summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-06-17 09:12:35 +0200
committerAndras Timar <atimar@suse.com>2013-06-17 13:31:50 +0200
commita5cdb78d797997c3b6f89b5d344d3a56d6d36348 (patch)
treee29e4c2fdced8f3533dcdb4edc96ab566b3f08c1
parent93e034b26eec63f2d37865446899458a94f6c002 (diff)
fdo#65809 Sidama (sit-ET) index sorting and collation data
Change-Id: I1781c94cc67d4a2fa47bcf126195309590016b14
-rw-r--r--i18npool/CustomTarget_collator.mk1
-rw-r--r--i18npool/source/collator/collator_unicode.cxx4
-rw-r--r--i18npool/source/collator/data/sid_charset.txt18
-rw-r--r--i18npool/source/localedata/data/sid_ET.xml4
4 files changed, 25 insertions, 2 deletions
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 22b24ad46487..04527bb613d7 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -22,6 +22,7 @@ i18npool_COTXTS := \
ln_charset.txt \
my_dictionary.txt \
ne_charset.txt \
+ sid_charset.txt \
zh_charset.txt \
zh_pinyin.txt \
zh_radical.txt \
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index a7cf05ba389a..d4dde12cf2a0 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -74,6 +74,7 @@ const sal_uInt8* get_collator_data_ku_alphanumeric();
const sal_uInt8* get_collator_data_ln_charset();
const sal_uInt8* get_collator_data_my_dictionary();
const sal_uInt8* get_collator_data_ne_charset();
+const sal_uInt8* get_collator_data_sid_charset();
const sal_uInt8* get_collator_data_zh_TW_charset();
const sal_uInt8* get_collator_data_zh_TW_radical();
const sal_uInt8* get_collator_data_zh_TW_stroke();
@@ -183,6 +184,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
} else if ( rLocale.Language == "ne" ) {
if ( rAlgorithm == "charset" )
func = get_collator_data_ne_charset;
+ } else if ( rLocale.Language == "sid" ) {
+ if ( rAlgorithm == "charset" )
+ func = get_collator_data_sid_charset;
} else if ( rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO") ) {
if ( rAlgorithm == "charset" )
func = get_collator_data_zh_TW_charset;
diff --git a/i18npool/source/collator/data/sid_charset.txt b/i18npool/source/collator/data/sid_charset.txt
new file mode 100644
index 000000000000..c4c8da196f87
--- /dev/null
+++ b/i18npool/source/collator/data/sid_charset.txt
@@ -0,0 +1,18 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+#
+# Collation of Sidama letters
+#
+& c < ch <<< Ch <<< CH
+& d < dh <<< Dh <<< DH
+& n < ny <<< Ny <<< NY
+& p < ph <<< Ph <<< PH
+& s < sh <<< Sh <<< SH
+& t < ts <<< Ts <<< TS
+& z < zh <<< Zh <<< ZH
diff --git a/i18npool/source/localedata/data/sid_ET.xml b/i18npool/source/localedata/data/sid_ET.xml
index f5dc751b3e3e..cdd511796575 100644
--- a/i18npool/source/localedata/data/sid_ET.xml
+++ b/i18npool/source/localedata/data/sid_ET.xml
@@ -178,7 +178,7 @@
</FormatElement>
</LC_FORMAT>
<LC_COLLATION>
- <Collator default="true" unoid="alphanumeric"/>
+ <Collator default="true" unoid="charset"/>
<CollationOptions>
<TransliterationModules>IGNORE_CASE</TransliterationModules>
</CollationOptions>
@@ -189,7 +189,7 @@
</SearchOptions>
</LC_SEARCH>
<LC_INDEX>
- <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
+ <IndexKey phonetic="false" default="true" unoid="charset">A-C {Ch} D {Dh} E-N {Ny} O P {Ph} Q-S {Sh} T {TS} U-Z {ZH}</IndexKey>
<UnicodeScript>0</UnicodeScript>
<UnicodeScript>1</UnicodeScript>
<FollowPageWord>STP</FollowPageWord>