// Add syntax parts (compound, power prefixes)
b.add(u"-per-", COMPOUND_PART_PER, status);
b.add(u"-", COMPOUND_PART_TIMES, status);
- b.add(u"+", COMPOUND_PART_PLUS, status);
+ b.add(u"-and-", COMPOUND_PART_PLUS, status);
b.add(u"square-", POWER_PART_P2, status);
b.add(u"cubic-", POWER_PART_P3, status);
b.add(u"p2-", POWER_PART_P2, status);
const SingleUnitImpl& prev = *impl.units[i-1];
const SingleUnitImpl& curr = *impl.units[i];
if (impl.complexity == UMEASURE_UNIT_SEQUENCE) {
- impl.identifier.append('+', status);
+ impl.identifier.append("-and-", status);
serializeSingle(curr, true, impl.identifier, status);
} else {
if (prev.dimensionality > 0 && curr.dimensionality < 0) {
verifySingleUnit(centimeter3, UMEASURE_SI_PREFIX_CENTI, 1, "centimeter");
assertTrue("string piece equality", centimeter1 == centimeter3);
- MeasureUnit footInch = MeasureUnit::forIdentifier("foot+inch", status);
- MeasureUnit inchFoot = MeasureUnit::forIdentifier("inch+foot", status);
+ MeasureUnit footInch = MeasureUnit::forIdentifier("foot-and-inch", status);
+ MeasureUnit inchFoot = MeasureUnit::forIdentifier("inch-and-foot", status);
const char* footInchSub[] = {"foot", "inch"};
- verifySequenceUnit(footInch, "foot+inch",
+ verifySequenceUnit(footInch, "foot-and-inch",
footInchSub, UPRV_LENGTHOF(footInchSub));
const char* inchFootSub[] = {"inch", "foot"};
- verifySequenceUnit(inchFoot, "inch+foot",
+ verifySequenceUnit(inchFoot, "inch-and-foot",
inchFootSub, UPRV_LENGTHOF(inchFootSub));
assertTrue("order matters inequality", footInch != inchFoot);
MeasureUnit squareKiloOne = squareOne.withSIPrefix(UMEASURE_SI_PREFIX_KILO, status);
MeasureUnit onePerSquareKiloOne = squareKiloOne.reciprocal(status);
MeasureUnit oneOne = MeasureUnit::forIdentifier("one-one", status);
- MeasureUnit onePlusOne = MeasureUnit::forIdentifier("one+one", status);
+ MeasureUnit onePlusOne = MeasureUnit::forIdentifier("one-and-one", status);
MeasureUnit kilometer2 = one2.product(kilometer, status);
verifySingleUnit(one1, UMEASURE_SI_PREFIX_ONE, 1, "one");