summaryrefslogtreecommitdiff
path: root/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
diff options
context:
space:
mode:
Diffstat (limited to 'tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt')
-rw-r--r--tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt41
1 files changed, 35 insertions, 6 deletions
diff --git a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
index 3eda4f568..421b4eded 100644
--- a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
+++ b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
@@ -134,10 +134,15 @@
; /territoryInfo/$1/territoryF:intvector ; values=&exp($2) &exp($3,-2) &exp($4) ; base_xpath=//supplementalData/territoryInfo/territory[@type="$1"]
//supplementalData/calendarData/calendar[@type="(%W)"]/calendarSystem[@type="(%W)"] ; /calendarData/$1/system ; values=$2
-//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%W)"][@(start|end)="(%A)"][@named="(%W)"]
+//supplementalData/calendarData/calendar[@type="(%W)"]/inheritEras[@calendar="(%W)"] ; /calendarData/$1/inheritEras ; values=$2
+//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%N)"][@(start|end)="(%A)"][@named="(%W)"]
; /calendarData/$1/eras/$2/$3:intvector ; values=&ymd($4)
; /calendarData/$1/eras/$2/named ; values=$5
-//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%W)"][@(start|end)="(%A)"]
+//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%N)"][@(start|end)="(%A)"][@code="%A"][@aliases="%A"]
+ ; /calendarData/$1/eras/$2/$3:intvector ; values=&ymd($4)
+//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%N)"][@(start|end)="(%A)"][@code="%A"]
+ ; /calendarData/$1/eras/$2/$3:intvector ; values=&ymd($4)
+//supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%N)"][@(start|end)="(%A)"]
; /calendarData/$1/eras/$2/$3:intvector ; values=&ymd($4)
# units.xml
@@ -148,23 +153,45 @@
//supplementalData/unitQuantities/unitQuantity[@baseUnit="(%W)"][@quantity="(%W)"](?:[@status="%W"])?
; /unitQuantities/<FIFO>/$1 ; values="$2"
-//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"](?:[@systems="%W"])?
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"]
+ ; /convertUnits/$1/target ; values=$2
+ ; /convertUnits/$1/factor ; values=1
+
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"]
+ ; /convertUnits/$1/target ; values=$2
+ ; /convertUnits/$1/factor ; values="$3"
+
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@offset="(%A)"]
+ ; /convertUnits/$1/target ; values=$2
+ ; /convertUnits/$1/factor ; values=1
+ ; /convertUnits/$1/offset ; values=$3
+
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"][@offset="(%A)"]
+ ; /convertUnits/$1/target ; values=$2
+ ; /convertUnits/$1/factor ; values="$3"
+ ; /convertUnits/$1/offset ; values=$4
+
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@systems="(%W)"]
; /convertUnits/$1/target ; values=$2
; /convertUnits/$1/factor ; values=1
+ ; /convertUnits/$1/systems ; values="$3"
-//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"](?:[@systems="%W"])?
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"][@systems="(%W)"]
; /convertUnits/$1/target ; values=$2
; /convertUnits/$1/factor ; values="$3"
+ ; /convertUnits/$1/systems ; values="$4"
-//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@offset="(%A)"](?:[@systems="%W"])?
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@offset="(%A)"][@systems="(%W)"]
; /convertUnits/$1/target ; values=$2
; /convertUnits/$1/factor ; values=1
; /convertUnits/$1/offset ; values=$3
+ ; /convertUnits/$1/systems ; values="$4"
-//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"][@offset="(%A)"](?:[@systems="%W"])?
+//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"][@offset="(%A)"][@systems="(%W)"]
; /convertUnits/$1/target ; values=$2
; /convertUnits/$1/factor ; values="$3"
; /convertUnits/$1/offset ; values=$4
+ ; /convertUnits/$1/systems ; values="$5"
# note the following will go into metadata.txt, not units.txt
//supplementalData/metadata/alias/(unit|usage)Alias[@type="(%A)"][@replacement="(%A)"][@reason="(%A)"]
@@ -228,6 +255,7 @@
//supplementalData/languageMatching/languageMatches[@type="(%B)"]/languageMatch[@desired="(%A)"][@supported="(%A)"][@percent="(%N)"] ; /languageMatching/$1/<FIFO> ; values=$2 $3 $4 0
# likelySubtags.xml
+//supplementalData/likelySubtags/likelySubtag[@from="(%A)"][@to="(%A)"][@origin="%A"] ; /$1 ; values=$2
//supplementalData/likelySubtags/likelySubtag[@from="(%A)"][@to="(%A)"] ; /$1 ; values=$2
# metaZones.xml - metaZones.txt
@@ -258,6 +286,7 @@
//supplementalData/gender/personList[@type="(%W)"][@locales="(%W)"] ; /genderList/$2 ; values=$1
# locale info
+//supplementalData/parentLocales[@component="(%A)"]/parentLocale[@parent="(%A)"][@locales="(%A)"] ; /parentLocales%$1/$2 ; values=$3
//supplementalData/parentLocales/parentLocale[@parent="(%A)"][@locales="(%A)"] ; /parentLocales/$1 ; values=$2
# personName formats