summaryrefslogtreecommitdiff
path: root/i18nutil
diff options
context:
space:
mode:
authorKhaled Hosny <khaled@libreoffice.org>2023-07-23 14:45:34 +0300
committerخالد حسني <khaled@libreoffice.org>2023-07-24 20:20:07 +0200
commit9eb88d78c8bc9e942814eb6fc4fe06a4e5736256 (patch)
treeb2e171cff0066d52e6131d3e52d17442cc37f5d2 /i18nutil
parente8d79381bf97d550920cec079fddf2b80927805a (diff)
tdf#96343, tdf#134766, tdf#97152: Fallback to ICU for case mapping
If we are requested to case map a character not present in our case mapping data, fallback to ICU case mapping functions. We should switch completely to ICU at some point, but we need to evaluate our case mapping data and see if it differs from ICU and if there is a reason for it. Does not handle the case of U+03F2 turning into Sigma from tdf#97152. Change-Id: Icf13ac7aab6d07b2a90fc0ff5ef1c4f50c7a7f8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154803 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'i18nutil')
-rw-r--r--i18nutil/source/utility/casefolding.cxx39
1 files changed, 38 insertions, 1 deletions
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 432de0bf1228..d4f79927c131 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -26,6 +26,8 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <rtl/character.hxx>
+#include <unicode/uchar.h>
+
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
@@ -125,10 +127,45 @@ Mapping casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 l
// Should not come here
throw RuntimeException();
}
- } else
+ }
+ else
+ {
dummy.map[0] = CaseMappingValue[address].value;
+ return dummy;
+ }
}
}
+
+ // If the code point is not supported by our case mapping tables,
+ // fallback to ICU functions.
+ // TODO: this does not handle special case mapping as these require
+ // using ustring.h APIs, which work on the whole string not character
+ // by character.
+ // TODO: what is the difference between ToLower and UpperToLower etc.?
+ sal_uInt32 value = 0;
+ switch (nMappingType)
+ {
+ case MappingType::ToLower:
+ case MappingType::UpperToLower:
+ value = u_tolower(c);
+ break;
+ case MappingType::ToUpper:
+ case MappingType::LowerToUpper:
+ value = u_toupper(c);
+ break;
+ case MappingType::ToTitle:
+ value = u_totitle(c);
+ break;
+ case MappingType::SimpleFolding:
+ case MappingType::FullFolding:
+ value = u_foldCase(c, U_FOLD_CASE_DEFAULT);
+ break;
+ default: break;
+ }
+
+ if (value && value != c)
+ dummy.nmap = rtl::splitSurrogates(value, dummy.map);
+
return dummy;
}