diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 4f341a775a7..56a363cd3da 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -35765,525 +35765,6 @@ supplementalData:table(nofallback){ preferred{"H"} } } - unitPreferenceData{ - 001{ - area-default{ - "square-kilometer", - "hectare", - "square-meter", - "square-centimeter", - } - area-geograph{"square-kilometer"} - area-land{"hectare"} - concentration-default{"item-per-cubic-meter"} - consumption-default{"liter-per-100-kilometer"} - consumption-inverse-default{"kilometer-per-centiliter"} - consumption-inverse-vehicle-fuel{"kilometer-per-centiliter"} - consumption-vehicle-fuel{"liter-per-100-kilometer"} - duration-default{ - "day", - "hour", - "minute", - "second", - "millisecond", - "microsecond", - "nanosecond", - } - duration-media{ - "minute-and-second", - "second", - } - energy-default{"kilowatt-hour"} - energy-food{"kilocalorie"} - length-default{ - "kilometer", - "meter", - "centimeter", - } - length-person{"centimeter"} - length-person-height{"centimeter"} - length-rainfall{"millimeter"} - length-road{"meter"} - length-snowfall{"centimeter"} - length-vehicle{"meter"} - length-visiblty{"meter"} - mass-default{ - "metric-ton", - "kilogram", - "gram", - "milligram", - "microgram", - } - mass-density-blood-glucose{"milligram-per-deciliter"} - mass-density-default{"kilogram-per-cubic-meter"} - mass-person{ - "kilogram", - "gram", - } - power-default{ - "gigawatt", - "megawatt", - "kilowatt", - "watt", - "milliwatt", - } - power-engine{"kilowatt"} - pressure-baromtrc{"hectopascal"} - pressure-default{ - "megapascal", - "pascal", - } - speed-default{"kilometer-per-hour"} - speed-wind{"kilometer-per-hour"} - temperature-default{"celsius"} - temperature-weather{"celsius"} - volume-default{ - "cubic-meter", - "cubic-centimeter", - } - volume-fluid{ - "liter", - "milliliter", - } - volume-oil{"barrel"} - volume-vehicle{"liter"} - year-duration-default{ - "year", - "month", - } - year-duration-person-age{ - "year-person-and-month-person", - "month-person", - } - } - AG{ - concentration-blood-glucose{"millimole-per-liter"} - } - AI{ - concentration-blood-glucose{"millimole-per-liter"} - } - AO{ - concentration-blood-glucose{"millimole-per-liter"} - } - AT{ - length-person-height{"meter-and-centimeter"} - } - AU{ - concentration-blood-glucose{"millimole-per-liter"} - } - BA{ - concentration-blood-glucose{"millimole-per-liter"} - } - BE{ - length-person-height{"meter-and-centimeter"} - } - BG{ - concentration-blood-glucose{"millimole-per-liter"} - } - BH{ - concentration-blood-glucose{"millimole-per-liter"} - } - BM{ - concentration-blood-glucose{"millimole-per-liter"} - } - BN{ - concentration-blood-glucose{"millimole-per-liter"} - } - BR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-rainfall{"centimeter"} - pressure-baromtrc{"millibar"} - } - BS{ - temperature-weather{"fahrenheit"} - } - BW{ - concentration-blood-glucose{"millimole-per-liter"} - } - BY{ - concentration-blood-glucose{"millimole-per-liter"} - } - BZ{ - temperature-weather{"fahrenheit"} - } - CA{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-inverse-vehicle-fuel{"mile-per-gallon-imperial"} - length-person{"inch"} - length-person-height{"inch"} - } - CH{ - concentration-blood-glucose{"millimole-per-liter"} - } - CM{ - concentration-blood-glucose{"millimole-per-liter"} - } - CN{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - CZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - DE{ - length-person-height{"meter-and-centimeter"} - length-visiblty{"meter"} - } - DK{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - DM{ - concentration-blood-glucose{"millimole-per-liter"} - } - DZ{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - EE{ - concentration-blood-glucose{"millimole-per-liter"} - } - EG{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - pressure-baromtrc{"millibar"} - } - ES{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - FI{ - concentration-blood-glucose{"millimole-per-liter"} - speed-wind{"meter-per-second"} - } - FJ{ - concentration-blood-glucose{"millimole-per-liter"} - } - FR{ - length-person-height{"meter-and-centimeter"} - } - GB{ - area-default{ - "square-mile", - "acre", - "square-foot", - "square-inch", - } - area-geograph{"square-mile"} - area-land{"acre"} - concentration-blood-glucose{"millimole-per-liter"} - consumption-inverse-vehicle-fuel{"mile-per-gallon-imperial"} - length-default{ - "mile", - "foot", - "inch", - } - length-person{"inch"} - length-person-height{"inch"} - length-road{"yard"} - length-vehicle{"foot-and-inch"} - length-visiblty{ - "mile", - "foot", - } - mass-default{ - "ton", - "pound", - "ounce", - } - mass-person{ - "stone-and-pound", - "pound-and-ounce", - } - power-engine{"horsepower"} - pressure-baromtrc{"millibar"} - pressure-default{"pound-force-per-square-inch"} - speed-default{"mile-per-hour"} - volume-default{ - "cubic-foot", - "cubic-inch", - } - volume-fluid{ - "gallon-imperial", - "fluid-ounce-imperial", - } - } - GD{ - concentration-blood-glucose{"millimole-per-liter"} - } - HK{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - mass-person{"pound-and-ounce"} - } - HR{ - concentration-blood-glucose{"millimole-per-liter"} - } - HU{ - concentration-blood-glucose{"millimole-per-liter"} - } - ID{ - length-person-height{"meter-and-centimeter"} - } - IE{ - concentration-blood-glucose{"millimole-per-liter"} - } - IL{ - length-person-height{"meter-and-centimeter"} - pressure-baromtrc{"millibar"} - } - IM{ - concentration-blood-glucose{"millimole-per-liter"} - } - IN{ - length-person{"inch"} - length-person-height{"inch"} - pressure-baromtrc{"inch-ofhg"} - } - IS{ - concentration-blood-glucose{"millimole-per-liter"} - } - IT{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - JO{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - JP{ - consumption-vehicle-fuel{"liter-per-kilometer"} - } - KE{ - concentration-blood-glucose{"millimole-per-liter"} - } - KN{ - concentration-blood-glucose{"millimole-per-liter"} - } - KR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - speed-wind{"meter-per-second"} - } - KW{ - concentration-blood-glucose{"millimole-per-liter"} - } - KY{ - temperature-weather{"fahrenheit"} - } - KZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - LC{ - concentration-blood-glucose{"millimole-per-liter"} - } - LI{ - concentration-blood-glucose{"millimole-per-liter"} - } - LT{ - concentration-blood-glucose{"millimole-per-liter"} - } - LU{ - concentration-blood-glucose{"millimole-per-liter"} - } - LV{ - concentration-blood-glucose{"millimole-per-liter"} - } - ME{ - concentration-blood-glucose{"millimole-per-liter"} - } - MG{ - concentration-blood-glucose{"millimole-per-liter"} - } - MK{ - concentration-blood-glucose{"millimole-per-liter"} - } - MO{ - concentration-blood-glucose{"millimole-per-liter"} - } - MS{ - concentration-blood-glucose{"millimole-per-liter"} - } - MT{ - concentration-blood-glucose{"millimole-per-liter"} - } - MU{ - concentration-blood-glucose{"millimole-per-liter"} - } - MX{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-vehicle{"meter-and-centimeter"} - pressure-baromtrc{"millimeter-ofhg"} - } - MY{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - MZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - NA{ - concentration-blood-glucose{"millimole-per-liter"} - } - NL{ - concentration-blood-glucose{"millimole-per-liter"} - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - length-visiblty{"meter"} - } - NO{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - speed-wind{"meter-per-second"} - } - NZ{ - concentration-blood-glucose{"millimole-per-liter"} - } - OM{ - concentration-blood-glucose{"millimole-per-liter"} - } - PG{ - concentration-blood-glucose{"millimole-per-liter"} - } - PL{ - length-person-height{"meter-and-centimeter"} - speed-wind{"meter-per-second"} - } - PR{ - temperature-weather{"fahrenheit"} - } - PT{ - length-person-height{"meter-and-centimeter"} - } - PW{ - temperature-weather{"fahrenheit"} - } - RS{ - concentration-blood-glucose{"millimole-per-liter"} - } - RU{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - pressure-baromtrc{"millimeter-ofhg"} - speed-wind{"meter-per-second"} - } - SA{ - length-person-height{"meter-and-centimeter"} - mass-person{"kilogram-and-gram"} - } - SE{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - length-road{ - "mile-scandinavian", - "kilometer", - } - speed-wind{"meter-per-second"} - } - SG{ - concentration-blood-glucose{"millimole-per-liter"} - } - SI{ - concentration-blood-glucose{"millimole-per-liter"} - } - SK{ - concentration-blood-glucose{"millimole-per-liter"} - } - TC{ - concentration-blood-glucose{"millimole-per-liter"} - } - TH{ - consumption-vehicle-fuel{"liter-per-kilometer"} - pressure-baromtrc{"millibar"} - } - TO{ - concentration-blood-glucose{"millimole-per-liter"} - } - TR{ - consumption-vehicle-fuel{"liter-per-kilometer"} - length-person-height{"meter-and-centimeter"} - } - UA{ - concentration-blood-glucose{"millimole-per-liter"} - } - UG{ - concentration-blood-glucose{"millimole-per-liter"} - } - US{ - area-default{ - "square-mile", - "acre", - "square-foot", - "square-inch", - } - area-geograph{"square-mile"} - area-land{"acre"} - consumption-inverse-vehicle-fuel{"mile-per-gallon"} - energy-food{"foodcalorie"} - length-default{ - "mile", - "foot", - "inch", - } - length-person{"inch"} - length-person-height{"inch"} - length-rainfall{"inch"} - length-snowfall{"inch"} - length-vehicle{"foot-and-inch"} - length-visiblty{ - "mile", - "foot", - } - mass-default{ - "ton", - "pound", - "ounce", - } - mass-person{ - "pound", - "pound-and-ounce", - } - power-engine{"horsepower"} - pressure-baromtrc{"inch-ofhg"} - pressure-default{"pound-force-per-square-inch"} - speed-default{"mile-per-hour"} - speed-wind{"mile-per-hour"} - temperature-default{"fahrenheit"} - temperature-weather{"fahrenheit"} - volume-default{ - "cubic-foot", - "cubic-inch", - } - volume-fluid{ - "gallon", - "quart", - "pint", - "cup", - "fluid-ounce", - "tablespoon", - "teaspoon", - } - volume-vehicle{"gallon"} - } - VC{ - concentration-blood-glucose{"millimole-per-liter"} - } - VG{ - concentration-blood-glucose{"millimole-per-liter"} - } - VN{ - concentration-blood-glucose{"millimole-per-liter"} - length-person-height{"meter-and-centimeter"} - } - VU{ - concentration-blood-glucose{"millimole-per-liter"} - } - ZA{ - concentration-blood-glucose{"millimole-per-liter"} - } - } weekData{ 001:intvector{ 2, diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt new file mode 100644 index 00000000000..bd19b241cf7 --- /dev/null +++ b/icu4c/source/data/misc/units.txt @@ -0,0 +1,1903 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License +units:table(nofallback){ + cldrVersion{"37"} + convertUnits{ + 100-kilometer{ + factor{"100000"} + target{"meter"} + } + acre{ + factor{"ft2_to_m2 * 43560"} + target{"square-meter"} + } + ampere{ + factor{"1"} + target{"ampere"} + } + arc-minute{ + factor{"1/360*60"} + target{"revolution"} + } + arc-second{ + factor{"1/360*60*60"} + target{"revolution"} + } + astronomical-unit{ + factor{"149597900000"} + target{"meter"} + } + atmosphere{ + factor{"101325"} + target{"kilogram-per-meter-square-second"} + } + bar{ + factor{"100000"} + target{"kilogram-per-meter-square-second"} + } + barrel{ + factor{"42*gal_to_m3"} + target{"cubic-meter"} + } + bit{ + factor{"1"} + target{"bit"} + } + british-thermal-unit{ + factor{"4.184*2267.96185/9"} + target{"kilogram-square-meter-per-square-second"} + } + bushel{ + factor{"2150.42*in3_to_m3"} + target{"cubic-meter"} + } + byte{ + factor{"8"} + target{"bit"} + } + calorie{ + factor{"4.184"} + target{"kilogram-square-meter-per-square-second"} + } + candela{ + factor{"1"} + target{"candela"} + } + carat{ + factor{"0.0002"} + target{"kilogram"} + } + celsius{ + factor{"1"} + offset{"273.15"} + target{"kelvin"} + } + century{ + factor{"100"} + target{"year"} + } + cup{ + factor{"gal_to_m3/16"} + target{"cubic-meter"} + } + cup-metric{ + factor{"0.00025"} + target{"cubic-meter"} + } + dalton{ + factor{"1.49241808560E-10"} + target{"kilogram-square-meter-per-square-second"} + } + day{ + factor{"86400"} + target{"second"} + } + day-person{ + factor{"86400"} + target{"second"} + } + decade{ + factor{"10"} + target{"year"} + } + degree{ + factor{"1/360"} + target{"revolution"} + } + dot{ + factor{"1"} + target{"pixel"} + } + dunam{ + factor{"1000"} + target{"square-meter"} + } + earth-mass{ + factor{"5.9722E+24"} + target{"kilogram"} + } + earth-radius{ + factor{"6.3781E6"} + target{"meter"} + } + electronvolt{ + factor{"1.602177E-19"} + target{"kilogram-square-meter-per-square-second"} + } + em{ + factor{"1"} + target{"em"} + } + fahrenheit{ + factor{"5/9"} + offset{"2298.35/9"} + target{"kelvin"} + } + fathom{ + factor{"ft_to_m * 6"} + target{"meter"} + } + fluid-ounce{ + factor{"gal_to_m3/128"} + target{"cubic-meter"} + } + fluid-ounce-imperial{ + factor{"gal_imp_to_m3/160"} + target{"cubic-meter"} + } + foodcalorie{ + factor{"4184"} + target{"kilogram-square-meter-per-square-second"} + } + foot{ + factor{"ft_to_m"} + target{"meter"} + } + furlong{ + factor{"ft_to_m*660"} + target{"meter"} + } + g-force{ + factor{"gravity"} + target{"meter-per-square-second"} + } + gallon{ + factor{"gal_to_m3"} + target{"cubic-meter"} + } + gallon-imperial{ + factor{"gal_imp_to_m3"} + target{"cubic-meter"} + } + gram{ + factor{"0.001"} + target{"kilogram"} + } + hectare{ + factor{"10000"} + target{"square-meter"} + } + hertz{ + factor{"1"} + target{"revolution-per-second"} + } + horsepower{ + factor{"ft_to_m * lb_to_kg * gravity * 550"} + target{"kilogram-square-meter-per-cubic-second"} + } + hour{ + factor{"3600"} + target{"second"} + } + inch{ + factor{"ft_to_m/12"} + target{"meter"} + } + item{ + factor{"1"} + target{"item"} + } + joule{ + factor{"1"} + target{"kilogram-square-meter-per-square-second"} + } + karat{ + factor{"1/24"} + target{"portion"} + } + kelvin{ + factor{"1"} + target{"kelvin"} + } + kilogram{ + factor{"1"} + target{"kilogram"} + } + knot{ + factor{"1852/3600"} + target{"meter-per-second"} + } + light-year{ + factor{"9460730000000000"} + target{"meter"} + } + liter{ + factor{"0.001"} + target{"cubic-meter"} + } + lux{ + factor{"1"} + target{"candela-square-meter-per-square-meter"} + } + meter{ + factor{"1"} + target{"meter"} + } + metric-ton{ + factor{"1000"} + target{"kilogram"} + } + mile{ + factor{"ft_to_m*5280"} + target{"meter"} + } + mile-scandinavian{ + factor{"10000"} + target{"meter"} + } + minute{ + factor{"60"} + target{"second"} + } + mole{ + factor{"6.02214076E+23"} + target{"item"} + } + month{ + factor{"1/12"} + target{"year"} + } + month-person{ + factor{"1/12"} + target{"year"} + } + nautical-mile{ + factor{"1852"} + target{"meter"} + } + newton{ + factor{"1"} + target{"kilogram-meter-per-square-second"} + } + ofhg{ + factor{"13595.1*gravity"} + target{"kilogram-per-square-meter-square-second"} + } + ohm{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second-square-ampere"} + } + ounce{ + factor{"lb_to_kg/16"} + target{"kilogram"} + } + ounce-troy{ + factor{"0.03110348"} + target{"kilogram"} + } + parsec{ + factor{"30856780000000000"} + target{"meter"} + } + pascal{ + factor{"1"} + target{"kilogram-per-meter-square-second"} + } + percent{ + factor{"1/100"} + target{"portion"} + } + permille{ + factor{"1/1000"} + target{"portion"} + } + permillion{ + factor{"1/1000000"} + target{"portion"} + } + permyriad{ + factor{"1/10000"} + target{"portion"} + } + pint{ + factor{"gal_to_m3/8"} + target{"cubic-meter"} + } + pint-metric{ + factor{"0.0005"} + target{"cubic-meter"} + } + pixel{ + factor{"1"} + target{"pixel"} + } + point{ + factor{"ft_to_m/864"} + target{"meter"} + } + portion{ + factor{"1"} + target{"portion"} + } + pound{ + factor{"lb_to_kg"} + target{"kilogram"} + } + pound-force{ + factor{"lb_to_kg * gravity"} + target{"kilogram-meter-per-square-second"} + } + quart{ + factor{"gal_to_m3/4"} + target{"cubic-meter"} + } + radian{ + factor{"1/2*PI"} + target{"revolution"} + } + revolution{ + factor{"1"} + target{"revolution"} + } + second{ + factor{"1"} + target{"second"} + } + solar-luminosity{ + factor{"3.828E+26"} + target{"kilogram-square-meter-per-cubic-second"} + } + solar-mass{ + factor{"1.98847E+30"} + target{"kilogram"} + } + solar-radius{ + factor{"695700000"} + target{"meter"} + } + stone{ + factor{"lb_to_kg*14"} + target{"kilogram"} + } + tablespoon{ + factor{"gal_to_m3/256"} + target{"cubic-meter"} + } + teaspoon{ + factor{"gal_to_m3/16*48"} + target{"cubic-meter"} + } + therm-us{ + factor{"105480400"} + target{"kilogram-square-meter-per-square-second"} + } + ton{ + factor{"lb_to_kg*2000"} + target{"kilogram"} + } + volt{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second-ampere"} + } + watt{ + factor{"1"} + target{"kilogram-square-meter-per-cubic-second"} + } + week{ + factor{"604800"} + target{"second"} + } + week-person{ + factor{"604800"} + target{"second"} + } + yard{ + factor{"ft_to_m*3"} + target{"meter"} + } + year{ + factor{"1"} + target{"year"} + } + year-person{ + factor{"1"} + target{"year"} + } + } + unitConstants{ + G{"6.67408E-11"} + PI{"411557987 / 131002976"} + ft2_to_m2{"ft_to_m*ft_to_m"} + ft3_to_m3{"ft_to_m*ft_to_m*ft_to_m"} + ft_to_m{"0.3048"} + gal_imp_to_m3{"0.00454609"} + gal_to_m3{"231*in3_to_m3"} + gravity{"9.80665"} + in3_to_m3{"ft3_to_m3/12*12*12"} + lb_to_kg{"0.45359237"} + } + unitPreferenceData{ + "area"{ + "default"{ + 001{ + { + unit{"square-kilometer"} + } + { + unit{"hectare"} + } + { + unit{"square-meter"} + } + { + unit{"square-centimeter"} + } + } + GB{ + { + unit{"square-mile"} + } + { + unit{"acre"} + } + { + unit{"square-foot"} + } + { + unit{"square-inch"} + } + } + US{ + { + unit{"square-mile"} + } + { + unit{"acre"} + } + { + unit{"square-foot"} + } + { + unit{"square-inch"} + } + } + } + "geograph"{ + 001{ + { + unit{"square-kilometer"} + } + } + GB{ + { + unit{"square-mile"} + } + } + US{ + { + unit{"square-mile"} + } + } + } + "land"{ + 001{ + { + unit{"hectare"} + } + } + GB{ + { + unit{"acre"} + } + } + US{ + { + unit{"acre"} + } + } + } + } + "concentration"{ + "blood-glucose"{ + AG{ + { + unit{"millimole-per-liter"} + } + } + AI{ + { + unit{"millimole-per-liter"} + } + } + AO{ + { + unit{"millimole-per-liter"} + } + } + AU{ + { + unit{"millimole-per-liter"} + } + } + BA{ + { + unit{"millimole-per-liter"} + } + } + BG{ + { + unit{"millimole-per-liter"} + } + } + BH{ + { + unit{"millimole-per-liter"} + } + } + BM{ + { + unit{"millimole-per-liter"} + } + } + BN{ + { + unit{"millimole-per-liter"} + } + } + BW{ + { + unit{"millimole-per-liter"} + } + } + BY{ + { + unit{"millimole-per-liter"} + } + } + CA{ + { + unit{"millimole-per-liter"} + } + } + CH{ + { + unit{"millimole-per-liter"} + } + } + CM{ + { + unit{"millimole-per-liter"} + } + } + CN{ + { + unit{"millimole-per-liter"} + } + } + CZ{ + { + unit{"millimole-per-liter"} + } + } + DK{ + { + unit{"millimole-per-liter"} + } + } + DM{ + { + unit{"millimole-per-liter"} + } + } + EE{ + { + unit{"millimole-per-liter"} + } + } + FI{ + { + unit{"millimole-per-liter"} + } + } + FJ{ + { + unit{"millimole-per-liter"} + } + } + GB{ + { + unit{"millimole-per-liter"} + } + } + GD{ + { + unit{"millimole-per-liter"} + } + } + HK{ + { + unit{"millimole-per-liter"} + } + } + HR{ + { + unit{"millimole-per-liter"} + } + } + HU{ + { + unit{"millimole-per-liter"} + } + } + IE{ + { + unit{"millimole-per-liter"} + } + } + IM{ + { + unit{"millimole-per-liter"} + } + } + IS{ + { + unit{"millimole-per-liter"} + } + } + KE{ + { + unit{"millimole-per-liter"} + } + } + KN{ + { + unit{"millimole-per-liter"} + } + } + KW{ + { + unit{"millimole-per-liter"} + } + } + KZ{ + { + unit{"millimole-per-liter"} + } + } + LC{ + { + unit{"millimole-per-liter"} + } + } + LI{ + { + unit{"millimole-per-liter"} + } + } + LT{ + { + unit{"millimole-per-liter"} + } + } + LU{ + { + unit{"millimole-per-liter"} + } + } + LV{ + { + unit{"millimole-per-liter"} + } + } + ME{ + { + unit{"millimole-per-liter"} + } + } + MG{ + { + unit{"millimole-per-liter"} + } + } + MK{ + { + unit{"millimole-per-liter"} + } + } + MO{ + { + unit{"millimole-per-liter"} + } + } + MS{ + { + unit{"millimole-per-liter"} + } + } + MT{ + { + unit{"millimole-per-liter"} + } + } + MU{ + { + unit{"millimole-per-liter"} + } + } + MY{ + { + unit{"millimole-per-liter"} + } + } + MZ{ + { + unit{"millimole-per-liter"} + } + } + NA{ + { + unit{"millimole-per-liter"} + } + } + NL{ + { + unit{"millimole-per-liter"} + } + } + NO{ + { + unit{"millimole-per-liter"} + } + } + NZ{ + { + unit{"millimole-per-liter"} + } + } + OM{ + { + unit{"millimole-per-liter"} + } + } + PG{ + { + unit{"millimole-per-liter"} + } + } + RS{ + { + unit{"millimole-per-liter"} + } + } + RU{ + { + unit{"millimole-per-liter"} + } + } + SE{ + { + unit{"millimole-per-liter"} + } + } + SG{ + { + unit{"millimole-per-liter"} + } + } + SI{ + { + unit{"millimole-per-liter"} + } + } + SK{ + { + unit{"millimole-per-liter"} + } + } + TC{ + { + unit{"millimole-per-liter"} + } + } + TO{ + { + unit{"millimole-per-liter"} + } + } + UA{ + { + unit{"millimole-per-liter"} + } + } + UG{ + { + unit{"millimole-per-liter"} + } + } + VC{ + { + unit{"millimole-per-liter"} + } + } + VG{ + { + unit{"millimole-per-liter"} + } + } + VN{ + { + unit{"millimole-per-liter"} + } + } + VU{ + { + unit{"millimole-per-liter"} + } + } + ZA{ + { + unit{"millimole-per-liter"} + } + } + } + "default"{ + 001{ + { + unit{"item-per-cubic-meter"} + } + } + } + } + "consumption"{ + "default"{ + 001{ + { + unit{"liter-per-100-kilometer"} + } + } + } + "vehicle-fuel"{ + 001{ + { + unit{"liter-per-100-kilometer"} + } + } + BR{ + { + unit{"liter-per-kilometer"} + } + } + IT{ + { + unit{"liter-per-kilometer"} + } + } + JP{ + { + unit{"liter-per-kilometer"} + } + } + KR{ + { + unit{"liter-per-kilometer"} + } + } + MX{ + { + unit{"liter-per-kilometer"} + } + } + MY{ + { + unit{"liter-per-kilometer"} + } + } + NL{ + { + unit{"liter-per-kilometer"} + } + } + TH{ + { + unit{"liter-per-kilometer"} + } + } + TR{ + { + unit{"liter-per-kilometer"} + } + } + } + } + "consumption-inverse"{ + "default"{ + 001{ + { + unit{"kilometer-per-centiliter"} + } + } + } + "vehicle-fuel"{ + 001{ + { + unit{"kilometer-per-centiliter"} + } + } + CA{ + { + unit{"mile-per-gallon-imperial"} + } + } + GB{ + { + unit{"mile-per-gallon-imperial"} + } + } + US{ + { + unit{"mile-per-gallon"} + } + } + } + } + "duration"{ + "default"{ + 001{ + { + unit{"day"} + } + { + unit{"hour"} + } + { + unit{"minute"} + } + { + unit{"second"} + } + { + unit{"millisecond"} + } + { + unit{"microsecond"} + } + { + unit{"nanosecond"} + } + } + } + "media"{ + 001{ + { + unit{"minute-and-second"} + } + { + unit{"second"} + } + } + } + } + "energy"{ + "default"{ + 001{ + { + unit{"kilowatt-hour"} + } + } + } + "food"{ + 001{ + { + unit{"kilocalorie"} + } + } + US{ + { + unit{"foodcalorie"} + } + } + } + } + "length"{ + "default"{ + 001{ + { + unit{"kilometer"} + } + { + unit{"meter"} + } + { + unit{"centimeter"} + } + } + GB{ + { + unit{"mile"} + } + { + unit{"foot"} + } + { + unit{"inch"} + } + } + US{ + { + unit{"mile"} + } + { + unit{"foot"} + } + { + unit{"inch"} + } + } + } + "person"{ + 001{ + { + unit{"centimeter"} + } + } + CA{ + { + unit{"inch"} + } + } + GB{ + { + unit{"inch"} + } + } + IN{ + { + unit{"inch"} + } + } + US{ + { + unit{"inch"} + } + } + } + "person-height"{ + 001{ + { + unit{"centimeter"} + } + } + AT{ + { + unit{"meter-and-centimeter"} + } + } + BE{ + { + unit{"meter-and-centimeter"} + } + } + BR{ + { + unit{"meter-and-centimeter"} + } + } + CA{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + CN{ + { + unit{"meter-and-centimeter"} + } + } + DE{ + { + unit{"meter-and-centimeter"} + } + } + DK{ + { + unit{"meter-and-centimeter"} + } + } + DZ{ + { + unit{"meter-and-centimeter"} + } + } + EG{ + { + unit{"meter-and-centimeter"} + } + } + ES{ + { + unit{"meter-and-centimeter"} + } + } + FR{ + { + unit{"meter-and-centimeter"} + } + } + GB{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + HK{ + { + unit{"meter-and-centimeter"} + } + } + ID{ + { + unit{"meter-and-centimeter"} + } + } + IL{ + { + unit{"meter-and-centimeter"} + } + } + IN{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + IT{ + { + unit{"meter-and-centimeter"} + } + } + JO{ + { + unit{"meter-and-centimeter"} + } + } + MX{ + { + unit{"meter-and-centimeter"} + } + } + MY{ + { + unit{"meter-and-centimeter"} + } + } + NL{ + { + unit{"meter-and-centimeter"} + } + } + NO{ + { + unit{"meter-and-centimeter"} + } + } + PL{ + { + unit{"meter-and-centimeter"} + } + } + PT{ + { + unit{"meter-and-centimeter"} + } + } + RU{ + { + unit{"meter-and-centimeter"} + } + } + SA{ + { + unit{"meter-and-centimeter"} + } + } + SE{ + { + unit{"meter-and-centimeter"} + } + } + TR{ + { + unit{"meter-and-centimeter"} + } + } + US{ + { + geq{"3.0"} + unit{"foot-and-inch"} + } + { + unit{"inch"} + } + } + VN{ + { + unit{"meter-and-centimeter"} + } + } + } + "rainfall"{ + 001{ + { + unit{"millimeter"} + } + } + BR{ + { + unit{"centimeter"} + } + } + US{ + { + unit{"inch"} + } + } + } + "road"{ + 001{ + { + geq{"0.9"} + unit{"kilometer"} + } + { + geq{"300.0"} + skeleton{"precision-increment/50"} + unit{"meter"} + } + { + skeleton{"precision-increment/10"} + unit{"meter"} + } + { + unit{"meter"} + } + } + GB{ + { + geq{"0.5"} + unit{"mile"} + } + { + geq{"100.0"} + skeleton{"precision-increment/50"} + unit{"yard"} + } + { + unit{"yard"} + } + } + SE{ + { + unit{"mile-scandinavian"} + } + { + unit{"kilometer"} + } + { + geq{"300.0"} + skeleton{"precision-increment/50"} + unit{"meter"} + } + { + skeleton{"precision-increment/10"} + unit{"meter"} + } + } + US{ + { + geq{"0.5"} + unit{"mile"} + } + { + geq{"100.0"} + skeleton{"precision-increment/50"} + unit{"foot"} + } + { + skeleton{"precision-increment/10"} + unit{"foot"} + } + } + } + "snowfall"{ + 001{ + { + unit{"centimeter"} + } + } + US{ + { + unit{"inch"} + } + } + } + "vehicle"{ + 001{ + { + unit{"meter"} + } + } + GB{ + { + unit{"foot-and-inch"} + } + } + MX{ + { + unit{"meter-and-centimeter"} + } + } + US{ + { + unit{"foot-and-inch"} + } + } + } + "visiblty"{ + 001{ + { + geq{"0.1"} + unit{"kilometer"} + } + { + unit{"meter"} + } + } + DE{ + { + unit{"meter"} + } + } + GB{ + { + unit{"mile"} + } + { + unit{"foot"} + } + } + NL{ + { + unit{"meter"} + } + } + US{ + { + unit{"mile"} + } + { + unit{"foot"} + } + } + } + } + "mass"{ + "default"{ + 001{ + { + unit{"metric-ton"} + } + { + unit{"kilogram"} + } + { + unit{"gram"} + } + { + unit{"milligram"} + } + { + unit{"microgram"} + } + } + GB{ + { + unit{"ton"} + } + { + unit{"pound"} + } + { + unit{"ounce"} + } + } + US{ + { + unit{"ton"} + } + { + unit{"pound"} + } + { + unit{"ounce"} + } + } + } + "person"{ + 001{ + { + unit{"kilogram"} + } + { + unit{"gram"} + } + } + DZ{ + { + unit{"kilogram-and-gram"} + } + } + EG{ + { + unit{"kilogram-and-gram"} + } + } + ES{ + { + unit{"kilogram-and-gram"} + } + } + GB{ + { + unit{"stone-and-pound"} + } + { + unit{"pound-and-ounce"} + } + } + HK{ + { + unit{"pound-and-ounce"} + } + } + JO{ + { + unit{"kilogram-and-gram"} + } + } + SA{ + { + unit{"kilogram-and-gram"} + } + } + US{ + { + unit{"pound"} + } + { + unit{"pound-and-ounce"} + } + } + } + } + "mass-density"{ + "blood-glucose"{ + 001{ + { + unit{"milligram-per-deciliter"} + } + } + } + "default"{ + 001{ + { + unit{"kilogram-per-cubic-meter"} + } + } + } + } + "power"{ + "default"{ + 001{ + { + unit{"gigawatt"} + } + { + unit{"megawatt"} + } + { + unit{"kilowatt"} + } + { + unit{"watt"} + } + { + unit{"milliwatt"} + } + } + } + "engine"{ + 001{ + { + unit{"kilowatt"} + } + } + GB{ + { + unit{"horsepower"} + } + } + US{ + { + unit{"horsepower"} + } + } + } + } + "pressure"{ + "baromtrc"{ + 001{ + { + unit{"hectopascal"} + } + } + BR{ + { + unit{"millibar"} + } + } + EG{ + { + unit{"millibar"} + } + } + GB{ + { + unit{"millibar"} + } + } + IL{ + { + unit{"millibar"} + } + } + IN{ + { + unit{"inch-ofhg"} + } + } + MX{ + { + unit{"millimeter-ofhg"} + } + } + RU{ + { + unit{"millimeter-ofhg"} + } + } + TH{ + { + unit{"millibar"} + } + } + US{ + { + unit{"inch-ofhg"} + } + } + } + "default"{ + 001{ + { + unit{"megapascal"} + } + { + unit{"pascal"} + } + } + GB{ + { + unit{"pound-force-per-square-inch"} + } + } + US{ + { + unit{"pound-force-per-square-inch"} + } + } + } + } + "speed"{ + "default"{ + 001{ + { + unit{"kilometer-per-hour"} + } + } + GB{ + { + unit{"mile-per-hour"} + } + } + US{ + { + unit{"mile-per-hour"} + } + } + } + "wind"{ + 001{ + { + unit{"kilometer-per-hour"} + } + } + FI{ + { + unit{"meter-per-second"} + } + } + KR{ + { + unit{"meter-per-second"} + } + } + NO{ + { + unit{"meter-per-second"} + } + } + PL{ + { + unit{"meter-per-second"} + } + } + RU{ + { + unit{"meter-per-second"} + } + } + SE{ + { + unit{"meter-per-second"} + } + } + US{ + { + unit{"mile-per-hour"} + } + } + } + } + "temperature"{ + "default"{ + 001{ + { + unit{"celsius"} + } + } + US{ + { + unit{"fahrenheit"} + } + } + } + "weather"{ + 001{ + { + unit{"celsius"} + } + } + BS{ + { + unit{"fahrenheit"} + } + } + BZ{ + { + unit{"fahrenheit"} + } + } + KY{ + { + unit{"fahrenheit"} + } + } + PR{ + { + unit{"fahrenheit"} + } + } + PW{ + { + unit{"fahrenheit"} + } + } + US{ + { + unit{"fahrenheit"} + } + } + } + } + "volume"{ + "default"{ + 001{ + { + unit{"cubic-meter"} + } + { + unit{"cubic-centimeter"} + } + } + GB{ + { + unit{"cubic-foot"} + } + { + unit{"cubic-inch"} + } + } + US{ + { + unit{"cubic-foot"} + } + { + unit{"cubic-inch"} + } + } + } + "fluid"{ + 001{ + { + unit{"liter"} + } + { + unit{"milliliter"} + } + } + GB{ + { + unit{"gallon-imperial"} + } + { + unit{"fluid-ounce-imperial"} + } + } + US{ + { + unit{"gallon"} + } + { + unit{"quart"} + } + { + unit{"pint"} + } + { + unit{"cup"} + } + { + unit{"fluid-ounce"} + } + { + unit{"tablespoon"} + } + { + unit{"teaspoon"} + } + } + } + "oil"{ + 001{ + { + unit{"barrel"} + } + } + } + "vehicle"{ + 001{ + { + unit{"liter"} + } + } + US{ + { + unit{"gallon"} + } + } + } + } + "year-duration"{ + "default"{ + 001{ + { + unit{"year"} + } + { + unit{"month"} + } + } + } + "person-age"{ + 001{ + { + geq{"2.5"} + unit{"year-person"} + } + { + unit{"year-person-and-month-person"} + } + { + unit{"month-person"} + } + } + } + } + } + unitQuantities{ + ampere{"electric-current"} + ampere-per-meter{"magnetic-field-strength"} + ampere-per-square-meter{"current-density"} + bit{"digital"} + candela{"luminous-intensity"} + candela-per-square-meter{"luminance"} + candela-square-meter-per-square-meter{"luminous-flux"} + cubic-meter{"volume"} + cubic-meter-per-kilogram{"specific-volume"} + cubic-meter-per-meter{"consumption"} + cubic-second-square-ampere-per-kilogram-square-meter{"electric-conductance"} + em{"typewidth"} + item{"substance-amount"} + item-per-cubic-meter{"concentration"} + kelvin{"temperature"} + kilogram{"mass"} + kilogram-meter-per-meter-square-second{"torque"} + kilogram-meter-per-square-second{"force"} + kilogram-per-cubic-meter{"mass-density"} + kilogram-per-kilogram{"mass-fraction"} + kilogram-per-meter-square-second{"pressure"} + kilogram-per-square-meter-square-second{"pressure-per-length"} + kilogram-per-square-second-ampere{"magnetic-induction"} + kilogram-square-meter-per-cubic-second{"power"} + kilogram-square-meter-per-cubic-second-ampere{"voltage"} + kilogram-square-meter-per-cubic-second-square-ampere{"electric-resistance"} + kilogram-square-meter-per-square-second{"energy"} + kilogram-square-meter-per-square-second-ampere{"magnetic-flux"} + kilogram-square-meter-per-square-second-square-ampere{"electric-inductance"} + meter{"length"} + meter-per-second{"speed"} + meter-per-square-second{"acceleration"} + pixel{"graphics"} + pixel-per-meter{"resolution"} + portion{"portion"} + pow4-second-square-ampere-per-kilogram-square-meter{"electric-capacitance"} + revolution{"angle"} + revolution-per-meter{"wave-number"} + revolution-per-second{"frequency"} + second{"duration"} + second-ampere{"electric-charge"} + square-meter{"area"} + square-meter-per-square-second{"dose"} + square-revolution{"solid-angle"} + year{"year-duration"} + } +} diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java index ce0b6421012..37d44750b6d 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java @@ -109,11 +109,16 @@ public final class LdmlConverter { "territoryContainment", "territoryInfo", "timeData", - "unitPreferenceData", "weekData", "weekOfPreference"); private static final Predicate CURRENCY_DATA_PATHS = supplementalMatcher("currencyData"); + private static final Predicate UNITS_DATA_PATHS = + supplementalMatcher( + "convertUnits", + "unitConstants", + "unitQuantities", + "unitPreferenceData"); private static final Predicate NUMBERING_SYSTEMS_PATHS = supplementalMatcher("numberingSystems"); private static final Predicate WINDOWS_ZONES_PATHS = @@ -153,6 +158,7 @@ public final class LdmlConverter { GENDER_LIST(SUPPLEMENTAL), LIKELY_SUBTAGS(SUPPLEMENTAL), SUPPLEMENTAL_DATA(SUPPLEMENTAL), + UNITS(SUPPLEMENTAL), CURRENCY_DATA(SUPPLEMENTAL), METADATA(SUPPLEMENTAL), META_ZONES(SUPPLEMENTAL), @@ -472,6 +478,10 @@ public final class LdmlConverter { processSupplemental("supplementalData", SUPPLEMENTAL_DATA_PATHS, "misc", true); break; + case UNITS: + processSupplemental("units", UNITS_DATA_PATHS, "misc", true); + break; + case CURRENCY_DATA: processSupplemental("supplementalData", CURRENCY_DATA_PATHS, "curr", false); break; 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 be582396a01..5edbe7074b5 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 @@ -98,11 +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 -//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"][@scope="small"]/unitPreference[@regions="(%A)"][@alt="informal"] ; /unitPreferenceData/$3/$1-$2-small-informal -//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"][@scope="small"]/unitPreference[@regions="(%A)"] ; /unitPreferenceData/$3/$1-$2-small -//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@alt="informal"] ; /unitPreferenceData/$3/$1-$2-informal -//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"] ; /unitPreferenceData/$3/$1-$2 - //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) @@ -145,6 +140,49 @@ //supplementalData/calendarData/calendar[@type="(%W)"]/eras/era[@type="(%W)"][@(start|end)="(%A)"] ; /calendarData/$1/eras/$2/$3:intvector ; values=&ymd($4) +# units.xml + +//supplementalData/unitConstants/unitConstant[@constant="(%W)"][@value="(%A)"](?:[@status="%W"])? + ; /unitConstants/$1 ; values="$2" + +//supplementalData/unitQuantities/unitQuantity[@baseUnit="(%W)"][@quantity="(%W)"](?:[@status="%W"])? + ; /unitQuantities/$1 ; values="$2" + +//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"](?:[@systems="%W"])? + ; /convertUnits/$1/target ; values=$2 + ; /convertUnits/$1/factor ; values=1 + +//supplementalData/convertUnits/convertUnit[@source="(%W)"][@baseUnit="(%W)"][@factor="(%A)"](?:[@systems="%W"])? + ; /convertUnits/$1/target ; values=$2 + ; /convertUnits/$1/factor ; values="$3" + +//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 + +//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 + +# 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//unit + +//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"] + ; /unitPreferenceData/"$1"/"$2"/$3//unit + ; /unitPreferenceData/"$1"/"$2"/$3//geq ; values=$4 + +//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@skeleton="(%A)"] + ; /unitPreferenceData/"$1"/"$2"/$3//unit + ; /unitPreferenceData/"$1"/"$2"/$3//skeleton ; values=$4 + +//supplementalData/unitPreferenceData/unitPreferences[@category="(%W)"][@usage="(%A)"]/unitPreference[@regions="(%A)"][@geq="(%A)"][@skeleton="(%A)"] + ; /unitPreferenceData/"$1"/"$2"/$3//unit + ; /unitPreferenceData/"$1"/"$2"/$3//geq ; values=$4 + ; /unitPreferenceData/"$1"/"$2"/$3//skeleton ; values=$5 + # languageInfo.xml //supplementalData/languageMatching/languageMatches[@type="(%B)_new"]/paradigmLocales[@locales="(%A)"] ; /languageMatchingInfo/$1/paradigmLocales ; values=$2