ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / measunit.cpp

diff --git a/icuSources/i18n/measunit.cpp b/icuSources/i18n/measunit.cpp
index f72ddb27a9259b4282a3c4d9acd6eff854c618fb..90cd02ee464dfec5d3565cece8846433319585f2 100644 (file)
--- a/icuSources/i18n/measunit.cpp
+++ b/icuSources/i18n/measunit.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-* Copyright (c) 2004-2015, International Business Machines
+* Copyright (c) 2004-2016, International Business Machines

 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu


@@ -34,47 +34,47 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MeasureUnit)
 static const int32_t gOffsets[] = {
     0,
     2,
 static const int32_t gOffsets[] = {
     0,
     2,

-    6,
-    15,
-    17,
-    277,
-    287,
-    297,
-    301,
-    307,
-    311,
-    329,
-    330,
-    341,
-    347,
-    352,
-    353,
+    7,
+    16,
+    20,
+    24,
+    284,
+    294,
+    305,
+    309,
+    315,
+    319,
+    338,
+    339,
+    350,

     356,
     356,

-    360,
-    382
+    361,
+    365,
+    369,
+    394

 };
 
 static const int32_t gIndexes[] = {
     0,
     2,
 };
 
 static const int32_t gIndexes[] = {
     0,
     2,

-    6,
-    15,
-    17,
-    17,
-    27,
-    37,
-    41,
-    47,
-    51,
-    69,
-    70,
-    81,
-    87,
-    92,
-    93,
+    7,
+    16,
+    20,
+    24,
+    24,
+    34,
+    45,
+    49,
+    55,
+    59,
+    78,
+    79,
+    90,

     96,
     96,

-    100,
-    122
+    101,
+    105,
+    109,
+    134

 };
 
 // Must be sorted alphabetically.
 };
 
 // Must be sorted alphabetically.


