organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 22:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

Merge pull request #19 from hugovdm/units-staging

Browse source 
ICU-20568 Fix sorting of unitPreferenceData rules: units.xml
This commit is contained in:
Shane F. Carr 2020-02-25 13:56:21 -08:00 • committed by GitHub
commit 8ab3a3a828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
View file

@ -98,20 +98,6 @@
//supplementalData/measurementData/paperSize[@type="A4"][@territories="(%W)"] ; /measurementData/$1/PaperSize:intvector ; values=297 210
//supplementalData/measurementData/paperSize[@type="US-Letter"][@territories="(%W)"] ; /measurementData/$1/PaperSize:intvector ; values=279 216
# Quoting "$1" and "$2" in the output lets $3 expand space-separated regions: only the first unquoted output supports such expansion.
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/geq ; values=$4
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@skeleton="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/skeleton ; values=$4
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"][@skeleton="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/geq ; values=$4
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/skeleton ; values=$5
//supplementalData/territoryInfo/territory[@type="(%W)"][@gdp="(%N)"][@literacyPercent="(%N)"][@population="(%N)"]/languagePopulation[@type="(%W)"][@writingPercent="(%N)"][@populationPercent="(%N)"][@officialStatus="(%W)"](?:[@references="%W"])?
; /territoryInfo/$1/territoryF:intvector ; values=&exp($2) &exp($3,-2) &exp($4) ; base_xpath=//supplementalData/territoryInfo/territory[@type="$1"]
; /territoryInfo/$1/$5/writingShareF:int ; values=&exp($6,-2)
@ -191,6 +177,23 @@
; /convertUnits/$1/factor ; values="$3"
; /convertUnits/$1/reciprocal ; values=$4
# Quoting "$1" and "$2" in the output lets $3 expand space-separated regions: only the first unquoted output supports such expansion.
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/geq ; values=$4
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@skeleton="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/skeleton ; values=$4
//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"][@skeleton="(%A)"]
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/unit
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/geq ; values=$4
; /unitPreferenceData/"$1"/"$2"/$3/<FIFO>/skeleton ; values=$5
# languageInfo.xml
//supplementalData/languageMatching/languageMatches[@type="(%B)_new"]/paradigmLocales[@locales="(%A)"] ; /languageMatchingInfo/$1/paradigmLocales ; values=$2