X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..0f5d89e82340278ed3d7d50029f37cab2c41a57e:/icuSources/data/translit/Latin_NumericPinyin.txt

diff --git a/icuSources/data/translit/Latin_NumericPinyin.txt b/icuSources/data/translit/Latin_NumericPinyin.txt
index c1bfda85..316e0758 100644
--- a/icuSources/data/translit/Latin_NumericPinyin.txt
+++ b/icuSources/data/translit/Latin_NumericPinyin.txt
@@ -1,13 +1,14 @@
-#--------------------------------------------------------------------
-# Copyright (c) 1999-2004, International Business Machines
-# Corporation and others. All Rights Reserved.
-#--------------------------------------------------------------------
+# © 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html#License
+#
+# File: Latin_NumericPinyin.txt
+# Generated from CLDR
+#
 
 # According to the pinyin definitions I've been able to find:
 # 'a', 'e' are the preferred bases
 # otherwise 'o'
 # otherwise last vowel
-
 # The trailing form of syllables are the following:
 #         "a", "ai", "ao", "an", "ang",
 #         "o", "ou", "ong",
@@ -16,26 +17,19 @@
 #         "u", "ua", "uo", "uai", "ui", "uan", "un", "uang", "ueng",
 #         "ü", "üe", "üan", "ün"
 # so the letters the tone will 'hop' are:
-
 ::NFD (NFC);
 $tone = [\u0304\u0301\u030C\u0300\u0306] ;
-
 # Move the tone to the end of a syllable, and convert to number
-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);
 # The following backs up until it finds the right vowel, then deposits the tone
-
-$vowel = [aAeEiIoOuUüÜ];
+$vowel = [aAeEiIoOuU {u\u0308} {U\u0308} vV];
 $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);
 
-
-