]> granicus.if.org Git - icu/commitdiff
ICU-8978 Integrate CLDR 21m2 data. Update dtfmttst.cpp for timezone name cleanup.
authorPeter Edberg <pedberg@unicode.org>
Fri, 9 Dec 2011 08:39:46 +0000 (08:39 +0000)
committerPeter Edberg <pedberg@unicode.org>
Fri, 9 Dec 2011 08:39:46 +0000 (08:39 +0000)
Update transrt.cpp to exclude 0970 from roundtrip tests; it was now included because
Unicode 6.1 moved it from Common to Devanagari, but it has no mapping from InterIndic
to anything else.

X-SVN-Rev: 31074

238 files changed:
icu4c/source/data/brkitr/brkfiles.mk
icu4c/source/data/brkitr/char_th.txt [deleted file]
icu4c/source/data/brkitr/line_he.txt [deleted file]
icu4c/source/data/build.xml
icu4c/source/data/coll/ar_001.txt [new file with mode: 0644]
icu4c/source/data/coll/colfiles.mk
icu4c/source/data/coll/km.txt
icu4c/source/data/coll/nl_CW.txt [new file with mode: 0644]
icu4c/source/data/coll/nl_SX.txt [new file with mode: 0644]
icu4c/source/data/coll/uk.txt
icu4c/source/data/curr/af.txt
icu4c/source/data/curr/am.txt
icu4c/source/data/curr/ar.txt
icu4c/source/data/curr/az.txt
icu4c/source/data/curr/be.txt
icu4c/source/data/curr/bg.txt
icu4c/source/data/curr/bn.txt
icu4c/source/data/curr/brx.txt
icu4c/source/data/curr/bs.txt
icu4c/source/data/curr/ca.txt
icu4c/source/data/curr/chr.txt
icu4c/source/data/curr/cs.txt
icu4c/source/data/curr/ee.txt
icu4c/source/data/curr/en.txt
icu4c/source/data/curr/es.txt
icu4c/source/data/curr/fi.txt
icu4c/source/data/curr/fr.txt
icu4c/source/data/curr/hr.txt
icu4c/source/data/curr/ko.txt
icu4c/source/data/curr/ln.txt
icu4c/source/data/curr/nl_CW.txt [new file with mode: 0644]
icu4c/source/data/curr/nl_SX.txt [new file with mode: 0644]
icu4c/source/data/curr/pt.txt
icu4c/source/data/curr/resfiles.mk
icu4c/source/data/curr/root.txt
icu4c/source/data/curr/sq.txt
icu4c/source/data/curr/supplementalData.txt
icu4c/source/data/curr/te.txt
icu4c/source/data/curr/ur.txt
icu4c/source/data/curr/zh.txt
icu4c/source/data/curr/zh_Hans_SG.txt
icu4c/source/data/curr/zh_Hant.txt
icu4c/source/data/curr/zh_Hant_HK.txt
icu4c/source/data/icu-config.xml
icu4c/source/data/lang/af.txt
icu4c/source/data/lang/am.txt
icu4c/source/data/lang/ar.txt
icu4c/source/data/lang/az.txt
icu4c/source/data/lang/be.txt
icu4c/source/data/lang/bg.txt
icu4c/source/data/lang/bn.txt
icu4c/source/data/lang/brx.txt
icu4c/source/data/lang/bs.txt
icu4c/source/data/lang/chr.txt
icu4c/source/data/lang/cs.txt
icu4c/source/data/lang/ee.txt
icu4c/source/data/lang/en.txt
icu4c/source/data/lang/es.txt
icu4c/source/data/lang/fi.txt
icu4c/source/data/lang/fr.txt
icu4c/source/data/lang/gu.txt
icu4c/source/data/lang/hr.txt
icu4c/source/data/lang/ko.txt
icu4c/source/data/lang/ln.txt
icu4c/source/data/lang/resfiles.mk
icu4c/source/data/lang/root.txt
icu4c/source/data/lang/sq.txt
icu4c/source/data/lang/te.txt
icu4c/source/data/lang/ur.txt
icu4c/source/data/lang/zh.txt
icu4c/source/data/lang/zh_Hans_SG.txt
icu4c/source/data/lang/zh_Hant.txt
icu4c/source/data/lang/zh_Hant_HK.txt
icu4c/source/data/locales/af.txt
icu4c/source/data/locales/am.txt
icu4c/source/data/locales/ar.txt
icu4c/source/data/locales/ar_001.txt [new file with mode: 0644]
icu4c/source/data/locales/az.txt
icu4c/source/data/locales/be.txt
icu4c/source/data/locales/bg.txt
icu4c/source/data/locales/bn.txt
icu4c/source/data/locales/brx.txt
icu4c/source/data/locales/bs.txt
icu4c/source/data/locales/chr.txt
icu4c/source/data/locales/ee.txt
icu4c/source/data/locales/en.txt
icu4c/source/data/locales/en_HK.txt
icu4c/source/data/locales/en_PK.txt
icu4c/source/data/locales/fi.txt
icu4c/source/data/locales/fr.txt
icu4c/source/data/locales/he.txt
icu4c/source/data/locales/hr.txt
icu4c/source/data/locales/ko.txt
icu4c/source/data/locales/ln.txt
icu4c/source/data/locales/nl_CW.txt [moved from icu4c/source/data/brkitr/th.txt with 70% similarity]
icu4c/source/data/locales/nl_SX.txt [moved from icu4c/source/data/brkitr/he.txt with 70% similarity]
icu4c/source/data/locales/resfiles.mk
icu4c/source/data/locales/root.txt
icu4c/source/data/locales/sq.txt
icu4c/source/data/locales/te.txt
icu4c/source/data/locales/ur.txt
icu4c/source/data/locales/zh.txt
icu4c/source/data/locales/zh_Hant.txt
icu4c/source/data/misc/likelySubtags.txt
icu4c/source/data/misc/metadata.txt
icu4c/source/data/misc/supplementalData.txt
icu4c/source/data/rbnf/rbnffiles.mk
icu4c/source/data/region/af.txt
icu4c/source/data/region/am.txt
icu4c/source/data/region/ar.txt
icu4c/source/data/region/az.txt
icu4c/source/data/region/be.txt
icu4c/source/data/region/bg.txt
icu4c/source/data/region/bn.txt
icu4c/source/data/region/brx.txt
icu4c/source/data/region/bs.txt
icu4c/source/data/region/chr.txt
icu4c/source/data/region/cs.txt
icu4c/source/data/region/ee.txt
icu4c/source/data/region/en.txt
icu4c/source/data/region/es.txt
icu4c/source/data/region/fi.txt
icu4c/source/data/region/fr.txt
icu4c/source/data/region/hr.txt
icu4c/source/data/region/ko.txt
icu4c/source/data/region/ln.txt
icu4c/source/data/region/resfiles.mk
icu4c/source/data/region/root.txt
icu4c/source/data/region/sq.txt
icu4c/source/data/region/te.txt
icu4c/source/data/region/ur.txt
icu4c/source/data/region/zh.txt
icu4c/source/data/region/zh_Hans_SG.txt
icu4c/source/data/region/zh_Hant.txt
icu4c/source/data/region/zh_Hant_HK.txt
icu4c/source/data/translit/Amharic_Latin_BGN.txt
icu4c/source/data/translit/Arabic_Latin.txt
icu4c/source/data/translit/Arabic_Latin_BGN.txt
icu4c/source/data/translit/Armenian_Latin_BGN.txt
icu4c/source/data/translit/Azerbaijani_Latin_BGN.txt
icu4c/source/data/translit/Belarusian_Latin_BGN.txt
icu4c/source/data/translit/Bengali_InterIndic.txt
icu4c/source/data/translit/Bulgarian_Latin_BGN.txt
icu4c/source/data/translit/Cyrillic_Latin.txt
icu4c/source/data/translit/Devanagari_InterIndic.txt
icu4c/source/data/translit/Georgian_Latin_BGN.txt
icu4c/source/data/translit/Greek_Latin.txt
icu4c/source/data/translit/Greek_Latin_BGN.txt
icu4c/source/data/translit/Greek_Latin_UNGEGN.txt
icu4c/source/data/translit/Gujarati_InterIndic.txt
icu4c/source/data/translit/Gurmukhi_InterIndic.txt
icu4c/source/data/translit/Hebrew_Latin.txt
icu4c/source/data/translit/IPA_XSampa.txt
icu4c/source/data/translit/InterIndic_Bengali.txt
icu4c/source/data/translit/InterIndic_Devanagari.txt
icu4c/source/data/translit/InterIndic_Gujarati.txt
icu4c/source/data/translit/InterIndic_Gurmukhi.txt
icu4c/source/data/translit/InterIndic_Kannada.txt
icu4c/source/data/translit/InterIndic_Latin.txt
icu4c/source/data/translit/InterIndic_Malayalam.txt
icu4c/source/data/translit/InterIndic_Oriya.txt
icu4c/source/data/translit/InterIndic_Tamil.txt
icu4c/source/data/translit/InterIndic_Telugu.txt
icu4c/source/data/translit/JapaneseKana_Latin_BGN.txt
icu4c/source/data/translit/Kannada_InterIndic.txt
icu4c/source/data/translit/Kazakh_Latin_BGN.txt
icu4c/source/data/translit/Kirghiz_Latin_BGN.txt
icu4c/source/data/translit/Korean_Latin_BGN.txt
icu4c/source/data/translit/Latin_Bopomofo.txt
icu4c/source/data/translit/Latin_ConjoiningJamo.txt
icu4c/source/data/translit/Latin_InterIndic.txt
icu4c/source/data/translit/Latin_Katakana.txt
icu4c/source/data/translit/Macedonian_Latin_BGN.txt
icu4c/source/data/translit/Malayalam_InterIndic.txt
icu4c/source/data/translit/Mongolian_Latin_BGN.txt
icu4c/source/data/translit/Oriya_InterIndic.txt
icu4c/source/data/translit/Pashto_Latin_BGN.txt
icu4c/source/data/translit/Persian_Latin_BGN.txt
icu4c/source/data/translit/Russian_Latin_BGN.txt
icu4c/source/data/translit/Serbian_Latin_BGN.txt
icu4c/source/data/translit/Simplified_Traditional.txt
icu4c/source/data/translit/Syriac_Latin.txt
icu4c/source/data/translit/Tamil_InterIndic.txt
icu4c/source/data/translit/Telugu_InterIndic.txt
icu4c/source/data/translit/ThaiLogical_Latin.txt
icu4c/source/data/translit/Thai_ThaiLogical.txt
icu4c/source/data/translit/Turkmen_Latin_BGN.txt
icu4c/source/data/translit/Ukrainian_Latin_BGN.txt
icu4c/source/data/translit/Uzbek_Latin_BGN.txt
icu4c/source/data/translit/cs_FONIPA_ja.txt
icu4c/source/data/translit/cs_FONIPA_ko.txt
icu4c/source/data/translit/cs_cs_FONIPA.txt
icu4c/source/data/translit/es_FONIPA_ja.txt
icu4c/source/data/translit/es_FONIPA_zh.txt
icu4c/source/data/translit/es_es_FONIPA.txt
icu4c/source/data/translit/ja_Latn_ko.txt
icu4c/source/data/translit/ja_Latn_ru.txt
icu4c/source/data/translit/pl_FONIPA_ja.txt
icu4c/source/data/translit/pl_pl_FONIPA.txt
icu4c/source/data/translit/ro_FONIPA_ja.txt
icu4c/source/data/translit/ro_ro_FONIPA.txt
icu4c/source/data/translit/ru_zh.txt
icu4c/source/data/translit/sk_FONIPA_ja.txt
icu4c/source/data/translit/sk_sk_FONIPA.txt
icu4c/source/data/translit/zh_Latn_PINYIN_ru.txt
icu4c/source/data/xml/brkitr/he.xml [deleted file]
icu4c/source/data/xml/brkitr/th.xml [deleted file]
icu4c/source/data/zone/af.txt
icu4c/source/data/zone/am.txt
icu4c/source/data/zone/ar.txt
icu4c/source/data/zone/az.txt
icu4c/source/data/zone/be.txt
icu4c/source/data/zone/bg.txt
icu4c/source/data/zone/bn.txt
icu4c/source/data/zone/brx.txt
icu4c/source/data/zone/bs.txt
icu4c/source/data/zone/chr.txt
icu4c/source/data/zone/cs.txt
icu4c/source/data/zone/ee.txt
icu4c/source/data/zone/en.txt
icu4c/source/data/zone/es.txt
icu4c/source/data/zone/fi.txt
icu4c/source/data/zone/fr.txt
icu4c/source/data/zone/hr.txt
icu4c/source/data/zone/ko.txt
icu4c/source/data/zone/ln.txt
icu4c/source/data/zone/resfiles.mk
icu4c/source/data/zone/root.txt
icu4c/source/data/zone/sq.txt
icu4c/source/data/zone/te.txt
icu4c/source/data/zone/ur.txt
icu4c/source/data/zone/zh.txt
icu4c/source/data/zone/zh_Hans_SG.txt
icu4c/source/data/zone/zh_Hant.txt
icu4c/source/data/zone/zh_Hant_HK.txt
icu4c/source/test/intltest/dtfmttst.cpp
icu4c/source/test/intltest/transrt.cpp
icu4c/source/test/testdata/structLocale.txt

index 82a87abe49e7bf9fba2d250d77572be15d11f80d..09373e575032c8fac28ab17b53139f21f86ba750 100644 (file)
@@ -42,5 +42,6 @@ BRK_SOURCE =  sent_el.txt word_POSIX.txt line_fi.txt word_ja.txt line_ja.txt cha
 
 
 # Ordinary resources
-BRK_RES_SOURCE = el.txt en.txt en_US.txt en_US_POSIX.txt fi.txt ja.txt
+BRK_RES_SOURCE = el.txt en.txt en_US.txt en_US_POSIX.txt\
+ fi.txt ja.txt
 
diff --git a/icu4c/source/data/brkitr/char_th.txt b/icu4c/source/data/brkitr/char_th.txt
deleted file mode 100644 (file)
index 150c0fe..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#   Copyright (C) 2002-2011, International Business Machines Corporation and others.
-#       All Rights Reserved.
-#
-#   file:  char_th.txt 
-#
-#   ICU Character Break Rules, also known as Grapheme Cluster Boundaries
-#      See Unicode Standard Annex #29.
-#      These rules are based on TR29 Revision 16, for Unicode Version 6.0
-#
-
-#
-#  Character Class Definitions.
-#
-$CR          = [\p{Grapheme_Cluster_Break = CR}];
-$LF          = [\p{Grapheme_Cluster_Break = LF}];
-$Control     = [\p{Grapheme_Cluster_Break = Control}];
-$Extend      = [\p{Grapheme_Cluster_Break = Extend} [\u0E33 \u0EB3]];
-
-#
-# Korean Syllable Definitions
-#
-$L       = [\p{Grapheme_Cluster_Break = L}];
-$V       = [\p{Grapheme_Cluster_Break = V}];
-$T       = [\p{Grapheme_Cluster_Break = T}];
-
-$LV      = [\p{Grapheme_Cluster_Break = LV}];
-$LVT     = [\p{Grapheme_Cluster_Break = LVT}];
-
-
-## -------------------------------------------------
-!!chain;
-
-!!forward;
-
-$CR $LF;
-
-$L ($L | $V | $LV | $LVT);
-($LV | $V) ($V | $T);
-($LVT | $T) $T;
-
-[^$Control $CR $LF] $Extend;
-
-## -------------------------------------------------
-
-!!reverse;
-$LF $CR;
-($L | $V | $LV | $LVT) $L;
-($V | $T) ($LV | $V);
-$T ($LVT | $T);
-
-$Extend      [^$Control $CR $LF];
-
-
-## -------------------------------------------------
-
-!!safe_reverse;
-
-
-## -------------------------------------------------
-
-!!safe_forward;
-
diff --git a/icu4c/source/data/brkitr/line_he.txt b/icu4c/source/data/brkitr/line_he.txt
deleted file mode 100644 (file)
index 9438451..0000000
+++ /dev/null
@@ -1,654 +0,0 @@
-# Copyright (c) 2002-2011  International Business Machines Corporation and
-# others. All Rights Reserved.
-#
-#  file:  line_he.txt
-#
-#         Line Breaking Rules
-#         Implement default line breaking as defined by 
-#         Unicode Standard Annex #14 Revision 24 for Unicode 6.0
-#         http://www.unicode.org/reports/tr14/
-#
-#         TODO:  Rule LB 8 remains as it was in Unicode 5.2
-#         This is only because of a limitation of ICU break engine implementation,
-#         not because the older behavior is desirable.
-
-#
-#  Character Classes defined by TR 14.
-#
-
-!!chain;
-!!LBCMNoChain;
-
-
-!!lookAheadHardBreak;
-#
-#  !!lookAheadHardBreak    Described here because it is (as yet) undocumented elsewhere
-#                          and only used for the line break rules.
-#
-#           It is used in the implementation of rule LB 10
-#           which says to treat any combining mark that is not attached to a base
-#           character as if it were of class AL  (alphabetic).
-#
-#           The problem occurs in the reverse rules.
-#
-#           Consider a sequence like, with correct breaks as shown
-#               LF  ID  CM  AL  AL
-#                  ^       ^       ^
-#           Then consider the sequence without the initial ID (ideographic)
-#                 LF  CM  AL  AL
-#                    ^           ^
-#           Our CM, which in the first example was attached to the ideograph,
-#           is now unattached, becomes an alpha, and joins in with the other
-#           alphas.
-#
-#           When iterating forwards, these sequences do not present any problems
-#           When iterating backwards, we need to look ahead when encountering
-#           a CM to see whether it attaches to something further on or not.
-#           (Look-ahead in a reverse rule is looking towards the start)
-#
-#           If the CM is unattached, we need to force a break.
-#
-#           !!lookAheadHardBreak forces the run time state machine to
-#           stop immediately when a look ahead rule ( '/' operator) matches,
-#           and set the match position to that of the look-ahead operator,
-#           no matter what other rules may be in play at the time.
-#
-#           See rule LB 19 for an example.
-#
-
-$AI = [:LineBreak =  Ambiguous:];
-$AL = [[:LineBreak =  Alphabetic:] - [[:Hebrew:] & [:Letter:]]];
-$HL = [[:Hebrew:] & [:Letter:]];
-$BA = [[:LineBreak =  Break_After:] - [\u2010]];
-$HH = [\u2010];
-$BB = [:LineBreak =  Break_Before:];
-$BK = [:LineBreak =  Mandatory_Break:];
-$B2 = [:LineBreak =  Break_Both:];
-$CB = [:LineBreak =  Contingent_Break:];
-$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
-$CL = [:LineBreak =  Close_Punctuation:];
-$CM = [:LineBreak =  Combining_Mark:];
-$CP = [:LineBreak =  Close_Parenthesis:];
-$CR = [:LineBreak =  Carriage_Return:];
-$EX = [:LineBreak =  Exclamation:];
-$GL = [:LineBreak =  Glue:];
-$HY = [:LineBreak =  Hyphen:];
-$H2 = [:LineBreak =  H2:];
-$H3 = [:LineBreak =  H3:];
-$ID = [:LineBreak =  Ideographic:];
-$IN = [:LineBreak =  Inseperable:];
-$IS = [:LineBreak =  Infix_Numeric:];
-$JL = [:LineBreak =  JL:];
-$JV = [:LineBreak =  JV:];
-$JT = [:LineBreak =  JT:];
-$LF = [:LineBreak =  Line_Feed:];
-$NL = [:LineBreak =  Next_Line:];
-$NS = [[:LineBreak =  Nonstarter:] $CJ];
-$NU = [:LineBreak =  Numeric:];
-$OP = [:LineBreak =  Open_Punctuation:];
-$PO = [:LineBreak =  Postfix_Numeric:];
-$PR = [:LineBreak =  Prefix_Numeric:];
-$QU = [:LineBreak =  Quotation:];
-$SA = [:LineBreak =  Complex_Context:];
-$SG = [:LineBreak =  Surrogate:];
-$SP = [:LineBreak =  Space:];
-$SY = [:LineBreak =  Break_Symbols:];
-$WJ = [:LineBreak =  Word_Joiner:];
-$XX = [:LineBreak =  Unknown:];
-$ZW = [:LineBreak =  ZWSpace:];
-
-#   Dictionary character set, for triggering language-based break engines. Currently
-#   limited to LineBreak=Complex_Context. Note that this set only works in Unicode
-#   5.0 or later as the definition of Complex_Context was corrected to include all
-#   characters requiring dictionary break.
-
-$dictionary = [:LineBreak = Complex_Context:];
-
-#
-#  Rule LB1.  By default, treat AI  (characters with ambiguous east Asian width),
-#                               SA  (South East Asian: Thai, Lao, Khmer)
-#                               SG  (Unpaired Surrogates)
-#                               XX  (Unknown, unassigned)
-#                         as $AL  (Alphabetic)
-#
-$ALPlus = [$AL $HL $AI $SA $SG $XX];
-
-#
-#  Combining Marks.   X $CM*  behaves as if it were X.  Rule LB6.
-#
-$ALcm = $ALPlus $CM*;
-$HLcm = $HL $CM*;
-$BAcm = $BA $CM*;
-$HHcm = $HH $CM*;
-$BBcm = $BB $CM*;
-$B2cm = $B2 $CM*;
-$CLcm = $CL $CM*;
-$CPcm = $CP $CM*;
-$EXcm = $EX $CM*;
-$GLcm = $GL $CM*;
-$HYcm = $HY $CM*;
-$H2cm = $H2 $CM*;
-$H3cm = $H3 $CM*;
-$IDcm = $ID $CM*;
-$INcm = $IN $CM*;
-$IScm = $IS $CM*;
-$JLcm = $JL $CM*;
-$JVcm = $JV $CM*;
-$JTcm = $JT $CM*;
-$NScm = $NS $CM*;
-$NUcm = $NU $CM*;
-$OPcm = $OP $CM*;
-$POcm = $PO $CM*;
-$PRcm = $PR $CM*;
-$QUcm = $QU $CM*;
-$SYcm = $SY $CM*;
-$WJcm = $WJ $CM*;
-
-## -------------------------------------------------
-
-!!forward;
-
-#
-#  Each class of character can stand by itself as an unbroken token, with trailing combining stuff
-#
-$ALPlus $CM+;
-$BA $CM+;
-$HH $CM+;
-$BB $CM+;
-$B2 $CM+;
-$CL $CM+;
-$CP $CM+;
-$EX $CM+;
-$GL $CM+;
-$HY $CM+;
-$H2 $CM+;
-$H3 $CM+;
-$ID $CM+;
-$IN $CM+;
-$IS $CM+;
-$JL $CM+;
-$JV $CM+;
-$JT $CM+;
-$NS $CM+;
-$NU $CM+;
-$OP $CM+;
-$PO $CM+;
-$PR $CM+;
-$QU $CM+;
-$SY $CM+;
-$WJ $CM+;
-
-#
-# CAN_CM  is the set of characters that may combine with CM combining chars.
-#         Note that Linebreak UAX 14's concept of a combining char and the rules
-#         for what they can combine with are _very_ different from the rest of Unicode.
-#
-#         Note that $CM itself is left out of this set.  If CM is needed as a base
-#         it must be listed separately in the rule.
-#
-$CAN_CM  = [^$SP $BK $CR $LF $NL $ZW $CM];       # Bases that can   take CMs
-$CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
-
-#
-# AL_FOLLOW  set of chars that can unconditionally follow an AL
-#            Needed in rules where stand-alone $CM s are treated as AL.
-#            Chaining is disabled with CM because it causes other failures,
-#            so for this one case we need to manually list out longer sequences.
-#
-$AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
-$AL_FOLLOW_CM   = [$CL $CP $EX $IS $SY $WJ $GL $OP $QU $BA $HH $HY $NS $IN $NU $ALPlus];
-$AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
-
-
-#
-#  Rule LB 4, 5    Mandatory (Hard) breaks.
-#
-$LB4Breaks    = [$BK $CR $LF $NL];
-$LB4NonBreaks = [^$BK $CR $LF $NL];
-$CR $LF {100};
-
-#
-#  LB 6    Do not break before hard line breaks.
-#
-$LB4NonBreaks?  $LB4Breaks {100};    # LB 5  do not break before hard breaks.
-$CAN_CM $CM*    $LB4Breaks {100};
-$CM+            $LB4Breaks {100};
-
-# LB 7         x SP
-#              x ZW
-$LB4NonBreaks [$SP $ZW];
-$CAN_CM $CM*  [$SP $ZW];
-$CM+          [$SP $ZW];
-
-#
-# LB 8         Break after zero width space
-#              TODO:  ZW SP* <break>
-#              An engine change is required to write the reverse rule for this.
-#              For now, leave the Unicode 5.2 rule, ZW <break>
-#
-$LB8Breaks    = [$LB4Breaks $ZW];
-$LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]];
-
-
-# LB 9     Combining marks.      X   $CM needs to behave like X, where X is not $SP, $BK $CR $LF $NL 
-#                                $CM not covered by the above needs to behave like $AL   
-#                                See definition of $CAN_CM.
-
-$CAN_CM $CM+;                   #  Stick together any combining sequences that don't match other rules.
-$CM+;
-
-#
-# LB 11  Do not break before or after WORD JOINER & related characters.
-#
-$CAN_CM $CM*  $WJcm;
-$LB8NonBreaks $WJcm;
-$CM+          $WJcm;
-
-$WJcm $CANT_CM;
-$WJcm $CAN_CM $CM*;
-
-#
-# LB 12  Do not break after NBSP and related characters.
-#         GL  x
-#
-$GLcm $CAN_CM $CM*;
-$GLcm $CANT_CM;
-#
-# LB 12a  Do not break before NBSP and related characters ...
-#            [^SP BA HY] x GL
-#
-[[$LB8NonBreaks] - [$SP $BA $HH $HY]] $CM* $GLcm;
-$CM+ GLcm;
-
-
-
-#
-# LB 13   Don't break before ']' or '!' or ';' or '/', even after spaces.
-#
-$LB8NonBreaks $CL;
-$CAN_CM $CM*  $CL;
-$CM+          $CL;              # by rule 10, stand-alone CM behaves as AL
-
-$LB8NonBreaks $CP;
-$CAN_CM $CM*  $CP;
-$CM+          $CP;              # by rule 10, stand-alone CM behaves as AL
-
-$LB8NonBreaks $EX;
-$CAN_CM $CM*  $EX;
-$CM+          $EX;              # by rule 10, stand-alone CM behaves as AL
-
-$LB8NonBreaks $IS;
-$CAN_CM $CM*  $IS;
-$CM+          $IS;              # by rule 10, stand-alone CM behaves as AL
-
-$LB8NonBreaks $SY;
-$CAN_CM $CM*  $SY;
-$CM+          $SY;              # by rule 10, stand-alone CM behaves as AL
-
-
-#
-# LB 14  Do not break after OP, even after spaces
-#
-$OPcm $SP* $CAN_CM $CM*;
-$OPcm $SP* $CANT_CM;
-
-$OPcm $SP+ $CM+ $AL_FOLLOW?;    # by rule 10, stand-alone CM behaves as AL
-
-# LB 15
-$QUcm $SP* $OPcm;
-
-# LB 16
-($CLcm | $CPcm) $SP* $NScm;
-
-# LB 17
-$B2cm $SP* $B2cm;
-
-#
-# LB 18  Break after spaces.
-#
-$LB18NonBreaks = [$LB8NonBreaks - [$SP]];
-$LB18Breaks    = [$LB8Breaks $SP];
-
-
-# LB 19
-#         x QU
-$LB18NonBreaks $CM* $QUcm;
-$CM+                $QUcm;
-
-#         QU  x
-$QUcm .?;
-$QUcm $LB18NonBreaks $CM*;    # Don't let a combining mark go onto $CR, $BK, etc.
-                              #  TODO:  I don't think this rule is needed.
-
-
-# LB 20
-#        <break>  $CB
-#        $CB   <break>
-
-$LB20NonBreaks = [$LB18NonBreaks - $CB];
-
-# LB 21        x   (BA | HY | NS)
-#           BB x
-#
-$LB20NonBreaks $CM* ($BAcm | $HHcm | $HYcm | $NScm); 
-
-$BBcm [^$CB];                                  #  $BB  x
-$BBcm $LB20NonBreaks $CM*;
-
-# LB 22
-$ALcm    $INcm;
-$CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
-$IDcm    $INcm;
-$INcm    $INcm;
-$NUcm    $INcm;
-
-
-# $LB 23
-$IDcm  $POcm;
-$ALcm  $NUcm;       # includes $LB19
-$CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
-$NUcm  $ALcm;
-
-#
-# LB 24
-#
-$PRcm $IDcm;
-$PRcm $ALcm;
-$POcm $ALcm;
-
-#
-# LB 25   Numbers.
-#
-($PRcm | $POcm)? ($OPcm | $HYcm)? $NUcm ($NUcm | $SYcm | $IScm)* ($CLcm | $CPcm)? ($PRcm | $POcm)?;
-
-# LB 26  Do not break a Korean syllable
-#
-$JLcm ($JLcm | $JVcm | $H2cm | $H3cm);
-($JVcm | $H2cm) ($JVcm | $JTcm);
-($JTcm | $H3cm) $JTcm;
-
-# LB 27  Treat korean Syllable Block the same as ID  (don't break it)
-($JLcm | $JVcm | $JTcm | $H2cm | $H3cm) $INcm;
-($JLcm | $JVcm | $JTcm | $H2cm | $H3cm) $POcm;
-$PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
-
-
-# LB 28   Do not break between alphabetics
-#
-$ALcm $ALcm;
-$CM+ $ALcm;      # The $CM+ is from rule 10, an unattached CM is treated as AL
-
-# LB 29
-$IScm $ALcm;
-
-# LB 30
-($ALcm | $NUcm) $OPcm;
-$CM+ $OPcm;         # The $CM+ is from rule 10, an unattached CM is treated as AL.          
-$CPcm ($ALcm | $NUcm);
-
-# (LB 31) Add new rule to prevent the break we do not want, this is the behavior change
-$HLcm ($HY | $HH) $ALcm;
-
-#
-#  Reverse Rules.
-#
-## -------------------------------------------------
-
-!!reverse;
-
-$CM+ $ALPlus;
-$CM+ $BA;
-$CM+ $HH;
-$CM+ $BB;
-$CM+ $B2;
-$CM+ $CL;
-$CM+ $CP;
-$CM+ $EX;
-$CM+ $GL;
-$CM+ $HY;
-$CM+ $H2;
-$CM+ $H3;
-$CM+ $ID;
-$CM+ $IN;
-$CM+ $IS;
-$CM+ $JL;
-$CM+ $JV;
-$CM+ $JT;
-$CM+ $NS;
-$CM+ $NU;
-$CM+ $OP;
-$CM+ $PO;
-$CM+ $PR;
-$CM+ $QU;
-$CM+ $SY;
-$CM+ $WJ;
-$CM+;
-
-
-#
-#  Sequences of the form  (shown forwards)
-#      [CANT_CM]  <break>  [CM]  [whatever]
-#  The CM needs to behave as an AL
-#
-$AL_FOLLOW $CM+ / (
-          [$BK $CR $LF $NL $ZW {eof}] |
-          $SP+ $CM+ $SP |
-          $SP+ $CM* ([^$OP $CM $SP] | [$AL {eof}]));   # if LB 14 will match, need to surpress this break.
-                                               #  LB14 says    OP SP* x .        
-                                               #    becomes    OP SP* x AL
-                                               #    becomes    OP SP* x CM+ AL_FOLLOW
-                                               #
-                                               # Further note:  the $AL in [$AL {eof}] is only to work around
-                                               #                a rule compiler bug which complains about
-                                               #                empty sets otherwise.
-          
-#
-#  Sequences of the form  (shown forwards)
-#      [CANT_CM]  <break> [CM]  <break>  [PR]
-#  The CM needs to behave as an AL
-#  This rule is concerned about getting the second of the two <breaks> in place.
-#
-
-[$PR   ] / $CM+ [$BK $CR $LF $NL $ZW $SP {eof}];
-
-
-
-# LB 4, 5, 5
-
-$LB4Breaks [$LB4NonBreaks-$CM];
-$LB4Breaks $CM+ $CAN_CM;
-$LF $CR;
-
-
-# LB 7         x SP
-#              x ZW
-[$SP $ZW] [$LB4NonBreaks-$CM];
-[$SP $ZW] $CM+ $CAN_CM;
-
-# LB 8 ZW SP* <break>
-#     TODO: to implement this, we need more than one look-ahead hard break in play at a time.
-#           Requires an engine enhancement.
-#   / $SP* $ZW
-
-# LB 9,10  Combining marks.
-#    X   $CM needs to behave like X, where X is not $SP or controls.
-#    $CM not covered by the above needs to behave like $AL
-# Stick together any combining sequences that don't match other rules.
-$CM+ $CAN_CM;
-
-
-# LB 11
-$CM* $WJ $CM* $CAN_CM;
-$CM* $WJ      [$LB8NonBreaks-$CM];
-
-     $CANT_CM $CM* $WJ;
-$CM* $CAN_CM  $CM* $WJ;
-
-# LB 12a
-#      [^SP BA HY] x GL
-#
-$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HH $HY]];
-
-# LB 12
-#     GL  x
-#
-$CANT_CM $CM* $GL;
-$CM* $CAN_CM $CM* $GL;
-
-
-# LB 13
-$CL $CM+ $CAN_CM;
-$CP $CM+ $CAN_CM;
-$EX $CM+ $CAN_CM;
-$IS $CM+ $CAN_CM;
-$SY $CM+ $CAN_CM;
-
-$CL [$LB8NonBreaks-$CM];
-$CP [$LB8NonBreaks-$CM];
-$EX [$LB8NonBreaks-$CM];
-$IS [$LB8NonBreaks-$CM];
-$SY [$LB8NonBreaks-$CM];
-
-# Rule 13 & 14 taken together for an edge case.
-#   Match this, shown forward
-#     OP SP+  ($CM+ behaving as $AL) (CL | CP | EX | IS | IY)
-#   This really wants to chain at the $CM+ (which is acting as an $AL)
-#   except for $CM chaining being disabled.
-[$CL $CP $EX $IS $SY] $CM+ $SP+ $CM* $OP;  
-
-# LB 14    OP SP* x
-#
-$CM* $CAN_CM    $SP* $CM* $OP;
-     $CANT_CM   $SP* $CM* $OP;
-$AL_FOLLOW? $CM+  $SP $SP* $CM* $OP;     #  by LB 10, behaves like $AL_FOLLOW? $AL $SP* $CM* $OP
-     
-     $AL_FOLLOW_NOCM $CM+ $SP+ $CM* $OP;
-$CM* $AL_FOLLOW_CM   $CM+ $SP+ $CM* $OP;
-$SY $CM $SP+ $OP;   # TODO:  Experiment.  Remove.
-
-
-
-# LB 15
-$CM* $OP $SP* $CM* $QU;
-
-# LB 16
-$CM* $NS $SP* $CM* ($CL | $CP);
-
-# LB 17
-$CM* $B2 $SP* $CM* $B2;
-
-# LB 18  break after spaces
-#        Nothing explicit needed here.
-
-
-#
-# LB 19
-#
-$CM* $QU $CM* $CAN_CM;                                #   . x QU
-$CM* $QU      $LB18NonBreaks;
-
-
-$CM* $CAN_CM  $CM* $QU;                               #   QU x .
-     $CANT_CM $CM* $QU;
-     
-#
-#  LB 20  Break before and after CB.
-#         nothing needed here.
-#
-
-# LB 21
-$CM* ($BA | $HH | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
-
-$CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
-[^$CB] $CM* $BB;                                      # 
-
-
-
-# LB 22
-$CM* $IN $CM* $ALPlus;
-$CM* $IN $CM* $ID;
-$CM* $IN $CM* $IN;
-$CM* $IN $CM* $NU;
-
-# LB 23
-$CM* $PO $CM* $ID;
-$CM* $NU $CM* $ALPlus;
-$CM* $ALPlus $CM* $NU;
-
-# LB 24
-$CM* $ID $CM* $PR;
-$CM* $ALPlus $CM* $PR;
-$CM* $ALPlus $CM* $PO;
-
-
-# LB 25
-($CM* ($PR | $PO))? ($CM* ($CL | $CP))? ($CM* ($NU | $IS | $SY))* $CM* $NU ($CM* ($OP | $HY))? ($CM* ($PR | $PO))?;
-
-# LB 26
-$CM* ($H3 | $H2 | $JV | $JL) $CM* $JL;
-$CM* ($JT | $JV) $CM* ($H2 | $JV);
-$CM* $JT $CM* ($H3 | $JT);
-
-# LB 27
-$CM* $IN $CM* ($H3 | $H2 | $JT | $JV | $JL);
-$CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
-$CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
-
-# LB 28
-$CM* $ALPlus $CM* $ALPlus;
-
-
-# LB 29
-$CM* $ALPlus $CM* $IS;
-
-# LB 30
-$CM* $OP $CM* ($ALPlus | $NU);
-$CM* ($ALPlus | $NU) $CM* $CP;
-
-# (LB 31) Add new rule to prevent the break we do not want, this is the behavior change
-$CM* $ALPlus ($HY | $HH) $CM* $HL;
-
-## -------------------------------------------------
-
-!!safe_reverse;
-
-# LB 9
-$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
-$CM+ $SP / .;
-
-# LB 14
-$SP+ $CM* $OP;
-
-# LB 15
-$SP+ $CM* $QU;
-
-# LB 16
-$SP+ $CM* ($CL | $CP);
-
-# LB 17
-$SP+ $CM* $B2;
-
-# LB 25
-($CM* ($IS | $SY))+ $CM* $NU;
-($CL | $CP) $CM* ($NU | $IS | $SY);
-
-# For dictionary-based break
-$dictionary $dictionary;
-
-## -------------------------------------------------
-
-!!safe_forward;
-
-# Skip forward over all character classes that are involved in
-#   rules containing patterns with possibly more than one char
-#   of context.
-#
-#  It might be slightly more efficient to have specific rules
-#  instead of one generic one, but only if we could
-#  turn off rule chaining.  We don't want to move more
-#  than necessary.
-#
-[$CM $OP $QU $CL $CP $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $CP $B2 $PR $HY $dictionary];
-$dictionary $dictionary;
-
index 8ed13c3e991c7b47724438d664b640ffa5c49a18..6f3e7e9421a562c6b84d36a540feae1f717bee5b 100644 (file)
                 <include name="en_US.txt" />
                 <include name="en_US_POSIX.txt" />
                 <include name="fi.txt" />
-                <include name="he.txt" />
                 <include name="ja.txt" />
-                <include name="th.txt" />
             </fileset>
             <fileset id="brkfiles" dir="${env.ICU4C_DIR}/source/data/brkitr">
                 <include name="brkfiles.mk" />
diff --git a/icu4c/source/data/coll/ar_001.txt b/icu4c/source/data/coll/ar_001.txt
new file mode 100644 (file)
index 0000000..4f5a2c4
--- /dev/null
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
+// *
+// ***************************************************************************
+/**
+ * validSubLocale of "ar"
+ */
+ar_001{
+    /**
+     * so genrb doesn't issue warnings
+     */
+    ___{""}
+}
index b502bf54c73f1175a20881e104af7d398bfa6dc4..1ecb15b577b823979ff649d62a3343a858ad5f5e 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-COLLATION_CLDR_VERSION = 2.0
+COLLATION_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
@@ -39,53 +39,53 @@ COLLATION_ALIAS_SOURCE = $(COLLATION_SYNTHETIC_ALIAS)
 
 
 # Empty locales, used for validSubLocale fallback.
-COLLATION_EMPTY_SOURCE = af_NA.txt af_ZA.txt ar_AE.txt ar_BH.txt\
- ar_DZ.txt ar_EG.txt ar_IQ.txt ar_JO.txt ar_KW.txt\
- ar_LB.txt ar_LY.txt ar_MA.txt ar_OM.txt ar_QA.txt\
- ar_SA.txt ar_SD.txt ar_SY.txt ar_TN.txt ar_YE.txt\
- as_IN.txt az_Latn.txt az_Latn_AZ.txt be_BY.txt bg_BG.txt\
- bn_BD.txt bn_IN.txt bs_BA.txt ca_ES.txt chr.txt\
- chr_US.txt cs_CZ.txt cy_GB.txt da_DK.txt de_AT.txt\
- de_BE.txt de_CH.txt de_DE.txt de_LI.txt de_LU.txt\
ee.txt ee_GH.txt ee_TG.txt el_CY.txt el_GR.txt\
- en_AS.txt en_AU.txt en_BB.txt en_BE.txt en_BM.txt\
- en_BW.txt en_BZ.txt en_CA.txt en_GB.txt en_GU.txt\
- en_HK.txt en_IE.txt en_IN.txt en_JM.txt en_MH.txt\
- en_MP.txt en_MT.txt en_MU.txt en_NA.txt en_NZ.txt\
- en_PH.txt en_PK.txt en_SG.txt en_TT.txt en_UM.txt\
- en_VI.txt en_ZA.txt en_ZW.txt es_419.txt es_AR.txt\
- es_BO.txt es_CL.txt es_CO.txt es_CR.txt es_DO.txt\
- es_EC.txt es_ES.txt es_GQ.txt es_GT.txt es_HN.txt\
- es_MX.txt es_NI.txt es_PA.txt es_PE.txt es_PR.txt\
- es_PY.txt es_SV.txt es_US.txt es_UY.txt es_VE.txt\
- et_EE.txt fa_IR.txt fi_FI.txt fil_PH.txt fo_FO.txt\
- fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt fr_BL.txt\
- fr_CD.txt fr_CF.txt fr_CG.txt fr_CH.txt fr_CI.txt\
- fr_CM.txt fr_DJ.txt fr_FR.txt fr_GA.txt fr_GN.txt\
- fr_GP.txt fr_GQ.txt fr_KM.txt fr_LU.txt fr_MC.txt\
- fr_MF.txt fr_MG.txt fr_ML.txt fr_MQ.txt fr_NE.txt\
- fr_RE.txt fr_RW.txt fr_SN.txt fr_TD.txt fr_TG.txt\
ga.txt ga_IE.txt gu_IN.txt ha_Latn.txt ha_Latn_GH.txt\
- ha_Latn_NE.txt ha_Latn_NG.txt he_IL.txt hi_IN.txt hr_HR.txt\
- hu_HU.txt hy_AM.txt id.txt id_ID.txt ig_NG.txt\
- is_IS.txt it.txt it_CH.txt it_IT.txt ja_JP.txt\
ka.txt ka_GE.txt kk_KZ.txt kl_GL.txt km_KH.txt\
- kn_IN.txt ko_KR.txt kok_IN.txt ln_CD.txt ln_CG.txt\
- lt_LT.txt lv_LV.txt mk_MK.txt ml_IN.txt mr_IN.txt\
- ms.txt ms_BN.txt ms_MY.txt mt_MT.txt my_MM.txt\
nb_NO.txt nl.txt nl_AW.txt nl_BE.txt nl_NL.txt\
- nn_NO.txt om_ET.txt om_KE.txt or_IN.txt pa_Arab.txt\
pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt pl_PL.txt ps_AF.txt\
- pt.txt pt_AO.txt pt_BR.txt pt_GW.txt pt_MZ.txt\
- pt_PT.txt pt_ST.txt ro_MD.txt ro_RO.txt ru_MD.txt\
- ru_RU.txt ru_UA.txt si_LK.txt sk_SK.txt sl_SI.txt\
- sq_AL.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt\
- sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv_FI.txt sv_SE.txt\
- sw.txt sw_KE.txt sw_TZ.txt ta_IN.txt ta_LK.txt\
te_IN.txt th_TH.txt tr_TR.txt uk_UA.txt ur_IN.txt\
ur_PK.txt vi_VN.txt yo_NG.txt zh_Hans.txt zh_Hans_CN.txt\
zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt\
- zu_ZA.txt
+COLLATION_EMPTY_SOURCE = af_NA.txt af_ZA.txt ar_001.txt ar_AE.txt\
+ ar_BH.txt ar_DZ.txt ar_EG.txt ar_IQ.txt ar_JO.txt\
+ ar_KW.txt ar_LB.txt ar_LY.txt ar_MA.txt ar_OM.txt\
+ ar_QA.txt ar_SA.txt ar_SD.txt ar_SY.txt ar_TN.txt\
+ ar_YE.txt as_IN.txt az_Latn.txt az_Latn_AZ.txt be_BY.txt\
+ bg_BG.txt bn_BD.txt bn_IN.txt bs_BA.txt ca_ES.txt\
+ chr.txt chr_US.txt cs_CZ.txt cy_GB.txt da_DK.txt\
+ de_AT.txt de_BE.txt de_CH.txt de_DE.txt de_LI.txt\
de_LU.txt ee.txt ee_GH.txt ee_TG.txt el_CY.txt\
+ el_GR.txt en_AS.txt en_AU.txt en_BB.txt en_BE.txt\
+ en_BM.txt en_BW.txt en_BZ.txt en_CA.txt en_GB.txt\
+ en_GU.txt en_HK.txt en_IE.txt en_IN.txt en_JM.txt\
+ en_MH.txt en_MP.txt en_MT.txt en_MU.txt en_NA.txt\
+ en_NZ.txt en_PH.txt en_PK.txt en_SG.txt en_TT.txt\
+ en_UM.txt en_VI.txt en_ZA.txt en_ZW.txt es_419.txt\
+ es_AR.txt es_BO.txt es_CL.txt es_CO.txt es_CR.txt\
+ es_DO.txt es_EC.txt es_ES.txt es_GQ.txt es_GT.txt\
+ es_HN.txt es_MX.txt es_NI.txt es_PA.txt es_PE.txt\
+ es_PR.txt es_PY.txt es_SV.txt es_US.txt es_UY.txt\
+ es_VE.txt et_EE.txt fa_IR.txt fi_FI.txt fil_PH.txt\
+ fo_FO.txt fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt\
+ fr_BL.txt fr_CD.txt fr_CF.txt fr_CG.txt fr_CH.txt\
+ fr_CI.txt fr_CM.txt fr_DJ.txt fr_FR.txt fr_GA.txt\
+ fr_GN.txt fr_GP.txt fr_GQ.txt fr_KM.txt fr_LU.txt\
+ fr_MC.txt fr_MF.txt fr_MG.txt fr_ML.txt fr_MQ.txt\
+ fr_NE.txt fr_RE.txt fr_RW.txt fr_SN.txt fr_TD.txt\
fr_TG.txt ga.txt ga_IE.txt gu_IN.txt ha_Latn.txt\
+ ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt he_IL.txt hi_IN.txt\
+ hr_HR.txt hu_HU.txt hy_AM.txt id.txt id_ID.txt\
+ ig_NG.txt is_IS.txt it.txt it_CH.txt it_IT.txt\
ja_JP.txt ka.txt ka_GE.txt kk_KZ.txt kl_GL.txt\
+ km_KH.txt kn_IN.txt ko_KR.txt kok_IN.txt ln_CD.txt\
+ ln_CG.txt lt_LT.txt lv_LV.txt mk_MK.txt ml_IN.txt\
+ mr_IN.txt ms.txt ms_BN.txt ms_MY.txt mt_MT.txt\
my_MM.txt nb_NO.txt nl.txt nl_AW.txt nl_BE.txt\
+ nl_CW.txt nl_NL.txt nl_SX.txt nn_NO.txt om_ET.txt\
om_KE.txt or_IN.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt\
+ pa_Guru_IN.txt pl_PL.txt ps_AF.txt pt.txt pt_AO.txt\
+ pt_BR.txt pt_GW.txt pt_MZ.txt pt_PT.txt pt_ST.txt\
+ ro_MD.txt ro_RO.txt ru_MD.txt ru_RU.txt ru_UA.txt\
+ si_LK.txt sk_SK.txt sl_SI.txt sq_AL.txt sr_Cyrl.txt\
+ sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn_BA.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\
sw_TZ.txt ta_IN.txt ta_LK.txt te_IN.txt th_TH.txt\
tr_TR.txt uk_UA.txt ur_IN.txt ur_PK.txt vi_VN.txt\
yo_NG.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt zh_Hant_HK.txt\
+ zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt
 
 
 # Ordinary resources
index f7fe2be84475449dc51957388df576db8b5dd51e..97818d38779c1b66e63b7cdebc0668570ff53c90 100644 (file)
@@ -15,7 +15,8 @@ km{
         standard{
             Sequence{
                 " [normalization on ]"
-                "&[last tertiary ignorable ]='\u17B4'='\u17B5'&។ល។<<<៘"
+                "&[last tertiary ignorable ]=឴=឵"
+                "&។ល។<<<៘"
                 "&ៈ<<៎<<៏<<៑<<័<<ៈ<<៝<<់<<៉<<៊<<៍"
                 "&រ<ឫ<ឬ"
                 "&ល<ឭ<ឮ"
diff --git a/icu4c/source/data/coll/nl_CW.txt b/icu4c/source/data/coll/nl_CW.txt
new file mode 100644 (file)
index 0000000..d518fd8
--- /dev/null
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
+// *
+// ***************************************************************************
+/**
+ * validSubLocale of "root"
+ */
+nl_CW{
+    /**
+     * so genrb doesn't issue warnings
+     */
+    ___{""}
+}
diff --git a/icu4c/source/data/coll/nl_SX.txt b/icu4c/source/data/coll/nl_SX.txt
new file mode 100644 (file)
index 0000000..a378ce1
--- /dev/null
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/icu-config.xml & build.xml
+// *
+// ***************************************************************************
+/**
+ * validSubLocale of "root"
+ */
+nl_SX{
+    /**
+     * so genrb doesn't issue warnings
+     */
+    ___{""}
+}
index 5c0cd6f87bb1584c9c048af2cb97cea00f8877aa..40e45d6f7da352c9982e8d73626ae5d4144465dc 100644 (file)
  *  ICU <specials> source: <path>/xml/collation/uk.xml
  */
 uk{
-    Version{"2.0.49.72"}
+    Version{"2.0.62.15"}
     collations{
         standard{
-            Sequence{
-                "[suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ] ]"
-                "&Г<ґ<<<Ґ"
-                "&я<ь<<<Ь"
-            }
+            Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ] ]&Г<ґ<<<Ґ"}
             Version{"21.0"}
         }
     }
index 541ade6b90ff662900072d0c85b3b576ee561891..4a5e21656bfbc2a506dd1e7268cd7e2461626d77 100644 (file)
@@ -664,5 +664,5 @@ af{
             "Zimbabwiese dollar",
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.33"}
 }
index c679906dca819195226b7ef8ddcd64e055d30b67..3b4eb7c4fd754c5d838bd239aa385bb5c8e0aa83 100644 (file)
@@ -648,5 +648,5 @@ am{
             "የዚምቧቡዌ ዶላር",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
 }
index 01c980ac61c6e6b4c9336a269997ffb12e718d54..5a12ed6322fc3413bdb339f3adba4a82cb21dc53 100644 (file)
@@ -1393,5 +1393,5 @@ ar{
         two{"{0} {1}"}
         zero{"{0} {1}"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
 }
index 8c26b90c38287ba467eba378a1a41c11602bc7f6..eaa003a462d5b87b98480b200f77acd7306dd977 100644 (file)
@@ -1736,5 +1736,5 @@ az{
             other{"Zimbabve dolları (1980-2008)"}
         }
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
 }
index 5076b723c70626c14f167528b444c1ed1cfd16e0..4c1e13d27b798a7621d9c4c08ca34c8f2933aad3 100644 (file)
@@ -68,5 +68,5 @@ be{
             "невядомая або недапушчальная валюта",
         }
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.33"}
 }
index 23290d12f4981a6c910c11c1b86482fea196a2b0..7f1574e8ab149c7daf3dd1e5151042291cff5105 100644 (file)
@@ -1895,5 +1895,5 @@ bg{
             other{"зимбабвийски долара (2009)"}
         }
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
 }
index 522eecc8069ec36e4b956b302e66954aa9c113a7..7afd203976fb49fce857fb76948f20384fc29f65 100644 (file)
@@ -1095,5 +1095,5 @@ bn{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
 }
index c7ca1eda59f2c0921aa446a5b6f419233187cf1b..809a3a159717f5c83c8acd36a384468d03e41972 100755 (executable)
@@ -1076,5 +1076,5 @@ brx{
             "ज़ीम्बाबवेई डॉलर",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
 }
index 027d2a6a0f9dffdecb26b829b3d714a89fb0d06d..054c3c182ac2a398ae27b35a47c44184a235c046 100644 (file)
@@ -2824,5 +2824,5 @@ bs{
             other{"zimbabvejskih dolara (2008)"}
         }
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.77"}
 }
index 39d4d1c39adbdf6dd9a4d4c114bd4da7e4f19888..32d59ddfa2fe77d89a9139141c6035df1dff7fbb 100644 (file)
@@ -641,7 +641,7 @@ ca{
         }
         MKN{
             "MKN",
-            "denar macedoni  (1992-1993)",
+            "denar macedoni (1992-1993)",
         }
         MLF{
             "MLF",
index 3f816cf0f8d8f4559c39d3e4a84ec2712f00f769..9fa121a422f54e7bdee290b39d80a1e5bc299217 100755 (executable)
@@ -62,5 +62,5 @@ chr{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.29"}
 }
index f7f0cff019a292c4baa2ab41be1b2196fa0d5766..3a4aba066f7c4976f7b48cbb1a781757ec8d22d7 100644 (file)
@@ -2323,5 +2323,5 @@ cs{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.55"}
 }
index b4c0f62c22a482342378f252b6bf6a57bb8d379c..46c75d801613b5c27abc0946855d1150c4bdf31a 100755 (executable)
@@ -2297,5 +2297,5 @@ ee{
     CurrencyUnitPatterns{
         other{"{1} {0}"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.61.87"}
 }
index 248d7aa1c3eaf2097243dfa679156e005366cc0e..c1fc99e04a95ff039ce48c14c0d0b3c9cedefbe7 100644 (file)
@@ -2355,5 +2355,5 @@ en{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.61.76"}
+    Version{"2.0.62.77"}
 }
index a51da6523273463057c479de097a260f4f43c693..2f31bffc03611ef0514de530d70a3674b4e01f29 100644 (file)
@@ -2073,5 +2073,5 @@ es{
     CurrencyUnitPatterns{
         other{"{0} {1}"}
     }
-    Version{"2.0.60.15"}
+    Version{"2.0.62.55"}
 }
index dbe107592247144878523a63a7bcc02445b22970..2be2cd73d9a657d3c0c7a46fbedd3afccfd51763 100644 (file)
@@ -2354,5 +2354,5 @@ fi{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.84"}
 }
index 3fd8984f4e16ef74736043482175c3c14deb4c40..56aa66974b7fd5cd234d695ba89b9bbf2798418c 100644 (file)
@@ -2206,5 +2206,5 @@ fr{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.75"}
 }
index 24fab89efc95de93e5b76c3fcd212d42148f8743..fb2425367e43a735f05cb52f86239093f392b099 100644 (file)
@@ -885,7 +885,7 @@ hr{
         }
         TMM{
             "TMM",
-            "turkmenistanski manat  (1993.-2009.)",
+            "turkmenistanski manat (1993.-2009.)",
         }
         TMT{
             "TMT",
@@ -1329,9 +1329,9 @@ hr{
         }
         BRB{
             few{"brazilska nova cruzeira (1967.-1986.)"}
-            many{"brazilskih novih cruzeira  (1967.-1986.)"}
-            one{"brazilski novi cruzeir  (1967.-1986.)"}
-            other{"brazilskih novih cruzeira  (1967.-1986.)"}
+            many{"brazilskih novih cruzeira (1967.-1986.)"}
+            one{"brazilski novi cruzeir (1967.-1986.)"}
+            other{"brazilskih novih cruzeira (1967.-1986.)"}
         }
         BRC{
             few{"brazilska cruzada"}
@@ -2418,10 +2418,10 @@ hr{
             other{"tadžikistanskih somona"}
         }
         TMM{
-            few{"turkmenistanska manata  (1993.-2009.)"}
-            many{"turkmenistanskih manata  (1993.-2009.)"}
-            one{"turkmenistanski manat  (1993.-2009.)"}
-            other{"turkmenistanskih manata  (1993.-2009.)"}
+            few{"turkmenistanska manata (1993.-2009.)"}
+            many{"turkmenistanskih manata (1993.-2009.)"}
+            one{"turkmenistanski manat (1993.-2009.)"}
+            other{"turkmenistanskih manata (1993.-2009.)"}
         }
         TMT{
             few{"turkmenistanska manata"}
@@ -2778,5 +2778,5 @@ hr{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.55"}
 }
index 68c27d5f431ffdba7131aa768921124db38a8398..55041035d11292b5feeeb161d4277db155f8256c 100644 (file)
@@ -1091,5 +1091,5 @@ ko{
     CurrencyUnitPatterns{
         other{"{0} {1}"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.55"}
 }
index d732699c300cd29a2c03cb9deb2bce3801e0a2d6..34a21ac6acbcbff8ce0c1322625077042e393817 100755 (executable)
@@ -232,5 +232,5 @@ ln{
             "Dolarɛ ya Zimbabwɛ",
         }
     }
-    Version{"2.0.57.98"}
+    Version{"2.0.62.5"}
 }
diff --git a/icu4c/source/data/curr/nl_CW.txt b/icu4c/source/data/curr/nl_CW.txt
new file mode 100644 (file)
index 0000000..2a188a1
--- /dev/null
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/common/main/nl_CW.xml
+// *
+// ***************************************************************************
+nl_CW{
+    Currencies{
+        ANG{
+            "NAf.",
+            "Nederlands-Antilliaanse gulden",
+        }
+    }
+    Version{"2.0.61.59"}
+}
diff --git a/icu4c/source/data/curr/nl_SX.txt b/icu4c/source/data/curr/nl_SX.txt
new file mode 100644 (file)
index 0000000..38c6f27
--- /dev/null
@@ -0,0 +1,17 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/common/main/nl_SX.xml
+// *
+// ***************************************************************************
+nl_SX{
+    Currencies{
+        ANG{
+            "NAf.",
+            "Nederlands-Antilliaanse gulden",
+        }
+    }
+    Version{"2.0.61.59"}
+}
index 98c1316356b309daf47944c2097ce8e1ea6fc364..55b21bcff64cc9fb11e7267f2f796a747caa7b85 100644 (file)
@@ -1262,8 +1262,8 @@ pt{
             other{"Florins de Aruba"}
         }
         AZM{
-            one{"Manat do Azeibaijão  (1993-2006)"}
-            other{"Manats do Azeibaijão  (1993-2006)"}
+            one{"Manat do Azeibaijão (1993-2006)"}
+            other{"Manats do Azeibaijão (1993-2006)"}
         }
         AZN{
             one{"Manat do Azeibaijão"}
index 2cff310313f3de403cd078cb7600b13d1b5ee35d..546b1b0a674e175a33ee66a9fe35ea7b52937edd 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-CURR_CLDR_VERSION = 2.0
+CURR_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
@@ -80,21 +80,21 @@ CURR_SOURCE = af.txt af_NA.txt agq.txt ak.txt\
  mk.txt ml.txt mr.txt ms.txt ms_BN.txt\
  mt.txt mua.txt my.txt naq.txt nb.txt\
  nd.txt ne.txt ne_IN.txt nl.txt nl_AW.txt\
- nmg.txt nn.txt nus.txt nyn.txt om.txt\
om_KE.txt or.txt pa.txt pa_Arab.txt pa_Guru.txt\
- pl.txt ps.txt pt.txt pt_AO.txt pt_MZ.txt\
- pt_PT.txt pt_ST.txt rm.txt rn.txt ro.txt\
- rof.txt ru.txt rw.txt rwk.txt saq.txt\
sbp.txt seh.txt ses.txt sg.txt shi.txt\
- shi_Latn.txt shi_Tfng.txt si.txt sk.txt sl.txt\
- sn.txt so.txt so_DJ.txt so_ET.txt so_KE.txt\
- sq.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Latn.txt\
- sv.txt sw.txt swc.txt ta.txt ta_LK.txt\
- te.txt teo.txt teo_KE.txt th.txt ti.txt\
- ti_ER.txt to.txt tr.txt twq.txt tzm.txt\
- tzm_Latn.txt uk.txt ur.txt uz.txt uz_Arab.txt\
- uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt\
- vi.txt vun.txt xog.txt yav.txt yo.txt\
zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt\
- zh_Hant.txt zh_Hant_HK.txt zu.txt
+ nl_CW.txt nl_SX.txt nmg.txt nn.txt nus.txt\
nyn.txt om.txt om_KE.txt or.txt pa.txt\
+ pa_Arab.txt pa_Guru.txt pl.txt ps.txt pt.txt\
+ pt_AO.txt pt_MZ.txt pt_PT.txt pt_ST.txt rm.txt\
+ rn.txt ro.txt rof.txt ru.txt rw.txt\
rwk.txt saq.txt sbp.txt seh.txt ses.txt\
+ sg.txt shi.txt shi_Latn.txt shi_Tfng.txt si.txt\
+ sk.txt sl.txt sn.txt so.txt so_DJ.txt\
+ so_ET.txt so_KE.txt sq.txt sr.txt sr_Cyrl.txt\
+ sr_Cyrl_BA.txt sr_Latn.txt sv.txt sw.txt swc.txt\
+ ta.txt ta_LK.txt te.txt teo.txt teo_KE.txt\
+ th.txt ti.txt ti_ER.txt to.txt tr.txt\
+ twq.txt tzm.txt tzm_Latn.txt uk.txt ur.txt\
+ uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt vai.txt\
+ vai_Latn.txt vai_Vaii.txt vi.txt vun.txt xog.txt\
yav.txt yo.txt zh.txt zh_Hans.txt zh_Hans_HK.txt\
+ zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zu.txt
 
index 16812dce390794d10486c12159b6bc6e56cf9caa..dd554953c408d161916adbab70ded954dc4d2d53 100644 (file)
@@ -99,7 +99,7 @@ root{
     CurrencyUnitPatterns{
         other{"{0} {1}"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.84"}
     currencySpacing{
         afterCurrency{
             currencyMatch{"[:letter:]"}
index cf5f35af6ae0e2628d2c37fcc10d1b2263534a5b..d4236a57906a0d2673b28eab079aae3c81ea83a1 100644 (file)
@@ -48,5 +48,5 @@ sq{
             "Dollar amerikan",
         }
     }
-    Version{"2.0.59.32"}
+    Version{"2.0.62.69"}
 }
index 4a89660a7ab004f33eb8168d81d772014e0dbf81..2a7794a4074bfffba79b46da39aed148c33c2e15 100644 (file)
@@ -797,10 +797,6 @@ supplementalData:table(nofallback){
                     -463,
                     419518048,
                 }
-                to:intvector{ /** 1974-04-16  */
-                    29,
-                    -1322378880,
-                }
             }
         }
         BU{
index c82f1b5998d3f664cddfab3f7c8d0a34dd065210..87bbd58d7e9bf804e9840d7c7f6b75e1fea967ab 100644 (file)
@@ -413,8 +413,7 @@ te{
         }
         NIO{
             "NIO",
-            "నికరగ్యుయన్
-కొర్‌డుబు",
+            "నికరగ్యుయన్ కొర్‌డుబు",
         }
         NOK{
             "NOK",
@@ -633,5 +632,5 @@ te{
             "జాంబియన్ క్వాచా",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.68"}
 }
index f501d186ddb228c147d44de91085ef5b3bf1e1ed..fbdbbf8752087e80a09a0de15e0ae9de717f4f51 100644 (file)
@@ -656,5 +656,5 @@ ur{
             "زامبیائی کواچا",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.70"}
 }
index bf9c9e06daf94772b5e77963392442175ce66cd0..8eef95b22df556974de44975f66596e803c50473 100644 (file)
@@ -1080,5 +1080,5 @@ zh{
             "津巴布韦元 (2009)",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
 }
index 2367161c2413fe7a22ec99dc8fdcac6c9ed3b02f..3baf51fa335a2cb09b53bff0a6bb6db150c78dfc 100644 (file)
@@ -29,5 +29,5 @@ zh_Hans_SG{
             "尼加拉瓜科多巴",
         }
     }
-    Version{"2.0.58.84"}
+    Version{"2.0.62.55"}
 }
index 1edb9ce08a07b0bf650def108779a9ce1aebbe62..af13ad38d887856365141b9203cc93f5dbafe0e8 100644 (file)
@@ -1048,5 +1048,5 @@ zh_Hant{
             "辛巴威元 (2009)",
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
 }
index c4cd134269dbcbd55316893be493331eedb2f3bd..bbbbe2930e90c1d9caf8b20da0b6067ec13fa7d3 100644 (file)
@@ -65,5 +65,5 @@ zh_Hant_HK{
             "太平洋法郎",
         }
     }
-    Version{"2.0.59.66"}
+    Version{"2.0.62.55"}
 }
index f18e5d124c0fc8adfee3751aba3f49e7c2ecb5ac..450111356232b02d1a27e98451c3485ee7f26e0e 100644 (file)
@@ -19,6 +19,7 @@
         <include locales="am"/>
         <include locales="am_ET"/>
         <include locales="ar"/>
+        <include locales="ar_001"/> 
         <include locales="ar_AE"/> 
         <include locales="ar_BH"/> 
         <include locales="ar_DZ"/> 
         <include locales="nl"/>        
         <include locales="nl_AW"/> 
         <include locales="nl_BE"/> 
+        <include locales="nl_CW"/> 
         <include locales="nl_NL"/> 
+        <include locales="nl_SX"/> 
         <include locales="nmg"/>
         <include locales="nmg_CM"/>
         <include locales="nn"/>
index c89c968177fc61efdcfd03c0d16c3356d20fd283..9d4cdbcafbc2e0001250cb1ed07b6430f89032db 100644 (file)
@@ -302,7 +302,7 @@ af{
             tibt{"Tibettaanse syfers"}
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.33"}
     codePatterns{
         language{"Taal: {0}"}
         script{"Skrif: {0}"}
index 34705f364252e812983180c3999a891da4cfee06..61c38c139f43a57ce6d4129d60e18fb796d8c6d8 100644 (file)
@@ -315,7 +315,7 @@ am{
             tibt{"የቲቤታን አሃዞች"}
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     localeDisplayPattern{
         separator{","}
     }
index e2a43f7d73c29f51cf18ba6a16007e66cf613163..72275f03f4ff52ce3ccf253c19d349e35a4f3a65 100644 (file)
@@ -722,7 +722,7 @@ ar{
         VALENCIA{"بلنسية"}
         WADEGILE{"المندرين باللاتينية - ويد–جيلز"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     codePatterns{
         language{"اللغة: {0}"}
         script{"نظام الكتابة: {0}"}
index a2a9a528c450b892f62f29af6a6d1a1f41936a80..48c7c0f33a51bc1f6eecdaccb721b1d9553b4122 100644 (file)
@@ -653,7 +653,7 @@ az{
             pinyin{"Pinyin təqvimi"}
         }
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     codePatterns{
         language{"Dil: {0}"}
         script{"Yazı: {0}"}
index 1e269f27bfd5d453615a822a39ec32ab0115bfe5..76f243d6682c10512588847857d322e159e2ad81 100644 (file)
@@ -187,7 +187,7 @@ be{
             japanese{"японскі каляндар"}
         }
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.33"}
     codePatterns{
         language{"Мова: {0}"}
         script{"Пісьмо: {0}"}
index 8ea6ae9fa3e0625924d567772626e01a785dcd60..e018e47254872a404a2c064297b43cbbeaf04d30 100644 (file)
@@ -754,7 +754,7 @@ bg{
         VALENCIA{"Валенсиански"}
         WADEGILE{"Уейд-Джайлс романизация"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     localeDisplayPattern{
         pattern{"{0} ({1})"}
         separator{", "}
index c0c17d50ebeccef89d4d2c6d19f2a49de84b8c41..37066db4c1505354248afc8e87ed4d2732d7db0f 100644 (file)
@@ -732,7 +732,7 @@ bn{
             tibt{"তিব্বতি সংখ্যা"}
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     codePatterns{
         language{"ভাষা: {0}"}
         script{"লিপি: {0}"}
index 67772e79fa272700874b7e228e27c24d43874458..42fae4bea3763db75834bb8d9f502d0dc71520e2 100755 (executable)
@@ -689,7 +689,7 @@ brx{
         TARASK{"तारास्कीएवीचा वर्तनी"}
         XIANG{"ज़ीयाँग हुनानी"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     codePatterns{
         script{"देवनागरी: {0}"}
         territory{"क्षेत्र:भारत {0}"}
index 1cd7497cb136b02e05d9cfa37716ca31d5db686a..94562dfec0422a39e74b1e4b6351995ca026fa13 100644 (file)
@@ -693,7 +693,7 @@ bs{
         TARASK{"Taraskijevica ortografija"}
         VALENCIA{"Valencijski"}
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.77"}
     codePatterns{
         language{"Jezik: {0}"}
         script{"Skript: {0}"}
index 22e70d19ace0a2266f603db2954348f347849e47..8e293c314b0b87ce917436b01f0763e6d9701335 100755 (executable)
@@ -46,5 +46,5 @@ chr{
             gregorian{"ᏅᏙ ᏗᏎᏗ"}
         }
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.29"}
 }
index 6d7a3f7408e3f3e435692121189aef9f65ee52c5..5e7deed1a156aa1c1e3fadfe57a84e729ef9f6bf 100644 (file)
@@ -579,7 +579,7 @@ cs{
     Variants{
         WADEGILE{"Wade-Giles"}
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.55"}
     codePatterns{
         language{"Jazyk: {0}"}
         script{"Písmo: {0}"}
index fba727751038e917e145ce6e11e6aba9325d6218..3d234f7b0c6f0b842d9b1da375a897c73b8e1196 100755 (executable)
@@ -299,7 +299,7 @@ ee{
             tibt{"tibet digitwo"}
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.61.87"}
     codePatterns{
         language{"gbegbɔgblɔ {0}"}
         script{"gbeŋɔŋlɔ {0}"}
index c7d785cd36556c76e24da7f74b03b70800656f0f..663304fe21aeda0004d1a7d3adfa269ab3d7d36e 100644 (file)
@@ -52,6 +52,7 @@ en{
         anp{"Angika"}
         apa{"Apache Language"}
         ar{"Arabic"}
+        ar_001{"Modern Standard Arabic"}
         arc{"Aramaic"}
         arn{"Araucanian"}
         arp{"Arapaho"}
@@ -634,7 +635,7 @@ en{
         Hebr{"Hebrew"}
         Hira{"Hiragana"}
         Hmng{"Pahawh Hmong"}
-        Hrkt{"Katakana or Hiragana"}
+        Hrkt{"Japanese syllabaries"}
         Hung{"Old Hungarian"}
         Inds{"Indus"}
         Ital{"Old Italic"}
@@ -644,6 +645,7 @@ en{
         Kana{"Katakana"}
         Khar{"Kharoshthi"}
         Khmr{"Khmer"}
+        Khoj{"Khojki"}
         Knda{"Kannada"}
         Kore{"Korean"}
         Kthi{"Kaithi"}
@@ -712,6 +714,7 @@ en{
         Thaa{"Thaana"}
         Thai{"Thai"}
         Tibt{"Tibetan"}
+        Tirh{"Tirhuta"}
         Ugar{"Ugaritic"}
         Vaii{"Vai"}
         Visp{"Visible Speech"}
@@ -751,6 +754,7 @@ en{
             dictionary{"Dictionary Sort Order"}
             direct{"Direct Sort Order"}
             ducet{"Default Unicode Sort Order"}
+            eor{"European Ordering Rules"}
             gb2312han{"Simplified Chinese Sort Order - GB2312"}
             phonebook{"Phonebook Sort Order"}
             pinyin{"Pinyin Sort Order"}
@@ -844,7 +848,7 @@ en{
         VALENCIA{"Valencian"}
         WADEGILE{"Wade-Giles Romanization"}
     }
-    Version{"2.0.61.76"}
+    Version{"2.0.62.77"}
     codePatterns{
         language{"Language: {0}"}
         script{"Script: {0}"}
index 06bde3a645bbabedf3a573e3227e767b05e9909f..b607b54a2a9bd91a70aa5360e67039c686aaba7e 100644 (file)
@@ -733,7 +733,7 @@ es{
         VALENCIA{"Valenciano"}
         WADEGILE{"Romanización Wade-Giles"}
     }
-    Version{"2.0.60.15"}
+    Version{"2.0.62.55"}
     codePatterns{
         language{"Idioma: {0}"}
         script{"Dialecto: {0}"}
index e3ffad6da62b8cd17b70c9a4f205f14accabcf0e..44717fc6eca992454b9c5f6c7cd7ccfd808e5a2d 100644 (file)
@@ -801,7 +801,7 @@ fi{
         VALLADER{"reoromaanin vallader-muoto"}
         WADEGILE{"kiinan Wade-Giles-latinaistus"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.84"}
     codePatterns{
         language{"kieli: {0}"}
         script{"kirjoitusjärjestelmä: {0}"}
index c4eeb67314f67c89db73b40d4669e55561d8a2bf..8dd4e0a58d578bcb494c79d899b47f90fdba851b 100644 (file)
@@ -762,7 +762,7 @@ fr{
         VALENCIA{"valencien"}
         WADEGILE{"Wade-Giles"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.75"}
     codePatterns{
         language{"langue : {0}"}
         script{"écriture : {0}"}
index ab5b9708abe92b1d09876618f28671994596c2e9..320d4f066d9ab647385eb13459395df164ad9921 100644 (file)
@@ -709,7 +709,7 @@ gu{
             greklow{"ગ્રિક નાના અક્ષરની સંખ્યા"}
             gujr{"ગુજરાતી અંકો"}
             guru{"ગુરમુખી અંકો"}
-            hanidec{"ચાઇનીઝ        દશાંશ સંખ્યા"}
+            hanidec{"ચાઇનીઝ દશાંશ સંખ્યા"}
             hans{"સરળિકૃત ચાઇનીઝ સંખ્યાઓ"}
             hansfin{"સરળિકૃત ચાઇનીઝ નાણાકિય સંખ્યાઓ"}
             hant{"પરંપરાગત ચાઇનિઝ સંખ્યાઓ"}
index 539d9516d4d9ea6622237d9b6b249cb28f12ea12..db9d6149ed9dea8d13539e6fcd6798ed91299864 100644 (file)
@@ -764,7 +764,7 @@ hr{
         VALENCIA{"valencijski"}
         WADEGILE{"Wade-Giles romanizacija"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.55"}
     codePatterns{
         language{"Jezik: {0}"}
         script{"Pismo: {0}"}
index 2c197c66ae6f56163a2d19b790cc336e834441dd..ed80fecac996f70331755ccce39156a9af7c2796 100644 (file)
@@ -719,7 +719,7 @@ ko{
         REVISED{"개정"}
         UCRCOR{"통합 개정 표기법"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.55"}
     codePatterns{
         language{"언어: {0}"}
         script{"스크립트: {0}"}
index a7d61f0bc4d921db6572159b40b86845a47adbf5..70e0db74bb5714c57d851821037725da1a480682 100755 (executable)
@@ -57,5 +57,5 @@ ln{
         zh{"lisinwa"}
         zu{"zulu"}
     }
-    Version{"2.0.57.98"}
+    Version{"2.0.62.5"}
 }
index 1da367f51eeffa834c0fd73015d93fc0084ed093..ff3b1bc04a710d4bb585571b622b2d3e1fee2102 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-LANG_CLDR_VERSION = 2.0
+LANG_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
index c5fa9b53d44feb71679c336ab94db092625b9477..3dc7abbce96d78f9c2eee291edcc096da8605e0a 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/root.xml
  */
 root{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.84"}
     codePatterns{
         language{"{0}"}
         script{"{0}"}
index 2a204b910231ca05f21643208bfd10c90dd7199b..42837a95242499275513108944baf6c0edfc3efd 100644 (file)
@@ -23,7 +23,7 @@ sq{
         pt{"Portugeze"}
         ru{"Rusisht"}
         sh{"Serbo-Kroatisht"}
-        sq{"shqipe"}
+        sq{"shqip"}
         zh{"Kineze"}
     }
     Scripts{
@@ -31,5 +31,5 @@ sq{
         Zxxx{"I pashkruar"}
         Zzzz{"Skript i panjohur"}
     }
-    Version{"2.0.59.32"}
+    Version{"2.0.62.69"}
 }
index 6d9d8d5dd104edd01f64a0052586fe4877a5a759..fb05da55c0d320b2fdcee4fb54a63e2b64e280c0 100644 (file)
@@ -741,7 +741,7 @@ te{
         REVISED{"సవరించబడిన వర్ణక్రమం"}
         WADEGILE{"వేడ్-గైల్స్ రోమనైజేషన్"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.68"}
     localeDisplayPattern{
         pattern{"{0} ({1})"}
         separator{","}
index b2ca2a4727c0840954cde189485036e8e717fd8f..3b1381efda7793a2d11874ff95945c67f60adbb2 100644 (file)
@@ -296,7 +296,7 @@ ur{
             tibt{"تبتی اعداد"}
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.70"}
     localeDisplayPattern{
         separator{"،"}
     }
index cd9d600d374663f2bc2eebfa9f9d9b226f6f7d80..aaa3e0e44a47dcd9dae5682eca04c19ec2f6e86d 100644 (file)
@@ -756,7 +756,7 @@ zh{
         VALENCIA{"瓦伦西亚文"}
         WADEGILE{"WG 威氏拼音法"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     codePatterns{
         language{"语言:{0}"}
         script{"脚本:{0}"}
index a3a13342251c9a7fbc69477bd07b2958041d7243..e3adfbdae7febd52675a49a8de06c016de88a0d0 100644 (file)
@@ -74,7 +74,7 @@ zh_Hans_SG{
         SAAHO{"萨霍文"}
         WADEGILE{"韦氏拼音罗马字"}
     }
-    Version{"2.0.58.84"}
+    Version{"2.0.62.55"}
     codePatterns{
         script{"语系:{0}"}
         territory{"地区:{0}"}
index e28720a700bce246862b60196fc8a0a4af22efeb..03efa450a425e085ddc68dcc0edcfcc25ee46ef5 100644 (file)
@@ -726,7 +726,7 @@ zh_Hant{
         REVISED{"已修訂的拼字學"}
         WADEGILE{"威妥瑪式拼音"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     codePatterns{
         language{"語言:{0}"}
         script{"文字:{0}"}
index 1c7032143ea91659167d216fc25f4f40688f72b7..235366676be1effd01dfa97519f3e5ac5be2c22c 100644 (file)
@@ -83,5 +83,5 @@ zh_Hant_HK{
         REVISED{"已修訂拼字法"}
         SCOTLAND{"蘇格蘭標準英語"}
     }
-    Version{"2.0.59.66"}
+    Version{"2.0.62.55"}
 }
index 9777d18561e42b532a9a3d9268d4f6c0ec10f58d..0e660cd4e753482fc1d8df2144460ff87f6501fb 100644 (file)
@@ -38,7 +38,7 @@ af{
             }
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.33"}
     calendar{
         gregorian{
             AmPmMarkers{
index 4b8e040b2ab4b19dc27f9239a04e1117f73e1036..29ace78ac07cab701e1abf5f113e378972effd72 100644 (file)
@@ -23,7 +23,7 @@ am{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     calendar{
         gregorian{
             AmPmMarkers{
index 4f62fee242313621b320c589648d05cf205e6164..489b7c355893c7d3b7bf0e25449a2b2a26cb5667 100644 (file)
@@ -55,7 +55,7 @@ ar{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     calendar{
         buddhist{
             DateTimePatterns{
diff --git a/icu4c/source/data/locales/ar_001.txt b/icu4c/source/data/locales/ar_001.txt
new file mode 100644 (file)
index 0000000..63f9f75
--- /dev/null
@@ -0,0 +1,16 @@
+// ***************************************************************************
+// *
+// * Copyright (C) 2011 International Business Machines
+// * Corporation and others.  All Rights Reserved.
+// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
+// * Source File:<path>/common/main/ar_001.xml
+// *
+// ***************************************************************************
+ar_001{
+    MeasurementSystem:int{0}
+    PaperSize:intvector{
+        297,
+        210,
+    }
+    Version{"2.0.62.28"}
+}
index bb0a5e5e3ba33a243fbfc44dc8ef2c559aa04417..c8c31fdec75dd52cd0e604462312da87338b4bac 100644 (file)
@@ -35,7 +35,7 @@ az{
             }
         }
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     calendar{
         gregorian{
             DateTimePatterns{
index 4a537ce2d581541fabafaa83bc00d1f751bd6168..585f94b59419733cdd7d090308ab398523ba89a5 100644 (file)
@@ -31,7 +31,7 @@ be{
             }
         }
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.33"}
     calendar{
         buddhist{
             DateTimePatterns{
index 6f007c122e239be65cc52686d187d0a0b769b843..144bfdd1e5bddd431d130006cb66722666d6c1df 100644 (file)
@@ -36,7 +36,7 @@ bg{
             }
         }
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     calendar{
         gregorian{
             AmPmMarkers{
index 3a0c973329f459c73c7ea992c3ae9114b0cf90fc..584ea57b167ee818d408d4423c951e7dfaeebf67 100644 (file)
@@ -52,7 +52,7 @@ bn{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     calendar{
         gregorian{
             AmPmMarkers{
index 96c46ac9049cfdb4c813f5450be3e13cf7388eda..f13e0fad647dd83861e5ba1fcf1b4cf468b40c55 100755 (executable)
@@ -46,7 +46,7 @@ brx{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     calendar{
         gregorian{
             AmPmMarkers{
index f1cf11789f3fddb25aa33eb932d1acf452135d67..4003dec650e98412a49f58806b1216684c210d4d 100644 (file)
@@ -23,7 +23,7 @@ bs{
             }
         }
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.77"}
     calendar{
         gregorian{
             AmPmMarkers{
index a36f9bc91299eab3175a61ddfec1a46a38f417a2..6bd1e2d5e75351a96693008f400c301c2328e60c 100755 (executable)
@@ -42,7 +42,7 @@ chr{
             }
         }
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.29"}
     calendar{
         gregorian{
             AmPmMarkers{
index ac078363c74740e4a8985d3ff226e861b8b36766..392a6d803f11a615d0a47c222ac8b817dfaae6c3 100755 (executable)
@@ -29,7 +29,7 @@ ee{
             }
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.61.87"}
     calendar{
         gregorian{
             AmPmMarkers{
index 15eb4dd3c5c990144fcb81575a66a40247d8d553..5d6eefa676b2fba1da5257d768eca48848beca15 100644 (file)
@@ -43,7 +43,7 @@ en{
             }
         }
     }
-    Version{"2.0.61.76"}
+    Version{"2.0.62.77"}
     calendar{
         buddhist{
             DateTimePatterns{
@@ -87,6 +87,28 @@ en{
                 yQQQ{"QQQ y G"}
             }
         }
+        chinese{
+            cyclicNameSets{
+                zodiacs{
+                    format{
+                        abbreviated{
+                            "Rat",
+                            "Ox",
+                            "Tiger",
+                            "Rabbit",
+                            "Dragon",
+                            "Snake",
+                            "Horse",
+                            "Goat",
+                            "Monkey",
+                            "Rooster",
+                            "Dog",
+                            "Pig",
+                        }
+                    }
+                }
+            }
+        }
         gregorian{
             AmPmMarkers{
                 "AM",
index 436e00a42425b53653ae6de36b9dedc9ee2fae61..89f350625a1a3b002309d963eed73e59589e827c 100644 (file)
@@ -155,238 +155,238 @@ en_HK{
             }
             eras{
                 abbreviated{
-                    "Taika",
-                    "Hakuchi",
-                    "Hakuhō",
-                    "Shuchō",
-                    "Taihō",
-                    "Keiun",
-                    "Wadō",
-                    "Reiki",
-                    "Yōrō",
-                    "Jinki",
-                    "Tempyō",
-                    "Tempyō-kampō",
-                    "Tempyō-shōhō",
-                    "Tempyō-hōji",
-                    "Temphō-jingo",
-                    "Jingo-keiun",
-                    "Hōki",
-                    "Ten-ō",
-                    "Enryaku",
-                    "Daidō",
-                    "Kōnin",
-                    "Tenchō",
-                    "Shōwa",
-                    "Kajō",
-                    "Ninju",
-                    "Saiko",
-                    "Tennan",
-                    "Jōgan",
-                    "Genkei",
-                    "Ninna",
-                    "Kampyō",
-                    "Shōtai",
-                    "Engi",
-                    "Enchō",
-                    "Shōhei",
-                    "Tengyō",
-                    "Tenryaku",
-                    "Tentoku",
-                    "Ōwa",
-                    "Kōhō",
-                    "Anna",
-                    "Tenroku",
-                    "Ten-en",
-                    "Jōgen",
-                    "Tengen",
-                    "Eikan",
-                    "Kanna",
-                    "Ei-en",
-                    "Eiso",
-                    "Shōryaku",
-                    "Chōtoku",
-                    "Chōhō",
-                    "Kankō",
-                    "Chōwa",
-                    "Kannin",
-                    "Jian",
-                    "Manju",
-                    "Chōgen",
-                    "Chōryaku",
-                    "Chōkyū",
-                    "Kantoku",
-                    "Eishō",
-                    "Tengi",
-                    "Kōhei",
-                    "Jiryaku",
-                    "Enkyū",
-                    "Shōho",
-                    "Shōryaku",
-                    "Eiho",
-                    "Ōtoku",
-                    "Kanji",
-                    "Kaho",
-                    "Eichō",
-                    "Shōtoku",
-                    "Kōwa",
-                    "Chōji",
-                    "Kashō",
-                    "Tennin",
-                    "Ten-ei",
-                    "Eikyū",
-                    "Gen-ei",
-                    "Hoan",
-                    "Tenji",
-                    "Daiji",
-                    "Tenshō",
-                    "Chōshō",
-                    "Hoen",
-                    "Eiji",
-                    "Kōji",
-                    "Tenyō",
-                    "Kyūan",
-                    "Ninpei",
-                    "Kyūju",
-                    "Hogen",
-                    "Heiji",
-                    "Eiryaku",
-                    "Ōho",
-                    "Chōkan",
-                    "Eiman",
-                    "Nin-an",
-                    "Kaō",
-                    "Shōan",
-                    "Angen",
-                    "Jishō",
-                    "Yōwa",
-                    "Juei",
-                    "Genryuku",
-                    "Bunji",
-                    "Kenkyū",
-                    "Shōji",
-                    "Kennin",
-                    "Genkyū",
-                    "Ken-ei",
-                    "Shōgen",
-                    "Kenryaku",
-                    "Kenpō",
-                    "Shōkyū",
-                    "Jōō",
-                    "Gennin",
-                    "Karoku",
-                    "Antei",
-                    "Kanki",
-                    "Jōei",
-                    "Tempuku",
-                    "Bunryaku",
-                    "Katei",
-                    "Ryakunin",
-                    "En-ō",
-                    "Ninji",
-                    "Kangen",
-                    "Hōji",
-                    "Kenchō",
-                    "Kōgen",
-                    "Shōka",
-                    "Shōgen",
-                    "Bun-ō",
-                    "Kōchō",
-                    "Bun-ei",
-                    "Kenji",
-                    "Kōan",
-                    "Shōō",
-                    "Einin",
-                    "Shōan",
-                    "Kengen",
-                    "Kagen",
-                    "Tokuji",
-                    "Enkei",
-                    "Ōchō",
-                    "Shōwa",
-                    "Bunpō",
-                    "Genō",
-                    "Genkyō",
-                    "Shōchū",
-                    "Kareki",
-                    "Gentoku",
-                    "Genkō",
-                    "Kemmu",
-                    "Engen",
-                    "Kōkoku",
-                    "Shōhei",
-                    "Kentoku",
+                    "Taika (645-650)",
+                    "Hakuchi (650-671)",
+                    "Hakuhō (672-686)",
+                    "Shuchō (686-701)",
+                    "Taihō (701-704)",
+                    "Keiun (704-708)",
+                    "Wadō (708-715)",
+                    "Reiki (715-717)",
+                    "Yōrō (717-724)",
+                    "Jinki (724-729)",
+                    "Tempyō (729-749)",
+                    "Tempyō-kampō (749-749)",
+                    "Tempyō-shōhō (749-757)",
+                    "Tempyō-hōji (757-765)",
+                    "Temphō-jingo (765-767)",
+                    "Jingo-keiun (767-770)",
+                    "Hōki (770-780)",
+                    "Ten-ō (781-782)",
+                    "Enryaku (782-806)",
+                    "Daidō (806-810)",
+                    "Kōnin (810-824)",
+                    "Tenchō (824-834)",
+                    "Shōwa (834-848)",
+                    "Kajō (848-851)",
+                    "Ninju (851-854)",
+                    "Saiko (854-857)",
+                    "Tennan (857-859)",
+                    "Jōgan (859-877)",
+                    "Genkei (877-885)",
+                    "Ninna (885-889)",
+                    "Kampyō (889-898)",
+                    "Shōtai (898-901)",
+                    "Engi (901-923)",
+                    "Enchō (923-931)",
+                    "Shōhei (931-938)",
+                    "Tengyō (938-947)",
+                    "Tenryaku (947-957)",
+                    "Tentoku (957-961)",
+                    "Ōwa (961-964)",
+                    "Kōhō (964-968)",
+                    "Anna (968-970)",
+                    "Tenroku (970-973)",
+                    "Ten-en (973-976)",
+                    "Jōgen (976-978)",
+                    "Tengen (978-983)",
+                    "Eikan (983-985)",
+                    "Kanna (985-987)",
+                    "Ei-en (987-989)",
+                    "Eiso (989-990)",
+                    "Shōryaku (990-995)",
+                    "Chōtoku (995-999)",
+                    "Chōhō (999-1004)",
+                    "Kankō (1004-1012)",
+                    "Chōwa (1012-1017)",
+                    "Kannin (1017-1021)",
+                    "Jian (1021-1024)",
+                    "Manju (1024-1028)",
+                    "Chōgen (1028-1037)",
+                    "Chōryaku (1037-1040)",
+                    "Chōkyū (1040-1044)",
+                    "Kantoku (1044-1046)",
+                    "Eishō (1046-1053)",
+                    "Tengi (1053-1058)",
+                    "Kōhei (1058-1065)",
+                    "Jiryaku (1065-1069)",
+                    "Enkyū (1069-1074)",
+                    "Shōho (1074-1077)",
+                    "Shōryaku (1077-1081)",
+                    "Eiho (1081-1084)",
+                    "Ōtoku (1084-1087)",
+                    "Kanji (1087-1094)",
+                    "Kaho (1094-1096)",
+                    "Eichō (1096-1097)",
+                    "Shōtoku (1097-1099)",
+                    "Kōwa (1099-1104)",
+                    "Chōji (1104-1106)",
+                    "Kashō (1106-1108)",
+                    "Tennin (1108-1110)",
+                    "Ten-ei (1110-1113)",
+                    "Eikyū (1113-1118)",
+                    "Gen-ei (1118-1120)",
+                    "Hoan (1120-1124)",
+                    "Tenji (1124-1126)",
+                    "Daiji (1126-1131)",
+                    "Tenshō (1131-1132)",
+                    "Chōshō (1132-1135)",
+                    "Hoen (1135-1141)",
+                    "Eiji (1141-1142)",
+                    "Kōji (1142-1144)",
+                    "Tenyō (1144-1145)",
+                    "Kyūan (1145-1151)",
+                    "Ninpei (1151-1154)",
+                    "Kyūju (1154-1156)",
+                    "Hogen (1156-1159)",
+                    "Heiji (1159-1160)",
+                    "Eiryaku (1160-1161)",
+                    "Ōho (1161-1163)",
+                    "Chōkan (1163-1165)",
+                    "Eiman (1165-1166)",
+                    "Nin-an (1166-1169)",
+                    "Kaō (1169-1171)",
+                    "Shōan (1171-1175)",
+                    "Angen (1175-1177)",
+                    "Jishō (1177-1181)",
+                    "Yōwa (1181-1182)",
+                    "Juei (1182-1184)",
+                    "Genryuku (1184-1185)",
+                    "Bunji (1185-1190)",
+                    "Kenkyū (1190-1199)",
+                    "Shōji (1199-1201)",
+                    "Kennin (1201-1204)",
+                    "Genkyū (1204-1206)",
+                    "Ken-ei (1206-1207)",
+                    "Shōgen (1207-1211)",
+                    "Kenryaku (1211-1213)",
+                    "Kenpō (1213-1219)",
+                    "Shōkyū (1219-1222)",
+                    "Jōō (1222-1224)",
+                    "Gennin (1224-1225)",
+                    "Karoku (1225-1227)",
+                    "Antei (1227-1229)",
+                    "Kanki (1229-1232)",
+                    "Jōei (1232-1233)",
+                    "Tempuku (1233-1234)",
+                    "Bunryaku (1234-1235)",
+                    "Katei (1235-1238)",
+                    "Ryakunin (1238-1239)",
+                    "En-ō (1239-1240)",
+                    "Ninji (1240-1243)",
+                    "Kangen (1243-1247)",
+                    "Hōji (1247-1249)",
+                    "Kenchō (1249-1256)",
+                    "Kōgen (1256-1257)",
+                    "Shōka (1257-1259)",
+                    "Shōgen (1259-1260)",
+                    "Bun-ō (1260-1261)",
+                    "Kōchō (1261-1264)",
+                    "Bun-ei (1264-1275)",
+                    "Kenji (1275-1278)",
+                    "Kōan (1278-1288)",
+                    "Shōō (1288-1293)",
+                    "Einin (1293-1299)",
+                    "Shōan (1299-1302)",
+                    "Kengen (1302-1303)",
+                    "Kagen (1303-1306)",
+                    "Tokuji (1306-1308)",
+                    "Enkei (1308-1311)",
+                    "Ōchō (1311-1312)",
+                    "Shōwa (1312-1317)",
+                    "Bunpō (1317-1319)",
+                    "Genō (1319-1321)",
+                    "Genkyō (1321-1324)",
+                    "Shōchū (1324-1326)",
+                    "Kareki (1326-1329)",
+                    "Gentoku (1329-1331)",
+                    "Genkō (1331-1334)",
+                    "Kemmu (1334-1336)",
+                    "Engen (1336-1340)",
+                    "Kōkoku (1340-1346)",
+                    "Shōhei (1346-1370)",
+                    "Kentoku (1370-1372)",
                     "Bunchū",
-                    "Tenju",
-                    "Kōryaku",
-                    "Kōwa",
+                    "Tenju (1375-1379)",
+                    "Kōryaku (1379-1381)",
+                    "Kōwa (1381-1384)",
                     "Genchū",
-                    "Meitoku",
-                    "Kakei",
-                    "Kōō",
-                    "Meitoku",
-                    "Ōei",
-                    "Shōchō",
-                    "Eikyō",
-                    "Kakitsu",
-                    "Bun-an",
-                    "Hōtoku",
-                    "Kyōtoku",
-                    "Kōshō",
-                    "Chōroku",
-                    "Kanshō",
-                    "Bunshō",
-                    "Ōnin",
-                    "Bunmei",
-                    "Chōkyō",
-                    "Entoku",
-                    "Meiō",
-                    "Bunki",
-                    "Eishō",
-                    "Taiei",
-                    "Kyōroku",
-                    "Tenmon",
-                    "Kōji",
-                    "Eiroku",
-                    "Genki",
-                    "Tenshō",
-                    "Bunroku",
-                    "Keichō",
-                    "Genwa",
-                    "Kan-ei",
-                    "Shōho",
-                    "Keian",
-                    "Shōō",
-                    "Meiryaku",
-                    "Manji",
-                    "Kanbun",
-                    "Enpō",
-                    "Tenwa",
-                    "Jōkyō",
-                    "Genroku",
-                    "Hōei",
-                    "Shōtoku",
-                    "Kyōhō",
-                    "Genbun",
-                    "Kanpō",
-                    "Enkyō",
-                    "Kan-en",
-                    "Hōryaku",
-                    "Meiwa",
-                    "An-ei",
-                    "Tenmei",
-                    "Kansei",
-                    "Kyōwa",
-                    "Bunka",
-                    "Bunsei",
-                    "Tenpō",
-                    "Kōka",
-                    "Kaei",
-                    "Ansei",
-                    "Man-en",
-                    "Bunkyū",
-                    "Genji",
-                    "Keiō",
+                    "Meitoku (1384-1387)",
+                    "Kakei (1387-1389)",
+                    "Kōō (1389-1390)",
+                    "Meitoku (1390-1394)",
+                    "Ōei (1394-1428)",
+                    "Shōchō (1428-1429)",
+                    "Eikyō (1429-1441)",
+                    "Kakitsu (1441-1444)",
+                    "Bun-an (1444-1449)",
+                    "Hōtoku (1449-1452)",
+                    "Kyōtoku (1452-1455)",
+                    "Kōshō (1455-1457)",
+                    "Chōroku (1457-1460)",
+                    "Kanshō (1460-1466)",
+                    "Bunshō (1466-1467)",
+                    "Ōnin (1467-1469)",
+                    "Bunmei (1469-1487)",
+                    "Chōkyō (1487-1489)",
+                    "Entoku (1489-1492)",
+                    "Meiō (1492-1501)",
+                    "Bunki (1501-1504)",
+                    "Eishō (1504-1521)",
+                    "Taiei (1521-1528)",
+                    "Kyōroku (1528-1532)",
+                    "Tenmon (1532-1555)",
+                    "Kōji (1555-1558)",
+                    "Eiroku (1558-1570)",
+                    "Genki (1570-1573)",
+                    "Tenshō (1573-1592)",
+                    "Bunroku (1592-1596)",
+                    "Keichō (1596-1615)",
+                    "Genwa (1615-1624)",
+                    "Kan-ei (1624-1644)",
+                    "Shōho (1644-1648)",
+                    "Keian (1648-1652)",
+                    "Shōō (1652-1655)",
+                    "Meiryaku (1655-1658)",
+                    "Manji (1658-1661)",
+                    "Kanbun (1661-1673)",
+                    "Enpō (1673-1681)",
+                    "Tenwa (1681-1684)",
+                    "Jōkyō (1684-1688)",
+                    "Genroku (1688-1704)",
+                    "Hōei (1704-1711)",
+                    "Shōtoku (1711-1716)",
+                    "Kyōhō (1716-1736)",
+                    "Genbun (1736-1741)",
+                    "Kanpō (1741-1744)",
+                    "Enkyō (1744-1748)",
+                    "Kan-en (1748-1751)",
+                    "Hōryaku (1751-1764)",
+                    "Meiwa (1764-1772)",
+                    "An-ei (1772-1781)",
+                    "Tenmei (1781-1789)",
+                    "Kansei (1789-1801)",
+                    "Kyōwa (1801-1804)",
+                    "Bunka (1804-1818)",
+                    "Bunsei (1818-1830)",
+                    "Tenpō (1830-1844)",
+                    "Kōka (1844-1848)",
+                    "Kaei (1848-1854)",
+                    "Ansei (1854-1860)",
+                    "Man-en (1860-1861)",
+                    "Bunkyū (1861-1864)",
+                    "Genji (1864-1865)",
+                    "Keiō (1865-1868)",
                     "Meiji",
                     "Taishō",
                     "Shōwa",
index dd203d6b4b07e8f26b1ca88bca24d651b16df909..df89a34c8aa0b31fc5ed5f93c777a4c3c7c98443 100644 (file)
@@ -16,10 +16,10 @@ en_PK{
                 "h:mm:ss a z",
                 "h:mm:ss a",
                 "h:mm a",
-                "EEEE, MMMM d, y",
-                "MMMM d, y",
+                "EEEE, d MMMM y",
+                "d MMMM y",
                 "dd-MMM-y",
-                "M/d/yy",
+                "dd/MM/yyyy",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
index 662ba91726586ff4a30f12918f20134bdc7860b9..5335db1389f90ad670266caa607531a361d294ed 100644 (file)
@@ -39,7 +39,7 @@ fi{
             }
         }
     }
-    Version{"2.0.62.55"}
+    Version{"2.0.62.84"}
     calendar{
         buddhist{
             DateTimePatterns{
@@ -113,8 +113,8 @@ fi{
                 Hm{"H.mm"}
                 Hms{"H.mm.ss"}
                 MEd{"E d.M."}
-                MMMEd{"E d. MMM"}
-                MMMd{"d. MMM"}
+                MMMEd{"E d.M."}
+                MMMd{"d.M."}
                 Md{"d.M."}
                 hm{"h.mm a"}
                 hms{"h.mm.ss a"}
index b5f2b5ca039704a13cefe9ca8fb67a2a0a149571..337370eabc4af8ab49ddcc7ef0c76c76761439f8 100644 (file)
@@ -43,7 +43,7 @@ fr{
             }
         }
     }
-    Version{"2.0.62.55"}
+    Version{"2.0.62.75"}
     calendar{
         buddhist{
             DateTimePatterns{
index 7cdd2c73b0971292cc68edb0d7104830704c284c..5167a4060e2a5ec286de53809a40a050def82bfb 100644 (file)
@@ -523,237 +523,237 @@ he{
             eras{
                 abbreviated{
                     "טאיקה",
-                    "Hakuchi",
-                    "Hakuhō",
-                    "Shuchō",
-                    "Taihō",
-                    "Keiun",
-                    "Wadō",
-                    "Reiki",
-                    "Yōrō",
-                    "Jinki",
-                    "Tempyō",
-                    "Tempyō-kampō",
-                    "Tempyō-shōhō",
-                    "Tempyō-hōji",
-                    "Temphō-jingo",
-                    "Jingo-keiun",
-                    "Hōki",
-                    "Ten-ō",
-                    "Enryaku",
-                    "Daidō",
-                    "Kōnin",
-                    "Tenchō",
-                    "Shōwa",
-                    "Kajō",
+                    "Hakuchi (650-671)",
+                    "Hakuhō (672-686)",
+                    "Shuchō (686-701)",
+                    "Taihō (701-704)",
+                    "Keiun (704-708)",
+                    "Wadō (708-715)",
+                    "Reiki (715-717)",
+                    "Yōrō (717-724)",
+                    "Jinki (724-729)",
+                    "Tempyō (729-749)",
+                    "Tempyō-kampō (749-749)",
+                    "Tempyō-shōhō (749-757)",
+                    "Tempyō-hōji (757-765)",
+                    "Temphō-jingo (765-767)",
+                    "Jingo-keiun (767-770)",
+                    "Hōki (770-780)",
+                    "Ten-ō (781-782)",
+                    "Enryaku (782-806)",
+                    "Daidō (806-810)",
+                    "Kōnin (810-824)",
+                    "Tenchō (824-834)",
+                    "Shōwa (834-848)",
+                    "Kajō (848-851)",
                     "נינג׳ו",
-                    "Saiko",
-                    "Tennan",
-                    "Jōgan",
-                    "Genkei",
-                    "Ninna",
-                    "Kampyō",
-                    "Shōtai",
-                    "Engi",
-                    "Enchō",
-                    "Shōhei",
-                    "Tengyō",
-                    "Tenryaku",
-                    "Tentoku",
-                    "Ōwa",
-                    "Kōhō",
-                    "Anna",
-                    "Tenroku",
-                    "Ten-en",
-                    "Jōgen",
-                    "Tengen",
-                    "Eikan",
-                    "Kanna",
-                    "Ei-en",
-                    "Eiso",
-                    "Shōryaku",
-                    "Chōtoku",
-                    "Chōhō",
-                    "Kankō",
-                    "Chōwa",
-                    "Kannin",
-                    "Jian",
-                    "Manju",
-                    "Chōgen",
-                    "Chōryaku",
-                    "Chōkyū",
-                    "Kantoku",
-                    "Eishō",
-                    "Tengi",
-                    "Kōhei",
-                    "Jiryaku",
-                    "Enkyū",
-                    "Shōho",
-                    "Shōryaku",
-                    "Eiho",
-                    "Ōtoku",
-                    "Kanji",
-                    "Kaho",
-                    "Eichō",
+                    "Saiko (854-857)",
+                    "Tennan (857-859)",
+                    "Jōgan (859-877)",
+                    "Genkei (877-885)",
+                    "Ninna (885-889)",
+                    "Kampyō (889-898)",
+                    "Shōtai (898-901)",
+                    "Engi (901-923)",
+                    "Enchō (923-931)",
+                    "Shōhei (931-938)",
+                    "Tengyō (938-947)",
+                    "Tenryaku (947-957)",
+                    "Tentoku (957-961)",
+                    "Ōwa (961-964)",
+                    "Kōhō (964-968)",
+                    "Anna (968-970)",
+                    "Tenroku (970-973)",
+                    "Ten-en (973-976)",
+                    "Jōgen (976-978)",
+                    "Tengen (978-983)",
+                    "Eikan (983-985)",
+                    "Kanna (985-987)",
+                    "Ei-en (987-989)",
+                    "Eiso (989-990)",
+                    "Shōryaku (990-995)",
+                    "Chōtoku (995-999)",
+                    "Chōhō (999-1004)",
+                    "Kankō (1004-1012)",
+                    "Chōwa (1012-1017)",
+                    "Kannin (1017-1021)",
+                    "Jian (1021-1024)",
+                    "Manju (1024-1028)",
+                    "Chōgen (1028-1037)",
+                    "Chōryaku (1037-1040)",
+                    "Chōkyū (1040-1044)",
+                    "Kantoku (1044-1046)",
+                    "Eishō (1046-1053)",
+                    "Tengi (1053-1058)",
+                    "Kōhei (1058-1065)",
+                    "Jiryaku (1065-1069)",
+                    "Enkyū (1069-1074)",
+                    "Shōho (1074-1077)",
+                    "Shōryaku (1077-1081)",
+                    "Eiho (1081-1084)",
+                    "Ōtoku (1084-1087)",
+                    "Kanji (1087-1094)",
+                    "Kaho (1094-1096)",
+                    "Eichō (1096-1097)",
                     "שוטוקו",
-                    "Kōwa",
-                    "Chōji",
-                    "Kashō",
-                    "Tennin",
-                    "Ten-ei",
-                    "Eikyū",
-                    "Gen-ei",
-                    "Hoan",
-                    "Tenji",
-                    "Daiji",
-                    "Tenshō",
-                    "Chōshō",
-                    "Hoen",
-                    "Eiji",
-                    "Kōji",
-                    "Tenyō",
-                    "Kyūan",
-                    "Ninpei",
-                    "Kyūju",
-                    "Hogen",
-                    "Heiji",
-                    "Eiryaku",
-                    "Ōho",
-                    "Chōkan",
-                    "Eiman",
-                    "Nin-an",
-                    "Kaō",
-                    "Shōan",
-                    "Angen",
-                    "Jishō",
-                    "Yōwa",
-                    "Juei",
-                    "Genryuku",
-                    "Bunji",
-                    "Kenkyū",
-                    "Shōji",
-                    "Kennin",
-                    "Genkyū",
-                    "Ken-ei",
-                    "Shōgen",
-                    "Kenryaku",
-                    "Kenpō",
-                    "Shōkyū",
-                    "Jōō",
-                    "Gennin",
-                    "Karoku",
-                    "Antei",
-                    "Kanki",
-                    "Jōei",
-                    "Tempuku",
-                    "Bunryaku",
-                    "Katei",
-                    "Ryakunin",
-                    "En-ō",
-                    "Ninji",
-                    "Kangen",
-                    "Hōji",
-                    "Kenchō",
-                    "Kōgen",
-                    "Shōka",
-                    "Shōgen",
-                    "Bun-ō",
-                    "Kōchō",
-                    "Bun-ei",
-                    "Kenji",
-                    "Kōan",
-                    "Shōō",
-                    "Einin",
-                    "Shōan",
-                    "Kengen",
-                    "Kagen",
-                    "Tokuji",
-                    "Enkei",
-                    "Ōchō",
-                    "Shōwa",
-                    "Bunpō",
-                    "Genō",
-                    "Genkyō",
-                    "Shōchū",
-                    "Kareki",
-                    "Gentoku",
-                    "Genkō",
-                    "Kemmu",
-                    "Engen",
-                    "Kōkoku",
-                    "Shōhei",
-                    "Kentoku",
-                    "Bunchũ",
-                    "Tenju",
-                    "Kōryaku",
-                    "Kōwa",
-                    "Genchũ",
-                    "Meitoku",
-                    "Kakei",
-                    "Kōō",
-                    "Meitoku",
-                    "Ōei",
-                    "Shōchō",
-                    "Eikyō",
-                    "Kakitsu",
-                    "Bun-an",
-                    "Hōtoku",
-                    "Kyōtoku",
-                    "Kōshō",
-                    "Chōroku",
-                    "Kanshō",
-                    "Bunshō",
-                    "Ōnin",
-                    "Bunmei",
-                    "Chōkyō",
-                    "Entoku",
-                    "Meiō",
-                    "Bunki",
-                    "Eishō",
-                    "Taiei",
-                    "Kyōroku",
-                    "Tenmon",
-                    "Kōji",
-                    "Eiroku",
-                    "Genki",
-                    "Tenshō",
-                    "Bunroku",
-                    "Keichō",
-                    "Genwa",
-                    "Kan-ei",
-                    "Shōho",
-                    "Keian",
-                    "Shōō",
-                    "Meiryaku",
-                    "Manji",
-                    "Kanbun",
-                    "Enpō",
-                    "Tenwa",
-                    "Jōkyō",
-                    "Genroku",
-                    "Hōei",
-                    "Shōtoku",
-                    "Kyōhō",
-                    "Genbun",
-                    "Kanpō",
-                    "Enkyō",
-                    "Kan-en",
-                    "Hōryaku",
-                    "Meiwa",
-                    "An-ei",
-                    "Tenmei",
-                    "Kansei",
-                    "Kyōwa",
-                    "Bunka",
-                    "Bunsei",
-                    "Tenpō",
-                    "Kōka",
-                    "Kaei",
-                    "Ansei",
-                    "Man-en",
-                    "Bunkyū",
-                    "Genji",
-                    "Keiō",
+                    "Kōwa (1099-1104)",
+                    "Chōji (1104-1106)",
+                    "Kashō (1106-1108)",
+                    "Tennin (1108-1110)",
+                    "Ten-ei (1110-1113)",
+                    "Eikyū (1113-1118)",
+                    "Gen-ei (1118-1120)",
+                    "Hoan (1120-1124)",
+                    "Tenji (1124-1126)",
+                    "Daiji (1126-1131)",
+                    "Tenshō (1131-1132)",
+                    "Chōshō (1132-1135)",
+                    "Hoen (1135-1141)",
+                    "Eiji (1141-1142)",
+                    "Kōji (1142-1144)",
+                    "Tenyō (1144-1145)",
+                    "Kyūan (1145-1151)",
+                    "Ninpei (1151-1154)",
+                    "Kyūju (1154-1156)",
+                    "Hogen (1156-1159)",
+                    "Heiji (1159-1160)",
+                    "Eiryaku (1160-1161)",
+                    "Ōho (1161-1163)",
+                    "Chōkan (1163-1165)",
+                    "Eiman (1165-1166)",
+                    "Nin-an (1166-1169)",
+                    "Kaō (1169-1171)",
+                    "Shōan (1171-1175)",
+                    "Angen (1175-1177)",
+                    "Jishō (1177-1181)",
+                    "Yōwa (1181-1182)",
+                    "Juei (1182-1184)",
+                    "Genryuku (1184-1185)",
+                    "Bunji (1185-1190)",
+                    "Kenkyū (1190-1199)",
+                    "Shōji (1199-1201)",
+                    "Kennin (1201-1204)",
+                    "Genkyū (1204-1206)",
+                    "Ken-ei (1206-1207)",
+                    "Shōgen (1207-1211)",
+                    "Kenryaku (1211-1213)",
+                    "Kenpō (1213-1219)",
+                    "Shōkyū (1219-1222)",
+                    "Jōō (1222-1224)",
+                    "Gennin (1224-1225)",
+                    "Karoku (1225-1227)",
+                    "Antei (1227-1229)",
+                    "Kanki (1229-1232)",
+                    "Jōei (1232-1233)",
+                    "Tempuku (1233-1234)",
+                    "Bunryaku (1234-1235)",
+                    "Katei (1235-1238)",
+                    "Ryakunin (1238-1239)",
+                    "En-ō (1239-1240)",
+                    "Ninji (1240-1243)",
+                    "Kangen (1243-1247)",
+                    "Hōji (1247-1249)",
+                    "Kenchō (1249-1256)",
+                    "Kōgen (1256-1257)",
+                    "Shōka (1257-1259)",
+                    "Shōgen (1259-1260)",
+                    "Bun-ō (1260-1261)",
+                    "Kōchō (1261-1264)",
+                    "Bun-ei (1264-1275)",
+                    "Kenji (1275-1278)",
+                    "Kōan (1278-1288)",
+                    "Shōō (1288-1293)",
+                    "Einin (1293-1299)",
+                    "Shōan (1299-1302)",
+                    "Kengen (1302-1303)",
+                    "Kagen (1303-1306)",
+                    "Tokuji (1306-1308)",
+                    "Enkei (1308-1311)",
+                    "Ōchō (1311-1312)",
+                    "Shōwa (1312-1317)",
+                    "Bunpō (1317-1319)",
+                    "Genō (1319-1321)",
+                    "Genkyō (1321-1324)",
+                    "Shōchū (1324-1326)",
+                    "Kareki (1326-1329)",
+                    "Gentoku (1329-1331)",
+                    "Genkō (1331-1334)",
+                    "Kemmu (1334-1336)",
+                    "Engen (1336-1340)",
+                    "Kōkoku (1340-1346)",
+                    "Shōhei (1346-1370)",
+                    "Kentoku (1370-1372)",
+                    "Bunchũ (1372-1375)",
+                    "Tenju (1375-1379)",
+                    "Kōryaku (1379-1381)",
+                    "Kōwa (1381-1384)",
+                    "Genchũ (1384-1392)",
+                    "Meitoku (1384-1387)",
+                    "Kakei (1387-1389)",
+                    "Kōō (1389-1390)",
+                    "Meitoku (1390-1394)",
+                    "Ōei (1394-1428)",
+                    "Shōchō (1428-1429)",
+                    "Eikyō (1429-1441)",
+                    "Kakitsu (1441-1444)",
+                    "Bun-an (1444-1449)",
+                    "Hōtoku (1449-1452)",
+                    "Kyōtoku (1452-1455)",
+                    "Kōshō (1455-1457)",
+                    "Chōroku (1457-1460)",
+                    "Kanshō (1460-1466)",
+                    "Bunshō (1466-1467)",
+                    "Ōnin (1467-1469)",
+                    "Bunmei (1469-1487)",
+                    "Chōkyō (1487-1489)",
+                    "Entoku (1489-1492)",
+                    "Meiō (1492-1501)",
+                    "Bunki (1501-1504)",
+                    "Eishō (1504-1521)",
+                    "Taiei (1521-1528)",
+                    "Kyōroku (1528-1532)",
+                    "Tenmon (1532-1555)",
+                    "Kōji (1555-1558)",
+                    "Eiroku (1558-1570)",
+                    "Genki (1570-1573)",
+                    "Tenshō (1573-1592)",
+                    "Bunroku (1592-1596)",
+                    "Keichō (1596-1615)",
+                    "Genwa (1615-1624)",
+                    "Kan-ei (1624-1644)",
+                    "Shōho (1644-1648)",
+                    "Keian (1648-1652)",
+                    "Shōō (1652-1655)",
+                    "Meiryaku (1655-1658)",
+                    "Manji (1658-1661)",
+                    "Kanbun (1661-1673)",
+                    "Enpō (1673-1681)",
+                    "Tenwa (1681-1684)",
+                    "Jōkyō (1684-1688)",
+                    "Genroku (1688-1704)",
+                    "Hōei (1704-1711)",
+                    "Shōtoku (1711-1716)",
+                    "Kyōhō (1716-1736)",
+                    "Genbun (1736-1741)",
+                    "Kanpō (1741-1744)",
+                    "Enkyō (1744-1748)",
+                    "Kan-en (1748-1751)",
+                    "Hōryaku (1751-1764)",
+                    "Meiwa (1764-1772)",
+                    "An-ei (1772-1781)",
+                    "Tenmei (1781-1789)",
+                    "Kansei (1789-1801)",
+                    "Kyōwa (1801-1804)",
+                    "Bunka (1804-1818)",
+                    "Bunsei (1818-1830)",
+                    "Tenpō (1830-1844)",
+                    "Kōka (1844-1848)",
+                    "Kaei (1848-1854)",
+                    "Ansei (1854-1860)",
+                    "Man-en (1860-1861)",
+                    "Bunkyū (1861-1864)",
+                    "Genji (1864-1865)",
+                    "Keiō (1865-1868)",
                     "Meiji",
                     "Taishō",
                     "Shōwa",
index c8ebd789070fdd03ebf5919fe83b943eb3cbe9e6..8bd5e898c10dec860e991f1d3ed74f023ba02dea 100644 (file)
@@ -31,7 +31,7 @@ hr{
             }
         }
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.55"}
     calendar{
         buddhist{
             DateTimePatterns{
@@ -56,10 +56,10 @@ hr{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEE, d.Ml.y. G",
-                "d.Ml.y. G",
-                "d.Ml.y. G",
-                "d.Ml.y. G",
+                "EEE, d.M.y.",
+                "d.M.y.",
+                "d.M.y.",
+                "d.M.y.",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
index b474f42ec5b35ce2ac856c610cf6af1e8b00a938..00f2272de61c9755592a052be0e19fe6265d03af 100644 (file)
@@ -127,8 +127,8 @@ ko{
                 "a h:mm:ss",
                 "a h:mm",
                 "y-M-d EEEE",
-                "y MMMM d",
-                "y MMM d",
+                "y-M-d",
+                "y-M-d",
                 "y-M-d",
                 "{1} {0}",
                 "{1} {0}",
index ef9863fcb3f1b283ca9649aeadee8eceb2141f36..1e4aa6aff662e3e88567dd2db23b9ed267c68196 100755 (executable)
@@ -35,7 +35,7 @@ ln{
             }
         }
     }
-    Version{"2.0.57.98"}
+    Version{"2.0.62.5"}
     calendar{
         gregorian{
             AmPmMarkers{
similarity index 70%
rename from icu4c/source/data/brkitr/th.txt
rename to icu4c/source/data/locales/nl_CW.txt
index 16ed511e427efff664c74f21e1423e1f6d74f162..5890400350a72c35b187a5f085eea009a7035b00 100644 (file)
@@ -3,12 +3,9 @@
 // * Copyright (C) 2011 International Business Machines
 // * Corporation and others.  All Rights Reserved.
 // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/xml/brkitr/th.xml
+// * Source File:<path>/common/main/nl_CW.xml
 // *
 // ***************************************************************************
-th{
-    Version{"1.1"}
-    boundaries{
-        grapheme:process(dependency){"char_th.brk"}
-    }
+nl_CW{
+    Version{"2.0.61.59"}
 }
similarity index 70%
rename from icu4c/source/data/brkitr/he.txt
rename to icu4c/source/data/locales/nl_SX.txt
index 78771ae010d12961f3929ff52fcbbef2a1c18f72..273d5fdae92763dafbbed52d735dc2c38dac6e55 100644 (file)
@@ -3,12 +3,9 @@
 // * Copyright (C) 2011 International Business Machines
 // * Corporation and others.  All Rights Reserved.
 // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File:<path>/xml/brkitr/he.xml
+// * Source File:<path>/common/main/nl_SX.xml
 // *
 // ***************************************************************************
-he{
-    Version{"2.2.88.46"}
-    boundaries{
-        line:process(dependency){"line_he.brk"}
-    }
+nl_SX{
+    Version{"2.0.61.59"}
 }
index 4a76807665159e0440d62bda28f2d347e49ec436..35898454bb61d1fd1b19d4c26a7bd40f4868564b 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-GENRB_CLDR_VERSION = 2.0
+GENRB_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
@@ -44,101 +44,101 @@ GENRB_ALIAS_SOURCE = $(GENRB_SYNTHETIC_ALIAS)
 # Ordinary resources
 GENRB_SOURCE = af.txt af_NA.txt af_ZA.txt agq.txt\
  agq_CM.txt ak.txt ak_GH.txt am.txt am_ET.txt\
- ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\
- ar_IQ.txt ar_JO.txt ar_KW.txt ar_LB.txt ar_LY.txt\
- ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt ar_SD.txt\
- ar_SY.txt ar_TN.txt ar_YE.txt as.txt as_IN.txt\
- asa.txt asa_TZ.txt az.txt az_Cyrl.txt az_Cyrl_AZ.txt\
- az_Latn.txt az_Latn_AZ.txt bas.txt bas_CM.txt be.txt\
- be_BY.txt bem.txt bem_ZM.txt bez.txt bez_TZ.txt\
- bg.txt bg_BG.txt bm.txt bm_ML.txt bn.txt\
- bn_BD.txt bn_IN.txt bo.txt bo_CN.txt bo_IN.txt\
- br.txt br_FR.txt brx.txt brx_IN.txt bs.txt\
- bs_BA.txt ca.txt ca_ES.txt cgg.txt cgg_UG.txt\
- chr.txt chr_US.txt cs.txt cs_CZ.txt cy.txt\
- cy_GB.txt da.txt da_DK.txt dav.txt dav_KE.txt\
- de.txt de_AT.txt de_BE.txt de_CH.txt de_DE.txt\
- de_LI.txt de_LU.txt dje.txt dje_NE.txt dua.txt\
- dua_CM.txt dyo.txt dyo_SN.txt ebu.txt ebu_KE.txt\
- ee.txt ee_GH.txt ee_TG.txt el.txt el_CY.txt\
- el_GR.txt en.txt en_AS.txt en_AU.txt en_BB.txt\
- en_BE.txt en_BM.txt en_BW.txt en_BZ.txt en_CA.txt\
- en_GB.txt en_GU.txt en_GY.txt en_HK.txt en_IE.txt\
- en_IN.txt en_JM.txt en_MH.txt en_MP.txt en_MT.txt\
- en_MU.txt en_NA.txt en_NZ.txt en_PH.txt en_PK.txt\
- en_SG.txt en_TT.txt en_UM.txt en_US.txt en_US_POSIX.txt\
- en_VI.txt en_ZA.txt en_ZW.txt eo.txt es.txt\
- es_419.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\
- es_CR.txt es_DO.txt es_EC.txt es_ES.txt es_GQ.txt\
- es_GT.txt es_HN.txt es_MX.txt es_NI.txt es_PA.txt\
- es_PE.txt es_PR.txt es_PY.txt es_SV.txt es_US.txt\
- es_UY.txt es_VE.txt et.txt et_EE.txt eu.txt\
- eu_ES.txt ewo.txt ewo_CM.txt fa.txt fa_AF.txt\
- fa_IR.txt ff.txt ff_SN.txt fi.txt fi_FI.txt\
- fil.txt fil_PH.txt fo.txt fo_FO.txt fr.txt\
- fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt fr_BL.txt\
- fr_CA.txt fr_CD.txt fr_CF.txt fr_CG.txt fr_CH.txt\
- fr_CI.txt fr_CM.txt fr_DJ.txt fr_FR.txt fr_GA.txt\
- fr_GF.txt fr_GN.txt fr_GP.txt fr_GQ.txt fr_KM.txt\
- fr_LU.txt fr_MC.txt fr_MF.txt fr_MG.txt fr_ML.txt\
- fr_MQ.txt fr_NE.txt fr_RE.txt fr_RW.txt fr_SN.txt\
- fr_TD.txt fr_TG.txt fr_YT.txt ga.txt ga_IE.txt\
- gl.txt gl_ES.txt gsw.txt gsw_CH.txt gu.txt\
- gu_IN.txt guz.txt guz_KE.txt gv.txt gv_GB.txt\
ha.txt ha_Latn.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt\
- haw.txt haw_US.txt he.txt he_IL.txt hi.txt\
- hi_IN.txt hr.txt hr_HR.txt hu.txt hu_HU.txt\
- hy.txt hy_AM.txt id.txt id_ID.txt ig.txt\
- ig_NG.txt ii.txt ii_CN.txt is.txt is_IS.txt\
- it.txt it_CH.txt it_IT.txt ja.txt ja_JP.txt\
- jmc.txt jmc_TZ.txt ka.txt ka_GE.txt kab.txt\
- kab_DZ.txt kam.txt kam_KE.txt kde.txt kde_TZ.txt\
- kea.txt kea_CV.txt khq.txt khq_ML.txt ki.txt\
- ki_KE.txt kk.txt kk_Cyrl.txt kk_Cyrl_KZ.txt kl.txt\
- kl_GL.txt kln.txt kln_KE.txt km.txt km_KH.txt\
- kn.txt kn_IN.txt ko.txt ko_KR.txt kok.txt\
- kok_IN.txt ksb.txt ksb_TZ.txt ksf.txt ksf_CM.txt\
- kw.txt kw_GB.txt lag.txt lag_TZ.txt lg.txt\
- lg_UG.txt ln.txt ln_CD.txt ln_CG.txt lt.txt\
- lt_LT.txt lu.txt lu_CD.txt luo.txt luo_KE.txt\
- luy.txt luy_KE.txt lv.txt lv_LV.txt mas.txt\
- mas_KE.txt mas_TZ.txt mer.txt mer_KE.txt mfe.txt\
- mfe_MU.txt mg.txt mg_MG.txt mgh.txt mgh_MZ.txt\
- mk.txt mk_MK.txt ml.txt ml_IN.txt mr.txt\
- mr_IN.txt ms.txt ms_BN.txt ms_MY.txt mt.txt\
- mt_MT.txt mua.txt mua_CM.txt my.txt my_MM.txt\
naq.txt naq_NA.txt nb.txt nb_NO.txt nd.txt\
- nd_ZW.txt ne.txt ne_IN.txt ne_NP.txt nl.txt\
- nl_AW.txt nl_BE.txt nl_NL.txt nmg.txt nmg_CM.txt\
- nn.txt nn_NO.txt nus.txt nus_SD.txt nyn.txt\
- nyn_UG.txt om.txt om_ET.txt om_KE.txt or.txt\
- or_IN.txt pa.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt\
- pa_Guru_IN.txt pl.txt pl_PL.txt ps.txt ps_AF.txt\
- pt.txt pt_AO.txt pt_BR.txt pt_GW.txt pt_MZ.txt\
- pt_PT.txt pt_ST.txt rm.txt rm_CH.txt rn.txt\
- rn_BI.txt ro.txt ro_MD.txt ro_RO.txt rof.txt\
- rof_TZ.txt ru.txt ru_MD.txt ru_RU.txt ru_UA.txt\
- rw.txt rw_RW.txt rwk.txt rwk_TZ.txt saq.txt\
saq_KE.txt sbp.txt sbp_TZ.txt seh.txt seh_MZ.txt\
- ses.txt ses_ML.txt sg.txt sg_CF.txt shi.txt\
- shi_Latn.txt shi_Latn_MA.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt\
- si_LK.txt sk.txt sk_SK.txt sl.txt sl_SI.txt\
- sn.txt sn_ZW.txt so.txt so_DJ.txt so_ET.txt\
- so_KE.txt so_SO.txt sq.txt sq_AL.txt sr.txt\
- sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn.txt\
- sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv.txt sv_FI.txt\
- sv_SE.txt sw.txt sw_KE.txt sw_TZ.txt swc.txt\
- swc_CD.txt ta.txt ta_IN.txt ta_LK.txt te.txt\
- te_IN.txt teo.txt teo_KE.txt teo_UG.txt th.txt\
- th_TH.txt ti.txt ti_ER.txt ti_ET.txt to.txt\
- to_TO.txt tr.txt tr_TR.txt twq.txt twq_NE.txt\
- tzm.txt tzm_Latn.txt tzm_Latn_MA.txt uk.txt uk_UA.txt\
ur.txt ur_IN.txt ur_PK.txt uz.txt uz_Arab.txt\
- uz_Arab_AF.txt uz_Cyrl.txt uz_Cyrl_UZ.txt uz_Latn.txt uz_Latn_UZ.txt\
vai.txt vai_Latn.txt vai_Latn_LR.txt vai_Vaii.txt vai_Vaii_LR.txt\
- vi.txt vi_VN.txt vun.txt vun_TZ.txt xog.txt\
xog_UG.txt yav.txt yav_CM.txt yo.txt yo_NG.txt\
zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_HK.txt zh_Hans_MO.txt\
- zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt\
- zu.txt zu_ZA.txt
+ ar.txt ar_001.txt ar_AE.txt ar_BH.txt ar_DZ.txt\
+ ar_EG.txt ar_IQ.txt ar_JO.txt ar_KW.txt ar_LB.txt\
+ ar_LY.txt ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt\
+ ar_SD.txt ar_SY.txt ar_TN.txt ar_YE.txt as.txt\
+ as_IN.txt asa.txt asa_TZ.txt az.txt az_Cyrl.txt\
+ az_Cyrl_AZ.txt az_Latn.txt az_Latn_AZ.txt bas.txt bas_CM.txt\
+ be.txt be_BY.txt bem.txt bem_ZM.txt bez.txt\
+ bez_TZ.txt bg.txt bg_BG.txt bm.txt bm_ML.txt\
+ bn.txt bn_BD.txt bn_IN.txt bo.txt bo_CN.txt\
+ bo_IN.txt br.txt br_FR.txt brx.txt brx_IN.txt\
+ bs.txt bs_BA.txt ca.txt ca_ES.txt cgg.txt\
+ cgg_UG.txt chr.txt chr_US.txt cs.txt cs_CZ.txt\
+ cy.txt cy_GB.txt da.txt da_DK.txt dav.txt\
+ dav_KE.txt de.txt de_AT.txt de_BE.txt de_CH.txt\
+ de_DE.txt de_LI.txt de_LU.txt dje.txt dje_NE.txt\
+ dua.txt dua_CM.txt dyo.txt dyo_SN.txt ebu.txt\
+ ebu_KE.txt ee.txt ee_GH.txt ee_TG.txt el.txt\
+ el_CY.txt el_GR.txt en.txt en_AS.txt en_AU.txt\
+ en_BB.txt en_BE.txt en_BM.txt en_BW.txt en_BZ.txt\
+ en_CA.txt en_GB.txt en_GU.txt en_GY.txt en_HK.txt\
+ en_IE.txt en_IN.txt en_JM.txt en_MH.txt en_MP.txt\
+ en_MT.txt en_MU.txt en_NA.txt en_NZ.txt en_PH.txt\
+ en_PK.txt en_SG.txt en_TT.txt en_UM.txt en_US.txt\
+ en_US_POSIX.txt en_VI.txt en_ZA.txt en_ZW.txt eo.txt\
+ es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\
+ es_CO.txt es_CR.txt es_DO.txt es_EC.txt es_ES.txt\
+ es_GQ.txt es_GT.txt es_HN.txt es_MX.txt es_NI.txt\
+ es_PA.txt es_PE.txt es_PR.txt es_PY.txt es_SV.txt\
+ es_US.txt es_UY.txt es_VE.txt et.txt et_EE.txt\
+ eu.txt eu_ES.txt ewo.txt ewo_CM.txt fa.txt\
+ fa_AF.txt fa_IR.txt ff.txt ff_SN.txt fi.txt\
+ fi_FI.txt fil.txt fil_PH.txt fo.txt fo_FO.txt\
+ fr.txt fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt\
+ fr_BL.txt fr_CA.txt fr_CD.txt fr_CF.txt fr_CG.txt\
+ fr_CH.txt fr_CI.txt fr_CM.txt fr_DJ.txt fr_FR.txt\
+ fr_GA.txt fr_GF.txt fr_GN.txt fr_GP.txt fr_GQ.txt\
+ fr_KM.txt fr_LU.txt fr_MC.txt fr_MF.txt fr_MG.txt\
+ fr_ML.txt fr_MQ.txt fr_NE.txt fr_RE.txt fr_RW.txt\
+ fr_SN.txt fr_TD.txt fr_TG.txt fr_YT.txt ga.txt\
+ ga_IE.txt gl.txt gl_ES.txt gsw.txt gsw_CH.txt\
+ gu.txt gu_IN.txt guz.txt guz_KE.txt gv.txt\
gv_GB.txt ha.txt ha_Latn.txt ha_Latn_GH.txt ha_Latn_NE.txt\
+ ha_Latn_NG.txt haw.txt haw_US.txt he.txt he_IL.txt\
+ hi.txt hi_IN.txt hr.txt hr_HR.txt hu.txt\
+ hu_HU.txt hy.txt hy_AM.txt id.txt id_ID.txt\
+ ig.txt ig_NG.txt ii.txt ii_CN.txt is.txt\
+ is_IS.txt it.txt it_CH.txt it_IT.txt ja.txt\
+ ja_JP.txt jmc.txt jmc_TZ.txt ka.txt ka_GE.txt\
+ kab.txt kab_DZ.txt kam.txt kam_KE.txt kde.txt\
+ kde_TZ.txt kea.txt kea_CV.txt khq.txt khq_ML.txt\
+ ki.txt ki_KE.txt kk.txt kk_Cyrl.txt kk_Cyrl_KZ.txt\
+ kl.txt kl_GL.txt kln.txt kln_KE.txt km.txt\
+ km_KH.txt kn.txt kn_IN.txt ko.txt ko_KR.txt\
+ kok.txt kok_IN.txt ksb.txt ksb_TZ.txt ksf.txt\
+ ksf_CM.txt kw.txt kw_GB.txt lag.txt lag_TZ.txt\
+ lg.txt lg_UG.txt ln.txt ln_CD.txt ln_CG.txt\
+ lt.txt lt_LT.txt lu.txt lu_CD.txt luo.txt\
+ luo_KE.txt luy.txt luy_KE.txt lv.txt lv_LV.txt\
+ mas.txt mas_KE.txt mas_TZ.txt mer.txt mer_KE.txt\
+ mfe.txt mfe_MU.txt mg.txt mg_MG.txt mgh.txt\
+ mgh_MZ.txt mk.txt mk_MK.txt ml.txt ml_IN.txt\
+ mr.txt mr_IN.txt ms.txt ms_BN.txt ms_MY.txt\
+ mt.txt mt_MT.txt mua.txt mua_CM.txt my.txt\
my_MM.txt naq.txt naq_NA.txt nb.txt nb_NO.txt\
+ nd.txt nd_ZW.txt ne.txt ne_IN.txt ne_NP.txt\
+ nl.txt nl_AW.txt nl_BE.txt nl_CW.txt nl_NL.txt\
+ nl_SX.txt nmg.txt nmg_CM.txt nn.txt nn_NO.txt\
+ nus.txt nus_SD.txt nyn.txt nyn_UG.txt om.txt\
+ om_ET.txt om_KE.txt or.txt or_IN.txt pa.txt\
+ pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt pl.txt\
+ pl_PL.txt ps.txt ps_AF.txt pt.txt pt_AO.txt\
+ pt_BR.txt pt_GW.txt pt_MZ.txt pt_PT.txt pt_ST.txt\
+ rm.txt rm_CH.txt rn.txt rn_BI.txt ro.txt\
+ ro_MD.txt ro_RO.txt rof.txt rof_TZ.txt ru.txt\
+ ru_MD.txt ru_RU.txt ru_UA.txt rw.txt rw_RW.txt\
rwk.txt rwk_TZ.txt saq.txt saq_KE.txt sbp.txt\
+ sbp_TZ.txt seh.txt seh_MZ.txt ses.txt ses_ML.txt\
+ sg.txt sg_CF.txt shi.txt shi_Latn.txt shi_Latn_MA.txt\
+ shi_Tfng.txt shi_Tfng_MA.txt si.txt si_LK.txt sk.txt\
+ sk_SK.txt sl.txt sl_SI.txt sn.txt sn_ZW.txt\
+ so.txt so_DJ.txt so_ET.txt so_KE.txt so_SO.txt\
+ sq.txt sq_AL.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt\
+ sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sv.txt sv_FI.txt sv_SE.txt sw.txt\
+ sw_KE.txt sw_TZ.txt swc.txt swc_CD.txt ta.txt\
+ ta_IN.txt ta_LK.txt te.txt te_IN.txt teo.txt\
+ teo_KE.txt teo_UG.txt th.txt th_TH.txt ti.txt\
+ ti_ER.txt ti_ET.txt to.txt to_TO.txt tr.txt\
+ tr_TR.txt twq.txt twq_NE.txt tzm.txt tzm_Latn.txt\
tzm_Latn_MA.txt uk.txt uk_UA.txt ur.txt ur_IN.txt\
+ ur_PK.txt uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt\
uz_Cyrl_UZ.txt uz_Latn.txt uz_Latn_UZ.txt vai.txt vai_Latn.txt\
+ vai_Latn_LR.txt vai_Vaii.txt vai_Vaii_LR.txt vi.txt vi_VN.txt\
vun.txt vun_TZ.txt xog.txt xog_UG.txt yav.txt\
yav_CM.txt yo.txt yo_NG.txt zh.txt zh_Hans.txt\
+ zh_Hans_CN.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\
+ zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt
 
index 4b1cd4963cc0f3621837aa72478638352b7d7a93..603122edd36ec12092cc196673fb9f339fe23758 100644 (file)
@@ -73,7 +73,7 @@ root{
         297,
         210,
     }
-    Version{"2.0.62.19"}
+    Version{"2.0.62.84"}
     calendar{
         buddhist{
             AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
@@ -151,9 +151,9 @@ root{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEEE, y MMMM d",
-                "y MMMM d",
-                "y MMM d",
+                "EEEE, y-M-d",
+                "y-M-d",
+                "y-M-d",
                 "y-M-d",
                 "{1} {0}",
                 "{1} {0}",
@@ -163,6 +163,99 @@ root{
             }
             appendItems:alias{"/LOCALE/calendar/gregorian/appendItems"}
             availableFormats:alias{"/LOCALE/calendar/gregorian/availableFormats"}
+            cyclicNameSets{
+                dayParts{
+                    format{
+                        abbreviated{
+                            "zi",
+                            "chou",
+                            "yin",
+                            "mao",
+                            "chen",
+                            "si",
+                            "wu",
+                            "wei",
+                            "shen",
+                            "you",
+                            "xu",
+                            "hai",
+                        }
+                        narrow:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts/format/abbreviated"}
+                        wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts/format/abbreviated"}
+                    }
+                }
+                days:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
+                months:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years"}
+                years{
+                    format{
+                        abbreviated{
+                            "jia-zi",
+                            "yi-chou",
+                            "bing-yin",
+                            "ding-mao",
+                            "wu-chen",
+                            "ji-si",
+                            "geng-wu",
+                            "xin-wei",
+                            "ren-shen",
+                            "gui-you",
+                            "jia-xu",
+                            "yi-hai",
+                            "bing-zi",
+                            "ding-chou",
+                            "wu-yin",
+                            "ji-mao",
+                            "geng-chen",
+                            "xin-si",
+                            "ren-wu",
+                            "gui-wei",
+                            "jia-shen",
+                            "yi-you",
+                            "bing-xu",
+                            "ding-hai",
+                            "wu-zi",
+                            "ji-chou",
+                            "geng-yin",
+                            "xin-mao",
+                            "ren-chen",
+                            "gui-si",
+                            "jia-wu",
+                            "yi-wei",
+                            "bing-shen",
+                            "ding-you",
+                            "wu-xu",
+                            "ji-hai",
+                            "geng-zi",
+                            "xin-chou",
+                            "ren-yin",
+                            "gui-mao",
+                            "jia-chen",
+                            "yi-si",
+                            "bing-wu",
+                            "ding-wei",
+                            "wu-shen",
+                            "ji-you",
+                            "geng-xu",
+                            "xin-hai",
+                            "ren-zi",
+                            "gui-chou",
+                            "jia-yin",
+                            "yi-mao",
+                            "bing-chen",
+                            "ding-si",
+                            "wu-wu",
+                            "ji-wei",
+                            "geng-shen",
+                            "xin-you",
+                            "ren-xu",
+                            "gui-hai",
+                        }
+                        narrow:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years/format/abbreviated"}
+                        wide:alias{"/LOCALE/calendar/chinese/cyclicNameSets/years/format/abbreviated"}
+                    }
+                }
+                zodiacs:alias{"/LOCALE/calendar/chinese/cyclicNameSets/dayParts"}
+            }
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"}
             isLeapMonth{
@@ -913,476 +1006,476 @@ root{
             dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"}
             eras{
                 abbreviated{
-                    "Taika",
-                    "Hakuchi",
-                    "Hakuhō",
-                    "Shuchō",
-                    "Taihō",
-                    "Keiun",
-                    "Wadō",
-                    "Reiki",
-                    "Yōrō",
-                    "Jinki",
-                    "Tempyō",
-                    "Tempyō-kampō",
-                    "Tempyō-shōhō",
-                    "Tempyō-hōji",
-                    "Temphō-jingo",
-                    "Jingo-keiun",
-                    "Hōki",
-                    "Ten-ō",
-                    "Enryaku",
-                    "Daidō",
-                    "Kōnin",
-                    "Tenchō",
-                    "Shōwa",
-                    "Kajō",
-                    "Ninju",
-                    "Saiko",
-                    "Tennan",
-                    "Jōgan",
-                    "Genkei",
-                    "Ninna",
-                    "Kampyō",
-                    "Shōtai",
-                    "Engi",
-                    "Enchō",
-                    "Shōhei",
-                    "Tengyō",
-                    "Tenryaku",
-                    "Tentoku",
-                    "Ōwa",
-                    "Kōhō",
-                    "Anna",
-                    "Tenroku",
-                    "Ten-en",
-                    "Jōgen",
-                    "Tengen",
-                    "Eikan",
-                    "Kanna",
-                    "Ei-en",
-                    "Eiso",
-                    "Shōryaku",
-                    "Chōtoku",
-                    "Chōhō",
-                    "Kankō",
-                    "Chōwa",
-                    "Kannin",
-                    "Jian",
-                    "Manju",
-                    "Chōgen",
-                    "Chōryaku",
-                    "Chōkyū",
-                    "Kantoku",
-                    "Eishō",
-                    "Tengi",
-                    "Kōhei",
-                    "Jiryaku",
-                    "Enkyū",
-                    "Shōho",
-                    "Shōryaku",
-                    "Eiho",
-                    "Ōtoku",
-                    "Kanji",
-                    "Kaho",
-                    "Eichō",
-                    "Shōtoku",
-                    "Kōwa",
-                    "Chōji",
-                    "Kashō",
-                    "Tennin",
-                    "Ten-ei",
-                    "Eikyū",
-                    "Gen-ei",
-                    "Hoan",
-                    "Tenji",
-                    "Daiji",
-                    "Tenshō",
-                    "Chōshō",
-                    "Hoen",
-                    "Eiji",
-                    "Kōji",
-                    "Tenyō",
-                    "Kyūan",
-                    "Ninpei",
-                    "Kyūju",
-                    "Hogen",
-                    "Heiji",
-                    "Eiryaku",
-                    "Ōho",
-                    "Chōkan",
-                    "Eiman",
-                    "Nin-an",
-                    "Kaō",
-                    "Shōan",
-                    "Angen",
-                    "Jishō",
-                    "Yōwa",
-                    "Juei",
-                    "Genryuku",
-                    "Bunji",
-                    "Kenkyū",
-                    "Shōji",
-                    "Kennin",
-                    "Genkyū",
-                    "Ken-ei",
-                    "Shōgen",
-                    "Kenryaku",
-                    "Kenpō",
-                    "Shōkyū",
-                    "Jōō",
-                    "Gennin",
-                    "Karoku",
-                    "Antei",
-                    "Kanki",
-                    "Jōei",
-                    "Tempuku",
-                    "Bunryaku",
-                    "Katei",
-                    "Ryakunin",
-                    "En-ō",
-                    "Ninji",
-                    "Kangen",
-                    "Hōji",
-                    "Kenchō",
-                    "Kōgen",
-                    "Shōka",
-                    "Shōgen",
-                    "Bun-ō",
-                    "Kōchō",
-                    "Bun-ei",
-                    "Kenji",
-                    "Kōan",
-                    "Shōō",
-                    "Einin",
-                    "Shōan",
-                    "Kengen",
-                    "Kagen",
-                    "Tokuji",
-                    "Enkei",
-                    "Ōchō",
-                    "Shōwa",
-                    "Bunpō",
-                    "Genō",
-                    "Genkyō",
-                    "Shōchū",
-                    "Kareki",
-                    "Gentoku",
-                    "Genkō",
-                    "Kemmu",
-                    "Engen",
-                    "Kōkoku",
-                    "Shōhei",
-                    "Kentoku",
-                    "Bunchũ",
-                    "Tenju",
-                    "Kōryaku",
-                    "Kōwa",
-                    "Genchũ",
-                    "Meitoku",
-                    "Kakei",
-                    "Kōō",
-                    "Meitoku",
-                    "Ōei",
-                    "Shōchō",
-                    "Eikyō",
-                    "Kakitsu",
-                    "Bun-an",
-                    "Hōtoku",
-                    "Kyōtoku",
-                    "Kōshō",
-                    "Chōroku",
-                    "Kanshō",
-                    "Bunshō",
-                    "Ōnin",
-                    "Bunmei",
-                    "Chōkyō",
-                    "Entoku",
-                    "Meiō",
-                    "Bunki",
-                    "Eishō",
-                    "Taiei",
-                    "Kyōroku",
-                    "Tenmon",
-                    "Kōji",
-                    "Eiroku",
-                    "Genki",
-                    "Tenshō",
-                    "Bunroku",
-                    "Keichō",
-                    "Genwa",
-                    "Kan-ei",
-                    "Shōho",
-                    "Keian",
-                    "Shōō",
-                    "Meiryaku",
-                    "Manji",
-                    "Kanbun",
-                    "Enpō",
-                    "Tenwa",
-                    "Jōkyō",
-                    "Genroku",
-                    "Hōei",
-                    "Shōtoku",
-                    "Kyōhō",
-                    "Genbun",
-                    "Kanpō",
-                    "Enkyō",
-                    "Kan-en",
-                    "Hōryaku",
-                    "Meiwa",
-                    "An-ei",
-                    "Tenmei",
-                    "Kansei",
-                    "Kyōwa",
-                    "Bunka",
-                    "Bunsei",
-                    "Tenpō",
-                    "Kōka",
-                    "Kaei",
-                    "Ansei",
-                    "Man-en",
-                    "Bunkyū",
-                    "Genji",
-                    "Keiō",
+                    "Taika (645-650)",
+                    "Hakuchi (650-671)",
+                    "Hakuhō (672-686)",
+                    "Shuchō (686-701)",
+                    "Taihō (701-704)",
+                    "Keiun (704-708)",
+                    "Wadō (708-715)",
+                    "Reiki (715-717)",
+                    "Yōrō (717-724)",
+                    "Jinki (724-729)",
+                    "Tempyō (729-749)",
+                    "Tempyō-kampō (749-749)",
+                    "Tempyō-shōhō (749-757)",
+                    "Tempyō-hōji (757-765)",
+                    "Temphō-jingo (765-767)",
+                    "Jingo-keiun (767-770)",
+                    "Hōki (770-780)",
+                    "Ten-ō (781-782)",
+                    "Enryaku (782-806)",
+                    "Daidō (806-810)",
+                    "Kōnin (810-824)",
+                    "Tenchō (824-834)",
+                    "Shōwa (834-848)",
+                    "Kajō (848-851)",
+                    "Ninju (851-854)",
+                    "Saiko (854-857)",
+                    "Tennan (857-859)",
+                    "Jōgan (859-877)",
+                    "Genkei (877-885)",
+                    "Ninna (885-889)",
+                    "Kampyō (889-898)",
+                    "Shōtai (898-901)",
+                    "Engi (901-923)",
+                    "Enchō (923-931)",
+                    "Shōhei (931-938)",
+                    "Tengyō (938-947)",
+                    "Tenryaku (947-957)",
+                    "Tentoku (957-961)",
+                    "Ōwa (961-964)",
+                    "Kōhō (964-968)",
+                    "Anna (968-970)",
+                    "Tenroku (970-973)",
+                    "Ten-en (973-976)",
+                    "Jōgen (976-978)",
+                    "Tengen (978-983)",
+                    "Eikan (983-985)",
+                    "Kanna (985-987)",
+                    "Ei-en (987-989)",
+                    "Eiso (989-990)",
+                    "Shōryaku (990-995)",
+                    "Chōtoku (995-999)",
+                    "Chōhō (999-1004)",
+                    "Kankō (1004-1012)",
+                    "Chōwa (1012-1017)",
+                    "Kannin (1017-1021)",
+                    "Jian (1021-1024)",
+                    "Manju (1024-1028)",
+                    "Chōgen (1028-1037)",
+                    "Chōryaku (1037-1040)",
+                    "Chōkyū (1040-1044)",
+                    "Kantoku (1044-1046)",
+                    "Eishō (1046-1053)",
+                    "Tengi (1053-1058)",
+                    "Kōhei (1058-1065)",
+                    "Jiryaku (1065-1069)",
+                    "Enkyū (1069-1074)",
+                    "Shōho (1074-1077)",
+                    "Shōryaku (1077-1081)",
+                    "Eiho (1081-1084)",
+                    "Ōtoku (1084-1087)",
+                    "Kanji (1087-1094)",
+                    "Kaho (1094-1096)",
+                    "Eichō (1096-1097)",
+                    "Shōtoku (1097-1099)",
+                    "Kōwa (1099-1104)",
+                    "Chōji (1104-1106)",
+                    "Kashō (1106-1108)",
+                    "Tennin (1108-1110)",
+                    "Ten-ei (1110-1113)",
+                    "Eikyū (1113-1118)",
+                    "Gen-ei (1118-1120)",
+                    "Hoan (1120-1124)",
+                    "Tenji (1124-1126)",
+                    "Daiji (1126-1131)",
+                    "Tenshō (1131-1132)",
+                    "Chōshō (1132-1135)",
+                    "Hoen (1135-1141)",
+                    "Eiji (1141-1142)",
+                    "Kōji (1142-1144)",
+                    "Tenyō (1144-1145)",
+                    "Kyūan (1145-1151)",
+                    "Ninpei (1151-1154)",
+                    "Kyūju (1154-1156)",
+                    "Hogen (1156-1159)",
+                    "Heiji (1159-1160)",
+                    "Eiryaku (1160-1161)",
+                    "Ōho (1161-1163)",
+                    "Chōkan (1163-1165)",
+                    "Eiman (1165-1166)",
+                    "Nin-an (1166-1169)",
+                    "Kaō (1169-1171)",
+                    "Shōan (1171-1175)",
+                    "Angen (1175-1177)",
+                    "Jishō (1177-1181)",
+                    "Yōwa (1181-1182)",
+                    "Juei (1182-1184)",
+                    "Genryuku (1184-1185)",
+                    "Bunji (1185-1190)",
+                    "Kenkyū (1190-1199)",
+                    "Shōji (1199-1201)",
+                    "Kennin (1201-1204)",
+                    "Genkyū (1204-1206)",
+                    "Ken-ei (1206-1207)",
+                    "Shōgen (1207-1211)",
+                    "Kenryaku (1211-1213)",
+                    "Kenpō (1213-1219)",
+                    "Shōkyū (1219-1222)",
+                    "Jōō (1222-1224)",
+                    "Gennin (1224-1225)",
+                    "Karoku (1225-1227)",
+                    "Antei (1227-1229)",
+                    "Kanki (1229-1232)",
+                    "Jōei (1232-1233)",
+                    "Tempuku (1233-1234)",
+                    "Bunryaku (1234-1235)",
+                    "Katei (1235-1238)",
+                    "Ryakunin (1238-1239)",
+                    "En-ō (1239-1240)",
+                    "Ninji (1240-1243)",
+                    "Kangen (1243-1247)",
+                    "Hōji (1247-1249)",
+                    "Kenchō (1249-1256)",
+                    "Kōgen (1256-1257)",
+                    "Shōka (1257-1259)",
+                    "Shōgen (1259-1260)",
+                    "Bun-ō (1260-1261)",
+                    "Kōchō (1261-1264)",
+                    "Bun-ei (1264-1275)",
+                    "Kenji (1275-1278)",
+                    "Kōan (1278-1288)",
+                    "Shōō (1288-1293)",
+                    "Einin (1293-1299)",
+                    "Shōan (1299-1302)",
+                    "Kengen (1302-1303)",
+                    "Kagen (1303-1306)",
+                    "Tokuji (1306-1308)",
+                    "Enkei (1308-1311)",
+                    "Ōchō (1311-1312)",
+                    "Shōwa (1312-1317)",
+                    "Bunpō (1317-1319)",
+                    "Genō (1319-1321)",
+                    "Genkyō (1321-1324)",
+                    "Shōchū (1324-1326)",
+                    "Kareki (1326-1329)",
+                    "Gentoku (1329-1331)",
+                    "Genkō (1331-1334)",
+                    "Kemmu (1334-1336)",
+                    "Engen (1336-1340)",
+                    "Kōkoku (1340-1346)",
+                    "Shōhei (1346-1370)",
+                    "Kentoku (1370-1372)",
+                    "Bunchũ (1372-1375)",
+                    "Tenju (1375-1379)",
+                    "Kōryaku (1379-1381)",
+                    "Kōwa (1381-1384)",
+                    "Genchũ (1384-1392)",
+                    "Meitoku (1384-1387)",
+                    "Kakei (1387-1389)",
+                    "Kōō (1389-1390)",
+                    "Meitoku (1390-1394)",
+                    "Ōei (1394-1428)",
+                    "Shōchō (1428-1429)",
+                    "Eikyō (1429-1441)",
+                    "Kakitsu (1441-1444)",
+                    "Bun-an (1444-1449)",
+                    "Hōtoku (1449-1452)",
+                    "Kyōtoku (1452-1455)",
+                    "Kōshō (1455-1457)",
+                    "Chōroku (1457-1460)",
+                    "Kanshō (1460-1466)",
+                    "Bunshō (1466-1467)",
+                    "Ōnin (1467-1469)",
+                    "Bunmei (1469-1487)",
+                    "Chōkyō (1487-1489)",
+                    "Entoku (1489-1492)",
+                    "Meiō (1492-1501)",
+                    "Bunki (1501-1504)",
+                    "Eishō (1504-1521)",
+                    "Taiei (1521-1528)",
+                    "Kyōroku (1528-1532)",
+                    "Tenmon (1532-1555)",
+                    "Kōji (1555-1558)",
+                    "Eiroku (1558-1570)",
+                    "Genki (1570-1573)",
+                    "Tenshō (1573-1592)",
+                    "Bunroku (1592-1596)",
+                    "Keichō (1596-1615)",
+                    "Genwa (1615-1624)",
+                    "Kan-ei (1624-1644)",
+                    "Shōho (1644-1648)",
+                    "Keian (1648-1652)",
+                    "Shōō (1652-1655)",
+                    "Meiryaku (1655-1658)",
+                    "Manji (1658-1661)",
+                    "Kanbun (1661-1673)",
+                    "Enpō (1673-1681)",
+                    "Tenwa (1681-1684)",
+                    "Jōkyō (1684-1688)",
+                    "Genroku (1688-1704)",
+                    "Hōei (1704-1711)",
+                    "Shōtoku (1711-1716)",
+                    "Kyōhō (1716-1736)",
+                    "Genbun (1736-1741)",
+                    "Kanpō (1741-1744)",
+                    "Enkyō (1744-1748)",
+                    "Kan-en (1748-1751)",
+                    "Hōryaku (1751-1764)",
+                    "Meiwa (1764-1772)",
+                    "An-ei (1772-1781)",
+                    "Tenmei (1781-1789)",
+                    "Kansei (1789-1801)",
+                    "Kyōwa (1801-1804)",
+                    "Bunka (1804-1818)",
+                    "Bunsei (1818-1830)",
+                    "Tenpō (1830-1844)",
+                    "Kōka (1844-1848)",
+                    "Kaei (1848-1854)",
+                    "Ansei (1854-1860)",
+                    "Man-en (1860-1861)",
+                    "Bunkyū (1861-1864)",
+                    "Genji (1864-1865)",
+                    "Keiō (1865-1868)",
                     "Meiji",
                     "Taishō",
                     "Shōwa",
                     "Heisei",
                 }
                 narrow{
-                    "Taika" /** (abbr.)  */,
-                    "Hakuchi" /** (abbr.)  */,
-                    "Hakuhō" /** (abbr.)  */,
-                    "Shuchō" /** (abbr.)  */,
-                    "Taihō" /** (abbr.)  */,
-                    "Keiun" /** (abbr.)  */,
-                    "Wadō" /** (abbr.)  */,
-                    "Reiki" /** (abbr.)  */,
-                    "Yōrō" /** (abbr.)  */,
-                    "Jinki" /** (abbr.)  */,
-                    "Tempyō" /** (abbr.)  */,
-                    "Tempyō-kampō" /** (abbr.)  */,
-                    "Tempyō-shōhō" /** (abbr.)  */,
-                    "Tempyō-hōji" /** (abbr.)  */,
-                    "Temphō-jingo" /** (abbr.)  */,
-                    "Jingo-keiun" /** (abbr.)  */,
-                    "Hōki" /** (abbr.)  */,
-                    "Ten-ō" /** (abbr.)  */,
-                    "Enryaku" /** (abbr.)  */,
-                    "Daidō" /** (abbr.)  */,
-                    "Kōnin" /** (abbr.)  */,
-                    "Tenchō" /** (abbr.)  */,
-                    "Shōwa" /** (abbr.)  */,
-                    "Kajō" /** (abbr.)  */,
-                    "Ninju" /** (abbr.)  */,
-                    "Saiko" /** (abbr.)  */,
-                    "Tennan" /** (abbr.)  */,
-                    "Jōgan" /** (abbr.)  */,
-                    "Genkei" /** (abbr.)  */,
-                    "Ninna" /** (abbr.)  */,
-                    "Kampyō" /** (abbr.)  */,
-                    "Shōtai" /** (abbr.)  */,
-                    "Engi" /** (abbr.)  */,
-                    "Enchō" /** (abbr.)  */,
-                    "Shōhei" /** (abbr.)  */,
-                    "Tengyō" /** (abbr.)  */,
-                    "Tenryaku" /** (abbr.)  */,
-                    "Tentoku" /** (abbr.)  */,
-                    "Ōwa" /** (abbr.)  */,
-                    "Kōhō" /** (abbr.)  */,
-                    "Anna" /** (abbr.)  */,
-                    "Tenroku" /** (abbr.)  */,
-                    "Ten-en" /** (abbr.)  */,
-                    "Jōgen" /** (abbr.)  */,
-                    "Tengen" /** (abbr.)  */,
-                    "Eikan" /** (abbr.)  */,
-                    "Kanna" /** (abbr.)  */,
-                    "Ei-en" /** (abbr.)  */,
-                    "Eiso" /** (abbr.)  */,
-                    "Shōryaku" /** (abbr.)  */,
-                    "Chōtoku" /** (abbr.)  */,
-                    "Chōhō" /** (abbr.)  */,
-                    "Kankō" /** (abbr.)  */,
-                    "Chōwa" /** (abbr.)  */,
-                    "Kannin" /** (abbr.)  */,
-                    "Jian" /** (abbr.)  */,
-                    "Manju" /** (abbr.)  */,
-                    "Chōgen" /** (abbr.)  */,
-                    "Chōryaku" /** (abbr.)  */,
-                    "Chōkyū" /** (abbr.)  */,
-                    "Kantoku" /** (abbr.)  */,
-                    "Eishō" /** (abbr.)  */,
-                    "Tengi" /** (abbr.)  */,
-                    "Kōhei" /** (abbr.)  */,
-                    "Jiryaku" /** (abbr.)  */,
-                    "Enkyū" /** (abbr.)  */,
-                    "Shōho" /** (abbr.)  */,
-                    "Shōryaku" /** (abbr.)  */,
-                    "Eiho" /** (abbr.)  */,
-                    "Ōtoku" /** (abbr.)  */,
-                    "Kanji" /** (abbr.)  */,
-                    "Kaho" /** (abbr.)  */,
-                    "Eichō" /** (abbr.)  */,
-                    "Shōtoku" /** (abbr.)  */,
-                    "Kōwa" /** (abbr.)  */,
-                    "Chōji" /** (abbr.)  */,
-                    "Kashō" /** (abbr.)  */,
-                    "Tennin" /** (abbr.)  */,
-                    "Ten-ei" /** (abbr.)  */,
-                    "Eikyū" /** (abbr.)  */,
-                    "Gen-ei" /** (abbr.)  */,
-                    "Hoan" /** (abbr.)  */,
-                    "Tenji" /** (abbr.)  */,
-                    "Daiji" /** (abbr.)  */,
-                    "Tenshō" /** (abbr.)  */,
-                    "Chōshō" /** (abbr.)  */,
-                    "Hoen" /** (abbr.)  */,
-                    "Eiji" /** (abbr.)  */,
-                    "Kōji" /** (abbr.)  */,
-                    "Tenyō" /** (abbr.)  */,
-                    "Kyūan" /** (abbr.)  */,
-                    "Ninpei" /** (abbr.)  */,
-                    "Kyūju" /** (abbr.)  */,
-                    "Hogen" /** (abbr.)  */,
-                    "Heiji" /** (abbr.)  */,
-                    "Eiryaku" /** (abbr.)  */,
-                    "Ōho" /** (abbr.)  */,
-                    "Chōkan" /** (abbr.)  */,
-                    "Eiman" /** (abbr.)  */,
-                    "Nin-an" /** (abbr.)  */,
-                    "Kaō" /** (abbr.)  */,
-                    "Shōan" /** (abbr.)  */,
-                    "Angen" /** (abbr.)  */,
-                    "Jishō" /** (abbr.)  */,
-                    "Yōwa" /** (abbr.)  */,
-                    "Juei" /** (abbr.)  */,
-                    "Genryuku" /** (abbr.)  */,
-                    "Bunji" /** (abbr.)  */,
-                    "Kenkyū" /** (abbr.)  */,
-                    "Shōji" /** (abbr.)  */,
-                    "Kennin" /** (abbr.)  */,
-                    "Genkyū" /** (abbr.)  */,
-                    "Ken-ei" /** (abbr.)  */,
-                    "Shōgen" /** (abbr.)  */,
-                    "Kenryaku" /** (abbr.)  */,
-                    "Kenpō" /** (abbr.)  */,
-                    "Shōkyū" /** (abbr.)  */,
-                    "Jōō" /** (abbr.)  */,
-                    "Gennin" /** (abbr.)  */,
-                    "Karoku" /** (abbr.)  */,
-                    "Antei" /** (abbr.)  */,
-                    "Kanki" /** (abbr.)  */,
-                    "Jōei" /** (abbr.)  */,
-                    "Tempuku" /** (abbr.)  */,
-                    "Bunryaku" /** (abbr.)  */,
-                    "Katei" /** (abbr.)  */,
-                    "Ryakunin" /** (abbr.)  */,
-                    "En-ō" /** (abbr.)  */,
-                    "Ninji" /** (abbr.)  */,
-                    "Kangen" /** (abbr.)  */,
-                    "Hōji" /** (abbr.)  */,
-                    "Kenchō" /** (abbr.)  */,
-                    "Kōgen" /** (abbr.)  */,
-                    "Shōka" /** (abbr.)  */,
-                    "Shōgen" /** (abbr.)  */,
-                    "Bun-ō" /** (abbr.)  */,
-                    "Kōchō" /** (abbr.)  */,
-                    "Bun-ei" /** (abbr.)  */,
-                    "Kenji" /** (abbr.)  */,
-                    "Kōan" /** (abbr.)  */,
-                    "Shōō" /** (abbr.)  */,
-                    "Einin" /** (abbr.)  */,
-                    "Shōan" /** (abbr.)  */,
-                    "Kengen" /** (abbr.)  */,
-                    "Kagen" /** (abbr.)  */,
-                    "Tokuji" /** (abbr.)  */,
-                    "Enkei" /** (abbr.)  */,
-                    "Ōchō" /** (abbr.)  */,
-                    "Shōwa" /** (abbr.)  */,
-                    "Bunpō" /** (abbr.)  */,
-                    "Genō" /** (abbr.)  */,
-                    "Genkyō" /** (abbr.)  */,
-                    "Shōchū" /** (abbr.)  */,
-                    "Kareki" /** (abbr.)  */,
-                    "Gentoku" /** (abbr.)  */,
-                    "Genkō" /** (abbr.)  */,
-                    "Kemmu" /** (abbr.)  */,
-                    "Engen" /** (abbr.)  */,
-                    "Kōkoku" /** (abbr.)  */,
-                    "Shōhei" /** (abbr.)  */,
-                    "Kentoku" /** (abbr.)  */,
-                    "Bunchũ" /** (abbr.)  */,
-                    "Tenju" /** (abbr.)  */,
-                    "Kōryaku" /** (abbr.)  */,
-                    "Kōwa" /** (abbr.)  */,
-                    "Genchũ" /** (abbr.)  */,
-                    "Meitoku" /** (abbr.)  */,
-                    "Kakei" /** (abbr.)  */,
-                    "Kōō" /** (abbr.)  */,
-                    "Meitoku" /** (abbr.)  */,
-                    "Ōei" /** (abbr.)  */,
-                    "Shōchō" /** (abbr.)  */,
-                    "Eikyō" /** (abbr.)  */,
-                    "Kakitsu" /** (abbr.)  */,
-                    "Bun-an" /** (abbr.)  */,
-                    "Hōtoku" /** (abbr.)  */,
-                    "Kyōtoku" /** (abbr.)  */,
-                    "Kōshō" /** (abbr.)  */,
-                    "Chōroku" /** (abbr.)  */,
-                    "Kanshō" /** (abbr.)  */,
-                    "Bunshō" /** (abbr.)  */,
-                    "Ōnin" /** (abbr.)  */,
-                    "Bunmei" /** (abbr.)  */,
-                    "Chōkyō" /** (abbr.)  */,
-                    "Entoku" /** (abbr.)  */,
-                    "Meiō" /** (abbr.)  */,
-                    "Bunki" /** (abbr.)  */,
-                    "Eishō" /** (abbr.)  */,
-                    "Taiei" /** (abbr.)  */,
-                    "Kyōroku" /** (abbr.)  */,
-                    "Tenmon" /** (abbr.)  */,
-                    "Kōji" /** (abbr.)  */,
-                    "Eiroku" /** (abbr.)  */,
-                    "Genki" /** (abbr.)  */,
-                    "Tenshō" /** (abbr.)  */,
-                    "Bunroku" /** (abbr.)  */,
-                    "Keichō" /** (abbr.)  */,
-                    "Genwa" /** (abbr.)  */,
-                    "Kan-ei" /** (abbr.)  */,
-                    "Shōho" /** (abbr.)  */,
-                    "Keian" /** (abbr.)  */,
-                    "Shōō" /** (abbr.)  */,
-                    "Meiryaku" /** (abbr.)  */,
-                    "Manji" /** (abbr.)  */,
-                    "Kanbun" /** (abbr.)  */,
-                    "Enpō" /** (abbr.)  */,
-                    "Tenwa" /** (abbr.)  */,
-                    "Jōkyō" /** (abbr.)  */,
-                    "Genroku" /** (abbr.)  */,
-                    "Hōei" /** (abbr.)  */,
-                    "Shōtoku" /** (abbr.)  */,
-                    "Kyōhō" /** (abbr.)  */,
-                    "Genbun" /** (abbr.)  */,
-                    "Kanpō" /** (abbr.)  */,
-                    "Enkyō" /** (abbr.)  */,
-                    "Kan-en" /** (abbr.)  */,
-                    "Hōryaku" /** (abbr.)  */,
-                    "Meiwa" /** (abbr.)  */,
-                    "An-ei" /** (abbr.)  */,
-                    "Tenmei" /** (abbr.)  */,
-                    "Kansei" /** (abbr.)  */,
-                    "Kyōwa" /** (abbr.)  */,
-                    "Bunka" /** (abbr.)  */,
-                    "Bunsei" /** (abbr.)  */,
-                    "Tenpō" /** (abbr.)  */,
-                    "Kōka" /** (abbr.)  */,
-                    "Kaei" /** (abbr.)  */,
-                    "Ansei" /** (abbr.)  */,
-                    "Man-en" /** (abbr.)  */,
-                    "Bunkyū" /** (abbr.)  */,
-                    "Genji" /** (abbr.)  */,
-                    "Keiō" /** (abbr.)  */,
+                    "Taika (645-650)" /** (abbr.)  */,
+                    "Hakuchi (650-671)" /** (abbr.)  */,
+                    "Hakuhō (672-686)" /** (abbr.)  */,
+                    "Shuchō (686-701)" /** (abbr.)  */,
+                    "Taihō (701-704)" /** (abbr.)  */,
+                    "Keiun (704-708)" /** (abbr.)  */,
+                    "Wadō (708-715)" /** (abbr.)  */,
+                    "Reiki (715-717)" /** (abbr.)  */,
+                    "Yōrō (717-724)" /** (abbr.)  */,
+                    "Jinki (724-729)" /** (abbr.)  */,
+                    "Tempyō (729-749)" /** (abbr.)  */,
+                    "Tempyō-kampō (749-749)" /** (abbr.)  */,
+                    "Tempyō-shōhō (749-757)" /** (abbr.)  */,
+                    "Tempyō-hōji (757-765)" /** (abbr.)  */,
+                    "Temphō-jingo (765-767)" /** (abbr.)  */,
+                    "Jingo-keiun (767-770)" /** (abbr.)  */,
+                    "Hōki (770-780)" /** (abbr.)  */,
+                    "Ten-ō (781-782)" /** (abbr.)  */,
+                    "Enryaku (782-806)" /** (abbr.)  */,
+                    "Daidō (806-810)" /** (abbr.)  */,
+                    "Kōnin (810-824)" /** (abbr.)  */,
+                    "Tenchō (824-834)" /** (abbr.)  */,
+                    "Shōwa (834-848)" /** (abbr.)  */,
+                    "Kajō (848-851)" /** (abbr.)  */,
+                    "Ninju (851-854)" /** (abbr.)  */,
+                    "Saiko (854-857)" /** (abbr.)  */,
+                    "Tennan (857-859)" /** (abbr.)  */,
+                    "Jōgan (859-877)" /** (abbr.)  */,
+                    "Genkei (877-885)" /** (abbr.)  */,
+                    "Ninna (885-889)" /** (abbr.)  */,
+                    "Kampyō (889-898)" /** (abbr.)  */,
+                    "Shōtai (898-901)" /** (abbr.)  */,
+                    "Engi (901-923)" /** (abbr.)  */,
+                    "Enchō (923-931)" /** (abbr.)  */,
+                    "Shōhei (931-938)" /** (abbr.)  */,
+                    "Tengyō (938-947)" /** (abbr.)  */,
+                    "Tenryaku (947-957)" /** (abbr.)  */,
+                    "Tentoku (957-961)" /** (abbr.)  */,
+                    "Ōwa (961-964)" /** (abbr.)  */,
+                    "Kōhō (964-968)" /** (abbr.)  */,
+                    "Anna (968-970)" /** (abbr.)  */,
+                    "Tenroku (970-973)" /** (abbr.)  */,
+                    "Ten-en (973-976)" /** (abbr.)  */,
+                    "Jōgen (976-978)" /** (abbr.)  */,
+                    "Tengen (978-983)" /** (abbr.)  */,
+                    "Eikan (983-985)" /** (abbr.)  */,
+                    "Kanna (985-987)" /** (abbr.)  */,
+                    "Ei-en (987-989)" /** (abbr.)  */,
+                    "Eiso (989-990)" /** (abbr.)  */,
+                    "Shōryaku (990-995)" /** (abbr.)  */,
+                    "Chōtoku (995-999)" /** (abbr.)  */,
+                    "Chōhō (999-1004)" /** (abbr.)  */,
+                    "Kankō (1004-1012)" /** (abbr.)  */,
+                    "Chōwa (1012-1017)" /** (abbr.)  */,
+                    "Kannin (1017-1021)" /** (abbr.)  */,
+                    "Jian (1021-1024)" /** (abbr.)  */,
+                    "Manju (1024-1028)" /** (abbr.)  */,
+                    "Chōgen (1028-1037)" /** (abbr.)  */,
+                    "Chōryaku (1037-1040)" /** (abbr.)  */,
+                    "Chōkyū (1040-1044)" /** (abbr.)  */,
+                    "Kantoku (1044-1046)" /** (abbr.)  */,
+                    "Eishō (1046-1053)" /** (abbr.)  */,
+                    "Tengi (1053-1058)" /** (abbr.)  */,
+                    "Kōhei (1058-1065)" /** (abbr.)  */,
+                    "Jiryaku (1065-1069)" /** (abbr.)  */,
+                    "Enkyū (1069-1074)" /** (abbr.)  */,
+                    "Shōho (1074-1077)" /** (abbr.)  */,
+                    "Shōryaku (1077-1081)" /** (abbr.)  */,
+                    "Eiho (1081-1084)" /** (abbr.)  */,
+                    "Ōtoku (1084-1087)" /** (abbr.)  */,
+                    "Kanji (1087-1094)" /** (abbr.)  */,
+                    "Kaho (1094-1096)" /** (abbr.)  */,
+                    "Eichō (1096-1097)" /** (abbr.)  */,
+                    "Shōtoku (1097-1099)" /** (abbr.)  */,
+                    "Kōwa (1099-1104)" /** (abbr.)  */,
+                    "Chōji (1104-1106)" /** (abbr.)  */,
+                    "Kashō (1106-1108)" /** (abbr.)  */,
+                    "Tennin (1108-1110)" /** (abbr.)  */,
+                    "Ten-ei (1110-1113)" /** (abbr.)  */,
+                    "Eikyū (1113-1118)" /** (abbr.)  */,
+                    "Gen-ei (1118-1120)" /** (abbr.)  */,
+                    "Hoan (1120-1124)" /** (abbr.)  */,
+                    "Tenji (1124-1126)" /** (abbr.)  */,
+                    "Daiji (1126-1131)" /** (abbr.)  */,
+                    "Tenshō (1131-1132)" /** (abbr.)  */,
+                    "Chōshō (1132-1135)" /** (abbr.)  */,
+                    "Hoen (1135-1141)" /** (abbr.)  */,
+                    "Eiji (1141-1142)" /** (abbr.)  */,
+                    "Kōji (1142-1144)" /** (abbr.)  */,
+                    "Tenyō (1144-1145)" /** (abbr.)  */,
+                    "Kyūan (1145-1151)" /** (abbr.)  */,
+                    "Ninpei (1151-1154)" /** (abbr.)  */,
+                    "Kyūju (1154-1156)" /** (abbr.)  */,
+                    "Hogen (1156-1159)" /** (abbr.)  */,
+                    "Heiji (1159-1160)" /** (abbr.)  */,
+                    "Eiryaku (1160-1161)" /** (abbr.)  */,
+                    "Ōho (1161-1163)" /** (abbr.)  */,
+                    "Chōkan (1163-1165)" /** (abbr.)  */,
+                    "Eiman (1165-1166)" /** (abbr.)  */,
+                    "Nin-an (1166-1169)" /** (abbr.)  */,
+                    "Kaō (1169-1171)" /** (abbr.)  */,
+                    "Shōan (1171-1175)" /** (abbr.)  */,
+                    "Angen (1175-1177)" /** (abbr.)  */,
+                    "Jishō (1177-1181)" /** (abbr.)  */,
+                    "Yōwa (1181-1182)" /** (abbr.)  */,
+                    "Juei (1182-1184)" /** (abbr.)  */,
+                    "Genryuku (1184-1185)" /** (abbr.)  */,
+                    "Bunji (1185-1190)" /** (abbr.)  */,
+                    "Kenkyū (1190-1199)" /** (abbr.)  */,
+                    "Shōji (1199-1201)" /** (abbr.)  */,
+                    "Kennin (1201-1204)" /** (abbr.)  */,
+                    "Genkyū (1204-1206)" /** (abbr.)  */,
+                    "Ken-ei (1206-1207)" /** (abbr.)  */,
+                    "Shōgen (1207-1211)" /** (abbr.)  */,
+                    "Kenryaku (1211-1213)" /** (abbr.)  */,
+                    "Kenpō (1213-1219)" /** (abbr.)  */,
+                    "Shōkyū (1219-1222)" /** (abbr.)  */,
+                    "Jōō (1222-1224)" /** (abbr.)  */,
+                    "Gennin (1224-1225)" /** (abbr.)  */,
+                    "Karoku (1225-1227)" /** (abbr.)  */,
+                    "Antei (1227-1229)" /** (abbr.)  */,
+                    "Kanki (1229-1232)" /** (abbr.)  */,
+                    "Jōei (1232-1233)" /** (abbr.)  */,
+                    "Tempuku (1233-1234)" /** (abbr.)  */,
+                    "Bunryaku (1234-1235)" /** (abbr.)  */,
+                    "Katei (1235-1238)" /** (abbr.)  */,
+                    "Ryakunin (1238-1239)" /** (abbr.)  */,
+                    "En-ō (1239-1240)" /** (abbr.)  */,
+                    "Ninji (1240-1243)" /** (abbr.)  */,
+                    "Kangen (1243-1247)" /** (abbr.)  */,
+                    "Hōji (1247-1249)" /** (abbr.)  */,
+                    "Kenchō (1249-1256)" /** (abbr.)  */,
+                    "Kōgen (1256-1257)" /** (abbr.)  */,
+                    "Shōka (1257-1259)" /** (abbr.)  */,
+                    "Shōgen (1259-1260)" /** (abbr.)  */,
+                    "Bun-ō (1260-1261)" /** (abbr.)  */,
+                    "Kōchō (1261-1264)" /** (abbr.)  */,
+                    "Bun-ei (1264-1275)" /** (abbr.)  */,
+                    "Kenji (1275-1278)" /** (abbr.)  */,
+                    "Kōan (1278-1288)" /** (abbr.)  */,
+                    "Shōō (1288-1293)" /** (abbr.)  */,
+                    "Einin (1293-1299)" /** (abbr.)  */,
+                    "Shōan (1299-1302)" /** (abbr.)  */,
+                    "Kengen (1302-1303)" /** (abbr.)  */,
+                    "Kagen (1303-1306)" /** (abbr.)  */,
+                    "Tokuji (1306-1308)" /** (abbr.)  */,
+                    "Enkei (1308-1311)" /** (abbr.)  */,
+                    "Ōchō (1311-1312)" /** (abbr.)  */,
+                    "Shōwa (1312-1317)" /** (abbr.)  */,
+                    "Bunpō (1317-1319)" /** (abbr.)  */,
+                    "Genō (1319-1321)" /** (abbr.)  */,
+                    "Genkyō (1321-1324)" /** (abbr.)  */,
+                    "Shōchū (1324-1326)" /** (abbr.)  */,
+                    "Kareki (1326-1329)" /** (abbr.)  */,
+                    "Gentoku (1329-1331)" /** (abbr.)  */,
+                    "Genkō (1331-1334)" /** (abbr.)  */,
+                    "Kemmu (1334-1336)" /** (abbr.)  */,
+                    "Engen (1336-1340)" /** (abbr.)  */,
+                    "Kōkoku (1340-1346)" /** (abbr.)  */,
+                    "Shōhei (1346-1370)" /** (abbr.)  */,
+                    "Kentoku (1370-1372)" /** (abbr.)  */,
+                    "Bunchũ (1372-1375)" /** (abbr.)  */,
+                    "Tenju (1375-1379)" /** (abbr.)  */,
+                    "Kōryaku (1379-1381)" /** (abbr.)  */,
+                    "Kōwa (1381-1384)" /** (abbr.)  */,
+                    "Genchũ (1384-1392)" /** (abbr.)  */,
+                    "Meitoku (1384-1387)" /** (abbr.)  */,
+                    "Kakei (1387-1389)" /** (abbr.)  */,
+                    "Kōō (1389-1390)" /** (abbr.)  */,
+                    "Meitoku (1390-1394)" /** (abbr.)  */,
+                    "Ōei (1394-1428)" /** (abbr.)  */,
+                    "Shōchō (1428-1429)" /** (abbr.)  */,
+                    "Eikyō (1429-1441)" /** (abbr.)  */,
+                    "Kakitsu (1441-1444)" /** (abbr.)  */,
+                    "Bun-an (1444-1449)" /** (abbr.)  */,
+                    "Hōtoku (1449-1452)" /** (abbr.)  */,
+                    "Kyōtoku (1452-1455)" /** (abbr.)  */,
+                    "Kōshō (1455-1457)" /** (abbr.)  */,
+                    "Chōroku (1457-1460)" /** (abbr.)  */,
+                    "Kanshō (1460-1466)" /** (abbr.)  */,
+                    "Bunshō (1466-1467)" /** (abbr.)  */,
+                    "Ōnin (1467-1469)" /** (abbr.)  */,
+                    "Bunmei (1469-1487)" /** (abbr.)  */,
+                    "Chōkyō (1487-1489)" /** (abbr.)  */,
+                    "Entoku (1489-1492)" /** (abbr.)  */,
+                    "Meiō (1492-1501)" /** (abbr.)  */,
+                    "Bunki (1501-1504)" /** (abbr.)  */,
+                    "Eishō (1504-1521)" /** (abbr.)  */,
+                    "Taiei (1521-1528)" /** (abbr.)  */,
+                    "Kyōroku (1528-1532)" /** (abbr.)  */,
+                    "Tenmon (1532-1555)" /** (abbr.)  */,
+                    "Kōji (1555-1558)" /** (abbr.)  */,
+                    "Eiroku (1558-1570)" /** (abbr.)  */,
+                    "Genki (1570-1573)" /** (abbr.)  */,
+                    "Tenshō (1573-1592)" /** (abbr.)  */,
+                    "Bunroku (1592-1596)" /** (abbr.)  */,
+                    "Keichō (1596-1615)" /** (abbr.)  */,
+                    "Genwa (1615-1624)" /** (abbr.)  */,
+                    "Kan-ei (1624-1644)" /** (abbr.)  */,
+                    "Shōho (1644-1648)" /** (abbr.)  */,
+                    "Keian (1648-1652)" /** (abbr.)  */,
+                    "Shōō (1652-1655)" /** (abbr.)  */,
+                    "Meiryaku (1655-1658)" /** (abbr.)  */,
+                    "Manji (1658-1661)" /** (abbr.)  */,
+                    "Kanbun (1661-1673)" /** (abbr.)  */,
+                    "Enpō (1673-1681)" /** (abbr.)  */,
+                    "Tenwa (1681-1684)" /** (abbr.)  */,
+                    "Jōkyō (1684-1688)" /** (abbr.)  */,
+                    "Genroku (1688-1704)" /** (abbr.)  */,
+                    "Hōei (1704-1711)" /** (abbr.)  */,
+                    "Shōtoku (1711-1716)" /** (abbr.)  */,
+                    "Kyōhō (1716-1736)" /** (abbr.)  */,
+                    "Genbun (1736-1741)" /** (abbr.)  */,
+                    "Kanpō (1741-1744)" /** (abbr.)  */,
+                    "Enkyō (1744-1748)" /** (abbr.)  */,
+                    "Kan-en (1748-1751)" /** (abbr.)  */,
+                    "Hōryaku (1751-1764)" /** (abbr.)  */,
+                    "Meiwa (1764-1772)" /** (abbr.)  */,
+                    "An-ei (1772-1781)" /** (abbr.)  */,
+                    "Tenmei (1781-1789)" /** (abbr.)  */,
+                    "Kansei (1789-1801)" /** (abbr.)  */,
+                    "Kyōwa (1801-1804)" /** (abbr.)  */,
+                    "Bunka (1804-1818)" /** (abbr.)  */,
+                    "Bunsei (1818-1830)" /** (abbr.)  */,
+                    "Tenpō (1830-1844)" /** (abbr.)  */,
+                    "Kōka (1844-1848)" /** (abbr.)  */,
+                    "Kaei (1848-1854)" /** (abbr.)  */,
+                    "Ansei (1854-1860)" /** (abbr.)  */,
+                    "Man-en (1860-1861)" /** (abbr.)  */,
+                    "Bunkyū (1861-1864)" /** (abbr.)  */,
+                    "Genji (1864-1865)" /** (abbr.)  */,
+                    "Keiō (1865-1868)" /** (abbr.)  */,
                     "M",
                     "T",
                     "S",
index c6058832eb16a2c78c879a9c30d25337ddc38ed7..9e5dd4374d0b56530b2f7248ca3cdcd6d6b239e9 100644 (file)
@@ -33,7 +33,7 @@ sq{
             }
         }
     }
-    Version{"2.0.59.32"}
+    Version{"2.0.62.69"}
     calendar{
         gregorian{
             AmPmMarkers{
index c20d74c8f3bd993f6829db0525894a33c46ff266..2d85a7bcc614fcc9bf09dfa75cecdccf39fe4060 100644 (file)
@@ -36,7 +36,7 @@ te{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.68"}
     calendar{
         gregorian{
             AmPmMarkers{
@@ -104,7 +104,7 @@ te{
                         "ఆ",
                         "సో",
                         "మ",
-                        "à°­ు",
+                        "à°¬ు",
                         "గు",
                         "శు",
                         "శ",
index 97e131d72edfec487953a9b5a25c95c7bd2837e6..9fff59f1e134eecfd5764725ed5ec983fa13986c 100644 (file)
@@ -40,7 +40,7 @@ ur{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.70"}
     calendar{
         gregorian{
             AmPmMarkers{
@@ -147,7 +147,7 @@ ur{
                     wide{
                         "جنوری",
                         "فروری",
-                        "مار چ",
+                        "مارچ",
                         "اپريل",
                         "مئ",
                         "جون",
index 46af3480589339691234357a20d16317e86ac7b0..6c5c71ab382907bd8abd4eb9f3c178842f80c1c8 100644 (file)
@@ -87,7 +87,7 @@ zh{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     calendar{
         buddhist{
             DateTimePatterns{
@@ -181,6 +181,110 @@ zh{
                 yMMMd{"y年M月d日"}
                 yMd{"y年M月d日"}
             }
+            cyclicNameSets{
+                dayParts{
+                    format{
+                        abbreviated{
+                            "子",
+                            "丑",
+                            "寅",
+                            "卯",
+                            "辰",
+                            "巳",
+                            "午",
+                            "未",
+                            "申",
+                            "酉",
+                            "戌",
+                            "亥",
+                        }
+                    }
+                }
+                years{
+                    format{
+                        abbreviated{
+                            "甲子",
+                            "乙丑",
+                            "丙寅",
+                            "丁卯",
+                            "戊辰",
+                            "己巳",
+                            "庚午",
+                            "辛未",
+                            "壬申",
+                            "癸酉",
+                            "甲戌",
+                            "乙亥",
+                            "丙子",
+                            "丁丑",
+                            "戊寅",
+                            "己卯",
+                            "庚辰",
+                            "辛巳",
+                            "壬午",
+                            "癸未",
+                            "甲申",
+                            "乙酉",
+                            "丙戌",
+                            "丁亥",
+                            "戊子",
+                            "己丑",
+                            "庚寅",
+                            "辛卯",
+                            "壬辰",
+                            "癸巳",
+                            "甲午",
+                            "乙未",
+                            "丙申",
+                            "丁酉",
+                            "戊戌",
+                            "己亥",
+                            "庚子",
+                            "辛丑",
+                            "壬寅",
+                            "癸卯",
+                            "甲辰",
+                            "乙巳",
+                            "丙午",
+                            "丁未",
+                            "戊申",
+                            "己酉",
+                            "庚戌",
+                            "辛亥",
+                            "壬子",
+                            "癸丑",
+                            "甲寅",
+                            "乙卯",
+                            "丙辰",
+                            "丁巳",
+                            "戊午",
+                            "己未",
+                            "庚申",
+                            "辛酉",
+                            "壬戌",
+                            "癸亥",
+                        }
+                    }
+                }
+                zodiacs{
+                    format{
+                        abbreviated{
+                            "鼠",
+                            "牛",
+                            "虎",
+                            "兔",
+                            "龙",
+                            "蛇",
+                            "马",
+                            "羊",
+                            "猴",
+                            "鸡",
+                            "狗",
+                            "猪",
+                        }
+                    }
+                }
+            }
             monthNames{
                 format{
                     wide{
index ede3316c579f5ee62afdbfa58e772d1d8d1b33d2..3818592149a70e16142992b889ec8e0cbafbddae 100644 (file)
@@ -85,7 +85,7 @@ zh_Hant{
             }
         }
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     calendar{
         buddhist{
             DateTimePatterns{
@@ -182,6 +182,110 @@ zh_Hant{
                 yMMMd{"y年M月d日"}
                 yMd{"y年M月d日"}
             }
+            cyclicNameSets{
+                dayParts{
+                    format{
+                        abbreviated{
+                            "子",
+                            "丑",
+                            "寅",
+                            "卯",
+                            "辰",
+                            "巳",
+                            "午",
+                            "未",
+                            "申",
+                            "酉",
+                            "戌",
+                            "亥",
+                        }
+                    }
+                }
+                years{
+                    format{
+                        abbreviated{
+                            "甲子",
+                            "乙丑",
+                            "丙寅",
+                            "丁卯",
+                            "戊辰",
+                            "己巳",
+                            "庚午",
+                            "辛未",
+                            "壬申",
+                            "癸酉",
+                            "甲戌",
+                            "乙亥",
+                            "丙子",
+                            "丁丑",
+                            "戊寅",
+                            "己卯",
+                            "庚辰",
+                            "辛巳",
+                            "壬午",
+                            "癸未",
+                            "甲申",
+                            "乙酉",
+                            "丙戌",
+                            "丁亥",
+                            "戊子",
+                            "己丑",
+                            "庚寅",
+                            "辛卯",
+                            "壬辰",
+                            "癸巳",
+                            "甲午",
+                            "乙未",
+                            "丙申",
+                            "丁酉",
+                            "戊戌",
+                            "己亥",
+                            "庚子",
+                            "辛丑",
+                            "壬寅",
+                            "癸卯",
+                            "甲辰",
+                            "乙巳",
+                            "丙午",
+                            "丁未",
+                            "戊申",
+                            "己酉",
+                            "庚戌",
+                            "辛亥",
+                            "壬子",
+                            "癸丑",
+                            "甲寅",
+                            "乙卯",
+                            "丙辰",
+                            "丁巳",
+                            "戊午",
+                            "己未",
+                            "庚申",
+                            "辛酉",
+                            "壬戌",
+                            "癸亥",
+                        }
+                    }
+                }
+                zodiacs{
+                    format{
+                        abbreviated{
+                            "鼠",
+                            "牛",
+                            "虎",
+                            "兔",
+                            "龍",
+                            "蛇",
+                            "馬",
+                            "羊",
+                            "猴",
+                            "雞",
+                            "狗",
+                            "豬",
+                        }
+                    }
+                }
+            }
             monthNames{
                 format{
                     wide{
index 0307965a3f70bf6e729091505e39b53a8798afb5..03b9907fb84ce6d5b2080dd4f7f0bfc13f1f2bfd 100644 (file)
@@ -467,6 +467,7 @@ likelySubtags:table(nofallback){
     und_SN{"fr_Latn_SN"}
     und_SO{"so_Latn_SO"}
     und_SR{"nl_Latn_SR"}
+    und_SS{"en_Latn_SS"}
     und_ST{"pt_Latn_ST"}
     und_SV{"es_Latn_SV"}
     und_SY{"ar_Arab_SY"}
index 4b4cc22a1a3a49b94325485e1f3dcfc23860688d..9fe5237012875acb204c27c5a5da041674c40d97 100755 (executable)
@@ -7,6 +7,286 @@
 // *
 // ***************************************************************************
 metadata:table(nofallback){
+    languageAlias{
+        aa_SAAHO{"ssy"}
+        aar{"aa"}
+        abk{"ab"}
+        afr{"af"}
+        aju{"jrb"}
+        aka{"ak"}
+        als{"sq"}
+        amh{"am"}
+        ara{"ar"}
+        arb{"ar"}
+        arg{"an"}
+        art-lojban{"jbo"}
+        asm{"as"}
+        ava{"av"}
+        ave{"ae"}
+        aym{"ay"}
+        ayr{"ay"}
+        aze{"az"}
+        azj{"az"}
+        bak{"ba"}
+        bam{"bm"}
+        bcc{"bal"}
+        bcl{"bik"}
+        bel{"be"}
+        ben{"bn"}
+        bh{"bho"}
+        bih{"bho"}
+        bis{"bi"}
+        bod{"bo"}
+        bos{"bs"}
+        bre{"br"}
+        bul{"bg"}
+        bxk{"luy"}
+        bxr{"bua"}
+        cat{"ca"}
+        ces{"cs"}
+        cha{"ch"}
+        che{"ce"}
+        chu{"cu"}
+        chv{"cv"}
+        cld{"syr"}
+        cmn{"zh"}
+        cor{"kw"}
+        cos{"co"}
+        cre{"cr"}
+        cwd{"cr"}
+        cym{"cy"}
+        dan{"da"}
+        deu{"de"}
+        dgo{"doi"}
+        dhd{"mwr"}
+        dik{"din"}
+        diq{"zza"}
+        div{"dv"}
+        dzo{"dz"}
+        ekk{"et"}
+        ell{"el"}
+        emk{"man"}
+        eng{"en"}
+        epo{"eo"}
+        esk{"ik"}
+        est{"et"}
+        eus{"eu"}
+        ewe{"ee"}
+        fao{"fo"}
+        fas{"fa"}
+        fat{"ak"}
+        fij{"fj"}
+        fin{"fi"}
+        fra{"fr"}
+        fry{"fy"}
+        fuc{"ff"}
+        ful{"ff"}
+        gaz{"om"}
+        gbo{"grb"}
+        gla{"gd"}
+        gle{"ga"}
+        glg{"gl"}
+        glv{"gv"}
+        gno{"gon"}
+        grn{"gn"}
+        gug{"gn"}
+        guj{"gu"}
+        gya{"gba"}
+        hat{"ht"}
+        hau{"ha"}
+        hbs{"sr_Latn"}
+        hdn{"hai"}
+        hea{"hmn"}
+        heb{"he"}
+        her{"hz"}
+        him{"srx"}
+        hin{"hi"}
+        hmo{"ho"}
+        hrv{"hr"}
+        hun{"hu"}
+        hye{"hy"}
+        i-ami{"ami"}
+        i-bnn{"bnn"}
+        i-hak{"hak"}
+        i-klingon{"tlh"}
+        i-lux{"lb"}
+        i-navajo{"nv"}
+        i-pwn{"pwn"}
+        i-tao{"tao"}
+        i-tay{"tay"}
+        i-tsu{"tsu"}
+        ibo{"ig"}
+        ido{"io"}
+        iii{"ii"}
+        ike{"iu"}
+        iku{"iu"}
+        ile{"ie"}
+        in{"id"}
+        ina{"ia"}
+        ind{"id"}
+        ipk{"ik"}
+        isl{"is"}
+        ita{"it"}
+        iw{"he"}
+        jav{"jv"}
+        ji{"yi"}
+        jpn{"ja"}
+        jw{"jv"}
+        kal{"kl"}
+        kan{"kn"}
+        kas{"ks"}
+        kat{"ka"}
+        kau{"kr"}
+        kaz{"kk"}
+        khk{"mn"}
+        khm{"km"}
+        kik{"ki"}
+        kin{"rw"}
+        kir{"ky"}
+        kmr{"ku"}
+        knc{"kr"}
+        kng{"kg"}
+        knn{"kok"}
+        kom{"kv"}
+        kon{"kg"}
+        kor{"ko"}
+        kpv{"kv"}
+        kua{"kj"}
+        kur{"ku"}
+        lao{"lo"}
+        lat{"la"}
+        lav{"lv"}
+        lbk{"bnc"}
+        lim{"li"}
+        lin{"ln"}
+        lit{"lt"}
+        ltz{"lb"}
+        lub{"lu"}
+        lug{"lg"}
+        lvs{"lv"}
+        mah{"mh"}
+        mal{"ml"}
+        mar{"mr"}
+        mhr{"chm"}
+        mkd{"mk"}
+        mlg{"mg"}
+        mlt{"mt"}
+        mo{"ro"}
+        mol{"ro"}
+        mon{"mn"}
+        mri{"mi"}
+        msa{"ms"}
+        mup{"raj"}
+        mya{"my"}
+        nau{"na"}
+        nav{"nv"}
+        nbl{"nr"}
+        nde{"nd"}
+        ndo{"ng"}
+        nep{"ne"}
+        nld{"nl"}
+        nno{"nn"}
+        no{"nb"}
+        no-bok{"nb"}
+        no-nyn{"nn"}
+        no_BOKMAL{"nb"}
+        no_NYNORSK{"nn"}
+        nob{"nb"}
+        nor{"nb"}
+        nya{"ny"}
+        oci{"oc"}
+        ojg{"oj"}
+        oji{"oj"}
+        ori{"or"}
+        orm{"om"}
+        oss{"os"}
+        pan{"pa"}
+        pbu{"ps"}
+        pes{"fa"}
+        pli{"pi"}
+        plt{"mg"}
+        pnb{"lah"}
+        pol{"pl"}
+        por{"pt"}
+        pus{"ps"}
+        que{"qu"}
+        qxp{"qu"}
+        rmy{"rom"}
+        roh{"rm"}
+        ron{"ro"}
+        run{"rn"}
+        rus{"ru"}
+        sag{"sg"}
+        san{"sa"}
+        sgn-BE-FR{"sfb"}
+        sgn-BE-NL{"vgt"}
+        sgn-CH-DE{"sgg"}
+        sh{"sr_Latn"}
+        sin{"si"}
+        slk{"sk"}
+        slv{"sl"}
+        sme{"se"}
+        smo{"sm"}
+        sna{"sn"}
+        snd{"sd"}
+        som{"so"}
+        sot{"st"}
+        spa{"es"}
+        spy{"kln"}
+        sqi{"sq"}
+        src{"sc"}
+        srd{"sc"}
+        srp{"sr"}
+        ssw{"ss"}
+        sun{"su"}
+        swa{"sw"}
+        swe{"sv"}
+        swh{"sw"}
+        tah{"ty"}
+        tam{"ta"}
+        tat{"tt"}
+        tel{"te"}
+        tgk{"tg"}
+        tgl{"fil"}
+        tha{"th"}
+        tir{"ti"}
+        tl{"fil"}
+        ton{"to"}
+        tsn{"tn"}
+        tso{"ts"}
+        ttq{"tmh"}
+        tuk{"tk"}
+        tur{"tr"}
+        tw{"ak"}
+        twi{"ak"}
+        uig{"ug"}
+        ukr{"uk"}
+        umu{"del"}
+        urd{"ur"}
+        uzb{"uz"}
+        uzn{"uz"}
+        ven{"ve"}
+        vie{"vi"}
+        vol{"vo"}
+        wln{"wa"}
+        wol{"wo"}
+        xho{"xh"}
+        xpe{"kpe"}
+        xsl{"den"}
+        ydd{"yi"}
+        yid{"yi"}
+        yor{"yo"}
+        zai{"zap"}
+        zh-guoyu{"zh"}
+        zh-hakka{"hak"}
+        zh-min-nan{"nan"}
+        zh-xiang{"hsn"}
+        zha{"za"}
+        zho{"zh"}
+        zsm{"ms"}
+        zul{"zu"}
+        zyb{"za"}
+    }
     regionCodes{
         "001",
         "002",
@@ -30,7 +310,6 @@ metadata:table(nofallback){
         "054",
         "057",
         "061",
-        "062",
         "142",
         "143",
         "145",
@@ -39,9 +318,6 @@ metadata:table(nofallback){
         "154",
         "155",
         "419",
-        "172",
-        "200",
-        "830",
         "AC",
         "AD",
         "AE",
@@ -110,7 +386,6 @@ metadata:table(nofallback){
         "DK",
         "DM",
         "DO",
-        "DY",
         "DZ",
         "EA",
         "EC",
@@ -126,7 +401,6 @@ metadata:table(nofallback){
         "FK",
         "FM",
         "FO",
-        "FQ",
         "FR",
         "FX",
         "GA",
@@ -154,7 +428,6 @@ metadata:table(nofallback){
         "HR",
         "HT",
         "HU",
-        "HV",
         "IC",
         "ID",
         "IE",
@@ -170,7 +443,6 @@ metadata:table(nofallback){
         "JM",
         "JO",
         "JP",
-        "JT",
         "KE",
         "KG",
         "KH",
@@ -200,7 +472,6 @@ metadata:table(nofallback){
         "MF",
         "MG",
         "MH",
-        "MI",
         "MK",
         "ML",
         "MM",
@@ -222,19 +493,16 @@ metadata:table(nofallback){
         "NE",
         "NF",
         "NG",
-        "NH",
         "NI",
         "NL",
         "NO",
         "NP",
-        "NQ",
         "NR",
         "NT",
         "NU",
         "NZ",
         "OM",
         "PA",
-        "PC",
         "PE",
         "PF",
         "PG",
@@ -246,10 +514,8 @@ metadata:table(nofallback){
         "PR",
         "PS",
         "PT",
-        "PU",
         "PW",
         "PY",
-        "PZ",
         "QA",
         "QO",
         "QU",
@@ -273,6 +539,7 @@ metadata:table(nofallback){
         "SN",
         "SO",
         "SR",
+        "SS",
         "ST",
         "SU",
         "SV",
@@ -322,6 +589,9 @@ metadata:table(nofallback){
         "ZW",
         "ZZ",
     }
+    scriptAlias{
+        Qaai{"Zinh"}
+    }
     territoryAlias{
         004{"AF"}
         008{"AL"}
@@ -540,6 +810,8 @@ metadata:table(nofallback){
         716{"ZW"}
         720{"YE"}
         724{"ES"}
+        728{"SS"}
+        729{"SD"}
         732{"EH"}
         736{"SD"}
         740{"SR"}
@@ -873,4 +1145,9 @@ metadata:table(nofallback){
         ZWE{"ZW"}
         ZZZ{"ZZ"}
     }
+    variantAlias{
+        AALAND{"AX"}
+        HEPLOC{"alalc97"}
+        POLYTONI{"POLYTON"}
+    }
 }
index bffb5b8e6db5198fcf61f5dbc5fc30a71e9906c4..c3e8ee10b6dc3f3670d6de6d032537ae71cc5732 100644 (file)
@@ -1266,7 +1266,7 @@ supplementalData:table(nofallback){
         }
         {
             "SD",
-            "736",
+            "729",
             "SDN",
         }
         {
@@ -1324,6 +1324,11 @@ supplementalData:table(nofallback){
             "740",
             "SUR",
         }
+        {
+            "SS",
+            "728",
+            "SSD",
+        }
         {
             "ST",
             "678",
@@ -8762,6 +8767,7 @@ supplementalData:table(nofallback){
             "LY",
             "MA",
             "SD",
+            "SS",
             "TN",
             "EA",
             "IC",
index c60af213c11bec5692e05de979a178c0e47ea788..8b9e265ff8ce187457dff5b9b10ea33ca6715904 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-RBNF_CLDR_VERSION = 2.0
+RBNF_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
index 9e5697dc1c2e390940b2fde2756ec6270e9bb744..384ddd6b29f39f02771f99fdab7987890ad0f150 100644 (file)
@@ -299,5 +299,5 @@ af{
         ZW{"Zimbabwe"}
         ZZ{"Onbekend gebied"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.33"}
 }
index be7ab9ecf242dbf66bc36dbaeff9f318782151c5..549e8b193b4662216fe8bc13d3365f2eec353bc2 100644 (file)
@@ -298,5 +298,5 @@ am{
         ZW{"ዚምቧቤ"}
         ZZ{"ያልታወቀ ክልል"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
 }
index 488244d2e9e4ae8f7080b98e31e4e4b54012d02f..38efb341bca7fa3e0293ed9744d046ebecb283d2 100644 (file)
@@ -300,5 +300,5 @@ ar{
         ZW{"زيمبابوي"}
         ZZ{"منطقة غير معروفة"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
 }
index 9292083aaf9655380498936f01c1fd4ff9ee878b..f11e778a38020eace0235233f4a193d6eafc19d7 100644 (file)
@@ -290,5 +290,5 @@ az{
         ZW{"Zimbabve"}
         ZZ{"bilinmir"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
 }
index 1f66be256f1e9d031798ebf38fdae430eea56d11..77c4b72683ab7cfe21539e1bf3bf606f3ecad8c9 100644 (file)
@@ -276,5 +276,5 @@ be{
         ZW{"Зімбабвэ"}
         ZZ{"Невядомы рэгіён"}
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.33"}
 }
index 35ec4bb6f0f80c4f174ecb2793f6f1e6df96f27b..c1c230f5a554e101f792b18d7d6e92ac7ab864e5 100644 (file)
@@ -301,5 +301,5 @@ bg{
         ZW{"Зимбабве"}
         ZZ{"Непозната или несъществуваща област"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
 }
index e9f65c3b890e2c3949b4434ac077613147f2524c..d43d1d03c90e745250a35449dcc08e2e4389ea22 100644 (file)
@@ -302,5 +302,5 @@ bn{
         ZW{"জিম্বাবুয়ে"}
         ZZ{"অজানা অথবা ভুল স্থান"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
 }
index 2d4859d639f33f83c51bce071d78fbc144ad6dfe..cc54a111252888eaf1aa82639548f19c750e5fa9 100755 (executable)
@@ -296,5 +296,5 @@ brx{
         ZW{"ज़ीम्बाब्वे"}
         ZZ{"अज्ञात या अवैध प्रदेश"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
 }
index bca0fce9a259bc877f86271e0a88faa8b5daea7b..5e773a70f4558c1bb9ed182ba52922671dcf5317 100644 (file)
@@ -295,5 +295,5 @@ bs{
         ZW{"Zimbabve"}
         ZZ{"Nepoznata ili nevažeća oblast"}
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.77"}
 }
index 43aa0d9ea29b2bdfab68fe4b665180f4751e55aa..9b97a18afc5c18b591fefcf0d98959f0d7c42c84 100755 (executable)
  */
 chr{
     Countries{
+        001{"ᎡᎶᎯ"}
         003{"ᏧᏴᏢ ᎠᎺᎵᎦ"}
+        005{"ᏧᎦᏃᏮ ᎠᎺᎵᎦ"}
         019{"ᎠᎺᎵᎦᎢ"}
+        AD{"ᎠᏂᏙᎳ"}
+        AE{"ᏌᏊ ᎢᏳᎾᎵᏍᏔᏅ ᎡᎳᏈ ᎢᎹᎵᏘᏏ"}
+        AF{"ᎠᏫᎨᏂᏍᏖᏂ"}
+        AG{"ᎤᏪᏘ ᎠᎴ ᏆᏊᏓ"}
+        AI{"ᎠᏂᎩᎳ"}
+        AL{"ᎠᎵᏇᏂᏯ"}
+        AM{"ᎠᎵᎻᏂᎠ"}
+        AO{"ᎠᏂᎪᎳ"}
+        AQ{"ᏧᏁᏍᏓᎸ"}
+        AR{"ᎠᏥᏂᏘᏂᎠ"}
+        AS{"ᎠᎺᎵᎧ ᏌᎼᎠ"}
+        AT{"ᎠᏍᏟᏯ"}
+        AU{"ᎡᎳᏗᏜ"}
+        AW{"ᎠᎷᏆ"}
+        AX{"ᎣᎴᏅᏓ ᏚᎦᏚᏛ"}
+        AZ{"ᎠᏏᎵᏆᏌᏂ"}
+        BA{"ᏉᏏᏂᎠ ᎠᎴ ᎲᏤᎪᏫ"}
+        BB{"ᏆᏇᏙᏍ"}
+        BD{"ᏆᏂᎦᎵᏕᏍ"}
+        BE{"ᏇᎵᏥᎥᎻ"}
+        BF{"ᏋᎩᎾ ᏩᏐ"}
+        BG{"ᏊᎵᎨᎵᎠ"}
+        BH{"ᏆᎭᎴᎢᏂ"}
+        BI{"ᏋᎷᏂᏗ"}
+        BJ{"ᏆᏂᎢᏂ"}
+        BL{"ᎠᏥᎸᏉᏗ ᏆᏕᎳᎻ"}
+        BM{"ᏆᏊᏓ"}
+        BN{"ᏊᎾᎢ"}
+        BO{"ᏉᎵᏫᎠ"}
         BR{"ᏆᏏᎵᎢ"}
+        BS{"ᎾᏍᎩ ᏆᎭᎹᏍ"}
+        BT{"ᏊᏔᏂ"}
+        BV{"ᏊᏪ ᎤᎦᏚᏛ"}
+        BW{"ᏆᏣᏩᎾ"}
+        BY{"ᏇᎳᎷᏍ"}
+        BZ{"ᏇᎵᏍ"}
         CA{"ᎨᎾᏓ"}
+        CC{"ᎪᎪᏍ [ᎩᎵᏂ] ᏚᎦᏚᏛ"}
+        CD{"ᎧᏂᎪ"}
+        CF{"ᎬᎿᎨᏍᏛ ᎠᏰᏟ ᏍᎦᏚᎩ"}
+        CG{"ᎧᏂᎪ [ᏍᎦᏚᎩ]"}
+        CH{"ᏍᏫᏍ"}
+        CI{"ᎢᏬᎵ ᎾᎿ ᎠᎹᏳᎶᏗ"}
+        CK{"ᎠᏓᏍᏓᏴᎲᏍᎩ ᎤᎦᏚᏛ"}
+        CL{"ᏥᎵ"}
+        CM{"ᎧᎹᎷᏂ"}
         CN{"ᏓᎶᏂᎨᏍᏛ"}
+        CO{"ᎪᎸᎻᏈᎢᎠ"}
+        CR{"ᎪᏍᏓ ᎵᎧ"}
+        CU{"ᎫᏆ"}
+        CV{"ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ"}
+        CW{"ᏂᎦᏓ ᎤᏂᎲ ᎾᎿ ᎫᎳᎨᎣ"}
+        CX{"ᏓᏂᏍᏓᏲᎯᎲ ᎤᎦᏚᏛ"}
+        CY{"ᏌᎢᏆᏍ"}
+        CZ{"ᏤᎩ ᏍᎦᏚᎩ"}
         DE{"ᎠᏂᏛᏥ"}
+        DJ{"ᏥᏊᏗ"}
+        DK{"ᏗᏂᎹᎦ"}
+        DM{"ᏙᎻᏂᎧ"}
+        DO{"ᏙᎻᏂᎧᏂ ᏍᎦᏚᎩ"}
+        DZ{"ᎠᎵᏥᎵᏯ"}
+        EC{"ᎡᏆᏙᎵ"}
+        EE{"ᎡᏍᏙᏂᏯ"}
+        EG{"ᎢᏥᏈᎢ"}
+        ER{"ᎡᎵᏟᏯ"}
+        ES{"ᎠᏂᏍᏆᏂᏱ"}
+        FI{"ᏫᏂᎦᏙᎯ"}
+        FJ{"ᏫᏥ"}
+        FK{"ᏩᎩ ᎤᎦᏚᏛ"}
+        FM{"ᎠᏰᏟ ᏧᎾᎵᎪᎯ ᎾᎿ ᎹᎢᏉᏂᏏᏯ"}
+        FO{"ᏪᎶ ᏚᎦᏚᏛ"}
         FR{"ᎦᎸᏥᏱ"}
+        GA{"ᎦᏉᏂ"}
         GB{"ᎩᎵᏏᏲ"}
+        GD{"ᏋᎾᏓ"}
+        GE{"ᏣᎠᏥᎢ"}
+        GF{"ᎠᏂᎦᎸᏥ ᎩᎠ"}
+        GG{"ᎬᏂᏏ"}
+        GH{"ᎦᎠᎾ"}
+        GI{"ᏥᏆᎵᏓ"}
+        GL{"ᎢᏤᏍᏛᏱ"}
+        GM{"ᎦᎹᏈᎢᎠ"}
+        GN{"ᎫᏇ"}
+        GP{"ᏩᏓᎷᏇ"}
+        GQ{"ᎡᏆᏙᎵᎠᎵ ᎩᎢᏂ"}
+        GR{"ᎪᎢᎯ"}
+        GS{"ᏧᎦᏃᏮ ᏣᏥᏱ ᎠᎴ ᎾᏍᎩ ᏧᎦᏃᏮ ᎠᏍᏛᎭᏟ ᏚᎦᏚᏛ"}
+        GT{"ᏩᏔᎹᎳ"}
+        GU{"ᏆᎻ"}
+        GW{"ᎫᏇ-ᏈᏌᎤᏫ"}
+        GY{"ᎦᏯᎾ"}
+        HK{"ᎰᏂᎩ ᎪᏂᎩ"}
+        HM{"ᎲᏗ ᎤᎦᏚᏛ ᎠᎴ ᎺᎩᏓᎾᎵᏗ ᏚᎦᏚᏛ"}
+        HR{"ᎧᎶᎡᏏᎠ"}
+        HT{"ᎮᎢᏘ"}
+        HU{"ᎲᏂᎦᎵ"}
+        ID{"ᎢᏂᏙᏂᏍᏯ"}
+        IE{"ᎠᎢᎴᏂᏗ"}
+        IL{"ᎢᏏᎵᏱ"}
+        IM{"ᎤᏍᏗ ᎤᎦᏚᏛ ᎾᎿ ᎠᏍᎦᏯ"}
         IN{"ᎢᏅᏗᎾ"}
+        IO{"ᏈᏗᏏ ᏴᏫᏯ ᎠᎺᏉ ᎢᎬᎾᏕᏅ"}
+        IQ{"ᎢᎳᎩ"}
+        IR{"ᎢᎴᏂ"}
+        IS{"ᏧᏁᏍᏓᎸᎯ"}
         IT{"ᏲᎶ"}
+        JE{"ᏨᎵᏏ"}
+        JM{"ᏣᎺᎢᎧ"}
+        JO{"ᏦᏓᏂ"}
         JP{"ᏣᏩᏂᏏ"}
+        KE{"ᎨᏂᏯ"}
+        KG{"ᎩᎵᏣᎢᏍ"}
+        KH{"ᎧᎹᏉᏗᎠᏂ"}
+        KI{"ᎧᎵᏆᏘ"}
+        KM{"ᎪᎼᎳᏍ"}
+        KN{"ᎠᏰᏟ ᎾᎿ ᎨᏥᎸᏉᏗ ᎠᏂᏪᏌ ᎠᎴ ᎠᏂᏁᏫᏍ"}
+        KP{"ᏧᏴᏢ ᎪᎵᎠ"}
+        KR{"ᏧᎦᏃᏮ ᎪᎵᎠ"}
+        KW{"ᎫᏪᎢᏘ"}
+        KY{"ᎨᎢᎹᏂ ᏚᎦᏚᏛᎢ"}
+        KZ{"ᎧᏎᎧᏍᏕᏂ"}
+        LA{"ᎴᎣᏍ"}
+        LB{"ᎴᏆᎾᏂ"}
+        LI{"ᎵᎦᏗᏂᏍᏓᏂ"}
+        LK{"ᏍᎵ ᎳᏂᎧ"}
+        LR{"ᎳᏈᎵᏯ"}
+        LS{"ᎴᏐᏙ"}
+        LT{"ᎵᏗᏪᏂᎠ"}
+        LU{"ᎸᎧᏎᏋᎩ"}
+        LV{"ᎳᏘᏫᎠ"}
+        LY{"ᎵᏈᏯ"}
+        MA{"ᎼᎶᎪ"}
+        MC{"ᎹᎾᎪ"}
+        MD{"ᎹᎵᏙᏫᎠ"}
+        ME{"ᎼᏂᏔᏁᎦᎶ"}
+        MF{"ᎠᏥᎸᏉᏗ ᏡᏡ"}
+        MG{"ᎹᏓᎦᏍᎧᎵ"}
+        MH{"ᎹᏌᎵ ᏚᎪᏚᏛ"}
+        MK{"ᎹᏏᏙᏂᎢᎠ"}
+        ML{"ᎹᎵ"}
+        MM{"ᎹᏯᎹᎵ"}
+        MN{"ᎹᏂᎪᎵᎠ"}
+        MO{"ᎹᎧᎣ [ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ] ᏣᎢ"}
+        MP{"ᎾᏍᎩ ᎤᏴᏢ ᏗᏜ ᎹᎵᎠᎾ ᏚᎦᏚᏛ"}
+        MQ{"ᎹᏘᏂᎨ"}
+        MR{"ᎹᏘᎢᏯ"}
+        MS{"ᎹᏂᏘᏌᎳᏗ"}
+        MT{"ᎹᎵᏔ"}
+        MU{"ᎼᎵᏏᎥᏍ"}
+        MV{"ᎹᎵᏗᏫᏍ"}
+        MW{"ᎹᎳᏫ"}
         MX{"ᏍᏆᏂᏱ"}
+        MY{"ᎹᎴᏏᎢᎠ"}
+        MZ{"ᎼᏎᎻᏇᎩ"}
+        NA{"ᎾᎻᏈᎢᏯ"}
+        NC{"ᎢᏤ ᎧᎵᏙᏂᎠᏂ"}
+        NE{"ᏂᏥᎵᏯ"}
+        NF{"ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛ"}
+        NG{"ᏂᏥᎵᏯ"}
+        NI{"ᏂᎧᎳᏆ"}
+        NL{"ᏁᏛᎳᏂ"}
+        NO{"ᏃᏪ"}
+        NP{"ᏁᏆᎵ"}
+        NR{"ᏃᎤᎷ"}
+        NU{"ᏂᏳ"}
+        NZ{"ᎢᏤ ᏏᎢᎴᏂᏗ"}
+        OM{"ᎣᎺᏂ"}
+        PA{"ᏆᎾᎹ"}
+        PE{"ᏇᎷ"}
+        PF{"ᎠᏂᎦᎸᏣ ᏆᎵᏂᏏᎠ"}
+        PG{"ᏆᏇ ᎢᏤ ᎩᏂ"}
+        PH{"ᎠᏂᏈᎵᎩᏃ"}
+        PK{"ᏆᎩᏍᏖᏂ"}
+        PL{"ᏉᎳᏂ"}
+        PM{"ᏎᏂᏘ ᏈᏓ ᎠᎴ ᎻᏇᎶᏂ"}
+        PN{"ᏈᎧᎵᏂ ᎤᎦᏚᏛᎢ"}
+        PR{"ᏇᎡᏙ ᎵᎢᎪ"}
+        PS{"ᏆᎴᏍᏗᏂᎠᏂ ᏄᎬᏫᏳᏌᏕᎩ"}
+        PT{"ᏉᏥᎦᎳ"}
+        PW{"ᏆᎴᎠᏫ"}
+        PY{"ᏆᎳᏇᎢᏯ"}
+        QA{"ᎧᏔᎵ"}
+        RO{"ᎶᎹᏂᏯ"}
+        RS{"ᏒᏈᏯ"}
         RU{"ᏲᏂᎢ"}
+        RW{"ᎶᏩᏂᏓ"}
+        SA{"ᏌᎤᏗ ᎡᎴᏈᎠ"}
+        SB{"ᏐᎶᎹᏂ ᏚᎦᏚᏛ"}
+        SC{"ᏏᎡᏥᎵᏍ"}
+        SD{"ᏑᏕᏂ"}
+        SE{"ᏍᏫᏕᏂ"}
+        SG{"ᏏᏂᎦᏉᎵ"}
+        SH{"ᎠᏥᎸᏉᏗ ᎮᎵᎾ"}
+        SI{"ᏍᎶᏫᏂᎠ"}
+        SK{"ᏍᎶᏩᎩᎠ"}
+        SL{"ᏏᎡᎳ ᎴᎣᏂ"}
         US{"ᎠᎹᏰᏟ"}
         ZZ{"ᏄᏬᎵᏍᏛᎾ ᎤᏔᏂᏗᎦᏙᎯ"}
     }
-    Version{"2.0.59.5"}
+    Version{"2.0.62.29"}
 }
index 7b165000e4dd0d315999ce99d16ba74b75561f8b..38d93ad64703ef91af743b59e670eae1b9b36bf6 100644 (file)
@@ -302,5 +302,5 @@ cs{
         ZW{"Zimbabwe"}
         ZZ{"Neznámá nebo neplatná oblast"}
     }
-    Version{"2.0.59.84"}
+    Version{"2.0.62.55"}
 }
index b13c4d2bd13d92a1cdd3786656fa293b5aa482ba..49c19e649cfd64889d5cb29d3fd4fc8cb583f5b2 100755 (executable)
@@ -297,5 +297,5 @@ ee{
         ZW{"Zimbabwe nutome"}
         ZZ{"nutome manya"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.61.87"}
 }
index 4eb39a6d7fad927a4ef4bff2fee07e37789422c1..4c7f04e53bb4be19c45dcbb3fe48da89b0e6a965 100644 (file)
@@ -76,6 +76,7 @@ en{
         BM{"Bermuda"}
         BN{"Brunei"}
         BO{"Bolivia"}
+        BQ{"Bonaire, Sint Eustatius, and Saba"}
         BR{"Brazil"}
         BS{"Bahamas"}
         BT{"Bhutan"}
@@ -260,6 +261,7 @@ en{
         SN{"Senegal"}
         SO{"Somalia"}
         SR{"Suriname"}
+        SS{"South Sudan"}
         ST{"São Tomé and Príncipe"}
         SV{"El Salvador"}
         SX{"Sint Maarten"}
@@ -304,5 +306,5 @@ en{
         ZW{"Zimbabwe"}
         ZZ{"Unknown Region"}
     }
-    Version{"2.0.61.76"}
+    Version{"2.0.62.77"}
 }
index 897562160b0dad3d87d89d1be1813796af29467a..e8c121d645c177cff6ea6e7f47b794595d25f267 100644 (file)
@@ -303,5 +303,5 @@ es{
         ZW{"Zimbabue"}
         ZZ{"Región desconocida"}
     }
-    Version{"2.0.60.15"}
+    Version{"2.0.62.55"}
 }
index f5a1c7aa90b8e03cc24af66fc009e6bcdeef0bd2..e7159eecdb0db9a61ef75c555e741abc59f66a8c 100644 (file)
@@ -300,5 +300,5 @@ fi{
         ZW{"Zimbabwe"}
         ZZ{"tuntematon tai virheellinen alue"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.84"}
 }
index 353cb68a774771be019bb551fd799d2fac137a59..44540de4318b8c940428357e05fba0ef2d8f09b3 100644 (file)
@@ -301,5 +301,5 @@ fr{
         ZW{"Zimbabwe"}
         ZZ{"région indéterminée"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.75"}
 }
index 35c260be9e7e2b262e8375983ad4c255cb82e56a..abaf10c50436da41ce267b3f3acdc5c04c51591e 100644 (file)
@@ -301,5 +301,5 @@ hr{
         ZW{"Zimbabve"}
         ZZ{"nepoznata ili nevažeća oblast"}
     }
-    Version{"2.0.61.44"}
+    Version{"2.0.62.55"}
 }
index 095de304effa1f71f1992967063930d1773110da..4f817dddd200f488929145d0fcf8ef90521c1e09 100644 (file)
@@ -300,5 +300,5 @@ ko{
         ZW{"짐바브웨"}
         ZZ{"알수없거나 유효하지 않은 지역"}
     }
-    Version{"2.0.59.68"}
+    Version{"2.0.62.55"}
 }
index c6d5ecfc745b46b263883d06f055c95e4b2efa8b..cbe46ca6c1b5f14e55b178066aea34fd5ead9ca9 100755 (executable)
@@ -140,7 +140,6 @@ ln{
         MH{"Bisanga bya Marishalɛ"}
         MK{"Masedwanɛ"}
         ML{"Malí"}
-        MM{"Mozambiki"}
         MN{"Mongolí"}
         MP{"Bisanga bya Marianɛ ya nɔ́rdi"}
         MQ{"Martiniki"}
@@ -238,5 +237,5 @@ ln{
         ZM{"Zambi"}
         ZW{"Zimbabwe"}
     }
-    Version{"2.0.57.98"}
+    Version{"2.0.62.5"}
 }
index 6afbb856ed1c8679f341cacf5f04df9db927f08e..3261a8f9598a39facb05f962db8220cb46cbd246 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-REGION_CLDR_VERSION = 2.0
+REGION_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
index 7df1bec95ca070d61dbb699fc0d2638c732fa917..0ea489e520b401fe9736c40c7741456a9041fd06 100644 (file)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/main/root.xml
  */
 root{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.84"}
 }
index e4c05cd8f3c89b631d41374ae79ab2bf00ef80ff..3ff98a09453420ac10f5465485022cd2465a2e2b 100644 (file)
@@ -169,5 +169,5 @@ sq{
         ZW{"Zimbabve"}
         ZZ{"Rajon i panjohur"}
     }
-    Version{"2.0.59.32"}
+    Version{"2.0.62.69"}
 }
index cdd8ea34b46adc24121a5b333918cb2b8d8d0a47..f4092534980c69b7d25a960756225c80d61c3e98 100644 (file)
@@ -302,5 +302,5 @@ te{
         ZW{"జింబాబ్వే"}
         ZZ{"తెలియని లేదా చెల్లని ప్రాంతం"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.68"}
 }
index cd6b55a6cebd1ec3379e91d72da2f8bb85f7e91d..03ece38fdd156456f2885e4da25ad31a53dbb8bf 100644 (file)
@@ -297,5 +297,5 @@ ur{
         ZW{"زمبابوے"}
         ZZ{"نامعلوم علاقہ"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.70"}
 }
index a20a7aefaee0df80addb3b4af60f5e4c60aba7d0..6b5c24eda21081bcd98928ee3e7505c6d53e370b 100644 (file)
@@ -301,5 +301,5 @@ zh{
         ZW{"津巴布韦"}
         ZZ{"未知地区"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
 }
index 6c586ef7e2e8568c3768d771ec7e69eca3a3bae7..5bb27988b811650f25b66496e24327440a3b1434 100644 (file)
@@ -14,5 +14,5 @@ zh_Hans_SG{
         ME{"黑山"}
         SC{"塞舌尔"}
     }
-    Version{"2.0.58.84"}
+    Version{"2.0.62.55"}
 }
index d25eaccd183f36a555b969981261e9e5699894cc..b1fd6802d1c4670c658582377abde0778fa0e092 100644 (file)
@@ -301,5 +301,5 @@ zh_Hant{
         ZW{"辛巴威"}
         ZZ{"未確定的區域"}
     }
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
 }
index ad285ac3566093fb6580dbcbe88d0b6a9da82f13..6bb25fe0218a39a8d3fd05f65e3545979fac253d 100644 (file)
@@ -13,5 +13,5 @@ zh_Hant_HK{
         029{"加勒比"}
         EA{"瑟塔與梅利拉"}
     }
-    Version{"2.0.59.66"}
+    Version{"2.0.62.55"}
 }
index 8f1305003f8af404edd26f8e7bc22449df890333..4b8fae9470a6cf594f2df526f74f4ce6bb2a708f 100644 (file)
@@ -10,9 +10,9 @@
 :: [ሀሁሂሃሄህሆለሉሊላሌልሎሏሐሑሒሓሔሕሖመሙሚማሜምሞሟሠሡሢሣሤሥሦረሩሪራሬርሮሯሰሱሲሳሴስሶሷሸሹሺሻሼሽሾሿቀቁቂቃቄቅቆቈቊቋቌቍቐቑቒቓቔቕቖቘቚቛቜቝበቡቢባቤብቦቧቨቩቪቫቬቭቮቯተቱቲታቴትቶቷቸቹቺቻቼችቾቿኀኁኂኃኄኅኆኈኊኋኌኍነኑኒናኔንኖኗኘኙኚኛኜኝኞኟአኡኢኣኤእኦኧከኩኪካኬክኮኰኲኳኴኵኸኹኺኻኼኽኾወዉዊዋዌውዎዘዙዚዛዜዝዞዟዠዡዢዣዤዥዦዧደዱዲዳዴድዶዷጀጁጂጃጄጅጆጇገጉጊጋጌግጎጐጒጓጔጕጠጡጢጣጤጥጦጧጨጩጪጫጬጭጮጯጰጱጲጳጴጵጶጷጸጹጺጻጼጽጾጿፀፁፂፃፄፅፆፈፉፊፋፌፍፎፏፐፑፒፓፔፕፖፗፘፙፚ፩፪፫፬፭፮፯፰፱፲፳፴፵፶፷፸፹፺፻] ;
 :: NFD (NFC) ;
 $ejective = ’;
-$glottal  = ’;
+$glottal = ’;
 $pharyngeal = ‘;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 ሀ → hā ; # ETHIOPIC SYLLABLE HA
 ሁ → hu ; # ETHIOPIC SYLLABLE HU
 ሂ → hī ; # ETHIOPIC SYLLABLE HI
index 7385bc6bef129bb24f26713674682e04a864f948..9bbad74e4a8c7ac3c558176037bd6b954456c336 100644 (file)
@@ -9,9 +9,9 @@
 #
 :: [[:Arabic:][:block=ARABIC:][‎ⁿ،؛؟ـ\u064B-\u0655٠-٬۰-۹﷼ښ]] ;
 :: NFKD (NFC);
-$disambig =  \u0331 ;
-$disambig2 =  \u0330 ;
-$under =  \u0323 ;
+$disambig = \u0331 ;
+$disambig2 = \u0330 ;
+$under = \u0323 ;
 $descender = ˌ;
 $notAbove = [[:^ccc=0:]&[:^ccc=230:]];
 [:Nd:]{٫}[:Nd:] ↔ [:Nd:]{','}[:Nd:] ; # ARABIC DECIMAL SEPARATOR
@@ -90,11 +90,11 @@ $notAbove = [[:^ccc=0:]&[:^ccc=230:]];
 \u064E ↔ a ; # ARABIC FATHA
 \u064F ↔ u ; # ARABIC DAMMA
 \u0650 ↔ i ; # ARABIC KASRA
-\u0651 ↔   \u0303 ; # ARABIC SHADDA
-\u0652 ↔   \u030A ; # ARABIC SUKUN
-\u0653 ↔  \u0302 ; # ARABIC MADDAH ABOVE
-\u0654 ↔  \u0309 ; # ARABIC HAMZA ABOVE
-\u0655 ↔  \u0339 ; # ARABIC HAMZA BELOW
+\u0651 ↔ \u0303 ; # ARABIC SHADDA
+\u0652 ↔ \u030A ; # ARABIC SUKUN
+\u0653 ↔ \u0302 ; # ARABIC MADDAH ABOVE
+\u0654 ↔ \u0309 ; # ARABIC HAMZA ABOVE
+\u0655 ↔ \u0339 ; # ARABIC HAMZA BELOW
 پ ↔ p ; # ARABIC LETTER PEH
 چ ↔ c h $disambig ; # ARABIC LETTER TCHEH
 ڤ ↔ v ; # ARABIC LETTER VEH
index 7c5642b4b2c113be30fa7b80730c05de2cbfbc83..1dc7d9281a92606dad1b526e77e1ca7745285969 100644 (file)
@@ -11,8 +11,8 @@
 :: NFKD (NFC) ;
 $alef = ’;
 $ayin = ‘;
-$disambig =  \u0331 ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$disambig = \u0331 ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 [:Nd:]{٫}[:Nd:] ↔ [:Nd:]{','}[:Nd:] ; # ARABIC DECIMAL SEPARATOR
 [:Nd:]{٬}[:Nd:] ↔ [:Nd:]{'.'}[:Nd:] ; # ARABIC THOUSANDS SEPARATOR
 ٫ ↔ ',' $disambig ; # ARABIC DECIMAL SEPARATOR
@@ -72,9 +72,9 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 ه\u0651 → hh ; # ARABIC LETTER HEH + SHADDA
 و\u0651 → ww ; # ARABIC LETTER WAW + SHADDA
 ى\u0651 → yy ; # ARABIC LETTER YEH + SHADDA
-$wordBoundary{ء →  ; # ARABIC LETTER HAMZA
+$wordBoundary{ء → ; # ARABIC LETTER HAMZA
 ء → $alef ; # ARABIC LETTER HAMZA
-$wordBoundary{ا →  ; # ARABIC LETTER ALEF
+$wordBoundary{ا → ; # ARABIC LETTER ALEF
 ٱ → $alef ; # ARABIC LETTER ALEF WASLA
 $wordBoundary{آ → ā ; # ARABIC LETTER ALEF WITH MADDA ABOVE
 آ → $alef ā ; # ARABIC LETTER ALEF WITH MADDA ABOVE
@@ -116,7 +116,7 @@ $wordBoundary{آ → ā ; # ARABIC LETTER ALEF WITH MADDA ABOVE
 \u0650 → i ; # ARABIC KASRA
 \u064Fو → ū ; # ARABIC DAMMA + WAW
 \u064F → u ; # ARABIC DAMMA
-\u0652 →  ; # ARABIC SUKUN
+\u0652 → ; # ARABIC SUKUN
 \u064B → aⁿ ; # ARABIC FATHATAN
 \u064D → iⁿ ; # ARABIC KASRATAN
 \u064C → uⁿ ; # ARABIC DAMMATAN
index 24b231514c84a4187b42c2927861fcdc07177a81..51c011fb9558f9af5228ab963275456c9135b7a7 100644 (file)
@@ -17,7 +17,7 @@ $lowerVowels = [աեէըիոևօւ] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
 $aspirate = ’ ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 $wordBoundary{ԵՒ}$wordBoundary → YEV ; # ARMENIAN CAPITAL ECH + CAPITAL YIWN
 $wordBoundary{ԵՒ → YEV ; # ARMENIAN CAPITAL ECH + CAPITAL YIWN
 $vowels{ԵՒ → YEV ; # ARMENIAN CAPITAL ECH + CAPITAL YIWN
@@ -33,7 +33,7 @@ $vowels{եւ → yev ; # ARMENIAN SMALL ECH + SMALL YIWN
 $wordBoundary{և}$wordBoundary → yev ; # ARMENIAN SMALL LIGATURE ECH YIWN
 $wordBoundary{և → yev ; # ARMENIAN SMALL LIGATURE ECH YIWN
 $vowels{և → yev ; # ARMENIAN SMALL LIGATURE ECH YIWN
-և →  ev ; # ARMENIAN SMALL LIGATURE ECH YIWN
+և → ev ; # ARMENIAN SMALL LIGATURE ECH YIWN
 Ա → A ; # ARMENIAN CAPITAL LETTER AYB
 ա → a ; # ARMENIAN SMALL LETTER AYB
 Բ → B ; # ARMENIAN CAPITAL LETTER BEN
@@ -100,9 +100,9 @@ $wordBoundary{ե → ye ; # ARMENIAN SMALL LETTER ECH
 ով → ov ;
 $wordBoundary{Ո}$lower → Vo ; # ARMENIAN CAPITAL LETTER VO
 $wordBoundary{Ո → VO ; # ARMENIAN CAPITAL LETTER VO
-Ո →  O ; # ARMENIAN CAPITAL LETTER ECH
+Ո → O ; # ARMENIAN CAPITAL LETTER ECH
 $wordBoundary{ո → vo ; # ARMENIAN SMALL LETTER VO
-ո →  o ; # ARMENIAN SMALL LETTER VO
+ո → o ; # ARMENIAN SMALL LETTER VO
 Չ} $lower → Ch $aspirate ; # ARMENIAN CAPITAL LETTER CHA
 Չ → CH $aspirate ; # ARMENIAN CAPITAL LETTER CHA
 չ → ch $aspirate ; # ARMENIAN SMALL LETTER CHA
index 91a653a65036c4968b2df639b3cdb45d0a56ecac..0734492a2e5a486fc1b8fd47818dc745e134493d 100644 (file)
@@ -9,8 +9,8 @@
 #
 :: [АБВГҒДЕӘЖЗИЫКҜЛМНОӨПРСТУҮФХҺЧҸШЙЭЮЯабвгғдеәжзиыкҝлмноөпрстуүфхһчҹш’йэюя] ;
 :: NFD (NFC) ;
-$prime  = ’ ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$prime = ’ ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 $upperConsonants = [БВГҒДЖЗЈКҜЛМНПРСТФХҺЧҸШЙ] ;
 $lowerConsonants = [бвгғджзјкҝлмнпрстфхһчҹш’й] ;
 $consonants = [$upperConsonants $lowerConsonants] ;
@@ -88,7 +88,7 @@ $lower = [$lowerConsonants $lowerVowels] ;
 э → ė ; # CYRILLIC SMALL LETTER SOFT SIGN
 Ю} $lower → Yu\u0307 ; # CYRILLIC CAPITAL LETTER YU
 Ю → YU\u0307 ; # CYRILLIC CAPITAL LETTER YU
-ю → yu\u0307 ;  # CYRILLIC SMALL LETTER YU
+ю → yu\u0307 ; # CYRILLIC SMALL LETTER YU
 Я} $lower → Yȧ ; # CYRILLIC CAPITAL LETTER YA
 Я → YȦ ; # CYRILLIC CAPITAL LETTER YA
 я → yȧ ; # CYRILLIC SMALL LETTER YA
index 95dbef47d4211d72b0df5ef08911d67e735e041b..2866b39306c345ba08f301c8ab0a888ff00265c6 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГДЕЁЖЗІЙКЛМНОПРСТУЎФХЦЧШЩЪЫЬЭЮЯҐабвгдеёжзійклмнопрстуўфхцчшщъыьэюя’ґ] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГДЖЗЙКЛМНПРСТЎФХЦЧШЬҐ] ;
 $lowerConsonants = [бвгджзйклмнпрстўфхцчшь’ґ] ;
@@ -18,7 +18,7 @@ $upperVowels = [АЕЁІОУЫЭЮЯ] ;
 $lowerVowels = [аеёіоуыэюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index 85bbc37d9a4b957f94148c6f7608349512a8c996..a2bf025e15056946237fe931ebd700a2571fa865 100644 (file)
@@ -97,5 +97,5 @@
 ৸→\uE079; # Bengali-InterIndic: CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
 ৹→\uE07A; # Bengali-InterIndic: CURRENCY DENOMINATOR SIXTEEN
 ৺→\uE07B; # ISSHAR
-।→\uE064;        # DANDA
-॥→\uE065;        # DOUBLE DANDA
+।→\uE064; # DANDA
+॥→\uE065; # DOUBLE DANDA
index b72c5f10c8bbe5e39103c3606aac02aba954f245..6e6e4f6072b86052503a6d8cab50e58d7c4bb51f 100644 (file)
@@ -17,7 +17,7 @@ $lowerVowels = [аеиоуъюяѫѣ] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
 $bulgarian = [ $lower $upperConsonants $upperVowels ] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
@@ -84,7 +84,7 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 щ → sht ; # CYRILLIC SMALL LETTER SHCHA
 Ъ → Ŭ ; # CYRILLIC CAPITAL LETTER HARD SIGN
 ъ → ŭ ; # CYRILLIC SMALL LETTER HARD SIGN
-$bulgarian { [Ъъ]  } $wordBoundary > ;
+$bulgarian { [Ъъ] } $wordBoundary > ;
 Ь → ’ ; # CYRILLIC CAPITAL LETTER SOFT SIGN
 ь → ’ ; # CYRILLIC SMALL LETTER SOFT SIGN
 Ю} $lower → Yu ; # CYRILLIC CAPITAL LETTER YU
index 38ad0c434f050d958b7d4eaa781c680b99a78c93..f18b5aaf902f3fd5880165f4faa8698ba2e8a467 100644 (file)
@@ -20,8 +20,8 @@ $caron = \u030C ;
 $comma = \u0326 ;
 $under = \u0331 ;
 $descender = ˌ;
-я ↔ a  $hat ; # CYRILLIC SMALL LETTER YA
-Я ↔  A $hat ; # CYRILLIC CAPITAL LETTER YA
+я ↔ a $hat ; # CYRILLIC SMALL LETTER YA
+Я ↔ A $hat ; # CYRILLIC CAPITAL LETTER YA
 ч ↔ c $caron ; # CYRILLIC SMALL LETTER CHE
 Ч ↔ C $caron; # CYRILLIC CAPITAL LETTER CHE
 э ↔ e $acute; # CYRILLIC SMALL LETTER E
@@ -35,7 +35,7 @@ $descender = ˌ;
 ѕ ↔ z $hat ; # CYRILLIC SMALL LETTER DZE
 Ѕ ↔ Z $hat; # CYRILLIC CAPITAL LETTER DZE
 ю ↔ u $hat ; # CYRILLIC SMALL LETTER YU
-Ю ↔  U $hat ; # CYRILLIC CAPITAL LETTER YU
+Ю ↔ U $hat ; # CYRILLIC CAPITAL LETTER YU
 і ↔ i $acute; # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
 І ↔ I $acute; # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
 ј ↔ j $caron; # CYRILLIC SMALL LETTER JE
@@ -50,7 +50,7 @@ $descender = ˌ;
 Џ ↔ D $hat ; # CYRILLIC CAPITAL LETTER DZHE
 а ↔ a ; # CYRILLIC SMALL LETTER A
 А ↔ A ; # CYRILLIC CAPITAL LETTER A
-ә ↔  ə ; # CYRILLIC SMALL LETTER SCHWA
+ә ↔ ə ; # CYRILLIC SMALL LETTER SCHWA
 Ә ↔ Ə ; # CYRILLIC CAPITAL LETTER SCHWA
 ӕ ↔ æ ; # CYRILLIC SMALL LIGATURE A IE
 Ӕ ↔ Æ ; # CYRILLIC CAPITAL LIGATURE A IE
@@ -111,9 +111,9 @@ $descender = ˌ;
 ц ↔ c ; # CYRILLIC SMALL LETTER TSE
 Ц ↔ C; # CYRILLIC CAPITAL LETTER TSE
 Ъ ↔ $modprime2 $under ; # CYRILLIC CAPITAL LETTER HARD SIGN
-ъ ↔  $modprime2 ; # CYRILLIC SMALL LETTER HARD SIGN
+ъ ↔ $modprime2 ; # CYRILLIC SMALL LETTER HARD SIGN
 Ь ↔ $modprime $under ; # CYRILLIC CAPITAL LETTER SOFT SIGN
-ь ↔  $modprime ; # CYRILLIC SMALL LETTER SOFT SIGN
+ь ↔ $modprime ; # CYRILLIC SMALL LETTER SOFT SIGN
 ы ↔ y ; # CYRILLIC SMALL LETTER YERU
 Ы ↔ Y ; # CYRILLIC CAPITAL LETTER YERU
 $ignore = [[:Mark:]''] * ;
index e84e1d90ab8c7472da4b1b77c97bf581032e7601..27ed4dd7c6949428d1158ca3f091520affdc7f48 100644 (file)
@@ -7,86 +7,86 @@
 # File: Devanagari_InterIndic.txt
 # Generated from CLDR 
 #
-\u0901→\uE001;  # SIGN CANDRABINDU
-\u0902→\uE002;  # SIGN ANUSVARA
-ः→\uE003;  # SIGN VISARGA
-ऄ→\uE004;  # SIGN SHORT A
-अ→\uE005;  # LETTER A
-आ→\uE006;  # LETTER AA
-इ→\uE007;  # LETTER I
-ई→\uE008;  # LETTER II
-उ→\uE009;  # LETTER U
-ऊ→\uE00A;  # LETTER UU
-ऋ→\uE00B;  # LETTER VOCALIC R
-ऌ→\uE00C;  # LETTER VOCALIC L
-ऍ→\uE00D;  # LETTER CANDRA E (For representing English sounds)
+\u0901→\uE001; # SIGN CANDRABINDU
+\u0902→\uE002; # SIGN ANUSVARA
+ः→\uE003; # SIGN VISARGA
+ऄ→\uE004; # SIGN SHORT A
+अ→\uE005; # LETTER A
+आ→\uE006; # LETTER AA
+इ→\uE007; # LETTER I
+ई→\uE008; # LETTER II
+उ→\uE009; # LETTER U
+ऊ→\uE00A; # LETTER UU
+ऋ→\uE00B; # LETTER VOCALIC R
+ऌ→\uE00C; # LETTER VOCALIC L
+ऍ→\uE00D; # LETTER CANDRA E (For representing English sounds)
 ऎ→\uE00E; # UNMAPPED LETTER SHORT E(For Southern Scripts)
-ए→\uE00F;  # LETTER E
-ऐ→\uE010;  # LETTER AI
-ऑ→\uE011;  # LETTER CANDRA O (For representing English sounds)
+ए→\uE00F; # LETTER E
+ऐ→\uE010; # LETTER AI
+ऑ→\uE011; # LETTER CANDRA O (For representing English sounds)
 ऒ→\uE012; # UNMAPPED LETTER SHORT O (For Southern Scripts)
-ओ→\uE013;  # LETTER O
-औ→\uE014;  # LETTER AU
-क→\uE015;  # LETTER KA
-ख→\uE016;  # LETTER KHA
-ग→\uE017;  # LETTER GA
-घ→\uE018;  # LETTER GHA
-ङ→\uE019;  # LETTER NGA
-च→\uE01A;  # LETTER CA
-छ→\uE01B;  # LETTER CHA
-ज→\uE01C;  # LETTER JA
-झ→\uE01D;  # LETTER JHA
-ञ→\uE01E;  # LETTER NYA
-ट→\uE01F;  # LETTER TTA
-ठ→\uE020;  # LETTER TTHA
-ड→\uE021;  # LETTER DDA
-ढ→\uE022;  # LETTER DDHA
-ण→\uE023;  # LETTER NNA
-त→\uE024;  # LETTER TA
-थ→\uE025;  # LETTER THA
-द→\uE026;  # LETTER DA
-ध→\uE027;  # LETTER DHA
-न→\uE028;  # LETTER NA
+ओ→\uE013; # LETTER O
+औ→\uE014; # LETTER AU
+क→\uE015; # LETTER KA
+ख→\uE016; # LETTER KHA
+ग→\uE017; # LETTER GA
+घ→\uE018; # LETTER GHA
+ङ→\uE019; # LETTER NGA
+च→\uE01A; # LETTER CA
+छ→\uE01B; # LETTER CHA
+ज→\uE01C; # LETTER JA
+झ→\uE01D; # LETTER JHA
+ञ→\uE01E; # LETTER NYA
+ट→\uE01F; # LETTER TTA
+ठ→\uE020; # LETTER TTHA
+ड→\uE021; # LETTER DDA
+ढ→\uE022; # LETTER DDHA
+ण→\uE023; # LETTER NNA
+त→\uE024; # LETTER TA
+थ→\uE025; # LETTER THA
+द→\uE026; # LETTER DA
+ध→\uE027; # LETTER DHA
+न→\uE028; # LETTER NA
 ऩ→\uE029;
-प→\uE02A;  # LETTER PA
-फ→\uE02B;  # LETTER PHA
-ब→\uE02C;  # LETTER BA
-भ→\uE02D;  # LETTER BHA
-म→\uE02E;  # LETTER MA
-य→\uE02F;  # LETTER YA
-र→\uE030;  # LETTER RA
+प→\uE02A; # LETTER PA
+फ→\uE02B; # LETTER PHA
+ब→\uE02C; # LETTER BA
+भ→\uE02D; # LETTER BHA
+म→\uE02E; # LETTER MA
+य→\uE02F; # LETTER YA
+र→\uE030; # LETTER RA
 ऱ→\uE031;
-ल→\uE032;  # LETTER LA
-ळ→\uE033;  # LETTER LLA
+ल→\uE032; # LETTER LA
+ळ→\uE033; # LETTER LLA
 ऴ→\uE034;
-व→\uE035;  # LETTER VA
-श→\uE036;  # LETTER SHA
-ष→\uE037;  # LETTER SSA
-स→\uE038;  # LETTER SA
-ह→\uE039;  # LETTER HA
-\u093C→\uE03C;  # SIGN NUKTA
-ऽ→\uE03D;  # SIGN AVAGRAHA
-ा→\uE03E;  # VOWEL SIGN AA
-ि→\uE03F;  # VOWEL SIGN I
-ी→\uE040;  # VOWEL SIGN II
-\u0941→\uE041;  # VOWEL SIGN U
-\u0942→\uE042;  # VOWEL SIGN UU
-\u0943→\uE043;  # VOWEL SIGN VOCALIC R
-\u0944→\uE044;  # VOWEL SIGN VOCALIC RR
-\u0945→\uE045;  # VOWEL SIGN CANDRA E
+व→\uE035; # LETTER VA
+श→\uE036; # LETTER SHA
+ष→\uE037; # LETTER SSA
+स→\uE038; # LETTER SA
+ह→\uE039; # LETTER HA
+\u093C→\uE03C; # SIGN NUKTA
+ऽ→\uE03D; # SIGN AVAGRAHA
+ा→\uE03E; # VOWEL SIGN AA
+ि→\uE03F; # VOWEL SIGN I
+ी→\uE040; # VOWEL SIGN II
+\u0941→\uE041; # VOWEL SIGN U
+\u0942→\uE042; # VOWEL SIGN UU
+\u0943→\uE043; # VOWEL SIGN VOCALIC R
+\u0944→\uE044; # VOWEL SIGN VOCALIC RR
+\u0945→\uE045; # VOWEL SIGN CANDRA E
 \u0946→\uE046; # UNMAPPED VOWEL SIGN SHORT E
-\u0947→\uE047;  # VOWEL SIGN E
-\u0948→\uE048;  # VOWEL SIGN AI
-ॉ→\uE049;  # VOWEL SIGN CANDRA O
+\u0947→\uE047; # VOWEL SIGN E
+\u0948→\uE048; # VOWEL SIGN AI
+ॉ→\uE049; # VOWEL SIGN CANDRA O
 ॊ→\uE04A; # UNMAPPED VOWEL SIGN SHORT O
-ो→\uE04B;  # VOWEL SIGN O
-ौ→\uE04C;  # VOWEL SIGN AU
-\u094D→\uE04D;  # SIGN VIRAMA
-ॐ→\uE050;  # OM
-\u0951→\uE051;       # UNMAPPED STRESS SIGN UDATTA
-\u0952→\uE052;       # UNMAPPED STRESS SIGN ANUDATTA
-\u0953→\uE053;       # UNMAPPED GRAVE ACCENT
-\u0954→\uE054;       # UNMAPPED ACUTE ACCENT
+ो→\uE04B; # VOWEL SIGN O
+ौ→\uE04C; # VOWEL SIGN AU
+\u094D→\uE04D; # SIGN VIRAMA
+ॐ→\uE050; # OM
+\u0951→\uE051; # UNMAPPED STRESS SIGN UDATTA
+\u0952→\uE052; # UNMAPPED STRESS SIGN ANUDATTA
+\u0953→\uE053; # UNMAPPED GRAVE ACCENT
+\u0954→\uE054; # UNMAPPED ACUTE ACCENT
 क़→\uE058;
 ख़→\uE059;
 ग़→\uE05A;
 ढ़→\uE05D;
 फ़→\uE05E;
 य़→\uE05F;
-ॠ→\uE060;  # LETTER VOCALIC RR
-ॡ→\uE061;  # LETTER VOCALIC LL
-\u0962→\uE062;  # VOWEL SIGN VOCALIC L
-\u0963→\uE063;  # VOWEL SIGN VOCALIC LL
-।→\uE064;  # DANDA
-॥→\uE065;  # DOUBLE DANDA
-०→\uE066;  # DIGIT ZERO
-१→\uE067;  # DIGIT ONE
-२→\uE068;  # DIGIT TWO
-३→\uE069;  # DIGIT THREE
-४→\uE06A;  # DIGIT FOUR
-५→\uE06B;  # DIGIT FIVE
-६→\uE06C;  # DIGIT SIX
-७→\uE06D;  # DIGIT SEVEN
-८→\uE06E;  # DIGIT EIGHT
-९→\uE06F;  # DIGIT NINE
-॰→\uE070;  # Devanagari-InterIndic: ABBREVIATION SIGN
-ॽ→\uE082;  # Devanagari Glottal Stop
+ॠ→\uE060; # LETTER VOCALIC RR
+ॡ→\uE061; # LETTER VOCALIC LL
+\u0962→\uE062; # VOWEL SIGN VOCALIC L
+\u0963→\uE063; # VOWEL SIGN VOCALIC LL
+।→\uE064; # DANDA
+॥→\uE065; # DOUBLE DANDA
+०→\uE066; # DIGIT ZERO
+१→\uE067; # DIGIT ONE
+२→\uE068; # DIGIT TWO
+३→\uE069; # DIGIT THREE
+४→\uE06A; # DIGIT FOUR
+५→\uE06B; # DIGIT FIVE
+६→\uE06C; # DIGIT SIX
+७→\uE06D; # DIGIT SEVEN
+८→\uE06E; # DIGIT EIGHT
+९→\uE06F; # DIGIT NINE
+॰→\uE070; # Devanagari-InterIndic: ABBREVIATION SIGN
+ॽ→\uE082; # Devanagari Glottal Stop
index 3d8183bf2020cb39f90b1fd9c93b222826243f43..11930fd3c12ad2c477be145338af35fb9ed5b5ff 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [აბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰ] ;
 :: NFD (NFC) ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 ა → a ; # GEORGIAN LETTER AN
 ბ → b ; # GEORGIAN LETTER BAN
 გ → g ; # GEORGIAN LETTER GAN
index a4a068a093371c5ce6743edae1c9dd96742a5ec1..0a1a187c5d99d28323ddd0478012584836bd9e7f 100644 (file)
@@ -52,7 +52,7 @@ $iotasub → i ;
 Α ($macron?) $rough } $beforeLower → H | α $1;
 Ε $rough } $beforeLower → H | ε;
 Η $rough } $beforeLower → H | η ;
-Ι ($ddot?) $rough } $beforeLower → H | ι  $1;
+Ι ($ddot?) $rough } $beforeLower → H | ι $1;
 Ο $rough } $beforeLower → H | ο ;
 Υ $rough } $beforeLower → H | υ ;
 Ω ($ddot?) $rough } $beforeLower → H | ω $1;
@@ -62,7 +62,7 @@ $iotasub → i ;
 Ι ($glower $ddot?) $rough → H | ι $1 ;
 Ο ($glower) $rough → H | ο $1 ;
 Υ ($glower) $rough → H | υ $1 ;
-Ω ($glower  $ddot?) $rough → H | ω $1 ;
+Ω ($glower $ddot?) $rough → H | ω $1 ;
 ($lcgvowel + $ddotmac? ) $rough → h | $1 ;
 ($gvowel + $ddotmac? ) $rough → H | $1 ;
 | $1 $rough ← h ($evowel $macron $ddot? $evowel2_i $macron?) ;
@@ -71,10 +71,10 @@ $iotasub → i ;
 | $1 $rough ← H ([AEIOUY] $macron $ddot? $evowel2_i $macron?) ;
 | $1 $rough ← H ([AEIOUY] $ddot? $evowel2 $macron?) ;
 | $1 $rough ← H ([AEIOUY] $macron? $ddot?) ;
-| A $1 $rough ← H a ($macron  $ddot? $evowel2_i $macron?) ;
-| E $1 $rough ← H e ($macron  $ddot? $evowel2_i $macron?) ;
-| I $1 $rough ← H i ($macron  $ddot? $evowel2_i $macron?) ;
-| O $1 $rough ← H o ($macron  $ddot? $evowel2_i $macron?) ;
+| A $1 $rough ← H a ($macron $ddot? $evowel2_i $macron?) ;
+| E $1 $rough ← H e ($macron $ddot? $evowel2_i $macron?) ;
+| I $1 $rough ← H i ($macron $ddot? $evowel2_i $macron?) ;
+| O $1 $rough ← H o ($macron $ddot? $evowel2_i $macron?) ;
 | U $1 $rough ← H u ($macron $ddot? $evowel2_i $macron?) ;
 | Y $1 $rough ← H y ($macron $ddot? $evowel2_i $macron?) ;
 | A $1 $rough ← H a ($ddot? $evowel2 $macron?) ;
@@ -104,7 +104,7 @@ $smooth → ;
 Φ ↔ PH ;
 ψ ↔ ps ;
 ω ↔ o $macron ;
-Ω ↔  O $macron;
+Ω ↔ O $macron;
 α ↔ a ;
 Α ↔ A ;
 β ↔ b ;
@@ -167,9 +167,9 @@ $vowel { Υ ↔ U ;
 Χ } $beforeLower ↔ Ch ;
 Χ ↔ CH ;
 $ignore = [[:Mark:]''] * ;
-| k  ← c ;
+| k ← c ;
 | ph ← f ;
-| i  ← j ;
+| i ← j ;
 | k ← q ;
 | b ← v } $vowel ;
 | b ← w } $vowel;
@@ -179,8 +179,8 @@ $ignore = [[:Mark:]''] * ;
 | Ph ← F ;
 | I ← J ;
 | K ← Q ;
-| B ← V  } $vowel ;
-| B ← W  } $vowel ;
+| B ← V } $vowel ;
+| B ← W } $vowel ;
 | U ← V ;
 | U ← W ;
 $rough } $ignore [:UppercaseLetter:] → H ;
index d7aaa104795dec3fb42804cc76415d5274bf85c2..d28b8f0748351e17ed3d4c2150383ee32333dc6f 100644 (file)
@@ -16,7 +16,7 @@ $upperVowels = [ΑΕΗΙΟΥΩ] ;
 $lowerVowels = [αεηιουω] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 [ἈἉᾼᾈᾉ] → Α ; # GREEK CAPITAL LETTER ALPHA
 [ἀἁᾳᾀᾁ] → α ; # GREEK SMALL LETTER ALPHA
 [ἊἋἌἍἎἏᾊᾋᾌᾍᾎᾏᾺΆ] → Ά ; # GREEK CAPITAL LETTER ALPHA WITH TONOS
@@ -106,11 +106,11 @@ $wordBoundary{γκ → g ; # GREEK SMALL LETTER GAMMA + SMALL KAPPA
 γ}[αοω [$lowerConsonants - [γξχ]]] → g ; # GREEK SMALL LETTER GAMMA
 γ}ου → g ; # GREEK SMALL LETTER GAMMA
 Γ}[ΑΕΟΥ]Ι → Y ; # GREEK CAPITAL LETTER GAMMA
-Γ}[ΕΗΙΥ]  → Y ; # GREEK CAPITAL LETTER GAMMA
+Γ}[ΕΗΙΥ] → Y ; # GREEK CAPITAL LETTER GAMMA
 Γ}[αεου]ι → Y ; # GREEK CAPITAL LETTER GAMMA
-Γ}[εηιυ]  → Y ; # GREEK CAPITAL LETTER GAMMA
+Γ}[εηιυ] → Y ; # GREEK CAPITAL LETTER GAMMA
 γ}[αεου]ι → y ; # GREEK SMALL LETTER GAMMA
-γ}[εηιυ]  → y ; # GREEK SMALL LETTER GAMMA
+γ}[εηιυ] → y ; # GREEK SMALL LETTER GAMMA
 Γ}[ΞΧ] → N ; # GREEK CAPITAL LETTER GAMMA
 Γ}[ξχ] → N ; # GREEK CAPITAL LETTER GAMMA
 γ}[ξχ] → n ; # GREEK SMALL LETTER GAMMA
index a1c5437d47e28bc8b3912ef9e68dca6d882cabd3..92b2bab396a7dccba46f03f0a5d0f1cbe2f8822a 100644 (file)
@@ -48,7 +48,7 @@ $iotasub → ;
 Ψ ↔ PS ;
 ψ ↔ ps ;
 ω ↔ o $under ;
-Ω ↔  O $under;
+Ω ↔ O $under;
 [^[:L:]$accent] { μπ → b ;
 μπ } [^[:L:]$accent] → b ;
 [^[:L:]$accent] { [Μμ][Ππ] → B ;
@@ -127,8 +127,8 @@ $afterLetter { ς ↔ $afterLetter { s ;
 Χ } $beforeLower ↔ Ch ;
 Χ ↔ CH ;
 | ch ← h ;
-| k  ← c ;
-| i  ← j ;
+| k ← c ;
+| i ← j ;
 | k ← q ;
 | b ← u } $vowel ;
 | b ← w } $vowel ;
index 4d46e5a7c6f85fcb446419cd85e18da0dfbd5cf5..ccc97dc9ea090d1a442f50b9f90cb74a28bf0630 100644 (file)
@@ -87,5 +87,5 @@
 ૭→\uE06D; # DIGIT SEVEN
 ૮→\uE06E; # DIGIT EIGHT
 ૯→\uE06F; # DIGIT NINE
-।→\uE064;        # DANDA
-॥→\uE065;        # DOUBLE DANDA
+।→\uE064; # DANDA
+॥→\uE065; # DOUBLE DANDA
index f0911acaba6449aadde3ef6aac34d4da506b3219..aa240364e9fe95ad957d06283568b1ef825e7b57 100644 (file)
@@ -7,79 +7,79 @@
 # File: Gurmukhi_InterIndic.txt
 # Generated from CLDR 
 #
-\u0A01→\uE001;  # SIGN CHANDRABINDU
-\u0A02→\uE002;  # SIGN BINDI
-ਅ→\uE005;  # LETTER A
-ਆ→\uE006;  # LETTER AA
-ਇ→\uE007;  # LETTER I
-ਈ→\uE008;  # LETTER II
-ਉ→\uE009;  # LETTER U
-ਊ→\uE00A;  # LETTER UU
-\u0A0C→\uE032;  # FALLBACK : VOCALLIC LA
-ਏ→\uE00F;  # LETTER EE
-ਐ→\uE010;  # LETTER AI
-ਓ→\uE013;  # LETTER OO
-ਔ→\uE014;  # LETTER AU
-ਕ→\uE015;  # LETTER KA
-ਖ→\uE016;  # LETTER KHA
-ਗ→\uE017;  # LETTER GA
-ਘ→\uE018;  # LETTER GHA
-ਙ→\uE019;  # LETTER NGA
-ਚ→\uE01A;  # LETTER CA
-ਛ→\uE01B;  # LETTER CHA
-ਜ→\uE01C;  # LETTER JA
-ਝ→\uE01D;  # LETTER JHA
-ਞ→\uE01E;  # LETTER NYA
-ਟ→\uE01F;  # LETTER TTA
-ਠ→\uE020;  # LETTER TTHA
-ਡ→\uE021;  # LETTER DDA
-ਢ→\uE022;  # LETTER DDHA
-ਣ→\uE023;  # LETTER NNA
-ਤ→\uE024;  # LETTER TA
-ਥ→\uE025;  # LETTER THA
-ਦ→\uE026;  # LETTER DA
-ਧ→\uE027;  # LETTER DHA
-ਨ→\uE028;  # LETTER NA
-ਪ→\uE02A;  # LETTER PA
-ਫ→\uE02B;  # LETTER PHA
-ਬ→\uE02C;  # LETTER BA
-ਭ→\uE02D;  # LETTER BHA
-ਮ→\uE02E;  # LETTER MA
-ਯ→\uE02F;  # LETTER YA
-ਰ→\uE030;  # LETTER RA
-ਲ→\uE032;  # LETTER LA
+\u0A01→\uE001; # SIGN CHANDRABINDU
+\u0A02→\uE002; # SIGN BINDI
+ਅ→\uE005; # LETTER A
+ਆ→\uE006; # LETTER AA
+ਇ→\uE007; # LETTER I
+ਈ→\uE008; # LETTER II
+ਉ→\uE009; # LETTER U
+ਊ→\uE00A; # LETTER UU
+\u0A0C→\uE032; # FALLBACK : VOCALLIC LA
+ਏ→\uE00F; # LETTER EE
+ਐ→\uE010; # LETTER AI
+ਓ→\uE013; # LETTER OO
+ਔ→\uE014; # LETTER AU
+ਕ→\uE015; # LETTER KA
+ਖ→\uE016; # LETTER KHA
+ਗ→\uE017; # LETTER GA
+ਘ→\uE018; # LETTER GHA
+ਙ→\uE019; # LETTER NGA
+ਚ→\uE01A; # LETTER CA
+ਛ→\uE01B; # LETTER CHA
+ਜ→\uE01C; # LETTER JA
+ਝ→\uE01D; # LETTER JHA
+ਞ→\uE01E; # LETTER NYA
+ਟ→\uE01F; # LETTER TTA
+ਠ→\uE020; # LETTER TTHA
+ਡ→\uE021; # LETTER DDA
+ਢ→\uE022; # LETTER DDHA
+ਣ→\uE023; # LETTER NNA
+ਤ→\uE024; # LETTER TA
+ਥ→\uE025; # LETTER THA
+ਦ→\uE026; # LETTER DA
+ਧ→\uE027; # LETTER DHA
+ਨ→\uE028; # LETTER NA
+ਪ→\uE02A; # LETTER PA
+ਫ→\uE02B; # LETTER PHA
+ਬ→\uE02C; # LETTER BA
+ਭ→\uE02D; # LETTER BHA
+ਮ→\uE02E; # LETTER MA
+ਯ→\uE02F; # LETTER YA
+ਰ→\uE030; # LETTER RA
+ਲ→\uE032; # LETTER LA
 ਲ਼→\uE033; # FALLBACK
-ਵ→\uE035;  # LETTER VA
+ਵ→\uE035; # LETTER VA
 ਸ਼→\uE036;
 ਸ\0a3c→\uE036; # FALLBACK
-ਸ→\uE038;  # LETTER SA
-ਹ→\uE039;  # LETTER HA
-\u0A3C→\uE03C;  # SIGN NUKTA
-ਾ→\uE03E;  # VOWEL SIGN AA
-ਿ→\uE03F;  # VOWEL SIGN I
-ੀ→\uE040;  # VOWEL SIGN II
-\u0A41→\uE041;  # VOWEL SIGN U
-\u0A42→\uE042;  # VOWEL SIGN UU
-\u0A47→\uE047;  # VOWEL SIGN EE
-\u0A48→\uE048;  # VOWEL SIGN AI
-\u0A4B→\uE04B;  # VOWEL SIGN OO
-\u0A4C→\uE04C;  # VOWEL SIGN AU
-\u0A4D→\uE04D;  # SIGN VIRAMA
-ੜ→\uE05C;  # LETTER RRA
-੦→\uE066;  # DIGIT ZERO
-੧→\uE067;  # DIGIT ONE
-੨→\uE068;  # DIGIT TWO
-੩→\uE069;  # DIGIT THREE
-੪→\uE06A;  # DIGIT FOUR
-੫→\uE06B;  # DIGIT FIVE
-੬→\uE06C;  # DIGIT SIX
-੭→\uE06D;  # DIGIT SEVEN
-੮→\uE06E;  # DIGIT EIGHT
-੯→\uE06F;  # DIGIT NINE
-\u0A70→\uE07C;  # TIPPI
-\u0A71→\uE07D;  # ADDAK
-ੲ→\uE07E;  # IRI
-ੳ→\uE07F;  # URA
-ੴ→\uE080;  # EK ONKAR
-।→\uE064;        # DANDA
-॥→\uE065;        # DOUBLE DANDA
+ਸ→\uE038; # LETTER SA
+ਹ→\uE039; # LETTER HA
+\u0A3C→\uE03C; # SIGN NUKTA
+ਾ→\uE03E; # VOWEL SIGN AA
+ਿ→\uE03F; # VOWEL SIGN I
+ੀ→\uE040; # VOWEL SIGN II
+\u0A41→\uE041; # VOWEL SIGN U
+\u0A42→\uE042; # VOWEL SIGN UU
+\u0A47→\uE047; # VOWEL SIGN EE
+\u0A48→\uE048; # VOWEL SIGN AI
+\u0A4B→\uE04B; # VOWEL SIGN OO
+\u0A4C→\uE04C; # VOWEL SIGN AU
+\u0A4D→\uE04D; # SIGN VIRAMA
+ੜ→\uE05C; # LETTER RRA
+੦→\uE066; # DIGIT ZERO
+੧→\uE067; # DIGIT ONE
+੨→\uE068; # DIGIT TWO
+੩→\uE069; # DIGIT THREE
+੪→\uE06A; # DIGIT FOUR
+੫→\uE06B; # DIGIT FIVE
+੬→\uE06C; # DIGIT SIX
+੭→\uE06D; # DIGIT SEVEN
+੮→\uE06E; # DIGIT EIGHT
+੯→\uE06F; # DIGIT NINE
+\u0A70→\uE07C; # TIPPI
+\u0A71→\uE07D; # ADDAK
+ੲ→\uE07E; # IRI
+ੳ→\uE07F; # URA
+ੴ→\uE080; # EK ONKAR
+।→\uE064; # DANDA
+॥→\uE065; # DOUBLE DANDA
index 55974024fb02c26eecf9be7e1ce62e90d48e95dd..9baba319eda818ba6d20de7af9e222cc060b9dbb 100644 (file)
@@ -29,7 +29,7 @@ $letterAfter = [:M:]* [:L:] ;
 ל ↔ l ;
 מ ↔ m } $letterAfter;
 ם ↔ m ;
-נ ↔ n  } $letterAfter;
+נ ↔ n } $letterAfter;
 ן ↔ n ;
 ס ↔ s ;
 ע ↔ ʻ ;
@@ -37,7 +37,7 @@ $letterAfter = [:M:]* [:L:] ;
 ף ↔ p ;
 ק ↔ q ;
 ר ↔ r ;
-װ → |  וו; # HEBREW LIGATURE YIDDISH DOUBLE VAV
+װ → | וו; # HEBREW LIGATURE YIDDISH DOUBLE VAV
 ױ → | וי; # HEBREW LIGATURE YIDDISH VAV YOD
 ײ → | יי ; # HEBREW LIGATURE YIDDISH DOUBLE YOD
 \u05BC ↔ \u0307 ; # dagesh just goes to overdot for now
@@ -45,23 +45,23 @@ $letterAfter = [:M:]* [:L:] ;
 \u05C2 ↔ \u0302 ; # sin dot -→ s
 $above = [^[:ccc=0:][:ccc=230:]]*;
 ‎\u05B2‎ → à ;
-‎\u05B2‎ $1← a ($above)  \u0300;
+‎\u05B2‎ $1← a ($above) \u0300;
 ‎\u05B8‎ → á ;
-‎\u05B8‎  $1 ← a ($above)  \u0301;
+‎\u05B8‎ $1 ← a ($above) \u0301;
 ‎\u05B1‎ → è ;
-‎\u05B1‎  $1 ← e ($above)  \u0300;
+‎\u05B1‎ $1 ← e ($above) \u0300;
 ‎\u05B5‎ → é ;
-‎\u05B5‎  $1 ← e ($above)   \u0301;
+‎\u05B5‎ $1 ← e ($above) \u0301;
 ‎\u05B0‎ → e \u0306 ;
-‎\u05B0‎  $1 ← e ($above)   \u0306;
+‎\u05B0‎ $1 ← e ($above) \u0306;
 ‎\u05B9‎ → ò ;
-‎\u05B9‎  $1 ← o ($above)   \u0300;
+‎\u05B9‎ $1 ← o ($above) \u0300;
 \u05B4 ↔ i ;
 \u05BB ↔ u ;
 \u05B7 ↔ a ;
 \u05B6 ↔ e ;
 \u05B3 ↔ o ;
-\u05BF ↔   \u0304 ;
+\u05BF ↔ \u0304 ;
 ק ← c ;
 פ ← f } $letterAfter;
 ף ← f ;
@@ -70,4 +70,4 @@ $above = [^[:ccc=0:][:ccc=230:]]*;
 כס ← x ;
 :: (lower);
 :: nfc (nfd) ;
-:: ([[:Latin:] [:^ccc=0:] [ʻ-ʼ\u0300-\u0302\u0307\u030C\u0327\u0331\u0340-\u0341    \u0304 ]]);
+:: ([[:Latin:] [:^ccc=0:] [ʻ-ʼ\u0300-\u0302\u0307\u030C\u0327\u0331\u0340-\u0341 \u0304 ]]);
index ead5cc65b175d81dae1b1351d28779e7baf2bd91..5084e5f379ecd80c1a1dc4a3f4bc71ec9c8ddfef 100644 (file)
 # File: IPA_XSampa.txt
 # Generated from CLDR 
 #
-$t = '_';  # X-SAMPA representation of IPA tie bar.
+$t = '_'; # X-SAMPA representation of IPA tie bar.
 ::NFD;
-ʯ ↔ 'z`_w=';   # LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
-ǁ ↔ '|\|\';    # LATIN LETTER LATERAL CLICK
-ʄ ↔ 'J\_<';    # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
-ʛ ↔ 'G\_<';    # LATIN LETTER SMALL CAPITAL G WITH HOOK
-ʮ ↔ 'z_w=';    # LATIN SMALL LETTER TURNED H WITH FISHHOOK
-\u1DC4 ↔ '_H_T';    # COMBINING MACRON-ACUTE
-\u1DC5 ↔ '_B_L';    # COMBINING GRAVE-MACRON
-\u1DC8 ↔ '_R_F';    # COMBINING GRAVE-ACUTE-GRAVE
-ɓ ↔ 'b_<';     # LATIN SMALL LETTER B WITH HOOK
-ɗ ↔ 'd_<';     # LATIN SMALL LETTER D WITH HOOK
-ɠ ↔ 'g_<';     # LATIN SMALL LETTER G WITH HOOK
-ɻ ↔ 'r\`';     # LATIN SMALL LETTER TURNED R WITH HOOK
-↗ ↔ '<R>';    # NORTH EAST ARROW
-↘ ↔ '<F>';    # SOUTH EAST ARROW
-ħ ↔ 'X\';      # LATIN SMALL LETTER H WITH STROKE
-ǀ ↔ '|\';      # LATIN LETTER DENTAL CLICK
-ǂ ↔ '=\';      # LATIN LETTER ALVEOLAR CLICK
-ǃ ↔ '!\';      # LATIN LETTER RETROFLEX CLICK
-ɕ ↔ 's\';      # LATIN SMALL LETTER C WITH CURL
-ɖ ↔ 'd`';      # LATIN SMALL LETTER D WITH TAIL
-ɘ ↔ '@\';      # LATIN SMALL LETTER REVERSED E
-ɚ ↔ '@`';      # LATIN SMALL LETTER SCHWA WITH HOOK
-ɝ ↔ '3`';      # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
-ɞ ↔ '3\';      # LATIN SMALL LETTER CLOSED REVERSED OPEN E
-ɟ ↔ 'J\';      # LATIN SMALL LETTER DOTLESS J WITH STROKE
-ɢ ↔ 'G\';      # LATIN LETTER SMALL CAPITAL G
-ɦ ↔ 'h\';      # LATIN SMALL LETTER H WITH HOOK
-ɧ ↔ 'x\';      # LATIN SMALL LETTER HENG WITH HOOK
-ɭ ↔ 'l`';      # LATIN SMALL LETTER L WITH RETROFLEX HOOK
-ɮ ↔ 'K\';      # LATIN SMALL LETTER LEZH
-ɰ ↔ 'M\';      # LATIN SMALL LETTER TURNED M WITH LONG LEG
-ɳ ↔ 'n`';      # LATIN SMALL LETTER N WITH RETROFLEX HOOK
-ɴ ↔ 'N\';      # LATIN LETTER SMALL CAPITAL N
-ɸ ↔ 'p\';      # LATIN SMALL LETTER PHI
-ɹ ↔ 'r\';      # LATIN SMALL LETTER TURNED R
-ɺ ↔ 'l\';      # LATIN SMALL LETTER TURNED R WITH LONG LEG
-ɽ ↔ 'r`';      # LATIN SMALL LETTER R WITH TAIL
-ʀ ↔ 'R\';      # LATIN LETTER SMALL CAPITAL R
-ʂ ↔ 's`';      # LATIN SMALL LETTER S WITH HOOK
-ʈ ↔ 't`';      # LATIN SMALL LETTER T WITH RETROFLEX HOOK
-ʐ ↔ 'z`';      # LATIN SMALL LETTER Z WITH RETROFLEX HOOK
-ʑ ↔ 'z\';      # LATIN SMALL LETTER Z WITH CURL
-ʕ ↔ '?\';      # LATIN LETTER PHARYNGEAL VOICED FRICATIVE
-ʘ ↔ 'O\';      # LATIN LETTER BILABIAL CLICK
-ʙ ↔ 'B\';      # LATIN LETTER SMALL CAPITAL B
-ʜ ↔ 'H\';      # LATIN LETTER SMALL CAPITAL H
-ʝ ↔ 'j\';      # LATIN SMALL LETTER J WITH CROSSED-TAIL
-ʟ ↔ 'L\';      # LATIN LETTER SMALL CAPITAL L
-ʡ ↔ '>\';      # LATIN LETTER GLOTTAL STOP WITH STROKE
-ʢ ↔ '<\';      # LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE
-ʰ ↔ '_h';      # MODIFIER LETTER SMALL H
-ʷ ↔ '_w';      # MODIFIER LETTER SMALL W
-ʼ ↔ '_>';      # MODIFIER LETTER APOSTROPHE
-ˆ ↔ '_\';      # MODIFIER LETTER CIRCUMFLEX ACCENT
-ˇ ↔ '_/';      # CARON
-ˑ ↔ ':\';      # MODIFIER LETTER HALF TRIANGULAR COLON
-ˠ ↔ '_G';      # MODIFIER LETTER SMALL GAMMA
-ˡ ↔ '_l';      # MODIFIER LETTER SMALL L
-ˤ ↔ '_?\';     # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-\u0300 ↔ '_L';      # COMBINING GRAVE ACCENT
-\u0301 ↔ '_H';      # COMBINING ACUTE ACCENT
-\u0302 ↔ '_F';      # COMBINING CIRCUMFLEX ACCENT
-\u0304 ↔ '_M';      # COMBINING MACRON
-\u0306 ↔ '_X';      # COMBINING BREVE
-\u0308 ↔ '_"';      # COMBINING DIAERESIS
-\u030B ↔ '_T';      # COMBINING DOUBLE ACUTE ACCENT
-\u030C ↔ '_R';      # COMBINING CARON
-\u030F ↔ '_B';      # COMBINING DOUBLE GRAVE ACCENT
-\u0318 ↔ '_A';      # COMBINING LEFT TACK BELOW
-\u0319 ↔ '_q';      # COMBINING RIGHT TACK BELOW
-\u031A ↔ '_}';      # COMBINING LEFT ANGLE ABOVE
-\u031C ↔ '_c';      # COMBINING LEFT HALF RING BELOW
-\u031D ↔ '_r';      # COMBINING UP TACK BELOW
-\u031E ↔ '_o';      # COMBINING DOWN TACK BELOW
-\u031F ↔ '_+';      # COMBINING PLUS SIGN BELOW
-\u0320 ↔ '_-';      # COMBINING MINUS SIGN BELOW
-\u0324 ↔ '_t';      # COMBINING DIAERESIS BELOW
-\u0325 ↔ '_0';      # COMBINING RING BELOW
-\u032A ↔ '_d';      # COMBINING BRIDGE BELOW
-\u032C ↔ '_v';      # COMBINING CARON BELOW
-\u032F ↔ '_^';      # COMBINING INVERTED BREVE BELOW
-\u0330 ↔ '_k';      # COMBINING TILDE BELOW
-\u0334 ↔ '_e';      # COMBINING TILDE OVERLAY
-\u0339 ↔ '_O';      # COMBINING RIGHT HALF RING BELOW
-\u033A ↔ '_a';      # COMBINING INVERTED BRIDGE BELOW
-\u033B ↔ '_m';      # COMBINING SQUARE BELOW
-\u033C ↔ '_N';      # COMBINING SEAGULL BELOW
-\u033D ↔ '_x';      # COMBINING X ABOVE
-ᵻ ↔ 'I\';      # LATIN SMALL CAPITAL LETTER I WITH STROKE
-ᵿ ↔ 'U\';      # LATIN SMALL CAPITAL LETTER U WITH STROKE
-ⁿ ↔ '_n';      # MODIFIER LETTER LATIN SMALL LETTER N
-ʋ ← 'v\';      # LATIN SMALL LETTER V WITH HOOK
-ʲ ← '_j';      # MODIFIER LETTER SMALL H
-\u0303 ← '_~';      # COMBINING TILDE
-\u0329 ← '_=';      # COMBINING VERTICAL LINE BELOW
-c\u0327 ↔ C;        # LATIN SMALL LETTER C WITH CEDILLA (decomposed)
-æ ↔ '{';       # LATIN SMALL LETTER AE
-ð ↔ D;         # LATIN SMALL LETTER ETH
-ø ↔ 2;         # LATIN SMALL LETTER O WITH STROKE
-ŋ ↔ N;         # LATIN SMALL LETTER ENG
-œ ↔ 9;         # LATIN SMALL LIGATURE OE
-ɐ ↔ 6;         # LATIN SMALL LETTER TURNED A
-ɑ ↔ A;         # LATIN SMALL LETTER ALPHA
-ɒ ↔ Q;         # LATIN SMALL LETTER TURNED ALPHA
-ɔ ↔ O;         # LATIN SMALL LETTER OPEN O
-ə ↔ '@';       # LATIN SMALL LETTER SCHWA
-ɛ ↔ E;         # LATIN SMALL LETTER OPEN E
-ɜ ↔ 3;         # LATIN SMALL LETTER REVERSED OPEN E
-ɡ ↔ g;         # LATIN SMALL LETTER SCRIPT G
-ɣ ↔ G;         # LATIN SMALL LETTER GAMMA
-ɤ ↔ 7;         # LATIN SMALL LETTER RAMS HORN
-ɥ ↔ H;         # LATIN SMALL LETTER TURNED H
-ɨ ↔ 1;         # LATIN SMALL LETTER I WITH STROKE
-ɪ ↔ I;         # LATIN LETTER SMALL CAPITAL I
-ɫ ↔ 5;         # LATIN SMALL LETTER L WITH MIDDLE TILDE
-ɬ ↔ K;         # LATIN SMALL LETTER L WITH BELT
-ɯ ↔ M;         # LATIN SMALL LETTER TURNED M
-ɱ ↔ F;         # LATIN SMALL LETTER M WITH HOOK
-ɲ ↔ J;         # LATIN SMALL LETTER N WITH LEFT HOOK
-ɵ ↔ 8;         # LATIN SMALL LETTER BARRED O
-ɶ ↔ '&';       # LATIN LETTER SMALL CAPITAL OE
-ɾ ↔ 4;         # LATIN SMALL LETTER R WITH FISHHOOK
-ʁ ↔ R;         # LATIN LETTER SMALL CAPITAL INVERTED R
-ʃ ↔ S;         # LATIN SMALL LETTER ESH
-ʉ ↔ '}';       # LATIN SMALL LETTER U BAR
-ʊ ↔ U;         # LATIN SMALL LETTER UPSILON
-ʋ ↔ P;         # LATIN SMALL LETTER V WITH HOOK
-ʌ ↔ V;         # LATIN SMALL LETTER TURNED V
-ʍ ↔ W;         # LATIN SMALL LETTER TURNED W
-ʎ ↔ L;         # LATIN SMALL LETTER TURNED Y
-ʏ ↔ Y;         # LATIN LETTER SMALL CAPITAL Y
-ʒ ↔ Z;         # LATIN SMALL LETTER EZH
-ʔ ↔ '?';       # LATIN LETTER GLOTTAL STOP
-ʲ ↔ \';        # MODIFIER LETTER SMALL J
-ˈ ↔ '"';       # MODIFIER LETTER VERTICAL LINE
-ˌ ↔ '%';       # MODIFIER LETTER LOW VERTICAL LINE
-ː ↔ ':';       # MODIFIER LETTER TRIANGULAR COLON
-˞ ↔ '`';       # MODIFIER LETTER RHOTIC HOOK
-\u0303 ↔ '~';       # COMBINING TILDE
-\u0329 ↔ '=';       # COMBINING VERTICAL LINE BELOW
-\u0361 ↔ $t;        # COMBINING DOUBLE INVERTED BREVE
-β ↔ B;         # GREEK SMALL LETTER BETA
-θ ↔ T;         # GREEK SMALL LETTER THETA
-χ ↔ X;         # GREEK SMALL LETTER CHI
-↑ ↔ '^';       # UPWARDS ARROW
-↓ ↔ '!';       # DOWNWARDS ARROW
-φ → 'p\';      # GREEK SMALL LETTER PHI
-ɩ → I;         # LATIN SMALL LETTER IOTA
-ɷ → U;         # LATIN SMALL LETTER CLOSED OMEGA
-ɼ → 'r_r';     # LATIN SMALL LETTER R WITH LONG LEG
-ɿ → 'z=';      # LATIN SMALL LETTER REVERSED R WITH FISHHOOK
-ʅ → 'z`=';     # LATIN SMALL LETTER SQUAT REVERSED ESH
-ʆ → S\';       # LATIN SMALL LETTER ESH WITH CURL
-ʇ → '|\' ;     # LATIN SMALL LETTER TURNED T
-ʓ → Z\';       # LATIN SMALL LETTER EZH WITH CURL
-ʖ → '|\|\';    # LATIN LETTER INVERTED GLOTTAL STOP
-ʗ → '!\';      # LATIN LETTER STRETCHED C
-ʚ → '3\';      # LATIN SMALL LETTER CLOSED OPEN E
-ʠ → 'G\_<_0';  # LATIN SMALL LETTER Q WITH HOOK
-ʣ → d $t z;    # LATIN SMALL LETTER DZ DIGRAPH
-ʤ → d $t Z;    # LATIN SMALL LETTER DEZH DIGRAPH
+ʯ ↔ 'z`_w='; # LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+ǁ ↔ '|\|\'; # LATIN LETTER LATERAL CLICK
+ʄ ↔ 'J\_<'; # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
+ʛ ↔ 'G\_<'; # LATIN LETTER SMALL CAPITAL G WITH HOOK
+ʮ ↔ 'z_w='; # LATIN SMALL LETTER TURNED H WITH FISHHOOK
+\u1DC4 ↔ '_H_T'; # COMBINING MACRON-ACUTE
+\u1DC5 ↔ '_B_L'; # COMBINING GRAVE-MACRON
+\u1DC8 ↔ '_R_F'; # COMBINING GRAVE-ACUTE-GRAVE
+ɓ ↔ 'b_<'; # LATIN SMALL LETTER B WITH HOOK
+ɗ ↔ 'd_<'; # LATIN SMALL LETTER D WITH HOOK
+ɠ ↔ 'g_<'; # LATIN SMALL LETTER G WITH HOOK
+ɻ ↔ 'r\`'; # LATIN SMALL LETTER TURNED R WITH HOOK
+↗ ↔ '<R>'; # NORTH EAST ARROW
+↘ ↔ '<F>'; # SOUTH EAST ARROW
+ħ ↔ 'X\'; # LATIN SMALL LETTER H WITH STROKE
+ǀ ↔ '|\'; # LATIN LETTER DENTAL CLICK
+ǂ ↔ '=\'; # LATIN LETTER ALVEOLAR CLICK
+ǃ ↔ '!\'; # LATIN LETTER RETROFLEX CLICK
+ɕ ↔ 's\'; # LATIN SMALL LETTER C WITH CURL
+ɖ ↔ 'd`'; # LATIN SMALL LETTER D WITH TAIL
+ɘ ↔ '@\'; # LATIN SMALL LETTER REVERSED E
+ɚ ↔ '@`'; # LATIN SMALL LETTER SCHWA WITH HOOK
+ɝ ↔ '3`'; # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
+ɞ ↔ '3\'; # LATIN SMALL LETTER CLOSED REVERSED OPEN E
+ɟ ↔ 'J\'; # LATIN SMALL LETTER DOTLESS J WITH STROKE
+ɢ ↔ 'G\'; # LATIN LETTER SMALL CAPITAL G
+ɦ ↔ 'h\'; # LATIN SMALL LETTER H WITH HOOK
+ɧ ↔ 'x\'; # LATIN SMALL LETTER HENG WITH HOOK
+ɭ ↔ 'l`'; # LATIN SMALL LETTER L WITH RETROFLEX HOOK
+ɮ ↔ 'K\'; # LATIN SMALL LETTER LEZH
+ɰ ↔ 'M\'; # LATIN SMALL LETTER TURNED M WITH LONG LEG
+ɳ ↔ 'n`'; # LATIN SMALL LETTER N WITH RETROFLEX HOOK
+ɴ ↔ 'N\'; # LATIN LETTER SMALL CAPITAL N
+ɸ ↔ 'p\'; # LATIN SMALL LETTER PHI
+ɹ ↔ 'r\'; # LATIN SMALL LETTER TURNED R
+ɺ ↔ 'l\'; # LATIN SMALL LETTER TURNED R WITH LONG LEG
+ɽ ↔ 'r`'; # LATIN SMALL LETTER R WITH TAIL
+ʀ ↔ 'R\'; # LATIN LETTER SMALL CAPITAL R
+ʂ ↔ 's`'; # LATIN SMALL LETTER S WITH HOOK
+ʈ ↔ 't`'; # LATIN SMALL LETTER T WITH RETROFLEX HOOK
+ʐ ↔ 'z`'; # LATIN SMALL LETTER Z WITH RETROFLEX HOOK
+ʑ ↔ 'z\'; # LATIN SMALL LETTER Z WITH CURL
+ʕ ↔ '?\'; # LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+ʘ ↔ 'O\'; # LATIN LETTER BILABIAL CLICK
+ʙ ↔ 'B\'; # LATIN LETTER SMALL CAPITAL B
+ʜ ↔ 'H\'; # LATIN LETTER SMALL CAPITAL H
+ʝ ↔ 'j\'; # LATIN SMALL LETTER J WITH CROSSED-TAIL
+ʟ ↔ 'L\'; # LATIN LETTER SMALL CAPITAL L
+ʡ ↔ '>\'; # LATIN LETTER GLOTTAL STOP WITH STROKE
+ʢ ↔ '<\'; # LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE
+ʰ ↔ '_h'; # MODIFIER LETTER SMALL H
+ʷ ↔ '_w'; # MODIFIER LETTER SMALL W
+ʼ ↔ '_>'; # MODIFIER LETTER APOSTROPHE
+ˆ ↔ '_\'; # MODIFIER LETTER CIRCUMFLEX ACCENT
+ˇ ↔ '_/'; # CARON
+ˑ ↔ ':\'; # MODIFIER LETTER HALF TRIANGULAR COLON
+ˠ ↔ '_G'; # MODIFIER LETTER SMALL GAMMA
+ˡ ↔ '_l'; # MODIFIER LETTER SMALL L
+ˤ ↔ '_?\'; # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+\u0300 ↔ '_L'; # COMBINING GRAVE ACCENT
+\u0301 ↔ '_H'; # COMBINING ACUTE ACCENT
+\u0302 ↔ '_F'; # COMBINING CIRCUMFLEX ACCENT
+\u0304 ↔ '_M'; # COMBINING MACRON
+\u0306 ↔ '_X'; # COMBINING BREVE
+\u0308 ↔ '_"'; # COMBINING DIAERESIS
+\u030B ↔ '_T'; # COMBINING DOUBLE ACUTE ACCENT
+\u030C ↔ '_R'; # COMBINING CARON
+\u030F ↔ '_B'; # COMBINING DOUBLE GRAVE ACCENT
+\u0318 ↔ '_A'; # COMBINING LEFT TACK BELOW
+\u0319 ↔ '_q'; # COMBINING RIGHT TACK BELOW
+\u031A ↔ '_}'; # COMBINING LEFT ANGLE ABOVE
+\u031C ↔ '_c'; # COMBINING LEFT HALF RING BELOW
+\u031D ↔ '_r'; # COMBINING UP TACK BELOW
+\u031E ↔ '_o'; # COMBINING DOWN TACK BELOW
+\u031F ↔ '_+'; # COMBINING PLUS SIGN BELOW
+\u0320 ↔ '_-'; # COMBINING MINUS SIGN BELOW
+\u0324 ↔ '_t'; # COMBINING DIAERESIS BELOW
+\u0325 ↔ '_0'; # COMBINING RING BELOW
+\u032A ↔ '_d'; # COMBINING BRIDGE BELOW
+\u032C ↔ '_v'; # COMBINING CARON BELOW
+\u032F ↔ '_^'; # COMBINING INVERTED BREVE BELOW
+\u0330 ↔ '_k'; # COMBINING TILDE BELOW
+\u0334 ↔ '_e'; # COMBINING TILDE OVERLAY
+\u0339 ↔ '_O'; # COMBINING RIGHT HALF RING BELOW
+\u033A ↔ '_a'; # COMBINING INVERTED BRIDGE BELOW
+\u033B ↔ '_m'; # COMBINING SQUARE BELOW
+\u033C ↔ '_N'; # COMBINING SEAGULL BELOW
+\u033D ↔ '_x'; # COMBINING X ABOVE
+ᵻ ↔ 'I\'; # LATIN SMALL CAPITAL LETTER I WITH STROKE
+ᵿ ↔ 'U\'; # LATIN SMALL CAPITAL LETTER U WITH STROKE
+ⁿ ↔ '_n'; # MODIFIER LETTER LATIN SMALL LETTER N
+ʋ ← 'v\'; # LATIN SMALL LETTER V WITH HOOK
+ʲ ← '_j'; # MODIFIER LETTER SMALL H
+\u0303 ← '_~'; # COMBINING TILDE
+\u0329 ← '_='; # COMBINING VERTICAL LINE BELOW
+c\u0327 ↔ C; # LATIN SMALL LETTER C WITH CEDILLA (decomposed)
+æ ↔ '{'; # LATIN SMALL LETTER AE
+ð ↔ D; # LATIN SMALL LETTER ETH
+ø ↔ 2; # LATIN SMALL LETTER O WITH STROKE
+ŋ ↔ N; # LATIN SMALL LETTER ENG
+œ ↔ 9; # LATIN SMALL LIGATURE OE
+ɐ ↔ 6; # LATIN SMALL LETTER TURNED A
+ɑ ↔ A; # LATIN SMALL LETTER ALPHA
+ɒ ↔ Q; # LATIN SMALL LETTER TURNED ALPHA
+ɔ ↔ O; # LATIN SMALL LETTER OPEN O
+ə ↔ '@'; # LATIN SMALL LETTER SCHWA
+ɛ ↔ E; # LATIN SMALL LETTER OPEN E
+ɜ ↔ 3; # LATIN SMALL LETTER REVERSED OPEN E
+ɡ ↔ g; # LATIN SMALL LETTER SCRIPT G
+ɣ ↔ G; # LATIN SMALL LETTER GAMMA
+ɤ ↔ 7; # LATIN SMALL LETTER RAMS HORN
+ɥ ↔ H; # LATIN SMALL LETTER TURNED H
+ɨ ↔ 1; # LATIN SMALL LETTER I WITH STROKE
+ɪ ↔ I; # LATIN LETTER SMALL CAPITAL I
+ɫ ↔ 5; # LATIN SMALL LETTER L WITH MIDDLE TILDE
+ɬ ↔ K; # LATIN SMALL LETTER L WITH BELT
+ɯ ↔ M; # LATIN SMALL LETTER TURNED M
+ɱ ↔ F; # LATIN SMALL LETTER M WITH HOOK
+ɲ ↔ J; # LATIN SMALL LETTER N WITH LEFT HOOK
+ɵ ↔ 8; # LATIN SMALL LETTER BARRED O
+ɶ ↔ '&'; # LATIN LETTER SMALL CAPITAL OE
+ɾ ↔ 4; # LATIN SMALL LETTER R WITH FISHHOOK
+ʁ ↔ R; # LATIN LETTER SMALL CAPITAL INVERTED R
+ʃ ↔ S; # LATIN SMALL LETTER ESH
+ʉ ↔ '}'; # LATIN SMALL LETTER U BAR
+ʊ ↔ U; # LATIN SMALL LETTER UPSILON
+ʋ ↔ P; # LATIN SMALL LETTER V WITH HOOK
+ʌ ↔ V; # LATIN SMALL LETTER TURNED V
+ʍ ↔ W; # LATIN SMALL LETTER TURNED W
+ʎ ↔ L; # LATIN SMALL LETTER TURNED Y
+ʏ ↔ Y; # LATIN LETTER SMALL CAPITAL Y
+ʒ ↔ Z; # LATIN SMALL LETTER EZH
+ʔ ↔ '?'; # LATIN LETTER GLOTTAL STOP
+ʲ ↔ \'; # MODIFIER LETTER SMALL J
+ˈ ↔ '"'; # MODIFIER LETTER VERTICAL LINE
+ˌ ↔ '%'; # MODIFIER LETTER LOW VERTICAL LINE
+ː ↔ ':'; # MODIFIER LETTER TRIANGULAR COLON
+˞ ↔ '`'; # MODIFIER LETTER RHOTIC HOOK
+\u0303 ↔ '~'; # COMBINING TILDE
+\u0329 ↔ '='; # COMBINING VERTICAL LINE BELOW
+\u0361 ↔ $t; # COMBINING DOUBLE INVERTED BREVE
+β ↔ B; # GREEK SMALL LETTER BETA
+θ ↔ T; # GREEK SMALL LETTER THETA
+χ ↔ X; # GREEK SMALL LETTER CHI
+↑ ↔ '^'; # UPWARDS ARROW
+↓ ↔ '!'; # DOWNWARDS ARROW
+φ → 'p\'; # GREEK SMALL LETTER PHI
+ɩ → I; # LATIN SMALL LETTER IOTA
+ɷ → U; # LATIN SMALL LETTER CLOSED OMEGA
+ɼ → 'r_r'; # LATIN SMALL LETTER R WITH LONG LEG
+ɿ → 'z='; # LATIN SMALL LETTER REVERSED R WITH FISHHOOK
+ʅ → 'z`='; # LATIN SMALL LETTER SQUAT REVERSED ESH
+ʆ → S\'; # LATIN SMALL LETTER ESH WITH CURL
+ʇ → '|\' ; # LATIN SMALL LETTER TURNED T
+ʓ → Z\'; # LATIN SMALL LETTER EZH WITH CURL
+ʖ → '|\|\'; # LATIN LETTER INVERTED GLOTTAL STOP
+ʗ → '!\'; # LATIN LETTER STRETCHED C
+ʚ → '3\'; # LATIN SMALL LETTER CLOSED OPEN E
+ʠ → 'G\_<_0'; # LATIN SMALL LETTER Q WITH HOOK
+ʣ → d $t z; # LATIN SMALL LETTER DZ DIGRAPH
+ʤ → d $t Z; # LATIN SMALL LETTER DEZH DIGRAPH
 ʥ → d $t 'z\'; # LATIN SMALL LETTER DZ DIGRAPH WITH CURL
-ʦ → t $t s;    # LATIN SMALL LETTER TS DIGRAPH
-ʧ → t $t S;    # LATIN SMALL LETTER TESH DIGRAPH
+ʦ → t $t s; # LATIN SMALL LETTER TS DIGRAPH
+ʧ → t $t S; # LATIN SMALL LETTER TESH DIGRAPH
 ʨ → t $t 's\'; # LATIN SMALL LETTER TC DIGRAPH WITH CURL
 ::NFC;
index bf5d9e2e0ab708ab28a00561015675d7555e888c..fb3cd967089de0b77c8c3eb48dab7e9cc7f6a7dc 100644 (file)
 # File: InterIndic_Bengali.txt
 # Generated from CLDR 
 #
-\uE001→\u0981;          # SIGN CANDRABINDU
-\uE002→ং;          # SIGN ANUSVARA
-\uE003→ঃ;          # SIGN VISARGA
-\uE004→অ;          # FALLBACK TO LETTER A
-\uE005→অ;          # LETTER A
-\uE006→আ;          # LETTER AA
-\uE007→ই;          # LETTER I
-\uE008→ঈ;          # LETTER II
-\uE009→উ;          # LETTER U
-\uE00A→ঊ;          # LETTER UU
-\uE00B→ঋ;          # LETTER VOCALIC R
-\uE00C→ঌ;          # LETTER VOCALIC L
-\uE00D→এ;          # FALLBACK
-\uE00E→এ;          # FALLBACK
-\uE00F→এ;          # LETTER E
-\uE010→ঐ;          # LETTER AI
-\uE011→ও;          # FALLBACK
-\uE012→ও;          # FALLBACK
-\uE013→ও;          # LETTER O
-\uE014→ঔ;          # LETTER AU
-\uE015→ক;          # LETTER KA
-\uE016→খ;          # LETTER KHA
-\uE017→গ;          # LETTER GA
-\uE018→ঘ;          # LETTER GHA
-\uE019→ঙ;          # LETTER NGA
-\uE01A→চ;          # LETTER CA
-\uE01B→ছ;          # LETTER CHA
-\uE01C→জ;          # LETTER JA
-\uE01D→ঝ;          # LETTER JHA
-\uE01E→ঞ;          # LETTER NYA
-\uE01F→ট;          # LETTER TTA
-\uE020→ঠ;          # LETTER TTHA
-\uE021→ড;          # LETTER DDA
-\uE022→ঢ;          # LETTER DDHA
-\uE023→ণ;          # LETTER NNA
-\uE024→ত;          # LETTER TA
-\uE025→থ;          # LETTER THA
-\uE026→দ;          # LETTER DA
-\uE027→ধ;          # LETTER DHA
-\uE028→ন;          # LETTER NA
-\uE029→ন\u09BC;    # REMAP (indicExceptions.txt): \u09A9→ন = LETTER NNNA→LETTER NA
-\uE02A→প;          # LETTER PA
-\uE02B→ফ;          # LETTER PHA
-\uE02C→ব;          # LETTER BA
-\uE02D→ভ;          # LETTER BHA
-\uE02E→ম;          # LETTER MA
-\uE02F→য;          # LETTER YA
-\uE030→র;          # LETTER RA
-\uE031→র\u09BC;    # FALLBACK to RA
-\uE032→ল;          # LETTER LA
-\uE033→ল;          # REMAP (indicExceptions.txt): \u09B3→ল = LETTER LLA→LETTER LA
-\uE034→ল;          # REMAP (indicExceptions.txt): \u09B4→ল = LETTER LLLA→LETTER LA
-\uE035→ব;          # REMAP (indicExceptions.txt): \u09B5→ব = LETTER VA→LETTER BA
-\uE036→শ;          # LETTER SHA
-\uE037→ষ;          # LETTER SSA
-\uE038→স;          # LETTER SA
-\uE039→হ;          # LETTER HA
-\uE03C→\u09BC;          # SIGN NUKTA
-\uE03D→ঽ;          # SIGN AVAGRAHA
-\uE03E→া;          # VOWEL SIGN AA
-\uE03F→ি;          # VOWEL SIGN I
-\uE040→ী;          # VOWEL SIGN II
-\uE041→\u09C1;          # VOWEL SIGN U
-\uE042→\u09C2;          # VOWEL SIGN UU
-\uE043→\u09C3;          # VOWEL SIGN VOCALIC R
-\uE044→\u09C4;          # VOWEL SIGN VOCALIC RR
-\uE045→ে;          # REMAP (indicExceptions.txt): \u09C5→ে = VOWEL SIGN CANDRA E→VOWEL SIGN E
-\uE046→ে;          # FALLBACK
-\uE047→ে;          # VOWEL SIGN E
-\uE048→ৈ;          # VOWEL SIGN AI
-\uE049→ো;    # REMAP (indicExceptions.txt): \u09C9→ো = VOWEL SIGN CANDRA O→VOWEL SIGN O
-\uE04A→ো;    # FALLBACK
-\uE04B→ো;    # VOWEL SIGN O
-\uE04C→ৌ;    # VOWEL SIGN AU
-\uE04D→\u09CD;          # SIGN VIRAMA
-\uE050→ওং;    #  InterIndic-Bengali: OM
+\uE001→\u0981; # SIGN CANDRABINDU
+\uE002→ং; # SIGN ANUSVARA
+\uE003→ঃ; # SIGN VISARGA
+\uE004→অ; # FALLBACK TO LETTER A
+\uE005→অ; # LETTER A
+\uE006→আ; # LETTER AA
+\uE007→ই; # LETTER I
+\uE008→ঈ; # LETTER II
+\uE009→উ; # LETTER U
+\uE00A→ঊ; # LETTER UU
+\uE00B→ঋ; # LETTER VOCALIC R
+\uE00C→ঌ; # LETTER VOCALIC L
+\uE00D→এ; # FALLBACK
+\uE00E→এ; # FALLBACK
+\uE00F→এ; # LETTER E
+\uE010→ঐ; # LETTER AI
+\uE011→ও; # FALLBACK
+\uE012→ও; # FALLBACK
+\uE013→ও; # LETTER O
+\uE014→ঔ; # LETTER AU
+\uE015→ক; # LETTER KA
+\uE016→খ; # LETTER KHA
+\uE017→গ; # LETTER GA
+\uE018→ঘ; # LETTER GHA
+\uE019→ঙ; # LETTER NGA
+\uE01A→চ; # LETTER CA
+\uE01B→ছ; # LETTER CHA
+\uE01C→জ; # LETTER JA
+\uE01D→ঝ; # LETTER JHA
+\uE01E→ঞ; # LETTER NYA
+\uE01F→ট; # LETTER TTA
+\uE020→ঠ; # LETTER TTHA
+\uE021→ড; # LETTER DDA
+\uE022→ঢ; # LETTER DDHA
+\uE023→ণ; # LETTER NNA
+\uE024→ত; # LETTER TA
+\uE025→থ; # LETTER THA
+\uE026→দ; # LETTER DA
+\uE027→ধ; # LETTER DHA
+\uE028→ন; # LETTER NA
+\uE029→ন\u09BC; # REMAP (indicExceptions.txt): \u09A9→ন = LETTER NNNA→LETTER NA
+\uE02A→প; # LETTER PA
+\uE02B→ফ; # LETTER PHA
+\uE02C→ব; # LETTER BA
+\uE02D→ভ; # LETTER BHA
+\uE02E→ম; # LETTER MA
+\uE02F→য; # LETTER YA
+\uE030→র; # LETTER RA
+\uE031→র\u09BC; # FALLBACK to RA
+\uE032→ল; # LETTER LA
+\uE033→ল; # REMAP (indicExceptions.txt): \u09B3→ল = LETTER LLA→LETTER LA
+\uE034→ল; # REMAP (indicExceptions.txt): \u09B4→ল = LETTER LLLA→LETTER LA
+\uE035→ব; # REMAP (indicExceptions.txt): \u09B5→ব = LETTER VA→LETTER BA
+\uE036→শ; # LETTER SHA
+\uE037→ষ; # LETTER SSA
+\uE038→স; # LETTER SA
+\uE039→হ; # LETTER HA
+\uE03C→\u09BC; # SIGN NUKTA
+\uE03D→ঽ; # SIGN AVAGRAHA
+\uE03E→া; # VOWEL SIGN AA
+\uE03F→ি; # VOWEL SIGN I
+\uE040→ী; # VOWEL SIGN II
+\uE041→\u09C1; # VOWEL SIGN U
+\uE042→\u09C2; # VOWEL SIGN UU
+\uE043→\u09C3; # VOWEL SIGN VOCALIC R
+\uE044→\u09C4; # VOWEL SIGN VOCALIC RR
+\uE045→ে; # REMAP (indicExceptions.txt): \u09C5→ে = VOWEL SIGN CANDRA E→VOWEL SIGN E
+\uE046→ে; # FALLBACK
+\uE047→ে; # VOWEL SIGN E
+\uE048→ৈ; # VOWEL SIGN AI
+\uE049→ো; # REMAP (indicExceptions.txt): \u09C9→ো = VOWEL SIGN CANDRA O→VOWEL SIGN O
+\uE04A→ো; # FALLBACK
+\uE04B→ো; # VOWEL SIGN O
+\uE04C→ৌ; # VOWEL SIGN AU
+\uE04D→\u09CD; # SIGN VIRAMA
+\uE050→ওং; # InterIndic-Bengali: OM
 \uE051→;
 \uE052→;
 \uE053→;
 \uE054→;
-\uE055→;                # LENGTH MARK
-\uE056→ৈ;          # REMAP (indicExceptions.txt): \u09D6→ৈ = AI LENGTH MARK→VOWEL SIGN AI
-\uE057→ৗ;          # AU LENGTH MARK
-\uE058→ক\u09BC;    # FALLBACK
-\uE059→খ\u09BC;    # REMAP (indicExceptions.txt): \u09D9→খ = LETTER KHHA→LETTER KHA
-\uE05A→গ\u09BC;    # REMAP (indicExceptions.txt): \u09DA→গ = LETTER GHHA→LETTER GA
-\uE05B→জ\u09BC;    # REMAP (indicExceptions.txt): \u09DB→জ = LETTER ZA→LETTER JA
-\uE05C→ড\u09BC;    # FALLBACK
-\uE05D→ঢ\u09BC;    # LETTER RHA
-\uE05E→ফ\u09BC;    # REMAP (indicExceptions.txt): \u09DE→ফ = LETTER FA→LETTER PHA
-\uE05F→য\u09BC;    # LETTER YYA
-\uE060→ৠ;          # LETTER VOCALIC RR
-\uE061→ৡ;          # LETTER VOCALIC LL
-\uE062→\u09E2;          # VOWEL SIGN VOCALIC L
-\uE063→\u09E3;          # VOWEL SIGN VOCALIC LL
-\uE064→।;          # DANDA
-\uE065→॥;          # DOUBLE DANDA
-\uE066→০;          # DIGIT ZERO
-\uE067→১;          # DIGIT ONE
-\uE068→২;          # DIGIT TWO
-\uE069→৩;          # DIGIT THREE
-\uE06A→৪;          # DIGIT FOUR
-\uE06B→৫;          # DIGIT FIVE
-\uE06C→৬;          # DIGIT SIX
-\uE06D→৭;          # DIGIT SEVEN
-\uE06E→৮;          # DIGIT EIGHT
-\uE06F→৯;          # DIGIT NINE
-\uE070→;                # ABBREVIATION SIGN
-\uE071→ৰ;          # LETTER RA WITH MIDDLE DIAGONAL
-\uE072→ৱ;          # LETTER RA WITH LOWER DIAGONAL
-\uE073→৲;          # RUPEE MARK
-\uE074→৳;          # RUPEE SIGN
-\uE075→৴;          # CURRENCY NUMERATOR ONE
-\uE076→৵;          # CURRENCY NUMERATOR TWO
-\uE077→৶;          # CURRENCY NUMERATOR THREE
-\uE078→৷;          # CURRENCY NUMERATOR FOUR
-\uE079→৸;          # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→৹;          # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→৺;          # ISSHAR
-\uE07C→;                # TIPPI
-\uE07D→;                # ADDAK
-\uE07E→;                # IRI
-\uE07F→;                # URA
-\uE080→;                # EK ONKAR
-\uE081→ব;    # FALLBACK FOR ORIYA LETTER WA
-\uE082→;                # Devanagari Glottal Stop
-\uE083→ৎ;          # Khanda-ta
-0 → ০;             # FALLBACK FOR TAMIL
+\uE055→; # LENGTH MARK
+\uE056→ৈ; # REMAP (indicExceptions.txt): \u09D6→ৈ = AI LENGTH MARK→VOWEL SIGN AI
+\uE057→ৗ; # AU LENGTH MARK
+\uE058→ক\u09BC; # FALLBACK
+\uE059→খ\u09BC; # REMAP (indicExceptions.txt): \u09D9→খ = LETTER KHHA→LETTER KHA
+\uE05A→গ\u09BC; # REMAP (indicExceptions.txt): \u09DA→গ = LETTER GHHA→LETTER GA
+\uE05B→জ\u09BC; # REMAP (indicExceptions.txt): \u09DB→জ = LETTER ZA→LETTER JA
+\uE05C→ড\u09BC; # FALLBACK
+\uE05D→ঢ\u09BC; # LETTER RHA
+\uE05E→ফ\u09BC; # REMAP (indicExceptions.txt): \u09DE→ফ = LETTER FA→LETTER PHA
+\uE05F→য\u09BC; # LETTER YYA
+\uE060→ৠ; # LETTER VOCALIC RR
+\uE061→ৡ; # LETTER VOCALIC LL
+\uE062→\u09E2; # VOWEL SIGN VOCALIC L
+\uE063→\u09E3; # VOWEL SIGN VOCALIC LL
+\uE064→।; # DANDA
+\uE065→॥; # DOUBLE DANDA
+\uE066→০; # DIGIT ZERO
+\uE067→১; # DIGIT ONE
+\uE068→২; # DIGIT TWO
+\uE069→৩; # DIGIT THREE
+\uE06A→৪; # DIGIT FOUR
+\uE06B→৫; # DIGIT FIVE
+\uE06C→৬; # DIGIT SIX
+\uE06D→৭; # DIGIT SEVEN
+\uE06E→৮; # DIGIT EIGHT
+\uE06F→৯; # DIGIT NINE
+\uE070→; # ABBREVIATION SIGN
+\uE071→ৰ; # LETTER RA WITH MIDDLE DIAGONAL
+\uE072→ৱ; # LETTER RA WITH LOWER DIAGONAL
+\uE073→৲; # RUPEE MARK
+\uE074→৳; # RUPEE SIGN
+\uE075→৴; # CURRENCY NUMERATOR ONE
+\uE076→৵; # CURRENCY NUMERATOR TWO
+\uE077→৶; # CURRENCY NUMERATOR THREE
+\uE078→৷; # CURRENCY NUMERATOR FOUR
+\uE079→৸; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→৹; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→৺; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
+\uE081→ব; # FALLBACK FOR ORIYA LETTER WA
+\uE082→; # Devanagari Glottal Stop
+\uE083→ৎ; # Khanda-ta
+0 → ০; # FALLBACK FOR TAMIL
 1 → ১;
index e617dd2a4499a4d221bbf6a468669ca081840da6..7cc65169d87c826b3f275a7157c8105ac76b0417 100644 (file)
 # File: InterIndic_Devanagari.txt
 # Generated from CLDR 
 #
-\uE028\uE03C → ऩ;  #\uE029
-\uE030\uE03C → ऱ;  #\uE031
-\uE033\uE03C → ऴ;  #\uE034
-\uE015\uE03C → क़;  #\uE058 LETTER QA   (For Urdu)
-\uE016\uE03C → ख़;  #\uE059 LETTER KHHA (For Urdu)
-\uE017\uE03C → ग़;  #\uE05A LETTER GHHA (For Urdu)
-\uE01C\uE03C → ज़;  #\uE05B LETTER ZA   (For Urdu)
-\uE021\uE03C → ड़;  #\uE05C LETTER DDDHA (pronounced RRA)
-\uE022\uE03C → ढ़;  #\uE05D LETTER RHA   (pronounced RRHA)
-\uE02B\uE03C → फ़;  #\uE05E LETTER FA
-\uE02F\uE03C → य़;  #\uE05F LETTER YYA
-\uE012\uE057→औ;   # FALLBACK FOR TAMIL AU
-0 → ०;       # FALLBACK FOR TAMIL
+\uE028\uE03C → ऩ; #\uE029
+\uE030\uE03C → ऱ; #\uE031
+\uE033\uE03C → ऴ; #\uE034
+\uE015\uE03C → क़; #\uE058 LETTER QA (For Urdu)
+\uE016\uE03C → ख़; #\uE059 LETTER KHHA (For Urdu)
+\uE017\uE03C → ग़; #\uE05A LETTER GHHA (For Urdu)
+\uE01C\uE03C → ज़; #\uE05B LETTER ZA (For Urdu)
+\uE021\uE03C → ड़; #\uE05C LETTER DDDHA (pronounced RRA)
+\uE022\uE03C → ढ़; #\uE05D LETTER RHA (pronounced RRHA)
+\uE02B\uE03C → फ़; #\uE05E LETTER FA
+\uE02F\uE03C → य़; #\uE05F LETTER YYA
+\uE012\uE057→औ; # FALLBACK FOR TAMIL AU
+0 → ०; # FALLBACK FOR TAMIL
 1 → १;
 \uE055→; # FALLBACK BLOW AWAY KANNADA AND TELUGU LENGTH MARK
 \uE056→; # FALLBACK BLOW AWAY KANNADA AND TELUGU AI LENGTH MARK
 \uE057→; # FALLBACK BLOW AWAY TAMIL AU LENGTH MARK
-\uE001 →  \u0901;  # SIGN CANDRABINDU
-\uE002 →  \u0902;  # SIGN ANUSVARA
-\uE003 →  ः;  # SIGN VISARGA
-\uE004 →  ऄ;  # SIGN SHORT A
-\uE005 →  अ;  # LETTER A
-\uE006 →  आ;  # LETTER AA
-\uE007 →  इ;  # LETTER I
-\uE008 →  ई;  # LETTER II
-\uE009 →  उ;  # LETTER U
-\uE00A →  ऊ;  # LETTER UU
-\uE00B →  ऋ;  # LETTER VOCALIC R
-\uE00C →  ऌ;  # LETTER VOCALIC L
-\uE00D →  ऍ;  # LETTER CANDRA E (For representing English sounds)
-\uE00E →  ऎ;  # LETTER SHORT E(For Southern Scripts)
-\uE00F →  ए;  # LETTER E
-\uE010 →  ऐ;  # LETTER AI
-\uE011 →  ऑ;  # LETTER CANDRA O (For representing English sounds)
-\uE012 →  ऒ;  # LETTER SHORT O (For Southern Scripts)
-\uE013 →  ओ;  # LETTER O
-\uE014 →  औ;  # LETTER AU
-\uE015 →  क;  # LETTER KA
-\uE016 →  ख;  # LETTER KHA
-\uE017 →  ग;  # LETTER GA
-\uE018 →  घ;  # LETTER GHA
-\uE019 →  ङ;  # LETTER NGA
-\uE01A →  च;  # LETTER CA
-\uE01B →  छ;  # LETTER CHA
-\uE01C →  ज;  # LETTER JA
-\uE01D →  झ;  # LETTER JHA
-\uE01E →  ञ;  # LETTER NYA
-\uE01F →  ट;  # LETTER TTA
-\uE020 →  ठ;  # LETTER TTHA
-\uE021 →  ड;  # LETTER DDA
-\uE022 →  ढ;  # LETTER DDHA
-\uE023 →  ण;  # LETTER NNA
-\uE024 →  त;  # LETTER TA
-\uE025 →  थ;  # LETTER THA
-\uE026 →  द;  # LETTER DA
-\uE027 →  ध;  # LETTER DHA
-\uE028 →  न;  # LETTER NA
-\uE029 →  ऩ;  # LETTER NNNA
-\uE02A →  प;  # LETTER PA
-\uE02B →  फ;  # LETTER PHA
-\uE02C →  ब;  # LETTER BA
-\uE02D →  भ;  # LETTER BHA
-\uE02E →  म;  # LETTER MA
-\uE02F →  य;  # LETTER YA
-\uE030 →  र;  # LETTER RA
-\uE031 →  ऱ;  # LETTER RRA (Eyelash RA for Southern scripts)
-\uE032 →  ल;  # LETTER LA
-\uE033 →  ळ;  # LETTER LLA
-\uE034 →  ऴ;  # LETTER LLLA (LLLA for Southern scripts)
-\uE035 →  व;  # LETTER VA
-\uE036 →  श;  # LETTER SHA
-\uE037 →  ष;  # LETTER SSA
-\uE038 →  स;  # LETTER SA
-\uE039 →  ह;  # LETTER HA
-\uE03C →  \u093C;  # SIGN NUKTA
-\uE03D →  ऽ;  # SIGN AVAGRAHA
-\uE03E →  ा;  # VOWEL SIGN AA
-\uE03F →  ि;  # VOWEL SIGN I
-\uE040 →  ी;  # VOWEL SIGN II
-\uE041 →  \u0941;  # VOWEL SIGN U
-\uE042 →  \u0942;  # VOWEL SIGN UU
-\uE043 →  \u0943;  # VOWEL SIGN VOCALIC R
-\uE044 →  \u0944;  # VOWEL SIGN VOCALIC RR
-\uE045 →  \u0945;  # VOWEL SIGN CANDRA E
-\uE046 →  \u0946;  # VOWEL SIGN SHORT E
-\uE047 →  \u0947;  # VOWEL SIGN E
-\uE048 →  \u0948;  # VOWEL SIGN AI
-\uE049 →  ॉ;  # VOWEL SIGN CANDRA O
-\uE04A →  ॊ;  # VOWEL SIGN SHORT O
-\uE04B →  ो;  # VOWEL SIGN O
-\uE04C →  ौ;  # VOWEL SIGN AU
-\uE04D →  \u094D;  # SIGN VIRAMA
-\uE050 →  ॐ;  # OM
-\uE051 →  \u0951;  # STRESS SIGN UDATTA
-\uE052 →  \u0952;  # STRESS SIGN ANUDATTA
-\uE053 →  \u0953;  # GRAVE ACCENT
-\uE054 →  \u0954;  # ACUTE ACCENT
-\uE058 →  क़;  # LETTER QA   (For Urdu)
-\uE059 →  ख़;  # LETTER KHHA (For Urdu)
-\uE05A →  ग़;  # LETTER GHHA (For Urdu)
-\uE05B →  ज़;  # LETTER ZA   (For Urdu)
-\uE05C →  ड़;  # LETTER DDDHA (pronounced RRA)
-\uE05D →  ढ़;  # LETTER RHA   (pronounced RRHA)
-\uE05E →  फ़;  # LETTER FA
-\uE05F →  य़;  # LETTER YYA
-\uE060 →  ॠ;  # LETTER VOCALIC RR
-\uE061 →  ॡ;  # LETTER VOCALIC LL
-\uE062 →  \u0962;  # VOWEL SIGN VOCALIC L
-\uE063 →  \u0963;  # VOWEL SIGN VOCALIC LL
-\uE064 →  ।;  # DANDA
-\uE065 →  ॥;  # DOUBLE DANDA
-\uE066 →  ०;  # DIGIT ZERO
-\uE067 →  १;  # DIGIT ONE
-\uE068 →  २;  # DIGIT TWO
-\uE069 →  ३;  # DIGIT THREE
-\uE06A →  ४;  # DIGIT FOUR
-\uE06B →  ५;  # DIGIT FIVE
-\uE06C →  ६;  # DIGIT SIX
-\uE06D →  ७;  # DIGIT SEVEN
-\uE06E →  ८;  # DIGIT EIGHT
-\uE06F →  ९;  # DIGIT NINE
-\uE070→॰;     # ABBREVIATION SIGN
-\uE071→र;     # LETTER RA WITH MIDDLE DIAGONAL
-\uE072→र;     # LETTER RA WITH LOWER DIAGONAL
-\uE073→;           # RUPEE MARK
-\uE074→र\u0942;           # RUPEE SIGN
-\uE075→;           # CURRENCY NUMERATOR ONE
-\uE076→;           # CURRENCY NUMERATOR TWO
-\uE077→;           # CURRENCY NUMERATOR THREE
-\uE078→;           # CURRENCY NUMERATOR FOUR
-\uE079→;           # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;           # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;           # ISSHAR
-\uE07C→;           # TIPPI
-\uE07D→;           # ADDAK
-\uE07E→;           # IRI
-\uE07F→;           # URA
-\uE080→;           # EK ONKAR
-\uE081→व;  # FALLBACK FOR ORIYA LETTER WA
-\uE082→ॽ;     # Devanagari Glottal Sign
-\uE083→त\u094D;  # Bengali Khanda-ta
+\uE001 → \u0901; # SIGN CANDRABINDU
+\uE002 → \u0902; # SIGN ANUSVARA
+\uE003 → ः; # SIGN VISARGA
+\uE004 → ऄ; # SIGN SHORT A
+\uE005 → अ; # LETTER A
+\uE006 → आ; # LETTER AA
+\uE007 → इ; # LETTER I
+\uE008 → ई; # LETTER II
+\uE009 → उ; # LETTER U
+\uE00A → ऊ; # LETTER UU
+\uE00B → ऋ; # LETTER VOCALIC R
+\uE00C → ऌ; # LETTER VOCALIC L
+\uE00D → ऍ; # LETTER CANDRA E (For representing English sounds)
+\uE00E → ऎ; # LETTER SHORT E(For Southern Scripts)
+\uE00F → ए; # LETTER E
+\uE010 → ऐ; # LETTER AI
+\uE011 → ऑ; # LETTER CANDRA O (For representing English sounds)
+\uE012 → ऒ; # LETTER SHORT O (For Southern Scripts)
+\uE013 → ओ; # LETTER O
+\uE014 → औ; # LETTER AU
+\uE015 → क; # LETTER KA
+\uE016 → ख; # LETTER KHA
+\uE017 → ग; # LETTER GA
+\uE018 → घ; # LETTER GHA
+\uE019 → ङ; # LETTER NGA
+\uE01A → च; # LETTER CA
+\uE01B → छ; # LETTER CHA
+\uE01C → ज; # LETTER JA
+\uE01D → झ; # LETTER JHA
+\uE01E → ञ; # LETTER NYA
+\uE01F → ट; # LETTER TTA
+\uE020 → ठ; # LETTER TTHA
+\uE021 → ड; # LETTER DDA
+\uE022 → ढ; # LETTER DDHA
+\uE023 → ण; # LETTER NNA
+\uE024 → त; # LETTER TA
+\uE025 → थ; # LETTER THA
+\uE026 → द; # LETTER DA
+\uE027 → ध; # LETTER DHA
+\uE028 → न; # LETTER NA
+\uE029 → ऩ; # LETTER NNNA
+\uE02A → प; # LETTER PA
+\uE02B → फ; # LETTER PHA
+\uE02C → ब; # LETTER BA
+\uE02D → भ; # LETTER BHA
+\uE02E → म; # LETTER MA
+\uE02F → य; # LETTER YA
+\uE030 → र; # LETTER RA
+\uE031 → ऱ; # LETTER RRA (Eyelash RA for Southern scripts)
+\uE032 → ल; # LETTER LA
+\uE033 → ळ; # LETTER LLA
+\uE034 → ऴ; # LETTER LLLA (LLLA for Southern scripts)
+\uE035 → व; # LETTER VA
+\uE036 → श; # LETTER SHA
+\uE037 → ष; # LETTER SSA
+\uE038 → स; # LETTER SA
+\uE039 → ह; # LETTER HA
+\uE03C → \u093C; # SIGN NUKTA
+\uE03D → ऽ; # SIGN AVAGRAHA
+\uE03E → ा; # VOWEL SIGN AA
+\uE03F → ि; # VOWEL SIGN I
+\uE040 → ी; # VOWEL SIGN II
+\uE041 → \u0941; # VOWEL SIGN U
+\uE042 → \u0942; # VOWEL SIGN UU
+\uE043 → \u0943; # VOWEL SIGN VOCALIC R
+\uE044 → \u0944; # VOWEL SIGN VOCALIC RR
+\uE045 → \u0945; # VOWEL SIGN CANDRA E
+\uE046 → \u0946; # VOWEL SIGN SHORT E
+\uE047 → \u0947; # VOWEL SIGN E
+\uE048 → \u0948; # VOWEL SIGN AI
+\uE049 → ॉ; # VOWEL SIGN CANDRA O
+\uE04A → ॊ; # VOWEL SIGN SHORT O
+\uE04B → ो; # VOWEL SIGN O
+\uE04C → ौ; # VOWEL SIGN AU
+\uE04D → \u094D; # SIGN VIRAMA
+\uE050 → ॐ; # OM
+\uE051 → \u0951; # STRESS SIGN UDATTA
+\uE052 → \u0952; # STRESS SIGN ANUDATTA
+\uE053 → \u0953; # GRAVE ACCENT
+\uE054 → \u0954; # ACUTE ACCENT
+\uE058 → क़; # LETTER QA (For Urdu)
+\uE059 → ख़; # LETTER KHHA (For Urdu)
+\uE05A → ग़; # LETTER GHHA (For Urdu)
+\uE05B → ज़; # LETTER ZA (For Urdu)
+\uE05C → ड़; # LETTER DDDHA (pronounced RRA)
+\uE05D → ढ़; # LETTER RHA (pronounced RRHA)
+\uE05E → फ़; # LETTER FA
+\uE05F → य़; # LETTER YYA
+\uE060 → ॠ; # LETTER VOCALIC RR
+\uE061 → ॡ; # LETTER VOCALIC LL
+\uE062 → \u0962; # VOWEL SIGN VOCALIC L
+\uE063 → \u0963; # VOWEL SIGN VOCALIC LL
+\uE064 → ।; # DANDA
+\uE065 → ॥; # DOUBLE DANDA
+\uE066 → ०; # DIGIT ZERO
+\uE067 → १; # DIGIT ONE
+\uE068 → २; # DIGIT TWO
+\uE069 → ३; # DIGIT THREE
+\uE06A → ४; # DIGIT FOUR
+\uE06B → ५; # DIGIT FIVE
+\uE06C → ६; # DIGIT SIX
+\uE06D → ७; # DIGIT SEVEN
+\uE06E → ८; # DIGIT EIGHT
+\uE06F → ९; # DIGIT NINE
+\uE070→॰; # ABBREVIATION SIGN
+\uE071→र; # LETTER RA WITH MIDDLE DIAGONAL
+\uE072→र; # LETTER RA WITH LOWER DIAGONAL
+\uE073→; # RUPEE MARK
+\uE074→र\u0942; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
+\uE081→व; # FALLBACK FOR ORIYA LETTER WA
+\uE082→ॽ; # Devanagari Glottal Sign
+\uE083→त\u094D; # Bengali Khanda-ta
index 4914c7e3fffa3c67e09372a234c58c830f2825b9..4a804f33e609646584ae5fd7540dd8aaef38e2b2 100644 (file)
@@ -21,7 +21,7 @@
 \uE00C→ઌ; # LETTER VOCALIC L
 \uE00D→ઍ; # GUJARATI VOWEL CANDRA E
 \uE00E→એ; # FALLBACK
-\uE00F→એ; #  InterIndic-Gujarati: LETTER EE (એ = LETTER E)
+\uE00F→એ; # InterIndic-Gujarati: LETTER EE (એ = LETTER E)
 \uE010→ઐ; # LETTER AI
 \uE011→ઑ; # FALLBACK
 \uE012→ઓ; # FALLBACK
@@ -58,7 +58,7 @@
 \uE031→ર\u0ABC; # FALLBACK
 \uE032→લ; # LETTER LA
 \uE033→ળ; # LETTER LLA
-\uE034→ળ\u0ABC; #  LETTER LLLA→LETTER LLA+NUKTA
+\uE034→ળ\u0ABC; # LETTER LLLA→LETTER LLA+NUKTA
 \uE035→વ; # LETTER VA
 \uE036→શ; # LETTER SHA
 \uE037→ષ; # LETTER SSA
@@ -75,7 +75,7 @@
 \uE044→\u0AC4; # VOWEL SIGN VOCALIC RR
 \uE045→\u0AC5; # VOWEL SIGN CANDRA E
 \uE046→\u0AC7; # FALLBACK
-\uE047→\u0AC7; #  InterIndic-Gujarati: VOWEL SIGN EE (\u0AC7 = VOWEL SIGN E)
+\uE047→\u0AC7; # InterIndic-Gujarati: VOWEL SIGN EE (\u0AC7 = VOWEL SIGN E)
 \uE048→\u0AC8; # VOWEL SIGN AI
 \uE049→ૉ; # VOWEL SIGN CANDRA O
 \uE04A→ો; # FALLBACK
 \uE061→ૡ; # LETTER VOCALIC LL
 \uE062→િ\u0ABC; # REMAP (indicExceptions.txt): \u0AE2→િ\u0ABC = VOWEL SIGN VOCALIC L→VOWEL SIGN I.SIGN NUKTA
 \uE063→ી\u0ABC; # REMAP (indicExceptions.txt): \u0AE3→ી\u0ABC = VOWEL SIGN VOCALIC LL→VOWEL SIGN II.SIGN NUKTA
-\uE064→।;          # DANDA
-\uE065→॥;          # DOUBLE DANDA
+\uE064→।; # DANDA
+\uE065→॥; # DOUBLE DANDA
 \uE066→૦; # DIGIT ZERO
 \uE067→૧; # DIGIT ONE
 \uE068→૨; # DIGIT TWO
 \uE06D→૭; # DIGIT SEVEN
 \uE06E→૮; # DIGIT EIGHT
 \uE06F→૯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
-\uE071→ર;     # LETTER RA WITH MIDDLE DIAGONAL
-\uE072→ર;     # LETTER RA WITH LOWER DIAGONAL
-\uE073→;           # RUPEE MARK
-\uE074→;           # RUPEE SIGN
-\uE075→;           # CURRENCY NUMERATOR ONE
-\uE076→;           # CURRENCY NUMERATOR TWO
-\uE077→;           # CURRENCY NUMERATOR THREE
-\uE078→;           # CURRENCY NUMERATOR FOUR
-\uE079→;           # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;           # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;           # ISSHAR
-\uE07C→;           # TIPPI
-\uE07D→;           # ADDAK
-\uE07E→;           # IRI
-\uE07F→;           # URA
-\uE080→;           # EK ONKAR
-\uE081→વ;     # FALLBACK FOR ORIYA LETTER WA
-\uE082→;           # Devanagari Glottal Stop
-\uE083→ત\u0ACD;  # Bengali Khanda-ta
-0 → ૦;        # FALLBACK FOR TAMIL
+\uE070→; # ABBREVIATION SIGN
+\uE071→ર; # LETTER RA WITH MIDDLE DIAGONAL
+\uE072→ર; # LETTER RA WITH LOWER DIAGONAL
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
+\uE081→વ; # FALLBACK FOR ORIYA LETTER WA
+\uE082→; # Devanagari Glottal Stop
+\uE083→ત\u0ACD; # Bengali Khanda-ta
+0 → ૦; # FALLBACK FOR TAMIL
 1 → ૧;
index b5bc8bbd2271dde693d9da254a48ebdb06c966c1..87137aea2e3e9728c03e487301f231c49d816960 100644 (file)
@@ -9,11 +9,11 @@
 #
 $vowel = [ਅ-ਔ ਾ-\u0A4D];
 $consonant = [ਕ-ਹ];
-\uE001→\u0A01;       # SIGN CHANDRABINDU
+\uE001→\u0A01; # SIGN CHANDRABINDU
 $vowel{\uE002→\u0A02; # SIGN ANUSVARA (\u0A02 = SIGN BINDI)
 $consonant{\uE002→\u0A70; # SIGN TIPPI
 \uE002→\u0A02;
-\uE003→;       # FALLBACK BLOW AWAY SIGN VISARGA
+\uE003→; # FALLBACK BLOW AWAY SIGN VISARGA
 \uE004→ਅ; # FALLBACK TO LETTER A
 \uE005→ਅ; # LETTER A
 \uE006→ਆ; # LETTER AA
@@ -86,7 +86,7 @@ $consonant{\uE002→\u0A70; # SIGN TIPPI
 \uE04B→\u0A4B; # VOWEL SIGN OO
 \uE04C→\u0A4C; # VOWEL SIGN AU
 \uE04D→\u0A4D; # SIGN VIRAMA
-\uE050→ਏ\u0A02; #  FALLBACK to OO+BINDI : OM
+\uE050→ਏ\u0A02; # FALLBACK to OO+BINDI : OM
 \uE051→;
 \uE052→;
 \uE053→;
@@ -106,8 +106,8 @@ $consonant{\uE002→\u0A70; # SIGN TIPPI
 \uE061→ਲ\u0A3C; #
 \uE062→ਿ\u0A3C; # REMAP (indicExceptions.txt): \u0A62→ਿ\u0A3C = VOWEL SIGN VOCALIC L→VOWEL SIGN I.SIGN NUKTA
 \uE063→ੀ\u0A3C; # REMAP (indicExceptions.txt): \u0A63→ੀ\u0A3C = VOWEL SIGN VOCALIC LL→VOWEL SIGN II.SIGN NUKTA
-\uE064→।;          # DANDA
-\uE065→॥;          # DOUBLE DANDA
+\uE064→।; # DANDA
+\uE065→॥; # DOUBLE DANDA
 \uE066→੦; # DIGIT ZERO
 \uE067→੧; # DIGIT ONE
 \uE068→੨; # DIGIT TWO
@@ -118,25 +118,25 @@ $consonant{\uE002→\u0A70; # SIGN TIPPI
 \uE06D→੭; # DIGIT SEVEN
 \uE06E→੮; # DIGIT EIGHT
 \uE06F→੯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
-\uE071→ਰ;     # LETTER RA WITH MIDDLE DIAGONAL
-\uE072→ਰ;     # LETTER RA WITH LOWER DIAGONAL
-\uE073→;           # RUPEE MARK
-\uE074→;           # RUPEE SIGN
-\uE075→;           # CURRENCY NUMERATOR ONE
-\uE076→;           # CURRENCY NUMERATOR TWO
-\uE077→;           # CURRENCY NUMERATOR THREE
-\uE078→;           # CURRENCY NUMERATOR FOUR
-\uE079→;           # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;           # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;           # ISSHAR
-\uE07C→\u0A70;     # TIPPI
-\uE07D→\u0A71;     # ADDAK
-\uE07E→ੲ;     # IRI
-\uE07F→ੳ;     # URA
-\uE080→ੴ;     # EK ONKAR
-\uE081→ਵ;     # FALLBACK FOR ORIYA LETTER WA
-\uE082→;           # Devanagari Glottal Stop
-\uE083→ਤ\u0A4D;  # Bengali Khanda-ta
-0 → ੦;       # FALLBACK FOR TAMIL
+\uE070→; # ABBREVIATION SIGN
+\uE071→ਰ; # LETTER RA WITH MIDDLE DIAGONAL
+\uE072→ਰ; # LETTER RA WITH LOWER DIAGONAL
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→\u0A70; # TIPPI
+\uE07D→\u0A71; # ADDAK
+\uE07E→ੲ; # IRI
+\uE07F→ੳ; # URA
+\uE080→ੴ; # EK ONKAR
+\uE081→ਵ; # FALLBACK FOR ORIYA LETTER WA
+\uE082→; # Devanagari Glottal Stop
+\uE083→ਤ\u0A4D; # Bengali Khanda-ta
+0 → ੦; # FALLBACK FOR TAMIL
 1 → ੧;
index 1558165baf4999551d489f6ecfe2c4ee5557d99b..db3aaa287ac175ad83a9f47975ed0caaef867a34 100644 (file)
 \uE061→ೡ; # LETTER VOCALIC LL
 \uE062→\u0CBF; # REMAP (indicExceptions.txt): \u0CE2→\u0CBF = VOWEL SIGN VOCALIC L→VOWEL SIGN I
 \uE063→ೀ; # REMAP (indicExceptions.txt): \u0CE3→ೀ = VOWEL SIGN VOCALIC LL→VOWEL SIGN II
-\uE064→'.'   ; # FALLBACK FOR DANDA
-\uE065→'.'   ; # FALLBACK FOR DOUBLE DANDA
+\uE064→'.' ; # FALLBACK FOR DANDA
+\uE065→'.' ; # FALLBACK FOR DOUBLE DANDA
 \uE066→೦; # DIGIT ZERO
 \uE067→೧; # DIGIT ONE
 \uE068→೨; # DIGIT TWO
 \uE06D→೭; # DIGIT SEVEN
 \uE06E→೮; # DIGIT EIGHT
 \uE06F→೯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071→ರ; # LETTER RA WITH MIDDLE DIAGONAL
 \uE072→ರ; # LETTER RA WITH LOWER DIAGONAL
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;       # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
 \uE081→ವ; # FALLBACK FOR ORIYA LETTER WA
-\uE082→;       # Devanagari Glottal Stop
-\uE083→ತ\u0CCD;  # Bengali Khanda-ta
-0 → ೦;    # FALLBACK FOR TAMIL
+\uE082→; # Devanagari Glottal Stop
+\uE083→ತ\u0CCD; # Bengali Khanda-ta
+0 → ೦; # FALLBACK FOR TAMIL
 1 → ೧;
index 6142863c36c4e39fc15c8d9f84edee40b9e34385..e1b9b3386e31d53f5c195fb0abb0501494a2c409 100644 (file)
@@ -20,11 +20,11 @@ $wr=\uE00B;
 $wl=\uE00C;
 $wce=\uE00D; # LETTER CANDRA E
 $wse=\uE00E; # LETTER SHORT E
-$we=\uE00F;  # ए LETTER E
+$we=\uE00F; # ए LETTER E
 $wai=\uE010;
 $wco=\uE011; # LETTER CANDRA O
 $wso=\uE012; # LETTER SHORT O
-$wo=\uE013;  # ओ LETTER O
+$wo=\uE013; # ओ LETTER O
 $wau=\uE014;
 $ka=\uE015;
 $kha=\uE016;
@@ -79,17 +79,17 @@ $e=\uE047;
 $ai=\uE048;
 $co=\uE049; # VOWEL SIGN CANDRA O
 $so=\uE04A; # VOWEL SIGN SHORT O
-$o=\uE04B;  # ो
+$o=\uE04B; # ो
 $au=\uE04C;
 $virama=\uE04D;
 $om=\uE050; # OM
-\uE051→;        # UNMAPPED STRESS SIGN UDATTA
-\uE052→;        # UNMAPPED STRESS SIGN ANUDATTA
-\uE053→;        # UNMAPPED GRAVE ACCENT
-\uE054→;        # UNMAPPED ACUTE ACCENT
-$lm = \uE055;#  Telugu Length Mark
-$ailm=\uE056;#  AI Length Mark
-$aulm=\uE057;#  AU Length Mark
+\uE051→; # UNMAPPED STRESS SIGN UDATTA
+\uE052→; # UNMAPPED STRESS SIGN ANUDATTA
+\uE053→; # UNMAPPED GRAVE ACCENT
+\uE054→; # UNMAPPED ACUTE ACCENT
+$lm = \uE055;# Telugu Length Mark
+$ailm=\uE056;# AI Length Mark
+$aulm=\uE057;# AU Length Mark
 $uka=\uE058;
 $ukha=\uE059;
 $ugha=\uE05A;
@@ -104,16 +104,16 @@ $rrh=\uE062;
 $llh=\uE063;
 $danda=\uE064;
 $doubleDanda=\uE065;
-$zero=\uE066;     # DIGIT ZERO
-$one=\uE067;      # DIGIT ONE
-$two=\uE068;      # DIGIT TWO
-$three=\uE069;    # DIGIT THREE
-$four=\uE06A;     # DIGIT FOUR
-$five=\uE06B;     # DIGIT FIVE
-$six=\uE06C;      # DIGIT SIX
-$seven=\uE06D;    # DIGIT SEVEN
-$eight=\uE06E;    # DIGIT EIGHT
-$nine=\uE06F;     # DIGIT NINE
+$zero=\uE066; # DIGIT ZERO
+$one=\uE067; # DIGIT ONE
+$two=\uE068; # DIGIT TWO
+$three=\uE069; # DIGIT THREE
+$four=\uE06A; # DIGIT FOUR
+$five=\uE06B; # DIGIT FIVE
+$six=\uE06C; # DIGIT SIX
+$seven=\uE06D; # DIGIT SEVEN
+$eight=\uE06E; # DIGIT EIGHT
+$nine=\uE06F; # DIGIT NINE
 $dgs=\uE082;
 $kta=\uE083;
 $depVowelAbove=[\uE03E-\uE040\uE045-\uE04C];
@@ -122,70 +122,70 @@ $x=[$aa$ai$au$ii$i$uu$u$rrh$rh$lh$llh$e$o$se$ce$so$co];
 $z=[bcdfghjklmnpqrstvwxyz];
 $vowels=[aeiour\u0304\u0325\u0306];
 $forceIndependentMatra = [^[[:L:][\u0300-\u034C]]];
-$anusvara} [$ka$kha$ga$gha$nga]             → n\u0307;
-$anusvara} [$ca$cha$ja$jha$nya]             → n\u0304;
-$anusvara} [$tta$ttha$dda$ddha$nna]         → n\u0323;
-$anusvara} [$ta$tha$da$dha$na]              → n;
-$anusvara} [$pa$pha$ba$bha$ma]              → m;
+$anusvara} [$ka$kha$ga$gha$nga] → n\u0307;
+$anusvara} [$ca$cha$ja$jha$nya] → n\u0304;
+$anusvara} [$tta$ttha$dda$ddha$nna] → n\u0323;
+$anusvara} [$ta$tha$da$dha$na] → n;
+$anusvara} [$pa$pha$ba$bha$ma] → m;
 $anusvara} [$ya$ra$lla$la$va$ssa$sha$sa$ha] → n;
 $anusvara→ m\u0307;
-$ya$nukta}$x        → y\u0307;
-$ya$nukta$virama    → y\u0307;
-$ya$nukta           → y\u0307a;
-$la$nukta }$x       → l\u0331;
-$la$nukta$virama    → l\u0331;
-$la$nukta           → l\u0331a;
-$na$nukta }$x       → n\u0331;
-$na$nukta$virama    → n\u0331;
-$na$nukta           → n\u0331a;
-$ena }$x            → n\u0331;
-$ena$virama         → n\u0331;
-$ena                → n\u0331a;
-$uka                → qa;
-$ka$nukta }$x       → q;
-$ka$nukta$virama    → q;
-$ka$nukta           → qa;
-$kha$nukta }$x      → k\u0331h\u0331;
-$kha$nukta$virama   → k\u0331h\u0331;
-$kha$nukta          → k\u0331h\u0331a;
-$ukha$virama        → k\u0331h\u0331;
-$ukha               → k\u0331h\u0331a;
-$ugha               → g\u0307a;
-$ga$nukta }$x       → g\u0307;
-$ga$nukta$virama    → g\u0307;
-$ga$nukta           → g\u0307a;
-$ujha               → za;
-$ja$nukta }$x       → z;
-$ja$nukta$virama    → z;
-$ja$nukta           → za;
-$ddha$nukta}$x      → r\u0323h;
-$ddha$nukta$virama  → r\u0323h;
-$ddha$nukta         → r\u0323ha;
-$uddha}$x           → r\u0323;
-$uddha$virama       → r\u0323;
-$uddha              → r\u0323a;
-$udha               → r\u0323a;
-$dda$nukta}$x       → r\u0323;
-$dda$nukta$virama   → r\u0323;
-$dda$nukta          → r\u0323a;
-$pha$nukta }$x      → f;
-$pha$nukta$virama   → f;
-$pha$nukta          → fa;
-$ufa }$x            → f;
-$ufa$virama         → f;
-$ufa                → fa;
-$ra$nukta}$x        → r\u0331;
-$ra$nukta$virama    → r\u0331;
-$ra$nukta           → r\u0331a;
-$lla$nukta}$x       → l\u0331;
-$lla$nukta$virama   → l\u0331;
-$lla$nukta          → l\u0331a;
-$ela}$x             → l\u0331;
-$ela$virama         → l\u0331;
-$ela                → l\u0331a;
-$uya}$x             → y\u0307;
-$uya$virama         → y\u0307;
-$uya                → y\u0307a;
+$ya$nukta}$x → y\u0307;
+$ya$nukta$virama → y\u0307;
+$ya$nukta → y\u0307a;
+$la$nukta }$x → l\u0331;
+$la$nukta$virama → l\u0331;
+$la$nukta → l\u0331a;
+$na$nukta }$x → n\u0331;
+$na$nukta$virama → n\u0331;
+$na$nukta → n\u0331a;
+$ena }$x → n\u0331;
+$ena$virama → n\u0331;
+$ena → n\u0331a;
+$uka → qa;
+$ka$nukta }$x → q;
+$ka$nukta$virama → q;
+$ka$nukta → qa;
+$kha$nukta }$x → k\u0331h\u0331;
+$kha$nukta$virama → k\u0331h\u0331;
+$kha$nukta → k\u0331h\u0331a;
+$ukha$virama → k\u0331h\u0331;
+$ukha → k\u0331h\u0331a;
+$ugha → g\u0307a;
+$ga$nukta }$x → g\u0307;
+$ga$nukta$virama → g\u0307;
+$ga$nukta → g\u0307a;
+$ujha → za;
+$ja$nukta }$x → z;
+$ja$nukta$virama → z;
+$ja$nukta → za;
+$ddha$nukta}$x → r\u0323h;
+$ddha$nukta$virama → r\u0323h;
+$ddha$nukta → r\u0323ha;
+$uddha}$x → r\u0323;
+$uddha$virama → r\u0323;
+$uddha → r\u0323a;
+$udha → r\u0323a;
+$dda$nukta}$x → r\u0323;
+$dda$nukta$virama → r\u0323;
+$dda$nukta → r\u0323a;
+$pha$nukta }$x → f;
+$pha$nukta$virama → f;
+$pha$nukta → fa;
+$ufa }$x → f;
+$ufa$virama → f;
+$ufa → fa;
+$ra$nukta}$x → r\u0331;
+$ra$nukta$virama → r\u0331;
+$ra$nukta → r\u0331a;
+$lla$nukta}$x → l\u0331;
+$lla$nukta$virama → l\u0331;
+$lla$nukta → l\u0331a;
+$ela}$x → l\u0331;
+$ela$virama → l\u0331;
+$ela → l\u0331a;
+$uya}$x → y\u0307;
+$uya$virama → y\u0307;
+$uya → y\u0307a;
 $ka$virama}$ha→k'';
 $ka}$x→k;
 $ka$virama→k;
@@ -325,42 +325,42 @@ $ssa→s\u0323a;
 $ha}$x→h;
 $ha$virama→h;
 $ha→ha;
-$forceIndependentMatra{$aa  → \u0314a\u0304;
-$forceIndependentMatra{$ai  → \u0314ai;
-$forceIndependentMatra{$au  → \u0314au;
-$forceIndependentMatra{$ii  → \u0314i\u0304;
-$forceIndependentMatra{$i   → \u0314i;
-$forceIndependentMatra{$uu  → \u0314u\u0304;
-$forceIndependentMatra{$u   → \u0314u;
+$forceIndependentMatra{$aa → \u0314a\u0304;
+$forceIndependentMatra{$ai → \u0314ai;
+$forceIndependentMatra{$au → \u0314au;
+$forceIndependentMatra{$ii → \u0314i\u0304;
+$forceIndependentMatra{$i → \u0314i;
+$forceIndependentMatra{$uu → \u0314u\u0304;
+$forceIndependentMatra{$u → \u0314u;
 $forceIndependentMatra{$rrh → \u0314r\u0325\u0304;
-$forceIndependentMatra{$rh  → \u0314r\u0325;
+$forceIndependentMatra{$rh → \u0314r\u0325;
 $forceIndependentMatra{$llh → \u0314l\u0325\u0304;
-$forceIndependentMatra{$lh  → \u0314l\u0325;
-$forceIndependentMatra{$e   → \u0314e\u0304;
-$forceIndependentMatra{$o   → \u0314o\u0304;
-$forceIndependentMatra{$ce  → \u0314e\u0306;
-$forceIndependentMatra{$co  → \u0314o\u0306;
-$forceIndependentMatra{$se  → \u0314e;
-$forceIndependentMatra{$so  → \u0314o;
-$forceIndependentMatra{$nukta  →; # Nukta cannot appear independently or as first character
+$forceIndependentMatra{$lh → \u0314l\u0325;
+$forceIndependentMatra{$e → \u0314e\u0304;
+$forceIndependentMatra{$o → \u0314o\u0304;
+$forceIndependentMatra{$ce → \u0314e\u0306;
+$forceIndependentMatra{$co → \u0314o\u0306;
+$forceIndependentMatra{$se → \u0314e;
+$forceIndependentMatra{$so → \u0314o;
+$forceIndependentMatra{$nukta →; # Nukta cannot appear independently or as first character
 $forceIndependentMatra{$virama →; # Virama cannot appear independently or as first character
-$aa  → a\u0304;
-$ai  → ai;
-$au  → au;
-$ii  → i\u0304;
-$i   → i;
-$uu  → u\u0304;
-$u   → u;
+$aa → a\u0304;
+$ai → ai;
+$au → au;
+$ii → i\u0304;
+$i → i;
+$uu → u\u0304;
+$u → u;
 $rrh → r\u0325\u0304;
-$rh  → r\u0325;
+$rh → r\u0325;
 $llh → l\u0325\u0304;
-$lh  → l\u0325;
-$e   → e\u0304;
-$o   → o\u0304;
-$ce  → e\u0306;
-$co  → o\u0306;
-$se  → e;
-$so  → o;
+$lh → l\u0325;
+$e → e\u0304;
+$o → o\u0304;
+$ce → e\u0306;
+$co → o\u0306;
+$se → e;
+$so → o;
 $waa} $x → a\u0304\u0314;
 $wai} $x → ai\u0314;
 $wau} $x → au\u0314;
@@ -380,38 +380,38 @@ $wco} $x → o\u0306\u0314;
 $wse} $x → e\u0314;
 $wso} $x → o\u0314;
 $om} $x → ''om\u0314;
-$vowels{$waa  → ''a\u0304;
-$vowels{$wai  → ''ai;
-$vowels{$wau  → ''au;
-$vowels{$wii  → ''i\u0304;
-$vowels{$wi   → ''i;
-$vowels{$wuu  → ''u\u0304;
-$vowels{$wu   → ''u;
-$vowels{$wrr  → ''r\u0325\u0304;
-$vowels{$wr   → ''r\u0325;
-$vowels{$wll  → ''l\u0325\u0304;
-$vowels{$wl   → ''l\u0325;
-$vowels{$we   → ''e\u0304;
-$vowels{$wo   → ''o\u0304;
-$vowels{$wa   → ''a;
-$vowels{$wce  → ''e\u0306;
-$vowels{$wco  → ''o\u0306;
-$vowels{$wse  → ''e;
-$vowels{$wso  → ''o;
+$vowels{$waa → ''a\u0304;
+$vowels{$wai → ''ai;
+$vowels{$wau → ''au;
+$vowels{$wii → ''i\u0304;
+$vowels{$wi → ''i;
+$vowels{$wuu → ''u\u0304;
+$vowels{$wu → ''u;
+$vowels{$wrr → ''r\u0325\u0304;
+$vowels{$wr → ''r\u0325;
+$vowels{$wll → ''l\u0325\u0304;
+$vowels{$wl → ''l\u0325;
+$vowels{$we → ''e\u0304;
+$vowels{$wo → ''o\u0304;
+$vowels{$wa → ''a;
+$vowels{$wce → ''e\u0306;
+$vowels{$wco → ''o\u0306;
+$vowels{$wse → ''e;
+$vowels{$wso → ''o;
 $waa → a\u0304;
 $wai → ai;
 $wau → au;
 $wii → i\u0304;
-$wi  → i;
+$wi → i;
 $wuu → u\u0304;
-$wu  → u;
+$wu → u;
 $wrr → r\u0325\u0304;
-$wr  → r\u0325;
+$wr → r\u0325;
 $wll → l\u0325\u0304;
-$wl  → l\u0325;
-$we  → e\u0304;
-$wo  → o\u0304;
-$wa  → a;
+$wl → l\u0325;
+$we → e\u0304;
+$wo → o\u0304;
+$wa → a;
 $wce → e\u0306;
 $wco → o\u0306;
 $wse → e;
@@ -421,42 +421,42 @@ $avagraha → \u0315;
 $chandrabindu$anusvara→\u0303;
 $chandrabindu → m\u0310;
 $visarga→h\u0323;
-$zero  → 0;
-$one   → 1;
-$two   → 2;
+$zero → 0;
+$one → 1;
+$two → 2;
 $three → 3;
-$four  → 4;
-$five  → 5;
-$six   → 6;
+$four → 4;
+$five → 5;
+$six → 6;
 $seven → 7;
 $eight → 8;
-$nine  → 9;
-$lm   →;
+$nine → 9;
+$lm →;
 $ailm →;
 $aulm →;
 $dgs→ʔ;
 $kta→t\u0331;
 $danda→'.';
 $doubleDanda→'.';
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071}$x→ra;
 \uE071$virama→r;
 \uE071→ra;
 \uE072}$x→ra;
 \uE072$virama→r;
 \uE072→ra;
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;       # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
-\uE004→;       # DEVANAGARI VOWEL SIGN SHORT A
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
+\uE004→; # DEVANAGARI VOWEL SIGN SHORT A
index c0fd8fd6fab68f5f563f726815df2d0909885aa4..929f9615680c2adf0ff44ad879a7e439b9ab4aa8 100644 (file)
 \uE061→ൡ; # LETTER VOCALIC LL
 \uE062→; # FALLBACK BLOW AWAY VOWEL SIGN VOCALIC L
 \uE063→; # FALLBACK BLOW AWAY VOWEL SIGN VOCALIC LL
-\uE064→'.'   ; # FALLBACK FOR DANDA
-\uE065→'.'   ; # FALLBACK FOR DOUBLE DANDA
+\uE064→'.' ; # FALLBACK FOR DANDA
+\uE065→'.' ; # FALLBACK FOR DOUBLE DANDA
 \uE066→൦; # DIGIT ZERO
 \uE067→൧; # DIGIT ONE
 \uE068→൨; # DIGIT TWO
 \uE06D→൭; # DIGIT SEVEN
 \uE06E→൮; # DIGIT EIGHT
 \uE06F→൯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071→ര; # LETTER RA WITH MIDDLE DIAGONAL
 \uE072→ര; # LETTER RA WITH LOWER DIAGONAL
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;       # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
 \uE081→വ; # FALLBACK FOR ORIYA LETTER WA
-\uE082→;       # Devanagari Glottal Stop
-\uE083→ത\u0D4D;  # Bengali Khanda-ta
-0 → ൦;    # FALLBACK FOR TAMIL
+\uE082→; # Devanagari Glottal Stop
+\uE083→ത\u0D4D; # Bengali Khanda-ta
+0 → ൦; # FALLBACK FOR TAMIL
 1 → ൧;
index 73e51795555b42a326fbb0a4005ed5ae33f2e26f..bdaddf6069ccb5265b7f3f64946e7f571ac487bb 100644 (file)
@@ -25,7 +25,7 @@
 \uE010→ଐ; # LETTER AI
 \uE011→ଓ; # FALLBACK
 \uE012→ଓ; # FALLBACK
-\uE013→ଓ; # FALLBACK  LETTER OO (ଓ = LETTER O)
+\uE013→ଓ; # FALLBACK LETTER OO (ଓ = LETTER O)
 \uE014→ଔ; # LETTER AU
 \uE015→କ; # LETTER KA
 \uE016→ଖ; # LETTER KHA
@@ -58,7 +58,7 @@
 \uE031→ଡ଼; # LETTER RRA
 \uE032→ଲ; # LETTER LA
 \uE033→ଳ; # LETTER LLA
-\uE034→ଳ\u0B3C; # FALLBACK  LETTER LLLA→LETTER LLA
+\uE034→ଳ\u0B3C; # FALLBACK LETTER LLLA→LETTER LLA
 \uE035→ଵ; # LETTER VA
 \uE036→ଶ; # LETTER SHA
 \uE037→ଷ; # LETTER SSA
 \uE06D→୭; # DIGIT SEVEN
 \uE06E→୮; # DIGIT EIGHT
 \uE06F→୯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071→ର; # LETTER RA WITH MIDDLE DIAGONAL
 \uE072→ର; # LETTER RA WITH LOWER DIAGONAL
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
 \uE07B→୰; # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
 \uE081→ୱ; # LETTER WA
-\uE082→;       # Devanagari Glottal Stop
-\uE083→ତ\u0B4D;  # Bengali Khanda-ta
-0 → ୦;    # FALLBACK FOR TAMIL
+\uE082→; # Devanagari Glottal Stop
+\uE083→ତ\u0B4D; # Bengali Khanda-ta
+0 → ୦; # FALLBACK FOR TAMIL
 1 → ୧;
index 5611b19502daf7d15b075d536bfc10f50f5fd3a4..8d10868a72eb23f3520754151bda926c895195dc 100644 (file)
 \uE061→ள; # FALLBACK LETTER LLA
 \uE062→ி; # FALLBACK VOWEL SIGN VOCALIC L
 \uE063→\u0BC0; # FALLBACK VOWEL SIGN VOCALIC LL
-\uE064→'.'   ; # FALLBACK FOR DANDA
-\uE065→'.'   ; # FALLBACK FOR DOUBLE DANDA
+\uE064→'.' ; # FALLBACK FOR DANDA
+\uE065→'.' ; # FALLBACK FOR DOUBLE DANDA
 \uE066→\u0BE6; # FALLBACK DIGIT ZERO
 \uE067→௧; # DIGIT ONE
 \uE068→௨; # DIGIT TWO
 \uE06D→௭; # DIGIT SEVEN
 \uE06E→௮; # DIGIT EIGHT
 \uE06F→௯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071→\u0BC0; # LETTER RA WITH MIDDLE DIAGONAL
 \uE072→\u0BC0; # LETTER RA WITH LOWER DIAGONAL
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;       # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
 \uE081→வ; # FALLBACK FOR ORIYA LETTER WA
-\uE082→;       # Devanagari Glottal Stop
-\uE083→த\u0BCD;  # Bengali Khanda-ta
+\uE082→; # Devanagari Glottal Stop
+\uE083→த\u0BCD; # Bengali Khanda-ta
index 07f3d7fa21ccbe39457b18f0c96b97e2474d84b6..8eb06f211a7549fc240da6d333b340547f036fb5 100644 (file)
 \uE061→ౡ; # LETTER VOCALIC LL
 \uE062→\u0C3F; # REMAP (indicExceptions.txt): \u0C62→\u0C3F = VOWEL SIGN VOCALIC L→VOWEL SIGN I
 \uE063→\u0C40; # REMAP (indicExceptions.txt): \u0C63→\u0C40 = VOWEL SIGN VOCALIC LL→VOWEL SIGN II
-\uE064→'.'   ; # FALLBACK FOR DANDA
-\uE065→'.'   ; # FALLBACK FOR DOUBLE DANDA
+\uE064→'.' ; # FALLBACK FOR DANDA
+\uE065→'.' ; # FALLBACK FOR DOUBLE DANDA
 \uE066→౦; # DIGIT ZERO
 \uE067→౧; # DIGIT ONE
 \uE068→౨; # DIGIT TWO
 \uE06D→౭; # DIGIT SEVEN
 \uE06E→౮; # DIGIT EIGHT
 \uE06F→౯; # DIGIT NINE
-\uE070→;       # ABBREVIATION SIGN
+\uE070→; # ABBREVIATION SIGN
 \uE071→ర; # LETTER RA WITH MIDDLE DIAGONAL
 \uE072→ర; # LETTER RA WITH LOWER DIAGONAL
-\uE073→;       # RUPEE MARK
-\uE074→;       # RUPEE SIGN
-\uE075→;       # CURRENCY NUMERATOR ONE
-\uE076→;       # CURRENCY NUMERATOR TWO
-\uE077→;       # CURRENCY NUMERATOR THREE
-\uE078→;       # CURRENCY NUMERATOR FOUR
-\uE079→;       # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-\uE07A→;       # CURRENCY DENOMINATOR SIXTEEN
-\uE07B→;       # ISSHAR
-\uE07C→;       # TIPPI
-\uE07D→;       # ADDAK
-\uE07E→;       # IRI
-\uE07F→;       # URA
-\uE080→;       # EK ONKAR
+\uE073→; # RUPEE MARK
+\uE074→; # RUPEE SIGN
+\uE075→; # CURRENCY NUMERATOR ONE
+\uE076→; # CURRENCY NUMERATOR TWO
+\uE077→; # CURRENCY NUMERATOR THREE
+\uE078→; # CURRENCY NUMERATOR FOUR
+\uE079→; # CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
+\uE07A→; # CURRENCY DENOMINATOR SIXTEEN
+\uE07B→; # ISSHAR
+\uE07C→; # TIPPI
+\uE07D→; # ADDAK
+\uE07E→; # IRI
+\uE07F→; # URA
+\uE080→; # EK ONKAR
 \uE081→వ; # FALLBACK FOR ORIYA LETTER WA
-\uE082→;       # Devanagari Glottal Stop
-\uE083→త\u0C4D;  # Bengali Khanda-ta
-0 → ౦;    # FALLBACK FOR TAMIL
+\uE082→; # Devanagari Glottal Stop
+\uE083→త\u0C4D; # Bengali Khanda-ta
+0 → ౦; # FALLBACK FOR TAMIL
 1 → ౧;
index cdfeb3c3224090936485974e8086779deea95164..70f5aa7ddec8b84e266d34536966a37fad9c276a 100644 (file)
@@ -9,8 +9,8 @@
 #
 :: [あいうえおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろわゐゑをんゔアイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロワヰヱヲンヴ] ;
 :: NFD (NFC) ;
-$apostrophe  = ’;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$apostrophe = ’;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 ッ}[カキクケコ] → k ; # KATAKANA LETTER SMALL TU
 っ}[かきくけこ] → k ; # HIRAGANA LETTER SMALL TU
 ッ}[サシスセソ] → s ; # KATAKANA LETTER SMALL TU
index 59f9a554ccba73490e199c103f55c8eade4cde40..e605c2ecf8503a8ef59eb206d21e11a8c5ef7635 100644 (file)
@@ -7,86 +7,86 @@
 # File: Kannada_InterIndic.txt
 # Generated from CLDR 
 #
-\u0CC6ೕ→\uE047;        # VOWEL SIGN EE
-\u0CC6\u0CCDೖ→\uE048\uE04D;        # VOWEL SIGN AI
-\u0CC6ೖ→\uE048;        # VOWEL SIGN AI
-\u0CC6ೂೕ→\uE04B;  # VOWEL SIGN OO
-\u0CC6ೂ→\uE04A;        # VOWEL SIGN O
-\u0CBFೕ→\uE040;        # VOWEL SIGN II
-ಂ→\uE002;              # SIGN ANUSVARA
-ಃ→\uE003;              # SIGN VISARGA
-ಅ→\uE005;              # LETTER A
-ಆ→\uE006;              # LETTER AA
-ಇ→\uE007;              # LETTER I
-ಈ→\uE008;              # LETTER II
-ಉ→\uE009;              # LETTER U
-ಊ→\uE00A;              # LETTER UU
-ಋ→\uE00B;              # LETTER VOCALIC R
-ಌ→\uE00C;              # LETTER VOCALIC L
-ಎ→\uE00E;              # LETTER E
-ಏ→\uE00F;              # LETTER EE
-ಐ→\uE010;              # LETTER AI
-ಒ→\uE012;              # LETTER O
-ಓ→\uE013;              # LETTER OO
-ಔ→\uE014;              # LETTER AU
-ಕ→\uE015;              # LETTER KA
-ಖ→\uE016;              # LETTER KHA
-ಗ→\uE017;              # LETTER GA
-ಘ→\uE018;              # LETTER GHA
-ಙ→\uE019;              # LETTER NGA
-ಚ→\uE01A;              # LETTER CA
-ಛ→\uE01B;              # LETTER CHA
-ಜ→\uE01C;              # LETTER JA
-ಝ→\uE01D;              # LETTER JHA
-ಞ→\uE01E;              # LETTER NYA
-ಟ→\uE01F;              # LETTER TTA
-ಠ→\uE020;              # LETTER TTHA
-ಡ→\uE021;              # LETTER DDA
-ಢ→\uE022;              # LETTER DDHA
-ಣ→\uE023;              # LETTER NNA
-ತ→\uE024;              # LETTER TA
-ಥ→\uE025;              # LETTER THA
-ದ→\uE026;              # LETTER DA
-ಧ→\uE027;              # LETTER DHA
-ನ→\uE028;              # LETTER NA
-ಪ→\uE02A;              # LETTER PA
-ಫ→\uE02B;              # LETTER PHA
-ಬ→\uE02C;              # LETTER BA
-ಭ→\uE02D;              # LETTER BHA
-ಮ→\uE02E;              # LETTER MA
-ಯ→\uE02F;              # LETTER YA
-ರ→\uE030;              # LETTER RA
-ಱ→\uE031;              # LETTER RRA
-ಲ→\uE032;              # LETTER LA
-ಳ→\uE033;              # LETTER LLA
-ವ→\uE035;              # LETTER VA
-ಶ→\uE036;              # LETTER SHA
-ಷ→\uE037;              # LETTER SSA
-ಸ→\uE038;              # LETTER SA
-ಹ→\uE039;              # LETTER HA
+\u0CC6ೕ→\uE047; # VOWEL SIGN EE
+\u0CC6\u0CCDೖ→\uE048\uE04D; # VOWEL SIGN AI
+\u0CC6ೖ→\uE048; # VOWEL SIGN AI
+\u0CC6ೂೕ→\uE04B; # VOWEL SIGN OO
+\u0CC6ೂ→\uE04A; # VOWEL SIGN O
+\u0CBFೕ→\uE040; # VOWEL SIGN II
+ಂ→\uE002; # SIGN ANUSVARA
+ಃ→\uE003; # SIGN VISARGA
+ಅ→\uE005; # LETTER A
+ಆ→\uE006; # LETTER AA
+ಇ→\uE007; # LETTER I
+ಈ→\uE008; # LETTER II
+ಉ→\uE009; # LETTER U
+ಊ→\uE00A; # LETTER UU
+ಋ→\uE00B; # LETTER VOCALIC R
+ಌ→\uE00C; # LETTER VOCALIC L
+ಎ→\uE00E; # LETTER E
+ಏ→\uE00F; # LETTER EE
+ಐ→\uE010; # LETTER AI
+ಒ→\uE012; # LETTER O
+ಓ→\uE013; # LETTER OO
+ಔ→\uE014; # LETTER AU
+ಕ→\uE015; # LETTER KA
+ಖ→\uE016; # LETTER KHA
+ಗ→\uE017; # LETTER GA
+ಘ→\uE018; # LETTER GHA
+ಙ→\uE019; # LETTER NGA
+ಚ→\uE01A; # LETTER CA
+ಛ→\uE01B; # LETTER CHA
+ಜ→\uE01C; # LETTER JA
+ಝ→\uE01D; # LETTER JHA
+ಞ→\uE01E; # LETTER NYA
+ಟ→\uE01F; # LETTER TTA
+ಠ→\uE020; # LETTER TTHA
+ಡ→\uE021; # LETTER DDA
+ಢ→\uE022; # LETTER DDHA
+ಣ→\uE023; # LETTER NNA
+ತ→\uE024; # LETTER TA
+ಥ→\uE025; # LETTER THA
+ದ→\uE026; # LETTER DA
+ಧ→\uE027; # LETTER DHA
+ನ→\uE028; # LETTER NA
+ಪ→\uE02A; # LETTER PA
+ಫ→\uE02B; # LETTER PHA
+ಬ→\uE02C; # LETTER BA
+ಭ→\uE02D; # LETTER BHA
+ಮ→\uE02E; # LETTER MA
+ಯ→\uE02F; # LETTER YA
+ರ→\uE030; # LETTER RA
+ಱ→\uE031; # LETTER RRA
+ಲ→\uE032; # LETTER LA
+ಳ→\uE033; # LETTER LLA
+ವ→\uE035; # LETTER VA
+ಶ→\uE036; # LETTER SHA
+ಷ→\uE037; # LETTER SSA
+ಸ→\uE038; # LETTER SA
+ಹ→\uE039; # LETTER HA
 \u0CBC→\uE03C; # SIGN NUKTA
-ಽ→\uE03D;              # AVAGRAHA
-ಾ→\uE03E;              # VOWEL SIGN AA
-\u0CBF→\uE03F;              # VOWEL SIGN I
-ು→\uE041;              # VOWEL SIGN U
-ೂ→\uE042;              # VOWEL SIGN UU
-ೃ→\uE043;              # VOWEL SIGN VOCALIC R
-ೄ→\uE044;              # VOWEL SIGN VOCALIC RR
-\u0CC6→\uE046;              # VOWEL SIGN E
-\u0CCC→\uE04C;              # VOWEL SIGN AU
-\u0CCD→\uE04D;              # SIGN VIRAMA
-ೕ→\uE055;              # LENGTH MARK
-ೖ→\uE056;              # AI LENGTH MARK
-ೞ→\uE034;              # LETTER LLLA
-ೠ→\uE060;              # LETTER VOCALIC RR
-ೡ→\uE061;              # LETTER VOCALIC LL
-೦→\uE066;              # DIGIT ZERO
-೧→\uE067;              # DIGIT ONE
-೨→\uE068;              # DIGIT TWO
-೩→\uE069;              # DIGIT THREE
-೪→\uE06A;              # DIGIT FOUR
-೫→\uE06B;              # DIGIT FIVE
-೬→\uE06C;              # DIGIT SIX
-೭→\uE06D;              # DIGIT SEVEN
-೮→\uE06E;              # DIGIT EIGHT
-೯→\uE06F;              # DIGIT NINE
+ಽ→\uE03D; # AVAGRAHA
+ಾ→\uE03E; # VOWEL SIGN AA
+\u0CBF→\uE03F; # VOWEL SIGN I
+ು→\uE041; # VOWEL SIGN U
+ೂ→\uE042; # VOWEL SIGN UU
+ೃ→\uE043; # VOWEL SIGN VOCALIC R
+ೄ→\uE044; # VOWEL SIGN VOCALIC RR
+\u0CC6→\uE046; # VOWEL SIGN E
+\u0CCC→\uE04C; # VOWEL SIGN AU
+\u0CCD→\uE04D; # SIGN VIRAMA
+ೕ→\uE055; # LENGTH MARK
+ೖ→\uE056; # AI LENGTH MARK
+ೞ→\uE034; # LETTER LLLA
+ೠ→\uE060; # LETTER VOCALIC RR
+ೡ→\uE061; # LETTER VOCALIC LL
+೦→\uE066; # DIGIT ZERO
+೧→\uE067; # DIGIT ONE
+೨→\uE068; # DIGIT TWO
+೩→\uE069; # DIGIT THREE
+೪→\uE06A; # DIGIT FOUR
+೫→\uE06B; # DIGIT FIVE
+೬→\uE06C; # DIGIT SIX
+೭→\uE06D; # DIGIT SEVEN
+೮→\uE06E; # DIGIT EIGHT
+೯→\uE06F; # DIGIT NINE
index ce10314477ac5780d864266fe49592fa67af6393..ee80776d6de06f744a7cbcf4b375b95f29167b03 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪЫІЬЭЮЯаәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГҒДЖЗЙКҚЛМНҢПРСТФХҺЦЧШЩЪЬ] ;
 $lowerConsonants = [бвгғджзйкқлмнңпрстфхһцчшщъь] ;
@@ -18,7 +18,7 @@ $upperVowels = [АӘЕЁИОӨУҰҮЫІЭЮЯ] ;
 $lowerVowels = [аәеёиоөуұүыіэюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Ә → Ä ; # CYRILLIC CAPITAL LETTER SCHWA
index 6ff110d1ebdc37ffb5a46bbb9ea6ca09b6b48ccd..a8fae70f9dde5c188dcb712d34a61498d240687a 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГДЕЁЖЗИЙКЛМНҢОӨПРСТУҮФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмнңоөпрстуүфхцчшщъыьэюя] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГДЖЗЙКЛМНҢПРСТФХЦЧШЩЪЬ] ;
 $lowerConsonants = [бвгджзйклмнңпрстфхцчшщъь] ;
@@ -18,7 +18,7 @@ $upperVowels = [АЕЁИОӨУҮЫЭЮЯ] ;
 $lowerVowels = [аеёиоөуүыэюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index 3af46fd73b3dd507b132fa87e6fa66ff36b9efec..6124bcd0c6069bf356eebf051bcbba1cc3359daa 100644 (file)
@@ -12,7 +12,7 @@
 $aspirate = ’;
 $apostrophe = ’;
 $vowels = [ᅡᅢᅣᅤᅥᅦᅧᅨᅩᅪᅫᅬᅭᅮᅯᅰᅱᅲᅳᅴᅵ] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 ᆨᄀ → kk ; # HANGUL JONGSEONG KIYEOK + CHOSEONG KIYEOK
 ᆨᄂ → ngn ; # HANGUL JONGSEONG KIYEOK + CHOSEONG NIEUN
 ᆨᄃ → kt ; # HANGUL JONGSEONG KIYEOK + CHOSEONG TIKEUT
@@ -153,7 +153,7 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 [$vowels]ᄆ → m ; # HANGUL JONGSEONG KIYEOK + CHOSEONG MIEUM
 [$vowels]ᄇ → b ; # HANGUL JONGSEONG KIYEOK + CHOSEONG PIEUP
 [$vowels]ᄉ → s ; # HANGUL JONGSEONG KIYEOK + CHOSEONG SIOS
-[$vowels]ᄋ →  ; # HANGUL JONGSEONG KIYEOK + CHOSEONG IEUNG
+[$vowels]ᄋ → ; # HANGUL JONGSEONG KIYEOK + CHOSEONG IEUNG
 [$vowels]ᄌ → j ; # HANGUL JONGSEONG KIYEOK + CHOSEONG CIEUC
 [$vowels]ᄎ → ch $aspirate ; # HANGUL JONGSEONG KIYEOK + CHOSEONG CHIEUCH
 [$vowels]ᄏ → k $aspirate ; # HANGUL JONGSEONG KIYEOK + CHOSEONG KHIEUKH
@@ -229,7 +229,7 @@ $wordBoundary{ᄅ → n ; # HANGUL CHOSEONG RIEUL
 $wordBoundary{ᄆ → m ; # HANGUL CHOSEONG MIEUM
 $wordBoundary{ᄇ → p ; # HANGUL CHOSEONG PIEUP
 $wordBoundary{ᄉ → s ; # HANGUL CHOSEONG SIOS
-$wordBoundary{ᄋ →  ; # HANGUL CHOSEONG IEUNG
+$wordBoundary{ᄋ → ; # HANGUL CHOSEONG IEUNG
 $wordBoundary{ᄌ → ch ; # HANGUL CHOSEONG CIEUC
 $wordBoundary{ᄎ → ch $aspirate ; # HANGUL CHOSEONG CHIEUCH
 $wordBoundary{ᄏ → k $aspirate ; # HANGUL CHOSEONG KHIEUKH
index b370f91531ca8e278c0c09edc5732aa533c72225..9b397e284a0901de109ed0a0cd3969752e0ca450 100755 (executable)
@@ -10,8 +10,8 @@
 #--- forward filter, transforms ----
 # currently in reverse it only goes back to Latin with numeric tones (not sure why); ok but would rather have marks.
 #
-:: [[:Latin:][1-5]];           # forward filter: only modifies Latin and tone digits
-:: Latin-NumericPinyin(NumericPinyin-Latin);   # tone marks in middle ↔ digits at end to use numeric below; this leaves the pinyin in NFC
+:: [[:Latin:][1-5]]; # forward filter: only modifies Latin and tone digits
+:: Latin-NumericPinyin(NumericPinyin-Latin); # tone marks in middle ↔ digits at end to use numeric below; this leaves the pinyin in NFC
 #
 #--- variables ----
 #
@@ -35,1346 +35,1346 @@ $zTone = [ˉˊˇˋ˙];
 #
 #--- clusters with initial consonant ----
 #
-bang }$pTone    ↔ ㄅㄤ }$zTone;
- bang           →  ㄅㄤ˙;
- bang1          ← ㄅㄤ;
-beng }$pTone    ↔ ㄅㄥ }$zTone;
- beng           →  ㄅㄥ˙;
- beng1          ← ㄅㄥ;
-biao }$pTone    ↔ ㄅㄧㄠ }$zTone;
- biao           →  ㄅㄧㄠ˙;
- biao1          ← ㄅㄧㄠ;
-bian }$pTone    ↔ ㄅㄧㄢ }$zTone;
- bian           →  ㄅㄧㄢ˙;
- bian1          ← ㄅㄧㄢ;
-bing }$pTone    ↔ ㄅㄧㄥ }$zTone;
- bing           →  ㄅㄧㄥ˙;
- bing1          ← ㄅㄧㄥ;
-bai }$pTone     ↔ ㄅㄞ }$zTone;
- bai            →  ㄅㄞ˙;
- bai1           ← ㄅㄞ;
-bei }$pTone     ↔ ㄅㄟ }$zTone;
- bei            →  ㄅㄟ˙;
- bei1           ← ㄅㄟ;
-bao }$pTone     ↔ ㄅㄠ }$zTone;
- bao            →  ㄅㄠ˙;
- bao1           ← ㄅㄠ;
-ban }$pTone     ↔ ㄅㄢ }$zTone;
- ban            →  ㄅㄢ˙;
- ban1           ← ㄅㄢ;
-ben }$pTone     ↔ ㄅㄣ }$zTone;
- ben            →  ㄅㄣ˙;
- ben1           ← ㄅㄣ;
-bie }$pTone     ↔ ㄅㄧㄝ }$zTone;
- bie            →  ㄅㄧㄝ˙;
- bie1           ← ㄅㄧㄝ;
-bin }$pTone     ↔ ㄅㄧㄣ }$zTone;
- bin            →  ㄅㄧㄣ˙;
- bin1           ← ㄅㄧㄣ;
-bun }$pTone     ↔ ㄅㄨㄣ }$zTone;
- bun            →  ㄅㄨㄣ˙;
- bun1           ← ㄅㄨㄣ;
-ba }$pTone      ↔ ㄅㄚ }$zTone;
- ba             →  ㄅㄚ˙;
- ba1            ← ㄅㄚ;
-bo }$pTone      ↔ ㄅㄛ }$zTone;
- bo             →  ㄅㄛ˙;
- bo1            ← ㄅㄛ;
-bi }$pTone      ↔ ㄅㄧ }$zTone;
- bi             →  ㄅㄧ˙;
- bi1            ← ㄅㄧ;
-bu }$pTone      ↔ ㄅㄨ }$zTone;
- bu             →  ㄅㄨ˙;
- bu1            ← ㄅㄨ;
+bang }$pTone ↔ ㄅㄤ }$zTone;
+ bang  ㄅㄤ˙;
+ bang1 ← ㄅㄤ;
+beng }$pTone ↔ ㄅㄥ }$zTone;
+ beng  ㄅㄥ˙;
+ beng1 ← ㄅㄥ;
+biao }$pTone ↔ ㄅㄧㄠ }$zTone;
+ biao  ㄅㄧㄠ˙;
+ biao1 ← ㄅㄧㄠ;
+bian }$pTone ↔ ㄅㄧㄢ }$zTone;
+ bian  ㄅㄧㄢ˙;
+ bian1 ← ㄅㄧㄢ;
+bing }$pTone ↔ ㄅㄧㄥ }$zTone;
+ bing  ㄅㄧㄥ˙;
+ bing1 ← ㄅㄧㄥ;
+bai }$pTone ↔ ㄅㄞ }$zTone;
+ bai  ㄅㄞ˙;
+ bai1 ← ㄅㄞ;
+bei }$pTone ↔ ㄅㄟ }$zTone;
+ bei  ㄅㄟ˙;
+ bei1 ← ㄅㄟ;
+bao }$pTone ↔ ㄅㄠ }$zTone;
+ bao  ㄅㄠ˙;
+ bao1 ← ㄅㄠ;
+ban }$pTone ↔ ㄅㄢ }$zTone;
+ ban  ㄅㄢ˙;
+ ban1 ← ㄅㄢ;
+ben }$pTone ↔ ㄅㄣ }$zTone;
+ ben  ㄅㄣ˙;
+ ben1 ← ㄅㄣ;
+bie }$pTone ↔ ㄅㄧㄝ }$zTone;
+ bie  ㄅㄧㄝ˙;
+ bie1 ← ㄅㄧㄝ;
+bin }$pTone ↔ ㄅㄧㄣ }$zTone;
+ bin  ㄅㄧㄣ˙;
+ bin1 ← ㄅㄧㄣ;
+bun }$pTone ↔ ㄅㄨㄣ }$zTone;
+ bun  ㄅㄨㄣ˙;
+ bun1 ← ㄅㄨㄣ;
+ba }$pTone ↔ ㄅㄚ }$zTone;
+ ba  ㄅㄚ˙;
+ ba1 ← ㄅㄚ;
+bo }$pTone ↔ ㄅㄛ }$zTone;
+ bo  ㄅㄛ˙;
+ bo1 ← ㄅㄛ;
+bi }$pTone ↔ ㄅㄧ }$zTone;
+ bi  ㄅㄧ˙;
+ bi1 ← ㄅㄧ;
+bu }$pTone ↔ ㄅㄨ }$zTone;
+ bu  ㄅㄨ˙;
+ bu1 ← ㄅㄨ;
 #
-pang }$pTone    ↔ ㄆㄤ }$zTone;
- pang           →  ㄆㄤ˙;
- pang1          ← ㄆㄤ;
-peng }$pTone    ↔ ㄆㄥ }$zTone;
- peng           →  ㄆㄥ˙;
- peng1          ← ㄆㄥ;
-piao }$pTone    ↔ ㄆㄧㄠ }$zTone;
- piao           →  ㄆㄧㄠ˙;
- piao1          ← ㄆㄧㄠ;
-pian }$pTone    ↔ ㄆㄧㄢ }$zTone;
- pian           →  ㄆㄧㄢ˙;
- pian1          ← ㄆㄧㄢ;
-ping }$pTone    ↔ ㄆㄧㄥ }$zTone;
- ping           →  ㄆㄧㄥ˙;
- ping1          ← ㄆㄧㄥ;
-pai }$pTone     ↔ ㄆㄞ }$zTone;
- pai            →  ㄆㄞ˙;
- pai1           ← ㄆㄞ;
-pei }$pTone     ↔ ㄆㄟ }$zTone;
- pei            →  ㄆㄟ˙;
- pei1           ← ㄆㄟ;
-pao }$pTone     ↔ ㄆㄠ }$zTone;
- pao            →  ㄆㄠ˙;
- pao1           ← ㄆㄠ;
-pou }$pTone     ↔ ㄆㄡ }$zTone;
- pou            →  ㄆㄡ˙;
- pou1           ← ㄆㄡ;
-pan }$pTone     ↔ ㄆㄢ }$zTone;
- pan            →  ㄆㄢ˙;
- pan1           ← ㄆㄢ;
-pen }$pTone     ↔ ㄆㄣ }$zTone;
- pen            →  ㄆㄣ˙;
- pen1           ← ㄆㄣ;
-pie }$pTone     ↔ ㄆㄧㄝ }$zTone;
- pie            →  ㄆㄧㄝ˙;
- pie1           ← ㄆㄧㄝ;
-pin }$pTone     ↔ ㄆㄧㄣ }$zTone;
- pin            →  ㄆㄧㄣ˙;
- pin1           ← ㄆㄧㄣ;
-pa }$pTone      ↔ ㄆㄚ }$zTone;
- pa             →  ㄆㄚ˙;
- pa1            ← ㄆㄚ;
-po }$pTone      ↔ ㄆㄛ }$zTone;
- po             →  ㄆㄛ˙;
- po1            ← ㄆㄛ;
-pi }$pTone      ↔ ㄆㄧ }$zTone;
- pi             →  ㄆㄧ˙;
- pi1            ← ㄆㄧ;
-pu }$pTone      ↔ ㄆㄨ }$zTone;
- pu             →  ㄆㄨ˙;
- pu1            ← ㄆㄨ;
+pang }$pTone ↔ ㄆㄤ }$zTone;
+ pang  ㄆㄤ˙;
+ pang1 ← ㄆㄤ;
+peng }$pTone ↔ ㄆㄥ }$zTone;
+ peng  ㄆㄥ˙;
+ peng1 ← ㄆㄥ;
+piao }$pTone ↔ ㄆㄧㄠ }$zTone;
+ piao  ㄆㄧㄠ˙;
+ piao1 ← ㄆㄧㄠ;
+pian }$pTone ↔ ㄆㄧㄢ }$zTone;
+ pian  ㄆㄧㄢ˙;
+ pian1 ← ㄆㄧㄢ;
+ping }$pTone ↔ ㄆㄧㄥ }$zTone;
+ ping  ㄆㄧㄥ˙;
+ ping1 ← ㄆㄧㄥ;
+pai }$pTone ↔ ㄆㄞ }$zTone;
+ pai  ㄆㄞ˙;
+ pai1 ← ㄆㄞ;
+pei }$pTone ↔ ㄆㄟ }$zTone;
+ pei  ㄆㄟ˙;
+ pei1 ← ㄆㄟ;
+pao }$pTone ↔ ㄆㄠ }$zTone;
+ pao  ㄆㄠ˙;
+ pao1 ← ㄆㄠ;
+pou }$pTone ↔ ㄆㄡ }$zTone;
+ pou  ㄆㄡ˙;
+ pou1 ← ㄆㄡ;
+pan }$pTone ↔ ㄆㄢ }$zTone;
+ pan  ㄆㄢ˙;
+ pan1 ← ㄆㄢ;
+pen }$pTone ↔ ㄆㄣ }$zTone;
+ pen  ㄆㄣ˙;
+ pen1 ← ㄆㄣ;
+pie }$pTone ↔ ㄆㄧㄝ }$zTone;
+ pie  ㄆㄧㄝ˙;
+ pie1 ← ㄆㄧㄝ;
+pin }$pTone ↔ ㄆㄧㄣ }$zTone;
+ pin  ㄆㄧㄣ˙;
+ pin1 ← ㄆㄧㄣ;
+pa }$pTone ↔ ㄆㄚ }$zTone;
+ pa  ㄆㄚ˙;
+ pa1 ← ㄆㄚ;
+po }$pTone ↔ ㄆㄛ }$zTone;
+ po  ㄆㄛ˙;
+ po1 ← ㄆㄛ;
+pi }$pTone ↔ ㄆㄧ }$zTone;
+ pi  ㄆㄧ˙;
+ pi1 ← ㄆㄧ;
+pu }$pTone ↔ ㄆㄨ }$zTone;
+ pu  ㄆㄨ˙;
+ pu1 ← ㄆㄨ;
 #
-mang }$pTone    ↔ ㄇㄤ }$zTone;
- mang           →  ㄇㄤ˙;
- mang1          ← ㄇㄤ;
-meng }$pTone    ↔ ㄇㄥ }$zTone;
- meng           →  ㄇㄥ˙;
- meng1          ← ㄇㄥ;
-miao }$pTone    ↔ ㄇㄧㄠ }$zTone;
- miao           →  ㄇㄧㄠ˙;
- miao1          ← ㄇㄧㄠ;
-mian }$pTone    ↔ ㄇㄧㄢ }$zTone;
- mian           →  ㄇㄧㄢ˙;
- mian1          ← ㄇㄧㄢ;
-ming }$pTone    ↔ ㄇㄧㄥ }$zTone;
- ming           →  ㄇㄧㄥ˙;
- ming1          ← ㄇㄧㄥ;
-mai }$pTone     ↔ ㄇㄞ }$zTone;
- mai            →  ㄇㄞ˙;
- mai1           ← ㄇㄞ;
-mei }$pTone     ↔ ㄇㄟ }$zTone;
- mei            →  ㄇㄟ˙;
- mei1           ← ㄇㄟ;
-mao }$pTone     ↔ ㄇㄠ }$zTone;
- mao            →  ㄇㄠ˙;
- mao1           ← ㄇㄠ;
-mou }$pTone     ↔ ㄇㄡ }$zTone;
- mou            →  ㄇㄡ˙;
- mou1           ← ㄇㄡ;
-man }$pTone     ↔ ㄇㄢ }$zTone;
- man            →  ㄇㄢ˙;
- man1           ← ㄇㄢ;
-men }$pTone     ↔ ㄇㄣ }$zTone;
- men            →  ㄇㄣ˙;
- men1           ← ㄇㄣ;
-mie }$pTone     ↔ ㄇㄧㄝ }$zTone;
- mie            →  ㄇㄧㄝ˙;
- mie1           ← ㄇㄧㄝ;
-miu }$pTone     ↔ ㄇㄧㄡ }$zTone;
- miu            →  ㄇㄧㄡ˙;
- miu1           ← ㄇㄧㄡ;
-min }$pTone     ↔ ㄇㄧㄣ }$zTone;
- min            →  ㄇㄧㄣ˙;
- min1           ← ㄇㄧㄣ;
-ma }$pTone      ↔ ㄇㄚ }$zTone;
- ma             →  ㄇㄚ˙;
- ma1            ← ㄇㄚ;
-mo }$pTone      ↔ ㄇㄛ }$zTone;
- mo             →  ㄇㄛ˙;
- mo1            ← ㄇㄛ;
-me }$pTone      ↔ ㄇㄜ }$zTone;
- me             →  ㄇㄜ˙;
- me1            ← ㄇㄜ;
-mi }$pTone      ↔ ㄇㄧ }$zTone;
- mi             →  ㄇㄧ˙;
- mi1            ← ㄇㄧ;
-mu }$pTone      ↔ ㄇㄨ }$zTone;
- mu             →  ㄇㄨ˙;
- mu1            ← ㄇㄨ;
+mang }$pTone ↔ ㄇㄤ }$zTone;
+ mang  ㄇㄤ˙;
+ mang1 ← ㄇㄤ;
+meng }$pTone ↔ ㄇㄥ }$zTone;
+ meng  ㄇㄥ˙;
+ meng1 ← ㄇㄥ;
+miao }$pTone ↔ ㄇㄧㄠ }$zTone;
+ miao  ㄇㄧㄠ˙;
+ miao1 ← ㄇㄧㄠ;
+mian }$pTone ↔ ㄇㄧㄢ }$zTone;
+ mian  ㄇㄧㄢ˙;
+ mian1 ← ㄇㄧㄢ;
+ming }$pTone ↔ ㄇㄧㄥ }$zTone;
+ ming  ㄇㄧㄥ˙;
+ ming1 ← ㄇㄧㄥ;
+mai }$pTone ↔ ㄇㄞ }$zTone;
+ mai  ㄇㄞ˙;
+ mai1 ← ㄇㄞ;
+mei }$pTone ↔ ㄇㄟ }$zTone;
+ mei  ㄇㄟ˙;
+ mei1 ← ㄇㄟ;
+mao }$pTone ↔ ㄇㄠ }$zTone;
+ mao  ㄇㄠ˙;
+ mao1 ← ㄇㄠ;
+mou }$pTone ↔ ㄇㄡ }$zTone;
+ mou  ㄇㄡ˙;
+ mou1 ← ㄇㄡ;
+man }$pTone ↔ ㄇㄢ }$zTone;
+ man  ㄇㄢ˙;
+ man1 ← ㄇㄢ;
+men }$pTone ↔ ㄇㄣ }$zTone;
+ men  ㄇㄣ˙;
+ men1 ← ㄇㄣ;
+mie }$pTone ↔ ㄇㄧㄝ }$zTone;
+ mie  ㄇㄧㄝ˙;
+ mie1 ← ㄇㄧㄝ;
+miu }$pTone ↔ ㄇㄧㄡ }$zTone;
+ miu  ㄇㄧㄡ˙;
+ miu1 ← ㄇㄧㄡ;
+min }$pTone ↔ ㄇㄧㄣ }$zTone;
+ min  ㄇㄧㄣ˙;
+ min1 ← ㄇㄧㄣ;
+ma }$pTone ↔ ㄇㄚ }$zTone;
+ ma  ㄇㄚ˙;
+ ma1 ← ㄇㄚ;
+mo }$pTone ↔ ㄇㄛ }$zTone;
+ mo  ㄇㄛ˙;
+ mo1 ← ㄇㄛ;
+me }$pTone ↔ ㄇㄜ }$zTone;
+ me  ㄇㄜ˙;
+ me1 ← ㄇㄜ;
+mi }$pTone ↔ ㄇㄧ }$zTone;
+ mi  ㄇㄧ˙;
+ mi1 ← ㄇㄧ;
+mu }$pTone ↔ ㄇㄨ }$zTone;
+ mu  ㄇㄨ˙;
+ mu1 ← ㄇㄨ;
 # m handled below
 #
-fang }$pTone    ↔ ㄈㄤ }$zTone;
- fang           →  ㄈㄤ˙;
- fang1          ← ㄈㄤ;
-feng }$pTone    ↔ ㄈㄥ }$zTone;
- feng           →  ㄈㄥ˙;
- feng1          ← ㄈㄥ;
-fiao }$pTone    ↔ ㄈㄧㄠ }$zTone;
- fiao           →  ㄈㄧㄠ˙;
- fiao1          ← ㄈㄧㄠ;
-fei }$pTone     ↔ ㄈㄟ }$zTone;
- fei            →  ㄈㄟ˙;
- fei1           ← ㄈㄟ;
-fou }$pTone     ↔ ㄈㄡ }$zTone;
- fou            →  ㄈㄡ˙;
- fou1           ← ㄈㄡ;
-fan }$pTone     ↔ ㄈㄢ }$zTone;
- fan            →  ㄈㄢ˙;
- fan1           ← ㄈㄢ;
-fen }$pTone     ↔ ㄈㄣ }$zTone;
- fen            →  ㄈㄣ˙;
- fen1           ← ㄈㄣ;
-fa }$pTone      ↔ ㄈㄚ }$zTone;
- fa             →  ㄈㄚ˙;
- fa1            ← ㄈㄚ;
-fo }$pTone      ↔ ㄈㄛ }$zTone;
- fo             →  ㄈㄛ˙;
- fo1            ← ㄈㄛ;
-fu }$pTone      ↔ ㄈㄨ }$zTone;
- fu             →  ㄈㄨ˙;
- fu1            ← ㄈㄨ;
+fang }$pTone ↔ ㄈㄤ }$zTone;
+ fang  ㄈㄤ˙;
+ fang1 ← ㄈㄤ;
+feng }$pTone ↔ ㄈㄥ }$zTone;
+ feng  ㄈㄥ˙;
+ feng1 ← ㄈㄥ;
+fiao }$pTone ↔ ㄈㄧㄠ }$zTone;
+ fiao  ㄈㄧㄠ˙;
+ fiao1 ← ㄈㄧㄠ;
+fei }$pTone ↔ ㄈㄟ }$zTone;
+ fei  ㄈㄟ˙;
+ fei1 ← ㄈㄟ;
+fou }$pTone ↔ ㄈㄡ }$zTone;
+ fou  ㄈㄡ˙;
+ fou1 ← ㄈㄡ;
+fan }$pTone ↔ ㄈㄢ }$zTone;
+ fan  ㄈㄢ˙;
+ fan1 ← ㄈㄢ;
+fen }$pTone ↔ ㄈㄣ }$zTone;
+ fen  ㄈㄣ˙;
+ fen1 ← ㄈㄣ;
+fa }$pTone ↔ ㄈㄚ }$zTone;
+ fa  ㄈㄚ˙;
+ fa1 ← ㄈㄚ;
+fo }$pTone ↔ ㄈㄛ }$zTone;
+ fo  ㄈㄛ˙;
+ fo1 ← ㄈㄛ;
+fu }$pTone ↔ ㄈㄨ }$zTone;
+ fu  ㄈㄨ˙;
+ fu1 ← ㄈㄨ;
 #
-diang }$pTone   ↔ ㄉㄧㄤ }$zTone; # (not in han-latin)
- diang          →  ㄉㄧㄤ˙;
- diang1         ← ㄉㄧㄤ;
-dang }$pTone    ↔ ㄉㄤ }$zTone;
- dang           →  ㄉㄤ˙;
- dang1          ← ㄉㄤ;
-deng }$pTone    ↔ ㄉㄥ }$zTone;
- deng           →  ㄉㄥ˙;
- deng1          ← ㄉㄥ;
-diao }$pTone    ↔ ㄉㄧㄠ }$zTone;
- diao           →  ㄉㄧㄠ˙;
- diao1          ← ㄉㄧㄠ;
-dian }$pTone    ↔ ㄉㄧㄢ }$zTone;
- dian           →  ㄉㄧㄢ˙;
- dian1          ← ㄉㄧㄢ;
-ding }$pTone    ↔ ㄉㄧㄥ }$zTone;
- ding           →  ㄉㄧㄥ˙;
- ding1          ← ㄉㄧㄥ;
-duan }$pTone    ↔ ㄉㄨㄢ }$zTone;
- duan           →  ㄉㄨㄢ˙;
- duan1          ← ㄉㄨㄢ;
-dong }$pTone    ↔ ㄉㄨㄥ }$zTone;
- dong           →  ㄉㄨㄥ˙;
- dong1          ← ㄉㄨㄥ;
-dai }$pTone     ↔ ㄉㄞ }$zTone;
- dai            →  ㄉㄞ˙;
- dai1           ← ㄉㄞ;
-dei }$pTone     ↔ ㄉㄟ }$zTone;            # (not in han-latin)
- dei            →  ㄉㄟ˙;
- dei1           ← ㄉㄟ;
-dao }$pTone     ↔ ㄉㄠ }$zTone;
- dao            →  ㄉㄠ˙;
- dao1           ← ㄉㄠ;
-dou }$pTone     ↔ ㄉㄡ }$zTone;
- dou            →  ㄉㄡ˙;
- dou1           ← ㄉㄡ;
-dan }$pTone     ↔ ㄉㄢ }$zTone;
- dan            →  ㄉㄢ˙;
- dan1           ← ㄉㄢ;
-den }$pTone     ↔ ㄉㄣ }$zTone;
- den            →  ㄉㄣ˙;
- den1           ← ㄉㄣ;
-dia }$pTone     ↔ ㄉㄧㄚ }$zTone;
- dia            →  ㄉㄧㄚ˙;
- dia1           ← ㄉㄧㄚ;
-die }$pTone     ↔ ㄉㄧㄝ }$zTone;
- die            →  ㄉㄧㄝ˙;
- die1           ← ㄉㄧㄝ;
-diu }$pTone     ↔ ㄉㄧㄡ }$zTone;
- diu            →  ㄉㄧㄡ˙;
- diu1           ← ㄉㄧㄡ;
-din }$pTone     ↔ ㄉㄧㄣ }$zTone;
- din            →  ㄉㄧㄣ˙;
- din1           ← ㄉㄧㄣ;
-duo }$pTone     ↔ ㄉㄨㄛ }$zTone;
- duo            →  ㄉㄨㄛ˙;
- duo1           ← ㄉㄨㄛ;
-dui }$pTone     ↔ ㄉㄨㄟ }$zTone;
- dui            →  ㄉㄨㄟ˙;
- dui1           ← ㄉㄨㄟ;
-dun }$pTone     ↔ ㄉㄨㄣ }$zTone;
- dun            →  ㄉㄨㄣ˙;
- dun1           ← ㄉㄨㄣ;
-da }$pTone      ↔ ㄉㄚ }$zTone;
- da             →  ㄉㄚ˙;
- da1            ← ㄉㄚ;
-de }$pTone      ↔ ㄉㄜ }$zTone;
- de             →  ㄉㄜ˙;
- de1            ← ㄉㄜ;
-di }$pTone      ↔ ㄉㄧ }$zTone;
- di             →  ㄉㄧ˙;
- di1            ← ㄉㄧ;
-du }$pTone      ↔ ㄉㄨ }$zTone;
- du             →  ㄉㄨ˙;
- du1            ← ㄉㄨ;
+diang }$pTone ↔ ㄉㄧㄤ }$zTone; # (not in han-latin)
+ diang  ㄉㄧㄤ˙;
+ diang1 ← ㄉㄧㄤ;
+dang }$pTone ↔ ㄉㄤ }$zTone;
+ dang  ㄉㄤ˙;
+ dang1 ← ㄉㄤ;
+deng }$pTone ↔ ㄉㄥ }$zTone;
+ deng  ㄉㄥ˙;
+ deng1 ← ㄉㄥ;
+diao }$pTone ↔ ㄉㄧㄠ }$zTone;
+ diao  ㄉㄧㄠ˙;
+ diao1 ← ㄉㄧㄠ;
+dian }$pTone ↔ ㄉㄧㄢ }$zTone;
+ dian  ㄉㄧㄢ˙;
+ dian1 ← ㄉㄧㄢ;
+ding }$pTone ↔ ㄉㄧㄥ }$zTone;
+ ding  ㄉㄧㄥ˙;
+ ding1 ← ㄉㄧㄥ;
+duan }$pTone ↔ ㄉㄨㄢ }$zTone;
+ duan  ㄉㄨㄢ˙;
+ duan1 ← ㄉㄨㄢ;
+dong }$pTone ↔ ㄉㄨㄥ }$zTone;
+ dong  ㄉㄨㄥ˙;
+ dong1 ← ㄉㄨㄥ;
+dai }$pTone ↔ ㄉㄞ }$zTone;
+ dai  ㄉㄞ˙;
+ dai1 ← ㄉㄞ;
+dei }$pTone ↔ ㄉㄟ }$zTone; # (not in han-latin)
+ dei  ㄉㄟ˙;
+ dei1 ← ㄉㄟ;
+dao }$pTone ↔ ㄉㄠ }$zTone;
+ dao  ㄉㄠ˙;
+ dao1 ← ㄉㄠ;
+dou }$pTone ↔ ㄉㄡ }$zTone;
+ dou  ㄉㄡ˙;
+ dou1 ← ㄉㄡ;
+dan }$pTone ↔ ㄉㄢ }$zTone;
+ dan  ㄉㄢ˙;
+ dan1 ← ㄉㄢ;
+den }$pTone ↔ ㄉㄣ }$zTone;
+ den  ㄉㄣ˙;
+ den1 ← ㄉㄣ;
+dia }$pTone ↔ ㄉㄧㄚ }$zTone;
+ dia  ㄉㄧㄚ˙;
+ dia1 ← ㄉㄧㄚ;
+die }$pTone ↔ ㄉㄧㄝ }$zTone;
+ die  ㄉㄧㄝ˙;
+ die1 ← ㄉㄧㄝ;
+diu }$pTone ↔ ㄉㄧㄡ }$zTone;
+ diu  ㄉㄧㄡ˙;
+ diu1 ← ㄉㄧㄡ;
+din }$pTone ↔ ㄉㄧㄣ }$zTone;
+ din  ㄉㄧㄣ˙;
+ din1 ← ㄉㄧㄣ;
+duo }$pTone ↔ ㄉㄨㄛ }$zTone;
+ duo  ㄉㄨㄛ˙;
+ duo1 ← ㄉㄨㄛ;
+dui }$pTone ↔ ㄉㄨㄟ }$zTone;
+ dui  ㄉㄨㄟ˙;
+ dui1 ← ㄉㄨㄟ;
+dun }$pTone ↔ ㄉㄨㄣ }$zTone;
+ dun  ㄉㄨㄣ˙;
+ dun1 ← ㄉㄨㄣ;
+da }$pTone ↔ ㄉㄚ }$zTone;
+ da  ㄉㄚ˙;
+ da1 ← ㄉㄚ;
+de }$pTone ↔ ㄉㄜ }$zTone;
+ de  ㄉㄜ˙;
+ de1 ← ㄉㄜ;
+di }$pTone ↔ ㄉㄧ }$zTone;
+ di  ㄉㄧ˙;
+ di1 ← ㄉㄧ;
+du }$pTone ↔ ㄉㄨ }$zTone;
+ du  ㄉㄨ˙;
+ du1 ← ㄉㄨ;
 #
-tang }$pTone    ↔ ㄊㄤ }$zTone;
- tang           →  ㄊㄤ˙;
- tang1          ← ㄊㄤ;
-teng }$pTone    ↔ ㄊㄥ }$zTone;
- teng           →  ㄊㄥ˙;
- teng1          ← ㄊㄥ;
-tiao }$pTone    ↔ ㄊㄧㄠ }$zTone;
- tiao           →  ㄊㄧㄠ˙;
- tiao1          ← ㄊㄧㄠ;
-tian }$pTone    ↔ ㄊㄧㄢ }$zTone;
- tian           →  ㄊㄧㄢ˙;
- tian1          ← ㄊㄧㄢ;
-ting }$pTone    ↔ ㄊㄧㄥ }$zTone;
- ting           →  ㄊㄧㄥ˙;
- ting1          ← ㄊㄧㄥ;
-tuan }$pTone    ↔ ㄊㄨㄢ }$zTone;
- tuan           →  ㄊㄨㄢ˙;
- tuan1          ← ㄊㄨㄢ;
-tong }$pTone    ↔ ㄊㄨㄥ }$zTone;
- tong           →  ㄊㄨㄥ˙;
- tong1          ← ㄊㄨㄥ;
-tai }$pTone     ↔ ㄊㄞ }$zTone;
- tai            →  ㄊㄞ˙;
- tai1           ← ㄊㄞ;
-tao }$pTone     ↔ ㄊㄠ }$zTone;
- tao            →  ㄊㄠ˙;
- tao1           ← ㄊㄠ;
-tou }$pTone     ↔ ㄊㄡ }$zTone;
- tou            →  ㄊㄡ˙;
- tou1           ← ㄊㄡ;
-tan }$pTone     ↔ ㄊㄢ }$zTone;
- tan            →  ㄊㄢ˙;
- tan1           ← ㄊㄢ;
-tie }$pTone     ↔ ㄊㄧㄝ }$zTone;
- tie            →  ㄊㄧㄝ˙;
- tie1           ← ㄊㄧㄝ;
-tuo }$pTone     ↔ ㄊㄨㄛ }$zTone;
- tuo            →  ㄊㄨㄛ˙;
- tuo1           ← ㄊㄨㄛ;
-tui }$pTone     ↔ ㄊㄨㄟ }$zTone;
- tui            →  ㄊㄨㄟ˙;
- tui1           ← ㄊㄨㄟ;
-tun }$pTone     ↔ ㄊㄨㄣ }$zTone;
- tun            →  ㄊㄨㄣ˙;
- tun1           ← ㄊㄨㄣ;
-ta }$pTone      ↔ ㄊㄚ }$zTone;
- ta             →  ㄊㄚ˙;
- ta1            ← ㄊㄚ;
-te }$pTone      ↔ ㄊㄜ }$zTone;
- te             →  ㄊㄜ˙;
- te1            ← ㄊㄜ;
-ti }$pTone      ↔ ㄊㄧ }$zTone;
- ti             →  ㄊㄧ˙;
- ti1            ← ㄊㄧ;
-tu }$pTone      ↔ ㄊㄨ }$zTone;
- tu             →  ㄊㄨ˙;
- tu1            ← ㄊㄨ;
+tang }$pTone ↔ ㄊㄤ }$zTone;
+ tang  ㄊㄤ˙;
+ tang1 ← ㄊㄤ;
+teng }$pTone ↔ ㄊㄥ }$zTone;
+ teng  ㄊㄥ˙;
+ teng1 ← ㄊㄥ;
+tiao }$pTone ↔ ㄊㄧㄠ }$zTone;
+ tiao  ㄊㄧㄠ˙;
+ tiao1 ← ㄊㄧㄠ;
+tian }$pTone ↔ ㄊㄧㄢ }$zTone;
+ tian  ㄊㄧㄢ˙;
+ tian1 ← ㄊㄧㄢ;
+ting }$pTone ↔ ㄊㄧㄥ }$zTone;
+ ting  ㄊㄧㄥ˙;
+ ting1 ← ㄊㄧㄥ;
+tuan }$pTone ↔ ㄊㄨㄢ }$zTone;
+ tuan  ㄊㄨㄢ˙;
+ tuan1 ← ㄊㄨㄢ;
+tong }$pTone ↔ ㄊㄨㄥ }$zTone;
+ tong  ㄊㄨㄥ˙;
+ tong1 ← ㄊㄨㄥ;
+tai }$pTone ↔ ㄊㄞ }$zTone;
+ tai  ㄊㄞ˙;
+ tai1 ← ㄊㄞ;
+tao }$pTone ↔ ㄊㄠ }$zTone;
+ tao  ㄊㄠ˙;
+ tao1 ← ㄊㄠ;
+tou }$pTone ↔ ㄊㄡ }$zTone;
+ tou  ㄊㄡ˙;
+ tou1 ← ㄊㄡ;
+tan }$pTone ↔ ㄊㄢ }$zTone;
+ tan  ㄊㄢ˙;
+ tan1 ← ㄊㄢ;
+tie }$pTone ↔ ㄊㄧㄝ }$zTone;
+ tie  ㄊㄧㄝ˙;
+ tie1 ← ㄊㄧㄝ;
+tuo }$pTone ↔ ㄊㄨㄛ }$zTone;
+ tuo  ㄊㄨㄛ˙;
+ tuo1 ← ㄊㄨㄛ;
+tui }$pTone ↔ ㄊㄨㄟ }$zTone;
+ tui  ㄊㄨㄟ˙;
+ tui1 ← ㄊㄨㄟ;
+tun }$pTone ↔ ㄊㄨㄣ }$zTone;
+ tun  ㄊㄨㄣ˙;
+ tun1 ← ㄊㄨㄣ;
+ta }$pTone ↔ ㄊㄚ }$zTone;
+ ta  ㄊㄚ˙;
+ ta1 ← ㄊㄚ;
+te }$pTone ↔ ㄊㄜ }$zTone;
+ te  ㄊㄜ˙;
+ te1 ← ㄊㄜ;
+ti }$pTone ↔ ㄊㄧ }$zTone;
+ ti  ㄊㄧ˙;
+ ti1 ← ㄊㄧ;
+tu }$pTone ↔ ㄊㄨ }$zTone;
+ tu  ㄊㄨ˙;
+ tu1 ← ㄊㄨ;
 #
-niang }$pTone   ↔ ㄋㄧㄤ }$zTone;
- niang          →  ㄋㄧㄤ˙;
- niang1         ← ㄋㄧㄤ;
-nang }$pTone    ↔ ㄋㄤ }$zTone;
- nang           →  ㄋㄤ˙;
- nang1          ← ㄋㄤ;
-neng }$pTone    ↔ ㄋㄥ }$zTone;
- neng           →  ㄋㄥ˙;
- neng1          ← ㄋㄥ;
-niao }$pTone    ↔ ㄋㄧㄠ }$zTone;
- niao           →  ㄋㄧㄠ˙;
- niao1          ← ㄋㄧㄠ;
-nian }$pTone    ↔ ㄋㄧㄢ }$zTone;
- nian           →  ㄋㄧㄢ˙;
- nian1          ← ㄋㄧㄢ;
-ning }$pTone    ↔ ㄋㄧㄥ }$zTone;
- ning           →  ㄋㄧㄥ˙;
- ning1          ← ㄋㄧㄥ;
-nuan }$pTone    ↔ ㄋㄨㄢ }$zTone;
- nuan           →  ㄋㄨㄢ˙;
- nuan1          ← ㄋㄨㄢ;
-nong }$pTone    ↔ ㄋㄨㄥ }$zTone;
- nong           →  ㄋㄨㄥ˙;
- nong1          ← ㄋㄨㄥ;
-nai }$pTone     ↔ ㄋㄞ }$zTone;
- nai            →  ㄋㄞ˙;
- nai1           ← ㄋㄞ;
-nei }$pTone     ↔ ㄋㄟ }$zTone;
- nei            →  ㄋㄟ˙;
- nei1           ← ㄋㄟ;
-nao }$pTone     ↔ ㄋㄠ }$zTone;
- nao            →  ㄋㄠ˙;
- nao1           ← ㄋㄠ;
-nou }$pTone     ↔ ㄋㄡ }$zTone;
- nou            →  ㄋㄡ˙;
- nou1           ← ㄋㄡ;
-nan }$pTone     ↔ ㄋㄢ }$zTone;
- nan            →  ㄋㄢ˙;
- nan1           ← ㄋㄢ;
-nen }$pTone     ↔ ㄋㄣ }$zTone;
- nen            →  ㄋㄣ˙;
- nen1           ← ㄋㄣ;
-nia }$pTone     ↔ ㄋㄧㄚ }$zTone; # (not in han-latin)
- nia            →  ㄋㄧㄚ˙;
- nia1           ← ㄋㄧㄚ;
-nie }$pTone     ↔ ㄋㄧㄝ }$zTone;
- nie            →  ㄋㄧㄝ˙;
- nie1           ← ㄋㄧㄝ;
-niu }$pTone     ↔ ㄋㄧㄡ }$zTone;
- niu            →  ㄋㄧㄡ˙;
- niu1           ← ㄋㄧㄡ;
-nin }$pTone     ↔ ㄋㄧㄣ }$zTone;
- nin            →  ㄋㄧㄣ˙;
- nin1           ← ㄋㄧㄣ;
-nuo }$pTone     ↔ ㄋㄨㄛ }$zTone;
- nuo            →  ㄋㄨㄛ˙;
- nuo1           ← ㄋㄨㄛ;
-nun }$pTone     ↔ ㄋㄨㄣ }$zTone;
- nun            →  ㄋㄨㄣ˙;
- nun1           ← ㄋㄨㄣ;
-nüe }$pTone     ↔ ㄋㄩㄝ }$zTone;
- nüe            →  ㄋㄩㄝ˙;
- nüe1           ← ㄋㄩㄝ;
-nve }$pTone     → ㄋㄩㄝ;                 # one-way, handle alternate spelling
- nve            →  ㄋㄩㄝ˙;
-nue }$pTone     → ㄋㄩㄝ;                 # (not in han-latin) one-way, handle wrong u
- nue            →  ㄋㄩㄝ˙;
-na }$pTone      ↔ ㄋㄚ }$zTone;
- na             →  ㄋㄚ˙;
- na1            ← ㄋㄚ;
-ne }$pTone      ↔ ㄋㄜ }$zTone;
- ne             →  ㄋㄜ˙;
- ne1            ← ㄋㄜ;
-ni }$pTone      ↔ ㄋㄧ }$zTone;
- ni             →  ㄋㄧ˙;
- ni1            ← ㄋㄧ;
-nu }$pTone      ↔ ㄋㄨ }$zTone;
- nu             →  ㄋㄨ˙;
- nu1            ← ㄋㄨ;
-nü }$pTone      ↔ ㄋㄩ }$zTone;
- nü             →  ㄋㄩ˙;
- nü1            ← ㄋㄩ;
-nv }$pTone      → ㄋㄩ;                            # one-way, handle alternate spelling
- nv             →  ㄋㄩ˙;
+niang }$pTone ↔ ㄋㄧㄤ }$zTone;
+ niang  ㄋㄧㄤ˙;
+ niang1 ← ㄋㄧㄤ;
+nang }$pTone ↔ ㄋㄤ }$zTone;
+ nang  ㄋㄤ˙;
+ nang1 ← ㄋㄤ;
+neng }$pTone ↔ ㄋㄥ }$zTone;
+ neng  ㄋㄥ˙;
+ neng1 ← ㄋㄥ;
+niao }$pTone ↔ ㄋㄧㄠ }$zTone;
+ niao  ㄋㄧㄠ˙;
+ niao1 ← ㄋㄧㄠ;
+nian }$pTone ↔ ㄋㄧㄢ }$zTone;
+ nian  ㄋㄧㄢ˙;
+ nian1 ← ㄋㄧㄢ;
+ning }$pTone ↔ ㄋㄧㄥ }$zTone;
+ ning  ㄋㄧㄥ˙;
+ ning1 ← ㄋㄧㄥ;
+nuan }$pTone ↔ ㄋㄨㄢ }$zTone;
+ nuan  ㄋㄨㄢ˙;
+ nuan1 ← ㄋㄨㄢ;
+nong }$pTone ↔ ㄋㄨㄥ }$zTone;
+ nong  ㄋㄨㄥ˙;
+ nong1 ← ㄋㄨㄥ;
+nai }$pTone ↔ ㄋㄞ }$zTone;
+ nai  ㄋㄞ˙;
+ nai1 ← ㄋㄞ;
+nei }$pTone ↔ ㄋㄟ }$zTone;
+ nei  ㄋㄟ˙;
+ nei1 ← ㄋㄟ;
+nao }$pTone ↔ ㄋㄠ }$zTone;
+ nao  ㄋㄠ˙;
+ nao1 ← ㄋㄠ;
+nou }$pTone ↔ ㄋㄡ }$zTone;
+ nou  ㄋㄡ˙;
+ nou1 ← ㄋㄡ;
+nan }$pTone ↔ ㄋㄢ }$zTone;
+ nan  ㄋㄢ˙;
+ nan1 ← ㄋㄢ;
+nen }$pTone ↔ ㄋㄣ }$zTone;
+ nen  ㄋㄣ˙;
+ nen1 ← ㄋㄣ;
+nia }$pTone ↔ ㄋㄧㄚ }$zTone; # (not in han-latin)
+ nia  ㄋㄧㄚ˙;
+ nia1 ← ㄋㄧㄚ;
+nie }$pTone ↔ ㄋㄧㄝ }$zTone;
+ nie  ㄋㄧㄝ˙;
+ nie1 ← ㄋㄧㄝ;
+niu }$pTone ↔ ㄋㄧㄡ }$zTone;
+ niu  ㄋㄧㄡ˙;
+ niu1 ← ㄋㄧㄡ;
+nin }$pTone ↔ ㄋㄧㄣ }$zTone;
+ nin  ㄋㄧㄣ˙;
+ nin1 ← ㄋㄧㄣ;
+nuo }$pTone ↔ ㄋㄨㄛ }$zTone;
+ nuo  ㄋㄨㄛ˙;
+ nuo1 ← ㄋㄨㄛ;
+nun }$pTone ↔ ㄋㄨㄣ }$zTone;
+ nun  ㄋㄨㄣ˙;
+ nun1 ← ㄋㄨㄣ;
+nüe }$pTone ↔ ㄋㄩㄝ }$zTone;
+ nüe  ㄋㄩㄝ˙;
+ nüe1 ← ㄋㄩㄝ;
+nve }$pTone → ㄋㄩㄝ; # one-way, handle alternate spelling
+ nve  ㄋㄩㄝ˙;
+nue }$pTone → ㄋㄩㄝ; # (not in han-latin) one-way, handle wrong u
+ nue  ㄋㄩㄝ˙;
+na }$pTone ↔ ㄋㄚ }$zTone;
+ na  ㄋㄚ˙;
+ na1 ← ㄋㄚ;
+ne }$pTone ↔ ㄋㄜ }$zTone;
+ ne  ㄋㄜ˙;
+ ne1 ← ㄋㄜ;
+ni }$pTone ↔ ㄋㄧ }$zTone;
+ ni  ㄋㄧ˙;
+ ni1 ← ㄋㄧ;
+nu }$pTone ↔ ㄋㄨ }$zTone;
+ nu  ㄋㄨ˙;
+ nu1 ← ㄋㄨ;
+nü }$pTone ↔ ㄋㄩ }$zTone;
+ nü  ㄋㄩ˙;
+ nü1 ← ㄋㄩ;
+nv }$pTone → ㄋㄩ; # one-way, handle alternate spelling
+ nv  ㄋㄩ˙;
 # n handled below
 #
-liang }$pTone   ↔ ㄌㄧㄤ }$zTone;
- liang          →  ㄌㄧㄤ˙;
- liang1         ← ㄌㄧㄤ;
-lang }$pTone    ↔ ㄌㄤ }$zTone;
- lang           →  ㄌㄤ˙;
- lang1          ← ㄌㄤ;
-leng }$pTone    ↔ ㄌㄥ }$zTone;
- leng           →  ㄌㄥ˙;
- leng1          ← ㄌㄥ;
-liao }$pTone    ↔ ㄌㄧㄠ }$zTone;
- liao           →  ㄌㄧㄠ˙;
- liao1          ← ㄌㄧㄠ;
-lian }$pTone    ↔ ㄌㄧㄢ }$zTone;
- lian           →  ㄌㄧㄢ˙;
- lian1          ← ㄌㄧㄢ;
-ling }$pTone    ↔ ㄌㄧㄥ }$zTone;
- ling           →  ㄌㄧㄥ˙;
- ling1          ← ㄌㄧㄥ;
-luan }$pTone    ↔ ㄌㄨㄢ }$zTone;
- luan           →  ㄌㄨㄢ˙;
- luan1          ← ㄌㄨㄢ;
-long }$pTone    ↔ ㄌㄨㄥ }$zTone;
- long           →  ㄌㄨㄥ˙;
- long1          ← ㄌㄨㄥ;
-lüan }$pTone    ↔ ㄌㄩㄢ }$zTone;        # (not in han-latin)
- lüan           →  ㄌㄩㄢ˙;
- lüan1          ← ㄌㄩㄢ;
-lvan }$pTone    → ㄌㄩㄢ;                 # (not in han-latin) one-way, handle v alternate for ü
- lvan           →  ㄌㄩㄢ˙;
-lai }$pTone     ↔ ㄌㄞ }$zTone;
- lai            →  ㄌㄞ˙;
- lai1           ← ㄌㄞ;
-lei }$pTone     ↔ ㄌㄟ }$zTone;
- lei            →  ㄌㄟ˙;
- lei1           ← ㄌㄟ;
-lao }$pTone     ↔ ㄌㄠ }$zTone;
- lao            →  ㄌㄠ˙;
- lao1           ← ㄌㄠ;
-lou }$pTone     ↔ ㄌㄡ }$zTone;
- lou            →  ㄌㄡ˙;
- lou1           ← ㄌㄡ;
-lan }$pTone     ↔ ㄌㄢ }$zTone;
- lan            →  ㄌㄢ˙;
- lan1           ← ㄌㄢ;
-lia }$pTone     ↔ ㄌㄧㄚ }$zTone;
- lia            →  ㄌㄧㄚ˙;
- lia1           ← ㄌㄧㄚ;
-lie }$pTone     ↔ ㄌㄧㄝ }$zTone;
- lie            →  ㄌㄧㄝ˙;
- lie1           ← ㄌㄧㄝ;
-liu }$pTone     ↔ ㄌㄧㄡ }$zTone;
- liu            →  ㄌㄧㄡ˙;
- liu1           ← ㄌㄧㄡ;
-lin }$pTone     ↔ ㄌㄧㄣ }$zTone;
- lin            →  ㄌㄧㄣ˙;
- lin1           ← ㄌㄧㄣ;
-luo }$pTone     ↔ ㄌㄨㄛ }$zTone;
- luo            →  ㄌㄨㄛ˙;
- luo1           ← ㄌㄨㄛ;
-lun }$pTone     ↔ ㄌㄨㄣ }$zTone;
- lun            →  ㄌㄨㄣ˙;
- lun1           ← ㄌㄨㄣ;
-lüe }$pTone     ↔ ㄌㄩㄝ }$zTone;
- lüe            →  ㄌㄩㄝ˙;
- lüe1           ← ㄌㄩㄝ;
-lve }$pTone     → ㄌㄩㄝ;                 # one-way, handle v alternate for ü
- lve            →  ㄌㄩㄝ˙;
-lue }$pTone     → ㄌㄩㄝ;                 # (not in han-latin) one-way, handle wrong u
- lue            →  ㄌㄩㄝ˙;
-la }$pTone      ↔ ㄌㄚ }$zTone;
- la             →  ㄌㄚ˙;
- la1            ← ㄌㄚ;
-lo }$pTone      ↔ ㄌㄛ }$zTone;
- lo             →  ㄌㄛ˙;
- lo1            ← ㄌㄛ;
-le }$pTone      ↔ ㄌㄜ }$zTone;
- le             →  ㄌㄜ˙;
- le1            ← ㄌㄜ;
-li }$pTone      ↔ ㄌㄧ }$zTone;
- li             →  ㄌㄧ˙;
- li1            ← ㄌㄧ;
-lu }$pTone      ↔ ㄌㄨ }$zTone;
- lu             →  ㄌㄨ˙;
- lu1            ← ㄌㄨ;
-lü }$pTone      ↔ ㄌㄩ }$zTone;
- lü             →  ㄌㄩ˙;
- lü1            ← ㄌㄩ;
-lv }$pTone      → ㄌㄩ;                            # one-way, handle v alternate for ü
- lv             →  ㄌㄩ˙;
+liang }$pTone ↔ ㄌㄧㄤ }$zTone;
+ liang  ㄌㄧㄤ˙;
+ liang1 ← ㄌㄧㄤ;
+lang }$pTone ↔ ㄌㄤ }$zTone;
+ lang  ㄌㄤ˙;
+ lang1 ← ㄌㄤ;
+leng }$pTone ↔ ㄌㄥ }$zTone;
+ leng  ㄌㄥ˙;
+ leng1 ← ㄌㄥ;
+liao }$pTone ↔ ㄌㄧㄠ }$zTone;
+ liao  ㄌㄧㄠ˙;
+ liao1 ← ㄌㄧㄠ;
+lian }$pTone ↔ ㄌㄧㄢ }$zTone;
+ lian  ㄌㄧㄢ˙;
+ lian1 ← ㄌㄧㄢ;
+ling }$pTone ↔ ㄌㄧㄥ }$zTone;
+ ling  ㄌㄧㄥ˙;
+ ling1 ← ㄌㄧㄥ;
+luan }$pTone ↔ ㄌㄨㄢ }$zTone;
+ luan  ㄌㄨㄢ˙;
+ luan1 ← ㄌㄨㄢ;
+long }$pTone ↔ ㄌㄨㄥ }$zTone;
+ long  ㄌㄨㄥ˙;
+ long1 ← ㄌㄨㄥ;
+lüan }$pTone ↔ ㄌㄩㄢ }$zTone; # (not in han-latin)
+ lüan  ㄌㄩㄢ˙;
+ lüan1 ← ㄌㄩㄢ;
+lvan }$pTone → ㄌㄩㄢ; # (not in han-latin) one-way, handle v alternate for ü
+ lvan  ㄌㄩㄢ˙;
+lai }$pTone ↔ ㄌㄞ }$zTone;
+ lai  ㄌㄞ˙;
+ lai1 ← ㄌㄞ;
+lei }$pTone ↔ ㄌㄟ }$zTone;
+ lei  ㄌㄟ˙;
+ lei1 ← ㄌㄟ;
+lao }$pTone ↔ ㄌㄠ }$zTone;
+ lao  ㄌㄠ˙;
+ lao1 ← ㄌㄠ;
+lou }$pTone ↔ ㄌㄡ }$zTone;
+ lou  ㄌㄡ˙;
+ lou1 ← ㄌㄡ;
+lan }$pTone ↔ ㄌㄢ }$zTone;
+ lan  ㄌㄢ˙;
+ lan1 ← ㄌㄢ;
+lia }$pTone ↔ ㄌㄧㄚ }$zTone;
+ lia  ㄌㄧㄚ˙;
+ lia1 ← ㄌㄧㄚ;
+lie }$pTone ↔ ㄌㄧㄝ }$zTone;
+ lie  ㄌㄧㄝ˙;
+ lie1 ← ㄌㄧㄝ;
+liu }$pTone ↔ ㄌㄧㄡ }$zTone;
+ liu  ㄌㄧㄡ˙;
+ liu1 ← ㄌㄧㄡ;
+lin }$pTone ↔ ㄌㄧㄣ }$zTone;
+ lin  ㄌㄧㄣ˙;
+ lin1 ← ㄌㄧㄣ;
+luo }$pTone ↔ ㄌㄨㄛ }$zTone;
+ luo  ㄌㄨㄛ˙;
+ luo1 ← ㄌㄨㄛ;
+lun }$pTone ↔ ㄌㄨㄣ }$zTone;
+ lun  ㄌㄨㄣ˙;
+ lun1 ← ㄌㄨㄣ;
+lüe }$pTone ↔ ㄌㄩㄝ }$zTone;
+ lüe  ㄌㄩㄝ˙;
+ lüe1 ← ㄌㄩㄝ;
+lve }$pTone → ㄌㄩㄝ; # one-way, handle v alternate for ü
+ lve  ㄌㄩㄝ˙;
+lue }$pTone → ㄌㄩㄝ; # (not in han-latin) one-way, handle wrong u
+ lue  ㄌㄩㄝ˙;
+la }$pTone ↔ ㄌㄚ }$zTone;
+ la  ㄌㄚ˙;
+ la1 ← ㄌㄚ;
+lo }$pTone ↔ ㄌㄛ }$zTone;
+ lo  ㄌㄛ˙;
+ lo1 ← ㄌㄛ;
+le }$pTone ↔ ㄌㄜ }$zTone;
+ le  ㄌㄜ˙;
+ le1 ← ㄌㄜ;
+li }$pTone ↔ ㄌㄧ }$zTone;
+ li  ㄌㄧ˙;
+ li1 ← ㄌㄧ;
+lu }$pTone ↔ ㄌㄨ }$zTone;
+ lu  ㄌㄨ˙;
+ lu1 ← ㄌㄨ;
+lü }$pTone ↔ ㄌㄩ }$zTone;
+ lü  ㄌㄩ˙;
+ lü1 ← ㄌㄩ;
+lv }$pTone → ㄌㄩ; # one-way, handle v alternate for ü
+ lv  ㄌㄩ˙;
 #
-guang }$pTone   ↔ ㄍㄨㄤ }$zTone;
- guang          →  ㄍㄨㄤ˙;
- guang1         ← ㄍㄨㄤ;
-gang }$pTone    ↔ ㄍㄤ }$zTone;
- gang           →  ㄍㄤ˙;
- gang1          ← ㄍㄤ;
-geng }$pTone    ↔ ㄍㄥ }$zTone;
- geng           →  ㄍㄥ˙;
- geng1          ← ㄍㄥ;
-guai }$pTone    ↔ ㄍㄨㄞ }$zTone;
- guai           →  ㄍㄨㄞ˙;
- guai1          ← ㄍㄨㄞ;
-guan }$pTone    ↔ ㄍㄨㄢ }$zTone;
- guan           →  ㄍㄨㄢ˙;
- guan1          ← ㄍㄨㄢ;
-gong }$pTone    ↔ ㄍㄨㄥ }$zTone;
- gong           →  ㄍㄨㄥ˙;
- gong1          ← ㄍㄨㄥ;
-gai }$pTone     ↔ ㄍㄞ }$zTone;
- gai            →  ㄍㄞ˙;
- gai1           ← ㄍㄞ;
-gei }$pTone     ↔ ㄍㄟ }$zTone;
- gei            →  ㄍㄟ˙;
- gei1           ← ㄍㄟ;
-gao }$pTone     ↔ ㄍㄠ }$zTone;
- gao            →  ㄍㄠ˙;
- gao1           ← ㄍㄠ;
-gou }$pTone     ↔ ㄍㄡ }$zTone;
- gou            →  ㄍㄡ˙;
- gou1           ← ㄍㄡ;
-gan }$pTone     ↔ ㄍㄢ }$zTone;
- gan            →  ㄍㄢ˙;
- gan1           ← ㄍㄢ;
-gen }$pTone     ↔ ㄍㄣ }$zTone;
- gen            →  ㄍㄣ˙;
- gen1           ← ㄍㄣ;
-gua }$pTone     ↔ ㄍㄨㄚ }$zTone;
- gua            →  ㄍㄨㄚ˙;
- gua1           ← ㄍㄨㄚ;
-guo }$pTone     ↔ ㄍㄨㄛ }$zTone;
- guo            →  ㄍㄨㄛ˙;
- guo1           ← ㄍㄨㄛ;
-gui }$pTone     ↔ ㄍㄨㄟ }$zTone;
- gui            →  ㄍㄨㄟ˙;
- gui1           ← ㄍㄨㄟ;
-gun }$pTone     ↔ ㄍㄨㄣ }$zTone;
- gun            →  ㄍㄨㄣ˙;
- gun1           ← ㄍㄨㄣ;
-ga }$pTone      ↔ ㄍㄚ }$zTone;
- ga             →  ㄍㄚ˙;
- ga1            ← ㄍㄚ;
-ge }$pTone      ↔ ㄍㄜ }$zTone;
- ge             →  ㄍㄜ˙;
- ge1            ← ㄍㄜ;
-gi }$pTone      ↔ ㄍㄧ }$zTone;
- gi             →  ㄍㄧ˙;
- gi1            ← ㄍㄧ;
-gu }$pTone      ↔ ㄍㄨ }$zTone;
- gu             →  ㄍㄨ˙;
- gu1            ← ㄍㄨ;
+guang }$pTone ↔ ㄍㄨㄤ }$zTone;
+ guang  ㄍㄨㄤ˙;
+ guang1 ← ㄍㄨㄤ;
+gang }$pTone ↔ ㄍㄤ }$zTone;
+ gang  ㄍㄤ˙;
+ gang1 ← ㄍㄤ;
+geng }$pTone ↔ ㄍㄥ }$zTone;
+ geng  ㄍㄥ˙;
+ geng1 ← ㄍㄥ;
+guai }$pTone ↔ ㄍㄨㄞ }$zTone;
+ guai  ㄍㄨㄞ˙;
+ guai1 ← ㄍㄨㄞ;
+guan }$pTone ↔ ㄍㄨㄢ }$zTone;
+ guan  ㄍㄨㄢ˙;
+ guan1 ← ㄍㄨㄢ;
+gong }$pTone ↔ ㄍㄨㄥ }$zTone;
+ gong  ㄍㄨㄥ˙;
+ gong1 ← ㄍㄨㄥ;
+gai }$pTone ↔ ㄍㄞ }$zTone;
+ gai  ㄍㄞ˙;
+ gai1 ← ㄍㄞ;
+gei }$pTone ↔ ㄍㄟ }$zTone;
+ gei  ㄍㄟ˙;
+ gei1 ← ㄍㄟ;
+gao }$pTone ↔ ㄍㄠ }$zTone;
+ gao  ㄍㄠ˙;
+ gao1 ← ㄍㄠ;
+gou }$pTone ↔ ㄍㄡ }$zTone;
+ gou  ㄍㄡ˙;
+ gou1 ← ㄍㄡ;
+gan }$pTone ↔ ㄍㄢ }$zTone;
+ gan  ㄍㄢ˙;
+ gan1 ← ㄍㄢ;
+gen }$pTone ↔ ㄍㄣ }$zTone;
+ gen  ㄍㄣ˙;
+ gen1 ← ㄍㄣ;
+gua }$pTone ↔ ㄍㄨㄚ }$zTone;
+ gua  ㄍㄨㄚ˙;
+ gua1 ← ㄍㄨㄚ;
+guo }$pTone ↔ ㄍㄨㄛ }$zTone;
+ guo  ㄍㄨㄛ˙;
+ guo1 ← ㄍㄨㄛ;
+gui }$pTone ↔ ㄍㄨㄟ }$zTone;
+ gui  ㄍㄨㄟ˙;
+ gui1 ← ㄍㄨㄟ;
+gun }$pTone ↔ ㄍㄨㄣ }$zTone;
+ gun  ㄍㄨㄣ˙;
+ gun1 ← ㄍㄨㄣ;
+ga }$pTone ↔ ㄍㄚ }$zTone;
+ ga  ㄍㄚ˙;
+ ga1 ← ㄍㄚ;
+ge }$pTone ↔ ㄍㄜ }$zTone;
+ ge  ㄍㄜ˙;
+ ge1 ← ㄍㄜ;
+gi }$pTone ↔ ㄍㄧ }$zTone;
+ gi  ㄍㄧ˙;
+ gi1 ← ㄍㄧ;
+gu }$pTone ↔ ㄍㄨ }$zTone;
+ gu  ㄍㄨ˙;
+ gu1 ← ㄍㄨ;
 #
-kuang }$pTone   ↔ ㄎㄨㄤ }$zTone;
- kuang          →  ㄎㄨㄤ˙;
- kuang1         ← ㄎㄨㄤ;
-kang }$pTone    ↔ ㄎㄤ }$zTone;
- kang           →  ㄎㄤ˙;
- kang1          ← ㄎㄤ;
-keng }$pTone    ↔ ㄎㄥ }$zTone;
- keng           →  ㄎㄥ˙;
- keng1          ← ㄎㄥ;
-kuai }$pTone    ↔ ㄎㄨㄞ }$zTone;
- kuai           →  ㄎㄨㄞ˙;
- kuai1          ← ㄎㄨㄞ;
-kuan }$pTone    ↔ ㄎㄨㄢ }$zTone;
- kuan           →  ㄎㄨㄢ˙;
- kuan1          ← ㄎㄨㄢ;
-kong }$pTone    ↔ ㄎㄨㄥ }$zTone;
- kong           →  ㄎㄨㄥ˙;
- kong1          ← ㄎㄨㄥ;
-kai }$pTone     ↔ ㄎㄞ }$zTone;
- kai            →  ㄎㄞ˙;
- kai1           ← ㄎㄞ;
-kao }$pTone     ↔ ㄎㄠ }$zTone;
- kao            →  ㄎㄠ˙;
- kao1           ← ㄎㄠ;
-kou }$pTone     ↔ ㄎㄡ }$zTone;
- kou            →  ㄎㄡ˙;
- kou1           ← ㄎㄡ;
-kan }$pTone     ↔ ㄎㄢ }$zTone;
- kan            →  ㄎㄢ˙;
- kan1           ← ㄎㄢ;
-ken }$pTone     ↔ ㄎㄣ }$zTone;
- ken            →  ㄎㄣ˙;
- ken1           ← ㄎㄣ;
-kua }$pTone     ↔ ㄎㄨㄚ }$zTone;
- kua            →  ㄎㄨㄚ˙;
- kua1           ← ㄎㄨㄚ;
-kuo }$pTone     ↔ ㄎㄨㄛ }$zTone;
- kuo            →  ㄎㄨㄛ˙;
- kuo1           ← ㄎㄨㄛ;
-kui }$pTone     ↔ ㄎㄨㄟ }$zTone;
- kui            →  ㄎㄨㄟ˙;
- kui1           ← ㄎㄨㄟ;
-kun }$pTone     ↔ ㄎㄨㄣ }$zTone;
- kun            →  ㄎㄨㄣ˙;
- kun1           ← ㄎㄨㄣ;
-ka }$pTone      ↔ ㄎㄚ }$zTone;
- ka             →  ㄎㄚ˙;
- ka1            ← ㄎㄚ;
-ke }$pTone      ↔ ㄎㄜ }$zTone;
- ke             →  ㄎㄜ˙;
- ke1            ← ㄎㄜ;
-ku }$pTone      ↔ ㄎㄨ }$zTone;
- ku             →  ㄎㄨ˙;
- ku1            ← ㄎㄨ;
+kuang }$pTone ↔ ㄎㄨㄤ }$zTone;
+ kuang  ㄎㄨㄤ˙;
+ kuang1 ← ㄎㄨㄤ;
+kang }$pTone ↔ ㄎㄤ }$zTone;
+ kang  ㄎㄤ˙;
+ kang1 ← ㄎㄤ;
+keng }$pTone ↔ ㄎㄥ }$zTone;
+ keng  ㄎㄥ˙;
+ keng1 ← ㄎㄥ;
+kuai }$pTone ↔ ㄎㄨㄞ }$zTone;
+ kuai  ㄎㄨㄞ˙;
+ kuai1 ← ㄎㄨㄞ;
+kuan }$pTone ↔ ㄎㄨㄢ }$zTone;
+ kuan  ㄎㄨㄢ˙;
+ kuan1 ← ㄎㄨㄢ;
+kong }$pTone ↔ ㄎㄨㄥ }$zTone;
+ kong  ㄎㄨㄥ˙;
+ kong1 ← ㄎㄨㄥ;
+kai }$pTone ↔ ㄎㄞ }$zTone;
+ kai  ㄎㄞ˙;
+ kai1 ← ㄎㄞ;
+kao }$pTone ↔ ㄎㄠ }$zTone;
+ kao  ㄎㄠ˙;
+ kao1 ← ㄎㄠ;
+kou }$pTone ↔ ㄎㄡ }$zTone;
+ kou  ㄎㄡ˙;
+ kou1 ← ㄎㄡ;
+kan }$pTone ↔ ㄎㄢ }$zTone;
+ kan  ㄎㄢ˙;
+ kan1 ← ㄎㄢ;
+ken }$pTone ↔ ㄎㄣ }$zTone;
+ ken  ㄎㄣ˙;
+ ken1 ← ㄎㄣ;
+kua }$pTone ↔ ㄎㄨㄚ }$zTone;
+ kua  ㄎㄨㄚ˙;
+ kua1 ← ㄎㄨㄚ;
+kuo }$pTone ↔ ㄎㄨㄛ }$zTone;
+ kuo  ㄎㄨㄛ˙;
+ kuo1 ← ㄎㄨㄛ;
+kui }$pTone ↔ ㄎㄨㄟ }$zTone;
+ kui  ㄎㄨㄟ˙;
+ kui1 ← ㄎㄨㄟ;
+kun }$pTone ↔ ㄎㄨㄣ }$zTone;
+ kun  ㄎㄨㄣ˙;
+ kun1 ← ㄎㄨㄣ;
+ka }$pTone ↔ ㄎㄚ }$zTone;
+ ka  ㄎㄚ˙;
+ ka1 ← ㄎㄚ;
+ke }$pTone ↔ ㄎㄜ }$zTone;
+ ke  ㄎㄜ˙;
+ ke1 ← ㄎㄜ;
+ku }$pTone ↔ ㄎㄨ }$zTone;
+ ku  ㄎㄨ˙;
+ ku1 ← ㄎㄨ;
 #
-huang }$pTone   ↔ ㄏㄨㄤ }$zTone;
- huang          →  ㄏㄨㄤ˙;
- huang1         ← ㄏㄨㄤ;
-hang }$pTone    ↔ ㄏㄤ }$zTone;
- hang           →  ㄏㄤ˙;
- hang1          ← ㄏㄤ;
-heng }$pTone    ↔ ㄏㄥ }$zTone;
- heng           →  ㄏㄥ˙;
- heng1          ← ㄏㄥ;
-huai }$pTone    ↔ ㄏㄨㄞ }$zTone;
- huai           →  ㄏㄨㄞ˙;
- huai1          ← ㄏㄨㄞ;
-huan }$pTone    ↔ ㄏㄨㄢ }$zTone;
- huan           →  ㄏㄨㄢ˙;
- huan1          ← ㄏㄨㄢ;
-hong }$pTone    ↔ ㄏㄨㄥ }$zTone;
- hong           →  ㄏㄨㄥ˙;
- hong1          ← ㄏㄨㄥ;
-hai }$pTone     ↔ ㄏㄞ }$zTone;
- hai            →  ㄏㄞ˙;
- hai1           ← ㄏㄞ;
-hei }$pTone     ↔ ㄏㄟ }$zTone;
- hei            →  ㄏㄟ˙;
- hei1           ← ㄏㄟ;
-hao }$pTone     ↔ ㄏㄠ }$zTone;
- hao            →  ㄏㄠ˙;
- hao1           ← ㄏㄠ;
-hou }$pTone     ↔ ㄏㄡ }$zTone;
- hou            →  ㄏㄡ˙;
- hou1           ← ㄏㄡ;
-han }$pTone     ↔ ㄏㄢ }$zTone;
- han            →  ㄏㄢ˙;
- han1           ← ㄏㄢ;
-hen }$pTone     ↔ ㄏㄣ }$zTone;
- hen            →  ㄏㄣ˙;
- hen1           ← ㄏㄣ;
-hua }$pTone     ↔ ㄏㄨㄚ }$zTone;
- hua            →  ㄏㄨㄚ˙;
- hua1           ← ㄏㄨㄚ;
-huo }$pTone     ↔ ㄏㄨㄛ }$zTone;
- huo            →  ㄏㄨㄛ˙;
- huo1           ← ㄏㄨㄛ;
-hui }$pTone     ↔ ㄏㄨㄟ }$zTone;
- hui            →  ㄏㄨㄟ˙;
- hui1           ← ㄏㄨㄟ;
-hun }$pTone     ↔ ㄏㄨㄣ }$zTone;
- hun            →  ㄏㄨㄣ˙;
- hun1           ← ㄏㄨㄣ;
-hm }$pTone      ↔ ㄏㄇ }$zTone;
- hm             →  ㄏㄇ˙;
- hm1            ← ㄏㄇ;
-ha }$pTone      ↔ ㄏㄚ }$zTone;
- ha             →  ㄏㄚ˙;
- ha1            ← ㄏㄚ;
-ho }$pTone      ↔ ㄏㄛ }$zTone;
- ho             →  ㄏㄛ˙;
- ho1            ← ㄏㄛ;
-he }$pTone      ↔ ㄏㄜ }$zTone;
- he             →  ㄏㄜ˙;
- he1            ← ㄏㄜ;
-hu }$pTone      ↔ ㄏㄨ }$zTone;
- hu             →  ㄏㄨ˙;
- hu1            ← ㄏㄨ;
+huang }$pTone ↔ ㄏㄨㄤ }$zTone;
+ huang  ㄏㄨㄤ˙;
+ huang1 ← ㄏㄨㄤ;
+hang }$pTone ↔ ㄏㄤ }$zTone;
+ hang  ㄏㄤ˙;
+ hang1 ← ㄏㄤ;
+heng }$pTone ↔ ㄏㄥ }$zTone;
+ heng  ㄏㄥ˙;
+ heng1 ← ㄏㄥ;
+huai }$pTone ↔ ㄏㄨㄞ }$zTone;
+ huai  ㄏㄨㄞ˙;
+ huai1 ← ㄏㄨㄞ;
+huan }$pTone ↔ ㄏㄨㄢ }$zTone;
+ huan  ㄏㄨㄢ˙;
+ huan1 ← ㄏㄨㄢ;
+hong }$pTone ↔ ㄏㄨㄥ }$zTone;
+ hong  ㄏㄨㄥ˙;
+ hong1 ← ㄏㄨㄥ;
+hai }$pTone ↔ ㄏㄞ }$zTone;
+ hai  ㄏㄞ˙;
+ hai1 ← ㄏㄞ;
+hei }$pTone ↔ ㄏㄟ }$zTone;
+ hei  ㄏㄟ˙;
+ hei1 ← ㄏㄟ;
+hao }$pTone ↔ ㄏㄠ }$zTone;
+ hao  ㄏㄠ˙;
+ hao1 ← ㄏㄠ;
+hou }$pTone ↔ ㄏㄡ }$zTone;
+ hou  ㄏㄡ˙;
+ hou1 ← ㄏㄡ;
+han }$pTone ↔ ㄏㄢ }$zTone;
+ han  ㄏㄢ˙;
+ han1 ← ㄏㄢ;
+hen }$pTone ↔ ㄏㄣ }$zTone;
+ hen  ㄏㄣ˙;
+ hen1 ← ㄏㄣ;
+hua }$pTone ↔ ㄏㄨㄚ }$zTone;
+ hua  ㄏㄨㄚ˙;
+ hua1 ← ㄏㄨㄚ;
+huo }$pTone ↔ ㄏㄨㄛ }$zTone;
+ huo  ㄏㄨㄛ˙;
+ huo1 ← ㄏㄨㄛ;
+hui }$pTone ↔ ㄏㄨㄟ }$zTone;
+ hui  ㄏㄨㄟ˙;
+ hui1 ← ㄏㄨㄟ;
+hun }$pTone ↔ ㄏㄨㄣ }$zTone;
+ hun  ㄏㄨㄣ˙;
+ hun1 ← ㄏㄨㄣ;
+hm }$pTone ↔ ㄏㄇ }$zTone;
+ hm  ㄏㄇ˙;
+ hm1 ← ㄏㄇ;
+ha }$pTone ↔ ㄏㄚ }$zTone;
+ ha  ㄏㄚ˙;
+ ha1 ← ㄏㄚ;
+ho }$pTone ↔ ㄏㄛ }$zTone;
+ ho  ㄏㄛ˙;
+ ho1 ← ㄏㄛ;
+he }$pTone ↔ ㄏㄜ }$zTone;
+ he  ㄏㄜ˙;
+ he1 ← ㄏㄜ;
+hu }$pTone ↔ ㄏㄨ }$zTone;
+ hu  ㄏㄨ˙;
+ hu1 ← ㄏㄨ;
 #
-jiang }$pTone   ↔ ㄐㄧㄤ }$zTone;
- jiang          →  ㄐㄧㄤ˙;
- jiang1         ← ㄐㄧㄤ;
-jiong }$pTone   ↔ ㄐㄩㄥ }$zTone;
- jiong          →  ㄐㄩㄥ˙;
- jiong1         ← ㄐㄩㄥ;
-jiao }$pTone    ↔ ㄐㄧㄠ }$zTone;
- jiao           →  ㄐㄧㄠ˙;
- jiao1          ← ㄐㄧㄠ;
-jian }$pTone    ↔ ㄐㄧㄢ }$zTone;
- jian           →  ㄐㄧㄢ˙;
- jian1          ← ㄐㄧㄢ;
-jing }$pTone    ↔ ㄐㄧㄥ }$zTone;
- jing           →  ㄐㄧㄥ˙;
- jing1          ← ㄐㄧㄥ;
-juan }$pTone    ↔ ㄐㄩㄢ }$zTone;
- juan           →  ㄐㄩㄢ˙;
- juan1          ← ㄐㄩㄢ;
-jia }$pTone     ↔ ㄐㄧㄚ }$zTone;
- jia            →  ㄐㄧㄚ˙;
- jia1           ← ㄐㄧㄚ;
-jie }$pTone     ↔ ㄐㄧㄝ }$zTone;
- jie            →  ㄐㄧㄝ˙;
- jie1           ← ㄐㄧㄝ;
-jiu }$pTone     ↔ ㄐㄧㄡ }$zTone;
- jiu            →  ㄐㄧㄡ˙;
- jiu1           ← ㄐㄧㄡ;
-jin }$pTone     ↔ ㄐㄧㄣ }$zTone;
- jin            →  ㄐㄧㄣ˙;
- jin1           ← ㄐㄧㄣ;
-jue }$pTone     ↔ ㄐㄩㄝ }$zTone;
- jue            →  ㄐㄩㄝ˙;
- jue1           ← ㄐㄩㄝ;
-jun }$pTone     ↔ ㄐㄩㄣ }$zTone;
- jun            →  ㄐㄩㄣ˙;
- jun1           ← ㄐㄩㄣ;
-ji }$pTone      ↔ ㄐㄧ }$zTone;
- ji             →  ㄐㄧ˙;
- ji1            ← ㄐㄧ;
-ju }$pTone      ↔ ㄐㄩ }$zTone;
- ju             →  ㄐㄩ˙;
- ju1            ← ㄐㄩ;
+jiang }$pTone ↔ ㄐㄧㄤ }$zTone;
+ jiang  ㄐㄧㄤ˙;
+ jiang1 ← ㄐㄧㄤ;
+jiong }$pTone ↔ ㄐㄩㄥ }$zTone;
+ jiong  ㄐㄩㄥ˙;
+ jiong1 ← ㄐㄩㄥ;
+jiao }$pTone ↔ ㄐㄧㄠ }$zTone;
+ jiao  ㄐㄧㄠ˙;
+ jiao1 ← ㄐㄧㄠ;
+jian }$pTone ↔ ㄐㄧㄢ }$zTone;
+ jian  ㄐㄧㄢ˙;
+ jian1 ← ㄐㄧㄢ;
+jing }$pTone ↔ ㄐㄧㄥ }$zTone;
+ jing  ㄐㄧㄥ˙;
+ jing1 ← ㄐㄧㄥ;
+juan }$pTone ↔ ㄐㄩㄢ }$zTone;
+ juan  ㄐㄩㄢ˙;
+ juan1 ← ㄐㄩㄢ;
+jia }$pTone ↔ ㄐㄧㄚ }$zTone;
+ jia  ㄐㄧㄚ˙;
+ jia1 ← ㄐㄧㄚ;
+jie }$pTone ↔ ㄐㄧㄝ }$zTone;
+ jie  ㄐㄧㄝ˙;
+ jie1 ← ㄐㄧㄝ;
+jiu }$pTone ↔ ㄐㄧㄡ }$zTone;
+ jiu  ㄐㄧㄡ˙;
+ jiu1 ← ㄐㄧㄡ;
+jin }$pTone ↔ ㄐㄧㄣ }$zTone;
+ jin  ㄐㄧㄣ˙;
+ jin1 ← ㄐㄧㄣ;
+jue }$pTone ↔ ㄐㄩㄝ }$zTone;
+ jue  ㄐㄩㄝ˙;
+ jue1 ← ㄐㄩㄝ;
+jun }$pTone ↔ ㄐㄩㄣ }$zTone;
+ jun  ㄐㄩㄣ˙;
+ jun1 ← ㄐㄩㄣ;
+ji }$pTone ↔ ㄐㄧ }$zTone;
+ ji  ㄐㄧ˙;
+ ji1 ← ㄐㄧ;
+ju }$pTone ↔ ㄐㄩ }$zTone;
+ ju  ㄐㄩ˙;
+ ju1 ← ㄐㄩ;
 #
-qiang }$pTone   ↔ ㄑㄧㄤ }$zTone;
- qiang          →  ㄑㄧㄤ˙;
- qiang1         ← ㄑㄧㄤ;
-qiong }$pTone   ↔ ㄑㄩㄥ }$zTone;
- qiong          →  ㄑㄩㄥ˙;
- qiong1         ← ㄑㄩㄥ;
-qiao }$pTone    ↔ ㄑㄧㄠ }$zTone;
- qiao           →  ㄑㄧㄠ˙;
- qiao1          ← ㄑㄧㄠ;
-qian }$pTone    ↔ ㄑㄧㄢ }$zTone;
- qian           →  ㄑㄧㄢ˙;
- qian1          ← ㄑㄧㄢ;
-qing }$pTone    ↔ ㄑㄧㄥ }$zTone;
- qing           →  ㄑㄧㄥ˙;
- qing1          ← ㄑㄧㄥ;
-quan }$pTone    ↔ ㄑㄩㄢ }$zTone;
- quan           →  ㄑㄩㄢ˙;
- quan1          ← ㄑㄩㄢ;
-qia }$pTone     ↔ ㄑㄧㄚ }$zTone;
- qia            →  ㄑㄧㄚ˙;
- qia1           ← ㄑㄧㄚ;
-qie }$pTone     ↔ ㄑㄧㄝ }$zTone;
- qie            →  ㄑㄧㄝ˙;
- qie1           ← ㄑㄧㄝ;
-qiu }$pTone     ↔ ㄑㄧㄡ }$zTone;
- qiu            →  ㄑㄧㄡ˙;
- qiu1           ← ㄑㄧㄡ;
-qin }$pTone     ↔ ㄑㄧㄣ }$zTone;
- qin            →  ㄑㄧㄣ˙;
- qin1           ← ㄑㄧㄣ;
-que }$pTone     ↔ ㄑㄩㄝ }$zTone;
- que            →  ㄑㄩㄝ˙;
- que1           ← ㄑㄩㄝ;
-qun }$pTone     ↔ ㄑㄩㄣ }$zTone;
- qun            →  ㄑㄩㄣ˙;
- qun1           ← ㄑㄩㄣ;
-qi }$pTone      ↔ ㄑㄧ }$zTone;
- qi             →  ㄑㄧ˙;
- qi1            ← ㄑㄧ;
-qu }$pTone      ↔ ㄑㄩ }$zTone;
- qu             →  ㄑㄩ˙;
- qu1            ← ㄑㄩ;
+qiang }$pTone ↔ ㄑㄧㄤ }$zTone;
+ qiang  ㄑㄧㄤ˙;
+ qiang1 ← ㄑㄧㄤ;
+qiong }$pTone ↔ ㄑㄩㄥ }$zTone;
+ qiong  ㄑㄩㄥ˙;
+ qiong1 ← ㄑㄩㄥ;
+qiao }$pTone ↔ ㄑㄧㄠ }$zTone;
+ qiao  ㄑㄧㄠ˙;
+ qiao1 ← ㄑㄧㄠ;
+qian }$pTone ↔ ㄑㄧㄢ }$zTone;
+ qian  ㄑㄧㄢ˙;
+ qian1 ← ㄑㄧㄢ;
+qing }$pTone ↔ ㄑㄧㄥ }$zTone;
+ qing  ㄑㄧㄥ˙;
+ qing1 ← ㄑㄧㄥ;
+quan }$pTone ↔ ㄑㄩㄢ }$zTone;
+ quan  ㄑㄩㄢ˙;
+ quan1 ← ㄑㄩㄢ;
+qia }$pTone ↔ ㄑㄧㄚ }$zTone;
+ qia  ㄑㄧㄚ˙;
+ qia1 ← ㄑㄧㄚ;
+qie }$pTone ↔ ㄑㄧㄝ }$zTone;
+ qie  ㄑㄧㄝ˙;
+ qie1 ← ㄑㄧㄝ;
+qiu }$pTone ↔ ㄑㄧㄡ }$zTone;
+ qiu  ㄑㄧㄡ˙;
+ qiu1 ← ㄑㄧㄡ;
+qin }$pTone ↔ ㄑㄧㄣ }$zTone;
+ qin  ㄑㄧㄣ˙;
+ qin1 ← ㄑㄧㄣ;
+que }$pTone ↔ ㄑㄩㄝ }$zTone;
+ que  ㄑㄩㄝ˙;
+ que1 ← ㄑㄩㄝ;
+qun }$pTone ↔ ㄑㄩㄣ }$zTone;
+ qun  ㄑㄩㄣ˙;
+ qun1 ← ㄑㄩㄣ;
+qi }$pTone ↔ ㄑㄧ }$zTone;
+ qi  ㄑㄧ˙;
+ qi1 ← ㄑㄧ;
+qu }$pTone ↔ ㄑㄩ }$zTone;
+ qu  ㄑㄩ˙;
+ qu1 ← ㄑㄩ;
 #
-xiang }$pTone   ↔ ㄒㄧㄤ }$zTone;
- xiang          →  ㄒㄧㄤ˙;
- xiang1         ← ㄒㄧㄤ;
-xiong }$pTone   ↔ ㄒㄩㄥ }$zTone;
- xiong          →  ㄒㄩㄥ˙;
- xiong1         ← ㄒㄩㄥ;
-xiao }$pTone    ↔ ㄒㄧㄠ }$zTone;
- xiao           →  ㄒㄧㄠ˙;
- xiao1          ← ㄒㄧㄠ;
-xian }$pTone    ↔ ㄒㄧㄢ }$zTone;
- xian           →  ㄒㄧㄢ˙;
- xian1          ← ㄒㄧㄢ;
-xing }$pTone    ↔ ㄒㄧㄥ }$zTone;
- xing           →  ㄒㄧㄥ˙;
- xing1          ← ㄒㄧㄥ;
-xuan }$pTone    ↔ ㄒㄩㄢ }$zTone;
- xuan           →  ㄒㄩㄢ˙;
- xuan1          ← ㄒㄩㄢ;
-xia }$pTone     ↔ ㄒㄧㄚ }$zTone;
- xia            →  ㄒㄧㄚ˙;
- xia1           ← ㄒㄧㄚ;
-xie }$pTone     ↔ ㄒㄧㄝ }$zTone;
- xie            →  ㄒㄧㄝ˙;
- xie1           ← ㄒㄧㄝ;
-xiu }$pTone     ↔ ㄒㄧㄡ }$zTone;
- xiu            →  ㄒㄧㄡ˙;
- xiu1           ← ㄒㄧㄡ;
-xin }$pTone     ↔ ㄒㄧㄣ }$zTone;
- xin            →  ㄒㄧㄣ˙;
- xin1           ← ㄒㄧㄣ;
-xue }$pTone     ↔ ㄒㄩㄝ }$zTone;
- xue            →  ㄒㄩㄝ˙;
- xue1           ← ㄒㄩㄝ;
-xun }$pTone     ↔ ㄒㄩㄣ }$zTone;
- xun            →  ㄒㄩㄣ˙;
- xun1           ← ㄒㄩㄣ;
-xi }$pTone      ↔ ㄒㄧ }$zTone;
- xi             →  ㄒㄧ˙;
- xi1            ← ㄒㄧ;
-xu }$pTone      ↔ ㄒㄩ }$zTone;
- xu             →  ㄒㄩ˙;
- xu1            ← ㄒㄩ;
+xiang }$pTone ↔ ㄒㄧㄤ }$zTone;
+ xiang  ㄒㄧㄤ˙;
+ xiang1 ← ㄒㄧㄤ;
+xiong }$pTone ↔ ㄒㄩㄥ }$zTone;
+ xiong  ㄒㄩㄥ˙;
+ xiong1 ← ㄒㄩㄥ;
+xiao }$pTone ↔ ㄒㄧㄠ }$zTone;
+ xiao  ㄒㄧㄠ˙;
+ xiao1 ← ㄒㄧㄠ;
+xian }$pTone ↔ ㄒㄧㄢ }$zTone;
+ xian  ㄒㄧㄢ˙;
+ xian1 ← ㄒㄧㄢ;
+xing }$pTone ↔ ㄒㄧㄥ }$zTone;
+ xing  ㄒㄧㄥ˙;
+ xing1 ← ㄒㄧㄥ;
+xuan }$pTone ↔ ㄒㄩㄢ }$zTone;
+ xuan  ㄒㄩㄢ˙;
+ xuan1 ← ㄒㄩㄢ;
+xia }$pTone ↔ ㄒㄧㄚ }$zTone;
+ xia  ㄒㄧㄚ˙;
+ xia1 ← ㄒㄧㄚ;
+xie }$pTone ↔ ㄒㄧㄝ }$zTone;
+ xie  ㄒㄧㄝ˙;
+ xie1 ← ㄒㄧㄝ;
+xiu }$pTone ↔ ㄒㄧㄡ }$zTone;
+ xiu  ㄒㄧㄡ˙;
+ xiu1 ← ㄒㄧㄡ;
+xin }$pTone ↔ ㄒㄧㄣ }$zTone;
+ xin  ㄒㄧㄣ˙;
+ xin1 ← ㄒㄧㄣ;
+xue }$pTone ↔ ㄒㄩㄝ }$zTone;
+ xue  ㄒㄩㄝ˙;
+ xue1 ← ㄒㄩㄝ;
+xun }$pTone ↔ ㄒㄩㄣ }$zTone;
+ xun  ㄒㄩㄣ˙;
+ xun1 ← ㄒㄩㄣ;
+xi }$pTone ↔ ㄒㄧ }$zTone;
+ xi  ㄒㄧ˙;
+ xi1 ← ㄒㄧ;
+xu }$pTone ↔ ㄒㄩ }$zTone;
+ xu  ㄒㄩ˙;
+ xu1 ← ㄒㄩ;
 #
-zhuang }$pTone  ↔ ㄓㄨㄤ }$zTone;
- zhuang         →  ㄓㄨㄤ˙;
- zhuang1        ← ㄓㄨㄤ;
-zhang }$pTone   ↔ ㄓㄤ }$zTone;
- zhang          →  ㄓㄤ˙;
- zhang1         ← ㄓㄤ;
-zheng }$pTone   ↔ ㄓㄥ }$zTone;
- zheng          →  ㄓㄥ˙;
- zheng1         ← ㄓㄥ;
-zhuai }$pTone   ↔ ㄓㄨㄞ }$zTone;
- zhuai          →  ㄓㄨㄞ˙;
- zhuai1         ← ㄓㄨㄞ;
-zhuan }$pTone   ↔ ㄓㄨㄢ }$zTone;
- zhuan          →  ㄓㄨㄢ˙;
- zhuan1         ← ㄓㄨㄢ;
-zhong }$pTone   ↔ ㄓㄨㄥ }$zTone;
- zhong          →  ㄓㄨㄥ˙;
- zhong1         ← ㄓㄨㄥ;
-zhai }$pTone    ↔ ㄓㄞ }$zTone;
- zhai           →  ㄓㄞ˙;
- zhai1          ← ㄓㄞ;
-zhei }$pTone    ↔ ㄓㄟ }$zTone;            # (not in han-latin)
- zhei           →  ㄓㄟ˙;
- zhei1          ← ㄓㄟ;
-zhao }$pTone    ↔ ㄓㄠ }$zTone;
- zhao           →  ㄓㄠ˙;
- zhao1          ← ㄓㄠ;
-zhou }$pTone    ↔ ㄓㄡ }$zTone;
- zhou           →  ㄓㄡ˙;
- zhou1          ← ㄓㄡ;
-zhan }$pTone    ↔ ㄓㄢ }$zTone;
- zhan           →  ㄓㄢ˙;
- zhan1          ← ㄓㄢ;
-zhen }$pTone    ↔ ㄓㄣ }$zTone;
- zhen           →  ㄓㄣ˙;
- zhen1          ← ㄓㄣ;
-zhua }$pTone    ↔ ㄓㄨㄚ }$zTone;
- zhua           →  ㄓㄨㄚ˙;
- zhua1          ← ㄓㄨㄚ;
-zhuo }$pTone    ↔ ㄓㄨㄛ }$zTone;
- zhuo           →  ㄓㄨㄛ˙;
- zhuo1          ← ㄓㄨㄛ;
-zhui }$pTone    ↔ ㄓㄨㄟ }$zTone;
- zhui           →  ㄓㄨㄟ˙;
- zhui1          ← ㄓㄨㄟ;
-zhun }$pTone    ↔ ㄓㄨㄣ }$zTone;
- zhun           →  ㄓㄨㄣ˙;
- zhun1          ← ㄓㄨㄣ;
-zha }$pTone     ↔ ㄓㄚ }$zTone;
- zha            →  ㄓㄚ˙;
- zha1           ← ㄓㄚ;
-zhe }$pTone     ↔ ㄓㄜ }$zTone;
- zhe            →  ㄓㄜ˙;
- zhe1           ← ㄓㄜ;
-zhu }$pTone     ↔ ㄓㄨ }$zTone;
- zhu            →  ㄓㄨ˙;
- zhu1           ← ㄓㄨ;
-zhi }$pTone     ↔ ㄓ }$zTone;
- zhi            →  ㄓ˙;
- zhi1           ← ㄓ;
+zhuang }$pTone ↔ ㄓㄨㄤ }$zTone;
+ zhuang  ㄓㄨㄤ˙;
+ zhuang1 ← ㄓㄨㄤ;
+zhang }$pTone ↔ ㄓㄤ }$zTone;
+ zhang  ㄓㄤ˙;
+ zhang1 ← ㄓㄤ;
+zheng }$pTone ↔ ㄓㄥ }$zTone;
+ zheng  ㄓㄥ˙;
+ zheng1 ← ㄓㄥ;
+zhuai }$pTone ↔ ㄓㄨㄞ }$zTone;
+ zhuai  ㄓㄨㄞ˙;
+ zhuai1 ← ㄓㄨㄞ;
+zhuan }$pTone ↔ ㄓㄨㄢ }$zTone;
+ zhuan  ㄓㄨㄢ˙;
+ zhuan1 ← ㄓㄨㄢ;
+zhong }$pTone ↔ ㄓㄨㄥ }$zTone;
+ zhong  ㄓㄨㄥ˙;
+ zhong1 ← ㄓㄨㄥ;
+zhai }$pTone ↔ ㄓㄞ }$zTone;
+ zhai  ㄓㄞ˙;
+ zhai1 ← ㄓㄞ;
+zhei }$pTone ↔ ㄓㄟ }$zTone; # (not in han-latin)
+ zhei  ㄓㄟ˙;
+ zhei1 ← ㄓㄟ;
+zhao }$pTone ↔ ㄓㄠ }$zTone;
+ zhao  ㄓㄠ˙;
+ zhao1 ← ㄓㄠ;
+zhou }$pTone ↔ ㄓㄡ }$zTone;
+ zhou  ㄓㄡ˙;
+ zhou1 ← ㄓㄡ;
+zhan }$pTone ↔ ㄓㄢ }$zTone;
+ zhan  ㄓㄢ˙;
+ zhan1 ← ㄓㄢ;
+zhen }$pTone ↔ ㄓㄣ }$zTone;
+ zhen  ㄓㄣ˙;
+ zhen1 ← ㄓㄣ;
+zhua }$pTone ↔ ㄓㄨㄚ }$zTone;
+ zhua  ㄓㄨㄚ˙;
+ zhua1 ← ㄓㄨㄚ;
+zhuo }$pTone ↔ ㄓㄨㄛ }$zTone;
+ zhuo  ㄓㄨㄛ˙;
+ zhuo1 ← ㄓㄨㄛ;
+zhui }$pTone ↔ ㄓㄨㄟ }$zTone;
+ zhui  ㄓㄨㄟ˙;
+ zhui1 ← ㄓㄨㄟ;
+zhun }$pTone ↔ ㄓㄨㄣ }$zTone;
+ zhun  ㄓㄨㄣ˙;
+ zhun1 ← ㄓㄨㄣ;
+zha }$pTone ↔ ㄓㄚ }$zTone;
+ zha  ㄓㄚ˙;
+ zha1 ← ㄓㄚ;
+zhe }$pTone ↔ ㄓㄜ }$zTone;
+ zhe  ㄓㄜ˙;
+ zhe1 ← ㄓㄜ;
+zhu }$pTone ↔ ㄓㄨ }$zTone;
+ zhu  ㄓㄨ˙;
+ zhu1 ← ㄓㄨ;
+zhi }$pTone ↔ ㄓ }$zTone;
+ zhi  ㄓ˙;
+ zhi1 ← ㄓ;
 #
-chuang }$pTone  ↔ ㄔㄨㄤ }$zTone;
- chuang         →  ㄔㄨㄤ˙;
- chuang1        ← ㄔㄨㄤ;
-chang }$pTone   ↔ ㄔㄤ }$zTone;
- chang          →  ㄔㄤ˙;
- chang1         ← ㄔㄤ;
-cheng }$pTone   ↔ ㄔㄥ }$zTone;
- cheng          →  ㄔㄥ˙;
- cheng1         ← ㄔㄥ;
-chuai }$pTone   ↔ ㄔㄨㄞ }$zTone;
- chuai          →  ㄔㄨㄞ˙;
- chuai1         ← ㄔㄨㄞ;
-chuan }$pTone   ↔ ㄔㄨㄢ }$zTone;
- chuan          →  ㄔㄨㄢ˙;
- chuan1         ← ㄔㄨㄢ;
-chong }$pTone   ↔ ㄔㄨㄥ }$zTone;
- chong          →  ㄔㄨㄥ˙;
- chong1         ← ㄔㄨㄥ;
-chai }$pTone    ↔ ㄔㄞ }$zTone;
- chai           →  ㄔㄞ˙;
- chai1          ← ㄔㄞ;
-chao }$pTone    ↔ ㄔㄠ }$zTone;
- chao           →  ㄔㄠ˙;
- chao1          ← ㄔㄠ;
-chou }$pTone    ↔ ㄔㄡ }$zTone;
- chou           →  ㄔㄡ˙;
- chou1          ← ㄔㄡ;
-chan }$pTone    ↔ ㄔㄢ }$zTone;
- chan           →  ㄔㄢ˙;
- chan1          ← ㄔㄢ;
-chen }$pTone    ↔ ㄔㄣ }$zTone;
- chen           →  ㄔㄣ˙;
- chen1          ← ㄔㄣ;
-chua }$pTone    ↔ ㄔㄨㄚ }$zTone;
- chua           →  ㄔㄨㄚ˙;
- chua1          ← ㄔㄨㄚ;
-chuo }$pTone    ↔ ㄔㄨㄛ }$zTone;
- chuo           →  ㄔㄨㄛ˙;
- chuo1          ← ㄔㄨㄛ;
-chui }$pTone    ↔ ㄔㄨㄟ }$zTone;
- chui           →  ㄔㄨㄟ˙;
- chui1          ← ㄔㄨㄟ;
-chun }$pTone    ↔ ㄔㄨㄣ }$zTone;
- chun           →  ㄔㄨㄣ˙;
- chun1          ← ㄔㄨㄣ;
-cha }$pTone     ↔ ㄔㄚ }$zTone;
- cha            →  ㄔㄚ˙;
- cha1           ← ㄔㄚ;
-che }$pTone     ↔ ㄔㄜ }$zTone;
- che            →  ㄔㄜ˙;
- che1           ← ㄔㄜ;
-chu }$pTone     ↔ ㄔㄨ }$zTone;
- chu            →  ㄔㄨ˙;
- chu1           ← ㄔㄨ;
-chi }$pTone     ↔ ㄔ }$zTone;
- chi            →  ㄔ˙;
- chi1           ← ㄔ;
+chuang }$pTone ↔ ㄔㄨㄤ }$zTone;
+ chuang  ㄔㄨㄤ˙;
+ chuang1 ← ㄔㄨㄤ;
+chang }$pTone ↔ ㄔㄤ }$zTone;
+ chang  ㄔㄤ˙;
+ chang1 ← ㄔㄤ;
+cheng }$pTone ↔ ㄔㄥ }$zTone;
+ cheng  ㄔㄥ˙;
+ cheng1 ← ㄔㄥ;
+chuai }$pTone ↔ ㄔㄨㄞ }$zTone;
+ chuai  ㄔㄨㄞ˙;
+ chuai1 ← ㄔㄨㄞ;
+chuan }$pTone ↔ ㄔㄨㄢ }$zTone;
+ chuan  ㄔㄨㄢ˙;
+ chuan1 ← ㄔㄨㄢ;
+chong }$pTone ↔ ㄔㄨㄥ }$zTone;
+ chong  ㄔㄨㄥ˙;
+ chong1 ← ㄔㄨㄥ;
+chai }$pTone ↔ ㄔㄞ }$zTone;
+ chai  ㄔㄞ˙;
+ chai1 ← ㄔㄞ;
+chao }$pTone ↔ ㄔㄠ }$zTone;
+ chao  ㄔㄠ˙;
+ chao1 ← ㄔㄠ;
+chou }$pTone ↔ ㄔㄡ }$zTone;
+ chou  ㄔㄡ˙;
+ chou1 ← ㄔㄡ;
+chan }$pTone ↔ ㄔㄢ }$zTone;
+ chan  ㄔㄢ˙;
+ chan1 ← ㄔㄢ;
+chen }$pTone ↔ ㄔㄣ }$zTone;
+ chen  ㄔㄣ˙;
+ chen1 ← ㄔㄣ;
+chua }$pTone ↔ ㄔㄨㄚ }$zTone;
+ chua  ㄔㄨㄚ˙;
+ chua1 ← ㄔㄨㄚ;
+chuo }$pTone ↔ ㄔㄨㄛ }$zTone;
+ chuo  ㄔㄨㄛ˙;
+ chuo1 ← ㄔㄨㄛ;
+chui }$pTone ↔ ㄔㄨㄟ }$zTone;
+ chui  ㄔㄨㄟ˙;
+ chui1 ← ㄔㄨㄟ;
+chun }$pTone ↔ ㄔㄨㄣ }$zTone;
+ chun  ㄔㄨㄣ˙;
+ chun1 ← ㄔㄨㄣ;
+cha }$pTone ↔ ㄔㄚ }$zTone;
+ cha  ㄔㄚ˙;
+ cha1 ← ㄔㄚ;
+che }$pTone ↔ ㄔㄜ }$zTone;
+ che  ㄔㄜ˙;
+ che1 ← ㄔㄜ;
+chu }$pTone ↔ ㄔㄨ }$zTone;
+ chu  ㄔㄨ˙;
+ chu1 ← ㄔㄨ;
+chi }$pTone ↔ ㄔ }$zTone;
+ chi  ㄔ˙;
+ chi1 ← ㄔ;
 #
-shuang }$pTone  ↔ ㄕㄨㄤ }$zTone;
- shuang         →  ㄕㄨㄤ˙;
- shuang1        ← ㄕㄨㄤ;
-shong }$pTone   ↔ ㄕㄡㄥ }$zTone; # (not in han-latin)
- shong          →  ㄕㄡㄥ˙;
- shong1         ← ㄕㄡㄥ;
-shang }$pTone   ↔ ㄕㄤ }$zTone;
- shang          →  ㄕㄤ˙;
- shang1         ← ㄕㄤ;
-sheng }$pTone   ↔ ㄕㄥ }$zTone;
- sheng          →  ㄕㄥ˙;
- sheng1         ← ㄕㄥ;
-shuai }$pTone   ↔ ㄕㄨㄞ }$zTone;
- shuai          →  ㄕㄨㄞ˙;
- shuai1         ← ㄕㄨㄞ;
-shuan }$pTone   ↔ ㄕㄨㄢ }$zTone;
- shuan          →  ㄕㄨㄢ˙;
- shuan1         ← ㄕㄨㄢ;
-shai }$pTone    ↔ ㄕㄞ }$zTone;
- shai           →  ㄕㄞ˙;
- shai1          ← ㄕㄞ;
-shei }$pTone    ↔ ㄕㄟ }$zTone;            # (not in han-latin)
- shei           →  ㄕㄟ˙;
- shei1          ← ㄕㄟ;
-shao }$pTone    ↔ ㄕㄠ }$zTone;
- shao           →  ㄕㄠ˙;
- shao1          ← ㄕㄠ;
-shou }$pTone    ↔ ㄕㄡ }$zTone;
- shou           →  ㄕㄡ˙;
- shou1          ← ㄕㄡ;
-shan }$pTone    ↔ ㄕㄢ }$zTone;
- shan           →  ㄕㄢ˙;
- shan1          ← ㄕㄢ;
-shen }$pTone    ↔ ㄕㄣ }$zTone;
- shen           →  ㄕㄣ˙;
- shen1          ← ㄕㄣ;
-shua }$pTone    ↔ ㄕㄨㄚ }$zTone;
- shua           →  ㄕㄨㄚ˙;
- shua1          ← ㄕㄨㄚ;
-shuo }$pTone    ↔ ㄕㄨㄛ }$zTone;
- shuo           →  ㄕㄨㄛ˙;
- shuo1          ← ㄕㄨㄛ;
-shui }$pTone    ↔ ㄕㄨㄟ }$zTone;
- shui           →  ㄕㄨㄟ˙;
- shui1          ← ㄕㄨㄟ;
-shun }$pTone    ↔ ㄕㄨㄣ }$zTone;
- shun           →  ㄕㄨㄣ˙;
- shun1          ← ㄕㄨㄣ;
-sha }$pTone     ↔ ㄕㄚ }$zTone;
- sha            →  ㄕㄚ˙;
- sha1           ← ㄕㄚ;
-she }$pTone     ↔ ㄕㄜ }$zTone;
- she            →  ㄕㄜ˙;
- she1           ← ㄕㄜ;
-shu }$pTone     ↔ ㄕㄨ }$zTone;
- shu            →  ㄕㄨ˙;
- shu1           ← ㄕㄨ;
-shi }$pTone     ↔ ㄕ }$zTone;
- shi            →  ㄕ˙;
- shi1           ← ㄕ;
+shuang }$pTone ↔ ㄕㄨㄤ }$zTone;
+ shuang  ㄕㄨㄤ˙;
+ shuang1 ← ㄕㄨㄤ;
+shong }$pTone ↔ ㄕㄡㄥ }$zTone; # (not in han-latin)
+ shong  ㄕㄡㄥ˙;
+ shong1 ← ㄕㄡㄥ;
+shang }$pTone ↔ ㄕㄤ }$zTone;
+ shang  ㄕㄤ˙;
+ shang1 ← ㄕㄤ;
+sheng }$pTone ↔ ㄕㄥ }$zTone;
+ sheng  ㄕㄥ˙;
+ sheng1 ← ㄕㄥ;
+shuai }$pTone ↔ ㄕㄨㄞ }$zTone;
+ shuai  ㄕㄨㄞ˙;
+ shuai1 ← ㄕㄨㄞ;
+shuan }$pTone ↔ ㄕㄨㄢ }$zTone;
+ shuan  ㄕㄨㄢ˙;
+ shuan1 ← ㄕㄨㄢ;
+shai }$pTone ↔ ㄕㄞ }$zTone;
+ shai  ㄕㄞ˙;
+ shai1 ← ㄕㄞ;
+shei }$pTone ↔ ㄕㄟ }$zTone; # (not in han-latin)
+ shei  ㄕㄟ˙;
+ shei1 ← ㄕㄟ;
+shao }$pTone ↔ ㄕㄠ }$zTone;
+ shao  ㄕㄠ˙;
+ shao1 ← ㄕㄠ;
+shou }$pTone ↔ ㄕㄡ }$zTone;
+ shou  ㄕㄡ˙;
+ shou1 ← ㄕㄡ;
+shan }$pTone ↔ ㄕㄢ }$zTone;
+ shan  ㄕㄢ˙;
+ shan1 ← ㄕㄢ;
+shen }$pTone ↔ ㄕㄣ }$zTone;
+ shen  ㄕㄣ˙;
+ shen1 ← ㄕㄣ;
+shua }$pTone ↔ ㄕㄨㄚ }$zTone;
+ shua  ㄕㄨㄚ˙;
+ shua1 ← ㄕㄨㄚ;
+shuo }$pTone ↔ ㄕㄨㄛ }$zTone;
+ shuo  ㄕㄨㄛ˙;
+ shuo1 ← ㄕㄨㄛ;
+shui }$pTone ↔ ㄕㄨㄟ }$zTone;
+ shui  ㄕㄨㄟ˙;
+ shui1 ← ㄕㄨㄟ;
+shun }$pTone ↔ ㄕㄨㄣ }$zTone;
+ shun  ㄕㄨㄣ˙;
+ shun1 ← ㄕㄨㄣ;
+sha }$pTone ↔ ㄕㄚ }$zTone;
+ sha  ㄕㄚ˙;
+ sha1 ← ㄕㄚ;
+she }$pTone ↔ ㄕㄜ }$zTone;
+ she  ㄕㄜ˙;
+ she1 ← ㄕㄜ;
+shu }$pTone ↔ ㄕㄨ }$zTone;
+ shu  ㄕㄨ˙;
+ shu1 ← ㄕㄨ;
+shi }$pTone ↔ ㄕ }$zTone;
+ shi  ㄕ˙;
+ shi1 ← ㄕ;
 #
-rang }$pTone    ↔ ㄖㄤ }$zTone;
- rang           →  ㄖㄤ˙;
- rang1          ← ㄖㄤ;
-reng }$pTone    ↔ ㄖㄥ }$zTone;
- reng           →  ㄖㄥ˙;
- reng1          ← ㄖㄥ;
-ruan }$pTone    ↔ ㄖㄨㄢ }$zTone;
- ruan           →  ㄖㄨㄢ˙;
- ruan1          ← ㄖㄨㄢ;
-rong }$pTone    ↔ ㄖㄨㄥ }$zTone;
- rong           →  ㄖㄨㄥ˙;
- rong1          ← ㄖㄨㄥ;
-rao }$pTone     ↔ ㄖㄠ }$zTone;
- rao            →  ㄖㄠ˙;
- rao1           ← ㄖㄠ;
-rou }$pTone     ↔ ㄖㄡ }$zTone;
- rou            →  ㄖㄡ˙;
- rou1           ← ㄖㄡ;
-ran }$pTone     ↔ ㄖㄢ }$zTone;
- ran            →  ㄖㄢ˙;
- ran1           ← ㄖㄢ;
-ren }$pTone     ↔ ㄖㄣ }$zTone;
- ren            →  ㄖㄣ˙;
- ren1           ← ㄖㄣ;
-ruo }$pTone     ↔ ㄖㄨㄛ }$zTone;
- ruo            →  ㄖㄨㄛ˙;
- ruo1           ← ㄖㄨㄛ;
-rui }$pTone     ↔ ㄖㄨㄟ }$zTone;
- rui            →  ㄖㄨㄟ˙;
- rui1           ← ㄖㄨㄟ;
-run }$pTone     ↔ ㄖㄨㄣ }$zTone;
- run            →  ㄖㄨㄣ˙;
- run1           ← ㄖㄨㄣ;
-ra }$pTone      ↔ ㄖㄚ }$zTone;
- ra             →  ㄖㄚ˙;
- ra1            ← ㄖㄚ;
-re }$pTone      ↔ ㄖㄜ }$zTone;
- re             →  ㄖㄜ˙;
- re1            ← ㄖㄜ;
-ru }$pTone      ↔ ㄖㄨ }$zTone;
- ru             →  ㄖㄨ˙;
- ru1            ← ㄖㄨ;
-ri }$pTone      ↔ ㄖ }$zTone;
- ri             →  ㄖ˙;
- ri1            ← ㄖ;
+rang }$pTone ↔ ㄖㄤ }$zTone;
+ rang  ㄖㄤ˙;
+ rang1 ← ㄖㄤ;
+reng }$pTone ↔ ㄖㄥ }$zTone;
+ reng  ㄖㄥ˙;
+ reng1 ← ㄖㄥ;
+ruan }$pTone ↔ ㄖㄨㄢ }$zTone;
+ ruan  ㄖㄨㄢ˙;
+ ruan1 ← ㄖㄨㄢ;
+rong }$pTone ↔ ㄖㄨㄥ }$zTone;
+ rong  ㄖㄨㄥ˙;
+ rong1 ← ㄖㄨㄥ;
+rao }$pTone ↔ ㄖㄠ }$zTone;
+ rao  ㄖㄠ˙;
+ rao1 ← ㄖㄠ;
+rou }$pTone ↔ ㄖㄡ }$zTone;
+ rou  ㄖㄡ˙;
+ rou1 ← ㄖㄡ;
+ran }$pTone ↔ ㄖㄢ }$zTone;
+ ran  ㄖㄢ˙;
+ ran1 ← ㄖㄢ;
+ren }$pTone ↔ ㄖㄣ }$zTone;
+ ren  ㄖㄣ˙;
+ ren1 ← ㄖㄣ;
+ruo }$pTone ↔ ㄖㄨㄛ }$zTone;
+ ruo  ㄖㄨㄛ˙;
+ ruo1 ← ㄖㄨㄛ;
+rui }$pTone ↔ ㄖㄨㄟ }$zTone;
+ rui  ㄖㄨㄟ˙;
+ rui1 ← ㄖㄨㄟ;
+run }$pTone ↔ ㄖㄨㄣ }$zTone;
+ run  ㄖㄨㄣ˙;
+ run1 ← ㄖㄨㄣ;
+ra }$pTone ↔ ㄖㄚ }$zTone;
+ ra  ㄖㄚ˙;
+ ra1 ← ㄖㄚ;
+re }$pTone ↔ ㄖㄜ }$zTone;
+ re  ㄖㄜ˙;
+ re1 ← ㄖㄜ;
+ru }$pTone ↔ ㄖㄨ }$zTone;
+ ru  ㄖㄨ˙;
+ ru1 ← ㄖㄨ;
+ri }$pTone ↔ ㄖ }$zTone;
+ ri  ㄖ˙;
+ ri1 ← ㄖ;
 #
-zang }$pTone    ↔ ㄗㄤ }$zTone;
- zang           →  ㄗㄤ˙;
- zang1          ← ㄗㄤ;
-zeng }$pTone    ↔ ㄗㄥ }$zTone;
- zeng           →  ㄗㄥ˙;
- zeng1          ← ㄗㄥ;
-zuan }$pTone    ↔ ㄗㄨㄢ }$zTone;
- zuan           →  ㄗㄨㄢ˙;
- zuan1          ← ㄗㄨㄢ;
-zong }$pTone    ↔ ㄗㄨㄥ }$zTone;
- zong           →  ㄗㄨㄥ˙;
- zong1          ← ㄗㄨㄥ;
-zai }$pTone     ↔ ㄗㄞ }$zTone;
- zai            →  ㄗㄞ˙;
- zai1           ← ㄗㄞ;
-zei }$pTone     ↔ ㄗㄟ }$zTone;
- zei            →  ㄗㄟ˙;
- zei1           ← ㄗㄟ;
-zao }$pTone     ↔ ㄗㄠ }$zTone;
- zao            →  ㄗㄠ˙;
- zao1           ← ㄗㄠ;
-zou }$pTone     ↔ ㄗㄡ }$zTone;
- zou            →  ㄗㄡ˙;
- zou1           ← ㄗㄡ;
-zan }$pTone     ↔ ㄗㄢ }$zTone;
- zan            →  ㄗㄢ˙;
- zan1           ← ㄗㄢ;
-zen }$pTone     ↔ ㄗㄣ }$zTone;
- zen            →  ㄗㄣ˙;
- zen1           ← ㄗㄣ;
-zuo }$pTone     ↔ ㄗㄨㄛ }$zTone;
- zuo            →  ㄗㄨㄛ˙;
- zuo1           ← ㄗㄨㄛ;
-zui }$pTone     ↔ ㄗㄨㄟ }$zTone;
- zui            →  ㄗㄨㄟ˙;
- zui1           ← ㄗㄨㄟ;
-zun }$pTone     ↔ ㄗㄨㄣ }$zTone;
- zun            →  ㄗㄨㄣ˙;
- zun1           ← ㄗㄨㄣ;
-za }$pTone      ↔ ㄗㄚ }$zTone;
- za             →  ㄗㄚ˙;
- za1            ← ㄗㄚ;
-ze }$pTone      ↔ ㄗㄜ }$zTone;
- ze             →  ㄗㄜ˙;
- ze1            ← ㄗㄜ;
-zu }$pTone      ↔ ㄗㄨ }$zTone;
- zu             →  ㄗㄨ˙;
- zu1            ← ㄗㄨ;
-zi }$pTone      ↔ ㄗ }$zTone;
- zi             →  ㄗ˙;
- zi1            ← ㄗ;
+zang }$pTone ↔ ㄗㄤ }$zTone;
+ zang  ㄗㄤ˙;
+ zang1 ← ㄗㄤ;
+zeng }$pTone ↔ ㄗㄥ }$zTone;
+ zeng  ㄗㄥ˙;
+ zeng1 ← ㄗㄥ;
+zuan }$pTone ↔ ㄗㄨㄢ }$zTone;
+ zuan  ㄗㄨㄢ˙;
+ zuan1 ← ㄗㄨㄢ;
+zong }$pTone ↔ ㄗㄨㄥ }$zTone;
+ zong  ㄗㄨㄥ˙;
+ zong1 ← ㄗㄨㄥ;
+zai }$pTone ↔ ㄗㄞ }$zTone;
+ zai  ㄗㄞ˙;
+ zai1 ← ㄗㄞ;
+zei }$pTone ↔ ㄗㄟ }$zTone;
+ zei  ㄗㄟ˙;
+ zei1 ← ㄗㄟ;
+zao }$pTone ↔ ㄗㄠ }$zTone;
+ zao  ㄗㄠ˙;
+ zao1 ← ㄗㄠ;
+zou }$pTone ↔ ㄗㄡ }$zTone;
+ zou  ㄗㄡ˙;
+ zou1 ← ㄗㄡ;
+zan }$pTone ↔ ㄗㄢ }$zTone;
+ zan  ㄗㄢ˙;
+ zan1 ← ㄗㄢ;
+zen }$pTone ↔ ㄗㄣ }$zTone;
+ zen  ㄗㄣ˙;
+ zen1 ← ㄗㄣ;
+zuo }$pTone ↔ ㄗㄨㄛ }$zTone;
+ zuo  ㄗㄨㄛ˙;
+ zuo1 ← ㄗㄨㄛ;
+zui }$pTone ↔ ㄗㄨㄟ }$zTone;
+ zui  ㄗㄨㄟ˙;
+ zui1 ← ㄗㄨㄟ;
+zun }$pTone ↔ ㄗㄨㄣ }$zTone;
+ zun  ㄗㄨㄣ˙;
+ zun1 ← ㄗㄨㄣ;
+za }$pTone ↔ ㄗㄚ }$zTone;
+ za  ㄗㄚ˙;
+ za1 ← ㄗㄚ;
+ze }$pTone ↔ ㄗㄜ }$zTone;
+ ze  ㄗㄜ˙;
+ ze1 ← ㄗㄜ;
+zu }$pTone ↔ ㄗㄨ }$zTone;
+ zu  ㄗㄨ˙;
+ zu1 ← ㄗㄨ;
+zi }$pTone ↔ ㄗ }$zTone;
+ zi  ㄗ˙;
+ zi1 ← ㄗ;
 #
-cang }$pTone    ↔ ㄘㄤ }$zTone;
- cang           →  ㄘㄤ˙;
- cang1          ← ㄘㄤ;
-ceng }$pTone    ↔ ㄘㄥ }$zTone;
- ceng           →  ㄘㄥ˙;
- ceng1          ← ㄘㄥ;
-cuan }$pTone    ↔ ㄘㄨㄢ }$zTone;
- cuan           →  ㄘㄨㄢ˙;
- cuan1          ← ㄘㄨㄢ;
-cong }$pTone    ↔ ㄘㄨㄥ }$zTone;
- cong           →  ㄘㄨㄥ˙;
- cong1          ← ㄘㄨㄥ;
-cai }$pTone     ↔ ㄘㄞ }$zTone;
- cai            →  ㄘㄞ˙;
- cai1           ← ㄘㄞ;
-cao }$pTone     ↔ ㄘㄠ }$zTone;
- cao            →  ㄘㄠ˙;
- cao1           ← ㄘㄠ;
-cou }$pTone     ↔ ㄘㄡ }$zTone;
- cou            →  ㄘㄡ˙;
- cou1           ← ㄘㄡ;
-can }$pTone     ↔ ㄘㄢ }$zTone;
- can            →  ㄘㄢ˙;
- can1           ← ㄘㄢ;
-cen }$pTone     ↔ ㄘㄣ }$zTone;
- cen            →  ㄘㄣ˙;
- cen1           ← ㄘㄣ;
-cuo }$pTone     ↔ ㄘㄨㄛ }$zTone;
- cuo            →  ㄘㄨㄛ˙;
- cuo1           ← ㄘㄨㄛ;
-cui }$pTone     ↔ ㄘㄨㄟ }$zTone;
- cui            →  ㄘㄨㄟ˙;
- cui1           ← ㄘㄨㄟ;
-cun }$pTone     ↔ ㄘㄨㄣ }$zTone;
- cun            →  ㄘㄨㄣ˙;
- cun1           ← ㄘㄨㄣ;
-ca }$pTone      ↔ ㄘㄚ }$zTone;
- ca             →  ㄘㄚ˙;
- ca1            ← ㄘㄚ;
-ce }$pTone      ↔ ㄘㄜ }$zTone;
- ce             →  ㄘㄜ˙;
- ce1            ← ㄘㄜ;
-cu }$pTone      ↔ ㄘㄨ }$zTone;
- cu             →  ㄘㄨ˙;
- cu1            ← ㄘㄨ;
-ci }$pTone      ↔ ㄘ }$zTone;
- ci             →  ㄘ˙;
- ci1            ← ㄘ;
+cang }$pTone ↔ ㄘㄤ }$zTone;
+ cang  ㄘㄤ˙;
+ cang1 ← ㄘㄤ;
+ceng }$pTone ↔ ㄘㄥ }$zTone;
+ ceng  ㄘㄥ˙;
+ ceng1 ← ㄘㄥ;
+cuan }$pTone ↔ ㄘㄨㄢ }$zTone;
+ cuan  ㄘㄨㄢ˙;
+ cuan1 ← ㄘㄨㄢ;
+cong }$pTone ↔ ㄘㄨㄥ }$zTone;
+ cong  ㄘㄨㄥ˙;
+ cong1 ← ㄘㄨㄥ;
+cai }$pTone ↔ ㄘㄞ }$zTone;
+ cai  ㄘㄞ˙;
+ cai1 ← ㄘㄞ;
+cao }$pTone ↔ ㄘㄠ }$zTone;
+ cao  ㄘㄠ˙;
+ cao1 ← ㄘㄠ;
+cou }$pTone ↔ ㄘㄡ }$zTone;
+ cou  ㄘㄡ˙;
+ cou1 ← ㄘㄡ;
+can }$pTone ↔ ㄘㄢ }$zTone;
+ can  ㄘㄢ˙;
+ can1 ← ㄘㄢ;
+cen }$pTone ↔ ㄘㄣ }$zTone;
+ cen  ㄘㄣ˙;
+ cen1 ← ㄘㄣ;
+cuo }$pTone ↔ ㄘㄨㄛ }$zTone;
+ cuo  ㄘㄨㄛ˙;
+ cuo1 ← ㄘㄨㄛ;
+cui }$pTone ↔ ㄘㄨㄟ }$zTone;
+ cui  ㄘㄨㄟ˙;
+ cui1 ← ㄘㄨㄟ;
+cun }$pTone ↔ ㄘㄨㄣ }$zTone;
+ cun  ㄘㄨㄣ˙;
+ cun1 ← ㄘㄨㄣ;
+ca }$pTone ↔ ㄘㄚ }$zTone;
+ ca  ㄘㄚ˙;
+ ca1 ← ㄘㄚ;
+ce }$pTone ↔ ㄘㄜ }$zTone;
+ ce  ㄘㄜ˙;
+ ce1 ← ㄘㄜ;
+cu }$pTone ↔ ㄘㄨ }$zTone;
+ cu  ㄘㄨ˙;
+ cu1 ← ㄘㄨ;
+ci }$pTone ↔ ㄘ }$zTone;
+ ci  ㄘ˙;
+ ci1 ← ㄘ;
 #
-sang }$pTone    ↔ ㄙㄤ }$zTone;
- sang           →  ㄙㄤ˙;
- sang1          ← ㄙㄤ;
-seng }$pTone    ↔ ㄙㄥ }$zTone;
- seng           →  ㄙㄥ˙;
- seng1          ← ㄙㄥ;
-suan }$pTone    ↔ ㄙㄨㄢ }$zTone;
- suan           →  ㄙㄨㄢ˙;
- suan1          ← ㄙㄨㄢ;
-song }$pTone    ↔ ㄙㄨㄥ }$zTone;
- song           →  ㄙㄨㄥ˙;
- song1          ← ㄙㄨㄥ;
-sai }$pTone     ↔ ㄙㄞ }$zTone;
- sai            →  ㄙㄞ˙;
- sai1           ← ㄙㄞ;
-sei }$pTone     ↔ ㄙㄟ }$zTone;            # (not in han-latin)
- sei            →  ㄙㄟ˙;
- sei1           ← ㄙㄟ;
-sao }$pTone     ↔ ㄙㄠ }$zTone;
- sao            →  ㄙㄠ˙;
- sao1           ← ㄙㄠ;
-sou }$pTone     ↔ ㄙㄡ }$zTone;
- sou            →  ㄙㄡ˙;
- sou1           ← ㄙㄡ;
-san }$pTone     ↔ ㄙㄢ }$zTone;
- san            →  ㄙㄢ˙;
- san1           ← ㄙㄢ;
-sen }$pTone     ↔ ㄙㄣ }$zTone;
- sen            →  ㄙㄣ˙;
- sen1           ← ㄙㄣ;
-suo }$pTone     ↔ ㄙㄨㄛ }$zTone;
- suo            →  ㄙㄨㄛ˙;
- suo1           ← ㄙㄨㄛ;
-sui }$pTone     ↔ ㄙㄨㄟ }$zTone;
- sui            →  ㄙㄨㄟ˙;
- sui1           ← ㄙㄨㄟ;
-sun }$pTone     ↔ ㄙㄨㄣ }$zTone;
- sun            →  ㄙㄨㄣ˙;
- sun1           ← ㄙㄨㄣ;
-sa }$pTone      ↔ ㄙㄚ }$zTone;
- sa             →  ㄙㄚ˙;
- sa1            ← ㄙㄚ;
-se }$pTone      ↔ ㄙㄜ }$zTone;
- se             →  ㄙㄜ˙;
- se1            ← ㄙㄜ;
-su }$pTone      ↔ ㄙㄨ }$zTone;
- su             →  ㄙㄨ˙;
- su1            ← ㄙㄨ;
-si }$pTone      ↔ ㄙ }$zTone;
- si             →  ㄙ˙;
- si1            ← ㄙ;
+sang }$pTone ↔ ㄙㄤ }$zTone;
+ sang  ㄙㄤ˙;
+ sang1 ← ㄙㄤ;
+seng }$pTone ↔ ㄙㄥ }$zTone;
+ seng  ㄙㄥ˙;
+ seng1 ← ㄙㄥ;
+suan }$pTone ↔ ㄙㄨㄢ }$zTone;
+ suan  ㄙㄨㄢ˙;
+ suan1 ← ㄙㄨㄢ;
+song }$pTone ↔ ㄙㄨㄥ }$zTone;
+ song  ㄙㄨㄥ˙;
+ song1 ← ㄙㄨㄥ;
+sai }$pTone ↔ ㄙㄞ }$zTone;
+ sai  ㄙㄞ˙;
+ sai1 ← ㄙㄞ;
+sei }$pTone ↔ ㄙㄟ }$zTone; # (not in han-latin)
+ sei  ㄙㄟ˙;
+ sei1 ← ㄙㄟ;
+sao }$pTone ↔ ㄙㄠ }$zTone;
+ sao  ㄙㄠ˙;
+ sao1 ← ㄙㄠ;
+sou }$pTone ↔ ㄙㄡ }$zTone;
+ sou  ㄙㄡ˙;
+ sou1 ← ㄙㄡ;
+san }$pTone ↔ ㄙㄢ }$zTone;
+ san  ㄙㄢ˙;
+ san1 ← ㄙㄢ;
+sen }$pTone ↔ ㄙㄣ }$zTone;
+ sen  ㄙㄣ˙;
+ sen1 ← ㄙㄣ;
+suo }$pTone ↔ ㄙㄨㄛ }$zTone;
+ suo  ㄙㄨㄛ˙;
+ suo1 ← ㄙㄨㄛ;
+sui }$pTone ↔ ㄙㄨㄟ }$zTone;
+ sui  ㄙㄨㄟ˙;
+ sui1 ← ㄙㄨㄟ;
+sun }$pTone ↔ ㄙㄨㄣ }$zTone;
+ sun  ㄙㄨㄣ˙;
+ sun1 ← ㄙㄨㄣ;
+sa }$pTone ↔ ㄙㄚ }$zTone;
+ sa  ㄙㄚ˙;
+ sa1 ← ㄙㄚ;
+se }$pTone ↔ ㄙㄜ }$zTone;
+ se  ㄙㄜ˙;
+ se1 ← ㄙㄜ;
+su }$pTone ↔ ㄙㄨ }$zTone;
+ su  ㄙㄨ˙;
+ su1 ← ㄙㄨ;
+si }$pTone ↔ ㄙ }$zTone;
+ si  ㄙ˙;
+ si1 ← ㄙ;
 #
 #--- vowels and vowel compounds ----
 # most exist as syllables by themselves and they are also used as finals for initial consonants
 #
-yuan }$pTone    ↔ ㄩㄢ }$zTone;
- yuan           →  ㄩㄢ˙;
- yuan1          ← ㄩㄢ;
-yong }$pTone    ↔ ㄩㄥ }$zTone;
      yong        →  ㄩㄥ˙;
      yong1       ← ㄩㄥ;
-yue }$pTone     ↔ ㄩㄝ }$zTone;
- yue            →  ㄩㄝ˙;
- yue1           ← ㄩㄝ;
-yun }$pTone     ↔ ㄩㄣ }$zTone;
- yun            →  ㄩㄣ˙;
- yun1           ← ㄩㄣ;
-yu }$pTone      ↔ ㄩ }$zTone;
- yu             →  ㄩ˙;
- yu1            ← ㄩ;
+yuan }$pTone ↔ ㄩㄢ }$zTone;
+ yuan  ㄩㄢ˙;
+ yuan1 ← ㄩㄢ;
+yong }$pTone ↔ ㄩㄥ }$zTone;
yong → ㄩㄥ˙;
yong1 ← ㄩㄥ;
+yue }$pTone ↔ ㄩㄝ }$zTone;
+ yue  ㄩㄝ˙;
+ yue1 ← ㄩㄝ;
+yun }$pTone ↔ ㄩㄣ }$zTone;
+ yun  ㄩㄣ˙;
+ yun1 ← ㄩㄣ;
+yu }$pTone ↔ ㄩ }$zTone;
+ yu  ㄩ˙;
+ yu1 ← ㄩ;
 # iu handled below
 #
-yang }$pTone    ↔ ㄧㄤ }$zTone;
- yang           →  ㄧㄤ˙;
- yang1          ← ㄧㄤ;
-ying }$pTone    ↔ ㄧㄥ }$zTone;
- ying           →  ㄧㄥ˙;
- ying1          ← ㄧㄥ;
-yai }$pTone     ↔ ㄧㄞ }$zTone;            # (not in han-latin)
- yai            →  ㄧㄞ˙;
- yai1           ← ㄧㄞ;
-yao }$pTone     ↔ ㄧㄠ }$zTone;
- yao            →  ㄧㄠ˙;
- yao1           ← ㄧㄠ;
-you }$pTone     ↔ ㄧㄡ }$zTone;
- you            →  ㄧㄡ˙;
- you1           ← ㄧㄡ;
-yan }$pTone     ↔ ㄧㄢ }$zTone;
- yan            →  ㄧㄢ˙;
- yan1           ← ㄧㄢ;
-yin }$pTone     ↔ ㄧㄣ }$zTone;
- yin            →  ㄧㄣ˙;
- yin1           ← ㄧㄣ;
-ya }$pTone      ↔ ㄧㄚ }$zTone;
- ya             →  ㄧㄚ˙;
- ya1            ← ㄧㄚ;
-yo }$pTone      ↔ ㄧㄛ }$zTone;
- yo             →  ㄧㄛ˙;
- yo1            ← ㄧㄛ;
-ye }$pTone      ↔ ㄧㄝ }$zTone;
- ye             →  ㄧㄝ˙;
- ye1            ← ㄧㄝ;
-yi }$pTone      ↔ ㄧ }$zTone;
- yi             →  ㄧ˙;
- yi1            ← ㄧ;
+yang }$pTone ↔ ㄧㄤ }$zTone;
+ yang  ㄧㄤ˙;
+ yang1 ← ㄧㄤ;
+ying }$pTone ↔ ㄧㄥ }$zTone;
+ ying  ㄧㄥ˙;
+ ying1 ← ㄧㄥ;
+yai }$pTone ↔ ㄧㄞ }$zTone; # (not in han-latin)
+ yai  ㄧㄞ˙;
+ yai1 ← ㄧㄞ;
+yao }$pTone ↔ ㄧㄠ }$zTone;
+ yao  ㄧㄠ˙;
+ yao1 ← ㄧㄠ;
+you }$pTone ↔ ㄧㄡ }$zTone;
+ you  ㄧㄡ˙;
+ you1 ← ㄧㄡ;
+yan }$pTone ↔ ㄧㄢ }$zTone;
+ yan  ㄧㄢ˙;
+ yan1 ← ㄧㄢ;
+yin }$pTone ↔ ㄧㄣ }$zTone;
+ yin  ㄧㄣ˙;
+ yin1 ← ㄧㄣ;
+ya }$pTone ↔ ㄧㄚ }$zTone;
+ ya  ㄧㄚ˙;
+ ya1 ← ㄧㄚ;
+yo }$pTone ↔ ㄧㄛ }$zTone;
+ yo  ㄧㄛ˙;
+ yo1 ← ㄧㄛ;
+ye }$pTone ↔ ㄧㄝ }$zTone;
+ ye  ㄧㄝ˙;
+ ye1 ← ㄧㄝ;
+yi }$pTone ↔ ㄧ }$zTone;
+ yi  ㄧ˙;
+ yi1 ← ㄧ;
 # i handled below
 #
-wong }$pTone    ↔ ㄨㄨㄥ }$zTone;
- wong           →  ㄨㄨㄥ˙;
- wong1          ← ㄨㄨㄥ;
-wang }$pTone    ↔ ㄨㄤ }$zTone;
- wang           →  ㄨㄤ˙;
- wang1          ← ㄨㄤ;
-weng }$pTone    ↔ ㄨㄥ }$zTone;
- weng           →  ㄨㄥ˙;
- weng1          ← ㄨㄥ;
-wai }$pTone     ↔ ㄨㄞ }$zTone;
- wai            →  ㄨㄞ˙;
- wai1           ← ㄨㄞ;
-wei }$pTone     ↔ ㄨㄟ }$zTone;
- wei            →  ㄨㄟ˙;
- wei1           ← ㄨㄟ;
-wan }$pTone     ↔ ㄨㄢ }$zTone;
- wan            →  ㄨㄢ˙;
- wan1           ← ㄨㄢ;
-wen }$pTone     ↔ ㄨㄣ }$zTone;
- wen            →  ㄨㄣ˙;
- wen1           ← ㄨㄣ;
-wa }$pTone      ↔ ㄨㄚ }$zTone;
- wa             →  ㄨㄚ˙;
- wa1            ← ㄨㄚ;
-wo }$pTone      ↔ ㄨㄛ }$zTone;
- wo             →  ㄨㄛ˙;
- wo1            ← ㄨㄛ;
-wu }$pTone      ↔ ㄨ }$zTone;
- wu             →  ㄨ˙;
- wu1            ← ㄨ;
+wong }$pTone ↔ ㄨㄨㄥ }$zTone;
+ wong  ㄨㄨㄥ˙;
+ wong1 ← ㄨㄨㄥ;
+wang }$pTone ↔ ㄨㄤ }$zTone;
+ wang  ㄨㄤ˙;
+ wang1 ← ㄨㄤ;
+weng }$pTone ↔ ㄨㄥ }$zTone;
+ weng  ㄨㄥ˙;
+ weng1 ← ㄨㄥ;
+wai }$pTone ↔ ㄨㄞ }$zTone;
+ wai  ㄨㄞ˙;
+ wai1 ← ㄨㄞ;
+wei }$pTone ↔ ㄨㄟ }$zTone;
+ wei  ㄨㄟ˙;
+ wei1 ← ㄨㄟ;
+wan }$pTone ↔ ㄨㄢ }$zTone;
+ wan  ㄨㄢ˙;
+ wan1 ← ㄨㄢ;
+wen }$pTone ↔ ㄨㄣ }$zTone;
+ wen  ㄨㄣ˙;
+ wen1 ← ㄨㄣ;
+wa }$pTone ↔ ㄨㄚ }$zTone;
+ wa  ㄨㄚ˙;
+ wa1 ← ㄨㄚ;
+wo }$pTone ↔ ㄨㄛ }$zTone;
+ wo  ㄨㄛ˙;
+ wo1 ← ㄨㄛ;
+wu }$pTone ↔ ㄨ }$zTone;
+ wu  ㄨ˙;
+ wu1 ← ㄨ;
 # u handled below
 #
-ang }$pTone     ↔ ㄤ }$zTone;
- ang            →  ㄤ˙;
- ang1           ← ㄤ;
-eng }$pTone     ↔ ㄥ }$zTone;
- eng            →  ㄥ˙;
- eng1           ← ㄥ;
-eh }$pTone      ↔ ㄝ }$zTone;               # (not in han-latin)
- eh             →  ㄝ˙;
- eh1            ← ㄝ;
-ea }$pTone      → ㄝ;                               # (not in han-latin) one-way
- ea             →  ㄝ˙;
-ai }$pTone      ↔ ㄞ }$zTone;
- ai             →  ㄞ˙;
- ai1            ← ㄞ;
-ei }$pTone      ↔ ㄟ }$zTone;
- ei             →  ㄟ˙;
- ei1            ← ㄟ;
-ao }$pTone      ↔ ㄠ }$zTone;
- ao             →  ㄠ˙;
- ao1            ← ㄠ;
-au }$pTone      → ㄠ;                               # (not in han-latin) one-way, handle unicode spelling 
- au             →  ㄠ˙;
-ou }$pTone      ↔ ㄡ }$zTone;
- ou             →  ㄡ˙;
- ou1            ← ㄡ;
-an }$pTone      ↔ ㄢ }$zTone;
- an             →  ㄢ˙;
- an1            ← ㄢ;
-en }$pTone      ↔ ㄣ }$zTone;
- en             →  ㄣ˙;
- en1            ← ㄣ;
-er }$pTone      ↔ ㄦ }$zTone;
- er             →  ㄦ˙;
- er1            ← ㄦ;
-a }$pTone       ↔ ㄚ }$zTone;
- a              →  ㄚ˙;
- a1             ← ㄚ;
-o }$pTone       ↔ ㄛ }$zTone;
- o              →  ㄛ˙;
- o1             ← ㄛ;
-e }$pTone       ↔ ㄜ }$zTone;
- e              →  ㄜ˙;
- e1             ← ㄜ;
+ang }$pTone ↔ ㄤ }$zTone;
+ ang  ㄤ˙;
+ ang1 ← ㄤ;
+eng }$pTone ↔ ㄥ }$zTone;
+ eng  ㄥ˙;
+ eng1 ← ㄥ;
+eh }$pTone ↔ ㄝ }$zTone; # (not in han-latin)
+ eh  ㄝ˙;
+ eh1 ← ㄝ;
+ea }$pTone → ㄝ; # (not in han-latin) one-way
+ ea  ㄝ˙;
+ai }$pTone ↔ ㄞ }$zTone;
+ ai  ㄞ˙;
+ ai1 ← ㄞ;
+ei }$pTone ↔ ㄟ }$zTone;
+ ei  ㄟ˙;
+ ei1 ← ㄟ;
+ao }$pTone ↔ ㄠ }$zTone;
+ ao  ㄠ˙;
+ ao1 ← ㄠ;
+au }$pTone → ㄠ; # (not in han-latin) one-way, handle unicode spelling 
+ au  ㄠ˙;
+ou }$pTone ↔ ㄡ }$zTone;
+ ou  ㄡ˙;
+ ou1 ← ㄡ;
+an }$pTone ↔ ㄢ }$zTone;
+ an  ㄢ˙;
+ an1 ← ㄢ;
+en }$pTone ↔ ㄣ }$zTone;
+ en  ㄣ˙;
+ en1 ← ㄣ;
+er }$pTone ↔ ㄦ }$zTone;
+ er  ㄦ˙;
+ er1 ← ㄦ;
+a }$pTone ↔ ㄚ }$zTone;
+ a  ㄚ˙;
+ a1 ← ㄚ;
+o }$pTone ↔ ㄛ }$zTone;
+ o  ㄛ˙;
+ o1 ← ㄛ;
+e }$pTone ↔ ㄜ }$zTone;
+ e  ㄜ˙;
+ e1 ← ㄜ;
 #
 # handle unicode spellings of ㄧ,ㄨ,ㄩ above
-iu }$pTone      → ㄩ;                               # (not in han-latin) one-way, handle unicode spelling
- iu             →  ㄩ˙;
-i }$pTone       → ㄧ;                               # (not in han-latin) one-way, handle unicode spelling
- i              →  ㄧ˙;
-u }$pTone       → ㄨ;                               # (not in han-latin) one-way, handle unicode spelling
- u              →  ㄨ˙;
+iu }$pTone → ㄩ; # (not in han-latin) one-way, handle unicode spelling
+ iu  ㄩ˙;
+i }$pTone → ㄧ; # (not in han-latin) one-way, handle unicode spelling
+ i  ㄧ˙;
+u }$pTone → ㄨ; # (not in han-latin) one-way, handle unicode spelling
+ u  ㄨ˙;
 #
 #--- clusters with a single pinyin consonant that can apear in other clusters ----
 #
-m }$pTone       ↔ ㄇ }$zTone;
- m              →  ㄇ˙;
- m1             ← ㄇ;
+m }$pTone ↔ ㄇ }$zTone;
+ m  ㄇ˙;
+ m1 ← ㄇ;
 #
-n }$pTone       ↔ ㄋ }$zTone;
- n              →  ㄋ˙;
- n1             ← ㄋ;
+n }$pTone ↔ ㄋ }$zTone;
+ n  ㄋ˙;
+ n1 ← ㄋ;
 #
 #--- fallback mappings ----
 #
@@ -1384,9 +1384,9 @@ n }$pTone       ↔ ㄋ }$zTone;
 #-------
 # would be nice to have these, need to work out how;
 # something like the following, but need to avoid conflicts with mappings above:
-# $pCons{ ia }$pTone   ↔ $zCons{ ㄧㄚ }$zTone;     # fallback mapping for unambiguous compound final
-#     $pCons{ ia       →  ㄧㄚ˙;
-#     ia1              ← $zCons{ ㄧㄚ
+# $pCons{ ia }$pTone ↔ $zCons{ ㄧㄚ }$zTone; # fallback mapping for unambiguous compound final
+# $pCons{ ia → ㄧㄚ˙;
+# ia1 ← $zCons{ ㄧㄚ
 #
 # the relevant mappings are:
 # ia ↔ ㄧㄚ
@@ -1408,51 +1408,51 @@ n }$pTone       ↔ ㄋ }$zTone;
 #
 # separate fallback mappings for some initial consonants not handled above
 # none of the mapped consonants handled here can have tones, so this is simple
-b       ↔ ㄅ;
-p       ↔ ㄆ;
-# m     ↔ ㄇ;       # handled above
-f       ↔ ㄈ;
-d       ↔ ㄉ;
-t       ↔ ㄊ;
-# n     ↔ ㄋ;       # handled above
-l       ↔ ㄌ;
-g       ↔ ㄍ;
-k       ↔ ㄎ;
-h       ↔ ㄏ;
-j       ↔ ㄐ;
-q       ↔ ㄑ;
-x       ↔ ㄒ;
-zh      → ㄓ;       # reverse mapping to zhi handled above
-ch      → ㄔ;       # reverse mapping to chi handled above
-sh      → ㄕ;       # reverse mapping to shi handled above
-r       → ㄖ;       # reverse mapping to ri handled above
-z       → ㄗ;       # reverse mapping to zi handled above
-c       → ㄘ;       # reverse mapping to ci handled above
-s       → ㄙ;       # reverse mapping to si handled above
+b ↔ ㄅ;
+p ↔ ㄆ;
+# m ↔ ㄇ; # handled above
+f ↔ ㄈ;
+d ↔ ㄉ;
+t ↔ ㄊ;
+# n ↔ ㄋ; # handled above
+l ↔ ㄌ;
+g ↔ ㄍ;
+k ↔ ㄎ;
+h ↔ ㄏ;
+j ↔ ㄐ;
+q ↔ ㄑ;
+x ↔ ㄒ;
+zh → ㄓ; # reverse mapping to zhi handled above
+ch → ㄔ; # reverse mapping to chi handled above
+sh → ㄕ; # reverse mapping to shi handled above
+r → ㄖ; # reverse mapping to ri handled above
+z → ㄗ; # reverse mapping to zi handled above
+c → ㄘ; # reverse mapping to ci handled above
+s → ㄙ; # reverse mapping to si handled above
 #
 #--- tones (except for the ummarked cases handled above) ----
 #
 # tone 1: pinyin \u0304 or 1 ↔ zhuyin typically unmarked or use ˉ \u02C9
-1 → ;                # map to nothing
-1 ← ˉ       ;       # transform if marked in zhuyin
+1 → ; # map to nothing
+1 ← ˉ ; # transform if marked in zhuyin
 # did the following with rules for each cluster, above
-# 1 ← ;              # map nothing in zhuyin to pinyin mark
+# 1 ← ; # map nothing in zhuyin to pinyin mark
 #
 # tones 2-4 (easy)
-# $pToneOK{ 2 ↔ $zToneOK{ ˊ;        # pinyin \u0301 or 2 ↔ zhuyin \u02CA
-# $pToneOK{ 3 ↔ $zToneOK{ ˇ;        # pinyin \u030C or 3 ↔ zhuyin \u02C7
-# $pToneOK{ 4 ↔ $zToneOK{ ˋ;        # pinyin \u0300 or 4 ↔ zhuyin \u02CB
+# $pToneOK{ 2 ↔ $zToneOK{ ˊ; # pinyin \u0301 or 2 ↔ zhuyin \u02CA
+# $pToneOK{ 3 ↔ $zToneOK{ ˇ; # pinyin \u030C or 3 ↔ zhuyin \u02C7
+# $pToneOK{ 4 ↔ $zToneOK{ ˋ; # pinyin \u0300 or 4 ↔ zhuyin \u02CB
 # actually don't need context:
-2 ↔ ˊ;      # pinyin \u0301 or 2 ↔ zhuyin \u02CA
-3 ↔ ˇ;      # pinyin \u030C or 3 ↔ zhuyin \u02C7
-4 ↔ ˋ;      # pinyin \u0300 or 4 ↔ zhuyin \u02CB
+2 ↔ ˊ; # pinyin \u0301 or 2 ↔ zhuyin \u02CA
+3 ↔ ˇ; # pinyin \u030C or 3 ↔ zhuyin \u02C7
+4 ↔ ˋ; # pinyin \u0300 or 4 ↔ zhuyin \u02CB
 #
 # tone 5 (light): pinyin typically unmarked or use 5 ↔ zhuyin ˙ \u02D9
 ← ˙;      # map to nothing
-5 → ˙;      # transform if marked in pinyin
← ˙; # map to nothing
+5 → ˙; # transform if marked in pinyin
 # did the following with rules for each cluster above
-#  → ˙;     # map nothing in pinyin to zhuyin mark
+# → ˙; # map nothing in pinyin to zhuyin mark
 #
 #--- reverse filter ----
 #
-:: ([[ㄅ-ㄩ][ˉˊˇˋ˙]]);          # reverse filter: only modifies basic Bopomofo and tone marks
+:: ([[ㄅ-ㄩ][ˉˊˇˋ˙]]); # reverse filter: only modifies basic Bopomofo and tone marks
index e8789efb36b146ca3c974e37274e09bf1d18c5d2..53f9c77499943724e729e06247066884b1d6b480 100644 (file)
@@ -186,7 +186,7 @@ $jamoMedial {g} ↔ $Gf;
 $jamoMedial {h} ↔ $Hf;
 $jamoMedial {j} ↔ $Jf;
 $jamoMedial {k} ↔ $Kf;
-$jamoMedial {lb} ↔ $LB;  $jamoMedial {lg} ↔ $LG;
+$jamoMedial {lb} ↔ $LB; $jamoMedial {lg} ↔ $LG;
 $jamoMedial {lh} ↔ $LH;
 $jamoMedial {lm} ↔ $LM;
 $jamoMedial {lp} ↔ $LP;
index dbd32d9d5aa6c7ddbc2783f88bf8c11e579f8325..fa916a43319257b31f41423ee043d37c55a9e04c 100644 (file)
@@ -20,11 +20,11 @@ $wr=\uE00B;
 $wl=\uE00C;
 $wce=\uE00D; # LETTER CANDRA E
 $wse=\uE00E; # LETTER SHORT E
-$we=\uE00F;  # ए LETTER E
+$we=\uE00F; # ए LETTER E
 $wai=\uE010;
 $wco=\uE011; # LETTER CANDRA O
 $wso=\uE012; # LETTER SHORT O
-$wo=\uE013;  # ओ LETTER O
+$wo=\uE013; # ओ LETTER O
 $wau=\uE014;
 $ka=\uE015;
 $kha=\uE016;
@@ -79,13 +79,13 @@ $e=\uE047;
 $ai=\uE048;
 $co=\uE049; # VOWEL SIGN CANDRA O
 $so=\uE04A; # VOWEL SIGN SHORT O
-$o=\uE04B;  # ो
+$o=\uE04B; # ो
 $au=\uE04C;
 $virama=\uE04D;
 $om = \uE050; # OM
-$lm = \uE055;#  Telugu Length Mark
-$ailm=\uE056;#  AI Length Mark
-$aulm=\uE057;#  AU Length Mark
+$lm = \uE055;# Telugu Length Mark
+$ailm=\uE056;# AI Length Mark
+$aulm=\uE057;# AU Length Mark
 $uka=\uE058;
 $ukha=\uE059;
 $ugha=\uE05A;
@@ -100,16 +100,16 @@ $rrh=\uE062;
 $llh=\uE063;
 $danda=\uE064;
 $doubleDanda=\uE065;
-$zero=\uE066;     # DIGIT ZERO
-$one=\uE067;      # DIGIT ONE
-$two=\uE068;      # DIGIT TWO
-$three=\uE069;    # DIGIT THREE
-$four=\uE06A;     # DIGIT FOUR
-$five=\uE06B;     # DIGIT FIVE
-$six=\uE06C;      # DIGIT SIX
-$seven=\uE06D;    # DIGIT SEVEN
-$eight=\uE06E;    # DIGIT EIGHT
-$nine=\uE06F;     # DIGIT NINE
+$zero=\uE066; # DIGIT ZERO
+$one=\uE067; # DIGIT ONE
+$two=\uE068; # DIGIT TWO
+$three=\uE069; # DIGIT THREE
+$four=\uE06A; # DIGIT FOUR
+$five=\uE06B; # DIGIT FIVE
+$six=\uE06C; # DIGIT SIX
+$seven=\uE06D; # DIGIT SEVEN
+$eight=\uE06E; # DIGIT EIGHT
+$nine=\uE06F; # DIGIT NINE
 $dgs=\uE082;
 $ecp0=\uE070;
 $ecp1=\uE071;
@@ -199,18 +199,18 @@ o\u0306→$wco;
 e→$wse;
 ''om→$om;
 o→$wso;
-n}r\u0325           → $na|$virama;
-n}l\u0325           → $na|$virama;
-n}na                → $na|$virama;
-n\u0307}[kg]        → $anusvara;
-n\u0307}n\u0307     → $anusvara;
-n\u0304}[cj]        → $anusvara;
-n\u0304}n\u0303     → $anusvara;
+n}r\u0325 → $na|$virama;
+n}l\u0325 → $na|$virama;
+n}na → $na|$virama;
+n\u0307}[kg] → $anusvara;
+n\u0307}n\u0307 → $anusvara;
+n\u0304}[cj] → $anusvara;
+n\u0304}n\u0303 → $anusvara;
 n\u0323}[tdn]\u0323 → $anusvara;
-n}[tdn]             → $anusvara;
-m}[pbm]             → $anusvara;
-n}[ylvshr]          → $anusvara;
-m\u0307             → $anusvara;
+n}[tdn] → $anusvara;
+m}[pbm] → $anusvara;
+n}[ylvshr] → $anusvara;
+m\u0307 → $anusvara;
 q→$uka|$virama;
 k\u0331h\u0331→$ukha |$virama;
 g\u0307→ $ugha | $virama;
index 86fbb12938d32da7e9f749ec2d5422e55b71a78f..8a44d31b2aedb9303d6caf69d4f6a998eb57494c 100644 (file)
@@ -10,7 +10,7 @@
 :: [[ᄀ-ᄒᄚᄡ\u1160-ᅵᆪᆬ-ᆭᆰ-ᆵ←-↓│■○\u3000-。「-」\u3099-\u309Aァ-ロワヲ-ヴヷヺ-ー!-~¢-₩][',.A-Za-z~À-ÖØ-öø-ďĒ-ĥĨ-İĴ-ķĹ-ľŃ-ňŌ-őŔ-ťŨ-žƠ-ơƯ-ưǍ-ǜǞ-ǣǦ-ǭǰǴ-ǵǸ-țȞ-ȟȦ-ȳ\u0304Ӣ-ӣӮ-ӯḀ-ẙẠ-ỹᾱᾹῑῙῡῩK-Å]] ;
 :: [:Latin:] fullwidth-halfwidth ();
 :: NFD (NFC);
-:: Lower ();    # whenever transliterating from cased to uncased script, include this
+:: Lower (); # whenever transliterating from cased to uncased script, include this
 $vowel = [aeiou] ;
 $consonant = [bcdfghjklmnpqrstvwxyz] ;
 $macron = \u0304 ;
@@ -30,7 +30,7 @@ $r_start = [ラリルレロらりるれろ] ;
 $w_start = [ワヰヱヲわゐゑを] ;
 $v_start = [ワヰヱヲ]\u3099 ;
 $voweled_basekana = [ァ-オカキクケコサシスセソタチッツテトナ-ノハヒフヘホマ-ヲヵヶ] ;
-$n_quoter  =  [ア イ ウ エ オ ナ ニ ヌ ネ ノ ヤ ユ ヨ ン] ;
+$n_quoter = [ア イ ウ エ オ ナ ニ ヌ ネ ノ ヤ ユ ヨ ン] ;
 $small_y = [ャィュェョ] ;
 $iteration = ゝ ;
 '.' ↔ 。;
@@ -68,7 +68,7 @@ dju ← チ\u3099ュ ;
 dje ← チ\u3099ェ ;
 djo ← チ\u3099ョ ;
 dji ↔ チ\u3099 ;
-dj  } $vowel → チ\u3099 | '~y' ;
+dj } $vowel → チ\u3099 | '~y' ;
 cha ← チャ ;
 chi'~i' ← チィ ; # liu
 chu ← チュ ;
@@ -78,7 +78,7 @@ chi ↔ チ ;
 ch } $vowel → チ | '~y' ;
 e ↔ エ ;
 g | '~' ← キ\u3099} $small_y ;
-gy  } $vowel → キ\u3099 | '~y' ;
+gy } $vowel → キ\u3099 | '~y' ;
 ga ↔ カ\u3099 ;
 gi ↔ キ\u3099 ;
 gu ↔ ク\u3099 ;
@@ -92,14 +92,14 @@ je ↔ シ\u3099ェ ;
 jo ↔ シ\u3099ョ ;
 ji ↔ シ\u3099 ;
 k | '~' ← キ} $small_y ;
-ky  } $vowel → キ | '~y' ;
+ky } $vowel → キ | '~y' ;
 ka ↔ カ ;
 ki ↔ キ ;
 ku ↔ ク ;
 ke ↔ ケ ;
 ko ↔ コ ;
 m | '~' ← ミ} $small_y ;
-my  } $vowel → ミ | '~y' ;
+my } $vowel → ミ | '~y' ;
 ma ↔ マ ;
 mi ↔ ミ ;
 mu ↔ ム ;
@@ -107,7 +107,7 @@ me ↔ メ ;
 mo ↔ モ ;
 m } [pbfv] → ン ;
 n | '~' ← ニ } $small_y ;
-ny  } $vowel → ニ | '~y' ;
+ny } $vowel → ニ | '~y' ;
 na ↔ ナ ;
 ni ↔ ニ ;
 nu ↔ ヌ ;
@@ -115,14 +115,14 @@ ne ↔ ネ ;
 no ↔ ノ ;
 o ↔ オ ;
 p | '~' ← ヒ\u309A } $small_y ;
-py  } $vowel → ヒ\u309A | '~y' ;
+py } $vowel → ヒ\u309A | '~y' ;
 pa ↔ ハ\u309A ;
 pi ↔ ヒ\u309A ;
 pu ↔ フ\u309A ;
 pe ↔ ヘ\u309A ;
 po ↔ ホ\u309A ;
 h | '~' ← ヒ } $small_y ;
-hy  } $vowel → ヒ | '~y' ;
+hy } $vowel → ヒ | '~y' ;
 ha ↔ ハ ;
 hi ↔ ヒ ;
 hu ↔ ヘゥ ;
@@ -134,7 +134,7 @@ fe ↔ フェ ;
 fo ↔ フォ ;
 fu ↔ フ ;
 r | '~' ← リ } $small_y ;
-ry  } $vowel → リ | '~y' ;
+ry } $vowel → リ | '~y' ;
 ra ↔ ラ ;
 ri ↔ リ ;
 ru ↔ ル ;
@@ -192,7 +192,7 @@ f } f ↔ ッ } $f_start ;
 r } r ↔ ッ } $r_start ;
 t } t ↔ ッ } $t_start ;
 s } s ↔ ッ } $s_start ;
-w } w  ↔ ッ } $w_start;
+w } w ↔ ッ } $w_start;
 y } y ↔ ッ } $y_start;
 x } x → ッ ;
 c } k → ッ ;
@@ -257,7 +257,7 @@ y → イ ;
 z → ス\u3099 ;
 v → ウ\u3099 ;
 f → フ;
-j  → シ\u3099;
+j → シ\u3099;
 w → ウ;
 ß → | ss ;
 æ → | e ;
index ae2e7894fe1db817c4f21ff60b187b9e3e0d9597..1bbd7c7ba063d40d4a438bdaf20decacd41cc68f 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГДЃЕЖЗЅИЈКЛЉМНЊОПРСТЌУФХЦЧЏШабвгдѓежзѕијклљмнњопрстќуфхцчџш’] ;
 :: NFD (NFC) ;
-$prime  = ’ ;
+$prime = ’ ;
 $upperConsonants = [БВГДЃЖЗЅЈКЛЉМНЊПРСТЌФХЦЧЏШ] ;
 $lowerConsonants = [бвгдѓжзѕјклљмнњпрстќфхцчџш’] ;
 $consonants = [$upperConsonants $lowerConsonants] ;
@@ -17,7 +17,7 @@ $upperVowels = [АЕИОУ] ;
 $lowerVowels = [аеиоу] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index 2a9d0aa0a67680ece89a2052881a0a9ee32c4239..eca74ef165a4a6848f2bb859342a8adf543c9042 100644 (file)
@@ -7,78 +7,78 @@
 # File: Malayalam_InterIndic.txt
 # Generated from CLDR 
 #
-ം→\uE002;      # SIGN ANUSVARA
-ഃ→\uE003;      # SIGN VISARGA
-അ→\uE005;      # LETTER A
-ആ→\uE006;      # LETTER AA
-ഇ→\uE007;      # LETTER I
-ഈ→\uE008;      # LETTER II
-ഉ→\uE009;      # LETTER U
-ഊ→\uE00A;      # LETTER UU
-ഋ→\uE00B;      # LETTER VOCALIC R
-ഌ→\uE00C;      # LETTER VOCALIC L
-എ→\uE00E;      # LETTER E
-ഏ→\uE00F;      # LETTER EE
-ഐ→\uE010;      # LETTER AI
-ഒ→\uE012;      # LETTER O
-ഓ→\uE013;      # LETTER OO
-ഔ→\uE014;      # LETTER AU
-ക→\uE015;      # LETTER KA
-ഖ→\uE016;      # LETTER KHA
-ഗ→\uE017;      # LETTER GA
-ഘ→\uE018;      # LETTER GHA
-ങ→\uE019;      # LETTER NGA
-ച→\uE01A;      # LETTER CA
-ഛ→\uE01B;      # LETTER CHA
-ജ→\uE01C;      # LETTER JA
-ഝ→\uE01D;      # LETTER JHA
-ഞ→\uE01E;      # LETTER NYA
-ട→\uE01F;      # LETTER TTA
-ഠ→\uE020;      # LETTER TTHA
-ഡ→\uE021;      # LETTER DDA
-ഢ→\uE022;      # LETTER DDHA
-ണ→\uE023;      # LETTER NNA
-ത→\uE024;      # LETTER TA
-ഥ→\uE025;      # LETTER THA
-ദ→\uE026;      # LETTER DA
-ധ→\uE027;      # LETTER DHA
-ന→\uE028;      # LETTER NA
-പ→\uE02A;      # LETTER PA
-ഫ→\uE02B;      # LETTER PHA
-ബ→\uE02C;      # LETTER BA
-ഭ→\uE02D;      # LETTER BHA
-മ→\uE02E;      # LETTER MA
-യ→\uE02F;      # LETTER YA
-ര→\uE030;      # LETTER RA
-റ→\uE031;      # LETTER RRA
-ല→\uE032;      # LETTER LA
-ള→\uE033;      # LETTER LLA
-ഴ→\uE034;      # LETTER LLLA
-വ→\uE035;      # LETTER VA
-ശ→\uE036;      # LETTER SHA
-ഷ→\uE037;      # LETTER SSA
-സ→\uE038;      # LETTER SA
-ഹ→\uE039;      # LETTER HA
-ാ→\uE03E;      # VOWEL SIGN AA
-ി→\uE03F;      # VOWEL SIGN I
-ീ→\uE040;      # VOWEL SIGN II
-\u0D41→\uE041;      # VOWEL SIGN U
-\u0D42→\uE042;      # VOWEL SIGN UU
-\u0D43→\uE043;      # VOWEL SIGN VOCALIC R
-െ→\uE046;      # VOWEL SIGN E
-േ→\uE047;      # VOWEL SIGN EE
-ൈ→\uE048;      # VOWEL SIGN AI
-\u0D4D→\uE04D;      # SIGN VIRAMA
-ൗ→\uE057;      # AU LENGTH MARK
-ൠ→\uE060;      # LETTER VOCALIC RR
-ൡ→\uE061;      # LETTER VOCALIC LL
-൦→\uE066;      # DIGIT ZERO
-൧→\uE067;      # DIGIT ONE
-൨→\uE068;      # DIGIT TWO
-൩→\uE069;      # DIGIT THREE
-൪→\uE06A;      # DIGIT FOUR
-൫→\uE06B;      # DIGIT FIVE
-൬→\uE06C;      # DIGIT SIX
-൭→\uE06D;      # DIGIT SEVEN
-൮→\uE06E;      # DIGIT EIGHT
-൯→\uE06F;      # DIGIT NINE
+ം→\uE002; # SIGN ANUSVARA
+ഃ→\uE003; # SIGN VISARGA
+അ→\uE005; # LETTER A
+ആ→\uE006; # LETTER AA
+ഇ→\uE007; # LETTER I
+ഈ→\uE008; # LETTER II
+ഉ→\uE009; # LETTER U
+ഊ→\uE00A; # LETTER UU
+ഋ→\uE00B; # LETTER VOCALIC R
+ഌ→\uE00C; # LETTER VOCALIC L
+എ→\uE00E; # LETTER E
+ഏ→\uE00F; # LETTER EE
+ഐ→\uE010; # LETTER AI
+ഒ→\uE012; # LETTER O
+ഓ→\uE013; # LETTER OO
+ഔ→\uE014; # LETTER AU
+ക→\uE015; # LETTER KA
+ഖ→\uE016; # LETTER KHA
+ഗ→\uE017; # LETTER GA
+ഘ→\uE018; # LETTER GHA
+ങ→\uE019; # LETTER NGA
+ച→\uE01A; # LETTER CA
+ഛ→\uE01B; # LETTER CHA
+ജ→\uE01C; # LETTER JA
+ഝ→\uE01D; # LETTER JHA
+ഞ→\uE01E; # LETTER NYA
+ട→\uE01F; # LETTER TTA
+ഠ→\uE020; # LETTER TTHA
+ഡ→\uE021; # LETTER DDA
+ഢ→\uE022; # LETTER DDHA
+ണ→\uE023; # LETTER NNA
+ത→\uE024; # LETTER TA
+ഥ→\uE025; # LETTER THA
+ദ→\uE026; # LETTER DA
+ധ→\uE027; # LETTER DHA
+ന→\uE028; # LETTER NA
+പ→\uE02A; # LETTER PA
+ഫ→\uE02B; # LETTER PHA
+ബ→\uE02C; # LETTER BA
+ഭ→\uE02D; # LETTER BHA
+മ→\uE02E; # LETTER MA
+യ→\uE02F; # LETTER YA
+ര→\uE030; # LETTER RA
+റ→\uE031; # LETTER RRA
+ല→\uE032; # LETTER LA
+ള→\uE033; # LETTER LLA
+ഴ→\uE034; # LETTER LLLA
+വ→\uE035; # LETTER VA
+ശ→\uE036; # LETTER SHA
+ഷ→\uE037; # LETTER SSA
+സ→\uE038; # LETTER SA
+ഹ→\uE039; # LETTER HA
+ാ→\uE03E; # VOWEL SIGN AA
+ി→\uE03F; # VOWEL SIGN I
+ീ→\uE040; # VOWEL SIGN II
+\u0D41→\uE041; # VOWEL SIGN U
+\u0D42→\uE042; # VOWEL SIGN UU
+\u0D43→\uE043; # VOWEL SIGN VOCALIC R
+െ→\uE046; # VOWEL SIGN E
+േ→\uE047; # VOWEL SIGN EE
+ൈ→\uE048; # VOWEL SIGN AI
+\u0D4D→\uE04D; # SIGN VIRAMA
+ൗ→\uE057; # AU LENGTH MARK
+ൠ→\uE060; # LETTER VOCALIC RR
+ൡ→\uE061; # LETTER VOCALIC LL
+൦→\uE066; # DIGIT ZERO
+൧→\uE067; # DIGIT ONE
+൨→\uE068; # DIGIT TWO
+൩→\uE069; # DIGIT THREE
+൪→\uE06A; # DIGIT FOUR
+൫→\uE06B; # DIGIT FIVE
+൬→\uE06C; # DIGIT SIX
+൭→\uE06D; # DIGIT SEVEN
+൮→\uE06E; # DIGIT EIGHT
+൯→\uE06F; # DIGIT NINE
index 095f2aaefe683d3c7930ab2aca1a5408a22a1958..090d0b9bfb60b0b79bb7191308ca9b93f785938b 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГДЕЁЖЗИЙКЛМНОӨПРСТУҮФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмноөпрстуүфхцчшщъыьэюя] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $upperConsonants = [БВГДЖЙКЛМНПРСТФХЦЧШЩЭ] ;
 $lowerConsonants = [бвгджйклмнпрстфхцчшщэ] ;
 $consonants = [$upperConsonants $lowerConsonants] ;
@@ -17,7 +17,7 @@ $upperVowels = [АЕЁЭИОУЫЮЯ] ;
 $lowerVowels = [аеёэиоуыюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index 4b36910afd46876a699c20968e12322280d16608..7215482b96acf2ddb248e77f5a2ec021291d2eda 100644 (file)
 େ\u0B56→\uE048;# VOWEL SIGN AI
 ୋ→\uE04B;# VOWEL SIGN O
 ୌ→\uE04C;# VOWEL SIGN AU
-\u0B01→\uE001;      # SIGN CANDRABINDU
-ଂ→\uE002;      # SIGN ANUSVARA
-ଃ→\uE003;      # SIGN VISARGA
-ଅ→\uE005;      # LETTER A
-ଆ→\uE006;      # LETTER AA
-ଇ→\uE007;      # LETTER I
-ଈ→\uE008;      # LETTER II
-ଉ→\uE009;      # LETTER U
-ଊ→\uE00A;      # LETTER UU
-ଋ→\uE00B;      # LETTER VOCALIC R
-ଌ→\uE00C;      # LETTER VOCALIC L
-ଏ→\uE00F;      # LETTER E
-ଐ→\uE010;      # LETTER AI
-ଓ→\uE013;      # LETTER O
-ଔ→\uE014;      # LETTER AU
-କ→\uE015;      # LETTER KA
-ଖ→\uE016;      # LETTER KHA
-ଗ→\uE017;      # LETTER GA
-ଘ→\uE018;      # LETTER GHA
-ଙ→\uE019;      # LETTER NGA
-ଚ→\uE01A;      # LETTER CA
-ଛ→\uE01B;      # LETTER CHA
-ଜ→\uE01C;      # LETTER JA
-ଝ→\uE01D;      # LETTER JHA
-ଞ→\uE01E;      # LETTER NYA
-ଟ→\uE01F;      # LETTER TTA
-ଠ→\uE020;      # LETTER TTHA
-ଡ→\uE021;      # LETTER DDA
-ଢ→\uE022;      # LETTER DDHA
-ଣ→\uE023;      # LETTER NNA
-ତ→\uE024;      # LETTER TA
-ଥ→\uE025;      # LETTER THA
-ଦ→\uE026;      # LETTER DA
-ଧ→\uE027;      # LETTER DHA
-ନ→\uE028;      # LETTER NA
-ପ→\uE02A;      # LETTER PA
-ଫ→\uE02B;      # LETTER PHA
-ବ→\uE02C;      # LETTER BA
-ଭ→\uE02D;      # LETTER BHA
-ମ→\uE02E;      # LETTER MA
-ଯ→\uE02F;      # LETTER YA
-ର→\uE030;      # LETTER RA
-ଲ→\uE032;      # LETTER LA
-ଳ→\uE033;      # LETTER LLA
-ଵ→\uE035;      # LETTER VA
-ଶ→\uE036;      # LETTER SHA
-ଷ→\uE037;      # LETTER SSA
-ସ→\uE038;      # LETTER SA
-ହ→\uE039;      # LETTER HA
-\u0B3C→\uE03C;      # SIGN NUKTA
-ଽ→\uE03D;      # SIGN AVAGRAHA
-ା→\uE03E;      # VOWEL SIGN AA
-\u0B3F→\uE03F;      # VOWEL SIGN I
-ୀ→\uE040;      # VOWEL SIGN II
-\u0B41→\uE041;      # VOWEL SIGN U
-\u0B42→\uE042;      # VOWEL SIGN UU
-\u0B43→\uE043;      # VOWEL SIGN VOCALIC R
-େ→\uE047;      # VOWEL SIGN E
-\u0B4D→\uE04D;      # SIGN VIRAMA
-\u0B56→\uE056;      # AI LENGTH MARK
-ୗ→\uE057;      # AU LENGTH MARK
-।→\uE064;      # DANDA
-॥→\uE065;      # DOUBLE DANDA
-ୟ→\uE05F;      # LETTER YYA
-ୠ→\uE060;      # LETTER VOCALIC RR
-ୡ→\uE061;      # LETTER VOCALIC LL
-୦→\uE066;      # DIGIT ZERO
-୧→\uE067;      # DIGIT ONE
-୨→\uE068;      # DIGIT TWO
-୩→\uE069;      # DIGIT THREE
-୪→\uE06A;      # DIGIT FOUR
-୫→\uE06B;      # DIGIT FIVE
-୬→\uE06C;      # DIGIT SIX
-୭→\uE06D;      # DIGIT SEVEN
-୮→\uE06E;      # DIGIT EIGHT
-୯→\uE06F;      # DIGIT NINE
-୰→\uE07B;      # ISSHAR
-ୱ→\uE081;      # LETTER WA
+\u0B01→\uE001; # SIGN CANDRABINDU
+ଂ→\uE002; # SIGN ANUSVARA
+ଃ→\uE003; # SIGN VISARGA
+ଅ→\uE005; # LETTER A
+ଆ→\uE006; # LETTER AA
+ଇ→\uE007; # LETTER I
+ଈ→\uE008; # LETTER II
+ଉ→\uE009; # LETTER U
+ଊ→\uE00A; # LETTER UU
+ଋ→\uE00B; # LETTER VOCALIC R
+ଌ→\uE00C; # LETTER VOCALIC L
+ଏ→\uE00F; # LETTER E
+ଐ→\uE010; # LETTER AI
+ଓ→\uE013; # LETTER O
+ଔ→\uE014; # LETTER AU
+କ→\uE015; # LETTER KA
+ଖ→\uE016; # LETTER KHA
+ଗ→\uE017; # LETTER GA
+ଘ→\uE018; # LETTER GHA
+ଙ→\uE019; # LETTER NGA
+ଚ→\uE01A; # LETTER CA
+ଛ→\uE01B; # LETTER CHA
+ଜ→\uE01C; # LETTER JA
+ଝ→\uE01D; # LETTER JHA
+ଞ→\uE01E; # LETTER NYA
+ଟ→\uE01F; # LETTER TTA
+ଠ→\uE020; # LETTER TTHA
+ଡ→\uE021; # LETTER DDA
+ଢ→\uE022; # LETTER DDHA
+ଣ→\uE023; # LETTER NNA
+ତ→\uE024; # LETTER TA
+ଥ→\uE025; # LETTER THA
+ଦ→\uE026; # LETTER DA
+ଧ→\uE027; # LETTER DHA
+ନ→\uE028; # LETTER NA
+ପ→\uE02A; # LETTER PA
+ଫ→\uE02B; # LETTER PHA
+ବ→\uE02C; # LETTER BA
+ଭ→\uE02D; # LETTER BHA
+ମ→\uE02E; # LETTER MA
+ଯ→\uE02F; # LETTER YA
+ର→\uE030; # LETTER RA
+ଲ→\uE032; # LETTER LA
+ଳ→\uE033; # LETTER LLA
+ଵ→\uE035; # LETTER VA
+ଶ→\uE036; # LETTER SHA
+ଷ→\uE037; # LETTER SSA
+ସ→\uE038; # LETTER SA
+ହ→\uE039; # LETTER HA
+\u0B3C→\uE03C; # SIGN NUKTA
+ଽ→\uE03D; # SIGN AVAGRAHA
+ା→\uE03E; # VOWEL SIGN AA
+\u0B3F→\uE03F; # VOWEL SIGN I
+ୀ→\uE040; # VOWEL SIGN II
+\u0B41→\uE041; # VOWEL SIGN U
+\u0B42→\uE042; # VOWEL SIGN UU
+\u0B43→\uE043; # VOWEL SIGN VOCALIC R
+େ→\uE047; # VOWEL SIGN E
+\u0B4D→\uE04D; # SIGN VIRAMA
+\u0B56→\uE056; # AI LENGTH MARK
+ୗ→\uE057; # AU LENGTH MARK
+।→\uE064; # DANDA
+॥→\uE065; # DOUBLE DANDA
+ୟ→\uE05F; # LETTER YYA
+ୠ→\uE060; # LETTER VOCALIC RR
+ୡ→\uE061; # LETTER VOCALIC LL
+୦→\uE066; # DIGIT ZERO
+୧→\uE067; # DIGIT ONE
+୨→\uE068; # DIGIT TWO
+୩→\uE069; # DIGIT THREE
+୪→\uE06A; # DIGIT FOUR
+୫→\uE06B; # DIGIT FIVE
+୬→\uE06C; # DIGIT SIX
+୭→\uE06D; # DIGIT SEVEN
+୮→\uE06E; # DIGIT EIGHT
+୯→\uE06F; # DIGIT NINE
+୰→\uE07B; # ISSHAR
+ୱ→\uE081; # LETTER WA
index 92004c3895807faa0627eeab24c83efe61e4b1c3..e8ca87b3432afaa22013ef44ece5993028030c74 100644 (file)
@@ -11,8 +11,8 @@
 :: NFD (NFC) ;
 $alef = ’;
 $ayin = ‘;
-$disambig =  \u0331 ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$disambig = \u0331 ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 [:Nd:]{٫}[:Nd:] ↔ [:Nd:]{','}[:Nd:] ; # ARABIC DECIMAL SEPARATOR
 [:Nd:]{٬}[:Nd:] ↔ [:Nd:]{'.'}[:Nd:] ; # ARABIC THOUSANDS SEPARATOR
 ٫ ↔ ',' $disambig ; # ARABIC DECIMAL SEPARATOR
@@ -86,9 +86,9 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 و\u0651 → ww ; # ARABIC LETTER WAW + SHADDA
 \u0651ی → yy ; # ARABIC LETTER FARSI YEH + SHADDA
 ى\u0651 → yy ; # ARABIC LETTER YEH + SHADDA
-$wordBoundary{ء →  ; # ARABIC LETTER HAMZA
+$wordBoundary{ء → ; # ARABIC LETTER HAMZA
 ء → $alef ; # ARABIC LETTER HAMZA
-$wordBoundary{ا →  ; # ARABIC LETTER ALEF
+$wordBoundary{ا → ; # ARABIC LETTER ALEF
 آ → $alef ā ; # ARABIC LETTER ALEF WITH MADDA ABOVE
 ب → b ; # ARABIC LETTER BEH
 پ → p ; # ARABIC LETTER PEH
@@ -149,4 +149,4 @@ $wordBoundary{ا →  ; # ARABIC LETTER ALEF
 \u064Fوی → ūy ; # ARABIC DAMMA + WAW + FARSI YEH
 \u064Fو → ū ; # ARABIC DAMMA + WAW
 \u064F → u ; # ARABIC DAMMA
-\u0652 →  ; # ARABIC SUKUN
+\u0652 → ; # ARABIC SUKUN
index 304c47140261dc8607cd8be742df7333a7a96ed1..e136c9814dcdc5424dc477d356fdb412e110fe2c 100644 (file)
@@ -11,8 +11,8 @@
 :: NFKD (NFC) ;
 $alef = ’;
 $ayin = ‘;
-$disambig =  \u0331 ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$disambig = \u0331 ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 [:Nd:]{٫}[:Nd:] ↔ [:Nd:]{','}[:Nd:] ; # ARABIC DECIMAL SEPARATOR
 [:Nd:]{٬}[:Nd:] ↔ [:Nd:]{'.'}[:Nd:] ; # ARABIC THOUSANDS SEPARATOR
 ٫ ↔ ',' $disambig ; # ARABIC DECIMAL SEPARATOR
@@ -75,9 +75,9 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 ه\u0651 → hh ; # ARABIC LETTER HEH + SHADDA
 و\u0651 → ww ; # ARABIC LETTER WAW + SHADDA
 ی\u0651 → yy ; # ARABIC LETTER FARSI YEH + SHADDA
-$wordBoundary{ء →  ; # ARABIC LETTER HAMZA
+$wordBoundary{ء → ; # ARABIC LETTER HAMZA
 ء → $alef ; # ARABIC LETTER HAMZA
-$wordBoundary{ا →  ; # ARABIC LETTER ALEF
+$wordBoundary{ا → ; # ARABIC LETTER ALEF
 آ → $alef ā ; # ARABIC FATHA ALEF WITH MADDA ABOVE
 ب → b ; # ARABIC LETTER BEH
 پ → p ; # ARABIC LETTER PEH
@@ -120,5 +120,5 @@ $wordBoundary{ا →  ; # ARABIC LETTER ALEF
 \u0650 → e ; # ARABIC KASRA
 \u064Fو → ū ; # ARABIC DAMMA + WAW
 \u064F → o ; # ARABIC DAMMA
-\u0652 →  ; # ARABIC SUKUN
+\u0652 → ; # ARABIC SUKUN
 ::NFC (NFD) ;
index 4ba4bd0d24cc2e9741c8d454871b348ee2e1705d..8c4ab28f4b25bbb37d00b30f68c0a2c256b9d6db 100644 (file)
@@ -9,9 +9,9 @@
 #
 :: [АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмнопрстуфхцчшщъыьэюя] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 $upperConsonants = [БВГДЖЙКЛМНПРСТФХЦЧШЩЭ] ;
 $lowerConsonants = [бвгджйклмнпрстфхцчшщэ] ;
 $consonants = [$upperConsonants $lowerConsonants] ;
@@ -34,17 +34,17 @@ $upperVowels[Ыы] → Y ;
 Е}[$upperVowels [ЙЪЬ]] → YE ; # CYRILLIC CAPITAL LETTER IE
 Е}[$lowerVowels [йъь]] → Ye ; # CYRILLIC CAPITAL LETTER IE
 $wordBoundary{Е → Ye ; # CYRILLIC CAPITAL LETTER IE
-Е →  E ; # CYRILLIC CAPITAL LETTER IE
+Е → E ; # CYRILLIC CAPITAL LETTER IE
 е}[$upperVowels $lowerVowels [ЙйЪъЬь]] → ye ; # CYRILLIC SMALL LETTER IE
 $wordBoundary{е → ye ; # CYRILLIC SMALL LETTER IE
-е →  e ; # CYRILLIC SMALL LETTER IE
+е → e ; # CYRILLIC SMALL LETTER IE
 Ё}[$upperVowels [ЙЪЬ]] → YË ; # CYRILLIC CAPITAL LETTER IO
 Ё}[$lowerVowels [йъь]] → Yë ; # CYRILLIC CAPITAL LETTER IO
 $wordBoundary{Ё → YË ; # CYRILLIC CAPITAL LETTER IO
-Ё →  Ë ; # CYRILLIC CAPITAL LETTER IO
+Ё → Ë ; # CYRILLIC CAPITAL LETTER IO
 ё}[$upperVowels $lowerVowels [ЙйЪъЬь]] → yë ; # CYRILLIC SMALL LETTER IO
 $wordBoundary{ё → yë ; # CYRILLIC SMALL LETTER IO
-ё →  ë ; # CYRILLIC SMALL LETTER IO
+ё → ë ; # CYRILLIC SMALL LETTER IO
 Ж} $lower → Zh ; # CYRILLIC CAPITAL LETTER ZHE
 Ж → ZH ; # CYRILLIC CAPITAL LETTER ZHE
 ж → zh ; # CYRILLIC SMALL LETTER ZHE
index cca9e9f4dbb22e030e994c012bdc8f01e9d95815..e31e1fe8f9e41112f0724ce98a3559e079e751a0 100644 (file)
@@ -16,7 +16,7 @@ $upperVowels = [АЕИОУ] ;
 $lowerVowels = [аеиоу] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index 104153f1781845ac3eea0f9ff95f4d8af60a259a..65bf6534b39eac75169f437ef511fb06195f0bd6 100644 (file)
@@ -2161,7 +2161,7 @@ $SCDigit { 出 } 戏 → 齣;
 京沈↔京瀋;
 辽沈↔遼瀋;
 沈←瀋;
-墨渖未干↔墨瀋未乾;    # 瀋 meaning liquid
+墨渖未干↔墨瀋未乾; # 瀋 meaning liquid
 渖→瀋;
 石沉大海↔石沈大海; # 沈 meaning sink
 鱼沉雁杳↔魚沈雁杳;
index 932cbcc9371a2c3e158fdb3096c752a0faee02c7..1b94ff7d3775ca079527ecf6424eb70eeff52b4f 100644 (file)
@@ -11,7 +11,7 @@
 ܞ → yh;
 ܖ ↔ dr;
 ܐ ↔ ʾ;
-\u0711  → ʾ;
+\u0711 → ʾ;
 ܒ ↔ b;
 ܓ ↔ g;
 ܔ → g;
index 69497bb66745a1558ed13bf0adeb124fe6a2232a..217e1423ee4593fd839ff6397c4a1fed963f6914 100644 (file)
 ோ→\uE04B;# VOWEL SIGN OO
 ௌ→\uE04C;# VOWEL SIGN AU
 ஔ→\uE014;# LETTER AU
-\u0B82→\uE002;      # SIGN ANUSVARA
-ஃ→\uE003;      # SIGN VISARGA
-அ→\uE005;      # LETTER A
-ஆ→\uE006;      # LETTER AA
-இ→\uE007;      # LETTER I
-ஈ→\uE008;      # LETTER II
-உ→\uE009;      # LETTER U
-ஊ→\uE00A;      # LETTER UU
-எ→\uE00E;      # LETTER E
-ஏ→\uE00F;      # LETTER EE
-ஐ→\uE010;      # LETTER AI
-ஒ→\uE012;      # LETTER O
-ஓ→\uE013;      # LETTER OO
-ஔ→\uE014;    # LETTER AU
-க→\uE015;      # LETTER KA
-ங→\uE019;      # LETTER NGA
-ச→\uE01A;      # LETTER CA
-ஜ→\uE01C;      # LETTER JA
-ஞ→\uE01E;      # LETTER NYA
-ட→\uE01F;      # LETTER TTA
-ண→\uE023;      # LETTER NNA
-த→\uE024;      # LETTER TA
-ந→\uE028;      # LETTER NA
-ன→\uE029;      # LETTER NNNA
-ப→\uE02A;      # LETTER PA
-ம→\uE02E;      # LETTER MA
-ய→\uE02F;      # LETTER YA
-ர→\uE030;      # LETTER RA
-ற→\uE031;      # LETTER RRA
-ல→\uE032;      # LETTER LA
-ள→\uE033;      # LETTER LLA
-ழ→\uE034;      # LETTER LLLA
-வ→\uE035;      # LETTER VA
-ஶ→\uE036;      # LETTER SHA
-ஷ→\uE037;      # LETTER SSA
-ஸ→\uE038;      # LETTER SA
-ஹ→\uE039;      # LETTER HA
-ா→\uE03E;      # VOWEL SIGN AA
-ி→\uE03F;      # VOWEL SIGN I
-\u0BC0→\uE040;      # VOWEL SIGN II
-ு→\uE041;      # VOWEL SIGN U
-ூ→\uE042;      # VOWEL SIGN UU
-ெ→\uE046;      # VOWEL SIGN E
-ே→\uE047;      # VOWEL SIGN EE
-ை→\uE048;      # VOWEL SIGN AI
-\u0BCD→\uE04D;      # SIGN VIRAMA
-ௗ→\uE057;      # AU LENGTH MARK
-௧→\uE067;      # DIGIT ONE
-௨→\uE068;      # DIGIT TWO
-௩→\uE069;      # DIGIT THREE
-௪→\uE06A;      # DIGIT FOUR
-௫→\uE06B;      # DIGIT FIVE
-௬→\uE06C;      # DIGIT SIX
-௭→\uE06D;      # DIGIT SEVEN
-௮→\uE06E;      # DIGIT EIGHT
-௯→\uE06F;      # DIGIT NINE
-௰→\uE067\uE066;          # UNMAPPED Tamil-InterIndic: NUMBER TEN
-௱→\uE067\uE066\uE066;     # UNMAPPED Tamil-InterIndic: NUMBER ONE HUNDRED
+\u0B82→\uE002; # SIGN ANUSVARA
+ஃ→\uE003; # SIGN VISARGA
+அ→\uE005; # LETTER A
+ஆ→\uE006; # LETTER AA
+இ→\uE007; # LETTER I
+ஈ→\uE008; # LETTER II
+உ→\uE009; # LETTER U
+ஊ→\uE00A; # LETTER UU
+எ→\uE00E; # LETTER E
+ஏ→\uE00F; # LETTER EE
+ஐ→\uE010; # LETTER AI
+ஒ→\uE012; # LETTER O
+ஓ→\uE013; # LETTER OO
+ஔ→\uE014; # LETTER AU
+க→\uE015; # LETTER KA
+ங→\uE019; # LETTER NGA
+ச→\uE01A; # LETTER CA
+ஜ→\uE01C; # LETTER JA
+ஞ→\uE01E; # LETTER NYA
+ட→\uE01F; # LETTER TTA
+ண→\uE023; # LETTER NNA
+த→\uE024; # LETTER TA
+ந→\uE028; # LETTER NA
+ன→\uE029; # LETTER NNNA
+ப→\uE02A; # LETTER PA
+ம→\uE02E; # LETTER MA
+ய→\uE02F; # LETTER YA
+ர→\uE030; # LETTER RA
+ற→\uE031; # LETTER RRA
+ல→\uE032; # LETTER LA
+ள→\uE033; # LETTER LLA
+ழ→\uE034; # LETTER LLLA
+வ→\uE035; # LETTER VA
+ஶ→\uE036; # LETTER SHA
+ஷ→\uE037; # LETTER SSA
+ஸ→\uE038; # LETTER SA
+ஹ→\uE039; # LETTER HA
+ா→\uE03E; # VOWEL SIGN AA
+ி→\uE03F; # VOWEL SIGN I
+\u0BC0→\uE040; # VOWEL SIGN II
+ு→\uE041; # VOWEL SIGN U
+ூ→\uE042; # VOWEL SIGN UU
+ெ→\uE046; # VOWEL SIGN E
+ே→\uE047; # VOWEL SIGN EE
+ை→\uE048; # VOWEL SIGN AI
+\u0BCD→\uE04D; # SIGN VIRAMA
+ௗ→\uE057; # AU LENGTH MARK
+௧→\uE067; # DIGIT ONE
+௨→\uE068; # DIGIT TWO
+௩→\uE069; # DIGIT THREE
+௪→\uE06A; # DIGIT FOUR
+௫→\uE06B; # DIGIT FIVE
+௬→\uE06C; # DIGIT SIX
+௭→\uE06D; # DIGIT SEVEN
+௮→\uE06E; # DIGIT EIGHT
+௯→\uE06F; # DIGIT NINE
+௰→\uE067\uE066; # UNMAPPED Tamil-InterIndic: NUMBER TEN
+௱→\uE067\uE066\uE066; # UNMAPPED Tamil-InterIndic: NUMBER ONE HUNDRED
 ௲→\uE067\uE066\uE066\uE066;# UNMAPPED Tamil-InterIndic: NUMBER ONE THOUSAND
 \u0BE6→\uE066;
index ce6c372d82803a04f11fa294ef3d5cb24e5e5f32..a9b2ecaddb4ee33c855d615d8f44abaa18188382 100644 (file)
@@ -9,82 +9,82 @@
 #
 \u0C46\u0C4D\u0C56→\uE048\uE04D;
 \u0C46\u0C56→\uE048;# VOWEL SIGN AI
-ఁ→\uE001;      # SIGN CANDRABINDU
-ం→\uE002;      # SIGN ANUSVARA
-ః→\uE003;      # SIGN VISARGA
-అ→\uE005;      # LETTER A
-ఆ→\uE006;      # LETTER AA
-ఇ→\uE007;      # LETTER I
-ఈ→\uE008;      # LETTER II
-ఉ→\uE009;      # LETTER U
-ఊ→\uE00A;      # LETTER UU
-ఋ→\uE00B;      # LETTER VOCALIC R
-ఌ→\uE00C;      # LETTER VOCALIC L
-ఎ→\uE00E;      # LETTER E
-ఏ→\uE00F;      # LETTER EE
-ఐ→\uE010;      # LETTER AI
-ఒ→\uE012;      # LETTER O
-ఓ→\uE013;      # LETTER OO
-ఔ→\uE014;      # LETTER AU
-క→\uE015;      # LETTER KA
-ఖ→\uE016;      # LETTER KHA
-గ→\uE017;      # LETTER GA
-ఘ→\uE018;      # LETTER GHA
-ఙ→\uE019;      # LETTER NGA
-చ→\uE01A;      # LETTER CA
-ఛ→\uE01B;      # LETTER CHA
-జ→\uE01C;      # LETTER JA
-ఝ→\uE01D;      # LETTER JHA
-ఞ→\uE01E;      # LETTER NYA
-ట→\uE01F;      # LETTER TTA
-ఠ→\uE020;      # LETTER TTHA
-డ→\uE021;      # LETTER DDA
-ఢ→\uE022;      # LETTER DDHA
-ణ→\uE023;      # LETTER NNA
-త→\uE024;      # LETTER TA
-థ→\uE025;      # LETTER THA
-ద→\uE026;      # LETTER DA
-ధ→\uE027;      # LETTER DHA
-న→\uE028;      # LETTER NA
-ప→\uE02A;      # LETTER PA
-ఫ→\uE02B;      # LETTER PHA
-బ→\uE02C;      # LETTER BA
-భ→\uE02D;      # LETTER BHA
-మ→\uE02E;      # LETTER MA
-య→\uE02F;      # LETTER YA
-ర→\uE030;      # LETTER RA
-ఱ→\uE031;      # LETTER RRA
-ల→\uE032;      # LETTER LA
-ళ→\uE033;      # LETTER LLA
-వ→\uE035;      # LETTER VA
-శ→\uE036;      # LETTER SHA
-ష→\uE037;      # LETTER SSA
-స→\uE038;      # LETTER SA
-హ→\uE039;      # LETTER HA
-\u0C3E→\uE03E;      # VOWEL SIGN AA
-\u0C3F→\uE03F;      # VOWEL SIGN I
-\u0C40→\uE040;      # VOWEL SIGN II
-ు→\uE041;      # VOWEL SIGN U
-ూ→\uE042;      # VOWEL SIGN UU
-ృ→\uE043;      # VOWEL SIGN VOCALIC R
-ౄ→\uE044;      # VOWEL SIGN VOCALIC RR
-\u0C46→\uE046;      # VOWEL SIGN E
-\u0C47→\uE047;      # VOWEL SIGN EE
-\u0C4A→\uE04A;      # VOWEL SIGN O
-\u0C4B→\uE04B;      # VOWEL SIGN OO
-\u0C4C→\uE04C;      # VOWEL SIGN AU
-\u0C4D→\uE04D;      # SIGN VIRAMA
-\u0C55→\uE055;      # LENGTH MARK
-\u0C56→\uE056;      # AI LENGTH MARK
-ౠ→\uE060;      # LETTER VOCALIC RR
-ౡ→\uE061;      # LETTER VOCALIC LL
-౦→\uE066;      # DIGIT ZERO
-౧→\uE067;      # DIGIT ONE
-౨→\uE068;      # DIGIT TWO
-౩→\uE069;      # DIGIT THREE
-౪→\uE06A;      # DIGIT FOUR
-౫→\uE06B;      # DIGIT FIVE
-౬→\uE06C;      # DIGIT SIX
-౭→\uE06D;      # DIGIT SEVEN
-౮→\uE06E;      # DIGIT EIGHT
-౯→\uE06F;      # DIGIT NINE
+ఁ→\uE001; # SIGN CANDRABINDU
+ం→\uE002; # SIGN ANUSVARA
+ః→\uE003; # SIGN VISARGA
+అ→\uE005; # LETTER A
+ఆ→\uE006; # LETTER AA
+ఇ→\uE007; # LETTER I
+ఈ→\uE008; # LETTER II
+ఉ→\uE009; # LETTER U
+ఊ→\uE00A; # LETTER UU
+ఋ→\uE00B; # LETTER VOCALIC R
+ఌ→\uE00C; # LETTER VOCALIC L
+ఎ→\uE00E; # LETTER E
+ఏ→\uE00F; # LETTER EE
+ఐ→\uE010; # LETTER AI
+ఒ→\uE012; # LETTER O
+ఓ→\uE013; # LETTER OO
+ఔ→\uE014; # LETTER AU
+క→\uE015; # LETTER KA
+ఖ→\uE016; # LETTER KHA
+గ→\uE017; # LETTER GA
+ఘ→\uE018; # LETTER GHA
+ఙ→\uE019; # LETTER NGA
+చ→\uE01A; # LETTER CA
+ఛ→\uE01B; # LETTER CHA
+జ→\uE01C; # LETTER JA
+ఝ→\uE01D; # LETTER JHA
+ఞ→\uE01E; # LETTER NYA
+ట→\uE01F; # LETTER TTA
+ఠ→\uE020; # LETTER TTHA
+డ→\uE021; # LETTER DDA
+ఢ→\uE022; # LETTER DDHA
+ణ→\uE023; # LETTER NNA
+త→\uE024; # LETTER TA
+థ→\uE025; # LETTER THA
+ద→\uE026; # LETTER DA
+ధ→\uE027; # LETTER DHA
+న→\uE028; # LETTER NA
+ప→\uE02A; # LETTER PA
+ఫ→\uE02B; # LETTER PHA
+బ→\uE02C; # LETTER BA
+భ→\uE02D; # LETTER BHA
+మ→\uE02E; # LETTER MA
+య→\uE02F; # LETTER YA
+ర→\uE030; # LETTER RA
+ఱ→\uE031; # LETTER RRA
+ల→\uE032; # LETTER LA
+ళ→\uE033; # LETTER LLA
+వ→\uE035; # LETTER VA
+శ→\uE036; # LETTER SHA
+ష→\uE037; # LETTER SSA
+స→\uE038; # LETTER SA
+హ→\uE039; # LETTER HA
+\u0C3E→\uE03E; # VOWEL SIGN AA
+\u0C3F→\uE03F; # VOWEL SIGN I
+\u0C40→\uE040; # VOWEL SIGN II
+ు→\uE041; # VOWEL SIGN U
+ూ→\uE042; # VOWEL SIGN UU
+ృ→\uE043; # VOWEL SIGN VOCALIC R
+ౄ→\uE044; # VOWEL SIGN VOCALIC RR
+\u0C46→\uE046; # VOWEL SIGN E
+\u0C47→\uE047; # VOWEL SIGN EE
+\u0C4A→\uE04A; # VOWEL SIGN O
+\u0C4B→\uE04B; # VOWEL SIGN OO
+\u0C4C→\uE04C; # VOWEL SIGN AU
+\u0C4D→\uE04D; # SIGN VIRAMA
+\u0C55→\uE055; # LENGTH MARK
+\u0C56→\uE056; # AI LENGTH MARK
+ౠ→\uE060; # LETTER VOCALIC RR
+ౡ→\uE061; # LETTER VOCALIC LL
+౦→\uE066; # DIGIT ZERO
+౧→\uE067; # DIGIT ONE
+౨→\uE068; # DIGIT TWO
+౩→\uE069; # DIGIT THREE
+౪→\uE06A; # DIGIT FOUR
+౫→\uE06B; # DIGIT FIVE
+౬→\uE06C; # DIGIT SIX
+౭→\uE06D; # DIGIT SEVEN
+౮→\uE06E; # DIGIT EIGHT
+౯→\uE06F; # DIGIT NINE
index 48ebd1f1f64b95d985eddc160fb7f28038721d20..4bf52d45d1e0a69910451269217792530d302ca7 100644 (file)
@@ -9,12 +9,12 @@
 #
 $notAbove = [^\p{ccc=0}\p{ccc=above}] ;
 $notBelow = [^\p{ccc=0}\p{ccc=below}] ;
-$freeStandingBelow = [\u0325  ];
-$hAccent =  [   \u0304     \u0323];
+$freeStandingBelow = [\u0325 ];
+$hAccent = [ \u0304 \u0323];
 $notHAccent0 = [^$freeStandingBelow$hAccent];
 $notHAccent1 = $freeStandingBelow [^$hAccent];
 ห → h\u0304 ; # THAI CHARACTER HO HIP
-ห | $1 ← h ($notAbove*)    \u0304; # backward case, account for reordering
+ห | $1 ← h ($notAbove*) \u0304; # backward case, account for reordering
 ฮ ↔ h\u0323 ; # THAI CHARACTER HO NOKHUK
 ข ↔ k\u0304h ; # THAI CHARACTER KHO KHAI
 ฃ ↔ k\u0323\u0304h ; # THAI CHARACTER KHO KHUAT
@@ -45,12 +45,12 @@ $notHAccent1 = $freeStandingBelow [^$hAccent];
 ง ↔ ng ; # THAI CHARACTER NGO NGU
 ณ ↔ n\u0323 ; # THAI CHARACTER NO NEN
 น ↔ n ; # THAI CHARACTER NO NU
-ญ ↔ y\u0323  ; # THAI CHARACTER YO YING
+ญ ↔ y\u0323 ; # THAI CHARACTER YO YING
 ฎ ↔ d\u0323 ; # THAI CHARACTER DO CHADA
 ด ↔ d ; # THAI CHARACTER DO DEK
 บ ↔ b ; # THAI CHARACTER BO BAIMAI
 ฝ ↔ f\u0304 ; # THAI CHARACTER FO FA
-ฝ | $1 ← f ($notAbove*)    \u0304; # backward case, account for reordering
+ฝ | $1 ← f ($notAbove*) \u0304; # backward case, account for reordering
 ม ↔ m ; # THAI CHARACTER MO MA
 ย ↔ y ; # THAI CHARACTER YO YAK
 ร ↔ r ; # THAI CHARACTER RO RUA
@@ -58,10 +58,10 @@ $notHAccent1 = $freeStandingBelow [^$hAccent];
 ฦ ↔ ł ; # THAI CHARACTER LU
 ว ↔ w ; # THAI CHARACTER WO WAEN
 ศ ↔ s\u0323\u0304 ; # THAI CHARACTER SO SALA***
-ศ | $1 ← s    \u0323 ($notAbove*)    \u0304; # backward case, account for reordering
+ศ | $1 ← s \u0323 ($notAbove*) \u0304; # backward case, account for reordering
 ษ ↔ s\u0304ʹ ; # THAI CHARACTER SO RUSI
 ส → s\u0304 ; # THAI CHARACTER SO SUA***
-ส | $1 ← s ($notAbove*)    \u0304; # backward case, account for reordering
+ส | $1 ← s ($notAbove*) \u0304; # backward case, account for reordering
 ฬ ↔ l\u0323 ; # THAI CHARACTER LO CHULA
 ล ↔ l ; # THAI CHARACTER LO LING
 ฟ ↔ f ; # THAI CHARACTER FO FAN
@@ -69,17 +69,17 @@ $notHAccent1 = $freeStandingBelow [^$hAccent];
 ซ ↔ s ; # THAI CHARACTER SO SO
 \u0E31 ↔ a\u0323 ; # THAI CHARACTER MAI HAN-AKAT
 า → a\u0304 ; # THAI CHARACTER SARA AA
-า | $1 ← a ($notAbove*)    \u0304; # backward case, account for reordering
-ำ → a  \u0309; # THAI CHARACTER SARA AM
-ำ | $1 ← a ($notAbove*)  \u0309 ; # backward case, account for reordering
+า | $1 ← a ($notAbove*) \u0304; # backward case, account for reordering
+ำ → a \u0309; # THAI CHARACTER SARA AM
+ำ | $1 ← a ($notAbove*) \u0309 ; # backward case, account for reordering
 ะ ↔ a ; # THAI CHARACTER SARA A
 \u0E35 ↔ i\u0304 ; # THAI CHARACTER SARA II
-\u0E35 | $1 ← i ($notAbove*)    \u0304  ; # backward case, account for reordering
+\u0E35 | $1 ← i ($notAbove*) \u0304 ; # backward case, account for reordering
 \u0E37 ↔ u\u0323\u0304 ; # THAI CHARACTER SARA UEE
-\u0E37 | $1 ← u   \u0323 ($notAbove*)    \u0304  ; # backward case, account for reordering
+\u0E37 | $1 ← u \u0323 ($notAbove*) \u0304 ; # backward case, account for reordering
 \u0E36 ↔ u\u0323 ; # THAI CHARACTER SARA UE
 \u0E39 ↔ u\u0304 ; # THAI CHARACTER SARA UU
-\u0E39 | $1 ← u  ($notAbove*)    \u0304  ; # backward case, account for reordering
+\u0E39 | $1 ← u ($notAbove*) \u0304 ; # backward case, account for reordering
 \u0E38 ↔ u ; # THAI CHARACTER SARA U
 ฯ ↔ ‡ ; # THAI CHARACTER PAIYANNOI
 เ ↔ e ; # THAI CHARACTER SARA E
@@ -95,7 +95,7 @@ $notHAccent1 = $freeStandingBelow [^$hAccent];
 \u0E4B ↔ \u030C ; # THAI CHARACTER MAI CHATTAWA
 \u0E4C ↔ \u0312 ; # THAI CHARACTER THANTHAKHAT
 \u0E4E ↔ '~' ; # THAI CHARACTER YAMAKKAN
-\u0E4D ↔  \u030A ; # THAI CHARACTER NIKHAHIT
+\u0E4D ↔ \u030A ; # THAI CHARACTER NIKHAHIT
 ๏ ↔ '§' ; # THAI CHARACTER FONGMAN
 ๐ ↔ 0 ; # THAI DIGIT ZERO
 ๑ ↔ 1 ; # THAI DIGIT ONE
index 7dc0b25f92d409bfa88381f444c934907da48c36..088e55016a8a55ffe4812cb150b16528bd64032b 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $thai = [[:thai:] ก-\u0E3Aเ-๛] ;
-' '  ← $thai { '; '  } $thai;
+' ' ← $thai { '; ' } $thai;
 ← $thai { ' ' } $thai;
 $thai_reversing = [[:Logical_Order_Exception:] & $thai];
 $thai_non_reversing = [$thai - $thai_reversing ];
index e9f7626817a903b8084c7abc38dadbdb0e127896..221056de02b3fdc6131cf441b09de6ce452305a2 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГДЖҖЗЙКЛМНҢПРСТФХЦЧШЩЪЬ] ;
 $lowerConsonants = [бвгджҗзйклмнңпрстфхцчшщъь] ;
@@ -17,7 +17,7 @@ $upperVowels = [АЕЁИОӨУҮЫЭӘЮЯ] ;
 $lowerVowels = [аеёиоөуүыэәюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
@@ -31,10 +31,10 @@ $wordBoundary =  [^[:L:][:M:][:N:]] ;
 Е}[[$upperVowels - [Ә]] [ЙЪЬ]] → YE ; # CYRILLIC CAPITAL LETTER IE
 Е}[[$lowerVowels - [ә]] [йъь]] → Ye ; # CYRILLIC CAPITAL LETTER IE
 $wordBoundary{Е → Ye ; # CYRILLIC CAPITAL LETTER IE
-Е →  E ; # CYRILLIC CAPITAL LETTER IE
+Е → E ; # CYRILLIC CAPITAL LETTER IE
 е}[[$upperVowels - [Ә]] [$lowerVowels - [ә]] [ЙйЪъЬь]] → ye ; # CYRILLIC SMALL LETTER IE
 $wordBoundary{е → ye ; # CYRILLIC SMALL LETTER IE
-е →  e ; # CYRILLIC SMALL LETTER IE
+е → e ; # CYRILLIC SMALL LETTER IE
 Ё} $lower → Yo ; # CYRILLIC CAPITAL LETTER IO
 Ё → YO ; # CYRILLIC CAPITAL LETTER IO
 ё → yo ; # CYRILLIC SMALL LETTER IO
index a75a10a6bc066f2770ddef2f20724df82a759741..89f5b94df258e42ffb1e0fe0dc835ac22f72aaee 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЮЯЬабвгґдеєжзиіїйклмнопрстуфхцчшщюяь’] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГҐДЖЗЙКЛМНПРСТФХЦЧШЩЬ] ;
 $lowerConsonants = [бвгґджзйклмнпрстфхцчшщь’] ;
@@ -18,7 +18,7 @@ $upperVowels = [АЕЄИІЇОУЮЯ] ;
 $lowerVowels = [аеєиіїоуюя] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 А → A ; # CYRILLIC CAPITAL LETTER A
 а → a ; # CYRILLIC SMALL LETTER A
 Б → B ; # CYRILLIC CAPITAL LETTER BE
index f1fea3a38bc6beedbdfeb6a85630ea64eaa80fd4..04c340fd0e3b081c2eb786245b41c673682e47f2 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: [АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЪЬЭЮЯЎҚҒҲабвгдеёжзийклмнопрстуфхцчшъьэюяўқғҳ] ;
 :: NFD (NFC) ;
-$prime  = ʹ ;
+$prime = ʹ ;
 $doublePrime = ʺ ;
 $upperConsonants = [БВГДЖЗЙКЛМНПРСТФХЦЧШЪЬҚҒҲ] ;
 $lowerConsonants = [бвгджзйклмнпрстфхцчшъьқғҳ] ;
@@ -18,7 +18,7 @@ $upperVowels = [АЕЁИОУЭЮЯЎ] ;
 $lowerVowels = [аеёиоуэюяў] ;
 $vowels = [$upperVowels $lowerVowels] ;
 $lower = [$lowerConsonants $lowerVowels] ;
-$wordBoundary =  [^[:L:][:M:][:N:]] ;
+$wordBoundary = [^[:L:][:M:][:N:]] ;
 $lowerVowels ы → y ;
 $upperVowels[Ыы] → Y ;
 А → A ; # CYRILLIC CAPITAL LETTER A
@@ -37,10 +37,10 @@ $upperVowels[Ыы] → Y ;
 Е}[$upperVowels [ЙЬ]] → YE ; # CYRILLIC CAPITAL LETTER IE
 Е}[$lowerVowels [йь]] → Ye ; # CYRILLIC CAPITAL LETTER IE
 $wordBoundary{Е → Ye ; # CYRILLIC CAPITAL LETTER IE
-Е →  E ; # CYRILLIC CAPITAL LETTER IE
+Е → E ; # CYRILLIC CAPITAL LETTER IE
 е}[$upperVowels $lowerVowels [ЙйЬь]] → ye ; # CYRILLIC SMALL LETTER IE
 $wordBoundary{е → ye ; # CYRILLIC SMALL LETTER IE
-е →  e ; # CYRILLIC SMALL LETTER IE
+е → e ; # CYRILLIC SMALL LETTER IE
 Ё} $lower → Yo ; # CYRILLIC CAPITAL LETTER IO
 Ё → YO ; # CYRILLIC CAPITAL LETTER IO
 ё → yo ; # CYRILLIC SMALL LETTER IO
index 170aa737e45cc4a12c8a30e5bf10ae910329567c..0d8d83ba985d6fd9c6cab69d68cce42b74ec65c1 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $word_boundary = [-\ $] ;
-$vowel = [aeiouw] ;       # Vowels and glides
+$vowel = [aeiouw] ; # Vowels and glides
 $not_vowel = [^$vowel] ;
 d\u0361ʒ → | ʒ ;
 d\u0361z → | z ;
index 4b044ad53a2e5ba7db3381cfb5998052b4053cd6..09ce181f692cf26114cebc9749e2d02fd1d08900 100644 (file)
 $vowel = [aeɛiɪoux];
 $start = [\u0020$];
 $end = [\u0020$];
-b } $end   → peu ;
+b } $end → peu ;
 b } $vowel → b ;
-bj } $vowel → b ;  # objɛc → obeti
-b          → beu ;
-c } $end   → ti ;
-c          → t ;
-d\u0361z         → deuj ;
-d } $end   → teu ;
+bj } $vowel → b ; # objɛc → obeti
+b → beu ;
+c } $end → ti ;
+c → t ;
+d\u0361z → deuj ;
+d } $end → teu ;
 d } $vowel → d ;
-d          → deu ;
-ɛ          → e ;
+d → deu ;
+ɛ → e ;
 f } $vowel → p ;
-f          → peu ;
+f → peu ;
 ɡ } $vowel → g ;
-ɡ          → geu ;
+ɡ → geu ;
 ɦ } $vowel → h ;
-ɦ          → heu ;
+ɦ → heu ;
 h } $vowel → h ;
-h          → heu ;
-i          → i ;
-ɪ          → i ;
-j } $end   → i ;  # pokoj → pokoi
-j          → y ;
-kvu        → keub ;  # kvuasɪ → keubasi
-ks } $end  → gseu ;  # ksɛroks → jelogseu
-$start { ks → j ;  # ksɛroks → jelogseu
-ks         → gs ;  # saksofoːn → sagsopon
+h → heu ;
+i → i ;
+ɪ → i ;
+j } $end → i ; # pokoj → pokoi
+j → y ;
+kvu → keub ; # kvuasɪ → keubasi
+ks } $end → gseu ; # ksɛroks → jelogseu
+$start { ks → j ; # ksɛroks → jelogseu
+ks → gs ; # saksofoːn → sagsopon
 k } $vowel → k ;
-k          → keu ;
+k → keu ;
 $vowel { l } $vowel → ll ;
-lz         → lj ;
-m } $end   → m ;
+lz → lj ;
+m } $end → m ;
 m } $vowel → m ;
-m } [l]    → m ;
-m          → meu ;
-ɲ          → n ;
-ŋ          → n ;
+m } [l] → m ;
+m → meu ;
+ɲ → n ;
+ŋ → n ;
 p } $vowel → p ;
-p } t      → b ;  # koroptɛv
-p          → peu ;
-r\u031D } $end   → leusi ; # kour\u031D → kouleusi
+p } t → b ; # koroptɛv
+p → peu ;
+r\u031D } $end → leusi ; # kour\u031D → kouleusi
 r\u031D } $vowel → leuj ;
-r\u031D } k      → leusyu ;  # ɦor\u031Dkiː → holeusyuki
-r\u031D          → leuju ;
+r\u031D } k → leusyu ; # ɦor\u031Dkiː → holeusyuki
+r\u031D → leuju ;
 r } $vowel → l ;
-r          → leu ;
+r → leu ;
 s } $vowel → s ;
-s          → seu ;
-ʃ } $end   → si ;
+s → seu ;
+ʃ } $end → si ;
 ʃ } $vowel → sy ;
-ʃ          → syu ;
+ʃ → syu ;
 t\u0361s} $vowel → ch ;
-t\u0361s         → cheu ;
+t\u0361s → cheu ;
 t\u0361ʃ} $vowel → ch ;
-t\u0361ʃ         → chi ;
+t\u0361ʃ → chi ;
 t } $vowel → t ;
-t          → teu ;
-vj         → b ;    # ʒvjɛr\u031Dɪna → jubeleujina
-v } $end   → peu ;
+t → teu ;
+vj → b ; # ʒvjɛr\u031Dɪna → jubeleujina
+v } $end → peu ;
 v } $vowel → b ;
-v          → beu ;
+v → beu ;
 x } $vowel → h ;
-x          → heu ;
+x → heu ;
 ɣ } $vowel → h ;
-ɣ          → heu ;
-z } $vowel → j ;    # zaːmɛk → jamekeu
-z } $end   → seu ;  # ɦmɪz → heumiseu
-z          → jeu ;  # pozdniː → pojeudeuni
-ʒ } $vowel → j ;    # ʒɪʒka → jisyuka (first ʒ)
-ʒ } v      → ju ;   # ʒvjɛr\u031Dɪna → jubeleujina
-ʒ } $end   → si ;   # broʒ → beulosi
-ʒ          → syu ;  # ʒɪʒka → jisyuka (second ʒ)
+ɣ → heu ;
+z } $vowel → j ; # zaːmɛk → jamekeu
+z } $end → seu ; # ɦmɪz → heumiseu
+z → jeu ; # pozdniː → pojeudeuni
+ʒ } $vowel → j ; # ʒɪʒka → jisyuka (first ʒ)
+ʒ } v → ju ; # ʒvjɛr\u031Dɪna → jubeleujina
+ʒ } $end → si ; # broʒ → beulosi
+ʒ → syu ; # ʒɪʒka → jisyuka (second ʒ)
 ɟ } $vowel → dy ;
-ɟ          → ti ;
-ː          → ;
-\u0020     → ;  # space
+ɟ → ti ;
+ː → ;
+\u0020 → ; # space
 :: Latin-Hangul ();
index 24fea422d5a14d5a7cc20e76421585800df76b5c..b5aaa5de89c45d7a419d3c0e7e7aa820dce3fbb0 100644 (file)
@@ -15,13 +15,13 @@ dě → ɟɛ ;
 mě → mɲɛ ;
 tě → cɛ ;
 ně → ɲɛ ;
-dž → d \u0361 ʒ;  # affricate indicated by ligature tie
-dz → d \u0361 z;  # affricate indicated by ligature tie
+dž → d \u0361 ʒ; # affricate indicated by ligature tie
+dz → d \u0361 z; # affricate indicated by ligature tie
 a → a ;
 á → aː ;
 b → b ;
-c → t \u0361 s;  # affricate indicated by ligature tie
-č → t \u0361 ʃ;  # affricate indicated by ligature tie
+c → t \u0361 s; # affricate indicated by ligature tie
+č → t \u0361 ʃ; # affricate indicated by ligature tie
 d → d ;
 ď → ɟ ;
 e → ɛ ;
index b31e9531fc3ab40a90a8e171ac964356bc5cfa54..4c2751f7f82b2c372d839f3f8e0aaf8c29866a4b 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $word_boundary = [-\ $] ;
-$vowel = [aeijouw] ;       # Vowels and glides
+$vowel = [aeijouw] ; # Vowels and glides
 $not_vowel = [^$vowel] ;
 β → | b;
 ð → | d;
index fc6cd9eea6cad98689089111562c0dd9ba15c744..c99b5648bc2c2dc1808db71b4568ad5214080654 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $word_boundary = [-\ $];
-$vowel = [aeijouw];       # Vowels and glides
+$vowel = [aeijouw]; # Vowels and glides
 $not_vowel = [^$vowel];
 ð → | d;
 ɣ → | g;
@@ -29,18 +29,18 @@ uu → u ;
 [^dgktx] { ei\u032F → e ;
 [^-\ .$] { eu\u032F → eu ;
 [^-\ .$] { ou\u032F → o;
-[^j]     { ui → wi ;
-[^$word_boundary] { m } [bp] → n;  # GB/T 17693.5-2009, 5.3.2
-s[θs] → s;               # GB/T 17693.5-2009, 5.3.4
-[^ʧ] { jo → io;          # GB/T 17693.5-2009 表 1, 注 7
+[^j] { ui → wi ;
+[^$word_boundary] { m } [bp] → n; # GB/T 17693.5-2009, 5.3.2
+s[θs] → s; # GB/T 17693.5-2009, 5.3.4
+[^ʧ] { jo → io; # GB/T 17693.5-2009 表 1, 注 7
 ::Null;
-j } an $not_vowel → i ;  # GB/T 17693.5-2009 表 1, 注 8
+j } an $not_vowel → i ; # GB/T 17693.5-2009 表 1, 注 8
 [g.$] { wai\u032F → wai ;
 wai\u032F → uai\u032F ;
 [g.$] { wau\u032F → wau ;
 wau\u032F → uau\u032F ;
 jau\u032F → iau\u032F ;
-[^jw] { ao } [^n]     → au\u032F ;
+[^jw] { ao } [^n] → au\u032F ;
 [^jw] { ao } n $vowel → au\u032F ;
 ::Null;
 '.' → ;
@@ -66,9 +66,9 @@ bun } $not_vowel → 本 ;
 bu → 布 ;
 bwan } $not_vowel → 布安 ;
 bwa → 布阿 ;
-bwen } $not_vowel → 布恩 ;  # Should be be 本, per GB/T 17693.5-2009 表 1.
+bwen } $not_vowel → 布恩 ; # Should be be 本, per GB/T 17693.5-2009 表 1.
 bwe → 布埃 ;
-bwin } $not_vowel → 布因 ;  # Nonstandard, but fits observed data.
+bwin } $not_vowel → 布因 ; # Nonstandard, but fits observed data.
 bwi → 布伊 ;
 bwo → 博 ;
 b → 布 ;
@@ -164,7 +164,7 @@ gon } $not_vowel → 贡 ;
 go → 戈 ;
 gun } $not_vowel → 贡 ;
 gu → 古 ;
-gwan } [$] → 古安 ;        # Nonstandard, but fits observed data.
+gwan } [$] → 古安 ; # Nonstandard, but fits observed data.
 gwan } $not_vowel → 关 ;
 gwa → 瓜 ;
 gwen } $not_vowel → 古恩 ;
@@ -280,7 +280,7 @@ mwan } $not_vowel → 穆安 ;
 mwa → 穆阿 ;
 mwen } $not_vowel → 门 ;
 mwe → 穆埃 ;
-mwin } $not_vowel → 穆因 ;  # Nonstandard, but fits observed data.
+mwin } $not_vowel → 穆因 ; # Nonstandard, but fits observed data.
 mwi → 穆伊 ;
 mwo → 莫 ;
 m → 姆 ;
@@ -421,7 +421,7 @@ tsu → 楚 ;
 ts → 茨 ;
 tun } $not_vowel → 通 ;
 tu → 图 ;
-twan } $not_vowel → 图安   ;
+twan } $not_vowel → 图安 ;
 twa → 图阿 ;
 twen } $not_vowel → 通 ;
 twe → 图埃 ;
@@ -444,7 +444,7 @@ t → 特 ;
 ʧju → 丘 ;
 ʧon } $not_vowel → 琼 ;
 ʧo → 乔 ;
-ʧun } $not_vowel → 琼 ;  # Should be 春, per GB/T 17693.5-2009 表 1.
+ʧun } $not_vowel → 琼 ; # Should be 春, per GB/T 17693.5-2009 表 1.
 ʧu → 丘 ;
 ʧwan } $not_vowel → 丘安 ;
 ʧwa → 丘阿 ;
@@ -461,7 +461,7 @@ wen } $not_vowel → 温 ;
 we → 韦 ;
 win } $not_vowel → 温 ;
 wi → 维 ;
-won } $not_vowel → 翁 ;  # Unseen.
+won } $not_vowel → 翁 ; # Unseen.
 wo → 沃 ;
 xai\u032F → 海 ;
 xan } $not_vowel → 汉 ;
index 2413ecaa821ec50b20e624792798255da1c8173a..d18c6125d0741bfbc62794a7eb27f5015e11f907 100644 (file)
@@ -7,36 +7,36 @@
 # File: es_es_FONIPA.txt
 # Generated from CLDR 
 #
-$bow = [-\ $] ;  # Beginning of word.
+$bow = [-\ $] ; # Beginning of word.
 $consonant = [bβdðfgɣʝklʎmnŋɲθprɾstʧx] ;
-$syll = '.' ;    # Syllable boundary.
+$syll = '.' ; # Syllable boundary.
 ::NFC;
 ::Lower;
-$bow { ct → | t ;  # ctónico (?)
-$bow { cz → | z ;  # czar
-$bow { gn → | n ;  # gnomo
-$bow { mn → | n ;  # mnemotécnico
-$bow { ps → | s ;  # psicología
-$bow { pt → | t ;  # pterodáctilo
-$bow { x  → | s ;  # xilófono
-$bow       { i                 → i ;
-$consonant { i } [ aáeé  oóuú] → j ;
-[aeo]      { i } [^aáeé  oóuú] → i\u032F ;
-i } [ aáeé  oóuú] → ʝ ;
-i                 → i ;
-[aeo]      { y } [^aáeéiíoóuú] → i\u032F ;
+$bow { ct → | t ; # ctónico (?)
+$bow { cz → | z ; # czar
+$bow { gn → | n ; # gnomo
+$bow { mn → | n ; # mnemotécnico
+$bow { ps → | s ; # psicología
+$bow { pt → | t ; # pterodáctilo
+$bow { x → | s ; # xilófono
+$bow { i → i ;
+$consonant { i } [ aáeé oóuú] → j ;
+[aeo] { i } [^aáeé oóuú] → i\u032F ;
+i } [ aáeé oóuú] → ʝ ;
+i → i ;
+[aeo] { y } [^aáeéiíoóuú] → i\u032F ;
 y } [ aáeéiíoóuú] → ʝ ;
-y                 → i ;
-[aeo]      { u } [^aáeéiíoó  ] → u\u032F ;
-u } [ aáeéiíoó  ] → w ;
-ü } [   eéií    ] → w ;
-u                 → u ;
-ü                 → u ;  # Should not be needed, but just in case.
+y → i ;
+[aeo] { u } [^aáeéiíoó ] → u\u032F ;
+u } [ aáeéiíoó ] → w ;
+ü } [ eéií ] → w ;
+u → u ;
+ü → u ; # Should not be needed, but just in case.
 [aá] → a ;
 [eé] → e ;
-í    → i ;
+í → i ;
 [oó] → o ;
-ú    → u ;
+ú → u ;
 b → β ;
 cch → ʧ ;
 ch → ʧ ;
@@ -65,7 +65,7 @@ rr → r ;
 r → ɾ ;
 ss → s ;
 s → s ;
-tx → ʧ ;  # for loanwords from Basque, Catalan
+tx → ʧ ; # for loanwords from Basque, Catalan
 t → t ;
 v → β ;
 w → $syll w ;
@@ -75,8 +75,8 @@ x → ks ;
 z → θ ;
 ::Null;
 [-\ ] → ;
-[mnɲŋ  $] { β → b ;
+[mnɲŋ $] { β → b ;
 [mnɲŋlʎ$] { ð → d ;
-[mnɲŋ  $] { ɣ → g ;
+[mnɲŋ $] { ɣ → g ;
 n } [gɣk] → ŋ ;
 ::NFC;
index 8799cac02e78d5dfddee884b8823bbfc2f64effd..9742df04cbd69b83e7096fa1b1375bcf9afe6012 100644 (file)
@@ -14,14 +14,14 @@ $lengthMarker = [\u0302\u0304];
 [\-\'] → ;
 e $lengthMarker → | e i ;
 $lengthMarker → ;
-[^$consonant] { ( [aiueoyw] ) → ᄋ | $1 ;  # Supply a required null initial.
+[^$consonant] { ( [aiueoyw] ) → ᄋ | $1 ; # Supply a required null initial.
 a → ᅡ ;
-i\~e → | ie ;  # イェ
+i\~e → | ie ; # イェ
 i → ᅵ ;
-u\~a → | wa ;  # クァ, グァ
-u\~i → ᅱ ;     # ウィ, クィ, etc.
-u\~e → ᅰ ;     # ウェ
-u\~o → ᅯ ;     # ウォ
+u\~a → | wa ; # クァ, グァ
+u\~i → ᅱ ; # ウィ, クィ, etc.
+u\~e → ᅰ ; # ウェ
+u\~o → ᅯ ; # ウォ
 u → ᅮ ;
 e → ᅦ ;
 o → ᅩ ;
@@ -40,34 +40,34 @@ dd → ᆺ | d ;
 bb → ᆺ | b ;
 vv → ᆺ | v ;
 pp → ᆺ | p ;
-' ' { k → | g ;   # Beginning of a word (after space).
-^k      → | g ;   # Beginning of the string.
+' ' { k → | g ; # Beginning of a word (after space).
+^k → | g ; # Beginning of the string.
 k → ᄏ ;
 sh → | sy ;
 su → 스 ;
 s → ᄉ ;
-te\~     → | t ;   # テュ
-to\~     → | t ;   # トゥ
-tsu\~    → | ch ;  # ツァ, ツィ, etc.
+te\~ → | t ; # テュ
+to\~ → | t ; # トゥ
+tsu\~ → | ch ; # ツァ, ツィ, etc.
 tsu → 쓰 ;
-ts       → | ch ;
-' ' { t  → | d ;
-^t       → | d ;
+ts → | ch ;
+' ' { t → | d ;
+^t → | d ;
 t → ᄐ ;
 ' ' { ch → | j ;
-^ch      → | j ;
+^ch → | j ;
 ch → ᄎ ;
 n } [\ \'bcdfghjkmnprstwz] → ᆫ ;
 n$ → ᆫ ;
 n → ᄂ ;
 h → ᄒ ;
-fu\~ → | p ;   # フュ
-fu   → | hu ;
-f    → | p ;
+fu\~ → | p ; # フュ
+fu → | hu ;
+f → | p ;
 m } [bmp] → ᆫ ;
 m → ᄆ ;
 ya → ᅣ ;
-yi → ᅵ ;  # Added for convenience, after shi.
+yi → ᅵ ; # Added for convenience, after shi.
 yu → ᅲ ;
 ye → ᅨ ;
 yo → ᅭ ;
@@ -78,16 +78,16 @@ g → ᄀ ;
 zu → 즈 ;
 z → | j ;
 j → ᄌ ;
-de\~  → | d ;   # デュ
-dji\~ → | j ;   # ヂァ, ヂゥ, etc.
-dji   → | ji ;  # ヂ
-do\~  → | d ;   # ドゥ
-dzu\~ → | j ;   # ヅァ, ヅィ, etc.
-dzu   → | zu ;  # ヅ
-dz    → | j ;
+de\~ → | d ; # デュ
+dji\~ → | j ; # ヂァ, ヂゥ, etc.
+dji → | ji ; # ヂ
+do\~ → | d ; # ドゥ
+dzu\~ → | j ; # ヅァ, ヅィ, etc.
+dzu → | zu ; # ヅ
+dz → | j ;
 d → ᄃ ;
 b → ᄇ ;
-vu\~ → | b ;  # ヴァ, etc.
-v    → | b ;
+vu\~ → | b ; # ヴァ, etc.
+v → | b ;
 p → ᄑ ;
 ::NFC(NFD);
index 1982c9e291d2a61b5ccc1313a509439d9d237e31..10143ebe310b64aac533a31780e3c86322b90eff 100644 (file)
@@ -14,35 +14,35 @@ $lengthMarker = [\u0302\u0304];
 e $lengthMarker → эй ;
 i $lengthMarker → | i i ;
 $lengthMarker → ;
-a  → а ;
+a → а ;
 i\~e → | ye ;
-i  → и ;
-u\~ → в ;  # ウィ etc.
-u  → у ;
-e  → э ;
-o  → о ;
+i → и ;
+u\~ → в ; # ウィ etc.
+u → у ;
+e → э ;
+o → о ;
 k → к ;
 sh → | sy ;
 s → с ;
-ch     → | ty ;
+ch → | ty ;
 c } ch → t ;
-te\~   → | t ;   # テュ
-to\~   → | t ;   # トゥ
-tsu\~  → | ts ;  # ツァ, ツィ, etc.
+te\~ → | t ; # テュ
+to\~ → | t ; # トゥ
+tsu\~ → | ts ; # ツァ, ツィ, etc.
 ts → ц ;
-t  → т ;
+t → т ;
 \~tsu → | tsu ;
-n } [bpm] → м ;  # 群馬 → Гумма
+n } [bpm] → м ; # 群馬 → Гумма
 n\' → нъ ;
 n → н ;
 h → х ;
-fu\~ → | f ;  # フュ
+fu\~ → | f ; # フュ
 f → ф ;
 m → м ;
 ya → я ;
-yi → и ;  # Added for convenience, after sh, ch, j.
+yi → и ; # Added for convenience, after sh, ch, j.
 yu → ю ;
-ye → е ;  # ?? unobserved
+ye → е ; # ?? unobserved
 yo → ё ;
 r → р ;
 wa → ва ;
@@ -50,15 +50,15 @@ w → ;
 g → г ;
 j → | zy ;
 z → дз ;
-de\~  → | d ;  # デュ
-dji\~ → | z ;  # ヂャ, ヂュ, etc.
-dj    → | j ;  # ヂ
-do\~  → | d ;  # ドゥ
-dzu\~ → | z ;  # ヅァ, ヅィ, etc.
-dz    → | z ;  # ヅ
+de\~ → | d ; # デュ
+dji\~ → | z ; # ヂャ, ヂュ, etc.
+dj → | j ; # ヂ
+do\~ → | d ; # ドゥ
+dzu\~ → | z ; # ヅァ, ヅィ, etc.
+dz → | z ; # ヅ
 d → д ;
 b → б ;
-vu\~ → | v ;  # ヴァ, etc.
-v → в ;  # ?? unobserved
+vu\~ → | v ; # ヴァ, etc.
+v → в ; # ?? unobserved
 p → п ;
 ::NFC(NFD);
index 7da29f0a4611de9094d1f0af30460195d3bc2f88..13ee0ae8d2722f63f31b1b73609ad08ec8865a3c 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $word_boundary = [-\ $] ;
-$vowel = [aeiouw] ;       # Vowels and glides
+$vowel = [aeiouw] ; # Vowels and glides
 $not_vowel = [^$vowel] ;
 ç → | h;
 ɡ → | g;
index c1b4f4a94bc57cdae2e624645758b76e04256583..7940e44bec9874ade005171853c71b7c423603f0 100644 (file)
@@ -90,7 +90,7 @@ pʐ → pʂ ;
 xʐ → xʂ ;
 ʐt\u0361ʂ → ʂt\u0361ʂ ;
 b } [$] → p ;
-d \u0361 z } [$] → t \u0361 s ;  # rydz → rɨt\u0361s
+d \u0361 z } [$] → t \u0361 s ; # rydz → rɨt\u0361s
 d } [$] → t ;
 ɡ } [$] → k ;
 v } [$] → f ;
index 73e0c22544dc3184725f957c1c15acfcd5ff3d63..c38de925a1718b1378d50df9a4f5707d25d7aa1d 100644 (file)
@@ -8,7 +8,7 @@
 # Generated from CLDR 
 #
 $word_boundary = [-\ $] ;
-$vowel = [aeiouw] ;       # Vowels and glides
+$vowel = [aeiouw] ; # Vowels and glides
 $not_vowel = [^$vowel] ;
 [ǎə] → | a ;
 e\u032F → | e ;
@@ -69,7 +69,7 @@ le → レ ;
 li → リ ;
 lo → ロ ;
 lu → ル ;
-l →  ル ;
+l → ル ;
 ma → マ ;
 me → メ ;
 mi → ミ ;
index b05023fa373c37dc1a345f38189ebe2d3f2ba4cb..78d16b9a4b63a0044a80260a702ad73105d674e6 100644 (file)
@@ -9,7 +9,7 @@
 #
 :: NFC () ;
 :: Lower () ;
-eoai → eo\u032Faj ;  # eg. leoaică → /leo\u032Fajkə/, not /le\u032Fo\u032Faikə/
+eoai → eo\u032Faj ; # eg. leoaică → /leo\u032Fajkə/, not /le\u032Fo\u032Faikə/
 eai → e\u032Faj ;
 eau → e\u032Faw ;
 eoa → e\u032Fo\u032Fa ;
index bf948f2990b47abad41c6573d27ceafa1399e691..5030fd54918d31c9a23cf7e046e31b649e17530a 100644 (file)
@@ -7,7 +7,7 @@
 # File: ru_zh.txt
 # Generated from CLDR 
 #
-$bow = [-\ $];  # Word boundary.
+$bow = [-\ $]; # Word boundary.
 $vowel = [аеийоуыьэюяё];
 $not_vowel = [^$vowel];
 ::NFC;
@@ -37,934 +37,934 @@ $vowel { нь → н;
 шш → ш;
 щщ → щ;
 ::Null;
-бург } $bow       → 堡 ;
-град } $bow       → 格勒 ;
-город } $bow     → 哥罗德 ;
-цов } $bow        → 佐夫 ;
-аи                 → 艾 ;
-ай                 → 艾 ;
-ан } $not_vowel    → 安 ;
-ао                 → 奥 ;
-ау                 → 奥 ;
-а                  → 阿 ;
-баи                → 拜 ;
-бай                → 拜 ;
-бан } $not_vowel   → 班 ;
-бао                → 包 ;
-бау                → 包 ;
-ба                 → 巴 ;
-бен } $not_vowel   → 边 ;
-бе                 → 别 ;
-бий                → 比 ;
-бин } $not_vowel   → 宾 ;
-би                 → 比 ;
-бйо                → 比奥 ;
-бон } $not_vowel   → 邦 ;
-бо                 → 博 ;
-буй                → 布伊 ;
-бун } $not_vowel   → 本 ;
-бу                 → 布 ;
-бый                → 贝 ;
-бын } $not_vowel   → 本 ;
-бы                 → 贝 ;
-бьи                → 比 ;
-бью                → 比尤 ;
-бь                 → 比 ;
-бэй                → 贝 ;
-бэн } $not_vowel   → 本 ;
-бэ                 → 贝 ;
-бю                 → 比尤 ;
-бян } $not_vowel   → 比扬 ;
-бя                 → 比亚 ;
-бё                 → 比奥 ;
-б                  → 布 ;
-ваи                → 瓦伊 ;
-вай                → 瓦伊 ;
-ван } $not_vowel   → 万 ;
-вао                → 沃 ;
-вау                → 沃 ;
-ва                 → 瓦 ;
-вен } $not_vowel   → 文 ;
-ве                 → 韦 ;
-вий                → 维 ;
-вин } $not_vowel   → 温 ;
-ви                 → 维 ;
-вйо                → 维奥 ;
-вон } $not_vowel   → 翁 ;
-во                 → 沃 ;
-вуй                → 维 ;
-вун } $not_vowel   → 文 ;
-ву                 → 武 ;
-вый                → 维 ;
-вын } $not_vowel   → 文 ;
-вы                 → 维 ;
-вьи                → 维 ;
-вью                → 维尤 ;
-вь                 → 维 ;
-вэй                → 韦 ;
-вэн } $not_vowel   → 文 ;
-вэ                 → 韦 ;
-вю                 → 维尤 ;
-вян } $not_vowel   → 维扬 ;
-вя                 → 维亚 ;
-вё                 → 维奥 ;
-в                  → 夫 ;
-гаи                → 盖 ;
-гай                → 盖 ;
-ган } $not_vowel   → 甘 ;
-гао                → 高 ;
-гау                → 高 ;
-га                 → 加 ;
-ген } $not_vowel   → 根 ;
-ге                 → 格 ;
-гий                → 吉 ;
-гин } $not_vowel   → 金 ;
-ги                 → 吉 ;
-гйо                → 吉奥 ;
-гон } $not_vowel   → 贡 ;
-го                 → 戈 ;
-гуй                → 圭 ;
-гун } $not_vowel   → 贡 ;
-гу                 → 古 ;
-гый                → 格 ;
-гын } $not_vowel   → 根 ;
-гы                 → 格 ;
-гьи                → 吉 ;
-гью                → 久 ;
-гь                 → 吉 ;
-гэй                → 盖 ;
-гэн } $not_vowel   → 根 ;
-гэ                 → 盖 ;
-гю                 → 久 ;
-гян } $not_vowel   → 吉扬 ;
-гя                 → 吉亚 ;
-гё                 → 吉奥 ;
-г                  → 格 ;
-даи                → 代 ;
-дай                → 代 ;
-дан } $not_vowel   → 丹 ;
-дао                → 道 ;
-дау                → 道 ;
-да                 → 达 ;
-ден } $not_vowel   → 坚 ;
-де                 → 杰 ;
-джаи               → 贾伊 ;
-джай               → 贾伊 ;
-джан } $not_vowel  → 占 ;
-джао               → 焦 ;
-джау               → 焦 ;
-джа                → 贾 ;
-джен } $not_vowel  → 真 ;
-дже                → 杰 ;
-джий               → 吉 ;
-джин } $not_vowel  → 金 ;
-джи                → 吉 ;
-джйо               → 焦 ;
-джон } $not_vowel  → 忠 ;
-джо                → 焦 ;
-джуй               → 朱伊 ;
-джун } $not_vowel  → 准 ;
-джу                → 朱 ;
-джый               → 吉 ;
-джын } $not_vowel  → 真 ;
-джы                → 吉 ;
-джьи               → 吉 ;
-джью               → 久 ;
-джь                → 吉 ;
-джэй               → 杰 ;
-джэн } $not_vowel  → 真 ;
-джэ                → 杰 ;
-джю                → 久 ;
-джян } $not_vowel  → 江 ;
-джя                → 贾 ;
-джё                → 焦 ;
-дж                 → 季 ;
-дзаи               → 宰 ;
-дзай               → 宰 ;
-дзан } $not_vowel  → 赞 ;
-дзао               → 藻 ;
-дзау               → 藻 ;
-дза                → 扎 ;
-дзен } $not_vowel  → 津 ;
-дзе                → 泽 ;
-дзий               → 济 ;
-дзин } $not_vowel  → 津 ;
-дзи                → 济 ;
-дзйо               → 焦 ;
-дзон } $not_vowel  → 宗 ;
-дзо                → 佐 ;
-дзуй               → 祖伊 ;
-дзун } $not_vowel  → 尊 ;
-дзу                → 祖 ;
-дзый               → 济 ;
-дзын } $not_vowel  → 曾 ;
-дзы                → 济 ;
-дзьи               → 济 ;
-дзью               → 久 ;
-дзь                → 济 ;
-дзэй               → 泽 ;
-дзэн } $not_vowel  → 曾 ;
-дзэ                → 泽 ;
-дзю                → 久 ;
-дзян } $not_vowel  → 江 ;
-дзя                → 贾 ;
-дзё                → 焦 ;
-дз                 → 兹 ;
-дий                → 季 ;
-дин } $not_vowel   → 金 ;
-ди                 → 季 ;
-дйо                → 焦 ;
-дон } $not_vowel   → 东 ;
-до                 → 多 ;
-дсаи               → 采 ;
-дсай               → 采 ;
-дсан } $not_vowel  → 灿 ;
-дсао               → 曹 ;
-дсау               → 曹 ;
-дса                → 察 ;
-дсен } $not_vowel  → 岑 ;
-дсе                → 采 ;
-дсий               → 齐 ;
-дсин } $not_vowel  → 钦 ;
-дси                → 齐 ;
-дсон } $not_vowel  → 聪 ;
-дсо                → 措 ;
-дсуй               → 崔 ;
-дсун } $not_vowel  → 聪 ;
-дсу                → 楚 ;
-дсый               → 齐 ;
-дсын } $not_vowel  → 岑 ;
-дсы                → 齐 ;
-дсьи               → 齐 ;
-дсью               → 秋 ;
-дсь                → 齐 ;
-дсэй               → 采 ;
-дсэн } $not_vowel  → 岑 ;
-дсэ                → 采 ;
-дсю                → 秋 ;
-дся                → 齐亚 ;
-дс                 → 茨 ;
-дуй                → 杜伊 ;
-дун } $not_vowel   → 敦 ;
-ду                 → 杜 ;
-дцаи               → 采 ;
-дцай               → 采 ;
-дцан } $not_vowel  → 灿 ;
-дцао               → 曹 ;
-дцау               → 曹 ;
-дца                → 察 ;
-дцен } $not_vowel  → 岑 ;
-дце                → 采 ;
-дций               → 齐 ;
-дцин } $not_vowel  → 钦 ;
-дци                → 齐 ;
-дцон } $not_vowel  → 聪 ;
-дцо                → 措 ;
-дцуй               → 崔 ;
-дцун } $not_vowel  → 聪 ;
-дцу                → 楚 ;
-дцый               → 齐 ;
-дцын } $not_vowel  → 岑 ;
-дцы                → 齐 ;
-дцьи               → 齐 ;
-дцью               → 秋 ;
-дць                → 齐 ;
-дцэй               → 采 ;
-дцэн } $not_vowel  → 岑 ;
-дцэ                → 采 ;
-дцю                → 秋 ;
-дця                → 齐亚 ;
-дц                 → 茨 ;
-дчаи               → 柴 ;
-дчай               → 柴 ;
-дчан } $not_vowel  → 昌 ;
-дчао               → 乔 ;
-дчау               → 乔 ;
-дча                → 恰 ;
-дчен } $not_vowel  → 琴 ;
-дче                → 切 ;
-дчий               → 奇 ;
-дчин } $not_vowel  → 钦 ;
-дчи                → 奇 ;
-дчйо               → 乔 ;
-дчон } $not_vowel  → 琼 ;
-дчо                → 乔 ;
-дчуй               → 崔 ;
-дчун } $not_vowel  → 春 ;
-дчу                → 丘 ;
-дчый               → 奇 ;
-дчын } $not_vowel  → 琴 ;
-дчы                → 奇 ;
-дчьи               → 奇 ;
-дчь                → 奇 ;
-дчэй               → 切 ;
-дчэн } $not_vowel  → 琴 ;
-дчэ                → 切 ;
-дчян } $not_vowel  → 强 ;
-дчё                → 乔 ;
-дч                 → 奇 ;
-дый                → 德 ;
-дын } $not_vowel   → 登 ;
-ды                 → 德 ;
-дьи                → 季 ;
-дью                → 久 ;
-дь                 → 季 ;
-дэй                → 代 ;
-дэн } $not_vowel   → 登 ;
-дэ                 → 代 ;
-дюн } $not_vowel   → 久恩 ;
-дю                 → 久 ;
-дян } $not_vowel   → 江 ;
-дя                 → 佳 ;
-дё                 → 焦 ;
-д                  → 德 ;
-ен } $not_vowel    → 延 ;
-е                  → 耶 ;
-жаи                → 扎伊 ;
-жай                → 扎伊 ;
-жан } $not_vowel   → 然 ;
-жао                → 饶 ;
-жау                → 饶 ;
-жа                 → 扎 ;
-жен } $not_vowel   → 任 ;
-же                 → 热 ;
-жий                → 日 ;
-жин } $not_vowel   → 任 ;
-жи                 → 日 ;
-жйо                → 若 ;
-жон } $not_vowel   → 容 ;
-жо                 → 若 ;
-жуй                → 瑞 ;
-жун } $not_vowel   → 容 ;
-жу                 → 茹 ;
-жый                → 日 ;
-жын } $not_vowel   → 任 ;
-жы                 → 日 ;
-жьи                → 日 ;
-жью                → 茹 ;
-жь                 → 日 ;
-жэй                → 热 ;
-жэн } $not_vowel   → 任 ;
-жэ                 → 热 ;
-жю                 → 茹 ;
-жян } $not_vowel   → 让 ;
-жя                 → 扎 ;
-жё                 → 若 ;
-ж                  → 日 ;
-заи                → 宰 ;
-зай                → 宰 ;
-зан } $not_vowel   → 赞 ;
-зао                → 藻 ;
-зау                → 藻 ;
-за                 → 扎 ;
-зен } $not_vowel   → 津 ;
-зе                 → 泽 ;
-зий                → 济 ;
-зин } $not_vowel   → 津 ;
-зи                 → 济 ;
-зйо                → 焦 ;
-зон } $not_vowel   → 宗 ;
-зо                 → 佐 ;
-зуй                → 祖伊 ;
-зун } $not_vowel   → 尊 ;
-зу                 → 祖 ;
-зый                → 济 ;
-зын } $not_vowel   → 曾 ;
-зы                 → 济 ;
-зьи                → 济 ;
-зью                → 久 ;
-зь                 → 济 ;
-зэй                → 泽 ;
-зэн } $not_vowel   → 曾 ;
-зэ                 → 泽 ;
-зю                 → 久 ;
-зян } $not_vowel   → 江 ;
-зя                 → 贾 ;
-зё                 → 焦 ;
-з                  → 兹 ;
-ий                 → 伊 ;
-ин } $not_vowel    → 因 ;
-и                  → 伊 ;
-йо                 → 约 ;
-й                  → 伊 ;
-каи                → 凯 ;
-кай                → 凯 ;
-кан } $not_vowel   → 坎 ;
-као                → 考 ;
-кау                → 考 ;
-ка                 → 卡 ;
-кен } $not_vowel   → 肯 ;
-ке                 → 克 ;
-кий                → 基 ;
-кин } $not_vowel   → 金 ;
-ки                 → 基 ;
-кйо                → 基奥 ;
-кон } $not_vowel   → 孔 ;
-ко                 → 科 ;
-куй                → 奎 ;
-кун } $not_vowel   → 昆 ;
-ку                 → 库 ;
-кый                → 克 ;
-кын } $not_vowel   → 肯 ;
-кы                 → 克 ;
-кьи                → 基 ;
-кью                → 丘 ;
-кь                 → 基 ;
-кэй                → 凯 ;
-кэн } $not_vowel   → 肯 ;
-кэ                 → 凯 ;
-кю                 → 丘 ;
-кян } $not_vowel   → 基扬 ;
-кя                 → 基亚 ;
-кё                 → 基奥 ;
-к                  → 克 ;
-лаи                → 莱 ;
-лай                → 莱 ;
-лан } $not_vowel   → 兰 ;
-лао                → 劳 ;
-лау                → 劳 ;
-ла                 → 拉 ;
-лен } $not_vowel   → 连 ;
-ле                 → 列 ;
-лий                → 利 ;
-лин } $not_vowel   → 林 ;
-ли                 → 利 ;
-лйо                → 廖 ;
-лон } $not_vowel   → 隆 ;
-ло                 → 洛 ;
-луй                → 卢伊 ;
-лун } $not_vowel   → 伦 ;
-лу                 → 卢 ;
-лый                → 雷 ;
-лын } $not_vowel   → 伦 ;
-лы                 → 雷 ;
-льи                → 利 ;
-лью                → 柳 ;
-ль                 → 利 ;
-лэй                → 莱 ;
-лэн } $not_vowel   → 伦 ;
-лэ                 → 莱 ;
-лю                 → 柳 ;
-лян } $not_vowel   → 良 ;
-ля                 → 利亚 ;
-лё                 → 廖 ;
-л                  → 尔 ;
-маи                → 迈 ;
-май                → 迈 ;
-ман } $not_vowel   → 曼 ;
-мао                → 毛 ;
-мау                → 毛 ;
-ма                 → 马 ;
-мен } $not_vowel   → 缅 ;
-ме                 → 梅 ;
-мий                → 米 ;
-мин } $not_vowel   → 明 ;
-ми                 → 米 ;
-мйо                → 苗 ;
-мон } $not_vowel   → 蒙 ;
-мо                 → 莫 ;
-муй                → 穆伊 ;
-мун } $not_vowel   → 蒙 ;
-му                 → 穆 ;
-мый                → 梅 ;
-мын } $not_vowel   → 门 ;
-мы                 → 梅 ;
-мьи                → 米 ;
-мью                → 缪 ;
-мь                 → 米 ;
-мэй                → 梅 ;
-мэн } $not_vowel   → 门 ;
-мэ                 → 梅 ;
-мюн } $not_vowel   → 敏 ;
-мю                 → 缪 ;
-мян } $not_vowel   → 米扬 ;
-мя                 → 米亚 ;
-мё                 → 苗 ;
-м                  → 姆 ;
-наи                → 奈 ;
-най                → 奈 ;
-нан } $not_vowel   → 南 ;
-нао                → 瑙 ;
-нау                → 瑙 ;
-на                 → 纳 ;
-нен } $not_vowel   → 年 ;
-не                 → 涅 ;
-ний                → 尼 ;
-нин } $not_vowel   → 宁 ;
-ни                 → 尼 ;
-нйо                → 尼奥 ;
-нон } $not_vowel   → 农 ;
-но                 → 诺 ;
-нуй                → 努伊 ;
-нун } $not_vowel   → 农 ;
-ну                 → 努 ;
-ный                → 内 ;
-нын } $not_vowel   → 嫩 ;
-ны                 → 内 ;
-нь } $not_vowel    → 尼 ;
-нэй                → 内 ;
-нэн } $not_vowel   → 嫩 ;
-нэ                 → 内 ;
-нюн } $not_vowel   → 纽恩 ;
-ню                 → 纽 ;
-нян } $not_vowel   → 尼扬 ;
-ня                 → 尼亚 ;
-нё                 → 尼奥 ;
-н } $not_vowel     → 恩 ;
-он } $not_vowel    → 翁 ;
-о                  → 奥 ;
-паи                → 派 ;
-пай                → 派 ;
-пан } $not_vowel   → 潘 ;
-пао                → 保 ;
-пау                → 保 ;
-па                 → 帕 ;
-пен } $not_vowel   → 片 ;
-пе                 → 佩 ;
-пий                → 皮 ;
-пин } $not_vowel   → 平 ;
-пи                 → 皮 ;
-пйо                → 皮奥 ;
-пон } $not_vowel   → 蓬 ;
-по                 → 波 ;
-пуй                → 普伊 ;
-пун } $not_vowel   → 蓬 ;
-пу                 → 普 ;
-пый                → 佩 ;
-пын } $not_vowel   → 彭 ;
-пы                 → 佩 ;
-пьи                → 皮 ;
-пью                → 皮尤 ;
-пь                 → 皮 ;
-пэй                → 佩 ;
-пэн } $not_vowel   → 彭 ;
-пэ                 → 佩 ;
-пю                 → 皮尤 ;
-пян } $not_vowel   → 皮扬 ;
-пя                 → 皮亚 ;
-пё                 → 皮奥 ;
-п                  → 普 ;
-раи                → 赖 ;
-рай                → 赖 ;
-ран } $not_vowel   → 兰 ;
-рао                → 劳 ;
-рау                → 劳 ;
-ра                 → 拉 ;
-рен } $not_vowel   → 连 ;
-ре                 → 列 ;
-рий                → 里 ;
-рин } $not_vowel   → 林 ;
-ри                 → 里 ;
-рйо                → 廖 ;
-рон } $not_vowel   → 龙 ;
-ро                 → 罗 ;
-руй                → 鲁伊 ;
-рун } $not_vowel   → 伦 ;
-ру                 → 鲁 ;
-рый                → 雷 ;
-рын } $not_vowel   → 伦 ;
-ры                 → 雷 ;
-рьи                → 里 ;
-рью                → 留 ;
-рь                 → 里 ;
-рэй                → 雷 ;
-рэн } $not_vowel   → 伦 ;
-рэ                 → 雷 ;
-рю                 → 留 ;
-рян } $not_vowel   → 良 ;
-ря                 → 里亚 ;
-рё                 → 廖 ;
-р                  → 尔 ;
-саи                → 赛 ;
-сай                → 赛 ;
-сан } $not_vowel   → 桑 ;
-сао                → 绍 ;
-сау                → 绍 ;
-са                 → 萨 ;
-сен } $not_vowel   → 先 ;
-се                 → 谢 ;
-сий                → 西 ;
-син } $not_vowel   → 辛 ;
-си                 → 西 ;
-сйо                → 肖 ;
-сон } $not_vowel   → 松 ;
-со                 → 索 ;
-суй                → 绥 ;
-сун } $not_vowel   → 孙 ;
-су                 → 苏 ;
-счаи               → 夏伊 ;
-счай               → 夏伊 ;
-счан } $not_vowel  → 先 ;
-счао               → 肖 ;
-счау               → 肖 ;
-сча                → 夏 ;
-счен } $not_vowel  → 先 ;
-сче                → 谢 ;
-счий               → 希 ;
-счин } $not_vowel  → 辛 ;
-счи                → 希 ;
-счйо               → 晓 ;
-счон } $not_vowel  → 雄 ;
-счо                → 晓 ;
-счуй               → 休伊 ;
-счун } $not_vowel  → 逊 ;
-счу                → 休 ;
-счын } $not_vowel  → 欣 ;
-счьи               → 希 ;
-счью               → 休 ;
-счь                → 希 ;
-счэн } $not_vowel  → 欣 ;
-счю                → 休 ;
-счё                → 晓 ;
-сч                 → 希 ;
-сый                → 瑟 ;
-сын } $not_vowel   → 森 ;
-сы                 → 瑟 ;
-сьи                → 西 ;
-сью                → 休 ;
-сь                 → 西 ;
-сэй                → 塞 ;
-сэн } $not_vowel   → 森 ;
-сэ                 → 塞 ;
-сюн } $not_vowel   → 雄 ;
-сю                 → 休 ;
-сян } $not_vowel   → 相 ;
-ся                 → 贾 ;
-сё                 → 肖 ;
-с                  → 斯 ;
-таи                → 泰 ;
-тай                → 泰 ;
-тан } $not_vowel   → 坦 ;
-тао                → 陶 ;
-тау                → 陶 ;
-та                 → 塔 ;
-тен } $not_vowel   → 坚 ;
-те                 → 捷 ;
-тий                → 季 ;
-тин } $not_vowel   → 京 ;
-ти                 → 季 ;
-тйо                → 乔 ;
-тон } $not_vowel   → 通 ;
-то                 → 托 ;
-тсаи               → 采 ;
-тсай               → 采 ;
-тсан } $not_vowel  → 灿 ;
-тсао               → 曹 ;
-тсау               → 曹 ;
-тса                → 察 ;
-тсен } $not_vowel  → 岑 ;
-тсе                → 采 ;
-тсий               → 齐 ;
-тсин } $not_vowel  → 钦 ;
-тси                → 齐 ;
-тсон } $not_vowel  → 聪 ;
-тсо                → 措 ;
-тсуй               → 崔 ;
-тсун } $not_vowel  → 聪 ;
-тсу                → 楚 ;
-тсый               → 齐 ;
-тсын } $not_vowel  → 岑 ;
-тсы                → 齐 ;
-тсьи               → 齐 ;
-тсью               → 秋 ;
-тсь                → 齐 ;
-тсэй               → 采 ;
-тсэн } $not_vowel  → 岑 ;
-тсэ                → 采 ;
-тсю                → 秋 ;
-тся                → 齐亚 ;
-тс                 → 茨 ;
-туй                → 图伊 ;
-тун } $not_vowel   → 通 ;
-ту                 → 图 ;
-тцаи               → 采 ;
-тцай               → 采 ;
-тцан } $not_vowel  → 灿 ;
-тцао               → 曹 ;
-тцау               → 曹 ;
-тца                → 察 ;
-тцен } $not_vowel  → 岑 ;
-тце                → 采 ;
-тций               → 齐 ;
-тцин } $not_vowel  → 钦 ;
-тци                → 齐 ;
-тцон } $not_vowel  → 聪 ;
-тцо                → 措 ;
-тцуй               → 崔 ;
-тцун } $not_vowel  → 聪 ;
-тцу                → 楚 ;
-тцый               → 齐 ;
-тцын } $not_vowel  → 岑 ;
-тцы                → 齐 ;
-тцьи               → 齐 ;
-тцью               → 秋 ;
-тць                → 齐 ;
-тцэй               → 采 ;
-тцэн } $not_vowel  → 岑 ;
-тцэ                → 采 ;
-тцю                → 秋 ;
-тця                → 齐亚 ;
-тц                 → 茨 ;
-тчаи               → 柴 ;
-тчай               → 柴 ;
-тчан } $not_vowel  → 昌 ;
-тчао               → 乔 ;
-тчау               → 乔 ;
-тча                → 恰 ;
-тчен } $not_vowel  → 琴 ;
-тче                → 切 ;
-тчий               → 奇 ;
-тчин } $not_vowel  → 钦 ;
-тчи                → 奇 ;
-тчйо               → 乔 ;
-тчон } $not_vowel  → 琼 ;
-тчо                → 乔 ;
-тчуй               → 崔 ;
-тчун } $not_vowel  → 春 ;
-тчу                → 丘 ;
-тчый               → 奇 ;
-тчын } $not_vowel  → 琴 ;
-тчы                → 奇 ;
-тчьи               → 奇 ;
-тчь                → 奇 ;
-тчэй               → 切 ;
-тчэн } $not_vowel  → 琴 ;
-тчэ                → 切 ;
-тчян } $not_vowel  → 强 ;
-тчё                → 乔 ;
-тч                 → 奇 ;
-тый                → 特 ;
-тын } $not_vowel   → 滕 ;
-ты                 → 特 ;
-тьи                → 季 ;
-тью                → 秋 ;
-ть                 → 季 ;
-тэй                → 泰 ;
-тэн } $not_vowel   → 滕 ;
-тэ                 → 泰 ;
-тюн } $not_vowel   → 琼 ;
-тю                 → 秋 ;
-тян } $not_vowel   → 强 ;
-тя                 → 佳 ;
-тё                 → 乔 ;
-т                  → 特 ;
-уй                 → 维 ;
-ун } $not_vowel    → 温 ;
-у                  → 乌 ;
-фаи                → 法伊 ;
-фай                → 法伊 ;
-фан } $not_vowel   → 凡 ;
-фао                → 福 ;
-фау                → 福 ;
-фа                 → 法 ;
-фен } $not_vowel   → 芬 ;
-фе                 → 费 ;
-фий                → 菲 ;
-фин } $not_vowel   → 芬 ;
-фи                 → 菲 ;
-фйо                → 菲奥 ;
-фон } $not_vowel   → 丰 ;
-фо                 → 福 ;
-фуй                → 富伊 ;
-фун } $not_vowel   → 丰 ;
-фу                 → 富 ;
-фый                → 菲 ;
-фын } $not_vowel   → 芬 ;
-фы                 → 菲 ;
-фьи                → 菲 ;
-фью                → 菲尤 ;
-фь                 → 菲 ;
-фэй                → 费 ;
-фэн } $not_vowel   → 芬 ;
-фэ                 → 费 ;
-фю                 → 菲尤 ;
-фя                 → 菲亚 ;
-фё                 → 菲奥 ;
-ф                  → 夫 ;
-хаи                → 海 ;
-хай                → 海 ;
-хан } $not_vowel   → 汉 ;
-хао                → 豪 ;
-хау                → 豪 ;
-ха                 → 哈 ;
-хен } $not_vowel   → 亨 ;
-хе                 → 赫 ;
-хий                → 希 ;
-хин } $not_vowel   → 欣 ;
-хи                 → 希 ;
-хон } $not_vowel   → 洪 ;
-хо                 → 霍 ;
-хуй                → 惠 ;
-хун } $not_vowel   → 洪 ;
-ху                 → 胡 ;
-хый                → 黑 ;
-хын } $not_vowel   → 亨 ;
-хы                 → 黑 ;
-хьи                → 希 ;
-хью                → 休 ;
-хь                 → 希 ;
-хэй                → 黑 ;
-хэн } $not_vowel   → 亨 ;
-хэ                 → 海 ;
-хю                 → 休 ;
-хян } $not_vowel   → 希扬 ;
-хя                 → 希亚 ;
-х                  → 赫 ;
-цаи                → 采 ;
-цай                → 采 ;
-цан } $not_vowel   → 灿 ;
-цао                → 曹 ;
-цау                → 曹 ;
-ца                 → 察 ;
-цен } $not_vowel   → 岑 ;
-це                 → 采 ;
-ций                → 齐 ;
-цин } $not_vowel   → 钦 ;
-ци                 → 齐 ;
-цон } $not_vowel   → 聪 ;
-цо                 → 措 ;
-цсаи               → 采 ;
-цсай               → 采 ;
-цсан } $not_vowel  → 灿 ;
-цсао               → 曹 ;
-цсау               → 曹 ;
-цса                → 察 ;
-цсен } $not_vowel  → 岑 ;
-цсе                → 采 ;
-цсий               → 齐 ;
-цсин } $not_vowel  → 钦 ;
-цси                → 齐 ;
-цсон } $not_vowel  → 聪 ;
-цсо                → 措 ;
-цсуй               → 崔 ;
-цсун } $not_vowel  → 聪 ;
-цсу                → 楚 ;
-цсый               → 齐 ;
-цсын } $not_vowel  → 岑 ;
-цсы                → 齐 ;
-цсьи               → 齐 ;
-цсью               → 秋 ;
-цсь                → 齐 ;
-цсэй               → 采 ;
-цсэн } $not_vowel  → 岑 ;
-цсэ                → 采 ;
-цсю                → 秋 ;
-цся                → 齐亚 ;
-цс                 → 茨 ;
-цуй                → 崔 ;
-цун } $not_vowel   → 聪 ;
-цу                 → 楚 ;
-цый                → 齐 ;
-цын } $not_vowel   → 岑 ;
-цы                 → 齐 ;
-цьи                → 齐 ;
-цью                → 秋 ;
-ць                 → 齐 ;
-цэй                → 采 ;
-цэн } $not_vowel   → 岑 ;
-цэ                 → 采 ;
-цю                 → 秋 ;
-ця                 → 齐亚 ;
-ц                  → 茨 ;
-чаи                → 柴 ;
-чай                → 柴 ;
-чан } $not_vowel   → 昌 ;
-чао                → 乔 ;
-чау                → 乔 ;
-ча                 → 恰 ;
-чен } $not_vowel   → 琴 ;
-че                 → 切 ;
-чий                → 奇 ;
-чин } $not_vowel   → 钦 ;
-чи                 → 奇 ;
-чйо                → 乔 ;
-чон } $not_vowel   → 琼 ;
-чо                 → 乔 ;
-чуй                → 崔 ;
-чун } $not_vowel   → 春 ;
-чу                 → 丘 ;
-чый                → 奇 ;
-чын } $not_vowel   → 琴 ;
-чы                 → 奇 ;
-чьи                → 奇 ;
-чь                 → 奇 ;
-чэй                → 切 ;
-чэн } $not_vowel   → 琴 ;
-чэ                 → 切 ;
-чян } $not_vowel   → 强 ;
-чё                 → 乔 ;
-ч                  → 奇 ;
-шаи                → 沙伊 ;
-шай                → 沙伊 ;
-шан } $not_vowel   → 尚 ;
-шао                → 绍 ;
-шау                → 绍 ;
-ша                 → 沙 ;
-шен } $not_vowel   → 申 ;
-ше                 → 舍 ;
-ший                → 希 ;
-шин } $not_vowel   → 申 ;
-ши                 → 希 ;
-шйо                → 绍 ;
-шон } $not_vowel   → 雄 ;
-шо                 → 绍 ;
-шуй                → 舒伊 ;
-шун } $not_vowel   → 顺 ;
-шу                 → 舒 ;
-шый                → 希 ;
-шын } $not_vowel   → 申 ;
-шы                 → 希 ;
-шьи                → 希 ;
-шью                → 舒 ;
-шь                 → 希 ;
-шэй                → 舍 ;
-шэн } $not_vowel   → 申 ;
-шэ                 → 舍 ;
-шю                 → 舒 ;
-шян } $not_vowel   → 尚 ;
-шя                 → 沙 ;
-шё                 → 绍 ;
-ш                  → 什 ;
-щаи                → 夏伊 ;
-щай                → 夏伊 ;
-щан } $not_vowel   → 先 ;
-щао                → 肖 ;
-щау                → 肖 ;
-ща                 → 夏 ;
-щен } $not_vowel   → 先 ;
-ще                 → 谢 ;
-щий                → 希 ;
-щин } $not_vowel   → 辛 ;
-щи                 → 希 ;
-щйо                → 晓 ;
-щон } $not_vowel   → 雄 ;
-що                 → 晓 ;
-щуй                → 休伊 ;
-щун } $not_vowel   → 逊 ;
-щу                 → 休 ;
-щын } $not_vowel   → 欣 ;
-щьи                → 希 ;
-щью                → 休 ;
-щь                 → 希 ;
-щэн } $not_vowel   → 欣 ;
-щю                 → 休 ;
-щё                 → 晓 ;
-щ                  → 希 ;
-ъ                  → ;
-ый                 → 厄 ;
-ын } $not_vowel    → 恩 ;
-ы                  → 厄 ;
-ьи                 → 伊 ;
-ью                 → 尤 ;
-ь                  → 伊 ;
-эй                 → 埃 ;
-эн } $not_vowel    → 恩 ;
-э                  → 埃 ;
-юн } $not_vowel    → 云 ;
-ю                  → 尤 ;
-ян } $not_vowel    → 扬 ;
-я                  → 亚 ;
-ё                  → 约 ;
+бург } $bow → 堡 ;
+град } $bow → 格勒 ;
+город } $bow → 哥罗德 ;
+цов } $bow → 佐夫 ;
+аи → 艾 ;
+ай → 艾 ;
+ан } $not_vowel → 安 ;
+ао → 奥 ;
+ау → 奥 ;
+а → 阿 ;
+баи → 拜 ;
+бай → 拜 ;
+бан } $not_vowel → 班 ;
+бао → 包 ;
+бау → 包 ;
+ба → 巴 ;
+бен } $not_vowel → 边 ;
+бе → 别 ;
+бий → 比 ;
+бин } $not_vowel → 宾 ;
+би → 比 ;
+бйо → 比奥 ;
+бон } $not_vowel → 邦 ;
+бо → 博 ;
+буй → 布伊 ;
+бун } $not_vowel → 本 ;
+бу → 布 ;
+бый → 贝 ;
+бын } $not_vowel → 本 ;
+бы → 贝 ;
+бьи → 比 ;
+бью → 比尤 ;
+бь → 比 ;
+бэй → 贝 ;
+бэн } $not_vowel → 本 ;
+бэ → 贝 ;
+бю → 比尤 ;
+бян } $not_vowel → 比扬 ;
+бя → 比亚 ;
+бё → 比奥 ;
+б → 布 ;
+ваи → 瓦伊 ;
+вай → 瓦伊 ;
+ван } $not_vowel → 万 ;
+вао → 沃 ;
+вау → 沃 ;
+ва → 瓦 ;
+вен } $not_vowel → 文 ;
+ве → 韦 ;
+вий → 维 ;
+вин } $not_vowel → 温 ;
+ви → 维 ;
+вйо → 维奥 ;
+вон } $not_vowel → 翁 ;
+во → 沃 ;
+вуй → 维 ;
+вун } $not_vowel → 文 ;
+ву → 武 ;
+вый → 维 ;
+вын } $not_vowel → 文 ;
+вы → 维 ;
+вьи → 维 ;
+вью → 维尤 ;
+вь → 维 ;
+вэй → 韦 ;
+вэн } $not_vowel → 文 ;
+вэ → 韦 ;
+вю → 维尤 ;
+вян } $not_vowel → 维扬 ;
+вя → 维亚 ;
+вё → 维奥 ;
+в → 夫 ;
+гаи → 盖 ;
+гай → 盖 ;
+ган } $not_vowel → 甘 ;
+гао → 高 ;
+гау → 高 ;
+га → 加 ;
+ген } $not_vowel → 根 ;
+ге → 格 ;
+гий → 吉 ;
+гин } $not_vowel → 金 ;
+ги → 吉 ;
+гйо → 吉奥 ;
+гон } $not_vowel → 贡 ;
+го → 戈 ;
+гуй → 圭 ;
+гун } $not_vowel → 贡 ;
+гу → 古 ;
+гый → 格 ;
+гын } $not_vowel → 根 ;
+гы → 格 ;
+гьи → 吉 ;
+гью → 久 ;
+гь → 吉 ;
+гэй → 盖 ;
+гэн } $not_vowel → 根 ;
+гэ → 盖 ;
+гю → 久 ;
+гян } $not_vowel → 吉扬 ;
+гя → 吉亚 ;
+гё → 吉奥 ;
+г → 格 ;
+даи → 代 ;
+дай → 代 ;
+дан } $not_vowel → 丹 ;
+дао → 道 ;
+дау → 道 ;
+да → 达 ;
+ден } $not_vowel → 坚 ;
+де → 杰 ;
+джаи → 贾伊 ;
+джай → 贾伊 ;
+джан } $not_vowel → 占 ;
+джао → 焦 ;
+джау → 焦 ;
+джа → 贾 ;
+джен } $not_vowel → 真 ;
+дже → 杰 ;
+джий → 吉 ;
+джин } $not_vowel → 金 ;
+джи → 吉 ;
+джйо → 焦 ;
+джон } $not_vowel → 忠 ;
+джо → 焦 ;
+джуй → 朱伊 ;
+джун } $not_vowel → 准 ;
+джу → 朱 ;
+джый → 吉 ;
+джын } $not_vowel → 真 ;
+джы → 吉 ;
+джьи → 吉 ;
+джью → 久 ;
+джь → 吉 ;
+джэй → 杰 ;
+джэн } $not_vowel → 真 ;
+джэ → 杰 ;
+джю → 久 ;
+джян } $not_vowel → 江 ;
+джя → 贾 ;
+джё → 焦 ;
+дж → 季 ;
+дзаи → 宰 ;
+дзай → 宰 ;
+дзан } $not_vowel → 赞 ;
+дзао → 藻 ;
+дзау → 藻 ;
+дза → 扎 ;
+дзен } $not_vowel → 津 ;
+дзе → 泽 ;
+дзий → 济 ;
+дзин } $not_vowel → 津 ;
+дзи → 济 ;
+дзйо → 焦 ;
+дзон } $not_vowel → 宗 ;
+дзо → 佐 ;
+дзуй → 祖伊 ;
+дзун } $not_vowel → 尊 ;
+дзу → 祖 ;
+дзый → 济 ;
+дзын } $not_vowel → 曾 ;
+дзы → 济 ;
+дзьи → 济 ;
+дзью → 久 ;
+дзь → 济 ;
+дзэй → 泽 ;
+дзэн } $not_vowel → 曾 ;
+дзэ → 泽 ;
+дзю → 久 ;
+дзян } $not_vowel → 江 ;
+дзя → 贾 ;
+дзё → 焦 ;
+дз → 兹 ;
+дий → 季 ;
+дин } $not_vowel → 金 ;
+ди → 季 ;
+дйо → 焦 ;
+дон } $not_vowel → 东 ;
+до → 多 ;
+дсаи → 采 ;
+дсай → 采 ;
+дсан } $not_vowel → 灿 ;
+дсао → 曹 ;
+дсау → 曹 ;
+дса → 察 ;
+дсен } $not_vowel → 岑 ;
+дсе → 采 ;
+дсий → 齐 ;
+дсин } $not_vowel → 钦 ;
+дси → 齐 ;
+дсон } $not_vowel → 聪 ;
+дсо → 措 ;
+дсуй → 崔 ;
+дсун } $not_vowel → 聪 ;
+дсу → 楚 ;
+дсый → 齐 ;
+дсын } $not_vowel → 岑 ;
+дсы → 齐 ;
+дсьи → 齐 ;
+дсью → 秋 ;
+дсь → 齐 ;
+дсэй → 采 ;
+дсэн } $not_vowel → 岑 ;
+дсэ → 采 ;
+дсю → 秋 ;
+дся → 齐亚 ;
+дс → 茨 ;
+дуй → 杜伊 ;
+дун } $not_vowel → 敦 ;
+ду → 杜 ;
+дцаи → 采 ;
+дцай → 采 ;
+дцан } $not_vowel → 灿 ;
+дцао → 曹 ;
+дцау → 曹 ;
+дца → 察 ;
+дцен } $not_vowel → 岑 ;
+дце → 采 ;
+дций → 齐 ;
+дцин } $not_vowel → 钦 ;
+дци → 齐 ;
+дцон } $not_vowel → 聪 ;
+дцо → 措 ;
+дцуй → 崔 ;
+дцун } $not_vowel → 聪 ;
+дцу → 楚 ;
+дцый → 齐 ;
+дцын } $not_vowel → 岑 ;
+дцы → 齐 ;
+дцьи → 齐 ;
+дцью → 秋 ;
+дць → 齐 ;
+дцэй → 采 ;
+дцэн } $not_vowel → 岑 ;
+дцэ → 采 ;
+дцю → 秋 ;
+дця → 齐亚 ;
+дц → 茨 ;
+дчаи → 柴 ;
+дчай → 柴 ;
+дчан } $not_vowel → 昌 ;
+дчао → 乔 ;
+дчау → 乔 ;
+дча → 恰 ;
+дчен } $not_vowel → 琴 ;
+дче → 切 ;
+дчий → 奇 ;
+дчин } $not_vowel → 钦 ;
+дчи → 奇 ;
+дчйо → 乔 ;
+дчон } $not_vowel → 琼 ;
+дчо → 乔 ;
+дчуй → 崔 ;
+дчун } $not_vowel → 春 ;
+дчу → 丘 ;
+дчый → 奇 ;
+дчын } $not_vowel → 琴 ;
+дчы → 奇 ;
+дчьи → 奇 ;
+дчь → 奇 ;
+дчэй → 切 ;
+дчэн } $not_vowel → 琴 ;
+дчэ → 切 ;
+дчян } $not_vowel → 强 ;
+дчё → 乔 ;
+дч → 奇 ;
+дый → 德 ;
+дын } $not_vowel → 登 ;
+ды → 德 ;
+дьи → 季 ;
+дью → 久 ;
+дь → 季 ;
+дэй → 代 ;
+дэн } $not_vowel → 登 ;
+дэ → 代 ;
+дюн } $not_vowel → 久恩 ;
+дю → 久 ;
+дян } $not_vowel → 江 ;
+дя → 佳 ;
+дё → 焦 ;
+д → 德 ;
+ен } $not_vowel → 延 ;
+е → 耶 ;
+жаи → 扎伊 ;
+жай → 扎伊 ;
+жан } $not_vowel → 然 ;
+жао → 饶 ;
+жау → 饶 ;
+жа → 扎 ;
+жен } $not_vowel → 任 ;
+же → 热 ;
+жий → 日 ;
+жин } $not_vowel → 任 ;
+жи → 日 ;
+жйо → 若 ;
+жон } $not_vowel → 容 ;
+жо → 若 ;
+жуй → 瑞 ;
+жун } $not_vowel → 容 ;
+жу → 茹 ;
+жый → 日 ;
+жын } $not_vowel → 任 ;
+жы → 日 ;
+жьи → 日 ;
+жью → 茹 ;
+жь → 日 ;
+жэй → 热 ;
+жэн } $not_vowel → 任 ;
+жэ → 热 ;
+жю → 茹 ;
+жян } $not_vowel → 让 ;
+жя → 扎 ;
+жё → 若 ;
+ж → 日 ;
+заи → 宰 ;
+зай → 宰 ;
+зан } $not_vowel → 赞 ;
+зао → 藻 ;
+зау → 藻 ;
+за → 扎 ;
+зен } $not_vowel → 津 ;
+зе → 泽 ;
+зий → 济 ;
+зин } $not_vowel → 津 ;
+зи → 济 ;
+зйо → 焦 ;
+зон } $not_vowel → 宗 ;
+зо → 佐 ;
+зуй → 祖伊 ;
+зун } $not_vowel → 尊 ;
+зу → 祖 ;
+зый → 济 ;
+зын } $not_vowel → 曾 ;
+зы → 济 ;
+зьи → 济 ;
+зью → 久 ;
+зь → 济 ;
+зэй → 泽 ;
+зэн } $not_vowel → 曾 ;
+зэ → 泽 ;
+зю → 久 ;
+зян } $not_vowel → 江 ;
+зя → 贾 ;
+зё → 焦 ;
+з → 兹 ;
+ий → 伊 ;
+ин } $not_vowel → 因 ;
+и → 伊 ;
+йо → 约 ;
+й → 伊 ;
+каи → 凯 ;
+кай → 凯 ;
+кан } $not_vowel → 坎 ;
+као → 考 ;
+кау → 考 ;
+ка → 卡 ;
+кен } $not_vowel → 肯 ;
+ке → 克 ;
+кий → 基 ;
+кин } $not_vowel → 金 ;
+ки → 基 ;
+кйо → 基奥 ;
+кон } $not_vowel → 孔 ;
+ко → 科 ;
+куй → 奎 ;
+кун } $not_vowel → 昆 ;
+ку → 库 ;
+кый → 克 ;
+кын } $not_vowel → 肯 ;
+кы → 克 ;
+кьи → 基 ;
+кью → 丘 ;
+кь → 基 ;
+кэй → 凯 ;
+кэн } $not_vowel → 肯 ;
+кэ → 凯 ;
+кю → 丘 ;
+кян } $not_vowel → 基扬 ;
+кя → 基亚 ;
+кё → 基奥 ;
+к → 克 ;
+лаи → 莱 ;
+лай → 莱 ;
+лан } $not_vowel → 兰 ;
+лао → 劳 ;
+лау → 劳 ;
+ла → 拉 ;
+лен } $not_vowel → 连 ;
+ле → 列 ;
+лий → 利 ;
+лин } $not_vowel → 林 ;
+ли → 利 ;
+лйо → 廖 ;
+лон } $not_vowel → 隆 ;
+ло → 洛 ;
+луй → 卢伊 ;
+лун } $not_vowel → 伦 ;
+лу → 卢 ;
+лый → 雷 ;
+лын } $not_vowel → 伦 ;
+лы → 雷 ;
+льи → 利 ;
+лью → 柳 ;
+ль → 利 ;
+лэй → 莱 ;
+лэн } $not_vowel → 伦 ;
+лэ → 莱 ;
+лю → 柳 ;
+лян } $not_vowel → 良 ;
+ля → 利亚 ;
+лё → 廖 ;
+л → 尔 ;
+маи → 迈 ;
+май → 迈 ;
+ман } $not_vowel → 曼 ;
+мао → 毛 ;
+мау → 毛 ;
+ма → 马 ;
+мен } $not_vowel → 缅 ;
+ме → 梅 ;
+мий → 米 ;
+мин } $not_vowel → 明 ;
+ми → 米 ;
+мйо → 苗 ;
+мон } $not_vowel → 蒙 ;
+мо → 莫 ;
+муй → 穆伊 ;
+мун } $not_vowel → 蒙 ;
+му → 穆 ;
+мый → 梅 ;
+мын } $not_vowel → 门 ;
+мы → 梅 ;
+мьи → 米 ;
+мью → 缪 ;
+мь → 米 ;
+мэй → 梅 ;
+мэн } $not_vowel → 门 ;
+мэ → 梅 ;
+мюн } $not_vowel → 敏 ;
+мю → 缪 ;
+мян } $not_vowel → 米扬 ;
+мя → 米亚 ;
+мё → 苗 ;
+м → 姆 ;
+наи → 奈 ;
+най → 奈 ;
+нан } $not_vowel → 南 ;
+нао → 瑙 ;
+нау → 瑙 ;
+на → 纳 ;
+нен } $not_vowel → 年 ;
+не → 涅 ;
+ний → 尼 ;
+нин } $not_vowel → 宁 ;
+ни → 尼 ;
+нйо → 尼奥 ;
+нон } $not_vowel → 农 ;
+но → 诺 ;
+нуй → 努伊 ;
+нун } $not_vowel → 农 ;
+ну → 努 ;
+ный → 内 ;
+нын } $not_vowel → 嫩 ;
+ны → 内 ;
+нь } $not_vowel → 尼 ;
+нэй → 内 ;
+нэн } $not_vowel → 嫩 ;
+нэ → 内 ;
+нюн } $not_vowel → 纽恩 ;
+ню → 纽 ;
+нян } $not_vowel → 尼扬 ;
+ня → 尼亚 ;
+нё → 尼奥 ;
+н } $not_vowel → 恩 ;
+он } $not_vowel → 翁 ;
+о → 奥 ;
+паи → 派 ;
+пай → 派 ;
+пан } $not_vowel → 潘 ;
+пао → 保 ;
+пау → 保 ;
+па → 帕 ;
+пен } $not_vowel → 片 ;
+пе → 佩 ;
+пий → 皮 ;
+пин } $not_vowel → 平 ;
+пи → 皮 ;
+пйо → 皮奥 ;
+пон } $not_vowel → 蓬 ;
+по → 波 ;
+пуй → 普伊 ;
+пун } $not_vowel → 蓬 ;
+пу → 普 ;
+пый → 佩 ;
+пын } $not_vowel → 彭 ;
+пы → 佩 ;
+пьи → 皮 ;
+пью → 皮尤 ;
+пь → 皮 ;
+пэй → 佩 ;
+пэн } $not_vowel → 彭 ;
+пэ → 佩 ;
+пю → 皮尤 ;
+пян } $not_vowel → 皮扬 ;
+пя → 皮亚 ;
+пё → 皮奥 ;
+п → 普 ;
+раи → 赖 ;
+рай → 赖 ;
+ран } $not_vowel → 兰 ;
+рао → 劳 ;
+рау → 劳 ;
+ра → 拉 ;
+рен } $not_vowel → 连 ;
+ре → 列 ;
+рий → 里 ;
+рин } $not_vowel → 林 ;
+ри → 里 ;
+рйо → 廖 ;
+рон } $not_vowel → 龙 ;
+ро → 罗 ;
+руй → 鲁伊 ;
+рун } $not_vowel → 伦 ;
+ру → 鲁 ;
+рый → 雷 ;
+рын } $not_vowel → 伦 ;
+ры → 雷 ;
+рьи → 里 ;
+рью → 留 ;
+рь → 里 ;
+рэй → 雷 ;
+рэн } $not_vowel → 伦 ;
+рэ → 雷 ;
+рю → 留 ;
+рян } $not_vowel → 良 ;
+ря → 里亚 ;
+рё → 廖 ;
+р → 尔 ;
+саи → 赛 ;
+сай → 赛 ;
+сан } $not_vowel → 桑 ;
+сао → 绍 ;
+сау → 绍 ;
+са → 萨 ;
+сен } $not_vowel → 先 ;
+се → 谢 ;
+сий → 西 ;
+син } $not_vowel → 辛 ;
+си → 西 ;
+сйо → 肖 ;
+сон } $not_vowel → 松 ;
+со → 索 ;
+суй → 绥 ;
+сун } $not_vowel → 孙 ;
+су → 苏 ;
+счаи → 夏伊 ;
+счай → 夏伊 ;
+счан } $not_vowel → 先 ;
+счао → 肖 ;
+счау → 肖 ;
+сча → 夏 ;
+счен } $not_vowel → 先 ;
+сче → 谢 ;
+счий → 希 ;
+счин } $not_vowel → 辛 ;
+счи → 希 ;
+счйо → 晓 ;
+счон } $not_vowel → 雄 ;
+счо → 晓 ;
+счуй → 休伊 ;
+счун } $not_vowel → 逊 ;
+счу → 休 ;
+счын } $not_vowel → 欣 ;
+счьи → 希 ;
+счью → 休 ;
+счь → 希 ;
+счэн } $not_vowel → 欣 ;
+счю → 休 ;
+счё → 晓 ;
+сч → 希 ;
+сый → 瑟 ;
+сын } $not_vowel → 森 ;
+сы → 瑟 ;
+сьи → 西 ;
+сью → 休 ;
+сь → 西 ;
+сэй → 塞 ;
+сэн } $not_vowel → 森 ;
+сэ → 塞 ;
+сюн } $not_vowel → 雄 ;
+сю → 休 ;
+сян } $not_vowel → 相 ;
+ся → 贾 ;
+сё → 肖 ;
+с → 斯 ;
+таи → 泰 ;
+тай → 泰 ;
+тан } $not_vowel → 坦 ;
+тао → 陶 ;
+тау → 陶 ;
+та → 塔 ;
+тен } $not_vowel → 坚 ;
+те → 捷 ;
+тий → 季 ;
+тин } $not_vowel → 京 ;
+ти → 季 ;
+тйо → 乔 ;
+тон } $not_vowel → 通 ;
+то → 托 ;
+тсаи → 采 ;
+тсай → 采 ;
+тсан } $not_vowel → 灿 ;
+тсао → 曹 ;
+тсау → 曹 ;
+тса → 察 ;
+тсен } $not_vowel → 岑 ;
+тсе → 采 ;
+тсий → 齐 ;
+тсин } $not_vowel → 钦 ;
+тси → 齐 ;
+тсон } $not_vowel → 聪 ;
+тсо → 措 ;
+тсуй → 崔 ;
+тсун } $not_vowel → 聪 ;
+тсу → 楚 ;
+тсый → 齐 ;
+тсын } $not_vowel → 岑 ;
+тсы → 齐 ;
+тсьи → 齐 ;
+тсью → 秋 ;
+тсь → 齐 ;
+тсэй → 采 ;
+тсэн } $not_vowel → 岑 ;
+тсэ → 采 ;
+тсю → 秋 ;
+тся → 齐亚 ;
+тс → 茨 ;
+туй → 图伊 ;
+тун } $not_vowel → 通 ;
+ту → 图 ;
+тцаи → 采 ;
+тцай → 采 ;
+тцан } $not_vowel → 灿 ;
+тцао → 曹 ;
+тцау → 曹 ;
+тца → 察 ;
+тцен } $not_vowel → 岑 ;
+тце → 采 ;
+тций → 齐 ;
+тцин } $not_vowel → 钦 ;
+тци → 齐 ;
+тцон } $not_vowel → 聪 ;
+тцо → 措 ;
+тцуй → 崔 ;
+тцун } $not_vowel → 聪 ;
+тцу → 楚 ;
+тцый → 齐 ;
+тцын } $not_vowel → 岑 ;
+тцы → 齐 ;
+тцьи → 齐 ;
+тцью → 秋 ;
+тць → 齐 ;
+тцэй → 采 ;
+тцэн } $not_vowel → 岑 ;
+тцэ → 采 ;
+тцю → 秋 ;
+тця → 齐亚 ;
+тц → 茨 ;
+тчаи → 柴 ;
+тчай → 柴 ;
+тчан } $not_vowel → 昌 ;
+тчао → 乔 ;
+тчау → 乔 ;
+тча → 恰 ;
+тчен } $not_vowel → 琴 ;
+тче → 切 ;
+тчий → 奇 ;
+тчин } $not_vowel → 钦 ;
+тчи → 奇 ;
+тчйо → 乔 ;
+тчон } $not_vowel → 琼 ;
+тчо → 乔 ;
+тчуй → 崔 ;
+тчун } $not_vowel → 春 ;
+тчу → 丘 ;
+тчый → 奇 ;
+тчын } $not_vowel → 琴 ;
+тчы → 奇 ;
+тчьи → 奇 ;
+тчь → 奇 ;
+тчэй → 切 ;
+тчэн } $not_vowel → 琴 ;
+тчэ → 切 ;
+тчян } $not_vowel → 强 ;
+тчё → 乔 ;
+тч → 奇 ;
+тый → 特 ;
+тын } $not_vowel → 滕 ;
+ты → 特 ;
+тьи → 季 ;
+тью → 秋 ;
+ть → 季 ;
+тэй → 泰 ;
+тэн } $not_vowel → 滕 ;
+тэ → 泰 ;
+тюн } $not_vowel → 琼 ;
+тю → 秋 ;
+тян } $not_vowel → 强 ;
+тя → 佳 ;
+тё → 乔 ;
+т → 特 ;
+уй → 维 ;
+ун } $not_vowel → 温 ;
+у → 乌 ;
+фаи → 法伊 ;
+фай → 法伊 ;
+фан } $not_vowel → 凡 ;
+фао → 福 ;
+фау → 福 ;
+фа → 法 ;
+фен } $not_vowel → 芬 ;
+фе → 费 ;
+фий → 菲 ;
+фин } $not_vowel → 芬 ;
+фи → 菲 ;
+фйо → 菲奥 ;
+фон } $not_vowel → 丰 ;
+фо → 福 ;
+фуй → 富伊 ;
+фун } $not_vowel → 丰 ;
+фу → 富 ;
+фый → 菲 ;
+фын } $not_vowel → 芬 ;
+фы → 菲 ;
+фьи → 菲 ;
+фью → 菲尤 ;
+фь → 菲 ;
+фэй → 费 ;
+фэн } $not_vowel → 芬 ;
+фэ → 费 ;
+фю → 菲尤 ;
+фя → 菲亚 ;
+фё → 菲奥 ;
+ф → 夫 ;
+хаи → 海 ;
+хай → 海 ;
+хан } $not_vowel → 汉 ;
+хао → 豪 ;
+хау → 豪 ;
+ха → 哈 ;
+хен } $not_vowel → 亨 ;
+хе → 赫 ;
+хий → 希 ;
+хин } $not_vowel → 欣 ;
+хи → 希 ;
+хон } $not_vowel → 洪 ;
+хо → 霍 ;
+хуй → 惠 ;
+хун } $not_vowel → 洪 ;
+ху → 胡 ;
+хый → 黑 ;
+хын } $not_vowel → 亨 ;
+хы → 黑 ;
+хьи → 希 ;
+хью → 休 ;
+хь → 希 ;
+хэй → 黑 ;
+хэн } $not_vowel → 亨 ;
+хэ → 海 ;
+хю → 休 ;
+хян } $not_vowel → 希扬 ;
+хя → 希亚 ;
+х → 赫 ;
+цаи → 采 ;
+цай → 采 ;
+цан } $not_vowel → 灿 ;
+цао → 曹 ;
+цау → 曹 ;
+ца → 察 ;
+цен } $not_vowel → 岑 ;
+це → 采 ;
+ций → 齐 ;
+цин } $not_vowel → 钦 ;
+ци → 齐 ;
+цон } $not_vowel → 聪 ;
+цо → 措 ;
+цсаи → 采 ;
+цсай → 采 ;
+цсан } $not_vowel → 灿 ;
+цсао → 曹 ;
+цсау → 曹 ;
+цса → 察 ;
+цсен } $not_vowel → 岑 ;
+цсе → 采 ;
+цсий → 齐 ;
+цсин } $not_vowel → 钦 ;
+цси → 齐 ;
+цсон } $not_vowel → 聪 ;
+цсо → 措 ;
+цсуй → 崔 ;
+цсун } $not_vowel → 聪 ;
+цсу → 楚 ;
+цсый → 齐 ;
+цсын } $not_vowel → 岑 ;
+цсы → 齐 ;
+цсьи → 齐 ;
+цсью → 秋 ;
+цсь → 齐 ;
+цсэй → 采 ;
+цсэн } $not_vowel → 岑 ;
+цсэ → 采 ;
+цсю → 秋 ;
+цся → 齐亚 ;
+цс → 茨 ;
+цуй → 崔 ;
+цун } $not_vowel → 聪 ;
+цу → 楚 ;
+цый → 齐 ;
+цын } $not_vowel → 岑 ;
+цы → 齐 ;
+цьи → 齐 ;
+цью → 秋 ;
+ць → 齐 ;
+цэй → 采 ;
+цэн } $not_vowel → 岑 ;
+цэ → 采 ;
+цю → 秋 ;
+ця → 齐亚 ;
+ц → 茨 ;
+чаи → 柴 ;
+чай → 柴 ;
+чан } $not_vowel → 昌 ;
+чао → 乔 ;
+чау → 乔 ;
+ча → 恰 ;
+чен } $not_vowel → 琴 ;
+че → 切 ;
+чий → 奇 ;
+чин } $not_vowel → 钦 ;
+чи → 奇 ;
+чйо → 乔 ;
+чон } $not_vowel → 琼 ;
+чо → 乔 ;
+чуй → 崔 ;
+чун } $not_vowel → 春 ;
+чу → 丘 ;
+чый → 奇 ;
+чын } $not_vowel → 琴 ;
+чы → 奇 ;
+чьи → 奇 ;
+чь → 奇 ;
+чэй → 切 ;
+чэн } $not_vowel → 琴 ;
+чэ → 切 ;
+чян } $not_vowel → 强 ;
+чё → 乔 ;
+ч → 奇 ;
+шаи → 沙伊 ;
+шай → 沙伊 ;
+шан } $not_vowel → 尚 ;
+шао → 绍 ;
+шау → 绍 ;
+ша → 沙 ;
+шен } $not_vowel → 申 ;
+ше → 舍 ;
+ший → 希 ;
+шин } $not_vowel → 申 ;
+ши → 希 ;
+шйо → 绍 ;
+шон } $not_vowel → 雄 ;
+шо → 绍 ;
+шуй → 舒伊 ;
+шун } $not_vowel → 顺 ;
+шу → 舒 ;
+шый → 希 ;
+шын } $not_vowel → 申 ;
+шы → 希 ;
+шьи → 希 ;
+шью → 舒 ;
+шь → 希 ;
+шэй → 舍 ;
+шэн } $not_vowel → 申 ;
+шэ → 舍 ;
+шю → 舒 ;
+шян } $not_vowel → 尚 ;
+шя → 沙 ;
+шё → 绍 ;
+ш → 什 ;
+щаи → 夏伊 ;
+щай → 夏伊 ;
+щан } $not_vowel → 先 ;
+щао → 肖 ;
+щау → 肖 ;
+ща → 夏 ;
+щен } $not_vowel → 先 ;
+ще → 谢 ;
+щий → 希 ;
+щин } $not_vowel → 辛 ;
+щи → 希 ;
+щйо → 晓 ;
+щон } $not_vowel → 雄 ;
+що → 晓 ;
+щуй → 休伊 ;
+щун } $not_vowel → 逊 ;
+щу → 休 ;
+щын } $not_vowel → 欣 ;
+щьи → 希 ;
+щью → 休 ;
+щь → 希 ;
+щэн } $not_vowel → 欣 ;
+щю → 休 ;
+щё → 晓 ;
+щ → 希 ;
+ъ → ;
+ый → 厄 ;
+ын } $not_vowel → 恩 ;
+ы → 厄 ;
+ьи → 伊 ;
+ью → 尤 ;
+ь → 伊 ;
+эй → 埃 ;
+эн } $not_vowel → 恩 ;
+э → 埃 ;
+юн } $not_vowel → 云 ;
+ю → 尤 ;
+ян } $not_vowel → 扬 ;
+я → 亚 ;
+ё → 约 ;
 :: Null ();
 $bow { 耶 → 叶 ;
 $bow { 夫 → 弗 ;
index 172f003ece685644ed2f1fd0201b5a7d51f48f13..2d453a3285e85109a229243b66600178d5e0da3d 100644 (file)
@@ -7,7 +7,7 @@
 # File: sk_FONIPA_ja.txt
 # Generated from CLDR 
 #
-$vowel = [aeiouw] ;       # Vowels and glides
+$vowel = [aeiouw] ; # Vowels and glides
 $not_vowel = [^$vowel] ;
 t \' → | t ʃ ;
 t \u0361 → | t ;
@@ -88,7 +88,7 @@ le → レ ;
 li → リ ;
 lo → ロ ;
 lu → ル ;
-l →  ル ;
+l → ル ;
 ma → マ ;
 me → メ ;
 mi → ミ ;
index 3f6474b3cf42943f2e528d4b7a541a287520058c..fd595ab0b33fae443c6d59e0642d1f8d01970ce2 100644 (file)
@@ -11,7 +11,7 @@ $soften = [ptťkcčsš$] ;
 :: NFC () ;
 :: Lower () ;
 ch → x ;
-dž } $soften → t \u0361 ʃ ;  # affricate indicated by ligature tie
+dž } $soften → t \u0361 ʃ ; # affricate indicated by ligature tie
 dz } $soften → t \u0361 s ;
 dž → d \u0361 ʒ ;
 dz → d \u0361 z ;
@@ -20,8 +20,8 @@ a → a ;
 ä → ɛ ;
 b } $soften → p ;
 b → b ;
-c → t \u0361 s;  # affricate indicated by ligature tie
-č → t \u0361 ʃ;  # affricate indicated by ligature tie
+c → t \u0361 s; # affricate indicated by ligature tie
+č → t \u0361 ʃ; # affricate indicated by ligature tie
 d } [ie] → ɟ ;
 d } $soften → t ;
 d → d ;
@@ -63,7 +63,7 @@ u → u ;
 ú → uː ;
 vz } $soften → fs ;
 v } $soften → f ;
-[ $] { v } ' ' $soften → f ;  # v as preposition
+[ $] { v } ' ' $soften → f ; # v as preposition
 v → v ;
 w → v ;
 x → ks ;
index ebebdbd59a380d4a3e5998e6c549048e9ce48a42..9b0cee7f12f591dcaec756cd4db22f23a76f11bd 100644 (file)
@@ -17,35 +17,35 @@ n } [aeiouü] → \'n;
 n → n\';
 :: Null ();
 Ai → Ай;
-A  → А;
-B  → Б;
+A → А;
+B → Б;
 Ch → Ч;
 Ci → Цы;
-C  → Ц;
-D  → Д;
-E  → Э;
-F  → Ф;
-G  → Г;
-H  → Х;
+C → Ц;
+D → Д;
+E → Э;
+F → Ф;
+G → Г;
+H → Х;
 Ju → Цз | ü;
-J  → Цз;
-K  → К;
-L  → Л;
-M  → М;
-N  → Н;
-O  → О;
-P  → П;
+J → Цз;
+K → К;
+L → Л;
+M → М;
+N → Н;
+O → О;
+P → П;
 Qu → Ц | ü;
-Q  → Ц;
-R  → Ж;
+Q → Ц;
+R → Ж;
 Sh → Ш;
 Si → Сы;
-S  → С;
-T  → Т;
+S → С;
+T → Т;
 Wu → У;
-W  → В;
+W → В;
 Xu → С | ü;
-X  → С;
+X → С;
 Yai → Яй;
 Ya → Я;
 Ye → Е;
@@ -56,57 +56,57 @@ Yo → Ё;
 Yu → Ю | v;
 Zh → Чж;
 Zi → Цзы;
-Z  → Цз;
+Z → Цз;
 [$] { n → н;
 \'n → н;
-\'  → ;
+\' → ;
 ai → ай;
-a  → а;
-b  → б;
+a → а;
+b → б;
 ch → ч;
 ci → цы;
-c  → ц;
-d  → д;
+c → ц;
+d → д;
 ei → эй;
-e  → э;
-f  → ф;
-g  → г;
-h  → х;
+e → э;
+f → ф;
+g → г;
+h → х;
 ia → я;
 ie → е;
 io } ng → ю;
 iu → ю;
-i  → и;
+i → и;
 ju → цз | ü;
-j  → цз;
-k  → к;
-l  → л;
-m  → м;
+j → цз;
+k → к;
+l → л;
+m → м;
 ng → н;
-n  → нь;
+n → нь;
 o } ng → у;
-o  → о;
-p  → п;
+o → о;
+p → п;
 qu → ц | ü;
-q  → ц;
+q → ц;
 r } [^aeiou] → р;
-r  → ж;
+r → ж;
 sh → ш;
 si → сы;
-s  → с;
-t  → т;
-[Хх] { ui → уэй;  # special exception
+s → с;
+t → т;
+[Хх] { ui → уэй; # special exception
 ui → уй;
 uo → о;
-u  → у;
-ü  → ю | v;
+u → у;
+ü → ю | v;
 ve → э;
 v } [an] → ;
-v  → й;
+v → й;
 wu → у;
-w  → в;
+w → в;
 xu → с | ü;
-x  → с;
+x → с;
 yai → яй;
 ya → я;
 ye → е;
@@ -117,5 +117,5 @@ yo → ё;
 yu → ю | v;
 zh → чж;
 zi → цзы;
-z  → цз;
+z → цз;
 :: NFC ();
diff --git a/icu4c/source/data/xml/brkitr/he.xml b/icu4c/source/data/xml/brkitr/he.xml
deleted file mode 100644 (file)
index 77a0e55..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2010 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-    <identity>
-        <version number="$Revision: 28846 $"/>
-        <generation date="$Date: 2010/10/17 22:15:00 $"/>
-        <language type="he"/> 
-    </identity>
-    <special xmlns:icu="http://www.icu-project.org/">
-        <icu:breakIteratorData>
-            <icu:boundaries>
-                <icu:line     icu:dependency="line_he.brk"/>
-            </icu:boundaries>
-        </icu:breakIteratorData>
-    </special>
-</ldml>
-
diff --git a/icu4c/source/data/xml/brkitr/th.xml b/icu4c/source/data/xml/brkitr/th.xml
deleted file mode 100644 (file)
index fa4824f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2010 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM "http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-    <identity>
-        <version number="$Revision: 1.1 $"/>
-        <generation date="$Date: 2006/04/21 00:54:07 $"/>
-        <language type="th"/> 
-    </identity>
-    <special xmlns:icu="http://www.icu-project.org/">
-        <icu:breakIteratorData>
-            <icu:boundaries>
-                <icu:grapheme icu:dependency="char_th.brk"/>
-            </icu:boundaries>
-        </icu:breakIteratorData>
-    </special>
-</ldml>
-
index eef41d140b103b537e8e64e9ee8e5dfb1be5e2ec..d7425ab7786f42dfa6c3ce466fb270b01fb0fb55 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/af.xml
  */
 af{
-    Version{"2.0.61.44"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "America:Mexico_City"{
             ec{"Meksiko"}
@@ -37,7 +37,6 @@ af{
             ss{"EAT"}
         }
         "meta:Africa_Southern"{
-            sg{"SAT"}
             ss{"SAST"}
         }
         "meta:Africa_Western"{
@@ -51,7 +50,9 @@ af{
             ls{"Alaska-standaardtyd"}
         }
         "meta:Amazon"{
+            ld{"Amasone-somertyd"}
             lg{"Amasone-tyd"}
+            ls{"Amasone-tyd"}
         }
         "meta:America_Central"{
             ld{"Sentrale dagligtyd"}
@@ -124,7 +125,9 @@ af{
             ls{"Choibalsan-tyd"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"Hawaii Aleutiese dagligtyd"}
             lg{"Hawaii Aleutiese tyd"}
+            ls{"Hawaii Aleutiese standaardtyd"}
         }
         "meta:Hovd"{
             ld{"Hovd-somertyd"}
@@ -132,13 +135,13 @@ af{
             ls{"Hovd-tyd"}
         }
         "meta:Indonesia_Central"{
-            lg{"Indonesië-sentraal-tyd"}
+            ls{"Indonesië-sentraal-tyd"}
         }
         "meta:Indonesia_Eastern"{
-            lg{"Indonesiese Oostelike tyd"}
+            ls{"Indonesiese Oostelike tyd"}
         }
         "meta:Indonesia_Western"{
-            lg{"Indonesiese Westelike tyd"}
+            ls{"Indonesiese Westelike tyd"}
         }
         "meta:Irkutsk"{
             ld{"Irkutsk-somertyd"}
@@ -171,7 +174,7 @@ af{
             ls{"Lord Howe-standaardtyd"}
         }
         "meta:Macquarie"{
-            lg{"Macquarie-tyd"}
+            ls{"Macquarie-tyd"}
         }
         "meta:Magadan"{
             ld{"Magadan-somertyd"}
index 7fb1d5a8c773bb55b28c02211116ce44d516b6de..7dac127fee018f9ad77f5ceae41add2d755b4ab5 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/am.xml
  */
 am{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"አቢጃን"}
@@ -1227,7 +1227,9 @@ am{
             ls{"የአላስካ መደበኛ የሰዓት አቆጣጠር"}
         }
         "meta:Amazon"{
+            ld{"የአማዞን የቀን ሰዓት አቆጣጠር"}
             lg{"የአማዞን ሰዓት አቆጣጠር"}
+            ls{"የአማዞን ሰዓት አቆጣጠር"}
         }
         "meta:America_Central"{
             ld{"የመካከላዊ የቀን ሰዓት አቆጣጠር"}
@@ -1300,7 +1302,9 @@ am{
             ls{"የቾይባልሳን ሰዓት አቆጣጠር"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"የሃዋይ አሌኡት የቀን ሰዓት አቆጣጠር"}
             lg{"የሃዋይ አሌኡት ሰዓት አቆጣጠር"}
+            ls{"የሃዋይ አሌኡት ሰዓት አቆጣጠር"}
         }
         "meta:Hovd"{
             ld{"የሆቭድ የበጋ ሰዓት አቆጣጠር"}
@@ -1308,13 +1312,13 @@ am{
             ls{"የሆቭድ የሰዓት አቆጣጠር"}
         }
         "meta:Indonesia_Central"{
-            lg{"የኢንዶኔዥያ መካከለኛ የሰዓት አቆጣጠር"}
+            ls{"የኢንዶኔዥያ መካከለኛ የሰዓት አቆጣጠር"}
         }
         "meta:Indonesia_Eastern"{
-            lg{"የኢንዶኔዥያ ምዕራባዊ ሰዓት አቆጣጠር"}
+            ls{"የኢንዶኔዥያ ምዕራባዊ ሰዓት አቆጣጠር"}
         }
         "meta:Indonesia_Western"{
-            lg{"የኢንዶኔዥያ ምስራቃዊ የሰዓት አቆጣጠር"}
+            ls{"የኢንዶኔዥያ ምስራቃዊ የሰዓት አቆጣጠር"}
         }
         "meta:Irkutsk"{
             ld{"ኢርኩትስክ የበጋ የሰዓት አቆጣጠር"}
@@ -1347,7 +1351,7 @@ am{
             ls{"የሎርድ ሆዌ መደበኛ የሰዓት አቆጣጠር"}
         }
         "meta:Macquarie"{
-            lg{"የማኳሪ የሰዓት አቆጣጠር"}
+            ls{"የማኳሪ የሰዓት አቆጣጠር"}
         }
         "meta:Magadan"{
             ld{"የማጋዳን በጋ ሰዓት አቆጣጠር"}
index 88063e335862cbb16bdaa8fb889c8136af2ad459..8fa1ef54c0f5fcd03f1ff19371ff5692dc27724e 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/ar.xml
  */
 ar{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"أبيدجان"}
@@ -1227,7 +1227,9 @@ ar{
             ls{"التوقيت الرسمي لألاسكا"}
         }
         "meta:Amazon"{
-            lg{"توقيت الأمازون"}
+            ld{"الأمازون التوقيت الصيفي"}
+            lg{"الأمازون الزمن"}
+            ls{"الأمازون الزمن"}
         }
         "meta:America_Central"{
             ld{"التوقيت الصيفي المركزي"}
@@ -1300,7 +1302,9 @@ ar{
             ls{"توقيت شويبالسان"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"توقيت هاواي أليوتيان الصيفي"}
             lg{"توقيت هاواي أليوتيان"}
+            ls{"توقيت هاواي أليوتيان"}
         }
         "meta:Hovd"{
             ld{"توقيت هوفد الصيفي"}
@@ -1308,13 +1312,13 @@ ar{
             ls{"توقيت هوفد"}
         }
         "meta:Indonesia_Central"{
-            lg{"توقيت إندونيسيا المركزي"}
+            ls{"توقيت إندونيسيا المركزي"}
         }
         "meta:Indonesia_Eastern"{
-            lg{"التوقيت الشرقي لإندونيسيا"}
+            ls{"التوقيت الشرقي لإندونيسيا"}
         }
         "meta:Indonesia_Western"{
-            lg{"التوقيت الغربي لإندونيسيا"}
+            ls{"التوقيت الغربي لإندونيسيا"}
         }
         "meta:Irkutsk"{
             ld{"توقيت إركوتسك الصيفي"}
@@ -1347,7 +1351,7 @@ ar{
             ls{"توقيت لورد هاو الرسمي"}
         }
         "meta:Macquarie"{
-            lg{"توقيت ماكواري"}
+            ls{"توقيت ماكواري"}
         }
         "meta:Magadan"{
             ld{"توقيت ماغادان الصيفي"}
index 9e4bd53856f0f17c1fd0aa621113b7d6606dec18..b2aa82d825ff81502f9d701a2eec444be9901120 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/az.xml
  */
 az{
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "Africa:Ceuta"{
             ec{"Seuta"}
@@ -476,14 +476,17 @@ az{
         }
         "meta:Europe_Central"{
             ld{"Orta Avropa/yay"}
+            lg{"Orta Avropa"}
             ls{"Orta Avropa"}
         }
         "meta:Europe_Eastern"{
             ld{"Şərq Avropa/yay"}
+            lg{"Şərq Avropa"}
             ls{"Şərq Avropa"}
         }
         "meta:Kuybyshev"{
             ld{"Kuybuşev/yay"}
+            lg{"Kuybuşev"}
             ls{"Kuybuşev"}
         }
         "meta:Moscow"{
@@ -493,14 +496,17 @@ az{
         }
         "meta:Samara"{
             ld{"Samara/yay"}
+            lg{"Samara"}
             ls{"Samara"}
         }
         "meta:Turkey"{
             ld{"Türkiya/yay"}
+            lg{"Türkiya"}
             ls{"Türkiya"}
         }
         "meta:Volgograd"{
             ld{"Volqoqrad/yay"}
+            lg{"Volqoqrad"}
             ls{"Volqoqrad"}
         }
     }
index c7cfd4f15feb1467fdf7b1cbe14ce592077c83ec..7ed74bdc2612986bb735cc8d9e143e4756532dc1 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/be.xml
  */
 be{
-    Version{"2.0.59.5"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "America:Anchorage"{
             ec{"Анкорыдж"}
@@ -75,14 +75,17 @@ be{
         }
         "meta:Europe_Central"{
             ld{"Цэнтральнаэўрапейскі летні час"}
+            lg{"Цэнтральнаэўрапейскі час"}
             ls{"Цэнтральнаэўрапейскі час"}
         }
         "meta:Europe_Eastern"{
             ld{"Усходнеэўрапейскі летні час"}
+            lg{"Усходнеэўрапейскі час"}
             ls{"Усходнеэўрапейскі час"}
         }
         "meta:Europe_Western"{
             ld{"Заходнеэўрапейскі летні час"}
+            lg{"Заходнеэўрапейскі час"}
             ls{"Заходнеэўрапейскі час"}
         }
         "meta:GMT"{
index 3e090c1644d4dd99cd6f9570a3722d60aa6a8d8a..97f730f4aacbd74ce253ffc8de83d257849ea647 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/bg.xml
  */
 bg{
-    Version{"2.0.59.68"}
+    Version{"2.0.62.33"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Абиджан"}
@@ -1223,12 +1223,9 @@ bg{
         }
         "meta:Alaska"{
             ld{"Лятна часова зона Аляска"}
-            lg{"Аляска"}
+            lg{"ЧаÑ\81ова Ð·Ð¾Ð½Ð° Ð\90лÑ\8fÑ\81ка"}
             ls{"Часова зона Аляска"}
         }
-        "meta:Amazon"{
-            lg{"Амазонка"}
-        }
         "meta:America_Central"{
             ld{"Американска централна лятна часова зона"}
             lg{"Централно време"}
@@ -1304,20 +1301,26 @@ bg{
         }
         "meta:Europe_Central"{
             ld{"Централноевропейска лятна часова зона"}
+            lg{"Централноевропейска часова зона"}
             ls{"Централноевропейска часова зона"}
         }
         "meta:Europe_Eastern"{
             ld{"Източноевропейска лятна часова зона"}
+            lg{"Източноевропейска часова зона"}
             ls{"Източноевропейска часова зона"}
         }
         "meta:Europe_Western"{
             ld{"Западноевропейско лятно време"}
+            lg{"Западноевропейска часова зона"}
+            ls{"Западноевропейска часова зона"}
         }
         "meta:GMT"{
             ls{"Часова зона Гринуич"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"Хавайско алеутско лятно време"}
             lg{"Хавайско алеутско време"}
+            ls{"Хавайско алеутско време"}
         }
         "meta:Hovd"{
             ld{"Ховд – лятно часово време"}
@@ -1325,13 +1328,13 @@ bg{
             ls{"Ховд"}
         }
         "meta:Indonesia_Central"{
-            lg{"Индонезия – централно време"}
+            ls{"Индонезия – централно време"}
         }
         "meta:Indonesia_Eastern"{
-            lg{"Индонезия – източно време"}
+            ls{"Индонезия – източно време"}
         }
         "meta:Indonesia_Western"{
-            lg{"Индонезия – западно време"}
+            ls{"Индонезия – западно време"}
         }
         "meta:Irkutsk"{
             ld{"Иркутск – лятно часово време"}
@@ -1340,10 +1343,12 @@ bg{
         }
         "meta:Israel"{
             ld{"Лятна часова зона Израел"}
+            lg{"Часова зона Израел"}
             ls{"Часова зона Израел"}
         }
         "meta:Japan"{
-            ld{"Японска часова зона"}
+            ld{"Японска часова зона - лятното часово време"}
+            lg{"Японска часова зона"}
             ls{"Японска часова зона"}
         }
         "meta:Kamchatka"{
@@ -1372,7 +1377,7 @@ bg{
             ls{"Лорд Хау – стандартно време"}
         }
         "meta:Macquarie"{
-            lg{"Маккуори"}
+            ls{"Маккуори"}
         }
         "meta:Magadan"{
             ld{"Магадан – лятно часово време"}
index 3cf9d4d32a51beb0b6dfead468e97c7734e04da2..12264b1ff907aeb4ea36283eeae51dcf9f9eab39 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/bn.xml
  */
 bn{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"আবিদজান"}
index a32d7b5358b2cd48cc352db843a41f5258fc5865..87ee073cc78921947f8ef216959bf1c4f1a8a5f7 100755 (executable)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/brx.xml
  */
 brx{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.77"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"अबिद्जान"}
@@ -1168,15 +1168,16 @@ brx{
             ls{"पूर्वी अफ्रीका स्टैंडर्ड टाईम"}
         }
         "meta:Africa_Southern"{
-            lg{"दक्षिण अफ्रीका टाईम"}
             ls{"दक्षिण अफ्रीका स्टैंडर्ड टाईम"}
         }
         "meta:Africa_Western"{
             ld{"पश्चीम अफ्रीका समर टाईम"}
+            lg{"पश्चीम अफ्रीका टाईम"}
             ls{"पश्चीम अफ्रीका स्टैंडर्ड टाईम"}
         }
         "meta:Aktyubinsk"{
             ld{"आक्त्युबीनस्क समर टाईम"}
+            lg{"आक्त्युबीनस्क टाईम"}
             ls{"आक्त्युबीनस्क स्टैंडर्ड टाईम"}
         }
         "meta:Alaska"{
@@ -1191,11 +1192,13 @@ brx{
         }
         "meta:Almaty"{
             ld{"अलमाटी समर टाईम"}
-            ls{"अलमाटी टाईम"}
+            lg{"अलमाटी टाईम"}
+            ls{"अलमाटी स्टैंडर्ड टाईम"}
         }
         "meta:Amazon"{
             ld{"अमाज़ोन समर टाईम"}
-            ls{"अमाज़ोन टाईम"}
+            lg{"अमाज़ोन टाईम"}
+            ls{"अमाज़ोन स्टैंडर्ड टाईम"}
         }
         "meta:America_Central"{
             ld{"सैंट्रल अमरिका डेलाईट टाईम"}
@@ -1219,15 +1222,18 @@ brx{
         }
         "meta:Anadyr"{
             ld{"अनादीर समर टाईम"}
-            ls{"अनादीर टाईम"}
+            lg{"अनादीर टाईम"}
+            ls{"अनादीर स्टैंडर्ड टाईम"}
         }
         "meta:Aqtau"{
             ld{"अक़्टाऊ समर टाईम"}
-            ls{"अक़्टाऊ टाईम"}
+            lg{"अक़्टाऊ टाईम"}
+            ls{"अक़्टाऊ स्टैंडर्ड टाईम"}
         }
         "meta:Aqtobe"{
             ld{"अक़्टोबे समर टाईम"}
-            ls{"अक़्टोबे टाईम"}
+            lg{"अक़्टोबे टाईम"}
+            ls{"अक़्टोबे स्टैंडर्ड टाईम"}
         }
         "meta:Arabian"{
             ld{"अरबी डेलाईट टाईम"}
@@ -1237,16 +1243,21 @@ brx{
         "meta:Argentina"{
             ld{"अर्जण्टिना समर टाईम"}
             lg{"अर्जनटिना टाईम"}
+            ls{"अर्जनटिना स्टैंडर्ड टाईम"}
         }
         "meta:Argentina_Western"{
+            ld{"पश्चीम अर्जण्टिना समर टाईम"}
+            lg{"पश्चीम अर्जण्टिना स्टैंडर्ड टाईम"}
             ls{"पश्चीम अर्जण्टिना स्टैंडर्ड टाईम"}
         }
         "meta:Armenia"{
             ld{"आरमीनी समर टाईम"}
+            lg{"आरमीनी टाईम"}
             ls{"आरमीनी स्टैंडर्ड टाईम"}
         }
         "meta:Ashkhabad"{
             ld{"अश्काबाद समर टाईम"}
+            lg{"अश्काबाद टाईम"}
             ls{"अश्काबाद स्टैंडर्ड टाईम"}
         }
         "meta:Atlantic"{
@@ -1276,17 +1287,22 @@ brx{
         }
         "meta:Azerbaijan"{
             ld{"आज़रबैजान समर टाईम"}
+            lg{"आज़रबैजान टाईम"}
             ls{"आज़रबैजान स्टैंडर्ड टाईम"}
         }
         "meta:Azores"{
             ld{"आज़ोर समर टाईम"}
+            lg{"आज़ोर टाईम"}
             ls{"आज़ोर स्टैंडर्ड टाईम"}
         }
         "meta:Baku"{
             ld{"बाकु समर टाईम"}
+            lg{"बाकु टाईम"}
             ls{"बाकु स्टैंडर्ड टाईम"}
         }
         "meta:Bangladesh"{
+            ld{"बांगलादेश समर टाईम"}
+            lg{"बांगलादेश टाईम"}
             ls{"बांगलादेश स्टैंडर्ड टाईम"}
         }
         "meta:Bering"{
@@ -1302,10 +1318,12 @@ brx{
         }
         "meta:Borneo"{
             ld{"बोर्नीओ समर टाईम"}
+            lg{"बोर्नीओ टाईम"}
             ls{"बोर्नीओ स्टैंडर्ड टाईम"}
         }
         "meta:Brasilia"{
             ld{"ब्राज़ीलिया समर टाईम"}
+            lg{"ब्राज़ीलिया टाईम"}
             ls{"ब्राज़ीलिया स्टैंडर्ड टाईम"}
         }
         "meta:Brunei"{
@@ -1313,10 +1331,10 @@ brx{
         }
         "meta:Cape_Verde"{
             ld{"काप वेर्दे समर टाईम"}
+            lg{"काप वेर्दे टाईम"}
             ls{"काप वेर्दे स्टैंडर्ड टाईम"}
         }
         "meta:Chamorro"{
-            lg{"चामरो टाईम"}
             ls{"चामरो स्टैंडर्ड टाईम"}
         }
         "meta:Changbai"{
@@ -1324,10 +1342,12 @@ brx{
         }
         "meta:Chatham"{
             ld{"चैथम डेलाईट टाईम"}
+            lg{"चैथम टाईम"}
             ls{"चैथम स्टैंडर्ड टाईम"}
         }
         "meta:Chile"{
             ld{"चीली समर टाईम"}
+            lg{"चीली टाईम"}
             ls{"चीली स्टैंडर्ड टाईम"}
         }
         "meta:China"{
@@ -1337,6 +1357,7 @@ brx{
         }
         "meta:Choibalsan"{
             ld{"चोईबालसान समर टाईम"}
+            lg{"चोईबालसान टाईम"}
             ls{"चोईबालसान स्टैंडर्ड टाईम"}
         }
         "meta:Christmas"{
@@ -1347,10 +1368,12 @@ brx{
         }
         "meta:Colombia"{
             ld{"कोलंबिया समर टाईम"}
+            lg{"कोलंबिया टाईम"}
             ls{"कोलंबिया स्टैंडर्ड टाईम"}
         }
         "meta:Cook"{
             ld{"कुक द्वीप अर्ध समर टाईम"}
+            lg{"कुक द्वीप टाईम"}
             ls{"कुक द्वीप स्टैंडर्ड टाईम"}
         }
         "meta:Cuba"{
@@ -1369,6 +1392,7 @@ brx{
         }
         "meta:Dushanbe"{
             ld{"दुशांबे समर टाईम"}
+            lg{"दुशांबे टाईम"}
             ls{"दुशांबे स्टैंडर्ड टाईम"}
         }
         "meta:Dutch_Guiana"{
@@ -1379,6 +1403,7 @@ brx{
         }
         "meta:Easter"{
             ld{"ईस्टर आईलंड समर टाईम"}
+            lg{"ईस्टर आईलंड टाईम"}
             ls{"ईस्टर आईलंड स्टैंडर्ड टाईम"}
         }
         "meta:Ecuador"{
@@ -1386,22 +1411,27 @@ brx{
         }
         "meta:Europe_Central"{
             ld{"मध्य यूरोप समर टाईम"}
+            lg{"मध्य यूरोप टाईम"}
             ls{"मध्य यूरोप स्टैंडर्ड टाईम"}
         }
         "meta:Europe_Eastern"{
             ld{"ईस्टर्न यूरोप समर टाईम"}
+            lg{"ईस्टर्न यूरोप टाईम"}
             ls{"ईस्टर्न यूरोप स्टैंडर्ड टाईम"}
         }
         "meta:Europe_Western"{
             ld{"वेस्टर्न यूरोप समर टाईम"}
+            lg{"वेस्टर्न यूरोप टाईम"}
             ls{"वेस्टर्न यूरोप स्टैंडर्ड टाईम"}
         }
         "meta:Falkland"{
             ld{"फ़ाल्कलैण्ड समर टाईम"}
+            lg{"फ़ाल्कलैण्ड टाईम"}
             ls{"फ़ाल्कलैण्ड स्टैंडर्ड टाईम"}
         }
         "meta:Fiji"{
             ld{"फीजी समर टाईम"}
+            lg{"फीजी टाईम"}
             ls{"फीजी स्टैंडर्ड टाईम"}
         }
         "meta:French_Guiana"{
@@ -1412,6 +1442,7 @@ brx{
         }
         "meta:Frunze"{
             ld{"फ़्रुन्ज़े समर टाईम"}
+            lg{"फ़्रुन्ज़े टाईम"}
             ls{"फ़्रुन्ज़े स्टैंडर्ड टाईम"}
         }
         "meta:GMT"{
@@ -1425,6 +1456,7 @@ brx{
         }
         "meta:Georgia"{
             ld{"जोर्जिया समर टाईम"}
+            lg{"जोर्जिया टाईम"}
             ls{"जोर्जिया स्टैंडर्ड टाईम"}
         }
         "meta:Gilbert_Islands"{
@@ -1432,35 +1464,41 @@ brx{
         }
         "meta:Greenland_Central"{
             ld{"ग्रीनलैण्ड सैन्ट्रल समर टाईम"}
+            lg{"ग्रीनलैण्ड सैन्ट्रल टाईम"}
             ls{"ग्रीनलैण्ड सैन्ट्रल स्टैंडर्ड टाईम"}
         }
         "meta:Greenland_Eastern"{
             ld{"ग्रीनलैण्ड ईस्टर्न समर टाईम"}
+            lg{"ग्रीनलैण्ड ईस्टर्न टाईम"}
             ls{"ग्रीनलैण्ड ईस्टर्न स्टैंडर्ड टाईम"}
         }
         "meta:Greenland_Western"{
             ld{"ग्रीनलैण्ड वेस्टर्न समर टाईम"}
+            lg{"ग्रीनलैण्ड वेस्टर्न टाईम"}
             ls{"ग्रीनलैण्ड वेस्टर्न स्टैंडर्ड टाईम"}
         }
         "meta:Guam"{
             ls{"गुआम स्टैंडर्ड टाईम"}
         }
         "meta:Gulf"{
-            lg{"गल्फ़ टाईम"}
             ls{"गल्फ़ स्टैंडर्ड टाईम"}
         }
         "meta:Guyana"{
             ls{"गुयाना स्टैंडर्ड टाईम"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"हवाई आलटन डेलाईट टाईम"}
+            lg{"हवाई आलटन टाईम"}
             ls{"हवाई आलटन स्टैंडर्ड टाईम"}
         }
         "meta:Hong_Kong"{
             ld{"हाँगकॉंग समर टाईम"}
+            lg{"हाँगकॉंग टाईम"}
             ls{"हाँगकॉंग स्टैंडर्ड टाईम"}
         }
         "meta:Hovd"{
             ld{"होव्ड समर टाईम"}
+            lg{"होव्ड टाईम"}
             ls{"होव्ड स्टैंडर्ड टाईम"}
         }
         "meta:India"{
@@ -1484,10 +1522,12 @@ brx{
         }
         "meta:Iran"{
             ld{"ईरान डेलाईट टाईम"}
+            lg{"ईरान टाईम"}
             ls{"ईरान स्टैंडर्ड टाईम"}
         }
         "meta:Irkutsk"{
             ld{"ईरकुर्त्स्क समर टाईम"}
+            lg{"ईरकुर्त्स्क टाईम"}
             ls{"ईरकुर्त्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Israel"{
@@ -1502,6 +1542,7 @@ brx{
         }
         "meta:Kamchatka"{
             ld{"पेत्रोपावलोस्क कामचटका समर टाईम"}
+            lg{"पेत्रोपावलोस्क कामचटका टाईम"}
             ls{"पेत्रोपावलोस्क कामचटका स्टैंडर्ड टाईम"}
         }
         "meta:Karachi"{
@@ -1511,15 +1552,14 @@ brx{
             ls{"कशगार स्टैंडर्ड टाईम"}
         }
         "meta:Kazakhstan_Eastern"{
-            lg{"क़ज़ाख़स्तान टाईम"}
-            ls{"क़ज़ाख़स्तान स्टैंडर्ड टाईम"}
+            ls{"क़ज़ाख़स्तान टाईम"}
         }
         "meta:Kazakhstan_Western"{
-            lg{"वेस्टर्न क़ज़ाख़स्तान टाईम"}
-            ls{"वेस्टर्न क़ज़ाख़स्तान स्टैंडर्ड टाईम"}
+            ls{"वेस्टर्न क़ज़ाख़स्तान टाईम"}
         }
         "meta:Kizilorda"{
             ld{"कीज़ीलोर्डा डेलाईट टाईम"}
+            lg{"कीज़ीलोर्डा टाईम"}
             ls{"कीज़ीलोर्डा स्टैंडर्ड टाईम"}
         }
         "meta:Korea"{
@@ -1532,10 +1572,12 @@ brx{
         }
         "meta:Krasnoyarsk"{
             ld{"क्रासनोयार्स्क समर टाईम"}
+            lg{"क्रासनोयार्स्क टाईम"}
             ls{"क्रासनोयार्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Kuybyshev"{
             ld{"कुयबिशेव समर टाईम"}
+            lg{"कुयबिशेव टाईम"}
             ls{"कुयबिशेव स्टैंडर्ड टाईम"}
         }
         "meta:Kwajalein"{
@@ -1560,10 +1602,12 @@ brx{
         }
         "meta:Macau"{
             ld{"माकाऊ समर टाईम"}
+            lg{"माकाऊ टाईम"}
             ls{"माकाऊ स्टैंडर्ड टाईम"}
         }
         "meta:Magadan"{
             ld{"मगदन समर टाईम"}
+            lg{"मगदन टाईम"}
             ls{"मगदन स्टैंडर्ड टाईम"}
         }
         "meta:Malaya"{
@@ -1589,6 +1633,7 @@ brx{
         }
         "meta:Mongolia"{
             ld{"मँगोलिया समर टाईम"}
+            lg{"मँगोलिया टाईम"}
             ls{"मँगोलिया स्टैंडर्ड टाईम"}
         }
         "meta:Moscow"{
@@ -1607,6 +1652,7 @@ brx{
         }
         "meta:New_Caledonia"{
             ld{"न्यु कैलेडोनिया समर टाईम"}
+            lg{"न्यु कैलेडोनिया टाईम"}
             ls{"न्यु कैलेडोनिया स्टैंडर्ड टाईम"}
         }
         "meta:New_Zealand"{
@@ -1627,6 +1673,7 @@ brx{
         }
         "meta:Noronha"{
             ld{"फेरनान्दो द नोरोन्हा समर टाईम"}
+            lg{"फेरनान्दो द नोरोन्हा टाईम"}
             ls{"फेरनान्दो द नोरोन्हा स्टैंडर्ड टाईम"}
         }
         "meta:North_Mariana"{
@@ -1634,14 +1681,17 @@ brx{
         }
         "meta:Novosibirsk"{
             ld{"नोवोसीबीर्स्क समर टाईम"}
+            lg{"नोवोसीबीर्स्क टाईम"}
             ls{"नोवोसीबीर्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Omsk"{
             ld{"ओम्स्क समर टाईम"}
+            lg{"ओम्स्क टाईम"}
             ls{"ओम्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Pakistan"{
             ld{"पाकिस्तान समर टाईम"}
+            lg{"पाकिस्तान टाईम"}
             ls{"पाकिस्तान स्टैंडर्ड टाईम"}
         }
         "meta:Palau"{
@@ -1652,14 +1702,17 @@ brx{
         }
         "meta:Paraguay"{
             ld{"पारागुए समर टाईम"}
+            lg{"पारागुए टाईम"}
             ls{"पारागुए स्टैंडर्ड टाईम"}
         }
         "meta:Peru"{
             ld{"पेरु समर टाईम"}
+            lg{"पेरु टाईम"}
             ls{"पेरु स्टैंडर्ड टाईम"}
         }
         "meta:Philippines"{
             ld{"फीलीपीन्स समर टाईम"}
+            lg{"फीलीपीन्स टाईम"}
             ls{"फीलीपीन्स स्टैंडर्ड टाईम"}
         }
         "meta:Phoenix_Islands"{
@@ -1678,6 +1731,7 @@ brx{
         }
         "meta:Qyzylorda"{
             ld{"क़ीज़ीलोर्डा समर टाईम"}
+            lg{"क़ीज़ीलोर्डा टाईम"}
             ls{"क़ीज़ीलोर्डा स्टैंडर्ड टाईम"}
         }
         "meta:Reunion"{
@@ -1688,14 +1742,17 @@ brx{
         }
         "meta:Sakhalin"{
             ld{"सख़ालीन समर टाईम"}
+            lg{"सख़ालीन टाईम"}
             ls{"सख़ालीन स्टैंडर्ड टाईम"}
         }
         "meta:Samara"{
             ld{"समारा समर टाईम"}
+            lg{"समारा टाईम"}
             ls{"समारा स्टैंडर्ड टाईम"}
         }
         "meta:Samarkand"{
             ld{"समरकंद समर टाईम"}
+            lg{"समरकंद स्टैंडर्ड टाईम"}
             ls{"समरकंद स्टैंडर्ड टाईम"}
         }
         "meta:Samoa"{
@@ -1706,6 +1763,7 @@ brx{
         }
         "meta:Shevchenko"{
             ld{"शेवचेनको समर टाईम"}
+            lg{"शेवचेनको टाईम"}
             ls{"शेवचेनको स्टैंडर्ड टाईम"}
         }
         "meta:Singapore"{
@@ -1722,6 +1780,7 @@ brx{
         }
         "meta:Sverdlovsk"{
             ld{"स्वेर्दलोव्स्क समर टाईम"}
+            lg{"स्वेर्दलोव्स्क टाईम"}
             ls{"स्वेर्दलोव्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Syowa"{
@@ -1735,10 +1794,12 @@ brx{
         }
         "meta:Tashkent"{
             ld{"ताशकंद समर टाईम"}
+            lg{"ताशकंद टाईम"}
             ls{"ताशकंद स्टैंडर्ड टाईम"}
         }
         "meta:Tbilisi"{
             ld{"तीबीलीसी समर टाईम"}
+            lg{"तीबीलीसी टाईम"}
             ls{"तीबीलीसी स्टैंडर्ड टाईम"}
         }
         "meta:Tokelau"{
@@ -1746,6 +1807,7 @@ brx{
         }
         "meta:Tonga"{
             ld{"टॉंगा समर टाईम"}
+            lg{"टॉंगा टाईम"}
             ls{"टॉंगा स्टैंडर्ड टाईम"}
         }
         "meta:Truk"{
@@ -1753,10 +1815,12 @@ brx{
         }
         "meta:Turkey"{
             ld{"तुर्की समर टाईम"}
+            lg{"तुर्की टाईम"}
             ls{"तुर्की स्टैंडर्ड टाईम"}
         }
         "meta:Turkmenistan"{
             ld{"तुर्कमेनीस्तान समर टाईम"}
+            lg{"तुर्कमेनीस्तान टाईम"}
             ls{"तुर्कमेनीस्तान स्टैंडर्ड टाईम"}
         }
         "meta:Tuvalu"{
@@ -1764,10 +1828,12 @@ brx{
         }
         "meta:Uralsk"{
             ld{"ऊरालस्क समर टाईम"}
+            lg{"ऊरालस्क टाईम"}
             ls{"ऊरालस्क स्टैंडर्ड टाईम"}
         }
         "meta:Uruguay"{
             ld{"ऊरुगुए समर टाईम"}
+            lg{"ऊरुगुए टाईम"}
             ls{"ऊरुगुए स्टैंडर्ड टाईम"}
         }
         "meta:Urumqi"{
@@ -1775,10 +1841,12 @@ brx{
         }
         "meta:Uzbekistan"{
             ld{"ऊज़्बेकिस्तान समर टाईम"}
+            lg{"ऊज़्बेकिस्तान टाईम"}
             ls{"ऊज़्बेकिस्तान स्टैंडर्ड टाईम"}
         }
         "meta:Vanuatu"{
             ld{"वनुआटु समर टाईम"}
+            lg{"वनुआटु टाईम"}
             ls{"वनुआटु स्टैंडर्ड टाईम"}
         }
         "meta:Venezuela"{
@@ -1786,10 +1854,12 @@ brx{
         }
         "meta:Vladivostok"{
             ld{"व्लादीवॉस्तॉक डेलाईट टाईम"}
+            lg{"व्लादीवॉस्तॉक टाईम"}
             ls{"व्लादीवॉस्तॉक स्टैंडर्ड टाईम"}
         }
         "meta:Volgograd"{
             ld{"वॉलगोग्राद समर टाईम"}
+            lg{"वॉलगोग्राद टाईम"}
             ls{"वॉलगोग्राद स्टैंडर्ड टाईम"}
         }
         "meta:Vostok"{
@@ -1803,14 +1873,17 @@ brx{
         }
         "meta:Yakutsk"{
             ld{"याकुट्स्क समर टाईम"}
+            lg{"याकुट्स्क टाईम"}
             ls{"याकुट्स्क स्टैंडर्ड टाईम"}
         }
         "meta:Yekaterinburg"{
             ld{"येकातेरीनाबुर्ग समर टाईम"}
+            lg{"येकातेरीनाबुर्ग टाईम"}
             ls{"येकातेरीनाबुर्ग स्टैंडर्ड टाईम"}
         }
         "meta:Yerevan"{
             ld{"येरेवान समर टाईम"}
+            lg{"येरेवान टाईम"}
             ls{"येरेवान स्टैंडर्ड टाईम"}
         }
         "meta:Yukon"{
index 17a85a727d94bacd38bfa658f45e314a2767ac16..130887ce57b738dd521867cece79f0e02ba896e7 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/bs.xml
  */
 bs{
-    Version{"2.0.59.84"}
+    Version{"2.0.62.77"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidžan"}
@@ -938,7 +938,8 @@ bs{
         }
         "meta:Acre"{
             ld{"Acre letnje računanje vremena"}
-            ls{"Acre vreme"}
+            lg{"Acre vreme"}
+            ls{"Acre standardno vreme"}
         }
         "meta:Afghanistan"{
             ls{"Avganistan vreme"}
@@ -950,16 +951,17 @@ bs{
             ls{"Istočna Afrika vreme"}
         }
         "meta:Africa_Southern"{
-            lg{"Južna Afrika vreme"}
             ls{"Južna Afrika standardno vreme"}
         }
         "meta:Africa_Western"{
             ld{"Zapadna Afrika letnje računanje vremena"}
-            ls{"Zapadna Afrika vreme"}
+            lg{"Zapadna Afrika vreme"}
+            ls{"Zapadna Afrika standardno vreme"}
         }
         "meta:Aktyubinsk"{
             ld{"Aktjubinsk letnje računanje vremena"}
-            ls{"Aktjubinsk vreme"}
+            lg{"Aktjubinsk vreme"}
+            ls{"Aktjubinsk standardno vreme"}
         }
         "meta:Alaska"{
             ld{"Aljaska letnje računanje vremena"}
@@ -973,11 +975,13 @@ bs{
         }
         "meta:Almaty"{
             ld{"Almatu letnje računanje vremena"}
-            ls{"Almatu vreme"}
+            lg{"Almatu vreme"}
+            ls{"Almatu standardno vreme"}
         }
         "meta:Amazon"{
             ld{"Amazon letnje računanje vremena"}
-            ls{"Amazon vreme"}
+            lg{"Amazon vreme"}
+            ls{"Amazon standardno vreme"}
         }
         "meta:America_Central"{
             ld{"Centralno letnje merenje vremena (SAD)"}
@@ -997,19 +1001,22 @@ bs{
         "meta:America_Pacific"{
             ld{"Pacifičko letnje računanje vremena (SAD)"}
             lg{"Pacifičko vreme (SAD)"}
-            ls{"Pacifičko vreme (SAD)"}
+            ls{"Pacifičko standardno vreme (SAD)"}
         }
         "meta:Anadyr"{
             ld{"Anadir letnje računanje vremena"}
-            ls{"Anadir vreme"}
+            lg{"Anadir vreme"}
+            ls{"Anadir standardno vreme"}
         }
         "meta:Aqtau"{
             ld{"Akvtau letnje računanje vremena"}
-            ls{"Akvtau vreme"}
+            lg{"Akvtau vreme"}
+            ls{"Akvtau standardno vreme"}
         }
         "meta:Aqtobe"{
             ld{"Akvtobe letnje računanje vremena"}
-            ls{"Akvtobe vreme"}
+            lg{"Akvtobe vreme"}
+            ls{"Akvtobe standardno vreme"}
         }
         "meta:Arabian"{
             ld{"Arapsko letnje računanje vremena"}
@@ -1018,18 +1025,23 @@ bs{
         }
         "meta:Argentina"{
             ld{"Argentina letnje računanje vremena"}
-            ls{"Argentina vreme"}
+            lg{"Argentina vreme"}
+            ls{"Argentina standardno vreme"}
         }
         "meta:Argentina_Western"{
-            ls{"Zapadna Argentina vreme"}
+            ld{"Zapadna Argentina letnje računanje vremena"}
+            lg{"Zapadna Argentina vreme"}
+            ls{"Zapadna Argentina standardno vreme"}
         }
         "meta:Armenia"{
             ld{"Armenija letnje računanje vremena"}
-            ls{"Armenija vreme"}
+            lg{"Armenija vreme"}
+            ls{"Armenija standardno vreme"}
         }
         "meta:Ashkhabad"{
             ld{"Aškabad letnje računanje vremena"}
-            ls{"Aškabad vreme"}
+            lg{"Aškabad vreme"}
+            ls{"Aškabad standardno vreme"}
         }
         "meta:Atlantic"{
             ld{"Atlantsko letnje računanje vremena"}
@@ -1058,18 +1070,23 @@ bs{
         }
         "meta:Azerbaijan"{
             ld{"Azerbejdžan letnje računanje vremena"}
-            ls{"Azerbejdžan vreme"}
+            lg{"Azerbejdžan vreme"}
+            ls{"Azerbejdžan standardno vreme"}
         }
         "meta:Azores"{
             ld{"Azori letnje računanje vremena"}
-            ls{"Azori vreme"}
+            lg{"Azori vreme"}
+            ls{"Azori standardno vreme"}
         }
         "meta:Baku"{
             ld{"Baku letnje računanje vremena"}
-            ls{"Baku vreme"}
+            lg{"Baku vreme"}
+            ls{"Baku standardno vreme"}
         }
         "meta:Bangladesh"{
-            ls{"Bangladeš vreme"}
+            ld{"Bangladeš letnje računanje vremena"}
+            lg{"Bangladeš vreme"}
+            ls{"Bangladeš standardno vreme"}
         }
         "meta:Bering"{
             ld{"Bering letnje računanje vremena"}
@@ -1084,21 +1101,23 @@ bs{
         }
         "meta:Borneo"{
             ld{"Borneo letnje računanje vremena"}
-            ls{"Borneo vreme"}
+            lg{"Borneo vreme"}
+            ls{"Borneo standardno vreme"}
         }
         "meta:Brasilia"{
             ld{"Brazilija letnje računanje vremena"}
-            ls{"Brazilija vreme"}
+            lg{"Brazilija vreme"}
+            ls{"Brazilija standardno vreme"}
         }
         "meta:Brunei"{
             ls{"Brunei Darusalam vreme"}
         }
         "meta:Cape_Verde"{
             ld{"Zelenortska ostrva letnje računanje vermena"}
-            ls{"Zelenortska ostrva vreme"}
+            lg{"Zelenortska ostrva vreme"}
+            ls{"Zelenortska ostrva standardno vreme"}
         }
         "meta:Chamorro"{
-            lg{"Čamoro vreme"}
             ls{"Čamoro standardno vreme"}
         }
         "meta:Changbai"{
@@ -1106,11 +1125,13 @@ bs{
         }
         "meta:Chatham"{
             ld{"Čatam letnje računanje vremena"}
+            lg{"Čatam vreme"}
             ls{"Čatam standardno vreme"}
         }
         "meta:Chile"{
             ld{"Čile letnje računanje vremena"}
-            ls{"Čile vreme"}
+            lg{"Čile vreme"}
+            ls{"Čile standardno vreme"}
         }
         "meta:China"{
             ld{"Kina letnje računanje vremena"}
@@ -1119,7 +1140,8 @@ bs{
         }
         "meta:Choibalsan"{
             ld{"Čojbalsan letnje računanje vremena"}
-            ls{"Čojbalsan vreme"}
+            lg{"Čojbalsan vreme"}
+            ls{"Čojbalsan standardno vreme"}
         }
         "meta:Christmas"{
             ls{"Božićna Ostrva vreme"}
@@ -1129,11 +1151,13 @@ bs{
         }
         "meta:Colombia"{
             ld{"Kolumbija letnje računanje vremena"}
-            ls{"Kolumbija vreme"}
+            lg{"Kolumbija vreme"}
+            ls{"Kolumbija standardno vreme"}
         }
         "meta:Cook"{
             ld{"Kukova ostrva, polu-letnje računanje vremena"}
-            ls{"Kukova ostrva vreme"}
+            lg{"Kukova ostrva vreme"}
+            ls{"Kukova ostrva standardno vreme"}
         }
         "meta:Cuba"{
             ld{"Kuba letnje računanje vremena"}
@@ -1151,7 +1175,8 @@ bs{
         }
         "meta:Dushanbe"{
             ld{"Dušanbe letnje računanje vremena"}
-            ls{"Dušanbe vreme"}
+            lg{"Dušanbe vreme"}
+            ls{"Dušanbe standardno vreme"}
         }
         "meta:Dutch_Guiana"{
             ls{"Holandska Gvijana vreme"}
@@ -1161,30 +1186,36 @@ bs{
         }
         "meta:Easter"{
             ld{"Uskršnja ostrva letnje računanje vremena"}
-            ls{"Uskršnja ostrva vreme"}
+            lg{"Uskršnja ostrva vreme"}
+            ls{"Uskršnja ostrva standardno vreme"}
         }
         "meta:Ecuador"{
             ls{"Ekvador vreme"}
         }
         "meta:Europe_Central"{
             ld{"Centralnoevropsko letnje računanje vremena"}
-            ls{"Centralnoevropsko vreme"}
+            lg{"Centralnoevropsko vreme"}
+            ls{"Centralnoevropsko standardno vreme"}
         }
         "meta:Europe_Eastern"{
             ld{"Istočnoevropsko letnje računanje vemena"}
-            ls{"Istočnoevropsko vreme"}
+            lg{"Istočnoevropsko vreme"}
+            ls{"Istočnoevropsko standardno vreme"}
         }
         "meta:Europe_Western"{
             ld{"Zapadno evropsko letnje računanje vremena"}
-            ls{"Zapadna evropsko vreme"}
+            lg{"Zapadna evropsko vreme"}
+            ls{"Zapadna evropsko standardno vreme"}
         }
         "meta:Falkland"{
             ld{"Folklandska ostrva letnje računanje vremena"}
-            ls{"Folklandska Ostrva vreme"}
+            lg{"Folklandska ostrva vreme"}
+            ls{"Folklandska ostrva standardno vreme"}
         }
         "meta:Fiji"{
             ld{"Fidži letnje računanje vremena"}
-            ls{"Fidži vreme"}
+            lg{"Fidži vreme"}
+            ls{"Fidži standardno vreme"}
         }
         "meta:French_Guiana"{
             ls{"Francuska Gvajana vreme"}
@@ -1194,7 +1225,8 @@ bs{
         }
         "meta:Frunze"{
             ld{"Frunze letnje računanje vremena"}
-            ls{"Frunze vreme"}
+            lg{"Frunze vreme"}
+            ls{"Frunze standardno vreme"}
         }
         "meta:GMT"{
             ls{"Grinvič vreme"}
@@ -1207,40 +1239,47 @@ bs{
         }
         "meta:Georgia"{
             ld{"Gruzija letnje računanje vremena"}
-            ls{"Gruzija vreme"}
+            lg{"Gruzija vreme"}
+            ls{"Gruzija standardno vreme"}
         }
         "meta:Greenland_Central"{
             ld{"Centralni Grenland letnje računanje vremena"}
-            ls{"Centralni Grenland vreme"}
+            lg{"Centralni Grenland vreme"}
+            ls{"Centralni Grenland standardno vreme"}
         }
         "meta:Greenland_Eastern"{
             ld{"Istočni Grenland letnje računanje vremena"}
-            ls{"Istočni Grenland vreme"}
+            lg{"Istočni Grenland vreme"}
+            ls{"Istočni Grenland standardno vreme"}
         }
         "meta:Greenland_Western"{
             ld{"Zapadni Grenland letnje računanje vremena"}
-            ls{"Zapadni Grenland vreme"}
+            lg{"Zapadni Grenland vreme"}
+            ls{"Zapadni Grenland standardno vreme"}
         }
         "meta:Guam"{
             ls{"Guam standardno vreme"}
         }
         "meta:Gulf"{
-            lg{"Zaliv vreme"}
             ls{"Zaliv standardno vreme"}
         }
         "meta:Guyana"{
             ls{"Gvajana vreme"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"Havaǰsko-aleućansko letnje računanje vremena"}
+            lg{"Havaǰsko-aleućansko vreme"}
             ls{"Havaǰsko-aleućansko standardno vreme"}
         }
         "meta:Hong_Kong"{
             ld{"Hong Kong letnje računanje vremena"}
-            ls{"Hong Kong vreme"}
+            lg{"Hong Kong vreme"}
+            ls{"Hong Kong standardno vreme"}
         }
         "meta:Hovd"{
             ld{"Hovd letnje računanje vremena"}
-            ls{"Hovd vreme"}
+            lg{"Hovd vreme"}
+            ls{"Hovd standardno vreme"}
         }
         "meta:India"{
             ls{"Indijsko standardno vreme"}
@@ -1262,14 +1301,17 @@ bs{
         }
         "meta:Iran"{
             ld{"Iran letnje računanje vremena"}
+            lg{"Iran vreme"}
             ls{"Iran standardno vreme"}
         }
         "meta:Irkutsk"{
             ld{"Irkuck letnje računanje vremena"}
-            ls{"Irkuck vreme"}
+            lg{"Irkuck vreme"}
+            ls{"Irkuck standardno vreme"}
         }
         "meta:Israel"{
             ld{"Izraelsko letnje računanje vremena"}
+            lg{"Izraelsko vreme"}
             ls{"Izraelsko standardno vreme"}
         }
         "meta:Japan"{
@@ -1279,7 +1321,8 @@ bs{
         }
         "meta:Kamchatka"{
             ld{"Petropavlovsk-Kamčatski letnje računanje vremena"}
-            ls{"Petropavlovsk-Kamčatski vreme"}
+            lg{"Petropavlovsk-Kamčatski vreme"}
+            ls{"Petropavlovsk-Kamčatski standardno vreme"}
         }
         "meta:Karachi"{
             ls{"Karači vreme"}
@@ -1288,15 +1331,14 @@ bs{
             ls{"Kašgar vreme"}
         }
         "meta:Kazakhstan_Eastern"{
-            lg{"Istočni Kazahstan vreme"}
-            ls{"Istočni Kazahstan standardno vreme"}
+            ls{"Istočni Kazahstan vreme"}
         }
         "meta:Kazakhstan_Western"{
-            lg{"Zapadni Kazahstan vreme"}
-            ls{"Zapadni Kazahstan standardno vreme"}
+            ls{"Zapadni Kazahstan vreme"}
         }
         "meta:Kizilorda"{
             ld{"Kizilorda letnje računanje vremena"}
+            lg{"Kizilorda vreme"}
             ls{"Kizilorda vreme"}
         }
         "meta:Korea"{
@@ -1309,11 +1351,13 @@ bs{
         }
         "meta:Krasnoyarsk"{
             ld{"Krasnojarsk letnje računanje vremena"}
-            ls{"Krasnojarsk vreme"}
+            lg{"Krasnojarsk vreme"}
+            ls{"Krasnojarsk standardno vreme"}
         }
         "meta:Kuybyshev"{
             ld{"Kujbišev letnje računanje vemena"}
-            ls{"Kujbišev vreme"}
+            lg{"Kujbišev vreme"}
+            ls{"Kujbišev standardno vreme"}
         }
         "meta:Kwajalein"{
             ls{"Kvajalejnsko vreme"}
@@ -1337,11 +1381,13 @@ bs{
         }
         "meta:Macau"{
             ld{"Makao letnje računanje vremena"}
-            ls{"Makao vreme"}
+            lg{"Makao vreme"}
+            ls{"Makao standardno vreme"}
         }
         "meta:Magadan"{
             ld{"Magadan letnje računanje vremena"}
-            ls{"Magadan vreme"}
+            lg{"Magadan vreme"}
+            ls{"Magadan standardno vreme"}
         }
         "meta:Malaya"{
             ls{"Malaja vreme"}
@@ -1360,14 +1406,16 @@ bs{
         }
         "meta:Mauritius"{
             ld{"Mauricijus letnje računanje vremena"}
-            ls{"Mauricijus vreme"}
+            lg{"Mauricijus vreme"}
+            ls{"Mauricijus standardno vreme"}
         }
         "meta:Mawson"{
             ls{"Moson vreme"}
         }
         "meta:Mongolia"{
             ld{"Ulan Bator letnje računanje vremena"}
-            ls{"Ulan Bator vreme"}
+            lg{"Ulan Bator vreme"}
+            ls{"Ulan Bator standardno vreme"}
         }
         "meta:Moscow"{
             ld{"Moskva letnje računanje vremena"}
@@ -1385,7 +1433,8 @@ bs{
         }
         "meta:New_Caledonia"{
             ld{"Nova Kaledonija letnje računanje vremena"}
-            ls{"Nova Kaledonija vreme"}
+            lg{"Nova Kaledonija vreme"}
+            ls{"Nova Kaledonija standardno vreme"}
         }
         "meta:New_Zealand"{
             ld{"Novi Zeland letnje računanje vremena"}
@@ -1405,22 +1454,26 @@ bs{
         }
         "meta:Noronha"{
             ld{"Fernando de Noronja letnje računanje vremena"}
-            ls{"Fernando de Noronja vreme"}
+            lg{"Fernando de Noronja vreme"}
+            ls{"Fernando de Noronja standardno vreme"}
         }
         "meta:North_Mariana"{
             ls{"Severna Marijanska Ostrva vreme"}
         }
         "meta:Novosibirsk"{
             ld{"Novosibirsk letnje računanje vremena"}
-            ls{"Novosibirsk vreme"}
+            lg{"Novosibirsk vreme"}
+            ls{"Novosibirsk standardno vreme"}
         }
         "meta:Omsk"{
             ld{"Omsk letnje računanje vremena"}
-            ls{"Omsk vreme"}
+            lg{"Omsk vreme"}
+            ls{"Omsk standardno vreme"}
         }
         "meta:Pakistan"{
             ld{"Pakistan letnje računanje vremena"}
-            ls{"Pakistan vreme"}
+            lg{"Pakistan vreme"}
+            ls{"Pakistan standardno vreme"}
         }
         "meta:Palau"{
             ls{"Palau vreme"}
@@ -1430,15 +1483,18 @@ bs{
         }
         "meta:Paraguay"{
             ld{"Paragvaj letnje računanje vremena"}
-            ls{"Paragvaj vreme"}
+            lg{"Paragvaj vreme"}
+            ls{"Paragvaj standardno vreme"}
         }
         "meta:Peru"{
             ld{"Peru letnje računanje vremena"}
-            ls{"Peru vreme"}
+            lg{"Peru vreme"}
+            ls{"Peru standardno vreme"}
         }
         "meta:Philippines"{
             ld{"Filipini letnje računanje vremena"}
-            ls{"Filipini vreme"}
+            lg{"Filipini vreme"}
+            ls{"Filipini standardno vreme"}
         }
         "meta:Phoenix_Islands"{
             ls{"Fenička ostrva vreme"}
@@ -1456,7 +1512,8 @@ bs{
         }
         "meta:Qyzylorda"{
             ld{"Kizilorda letnje računanje vremena"}
-            ls{"Kizilorda vreme"}
+            lg{"Kizilorda vreme"}
+            ls{"Kizilorda standardno vreme"}
         }
         "meta:Reunion"{
             ls{"Rejunion vreme"}
@@ -1466,15 +1523,18 @@ bs{
         }
         "meta:Sakhalin"{
             ld{"Sahalin letnje računanje vremena"}
-            ls{"Sahalin vreme"}
+            lg{"Sahalin vreme"}
+            ls{"Sahalin standardno vreme"}
         }
         "meta:Samara"{
             ld{"Samara letnje računanje vremena"}
-            ls{"Samara vreme"}
+            lg{"Samara vreme"}
+            ls{"Samara standardno vreme"}
         }
         "meta:Samarkand"{
             ld{"Samarkand letnje računanje vremena"}
-            ls{"Samarkand vreme"}
+            lg{"Samarkand vreme"}
+            ls{"Samarkand standardno vreme"}
         }
         "meta:Samoa"{
             ls{"Samoa standardno vreme"}
@@ -1484,7 +1544,8 @@ bs{
         }
         "meta:Shevchenko"{
             ld{"Ševčenko letnje računanje vremena"}
-            ls{"Ševčenko vreme"}
+            lg{"Ševčenko vreme"}
+            ls{"Ševčenko standardno vreme"}
         }
         "meta:Singapore"{
             ls{"Singapur standardno vreme"}
@@ -1500,7 +1561,8 @@ bs{
         }
         "meta:Sverdlovsk"{
             ld{"Sverdlovsk letnje računanje vremena"}
-            ls{"Sverdlovsk vreme"}
+            lg{"Sverdlovsk vreme"}
+            ls{"Sverdlovsk standardno vreme"}
         }
         "meta:Syowa"{
             ls{"Šova vreme"}
@@ -1513,62 +1575,73 @@ bs{
         }
         "meta:Tashkent"{
             ld{"Taškent letnje računanje vremena"}
-            ls{"Taškent vreme"}
+            lg{"Taškent vreme"}
+            ls{"Taškent standardno vreme"}
         }
         "meta:Tbilisi"{
             ld{"Tbilisi letnje računanje vremena"}
-            ls{"Tbilisi vreme"}
+            lg{"Tbilisi vreme"}
+            ls{"Tbilisi standardno vreme"}
         }
         "meta:Tokelau"{
             ls{"Tokelo vreme"}
         }
         "meta:Tonga"{
             ld{"Tonga letnje računanje vremena"}
-            ls{"Tonga vreme"}
+            lg{"Tonga vreme"}
+            ls{"Tonga standardno vreme"}
         }
         "meta:Truk"{
             ls{"Truk vreme"}
         }
         "meta:Turkey"{
             ld{"Turska letnje računanje vremena"}
-            ls{"Turska vreme"}
+            lg{"Turska vreme"}
+            ls{"Turska standardno vreme"}
         }
         "meta:Turkmenistan"{
             ld{"Turkmenistan letnje računanje vremena"}
-            ls{"Turkmenistan vreme"}
+            lg{"Turkmenistan vreme"}
+            ls{"Turkmenistan standardno vreme"}
         }
         "meta:Tuvalu"{
             ls{"Tuvalu vreme"}
         }
         "meta:Uralsk"{
             ld{"Ural'sk letnje računanje vremena"}
-            ls{"Ural'sk vreme"}
+            lg{"Ural'sk vreme"}
+            ls{"Ural'sk standardno vreme"}
         }
         "meta:Uruguay"{
             ld{"Urugvaj letnje računanje vremena"}
-            ls{"Urugvaj vreme"}
+            lg{"Urugvaj vreme"}
+            ls{"Urugvaj standardno vreme"}
         }
         "meta:Urumqi"{
             ls{"Urumki vreme"}
         }
         "meta:Uzbekistan"{
             ld{"Uzbekistan letnje računanje vremena"}
-            ls{"Uzbekistan vreme"}
+            lg{"Uzbekistan vreme"}
+            ls{"Uzbekistan standardno vreme"}
         }
         "meta:Vanuatu"{
             ld{"Vanuatu letnje računanje vremena"}
-            ls{"Vanuatu vreme"}
+            lg{"Vanuatu vreme"}
+            ls{"Vanuatu standardno vreme"}
         }
         "meta:Venezuela"{
             ls{"Venecuela vreme"}
         }
         "meta:Vladivostok"{
             ld{"Vladivostok letnje računanje vremena"}
-            ls{"Vladivostok vreme"}
+            lg{"Vladivostok vreme"}
+            ls{"Vladivostok standardno vreme"}
         }
         "meta:Volgograd"{
             ld{"Volgograd Letnje računanje vremena"}
-            ls{"Volgograd vreme"}
+            lg{"Volgograd vreme"}
+            ls{"Volgograd standardno vreme"}
         }
         "meta:Vostok"{
             ls{"Vostok vreme"}
@@ -1581,15 +1654,18 @@ bs{
         }
         "meta:Yakutsk"{
             ld{"Jakutsk letnje računanje vremena"}
-            ls{"Jakutsk vreme"}
+            lg{"Jakutsk vreme"}
+            ls{"Jakutsk standardno vreme"}
         }
         "meta:Yekaterinburg"{
             ld{"Jekaterinburg letnje računanje vremena"}
-            ls{"Jekaterinburg vreme"}
+            lg{"Jekaterinburg vreme"}
+            ls{"Jekaterinburg standardno vreme"}
         }
         "meta:Yerevan"{
             ld{"Jerevan letnje računanje vremena"}
-            ls{"Jerevan vreme"}
+            lg{"Jerevan vreme"}
+            ls{"Jerevan standardno vreme"}
         }
         "meta:Yukon"{
             ld{"Jukon letnje računanje vremena"}
index 076a0550a3f97b8b8e3441559b946389d9d57d2e..80078f6312d98ffe4c7bca580a2f068f48240d28 100755 (executable)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/chr.xml
  */
 chr{
-    Version{"2.0.59.5"}
+    Version{"2.0.62.29"}
     zoneStrings{
         "meta:America_Central"{
             ld{"ᎠᏰᎵ ᎢᎦ ᎢᏳᏩᎪᏗ"}
index efaa6295e805deb39b5cf17f9313c91fdb9086d5..fc66fb0e02ead587b586d7b0d025d0b82d6e2a29 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/cs.xml
  */
 cs{
-    Version{"2.0.59.84"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidžan"}
index d9d633c680a0e183cee765fdeb76e8ec70985576..8ee86014d303bc5d6aeea5c9261168d83d363f71 100755 (executable)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/ee.xml
  */
 ee{
-    Version{"2.0.61.44"}
+    Version{"2.0.61.87"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidzan nutomegaƒoƒome"}
index f76ff5500daf7127619f9d58aa806ff1ebfade8a..ef5a686babc0012e38d15c19a81b9bc84645d524 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/en.xml
  */
 en{
-    Version{"2.0.61.76"}
+    Version{"2.0.62.77"}
     zoneStrings{
         "Africa:Sao_Tome"{
             ec{"São Tomé"}
@@ -42,6 +42,11 @@ en{
         "Indian:Reunion"{
             ec{"Réunion"}
         }
+        "Pacific:Honolulu"{
+            sd{"HDT"}
+            sg{"HST"}
+            ss{"HST"}
+        }
         "meta:Acre"{
             ld{"Acre Summer Time"}
             lg{"Acre Time"}
@@ -62,12 +67,12 @@ en{
         "meta:Africa_Western"{
             ld{"West Africa Summer Time"}
             lg{"West Africa Time"}
-            ls{"West Africa Time"}
+            ls{"West Africa Standard Time"}
         }
         "meta:Aktyubinsk"{
             ld{"Aktyubinsk Summer Time"}
             lg{"Aktyubinsk Time"}
-            ls{"Aktyubinsk Time"}
+            ls{"Aktyubinsk Standard Time"}
         }
         "meta:Alaska"{
             ld{"Alaska Daylight Time"}
@@ -85,12 +90,12 @@ en{
         "meta:Almaty"{
             ld{"Almaty Summer Time"}
             lg{"Almaty Time"}
-            ls{"Almaty Time"}
+            ls{"Almaty Standard Time"}
         }
         "meta:Amazon"{
             ld{"Amazon Summer Time"}
             lg{"Amazon Time"}
-            ls{"Amazon Time"}
+            ls{"Amazon Standard Time"}
         }
         "meta:America_Central"{
             ld{"Central Daylight Time"}
@@ -127,17 +132,17 @@ en{
         "meta:Anadyr"{
             ld{"Anadyr Summer Time"}
             lg{"Anadyr Time"}
-            ls{"Anadyr Time"}
+            ls{"Anadyr Standard Time"}
         }
         "meta:Aqtau"{
             ld{"Aqtau Summer Time"}
             lg{"Aqtau Time"}
-            ls{"Aqtau Time"}
+            ls{"Aqtau Standard Time"}
         }
         "meta:Aqtobe"{
             ld{"Aqtobe Summer Time"}
             lg{"Aqtobe Time"}
-            ls{"Aqtobe Time"}
+            ls{"Aqtobe Standard Time"}
         }
         "meta:Arabian"{
             ld{"Arabian Daylight Time"}
@@ -147,22 +152,22 @@ en{
         "meta:Argentina"{
             ld{"Argentina Summer Time"}
             lg{"Argentina Time"}
-            ls{"Argentina Time"}
+            ls{"Argentina Standard Time"}
         }
         "meta:Argentina_Western"{
             ld{"Western Argentina Summer Time"}
             lg{"Western Argentina Time"}
-            ls{"Western Argentina Time"}
+            ls{"Western Argentina Standard Time"}
         }
         "meta:Armenia"{
             ld{"Armenia Summer Time"}
             lg{"Armenia Time"}
-            ls{"Armenia Time"}
+            ls{"Armenia Standard Time"}
         }
         "meta:Ashkhabad"{
             ld{"Ashkhabad Summer Time"}
             lg{"Ashkhabad Time"}
-            ls{"Ashkhabad Time"}
+            ls{"Ashkhabad Standard Time"}
         }
         "meta:Atlantic"{
             ld{"Atlantic Daylight Time"}
@@ -195,22 +200,22 @@ en{
         "meta:Azerbaijan"{
             ld{"Azerbaijan Summer Time"}
             lg{"Azerbaijan Time"}
-            ls{"Azerbaijan Time"}
+            ls{"Azerbaijan Standard Time"}
         }
         "meta:Azores"{
             ld{"Azores Summer Time"}
             lg{"Azores Time"}
-            ls{"Azores Time"}
+            ls{"Azores Standard Time"}
         }
         "meta:Baku"{
             ld{"Baku Summer Time"}
             lg{"Baku Time"}
-            ls{"Baku Time"}
+            ls{"Baku Standard Time"}
         }
         "meta:Bangladesh"{
             ld{"Bangladesh Summer Time"}
             lg{"Bangladesh Time"}
-            ls{"Bangladesh Time"}
+            ls{"Bangladesh Standard Time"}
         }
         "meta:Bering"{
             ld{"Bering Daylight Time"}
@@ -226,12 +231,12 @@ en{
         "meta:Borneo"{
             ld{"Borneo Summer Time"}
             lg{"Borneo Time"}
-            ls{"Borneo Time"}
+            ls{"Borneo Standard Time"}
         }
         "meta:Brasilia"{
             ld{"Brasilia Summer Time"}
             lg{"Brasilia Time"}
-            ls{"Brasilia Time"}
+            ls{"Brasilia Standard Time"}
         }
         "meta:Brunei"{
             ls{"Brunei Darussalam Time"}
@@ -239,7 +244,7 @@ en{
         "meta:Cape_Verde"{
             ld{"Cape Verde Summer Time"}
             lg{"Cape Verde Time"}
-            ls{"Cape Verde Time"}
+            ls{"Cape Verde Standard Time"}
         }
         "meta:Casey"{
             ls{"Casey Time"}
@@ -258,7 +263,7 @@ en{
         "meta:Chile"{
             ld{"Chile Summer Time"}
             lg{"Chile Time"}
-            ls{"Chile Time"}
+            ls{"Chile Standard Time"}
         }
         "meta:China"{
             ld{"China Daylight Time"}
@@ -268,7 +273,7 @@ en{
         "meta:Choibalsan"{
             ld{"Choibalsan Summer Time"}
             lg{"Choibalsan Time"}
-            ls{"Choibalsan Time"}
+            ls{"Choibalsan Standard Time"}
         }
         "meta:Christmas"{
             ls{"Christmas Island Time"}
@@ -279,12 +284,12 @@ en{
         "meta:Colombia"{
             ld{"Colombia Summer Time"}
             lg{"Colombia Time"}
-            ls{"Colombia Time"}
+            ls{"Colombia Standard Time"}
         }
         "meta:Cook"{
             ld{"Cook Islands Half Summer Time"}
             lg{"Cook Islands Time"}
-            ls{"Cook Islands Time"}
+            ls{"Cook Islands Standard Time"}
         }
         "meta:Cuba"{
             ld{"Cuba Daylight Time"}
@@ -303,7 +308,7 @@ en{
         "meta:Dushanbe"{
             ld{"Dushanbe Summer Time"}
             lg{"Dushanbe Time"}
-            ls{"Dushanbe Time"}
+            ls{"Dushanbe Standard Time"}
         }
         "meta:Dutch_Guiana"{
             ls{"Dutch Guiana Time"}
@@ -314,7 +319,7 @@ en{
         "meta:Easter"{
             ld{"Easter Island Summer Time"}
             lg{"Easter Island Time"}
-            ls{"Easter Island Time"}
+            ls{"Easter Island Standard Time"}
         }
         "meta:Ecuador"{
             ls{"Ecuador Time"}
@@ -322,27 +327,27 @@ en{
         "meta:Europe_Central"{
             ld{"Central European Summer Time"}
             lg{"Central European Time"}
-            ls{"Central European Time"}
+            ls{"Central European Standard Time"}
         }
         "meta:Europe_Eastern"{
             ld{"Eastern European Summer Time"}
             lg{"Eastern European Time"}
-            ls{"Eastern European Time"}
+            ls{"Eastern European Standard Time"}
         }
         "meta:Europe_Western"{
             ld{"Western European Summer Time"}
             lg{"Western European Time"}
-            ls{"Western European Time"}
+            ls{"Western European Standard Time"}
         }
         "meta:Falkland"{
             ld{"Falkland Islands Summer Time"}
             lg{"Falkland Islands Time"}
-            ls{"Falkland Islands Time"}
+            ls{"Falkland Islands Standard Time"}
         }
         "meta:Fiji"{
             ld{"Fiji Summer Time"}
             lg{"Fiji Time"}
-            ls{"Fiji Time"}
+            ls{"Fiji Standard Time"}
         }
         "meta:French_Guiana"{
             ls{"French Guiana Time"}
@@ -353,7 +358,7 @@ en{
         "meta:Frunze"{
             ld{"Frunze Summer Time"}
             lg{"Frunze Time"}
-            ls{"Frunze Time"}
+            ls{"Frunze Standard Time"}
         }
         "meta:GMT"{
             ls{"Greenwich Mean Time"}
@@ -368,7 +373,7 @@ en{
         "meta:Georgia"{
             ld{"Georgia Summer Time"}
             lg{"Georgia Time"}
-            ls{"Georgia Time"}
+            ls{"Georgia Standard Time"}
         }
         "meta:Gilbert_Islands"{
             ls{"Gilbert Islands Time"}
@@ -376,17 +381,17 @@ en{
         "meta:Greenland_Central"{
             ld{"Central Greenland Summer Time"}
             lg{"Central Greenland Time"}
-            ls{"Central Greenland Time"}
+            ls{"Central Greenland Standard Time"}
         }
         "meta:Greenland_Eastern"{
             ld{"East Greenland Summer Time"}
             lg{"East Greenland Time"}
-            ls{"East Greenland Time"}
+            ls{"East Greenland Standard Time"}
         }
         "meta:Greenland_Western"{
             ld{"West Greenland Summer Time"}
             lg{"West Greenland Time"}
-            ls{"West Greenland Time"}
+            ls{"West Greenland Standard Time"}
         }
         "meta:Guam"{
             ls{"Guam Standard Time"}
@@ -398,18 +403,22 @@ en{
             ls{"Guyana Time"}
         }
         "meta:Hawaii_Aleutian"{
+            ld{"Hawaii-Aleutian Daylight Time"}
+            lg{"Hawaii-Aleutian Time"}
             ls{"Hawaii-Aleutian Standard Time"}
-            ss{"HST"}
+            sd{"HADT"}
+            sg{"HAT"}
+            ss{"HAST"}
         }
         "meta:Hong_Kong"{
             ld{"Hong Kong Summer Time"}
             lg{"Hong Kong Time"}
-            ls{"Hong Kong Time"}
+            ls{"Hong Kong Standard Time"}
         }
         "meta:Hovd"{
             ld{"Hovd Summer Time"}
             lg{"Hovd Time"}
-            ls{"Hovd Time"}
+            ls{"Hovd Standard Time"}
         }
         "meta:India"{
             ls{"India Standard Time"}
@@ -437,7 +446,7 @@ en{
         "meta:Irkutsk"{
             ld{"Irkutsk Summer Time"}
             lg{"Irkutsk Time"}
-            ls{"Irkutsk Time"}
+            ls{"Irkutsk Standard Time"}
         }
         "meta:Israel"{
             ld{"Israel Daylight Time"}
@@ -452,7 +461,7 @@ en{
         "meta:Kamchatka"{
             ld{"Petropavlovsk-Kamchatski Summer Time"}
             lg{"Petropavlovsk-Kamchatski Time"}
-            ls{"Petropavlovsk-Kamchatski Time"}
+            ls{"Petropavlovsk-Kamchatski Standard Time"}
         }
         "meta:Karachi"{
             ls{"Karachi Time"}
@@ -469,7 +478,7 @@ en{
         "meta:Kizilorda"{
             ld{"Kizilorda Summer Time"}
             lg{"Kizilorda Time"}
-            ls{"Kizilorda Time"}
+            ls{"Kizilorda Standard Time"}
         }
         "meta:Korea"{
             ld{"Korean Daylight Time"}
@@ -482,12 +491,12 @@ en{
         "meta:Krasnoyarsk"{
             ld{"Krasnoyarsk Summer Time"}
             lg{"Krasnoyarsk Time"}
-            ls{"Krasnoyarsk Time"}
+            ls{"Krasnoyarsk Standard Time"}
         }
         "meta:Kuybyshev"{
             ld{"Kuybyshev Summer Time"}
             lg{"Kuybyshev Time"}
-            ls{"Kuybyshev Time"}
+            ls{"Kuybyshev Standard Time"}
         }
         "meta:Kwajalein"{
             ls{"Kwajalein Time"}
@@ -512,7 +521,7 @@ en{
         "meta:Macau"{
             ld{"Macau Summer Time"}
             lg{"Macau Time"}
-            ls{"Macau Time"}
+            ls{"Macau Standard Time"}
         }
         "meta:Macquarie"{
             ls{"Macquarie Island Time"}
@@ -520,7 +529,7 @@ en{
         "meta:Magadan"{
             ld{"Magadan Summer Time"}
             lg{"Magadan Time"}
-            ls{"Magadan Time"}
+            ls{"Magadan Standard Time"}
         }
         "meta:Malaya"{
             ls{"Malaya Time"}
@@ -540,7 +549,7 @@ en{
         "meta:Mauritius"{
             ld{"Mauritius Summer Time"}
             lg{"Mauritius Time"}
-            ls{"Mauritius Time"}
+            ls{"Mauritius Standard Time"}
         }
         "meta:Mawson"{
             ls{"Mawson Time"}
@@ -548,7 +557,7 @@ en{
         "meta:Mongolia"{
             ld{"Ulan Bator Summer Time"}
             lg{"Ulan Bator Time"}
-            ls{"Ulan Bator Time"}
+            ls{"Ulan Bator Standard Time"}
         }
         "meta:Moscow"{
             ld{"Moscow Summer Time"}
@@ -567,7 +576,7 @@ en{
         "meta:New_Caledonia"{
             ld{"New Caledonia Summer Time"}
             lg{"New Caledonia Time"}
-            ls{"New Caledonia Time"}
+            ls{"New Caledonia Standard Time"}
         }
         "meta:New_Zealand"{
             ld{"New Zealand Daylight Time"}
@@ -588,7 +597,7 @@ en{
         "meta:Noronha"{
             ld{"Fernando de Noronha Summer Time"}
             lg{"Fernando de Noronha Time"}
-            ls{"Fernando de Noronha Time"}
+            ls{"Fernando de Noronha Standard Time"}
         }
         "meta:North_Mariana"{
             ls{"North Mariana Islands Time"}
@@ -596,17 +605,17 @@ en{
         "meta:Novosibirsk"{
             ld{"Novosibirsk Summer Time"}
             lg{"Novosibirsk Time"}
-            ls{"Novosibirsk Time"}
+            ls{"Novosibirsk Standard Time"}
         }
         "meta:Omsk"{
             ld{"Omsk Summer Time"}
             lg{"Omsk Time"}
-            ls{"Omsk Time"}
+            ls{"Omsk Standard Time"}
         }
         "meta:Pakistan"{
             ld{"Pakistan Summer Time"}
             lg{"Pakistan Time"}
-            ls{"Pakistan Time"}
+            ls{"Pakistan Standard Time"}
         }
         "meta:Palau"{
             ls{"Palau Time"}
@@ -617,17 +626,17 @@ en{
         "meta:Paraguay"{
             ld{"Paraguay Summer Time"}
             lg{"Paraguay Time"}
-            ls{"Paraguay Time"}
+            ls{"Paraguay Standard Time"}
         }
         "meta:Peru"{
             ld{"Peru Summer Time"}
             lg{"Peru Time"}
-            ls{"Peru Time"}
+            ls{"Peru Standard Time"}
         }
         "meta:Philippines"{
             ld{"Philippine Summer Time"}
             lg{"Philippine Time"}
-            ls{"Philippine Time"}
+            ls{"Philippine Standard Time"}
         }
         "meta:Phoenix_Islands"{
             ls{"Phoenix Islands Time"}
@@ -646,7 +655,7 @@ en{
         "meta:Qyzylorda"{
             ld{"Qyzylorda Summer Time"}
             lg{"Qyzylorda Time"}
-            ls{"Qyzylorda Time"}
+            ls{"Qyzylorda Standard Time"}
         }
         "meta:Reunion"{
             ls{"Reunion Time"}
@@ -657,17 +666,17 @@ en{
         "meta:Sakhalin"{
             ld{"Sakhalin Summer Time"}
             lg{"Sakhalin Time"}
-            ls{"Sakhalin Time"}
+            ls{"Sakhalin Standard Time"}
         }
         "meta:Samara"{
             ld{"Samara Summer Time"}
             lg{"Samara Time"}
-            ls{"Samara Time"}
+            ls{"Samara Standard Time"}
         }
         "meta:Samarkand"{
             ld{"Samarkand Summer Time"}
             lg{"Samarkand Time"}
-            ls{"Samarkand Time"}
+            ls{"Samarkand Standard Time"}
         }
         "meta:Samoa"{
             ls{"Samoa Standard Time"}
@@ -678,7 +687,7 @@ en{
         "meta:Shevchenko"{
             ld{"Shevchenko Summer Time"}
             lg{"Shevchenko Time"}
-            ls{"Shevchenko Time"}
+            ls{"Shevchenko Standard Time"}
         }
         "meta:Singapore"{
             ls{"Singapore Standard Time"}
@@ -695,7 +704,7 @@ en{
         "meta:Sverdlovsk"{
             ld{"Sverdlovsk Summer Time"}
             lg{"Sverdlovsk Time"}
-            ls{"Sverdlovsk Time"}
+            ls{"Sverdlovsk Standard Time"}
         }
         "meta:Syowa"{
             ls{"Syowa Time"}
@@ -714,12 +723,12 @@ en{
         "meta:Tashkent"{
             ld{"Tashkent Summer Time"}
             lg{"Tashkent Time"}
-            ls{"Tashkent Time"}
+            ls{"Tashkent Standard Time"}
         }
         "meta:Tbilisi"{
             ld{"Tbilisi Summer Time"}
             lg{"Tbilisi Time"}
-            ls{"Tbilisi Time"}
+            ls{"Tbilisi Standard Time"}
         }
         "meta:Tokelau"{
             ls{"Tokelau Time"}
@@ -727,7 +736,7 @@ en{
         "meta:Tonga"{
             ld{"Tonga Summer Time"}
             lg{"Tonga Time"}
-            ls{"Tonga Time"}
+            ls{"Tonga Standard Time"}
         }
         "meta:Truk"{
             ls{"Chuuk Time"}
@@ -735,12 +744,12 @@ en{
         "meta:Turkey"{
             ld{"Turkey Summer Time"}
             lg{"Turkey Time"}
-            ls{"Turkey Time"}
+            ls{"Turkey Standard Time"}
         }
         "meta:Turkmenistan"{
             ld{"Turkmenistan Summer Time"}
             lg{"Turkmenistan Time"}
-            ls{"Turkmenistan Time"}
+            ls{"Turkmenistan Standard Time"}
         }
         "meta:Tuvalu"{
             ls{"Tuvalu Time"}
@@ -748,12 +757,12 @@ en{
         "meta:Uralsk"{
             ld{"Uralʹsk Summer Time"}
             lg{"Uralʹsk Time"}
-            ls{"Uralʹsk Time"}
+            ls{"Uralʹsk Standard Time"}
         }
         "meta:Uruguay"{
             ld{"Uruguay Summer Time"}
             lg{"Uruguay Time"}
-            ls{"Uruguay Time"}
+            ls{"Uruguay Standard Time"}
         }
         "meta:Urumqi"{
             ls{"Urumqi Time"}
@@ -761,7 +770,7 @@ en{
         "meta:Uzbekistan"{
             ld{"Uzbekistan Summer Time"}
             lg{"Uzbekistan Time"}
-            ls{"Uzbekistan Time"}
+            ls{"Uzbekistan Standard Time"}
         }
         "meta:Vanuatu"{
             ld{"Vanuatu Summer Time"}
@@ -774,12 +783,12 @@ en{
         "meta:Vladivostok"{
             ld{"Vladivostok Summer Time"}
             lg{"Vladivostok Time"}
-            ls{"Vladivostok Time"}
+            ls{"Vladivostok Standard Time"}
         }
         "meta:Volgograd"{
             ld{"Volgograd Summer Time"}
             lg{"Volgograd Time"}
-            ls{"Volgograd Time"}
+            ls{"Volgograd Standard Time"}
         }
         "meta:Vostok"{
             ls{"Vostok Time"}
@@ -793,17 +802,17 @@ en{
         "meta:Yakutsk"{
             ld{"Yakutsk Summer Time"}
             lg{"Yakutsk Time"}
-            ls{"Yakutsk Time"}
+            ls{"Yakutsk Standard Time"}
         }
         "meta:Yekaterinburg"{
             ld{"Yekaterinburg Summer Time"}
             lg{"Yekaterinburg Time"}
-            ls{"Yekaterinburg Time"}
+            ls{"Yekaterinburg Standard Time"}
         }
         "meta:Yerevan"{
             ld{"Yerevan Summer Time"}
             lg{"Yerevan Time"}
-            ls{"Yerevan Time"}
+            ls{"Yerevan Standard Time"}
         }
         "meta:Yukon"{
             ld{"Yukon Daylight Time"}
index 45c1e4bd8a516b864adb64fa4dce1b3f961c8440..df017f81242257914247afb64ef4b90f3a3d246d 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/es.xml
  */
 es{
-    Version{"2.0.60.15"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abiyán"}
index 035f706e73cb6b91f3da994573c89c10150b4a2b..e7e4f164ce3da6944d7a983dc28ce4e83e089ffb 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/fi.xml
  */
 fi{
-    Version{"2.0.59.68"}
+    Version{"2.0.62.84"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidjan"}
index 6f27524c0d11635f91cdeb1d5e0077eb987f953b..8d2a0ccb5cba452b654fe70bcc400f8a5974aa4b 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/fr.xml
  */
 fr{
-    Version{"2.0.61.44"}
+    Version{"2.0.62.75"}
     zoneStrings{
         "Africa:Addis_Ababa"{
             ec{"Addis-Abeba"}
index a18e603dc32aa00e8079b5b74098c07401e8a625..494c306afb3cb0a75de4d41b233f9c34e2b9f00a 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/hr.xml
  */
 hr{
-    Version{"2.0.61.44"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "Africa:Algiers"{
             ec{"Alžir"}
index 5c8971724c985eb714be4023a646c76e38144c55..fbbdb8e286e6f53a856694d9785b0326f3fc830d 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/ko.xml
  */
 ko{
-    Version{"2.0.59.68"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"아비장"}
index 5607981434c9f1ed280c2f0577ed2e063642c7ac..04b2dd761f45d8397eace4f3d88634621d97b475 100755 (executable)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/main/ln.xml
  */
 ln{
-    Version{"2.0.57.98"}
+    Version{"2.0.62.5"}
 }
index 59f9127a2524b2ee02595858712507eafe8d94b9..2417740568f1c6652320aaa868d44a51b94b7d2d 100644 (file)
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2011, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-ZONE_CLDR_VERSION = 2.0
+ZONE_CLDR_VERSION = 21.0
 # A list of txt's to build
 # Note:
 #
index 1dcda26b7f1f023a39f214ce2eb236bc206d4bc7..9b8903ab0246f43f47c5175db58f7aca40eb07ce 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/root.xml
  */
 root{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.84"}
     zoneStrings{
         ""{
             ec{""}
index cf80c6c1749feac0009e205ba7b23712f5822817..ce78e59872a104368a07c29e58a1aefd3f7e9557 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/sq.xml
  */
 sq{
-    Version{"2.0.59.32"}
+    Version{"2.0.62.69"}
     zoneStrings{
         "Etc:Unknown"{
             ec{"I panjohur"}
index d9b6494e84947ec3456a73abab5b3f2ceedc3ffc..9e61ed25d8ef368279658e00c4996798c332bc6a 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/te.xml
  */
 te{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.68"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"అబిడ్జాన్"}
index eaaa328a9631ef1ccb616d6458aac8d74beb7caa..bd198a542945f867f857f820189545f7a09c5dd6 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/ur.xml
  */
 ur{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.70"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"عابدجان"}
index 88d1f0c23573d7706de02f2111af071c2f76a381..8fdf2116dadbd504753db4c85314d054034b65e8 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/zh.xml
  */
 zh{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"阿比让"}
index 52ce86c6ede1e805ba321481202cb4a85413adf0..67180786cc1d6b68741d180b3fbcf3fde5d7fcf5 100644 (file)
@@ -7,7 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hans_SG{
-    Version{"2.0.58.84"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "America:Cambridge_Bay"{
             ec{"剑桥湾"}
index c1b4a8239991930fa1f7f46b5db5919d93771560..44253434ffc913834756163daa5316101b14b361 100644 (file)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/main/zh_Hant.xml
  */
 zh_Hant{
-    Version{"2.0.61.77"}
+    Version{"2.0.62.76"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"阿必尚"}
index dde2720d11937bcaa0df123f12a0664c7ede3088..8cf708d4340fd73f89bc4285df228ab37b760f79 100644 (file)
@@ -7,7 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
-    Version{"2.0.59.66"}
+    Version{"2.0.62.55"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"阿比贊"}
index 8ac62289bd67ad223c74c6fe7e3de4db11b30466..f0b5c65ff77467e047f99f3f941687ec6acb6d65 100644 (file)
@@ -2316,28 +2316,28 @@ void DateFormatTest::TestTimeZoneDisplayName()
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
-        { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
+        { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
-        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
+        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
-        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
+        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "VVVV", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
 
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
-        { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
+        { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
-        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
+        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
-        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
+        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "VVVV", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
 
         { "en", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
@@ -3064,11 +3064,11 @@ void DateFormatTest::TestTimeZoneDisplayName()
         // Tests proper handling of time zones that should have empty sets when inherited from the parent.
         // For example, en_GB understands CET as Central European Time, but en_HK, which inherits from en_GB
         // does not
-        { "en_GB", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Time", "+1:00"},
+        { "en_GB", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Standard Time", "+1:00"},
         { "en_GB", "Europe/Paris", "2004-07-15T00:00:00Z", "zzzz", "Central European Summer Time", "+2:00"},
         { "en_GB", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "CET", "+1:00"},
         { "en_GB", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "CEST", "+2:00"},
-        { "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Time", "+1:00"},
+        { "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "zzzz", "Central European Standard Time", "+1:00"},
         { "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "zzzz", "Central European Summer Time", "+2:00"},
         { "en_HK", "Europe/Paris", "2004-01-15T00:00:00Z", "z", "GMT+01:00", "+1:00"},
         { "en_HK", "Europe/Paris", "2004-07-15T00:00:00Z", "z", "GMT+02:00", "+2:00"},
@@ -3731,7 +3731,7 @@ void DateFormatTest::TestMonthPatterns()
 
     const MonthPatternItem items[] = {
         //                                          dateString
-        { "root@calendar=chinese",    DateFormat::kLong,  { UnicodeString("29 4 2"),                        UnicodeString("29 4bis 2"),                        UnicodeString("29 5 2") } },
+        { "root@calendar=chinese",    DateFormat::kLong,  { UnicodeString("29-4-2"),                        UnicodeString("29-4bis-2"),                        UnicodeString("29-5-2") } },
         { "root@calendar=chinese",    DateFormat::kShort, { UnicodeString("29-4-2"),                        UnicodeString("29-4bis-2"),                        UnicodeString("29-5-2") } },
         { "zh@calendar=chinese",      DateFormat::kLong,  { CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"), CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } },
         { "zh@calendar=chinese",      DateFormat::kShort, { UnicodeString("29-4-2"),                        CharsToUnicodeString("29-\\u95F04-2"),             UnicodeString("29-5-2") } },
index beaeae779e9f2fb85cd0cb9fef2c5875ae2160e6..e70a69cd71a33f802f695e9311c3e357228133b4 100644 (file)
@@ -1402,7 +1402,7 @@ void TransliteratorRoundTripTest::TestDevanagariLatin() {
 //        logln("Warning: TestDevanagariLatin needs to be updated to remove delete the section marked [:Age=4.1:] filter");
 //    }
     test.test(UnicodeString(latinForIndic, ""), 
-        UnicodeString("[[[:Devanagari:][\\u094d][\\u0964\\u0965]]&[:Age=4.1:]]", ""), "[\\u0965\\u0904]", this, quick, 
+        UnicodeString("[[[:Devanagari:][\\u094d][\\u0964\\u0965]]&[:Age=4.1:]]", ""), "[\\u0965\\u0904\\0970]", this, quick, 
             legal, 50);
 
     delete legal;
@@ -1413,52 +1413,52 @@ static const int32_t INTER_INDIC_ARRAY_WIDTH = 4;
 static const char * const interIndicArray[] = {
 
     "BENGALI-DEVANAGARI", "[:BENGALI:]", "[:Devanagari:]", 
-    "[\\u0904\\u0951-\\u0954\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u097d]", /*roundtrip exclusions*/
+    "[\\u0904\\u0951-\\u0954\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-BENGALI", "[:Devanagari:]", "[:BENGALI:]",
-    "[\\u0951-\\u0954\\u0951-\\u0954\\u09D7\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1\\u09f2-\\u09fa\\u09ce]", /*roundtrip exclusions*/
+    "[\\u0951-\\u0954\\u0951-\\u0954\\u09D7\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1\\u09f2-\\u09fa\\u09ce\\0970]", /*roundtrip exclusions*/
 
     "GURMUKHI-DEVANAGARI", "[:GURMUKHI:]", "[:Devanagari:]", 
-    "[\\u0904\\u0901\\u0902\\u0936\\u0933\\u0951-\\u0954\\u0902\\u0903\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u097d]", /*roundtrip exclusions*/
+    "[\\u0904\\u0901\\u0902\\u0936\\u0933\\u0951-\\u0954\\u0902\\u0903\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-GURMUKHI", "[:Devanagari:]", "[:GURMUKHI:]",
-    "[\\u0904\\u0A02\\u0946\\u0A5C\\u0951-\\u0954\\u0A70\\u0A71\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
+    "[\\u0904\\u0A02\\u0946\\u0A5C\\u0951-\\u0954\\u0A70\\u0A71\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74\\0970]", /*roundtrip exclusions*/
 
     "GUJARATI-DEVANAGARI", "[:GUJARATI:]", "[:Devanagari:]", 
-    "[\\u0946\\u094A\\u0962\\u0963\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912\\u097d]", /*roundtrip exclusions*/
+    "[\\u0946\\u094A\\u0962\\u0963\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-GUJARATI", "[:Devanagari:]", "[:GUJARATI:]",
-    "[\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912]", /*roundtrip exclusions*/
+    "[\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912\\0970]", /*roundtrip exclusions*/
 
     "ORIYA-DEVANAGARI", "[:ORIYA:]", "[:Devanagari:]", 
-    "[\\u0904\\u0943-\\u094a\\u0962\\u0963\\u0951-\\u0954\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\u0935\\u097d]", /*roundtrip exclusions*/
+    "[\\u0904\\u0943-\\u094a\\u0962\\u0963\\u0951-\\u0954\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\u0935\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-ORIYA", "[:Devanagari:]", "[:ORIYA:]",
-    "[\\u0b5f\\u0b56\\u0b57\\u0b70\\u0b71\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931]", /*roundtrip exclusions*/
+    "[\\u0b5f\\u0b56\\u0b57\\u0b70\\u0b71\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\0970]", /*roundtrip exclusions*/
 
     "Tamil-DEVANAGARI", "[:tamil:]", "[:Devanagari:]", 
-    "[\\u0901\\u0904\\u093c\\u0943-\\u094a\\u0951-\\u0954\\u0962\\u0963\\u090B\\u090C\\u090D\\u0911\\u0916\\u0917\\u0918\\u091B\\u091D\\u0920\\u0921\\u0922\\u0925\\u0926\\u0927\\u092B\\u092C\\u092D\\u0936\\u093d\\u0950[\\u0958-\\u0961]\\u097d]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u093c\\u0943-\\u094a\\u0951-\\u0954\\u0962\\u0963\\u090B\\u090C\\u090D\\u0911\\u0916\\u0917\\u0918\\u091B\\u091D\\u0920\\u0921\\u0922\\u0925\\u0926\\u0927\\u092B\\u092C\\u092D\\u0936\\u093d\\u0950[\\u0958-\\u0961]\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-Tamil", "[:Devanagari:]", "[:tamil:]", 
-    "[\\u0bd7\\u0BF0\\u0BF1\\u0BF2]", /*roundtrip exclusions*/
+    "[\\u0bd7\\u0BF0\\u0BF1\\u0BF2\\0970]", /*roundtrip exclusions*/
 
     "Telugu-DEVANAGARI", "[:telugu:]", "[:Devanagari:]", 
-    "[\\u0904\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d]", /*roundtrip exclusions*/
+    "[\\u0904\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-TELUGU", "[:Devanagari:]", "[:TELUGU:]",
-    "[\\u0c55\\u0c56\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
+    "[\\u0c55\\u0c56\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\0970]", /*roundtrip exclusions*/
 
     "KANNADA-DEVANAGARI", "[:KANNADA:]", "[:Devanagari:]", 
-    "[\\u0901\\u0904\\u0946\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u0946\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-KANNADA", "[:Devanagari:]", "[:KANNADA:]",
-    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cde\\u0cd5\\u0cd6\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/ 
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cde\\u0cd5\\u0cd6\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\0970]", /*roundtrip exclusions*/ 
 
     "MALAYALAM-DEVANAGARI", "[:MALAYALAM:]", "[:Devanagari:]", 
-    "[\\u0901\\u0904\\u094a\\u094b\\u094c\\u093c\\u0950\\u0944\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u094a\\u094b\\u094c\\u093c\\u0950\\u0944\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\u097d\\0970]", /*roundtrip exclusions*/
 
     "DEVANAGARI-MALAYALAM", "[:Devanagari:]", "[:MALAYALAM:]",
-    "[\\u0d4c\\u0d57\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
+    "[\\u0d4c\\u0d57\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]\\0970]", /*roundtrip exclusions*/
 
     "GURMUKHI-BENGALI", "[:GURMUKHI:]", "[:BENGALI:]",  
     "[\\u0981\\u0982\\u09b6\\u09e2\\u09e3\\u09c3\\u09c4\\u09d7\\u098B\\u098C\\u09B7\\u09E0\\u09E1\\u09F0\\u09F1\\u09f2-\\u09fa\\u09ce]", /*roundtrip exclusions*/
index 61d13336c01acf784bc13f3d754484a7c424b93e..697415485ff2a6e72df1fe96a8b829b10db258c7 100644 (file)
@@ -5198,6 +5198,110 @@ structLocale:table(nofallback){
                 "A4",
                 "A4",
             }
+            cyclicNameSets{
+                dayParts{
+                    format{
+                        abbreviated{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
+                    }
+                }
+                years{
+                    format{
+                        abbreviated{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
+                    }
+                }
+                zodiacs{
+                    format{
+                        abbreviated{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
+                    }
+                }
+            }
             intervalFormats{
                 H{
                     H{""}