Merge remote-tracking branch 'sffc/units-staging' into units-staging

diff --cc icu4c/source/data/misc/units.txt
index 6e4ba5daa50c8fdf91a202d677e66df103148481,20e7bb64d6c70f2e68691e90331d6a4fbae819a1..ed9e075fd648a42c3da4a28e498c23c8af735dbf
--- 1/icu4c/source/data/misc/units.txt
--- 2/icu4c/source/data/misc/units.txt
+++ b/icu4c/source/data/misc/units.txt
@@@ -161,160 -35,20 +161,161 @@@ units:table(nofallback)
              offset{"273.15"}
              target{"celsius"}
          }
 -        // <convertUnit source='hectare' target='square-meter' factor='10000'/>
 -        // <convertUnit source='acre' target='square-meter' factor='f2m^2 * 43560'/>
 -        // <convertUnit source='dunam' target='square-meter' factor='1000'/>
 -        hectare{
 -            factor{"10000"}
 -            target{"square-meter"}
 +        knot{
 +            factor{"1852/3600"}
 +            target{"meter-per-second"}
          }
 -        acre{
 -            factor{"f2m^2 * 43560"}
 -            target{"square-meter"}
 +        light-year{
 +            factor{"9460730000000000"}
 +            target{"meter"}
          }
 -        dunam{
 +        liter{
 +            factor{"0.001"}
 +            target{"cubic-meter"}
 +        }
 +        metric-ton{
              factor{"1000"}
 -            target{"square-meter"}
 +            target{"kilogram"}
 +        }
 +        mile{
 +            factor{"f2m*5280"}
 +            target{"meter"}
 +        }
 +        mile-per-gallon{
 +            factor{"235.215"}
 +            reciprocal{"TRUE"}
 +            target{"liter-per-kilometer"}
 +        }
 +        mile-scandinavian{
 +            factor{"10000"}
 +            target{"meter"}
 +        }
 +        minute{
 +            factor{"3600"}
 +            target{"second"}
 +        }
 +        mole{
 +            factor{"6.02214076E+23"}
 +            target{"one"}
 +        }
 +        nautical-mile{
 +            factor{"1852"}
 +            target{"meter"}
 +        }
 +        newton{
 +            factor{"1"}
 +            target{"kilogram-meter-per-square-second"}
 +        }
 +        ohm{
 +            factor{"1"}
 +            target{"kilogram-square-meter-per-cubic-second-square-ampere"}
 +        }
 +        one{
 +            factor{"1"}
 +            target{"1"}
 +        }
 +        ounce{
 +            factor{"lb2kg/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{"one-per-one"}
          }
 +        permille{
 +            factor{"1/1000"}
 +            target{"one-per-one"}
 +        }
 +        permyriad{
 +            factor{"1/10000"}
 +            target{"one-per-one"}
 +        }
 +        pint{
 +            factor{"cup2m3 * 2"}
 +            target{"cubic-meter"}
 +        }
 +        pint-metric{
 +            factor{"0.0005"}
 +            target{"cubic-meter"}
 +        }
 +        pound{
 +            factor{"lb2kg"}
 +            target{"kilogram"}
 +        }
 +        pound-force{
 +            factor{"lb2kg * gravity"}
 +            target{"kilogram-meter-per-square-second"}
 +        }
 +        quart{
 +            factor{"cup2m3 * 4"}
 +            target{"cubic-meter"}
 +        }
 +        radian{
 +            factor{"180/PI"}
 +            target{"degree"}
 +        }
 +        revolution{
 +            factor{"360"}
 +            target{"degree"}
 +        }
 +        stone{
 +            factor{"lb2kg*14"}
 +            target{"kilogram"}
 +        }
 +        tablespoon{
 +            factor{"cup2m3/16"}
 +            target{"cubic-meter"}
 +        }
 +        teaspoon{
 +            factor{"cup2m3/48"}
 +            target{"cubic-meter"}
 +        }
 +        therm-us{
 +            factor{"105506000"}
 +            target{"kilogram-square-meter-per-square-second"}
 +        }
 +        ton{
 +            factor{"lb2kg*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{"f2m*3"}
 +            target{"meter"}
 +        }
 +    }
 +    unitConstants{
 +        PI{"3.1415926535897932384626433832795"}
 +        f2m{"0.3048"}
 +        gravity{"9.80665"}
 +        lb2kg{"0.45359237"}
++        cup2m3{"231*f2m*f2m*f2m/16*12*12*12"}
      }
  }