@@ -82,6 +82,7 @@ static const char * const gTypes[] = {
     "acceleration",
     "angle",
     "area",
     "acceleration",
     "angle",
     "area",

+    "concentr",

     "consumption",
     "currency",
     "digital",
     "consumption",
     "currency",
     "digital",


@@ -94,7 +95,6 @@ static const char * const gTypes[] = {
     "mass",
     "power",
     "pressure",
     "mass",
     "power",
     "pressure",

-    "proportion",

     "speed",
     "temperature",
     "volume"
     "speed",
     "temperature",
     "volume"


@@ -108,6 +108,7 @@ static const char * const gSubTypes[] = {
     "arc-second",
     "degree",
     "radian",
     "arc-second",
     "degree",
     "radian",

+    "revolution",

     "acre",
     "hectare",
     "square-centimeter",
     "acre",
     "hectare",
     "square-centimeter",


@@ -117,8 +118,14 @@ static const char * const gSubTypes[] = {
     "square-meter",
     "square-mile",
     "square-yard",
     "square-meter",
     "square-mile",
     "square-yard",

+    "karat",
+    "milligram-per-deciliter",
+    "millimole-per-liter",
+    "part-per-million",
+    "liter-per-100kilometers",

     "liter-per-kilometer",
     "mile-per-gallon",
     "liter-per-kilometer",
     "mile-per-gallon",

+    "mile-per-gallon-imperial",

     "ADP",
     "AED",
     "AFA",
     "ADP",
     "AED",
     "AFA",


@@ -389,6 +396,7 @@ static const char * const gSubTypes[] = {
     "megabyte",
     "terabit",
     "terabyte",
     "megabyte",
     "terabit",
     "terabyte",

+    "century",

     "day",
     "hour",
     "microsecond",
     "day",
     "hour",
     "microsecond",


@@ -425,6 +433,7 @@ static const char * const gSubTypes[] = {
     "meter",
     "micrometer",
     "mile",
     "meter",
     "micrometer",
     "mile",

+    "mile-scandinavian",

     "millimeter",
     "nanometer",
     "nautical-mile",
     "millimeter",
     "nanometer",
     "nautical-mile",


@@ -454,14 +463,14 @@ static const char * const gSubTypes[] = {
     "millibar",
     "millimeter-of-mercury",
     "pound-per-square-inch",
     "millibar",
     "millimeter-of-mercury",
     "pound-per-square-inch",

-    "karat",

     "kilometer-per-hour",
     "kilometer-per-hour",

+    "knot",

     "meter-per-second",
     "mile-per-hour",
     "celsius",
     "fahrenheit",
     "meter-per-second",
     "mile-per-hour",
     "celsius",
     "fahrenheit",

-    "kelvin",

     "generic",
     "generic",

+    "kelvin",

     "acre-foot",
     "bushel",
     "centiliter",
     "acre-foot",
     "bushel",
     "centiliter",


@@ -473,14 +482,17 @@ static const char * const gSubTypes[] = {
     "cubic-mile",
     "cubic-yard",
     "cup",
     "cubic-mile",
     "cubic-yard",
     "cup",

+    "cup-metric",

     "deciliter",
     "fluid-ounce",
     "gallon",
     "deciliter",
     "fluid-ounce",
     "gallon",

+    "gallon-imperial",

     "hectoliter",
     "liter",
     "megaliter",
     "milliliter",
     "pint",
     "hectoliter",
     "liter",
     "megaliter",
     "milliliter",
     "pint",

+    "pint-metric",

     "quart",
     "tablespoon",
     "teaspoon"
     "quart",
     "tablespoon",
     "teaspoon"


@@ -488,12 +500,14 @@ static const char * const gSubTypes[] = {
 
 // Must be sorted by first value and then second value.
 static int32_t unitPerUnitToSingleUnit[][4] = {
 
 // Must be sorted by first value and then second value.
 static int32_t unitPerUnitToSingleUnit[][4] = {

-        {318, 288, 16, 0},
-        {320, 294, 16, 1},
-        {322, 288, 16, 2},
-        {322, 372, 3, 1},
-        {338, 10, 14, 4},
-        {375, 318, 3, 0}
+        {326, 296, 16, 0},
+        {328, 302, 16, 2},
+        {330, 296, 16, 3},
+        {330, 383, 4, 2},
+        {330, 384, 4, 3},
+        {344, 381, 3, 1},
+        {347, 11, 15, 4},
+        {386, 326, 4, 1}

 };
 
 MeasureUnit *MeasureUnit::createGForce(UErrorCode &status) {
 };
 
 MeasureUnit *MeasureUnit::createGForce(UErrorCode &status) {


@@ -520,6 +534,10 @@ MeasureUnit *MeasureUnit::createRadian(UErrorCode &status) {
     return MeasureUnit::create(1, 3, status);
 }
 
     return MeasureUnit::create(1, 3, status);
 }
 

+MeasureUnit *MeasureUnit::createRevolutionAngle(UErrorCode &status) {
+    return MeasureUnit::create(1, 4, status);
+}
+

 MeasureUnit *MeasureUnit::createAcre(UErrorCode &status) {
     return MeasureUnit::create(2, 0, status);
 }
 MeasureUnit *MeasureUnit::createAcre(UErrorCode &status) {
     return MeasureUnit::create(2, 0, status);
 }


@@ -556,330 +574,362 @@ MeasureUnit *MeasureUnit::createSquareYard(UErrorCode &status) {
     return MeasureUnit::create(2, 8, status);
 }
 
     return MeasureUnit::create(2, 8, status);
 }
 

-MeasureUnit *MeasureUnit::createLiterPerKilometer(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createKarat(UErrorCode &status) {

     return MeasureUnit::create(3, 0, status);
 }
 
     return MeasureUnit::create(3, 0, status);
 }
 

-MeasureUnit *MeasureUnit::createMilePerGallon(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) {

     return MeasureUnit::create(3, 1, status);
 }
 
     return MeasureUnit::create(3, 1, status);
 }
 

+MeasureUnit *MeasureUnit::createMillimolePerLiter(UErrorCode &status) {
+    return MeasureUnit::create(3, 2, status);
+}
+
+MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) {
+    return MeasureUnit::create(3, 3, status);
+}
+
+MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) {
+    return MeasureUnit::create(4, 0, status);
+}
+
+MeasureUnit *MeasureUnit::createLiterPerKilometer(UErrorCode &status) {
+    return MeasureUnit::create(4, 1, status);
+}
+
+MeasureUnit *MeasureUnit::createMilePerGallon(UErrorCode &status) {
+    return MeasureUnit::create(4, 2, status);
+}
+
+MeasureUnit *MeasureUnit::createMilePerGallonImperial(UErrorCode &status) {
+    return MeasureUnit::create(4, 3, status);
+}
+

 MeasureUnit *MeasureUnit::createBit(UErrorCode &status) {
 MeasureUnit *MeasureUnit::createBit(UErrorCode &status) {

-    return MeasureUnit::create(5, 0, status);
+    return MeasureUnit::create(6, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createByte(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createByte(UErrorCode &status) {

-    return MeasureUnit::create(5, 1, status);
+    return MeasureUnit::create(6, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createGigabit(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createGigabit(UErrorCode &status) {

-    return MeasureUnit::create(5, 2, status);
+    return MeasureUnit::create(6, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createGigabyte(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createGigabyte(UErrorCode &status) {

-    return MeasureUnit::create(5, 3, status);
+    return MeasureUnit::create(6, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createKilobit(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilobit(UErrorCode &status) {

-    return MeasureUnit::create(5, 4, status);
+    return MeasureUnit::create(6, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createKilobyte(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilobyte(UErrorCode &status) {

-    return MeasureUnit::create(5, 5, status);
+    return MeasureUnit::create(6, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createMegabit(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMegabit(UErrorCode &status) {

-    return MeasureUnit::create(5, 6, status);
+    return MeasureUnit::create(6, 6, status);

 }
 
 MeasureUnit *MeasureUnit::createMegabyte(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMegabyte(UErrorCode &status) {

-    return MeasureUnit::create(5, 7, status);
+    return MeasureUnit::create(6, 7, status);

 }
 
 MeasureUnit *MeasureUnit::createTerabit(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createTerabit(UErrorCode &status) {

-    return MeasureUnit::create(5, 8, status);
+    return MeasureUnit::create(6, 8, status);

 }
 
 MeasureUnit *MeasureUnit::createTerabyte(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createTerabyte(UErrorCode &status) {

-    return MeasureUnit::create(5, 9, status);
+    return MeasureUnit::create(6, 9, status);
+}
+
+MeasureUnit *MeasureUnit::createCentury(UErrorCode &status) {
+    return MeasureUnit::create(7, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createDay(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createDay(UErrorCode &status) {

-    return MeasureUnit::create(6, 0, status);
+    return MeasureUnit::create(7, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createHour(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createHour(UErrorCode &status) {

-    return MeasureUnit::create(6, 1, status);
+    return MeasureUnit::create(7, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) {

-    return MeasureUnit::create(6, 2, status);
+    return MeasureUnit::create(7, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) {

-    return MeasureUnit::create(6, 3, status);
+    return MeasureUnit::create(7, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) {

-    return MeasureUnit::create(6, 4, status);
+    return MeasureUnit::create(7, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) {

-    return MeasureUnit::create(6, 5, status);
+    return MeasureUnit::create(7, 6, status);

 }
 
 MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) {

-    return MeasureUnit::create(6, 6, status);
+    return MeasureUnit::create(7, 7, status);

 }
 
 MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) {

-    return MeasureUnit::create(6, 7, status);
+    return MeasureUnit::create(7, 8, status);

 }
 
 MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) {

-    return MeasureUnit::create(6, 8, status);
+    return MeasureUnit::create(7, 9, status);

 }
 
 MeasureUnit *MeasureUnit::createYear(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createYear(UErrorCode &status) {

-    return MeasureUnit::create(6, 9, status);
+    return MeasureUnit::create(7, 10, status);

 }
 
 MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) {

-    return MeasureUnit::create(7, 0, status);
+    return MeasureUnit::create(8, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) {

-    return MeasureUnit::create(7, 1, status);
+    return MeasureUnit::create(8, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) {

-    return MeasureUnit::create(7, 2, status);
+    return MeasureUnit::create(8, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) {

-    return MeasureUnit::create(7, 3, status);
+    return MeasureUnit::create(8, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) {

-    return MeasureUnit::create(8, 0, status);
+    return MeasureUnit::create(9, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) {

-    return MeasureUnit::create(8, 1, status);
+    return MeasureUnit::create(9, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) {

-    return MeasureUnit::create(8, 2, status);
+    return MeasureUnit::create(9, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) {

-    return MeasureUnit::create(8, 3, status);
+    return MeasureUnit::create(9, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) {

-    return MeasureUnit::create(8, 4, status);
+    return MeasureUnit::create(9, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) {

-    return MeasureUnit::create(8, 5, status);
+    return MeasureUnit::create(9, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createGigahertz(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createGigahertz(UErrorCode &status) {

-    return MeasureUnit::create(9, 0, status);
+    return MeasureUnit::create(10, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createHertz(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createHertz(UErrorCode &status) {

-    return MeasureUnit::create(9, 1, status);
+    return MeasureUnit::create(10, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createKilohertz(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilohertz(UErrorCode &status) {

-    return MeasureUnit::create(9, 2, status);
+    return MeasureUnit::create(10, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createMegahertz(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMegahertz(UErrorCode &status) {

-    return MeasureUnit::create(9, 3, status);
+    return MeasureUnit::create(10, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) {

-    return MeasureUnit::create(10, 0, status);
+    return MeasureUnit::create(11, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) {

-    return MeasureUnit::create(10, 1, status);
+    return MeasureUnit::create(11, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) {

-    return MeasureUnit::create(10, 2, status);
+    return MeasureUnit::create(11, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) {

-    return MeasureUnit::create(10, 3, status);
+    return MeasureUnit::create(11, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) {

-    return MeasureUnit::create(10, 4, status);
+    return MeasureUnit::create(11, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) {

-    return MeasureUnit::create(10, 5, status);
+    return MeasureUnit::create(11, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createInch(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createInch(UErrorCode &status) {

-    return MeasureUnit::create(10, 6, status);
+    return MeasureUnit::create(11, 6, status);

 }
 
 MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) {

-    return MeasureUnit::create(10, 7, status);
+    return MeasureUnit::create(11, 7, status);

 }
 
 MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) {

-    return MeasureUnit::create(10, 8, status);
+    return MeasureUnit::create(11, 8, status);

 }
 
 MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) {

-    return MeasureUnit::create(10, 9, status);
+    return MeasureUnit::create(11, 9, status);

 }
 
 MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) {

-    return MeasureUnit::create(10, 10, status);
+    return MeasureUnit::create(11, 10, status);

 }
 
 MeasureUnit *MeasureUnit::createMile(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMile(UErrorCode &status) {

-    return MeasureUnit::create(10, 11, status);
+    return MeasureUnit::create(11, 11, status);
+}
+
+MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) {
+    return MeasureUnit::create(11, 12, status);

 }
 
 MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) {

-    return MeasureUnit::create(10, 12, status);
+    return MeasureUnit::create(11, 13, status);

 }
 
 MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) {

-    return MeasureUnit::create(10, 13, status);
+    return MeasureUnit::create(11, 14, status);

 }
 
 MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) {

-    return MeasureUnit::create(10, 14, status);
+    return MeasureUnit::create(11, 15, status);

 }
 
 MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) {

-    return MeasureUnit::create(10, 15, status);
+    return MeasureUnit::create(11, 16, status);

 }
 
 MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) {

-    return MeasureUnit::create(10, 16, status);
+    return MeasureUnit::create(11, 17, status);

 }
 
 MeasureUnit *MeasureUnit::createYard(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createYard(UErrorCode &status) {

-    return MeasureUnit::create(10, 17, status);
+    return MeasureUnit::create(11, 18, status);

 }
 
 MeasureUnit *MeasureUnit::createLux(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createLux(UErrorCode &status) {

-    return MeasureUnit::create(11, 0, status);
+    return MeasureUnit::create(12, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) {

-    return MeasureUnit::create(12, 0, status);
+    return MeasureUnit::create(13, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createGram(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createGram(UErrorCode &status) {

-    return MeasureUnit::create(12, 1, status);
+    return MeasureUnit::create(13, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) {

-    return MeasureUnit::create(12, 2, status);
+    return MeasureUnit::create(13, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) {

-    return MeasureUnit::create(12, 3, status);
+    return MeasureUnit::create(13, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) {

-    return MeasureUnit::create(12, 4, status);
+    return MeasureUnit::create(13, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) {

-    return MeasureUnit::create(12, 5, status);
+    return MeasureUnit::create(13, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) {

-    return MeasureUnit::create(12, 6, status);
+    return MeasureUnit::create(13, 6, status);

 }
 
 MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) {

-    return MeasureUnit::create(12, 7, status);
+    return MeasureUnit::create(13, 7, status);

 }
 
 MeasureUnit *MeasureUnit::createPound(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createPound(UErrorCode &status) {

-    return MeasureUnit::create(12, 8, status);
+    return MeasureUnit::create(13, 8, status);

 }
 
 MeasureUnit *MeasureUnit::createStone(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createStone(UErrorCode &status) {

-    return MeasureUnit::create(12, 9, status);
+    return MeasureUnit::create(13, 9, status);

 }
 
 MeasureUnit *MeasureUnit::createTon(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createTon(UErrorCode &status) {

-    return MeasureUnit::create(12, 10, status);
+    return MeasureUnit::create(13, 10, status);

 }
 
 MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) {

-    return MeasureUnit::create(13, 0, status);
+    return MeasureUnit::create(14, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) {

-    return MeasureUnit::create(13, 1, status);
+    return MeasureUnit::create(14, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) {

-    return MeasureUnit::create(13, 2, status);
+    return MeasureUnit::create(14, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) {

-    return MeasureUnit::create(13, 3, status);
+    return MeasureUnit::create(14, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) {

-    return MeasureUnit::create(13, 4, status);
+    return MeasureUnit::create(14, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) {

-    return MeasureUnit::create(13, 5, status);
+    return MeasureUnit::create(14, 5, status);

 }
 
 MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) {

-    return MeasureUnit::create(14, 0, status);
+    return MeasureUnit::create(15, 0, status);

 }
 
 MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) {

-    return MeasureUnit::create(14, 1, status);
+    return MeasureUnit::create(15, 1, status);

 }
 
 MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) {

-    return MeasureUnit::create(14, 2, status);
+    return MeasureUnit::create(15, 2, status);

 }
 
 MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) {

-    return MeasureUnit::create(14, 3, status);
+    return MeasureUnit::create(15, 3, status);

 }
 
 MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) {
 }
 
 MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) {

-    return MeasureUnit::create(14, 4, status);
-}
-
-MeasureUnit *MeasureUnit::createKarat(UErrorCode &status) {
-    return MeasureUnit::create(15, 0, status);
+    return MeasureUnit::create(15, 4, status);

 }
 
 MeasureUnit *MeasureUnit::createKilometerPerHour(UErrorCode &status) {
     return MeasureUnit::create(16, 0, status);
 }
 
 }
 
 MeasureUnit *MeasureUnit::createKilometerPerHour(UErrorCode &status) {
     return MeasureUnit::create(16, 0, status);
 }
 

-MeasureUnit *MeasureUnit::createMeterPerSecond(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createKnot(UErrorCode &status) {

     return MeasureUnit::create(16, 1, status);
 }
 
     return MeasureUnit::create(16, 1, status);
 }
 

-MeasureUnit *MeasureUnit::createMilePerHour(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createMeterPerSecond(UErrorCode &status) {

     return MeasureUnit::create(16, 2, status);
 }
 
     return MeasureUnit::create(16, 2, status);
 }
 

+MeasureUnit *MeasureUnit::createMilePerHour(UErrorCode &status) {
+    return MeasureUnit::create(16, 3, status);
+}
+

 MeasureUnit *MeasureUnit::createCelsius(UErrorCode &status) {
     return MeasureUnit::create(17, 0, status);
 }
 MeasureUnit *MeasureUnit::createCelsius(UErrorCode &status) {
     return MeasureUnit::create(17, 0, status);
 }


@@ -888,12 +938,11 @@ MeasureUnit *MeasureUnit::createFahrenheit(UErrorCode &status) {
     return MeasureUnit::create(17, 1, status);
 }
 
     return MeasureUnit::create(17, 1, status);
 }
 

-MeasureUnit *MeasureUnit::createKelvin(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createGenericTemperature(UErrorCode &status) {

     return MeasureUnit::create(17, 2, status);
 }
 
     return MeasureUnit::create(17, 2, status);
 }
 

-// Apple-specific for now
-MeasureUnit *MeasureUnit::createGenericTemperature(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createKelvin(UErrorCode &status) {

     return MeasureUnit::create(17, 3, status);
 }
 
     return MeasureUnit::create(17, 3, status);
 }
 


@@ -941,50 +990,62 @@ MeasureUnit *MeasureUnit::createCup(UErrorCode &status) {
     return MeasureUnit::create(18, 10, status);
 }
 
     return MeasureUnit::create(18, 10, status);
 }
 

-MeasureUnit *MeasureUnit::createDeciliter(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createCupMetric(UErrorCode &status) {

     return MeasureUnit::create(18, 11, status);
 }
 
     return MeasureUnit::create(18, 11, status);
 }
 

-MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createDeciliter(UErrorCode &status) {

     return MeasureUnit::create(18, 12, status);
 }
 
     return MeasureUnit::create(18, 12, status);
 }
 

-MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) {

     return MeasureUnit::create(18, 13, status);
 }
 
     return MeasureUnit::create(18, 13, status);
 }
 

-MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) {

     return MeasureUnit::create(18, 14, status);
 }
 
     return MeasureUnit::create(18, 14, status);
 }
 

-MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) {

     return MeasureUnit::create(18, 15, status);
 }
 
     return MeasureUnit::create(18, 15, status);
 }
 

-MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) {

     return MeasureUnit::create(18, 16, status);
 }
 
     return MeasureUnit::create(18, 16, status);
 }
 

-MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) {

     return MeasureUnit::create(18, 17, status);
 }
 
     return MeasureUnit::create(18, 17, status);
 }
 

-MeasureUnit *MeasureUnit::createPint(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) {

     return MeasureUnit::create(18, 18, status);
 }
 
     return MeasureUnit::create(18, 18, status);
 }
 

-MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) {

     return MeasureUnit::create(18, 19, status);
 }
 
     return MeasureUnit::create(18, 19, status);
 }
 

-MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createPint(UErrorCode &status) {

     return MeasureUnit::create(18, 20, status);
 }
 
     return MeasureUnit::create(18, 20, status);
 }
 

-MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) {
+MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) {

     return MeasureUnit::create(18, 21, status);
 }
 
     return MeasureUnit::create(18, 21, status);
 }
 

+MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) {
+    return MeasureUnit::create(18, 22, status);
+}
+
+MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) {
+    return MeasureUnit::create(18, 23, status);
+}
+
+MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) {
+    return MeasureUnit::create(18, 24, status);
+}
+

 // End generated code
 
 static int32_t binarySearch(
 // End generated code
 
 static int32_t binarySearch(


@@ -1118,6 +1179,18 @@ int32_t MeasureUnit::getIndexCount() {
     return gIndexes[UPRV_LENGTHOF(gIndexes) - 1];
 }
 
     return gIndexes[UPRV_LENGTHOF(gIndexes) - 1];
 }
 

+int32_t MeasureUnit::internalGetIndexForTypeAndSubtype(const char *type, const char *subtype) {
+    int32_t t = binarySearch(gTypes, 0, UPRV_LENGTHOF(gTypes), type);
+    if (t < 0) {
+        return t;
+    }
+    int32_t st = binarySearch(gSubTypes, gOffsets[t], gOffsets[t + 1], subtype);
+    if (st < 0) {
+        return st;
+    }
+    return gIndexes[t] + st - gOffsets[t];
+}
+

 MeasureUnit *MeasureUnit::resolveUnitPerUnit(
         const MeasureUnit &unit, const MeasureUnit &perUnit) {
     int32_t unitOffset = unit.getOffset();
 MeasureUnit *MeasureUnit::resolveUnitPerUnit(
         const MeasureUnit &unit, const MeasureUnit &perUnit) {
     int32_t unitOffset = unit.getOffset();


@@ -1176,6 +1249,7 @@ void MeasureUnit::initCurrency(const char *isoCurrency) {
         fSubTypeId = result - gOffsets[fTypeId];
     } else {
         uprv_strncpy(fCurrency, isoCurrency, UPRV_LENGTHOF(fCurrency));
         fSubTypeId = result - gOffsets[fTypeId];
     } else {
         uprv_strncpy(fCurrency, isoCurrency, UPRV_LENGTHOF(fCurrency));

+        fCurrency[3] = 0;

     }
 }
 
     }
 }