From 1b900c35299257371f617331e6e11ea751ac3e90 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Tue, 21 Jan 2020 23:08:32 +0100 Subject: [PATCH 1/7] Some sample unitPreferences data for discussing output format. --- icu4c/source/data/misc/supplementalData.txt | 683 +++++++++----------- 1 file changed, 291 insertions(+), 392 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index cb4f618eaf2..049f522de1a 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35597,398 +35597,297 @@ supplementalData:table(nofallback){ } } unitPreferenceData{ - 001{ - area-land-agricult{"hectare"} - area-land-commercl{"hectare"} - area-land-residntl{"hectare"} - concentr-blood-glucose{"milligram-per-deciliter"} - consumption-vehicle-fuel{"liter-per-100kilometers"} - duration-music-track{"minute second"} - duration-person-age{"year-person month-person"} - duration-tv-program{"minute second"} - energy-food{"foodcalorie"} - energy-person-usage{"kilocalorie"} - length-person{"centimeter"} - length-person-small{"centimeter"} - length-rainfall{"millimeter"} - length-road{"kilometer"} - length-road-small{"meter"} - length-snowfall{"centimeter"} - length-vehicle{"meter"} - length-visiblty{"kilometer"} - length-visiblty-small{"meter"} - mass-person{"kilogram"} - mass-person-small{"gram"} - pressure-baromtrc{"hectopascal"} - speed-road-travel{"kilometer-per-hour"} - speed-wind{"kilometer-per-hour"} - temperature-person{"celsius"} - temperature-weather{"celsius"} - volume-vehicle-fuel{"liter"} - } - AG{ - concentr-blood-glucose{"millimole-per-liter"} - } - AI{ - concentr-blood-glucose{"millimole-per-liter"} - } - AO{ - concentr-blood-glucose{"millimole-per-liter"} - } - AT{ - length-person{"meter centimeter"} - } - AU{ - concentr-blood-glucose{"millimole-per-liter"} - } - BA{ - concentr-blood-glucose{"millimole-per-liter"} - } - BE{ - length-person{"meter centimeter"} - } - BG{ - concentr-blood-glucose{"millimole-per-liter"} - } - BH{ - concentr-blood-glucose{"millimole-per-liter"} - } - BM{ - concentr-blood-glucose{"millimole-per-liter"} - } - BN{ - concentr-blood-glucose{"millimole-per-liter"} - } - BR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-informal{"meter centimeter"} - length-rainfall{"centimeter"} - pressure-baromtrc{"millibar"} - } - BS{ - temperature-weather{"fahrenheit"} - } - BW{ - concentr-blood-glucose{"millimole-per-liter"} - } - BY{ - concentr-blood-glucose{"millimole-per-liter"} - } - BZ{ - temperature-weather{"fahrenheit"} - } - CA{ - concentr-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel-informal{"mile-per-gallon-imperial"} - length-person-informal{"foot inch"} - length-person-small-informal{"inch"} - } - CH{ - concentr-blood-glucose{"millimole-per-liter"} - } - CM{ - concentr-blood-glucose{"millimole-per-liter"} - } - CN{ - concentr-blood-glucose{"millimole-per-liter"} - length-person-informal{"meter centimeter"} - } - CZ{ - concentr-blood-glucose{"millimole-per-liter"} - } - DE{ - length-person-informal{"meter centimeter"} - length-visiblty{"meter"} - } - DK{ - concentr-blood-glucose{"millimole-per-liter"} - length-person-informal{"meter centimeter"} - } - DM{ - concentr-blood-glucose{"millimole-per-liter"} - } - DZ{ - length-person{"meter centimeter"} - mass-person-small{"kilogram gram"} - } - EE{ - concentr-blood-glucose{"millimole-per-liter"} - } - EG{ - length-person{"meter centimeter"} - mass-person-small{"kilogram gram"} - pressure-baromtrc{"millibar"} - } - ES{ - length-person{"meter centimeter"} - mass-person-small{"kilogram gram"} - } - FI{ - concentr-blood-glucose{"millimole-per-liter"} - speed-wind{"meter-per-second"} - } - FJ{ - concentr-blood-glucose{"millimole-per-liter"} - } - FR{ - length-person{"meter centimeter"} - } - GB{ - area-land-agricult{"acre"} - area-land-commercl{"acre"} - area-land-residntl{"acre"} - concentr-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel-informal{"mile-per-gallon-imperial"} - length-person-informal{"foot inch"} - length-person-small-informal{"inch"} - length-road{"mile"} - length-road-small{"yard"} - length-vehicle{"foot inch"} - length-visiblty{"mile"} - length-visiblty-small{"foot"} - mass-person{"stone pound"} - mass-person-small{"pound ounce"} - pressure-baromtrc{"millibar"} - speed-road-travel{"mile-per-hour"} - } - GD{ - concentr-blood-glucose{"millimole-per-liter"} - } - HK{ - concentr-blood-glucose{"millimole-per-liter"} - length-person{"meter centimeter"} - mass-person-small{"pound ounce"} - } - HR{ - concentr-blood-glucose{"millimole-per-liter"} - } - HU{ - concentr-blood-glucose{"millimole-per-liter"} - } - ID{ - length-person{"meter centimeter"} - } - IE{ - concentr-blood-glucose{"millimole-per-liter"} - } - IL{ - length-person{"meter centimeter"} - pressure-baromtrc{"millibar"} - } - IM{ - concentr-blood-glucose{"millimole-per-liter"} - } - IN{ - length-person-informal{"foot inch"} - length-person-small-informal{"inch"} - pressure-baromtrc{"inch-hg"} - } - IS{ - concentr-blood-glucose{"millimole-per-liter"} - } - IT{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person{"meter centimeter"} - } - JO{ - length-person{"meter centimeter"} - mass-person-small{"kilogram gram"} - } - JP{ - consumption-vehicle-fuel{"liter-per-kilometer"} - } - KE{ - concentr-blood-glucose{"millimole-per-liter"} - } - KN{ - concentr-blood-glucose{"millimole-per-liter"} - } - KR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - speed-wind{"meter-per-second"} - } - KW{ - concentr-blood-glucose{"millimole-per-liter"} - } - KY{ - temperature-weather{"fahrenheit"} - } - KZ{ - concentr-blood-glucose{"millimole-per-liter"} - } - LC{ - concentr-blood-glucose{"millimole-per-liter"} - } - LI{ - concentr-blood-glucose{"millimole-per-liter"} - } - LT{ - concentr-blood-glucose{"millimole-per-liter"} - } - LU{ - concentr-blood-glucose{"millimole-per-liter"} - } - LV{ - concentr-blood-glucose{"millimole-per-liter"} - } - ME{ - concentr-blood-glucose{"millimole-per-liter"} - } - MG{ - concentr-blood-glucose{"millimole-per-liter"} - } - MK{ - concentr-blood-glucose{"millimole-per-liter"} - } - MO{ - concentr-blood-glucose{"millimole-per-liter"} - } - MS{ - concentr-blood-glucose{"millimole-per-liter"} - } - MT{ - concentr-blood-glucose{"millimole-per-liter"} - } - MU{ - concentr-blood-glucose{"millimole-per-liter"} - } - MX{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-informal{"meter centimeter"} - length-vehicle{"meter centimeter"} - pressure-baromtrc{"millimeter-of-mercury"} - } - MY{ - concentr-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person{"meter centimeter"} - } - MZ{ - concentr-blood-glucose{"millimole-per-liter"} - } - NA{ - concentr-blood-glucose{"millimole-per-liter"} - } - NL{ - concentr-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel-informal{"liter-per-kilometer"} - length-person-informal{"meter centimeter"} - length-visiblty{"meter"} - } - NO{ - concentr-blood-glucose{"millimole-per-liter"} - length-person-informal{"meter centimeter"} - speed-wind{"meter-per-second"} - } - NZ{ - concentr-blood-glucose{"millimole-per-liter"} - } - OM{ - concentr-blood-glucose{"millimole-per-liter"} - } - PG{ - concentr-blood-glucose{"millimole-per-liter"} - } - PL{ - length-person-informal{"meter centimeter"} - speed-wind{"meter-per-second"} - } - PR{ - temperature-weather{"fahrenheit"} - } - PT{ - length-person-informal{"meter centimeter"} - } - PW{ - temperature-weather{"fahrenheit"} - } - RS{ - concentr-blood-glucose{"millimole-per-liter"} - } - RU{ - concentr-blood-glucose{"millimole-per-liter"} - length-person-informal{"meter centimeter"} - pressure-baromtrc{"millimeter-of-mercury"} - speed-wind{"meter-per-second"} - } - SA{ - length-person{"meter centimeter"} - mass-person-small{"kilogram gram"} - } - SE{ - concentr-blood-glucose{"millimole-per-liter"} - length-person{"meter centimeter"} - length-road-informal{"mile-scandinavian"} - speed-wind{"meter-per-second"} - } - SG{ - concentr-blood-glucose{"millimole-per-liter"} - } - SI{ - concentr-blood-glucose{"millimole-per-liter"} - } - SK{ - concentr-blood-glucose{"millimole-per-liter"} - } - TC{ - concentr-blood-glucose{"millimole-per-liter"} - } - TH{ - consumption-vehicle-fuel{"liter-per-kilometer"} - pressure-baromtrc{"millibar"} - } - TO{ - concentr-blood-glucose{"millimole-per-liter"} - } - TR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person{"meter centimeter"} - } - UA{ - concentr-blood-glucose{"millimole-per-liter"} - } - UG{ - concentr-blood-glucose{"millimole-per-liter"} - } - US{ - area-land-agricult{"acre"} - area-land-commercl{"acre"} - area-land-residntl{"acre"} - consumption-vehicle-fuel{"mile-per-gallon"} - length-person{"inch"} - length-person-informal{"foot inch"} - length-person-small{"inch"} - length-rainfall{"inch"} - length-road{"mile"} - length-road-small{"foot"} - length-snowfall{"inch"} - length-vehicle{"foot inch"} - length-visiblty{"mile"} - length-visiblty-small{"foot"} - mass-person{"pound"} - mass-person-small{"pound ounce"} - pressure-baromtrc{"inch-hg"} - speed-road-travel{"mile-per-hour"} - speed-wind{"mile-per-hour"} - temperature-person{"fahrenheit"} - temperature-weather{"fahrenheit"} - volume-vehicle-fuel{"gallon"} - } - VC{ - concentr-blood-glucose{"millimole-per-liter"} - } - VG{ - concentr-blood-glucose{"millimole-per-liter"} - } - VN{ - concentr-blood-glucose{"millimole-per-liter"} - length-person{"meter centimeter"} - } - VU{ - concentr-blood-glucose{"millimole-per-liter"} - } - ZA{ - concentr-blood-glucose{"millimole-per-liter"} + "area"{ + "geograph"{ + 001{ + square-kilometer{""} + } + GB{ + square-mile{""} + } + US{ + square-mile{""} + } + } + "land-agricult"{ + 001{ + hectare{""} + } + GB{ + acre{""} + } + US{ + acre{""} + } + } + "land-commercl"{ + 001{ + hectare{""} + } + GB{ + acre{""} + } + US{ + acre{""} + } + } + "land-residntl"{ + 001{ + hectare{""} + } + GB{ + acre{""} + } + US{ + acre{""} + } + } + _default{ + 001{ + square-kilometer{ + geq:1{""} + } + hectare{ + geq:1{""} + } + square-meter{ + geq:1{""} + } + square-centimeter{""} + } + } + } + "duration"{ + "music-track"{ + 001{ + minute+second{""} + } + } + "person-age"{ + 001{ + year-person+month-person{""} + } + } + "tv-program"{ + 001{ + minute+second{""} + } + } + _default{ + 001{ + year{ + geq:1{""} + } + month{ + geq:1{""} + } + day{ + geq:1{""} + } + hour{ + geq:1{""} + } + minute{ + geq:1{""} + } + second{ + geq:1{""} + } + millisecond{ + geq:1{""} + } + microsecond{ + geq:1{""} + } + nanosecond{""} + } + } + } + // DEMO: alt{"informal"}: + "length"{ + "road"{ + 001{ + kilometer{""} + } + GB{ + mile{""} + } + SE{ + mile-scandinavian{ + alt{"informal"} + } + } + US{ + mile{""} + } + // DEMO: Current hack for _small, proposing we drop this info and simply use geq: + _small{ + 001{ + meter{""} + } + GB{ + yard{""} + } + US{ + foot{""} + } + } + } + "road-travel"{ + 001{ + kilometer{ + geq:0.975{""} + } + meter{ + geq:300{ + skeleton{"precision-increment/50"} + } + skeleton{"precision-increment/10"} + } + } + GB{ + mile{ + geq:0.095{""} + } + yard{ + geq:300{ + skeleton{"precision-increment/50"} + } + skeleton{"precision-increment/10"} + } + } + US{ + mile{ + geq:0.095{""} + } + foot{ + geq:300{ + skeleton{"precision-increment/50"} + } + skeleton{"precision-increment/10"} + } + } + } + _default{ + 001{ + kilometer{ + geq:1{""} + } + meter{ + geq:1{""} + } + centimeter{ + geq:1{""} + } + millimeter{ + geq:1{""} + } + micrometer{ + geq:1{""} + } + nanometer{""} + } + GB{ + mile{ + geq:0.475{""} + } + foot{ + geq:1{""} + } + inch{""} + } + US{ + mile{ + geq:0.475{""} + } + foot{ + geq:1{""} + } + inch{""} + } + } + } + "mass"{ + _default{ + 001{ + metric-ton{ + geq:1{""} + } + kilogram{ + geq:1{""} + } + gram{ + geq:1{""} + } + milligram{ + geq:1{""} + } + microgram{""} + } + GB{ + stone{ + geq:1{""} + } + pound{ + geq:1{""} + } + ounce{""} + } + US{ + ton{ + geq:1{""} + } + pound{ + geq:1{""} + } + ounce{""} + } + } + } + "power"{ + _default{ + 001{ + gigawatt{ + geq:1{""} + } + megawatt{ + geq:1{""} + } + kilowatt{ + geq:1{""} + } + watt{ + geq:1{""} + } + milliwatt{""} + } + } + } + "pressure"{ + _default{ + 001{ + megapascal{ + geq:1{""} + } + kilopascal{ + geq:1{""} + } + pascal{""} + } + } + } + "volume"{ + _default{ + 001{ + cubic-meter{ + geq:1{""} + } + liter{ + geq:1{""} + } + milliliter{""} + } + } } } weekData{ From 43bd0aad26483be84f339e94bfcb391fc5ab0112 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Wed, 22 Jan 2020 18:00:49 +0100 Subject: [PATCH 2/7] supplementalData.txt: Add alt{""} in empty units to avoid mixed types. --- icu4c/source/data/misc/supplementalData.txt | 124 +++++++++++++++----- 1 file changed, 93 insertions(+), 31 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 049f522de1a..3e162495ee3 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35600,46 +35600,70 @@ supplementalData:table(nofallback){ "area"{ "geograph"{ 001{ - square-kilometer{""} + square-kilometer{ + alt{""} + } } GB{ - square-mile{""} + square-mile{ + alt{""} + } } US{ - square-mile{""} + square-mile{ + alt{""} + } } } "land-agricult"{ 001{ - hectare{""} + hectare{ + alt{""} + } } GB{ - acre{""} + acre{ + alt{""} + } } US{ - acre{""} + acre{ + alt{""} + } } } "land-commercl"{ 001{ - hectare{""} + hectare{ + alt{""} + } } GB{ - acre{""} + acre{ + alt{""} + } } US{ - acre{""} + acre{ + alt{""} + } } } "land-residntl"{ 001{ - hectare{""} + hectare{ + alt{""} + } } GB{ - acre{""} + acre{ + alt{""} + } } US{ - acre{""} + acre{ + alt{""} + } } } _default{ @@ -35660,17 +35684,23 @@ supplementalData:table(nofallback){ "duration"{ "music-track"{ 001{ - minute+second{""} + minute+second{ + alt{""} + } } } "person-age"{ 001{ - year-person+month-person{""} + year-person+month-person{ + alt{""} + } } } "tv-program"{ 001{ - minute+second{""} + minute+second{ + alt{""} + } } } _default{ @@ -35699,7 +35729,9 @@ supplementalData:table(nofallback){ microsecond{ geq:1{""} } - nanosecond{""} + nanosecond{ + alt{""} + } } } } @@ -35707,10 +35739,14 @@ supplementalData:table(nofallback){ "length"{ "road"{ 001{ - kilometer{""} + kilometer{ + alt{""} + } } GB{ - mile{""} + mile{ + alt{""} + } } SE{ mile-scandinavian{ @@ -35718,18 +35754,26 @@ supplementalData:table(nofallback){ } } US{ - mile{""} + mile{ + alt{""} + } } // DEMO: Current hack for _small, proposing we drop this info and simply use geq: _small{ 001{ - meter{""} + meter{ + alt{""} + } } GB{ - yard{""} + yard{ + alt{""} + } } US{ - foot{""} + foot{ + alt{""} + } } } } @@ -35785,7 +35829,9 @@ supplementalData:table(nofallback){ micrometer{ geq:1{""} } - nanometer{""} + nanometer{ + alt{""} + } } GB{ mile{ @@ -35794,7 +35840,9 @@ supplementalData:table(nofallback){ foot{ geq:1{""} } - inch{""} + inch{ + alt{""} + } } US{ mile{ @@ -35803,7 +35851,9 @@ supplementalData:table(nofallback){ foot{ geq:1{""} } - inch{""} + inch{ + alt{""} + } } } } @@ -35822,7 +35872,9 @@ supplementalData:table(nofallback){ milligram{ geq:1{""} } - microgram{""} + microgram{ + alt{""} + } } GB{ stone{ @@ -35831,7 +35883,9 @@ supplementalData:table(nofallback){ pound{ geq:1{""} } - ounce{""} + ounce{ + alt{""} + } } US{ ton{ @@ -35840,7 +35894,9 @@ supplementalData:table(nofallback){ pound{ geq:1{""} } - ounce{""} + ounce{ + alt{""} + } } } } @@ -35859,7 +35915,9 @@ supplementalData:table(nofallback){ watt{ geq:1{""} } - milliwatt{""} + milliwatt{ + alt{""} + } } } } @@ -35872,7 +35930,9 @@ supplementalData:table(nofallback){ kilopascal{ geq:1{""} } - pascal{""} + pascal{ + alt{""} + } } } } @@ -35885,7 +35945,9 @@ supplementalData:table(nofallback){ liter{ geq:1{""} } - milliliter{""} + milliliter{ + alt{""} + } } } } From 32f1f5e16cde6bd424729c762e6c5944777eb1aa Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Wed, 22 Jan 2020 19:45:37 +0100 Subject: [PATCH 3/7] Rework the samples, based on inability to iterate over paths. --- icu4c/source/data/misc/supplementalData.txt | 333 +++++++++++--------- 1 file changed, 179 insertions(+), 154 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 3e162495ee3..4cbddfe2639 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35600,137 +35600,148 @@ supplementalData:table(nofallback){ "area"{ "geograph"{ 001{ - square-kilometer{ - alt{""} + 0{ + unit{"square-kilometer"} } } GB{ - square-mile{ - alt{""} + 0{ + unit{"square-mile"} } } US{ - square-mile{ - alt{""} + 0{ + unit{"square-mile"} } } } "land-agricult"{ 001{ - hectare{ - alt{""} + 0{ + unit{"hectare"} } } GB{ - acre{ - alt{""} + 0{ + unit{"acre"} } } US{ - acre{ - alt{""} + 0{ + unit{"acre"} } } } "land-commercl"{ 001{ - hectare{ - alt{""} + 0{ + unit{"hectare"} } } GB{ - acre{ - alt{""} + 0{ + unit{"acre"} } } US{ - acre{ - alt{""} + 0{ + unit{"acre"} } } } "land-residntl"{ 001{ - hectare{ - alt{""} + 0{ + unit{"hectare"} } } GB{ - acre{ - alt{""} + 0{ + unit{"acre"} } } US{ - acre{ - alt{""} + 0{ + unit{"acre"} } } } _default{ 001{ - square-kilometer{ - geq:1{""} + 0{ + unit{"square-kilometer"} } - hectare{ - geq:1{""} + 1{ + unit{"hectare"} } - square-meter{ - geq:1{""} + 2{ + unit{"square-meter"} } - square-centimeter{""} + 3{ + unit{"square-centimeter"} + } } } } "duration"{ "music-track"{ 001{ - minute+second{ - alt{""} + 0{ + unit{"minute+second"} + } + 1{ + unit{"second"} } } } "person-age"{ 001{ - year-person+month-person{ - alt{""} + 0{ + unit{"year-person+month-person"} + } + 1{ + unit{"month-person"} } } } "tv-program"{ 001{ - minute+second{ - alt{""} + 0{ + unit{"minute+second"} + } + 1{ + unit{"second"} } } } _default{ 001{ - year{ - geq:1{""} + 0{ + unit{"year"} } - month{ - geq:1{""} + 1{ + unit{"month"} } - day{ - geq:1{""} + 2{ + unit{"day"} } - hour{ - geq:1{""} + 3{ + unit{"hour"} } - minute{ - geq:1{""} + 4{ + unit{"minute"} } - second{ - geq:1{""} + 5{ + unit{"second"} } - millisecond{ - geq:1{""} + 6{ + unit{"millisecond"} } - microsecond{ - geq:1{""} + 7{ + unit{"microsecond"} } - nanosecond{ - alt{""} + 8{ + unit{"nanosecond"} } } } @@ -35739,120 +35750,134 @@ supplementalData:table(nofallback){ "length"{ "road"{ 001{ - kilometer{ - alt{""} + 0{ + unit{"kilometer"} } } GB{ - mile{ - alt{""} + 0{ + unit{"mile"} } } SE{ - mile-scandinavian{ + 0{ + unit{"mile-scandinavian"} alt{"informal"} } } US{ - mile{ - alt{""} + 0{ + unit{"mile"} } } // DEMO: Current hack for _small, proposing we drop this info and simply use geq: _small{ 001{ - meter{ - alt{""} + 0{ + unit{"meter"} } } GB{ - yard{ - alt{""} + 0{ + unit{"yard"} } } US{ - foot{ - alt{""} + 0{ + unit{"foot"} } } } } "road-travel"{ 001{ - kilometer{ - geq:0.975{""} + 0{ + unit{"kilometer"} + geq{0.975} } - meter{ - geq:300{ - skeleton{"precision-increment/50"} - } + 1{ + unit{"meter"} + geq{300} + skeleton{"precision-increment/50"} + } + 2{ + unit{"meter"} skeleton{"precision-increment/10"} } } GB{ - mile{ - geq:0.095{""} + 0{ + unit{"mile"} + geq{0.095} } - yard{ - geq:300{ - skeleton{"precision-increment/50"} - } + 1{ + unit{"yard"} + geq{300} + skeleton{"precision-increment/50"} + } + unit{"yard"} skeleton{"precision-increment/10"} } } US{ - mile{ - geq:0.095{""} + 0{ + unit{"mile"} + geq{0.095} } - foot{ - geq:300{ - skeleton{"precision-increment/50"} - } + 1{ + unit{"foot"} + geq{300} + skeleton{"precision-increment/50"} + } + 2{ + unit{"foot"} skeleton{"precision-increment/10"} } } } _default{ 001{ - kilometer{ - geq:1{""} + 0{ + unit{"kilometer"} } - meter{ - geq:1{""} + 1{ + unit{"meter"} } - centimeter{ - geq:1{""} + 2{ + unit{"centimeter"} } - millimeter{ - geq:1{""} + 3{ + unit{"millimeter"} } - micrometer{ - geq:1{""} + 4{ + unit{"micrometer"} } - nanometer{ - alt{""} + 5{ + unit{"nanometer"} } } GB{ - mile{ - geq:0.475{""} + 0{ + unit{"mile"} + geq{0.475} } - foot{ - geq:1{""} + 1{ + unit{"foot"} } - inch{ - alt{""} + 2{ + unit{"inch"} } } US{ - mile{ - geq:0.475{""} + 0{ + unit{"mile"} + geq{0.475} } - foot{ - geq:1{""} + 1{ + unit{"foot"} } - inch{ - alt{""} + 2{ + unit{"inch"} } } } @@ -35860,42 +35885,42 @@ supplementalData:table(nofallback){ "mass"{ _default{ 001{ - metric-ton{ - geq:1{""} + 0{ + unit{"metric-ton"} } - kilogram{ - geq:1{""} + 1{ + unit{"kilogram"} } - gram{ - geq:1{""} + 2{ + unit{"gram"} } - milligram{ - geq:1{""} + 3{ + unit{"milligram"} } - microgram{ - alt{""} + 4{ + unit{"microgram"} } } GB{ - stone{ - geq:1{""} + 0{ + unit{"stone"} } - pound{ - geq:1{""} + 1{ + unit{"pound"} } - ounce{ - alt{""} + 2{ + unit{"ounce"} } } US{ - ton{ - geq:1{""} + 0{ + unit{"ton"} } - pound{ - geq:1{""} + 1{ + unit{"pound"} } - ounce{ - alt{""} + 2{ + unit{"ounce"} } } } @@ -35903,20 +35928,20 @@ supplementalData:table(nofallback){ "power"{ _default{ 001{ - gigawatt{ - geq:1{""} + 0{ + unit{"gigawatt"} } - megawatt{ - geq:1{""} + 1{ + unit{"megawatt"} } - kilowatt{ - geq:1{""} + 2{ + unit{"kilowatt"} } - watt{ - geq:1{""} + 3{ + unit{"watt"} } - milliwatt{ - alt{""} + 4{ + unit{"milliwatt"} } } } @@ -35924,14 +35949,14 @@ supplementalData:table(nofallback){ "pressure"{ _default{ 001{ - megapascal{ - geq:1{""} + 0{ + unit{"megapascal"} } - kilopascal{ - geq:1{""} + 1{ + unit{"kilopascal"} } - pascal{ - alt{""} + 2{ + unit{"pascal"} } } } @@ -35939,14 +35964,14 @@ supplementalData:table(nofallback){ "volume"{ _default{ 001{ - cubic-meter{ - geq:1{""} + 0{ + unit{"cubic-meter"} } - liter{ - geq:1{""} + 1{ + unit{"liter"} } - milliliter{ - alt{""} + 2{ + unit{"milliliter"} } } } From e475d6ad5cac965d4ffed767eb30b52af2ee9ca1 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Wed, 22 Jan 2020 19:57:07 +0100 Subject: [PATCH 4/7] Replace tabs with spaces. --- icu4c/source/data/misc/supplementalData.txt | 170 ++++++++++---------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 4cbddfe2639..f00f7519f85 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35601,85 +35601,85 @@ supplementalData:table(nofallback){ "geograph"{ 001{ 0{ - unit{"square-kilometer"} + unit{"square-kilometer"} } } GB{ - 0{ - unit{"square-mile"} + 0{ + unit{"square-mile"} } } US{ 0{ - unit{"square-mile"} + unit{"square-mile"} } } } "land-agricult"{ 001{ 0{ - unit{"hectare"} + unit{"hectare"} } } GB{ 0{ - unit{"acre"} + unit{"acre"} } } US{ 0{ - unit{"acre"} + unit{"acre"} } } } "land-commercl"{ 001{ 0{ - unit{"hectare"} + unit{"hectare"} } } GB{ 0{ - unit{"acre"} + unit{"acre"} } } US{ 0{ - unit{"acre"} + unit{"acre"} } } } "land-residntl"{ 001{ 0{ - unit{"hectare"} + unit{"hectare"} } } GB{ 0{ - unit{"acre"} + unit{"acre"} } } US{ 0{ - unit{"acre"} + unit{"acre"} } } } _default{ 001{ 0{ - unit{"square-kilometer"} + unit{"square-kilometer"} } 1{ - unit{"hectare"} + unit{"hectare"} } 2{ - unit{"square-meter"} + unit{"square-meter"} } 3{ - unit{"square-centimeter"} - } + unit{"square-centimeter"} + } } } } @@ -35687,104 +35687,104 @@ supplementalData:table(nofallback){ "music-track"{ 001{ 0{ - unit{"minute+second"} + unit{"minute+second"} } 1{ - unit{"second"} + unit{"second"} } } } "person-age"{ 001{ 0{ - unit{"year-person+month-person"} + unit{"year-person+month-person"} } 1{ - unit{"month-person"} + unit{"month-person"} } } } "tv-program"{ 001{ 0{ - unit{"minute+second"} + unit{"minute+second"} } 1{ - unit{"second"} + unit{"second"} } } } _default{ 001{ 0{ - unit{"year"} + unit{"year"} } 1{ - unit{"month"} + unit{"month"} } 2{ - unit{"day"} + unit{"day"} } 3{ - unit{"hour"} + unit{"hour"} } 4{ - unit{"minute"} + unit{"minute"} } 5{ - unit{"second"} + unit{"second"} } 6{ - unit{"millisecond"} + unit{"millisecond"} } 7{ - unit{"microsecond"} + unit{"microsecond"} } 8{ - unit{"nanosecond"} + unit{"nanosecond"} } } } } - // DEMO: alt{"informal"}: + // DEMO: alt{"informal"}: "length"{ "road"{ 001{ 0{ - unit{"kilometer"} + unit{"kilometer"} } } GB{ 0{ - unit{"mile"} + unit{"mile"} } } SE{ 0{ - unit{"mile-scandinavian"} + unit{"mile-scandinavian"} alt{"informal"} } } US{ 0{ - unit{"mile"} + unit{"mile"} } } - // DEMO: Current hack for _small, proposing we drop this info and simply use geq: + // DEMO: Current hack for _small, proposing we drop this info and simply use geq: _small{ 001{ 0{ - unit{"meter"} + unit{"meter"} } } GB{ 0{ - unit{"yard"} + unit{"yard"} } } US{ 0{ - unit{"foot"} + unit{"foot"} } } } @@ -35792,45 +35792,45 @@ supplementalData:table(nofallback){ "road-travel"{ 001{ 0{ - unit{"kilometer"} + unit{"kilometer"} geq{0.975} } 1{ - unit{"meter"} + unit{"meter"} geq{300} skeleton{"precision-increment/50"} } 2{ - unit{"meter"} + unit{"meter"} skeleton{"precision-increment/10"} } } GB{ 0{ - unit{"mile"} + unit{"mile"} geq{0.095} } 1{ - unit{"yard"} + unit{"yard"} geq{300} skeleton{"precision-increment/50"} } - unit{"yard"} + unit{"yard"} skeleton{"precision-increment/10"} } } US{ 0{ - unit{"mile"} + unit{"mile"} geq{0.095} } 1{ - unit{"foot"} + unit{"foot"} geq{300} skeleton{"precision-increment/50"} } 2{ - unit{"foot"} + unit{"foot"} skeleton{"precision-increment/10"} } } @@ -35838,46 +35838,46 @@ supplementalData:table(nofallback){ _default{ 001{ 0{ - unit{"kilometer"} + unit{"kilometer"} } 1{ - unit{"meter"} + unit{"meter"} } 2{ - unit{"centimeter"} + unit{"centimeter"} } 3{ - unit{"millimeter"} + unit{"millimeter"} } 4{ - unit{"micrometer"} + unit{"micrometer"} } 5{ - unit{"nanometer"} + unit{"nanometer"} } } GB{ 0{ - unit{"mile"} + unit{"mile"} geq{0.475} } 1{ - unit{"foot"} + unit{"foot"} } 2{ - unit{"inch"} + unit{"inch"} } } US{ 0{ - unit{"mile"} + unit{"mile"} geq{0.475} } 1{ - unit{"foot"} + unit{"foot"} } 2{ - unit{"inch"} + unit{"inch"} } } } @@ -35886,41 +35886,41 @@ supplementalData:table(nofallback){ _default{ 001{ 0{ - unit{"metric-ton"} + unit{"metric-ton"} } 1{ - unit{"kilogram"} + unit{"kilogram"} } 2{ - unit{"gram"} + unit{"gram"} } 3{ - unit{"milligram"} + unit{"milligram"} } 4{ - unit{"microgram"} + unit{"microgram"} } } GB{ 0{ - unit{"stone"} + unit{"stone"} } 1{ - unit{"pound"} + unit{"pound"} } 2{ - unit{"ounce"} + unit{"ounce"} } } US{ 0{ - unit{"ton"} + unit{"ton"} } 1{ - unit{"pound"} + unit{"pound"} } 2{ - unit{"ounce"} + unit{"ounce"} } } } @@ -35929,19 +35929,19 @@ supplementalData:table(nofallback){ _default{ 001{ 0{ - unit{"gigawatt"} + unit{"gigawatt"} } 1{ - unit{"megawatt"} + unit{"megawatt"} } 2{ - unit{"kilowatt"} + unit{"kilowatt"} } 3{ - unit{"watt"} + unit{"watt"} } 4{ - unit{"milliwatt"} + unit{"milliwatt"} } } } @@ -35950,13 +35950,13 @@ supplementalData:table(nofallback){ _default{ 001{ 0{ - unit{"megapascal"} + unit{"megapascal"} } 1{ - unit{"kilopascal"} + unit{"kilopascal"} } 2{ - unit{"pascal"} + unit{"pascal"} } } } @@ -35965,13 +35965,13 @@ supplementalData:table(nofallback){ _default{ 001{ 0{ - unit{"cubic-meter"} + unit{"cubic-meter"} } 1{ - unit{"liter"} + unit{"liter"} } 2{ - unit{"milliliter"} + unit{"milliliter"} } } } From 353cdeb71669f16a81ec9680e3e78ba749676bb7 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Thu, 23 Jan 2020 14:51:49 +0100 Subject: [PATCH 5/7] Fix: missing line. --- icu4c/source/data/misc/supplementalData.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index f00f7519f85..5dc2cd2e68b 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35815,6 +35815,7 @@ supplementalData:table(nofallback){ geq{300} skeleton{"precision-increment/50"} } + 2{ unit{"yard"} skeleton{"precision-increment/10"} } From 47d1542dba6d6e239da2337ec511e4cf3e63dcc6 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Fri, 24 Jan 2020 17:47:49 +0100 Subject: [PATCH 6/7] Adjust supplementalData.txt to something "" can generate. --- icu4c/source/data/misc/supplementalData.txt | 212 ++++++++++---------- 1 file changed, 110 insertions(+), 102 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 5dc2cd2e68b..ce0d512f9b3 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -2104,7 +2104,7 @@ supplementalData:table(nofallback){ "islamic-tbla", } } - cldrVersion{"36.1"} + cldrVersion{"37"} codeMappings{ { "AA", @@ -7860,6 +7860,7 @@ supplementalData:table(nofallback){ "Qaaj~p", } special{ + "Aran", "Qaag", "Zanb", "Zinh", @@ -13554,7 +13555,10 @@ supplementalData:table(nofallback){ territories{"IN"} } secondary{ - scripts{"Mahj"} + scripts{ + "Latn", + "Mahj", + } territories{ "FJ", "ZA", @@ -15832,13 +15836,13 @@ supplementalData:table(nofallback){ } sat{ primary{ - scripts{"Latn"} + scripts{"Olck"} } secondary{ scripts{ "Beng", "Deva", - "Olck", + "Latn", "Orya", } territories{"IN"} @@ -20532,15 +20536,19 @@ supplementalData:table(nofallback){ "ff_Adlm", "ff_Arab", "ha_Arab", + "hi_Latn", "iu_Latn", "kk_Arab", + "ks_Deva", "ku_Arab", "ky_Arab", "ky_Latn", "ml_Arab", "mn_Mong", + "mni_Mtei", "ms_Arab", "pa_Arab", + "sat_Deva", "sd_Deva", "sd_Khoj", "sd_Sind", @@ -33086,6 +33094,9 @@ supplementalData:table(nofallback){ } } US{ + cad{ + populationShareF:int{0} + } cho{ populationShareF:int{45330000} } @@ -35600,84 +35611,84 @@ supplementalData:table(nofallback){ "area"{ "geograph"{ 001{ - 0{ + { unit{"square-kilometer"} } } GB{ - 0{ + { unit{"square-mile"} } } US{ - 0{ + { unit{"square-mile"} } } } "land-agricult"{ 001{ - 0{ + { unit{"hectare"} } } GB{ - 0{ + { unit{"acre"} } } US{ - 0{ + { unit{"acre"} } } } "land-commercl"{ 001{ - 0{ + { unit{"hectare"} } } GB{ - 0{ + { unit{"acre"} } } US{ - 0{ + { unit{"acre"} } } } "land-residntl"{ 001{ - 0{ + { unit{"hectare"} } } GB{ - 0{ + { unit{"acre"} } } US{ - 0{ + { unit{"acre"} } } } _default{ 001{ - 0{ + { unit{"square-kilometer"} } - 1{ + { unit{"hectare"} } - 2{ + { unit{"square-meter"} } - 3{ + { unit{"square-centimeter"} } } @@ -35686,104 +35697,101 @@ supplementalData:table(nofallback){ "duration"{ "music-track"{ 001{ - 0{ + { unit{"minute+second"} } - 1{ + { unit{"second"} } } } "person-age"{ 001{ - 0{ + { unit{"year-person+month-person"} } - 1{ + { unit{"month-person"} } } } "tv-program"{ 001{ - 0{ + { unit{"minute+second"} } - 1{ + { unit{"second"} } } } _default{ 001{ - 0{ + { unit{"year"} } - 1{ + { unit{"month"} } - 2{ + { unit{"day"} } - 3{ + { unit{"hour"} } - 4{ + { unit{"minute"} } - 5{ + { unit{"second"} } - 6{ + { unit{"millisecond"} } - 7{ + { unit{"microsecond"} } - 8{ + { unit{"nanosecond"} } } } } - // DEMO: alt{"informal"}: "length"{ "road"{ 001{ - 0{ + { unit{"kilometer"} } } GB{ - 0{ + { unit{"mile"} } } SE{ - 0{ + { unit{"mile-scandinavian"} - alt{"informal"} } } US{ - 0{ + { unit{"mile"} } } - // DEMO: Current hack for _small, proposing we drop this info and simply use geq: _small{ 001{ - 0{ + { unit{"meter"} } } GB{ - 0{ + { unit{"yard"} } } US{ - 0{ + { unit{"foot"} } } @@ -35791,93 +35799,93 @@ supplementalData:table(nofallback){ } "road-travel"{ 001{ - 0{ + { + geq{"0.975"} unit{"kilometer"} - geq{0.975} } - 1{ - unit{"meter"} - geq{300} + { + geq{"300"} skeleton{"precision-increment/50"} - } - 2{ unit{"meter"} + } + { skeleton{"precision-increment/10"} + unit{"meter"} } } GB{ - 0{ + { + geq{"0.095"} unit{"mile"} - geq{0.095} } - 1{ - unit{"yard"} - geq{300} + { + geq{"300"} skeleton{"precision-increment/50"} - } - 2{ unit{"yard"} + } + { skeleton{"precision-increment/10"} + unit{"yard"} } } US{ - 0{ + { + geq{"0.095"} unit{"mile"} - geq{0.095} } - 1{ - unit{"foot"} - geq{300} + { + geq{"300"} skeleton{"precision-increment/50"} - } - 2{ unit{"foot"} + } + { skeleton{"precision-increment/10"} + unit{"foot"} } } } _default{ 001{ - 0{ + { unit{"kilometer"} } - 1{ + { unit{"meter"} } - 2{ + { unit{"centimeter"} } - 3{ + { unit{"millimeter"} } - 4{ + { unit{"micrometer"} } - 5{ + { unit{"nanometer"} } } GB{ - 0{ + { + geq{"0.475"} unit{"mile"} - geq{0.475} } - 1{ + { unit{"foot"} } - 2{ + { unit{"inch"} } } US{ - 0{ + { + geq{"0.475"} unit{"mile"} - geq{0.475} } - 1{ + { unit{"foot"} } - 2{ + { unit{"inch"} } } @@ -35886,41 +35894,41 @@ supplementalData:table(nofallback){ "mass"{ _default{ 001{ - 0{ + { unit{"metric-ton"} } - 1{ + { unit{"kilogram"} } - 2{ + { unit{"gram"} } - 3{ + { unit{"milligram"} } - 4{ + { unit{"microgram"} } } GB{ - 0{ + { unit{"stone"} } - 1{ + { unit{"pound"} } - 2{ + { unit{"ounce"} } } US{ - 0{ + { unit{"ton"} } - 1{ + { unit{"pound"} } - 2{ + { unit{"ounce"} } } @@ -35929,19 +35937,19 @@ supplementalData:table(nofallback){ "power"{ _default{ 001{ - 0{ + { unit{"gigawatt"} } - 1{ + { unit{"megawatt"} } - 2{ + { unit{"kilowatt"} } - 3{ + { unit{"watt"} } - 4{ + { unit{"milliwatt"} } } @@ -35950,13 +35958,13 @@ supplementalData:table(nofallback){ "pressure"{ _default{ 001{ - 0{ + { unit{"megapascal"} } - 1{ + { unit{"kilopascal"} } - 2{ + { unit{"pascal"} } } @@ -35965,13 +35973,13 @@ supplementalData:table(nofallback){ "volume"{ _default{ 001{ - 0{ + { unit{"cubic-meter"} } - 1{ + { unit{"liter"} } - 2{ + { unit{"milliliter"} } } From 38d428a1dcd33a3075c95f9cfd82e780db4bb9f1 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Mon, 17 Feb 2020 12:10:57 +0100 Subject: [PATCH 7/7] Remove diffs that aren't related to the unitPreferenceData work. --- icu4c/source/data/misc/supplementalData.txt | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index ce0d512f9b3..e4ae04607c1 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -2104,7 +2104,7 @@ supplementalData:table(nofallback){ "islamic-tbla", } } - cldrVersion{"37"} + cldrVersion{"36.1"} codeMappings{ { "AA", @@ -7860,7 +7860,6 @@ supplementalData:table(nofallback){ "Qaaj~p", } special{ - "Aran", "Qaag", "Zanb", "Zinh", @@ -13555,10 +13554,7 @@ supplementalData:table(nofallback){ territories{"IN"} } secondary{ - scripts{ - "Latn", - "Mahj", - } + scripts{"Mahj"} territories{ "FJ", "ZA", @@ -15836,13 +15832,13 @@ supplementalData:table(nofallback){ } sat{ primary{ - scripts{"Olck"} + scripts{"Latn"} } secondary{ scripts{ "Beng", "Deva", - "Latn", + "Olck", "Orya", } territories{"IN"} @@ -20536,19 +20532,15 @@ supplementalData:table(nofallback){ "ff_Adlm", "ff_Arab", "ha_Arab", - "hi_Latn", "iu_Latn", "kk_Arab", - "ks_Deva", "ku_Arab", "ky_Arab", "ky_Latn", "ml_Arab", "mn_Mong", - "mni_Mtei", "ms_Arab", "pa_Arab", - "sat_Deva", "sd_Deva", "sd_Khoj", "sd_Sind", @@ -33094,9 +33086,6 @@ supplementalData:table(nofallback){ } } US{ - cad{ - populationShareF:int{0} - } cho{ populationShareF:int{45330000} }