i18npool/CustomTarget_collator.mk | 1 + i18npool/source/collator/collator_unicode.cxx | 6 +++++- i18npool/source/collator/data/sid_charset.txt | 18 ++++++++++++++++++ i18npool/source/localedata/data/sid_ET.xml | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-)
New commits: commit 965b1bc9f56b32d8a8630bad76f2033a5ee9dfd3 Author: Andras Timar <[email protected]> Date: Mon Jun 17 09:24:47 2013 +0200 typo fix, use ja_charset for Japanese Change-Id: I29b7db952a8cc9e0670e03dd79204486332aabe9 diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index d4dde12..bcdef82 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -164,7 +164,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: func = get_collator_data_hu_charset; } else if ( rLocale.Language == "ja" ) { if ( rAlgorithm == "charset" ) - func = get_collator_data_hu_charset; + func = get_collator_data_ja_charset; else if ( rAlgorithm == "phonetic (alphanumeric first)" ) func = get_collator_data_ja_phonetic_alphanumeric_first; else if ( rAlgorithm == "phonetic (alphanumeric last)" ) commit a5cdb78d797997c3b6f89b5d344d3a56d6d36348 Author: Andras Timar <[email protected]> Date: Mon Jun 17 09:12:35 2013 +0200 fdo#65809 Sidama (sit-ET) index sorting and collation data Change-Id: I1781c94cc67d4a2fa47bcf126195309590016b14 diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 22b24ad..04527bb 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 a7cf05b..d4dde12 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 0000000..c4c8da1 --- /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 f5dc751..cdd5117 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> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
