ICU-461.12.tar.gz

[apple/icu.git] / icuSources / data / translit / Latin_NumericPinyin.txt

diff --git a/icuSources/data/translit/Latin_NumericPinyin.txt b/icuSources/data/translit/Latin_NumericPinyin.txt
index 18b29b0161940f3e957328d4df3c7adc722844e4..cc8ce2eca6718ff4d736225265ef852775d56bab 100644 (file)
--- a/icuSources/data/translit/Latin_NumericPinyin.txt
+++ b/icuSources/data/translit/Latin_NumericPinyin.txt
@@ -1,6 +1,6 @@
 # ***************************************************************************
 # *
 # ***************************************************************************
 # *

-# *  Copyright (C) 2004-2008, International Business Machines
+# *  Copyright (C) 2004-2010, International Business Machines

 # *  Corporation; Unicode, Inc.; and others.  All Rights Reserved.
 # *
 # ***************************************************************************
 # *  Corporation; Unicode, Inc.; and others.  All Rights Reserved.
 # *
 # ***************************************************************************


@@ -9,14 +9,14 @@
 #
 ::NFD (NFC);
 $tone = [\u0304\u0301\u030C\u0300\u0306] ;
 #
 ::NFD (NFC);
 $tone = [\u0304\u0301\u030C\u0300\u0306] ;

-e {($tone) r} > r &tone-digit($1);
-($tone) ( [i o n u {o n} {n g}]) > $2 &tone-digit($1);
-($tone) > &tone-digit($1);
+e {($tone) r} → r &Pinyin-NumericPinyin($1);
+($tone) ( [i o n u {o n} {n g}]) → $2 &Pinyin-NumericPinyin($1);
+($tone) → &Pinyin-NumericPinyin($1);

 $vowel = [aAeEiIoOuUüÜ {u\u0308} {U\u0308} ];
 $consonant = [[a-z A-Z] - [$vowel]];
 $digit = [1-5];
 $vowel = [aAeEiIoOuUüÜ {u\u0308} {U\u0308} ];
 $consonant = [[a-z A-Z] - [$vowel]];
 $digit = [1-5];

-$1 &digit-tone($3) $2 < ([aAeE]) ($vowel* $consonant*) ($digit);
-$1 &digit-tone($3) $2 < ([oO]) ([$vowel-[aeAE]]* $consonant*) ($digit);
-$1 &digit-tone($3) $2 < ($vowel) ($consonant*) ($digit);
-&digit-tone($1) < [:letter:] {($digit)};
+$1 &NumericPinyin-Pinyin($3) $2 ← ([aAeE]) ($vowel* $consonant*) ($digit);
+$1 &NumericPinyin-Pinyin($3) $2 ← ([oO]) ([$vowel-[aeAE]]* $consonant*) ($digit);
+$1 &NumericPinyin-Pinyin($3) $2 ← ($vowel) ($consonant*) ($digit);
+&NumericPinyin-Pinyin($1) ← [:letter:] {($digit)};

 ::NFC (NFD);
 ::NFC (NFD);