organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21484 Add SignDisplay NEGATIVE

Browse source
This commit is contained in:
Shane F. Carr 2021-02-03 22:50:47 -06:00
parent f23bd25ef5
commit 1aa0dad8e0
12 changed files with 238 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/userguide/format_parse/numbers/skeletons.md
View file

@ -349,6 +349,8 @@ The following stems specify sign display:
- `sign-accounting-always` or `()!` (concise)
- `sign-except-zero` or `+?` (concise)
- `sign-accounting-except-zero` or `()?` (concise)
- `sign-negative` or `+-` (concise)
- `sign-accounting-negative` or `()-` (concise)
For more details, see
[`UNumberSignDisplay`](https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/unumberformatter_8h.html).

6
icu4c/source/i18n/number_formatimpl.cpp
View file

@ -139,8 +139,10 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe,
bool isPermille = utils::unitIsPermille(macros.unit);
bool isCompactNotation = macros.notation.fType == Notation::NTN_COMPACT;
bool isAccounting =
macros.sign == UNUM_SIGN_ACCOUNTING || macros.sign == UNUM_SIGN_ACCOUNTING_ALWAYS ||
macros.sign == UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO;
macros.sign == UNUM_SIGN_ACCOUNTING ||
macros.sign == UNUM_SIGN_ACCOUNTING_ALWAYS ||
macros.sign == UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO ||
macros.sign == UNUM_SIGN_ACCOUNTING_NEGATIVE;
CurrencyUnit currency(u"", status);
if (isCurrency) {
currency = CurrencyUnit(macros.unit, status); // Restore CurrencyUnit from MeasureUnit

14
icu4c/source/i18n/number_patternstring.cpp
View file

@ -1106,6 +1106,20 @@ PatternSignType PatternStringUtils::resolveSignDisplay(UNumberSignDisplay signDi
}
break;
case UNUM_SIGN_NEGATIVE:
case UNUM_SIGN_ACCOUNTING_NEGATIVE:
switch (signum) {
case SIGNUM_NEG:
return PATTERN_SIGN_TYPE_NEG;
case SIGNUM_NEG_ZERO:
case SIGNUM_POS_ZERO:
case SIGNUM_POS:
return PATTERN_SIGN_TYPE_POS;
default:
break;
}
break;
case UNUM_SIGN_NEVER:
return PATTERN_SIGN_TYPE_POS;

17
icu4c/source/i18n/number_skeletons.cpp
View file

@ -91,6 +91,8 @@ void U_CALLCONV initNumberSkeletons(UErrorCode& status) {
b.add(u"sign-accounting-always", STEM_SIGN_ACCOUNTING_ALWAYS, status);
b.add(u"sign-except-zero", STEM_SIGN_EXCEPT_ZERO, status);
b.add(u"sign-accounting-except-zero", STEM_SIGN_ACCOUNTING_EXCEPT_ZERO, status);
b.add(u"sign-negative", STEM_SIGN_NEGATIVE, status);
b.add(u"sign-accounting-negative", STEM_SIGN_ACCOUNTING_NEGATIVE, status);
b.add(u"decimal-auto", STEM_DECIMAL_AUTO, status);
b.add(u"decimal-always", STEM_DECIMAL_ALWAYS, status);
if (U_FAILURE(status)) { return; }
@ -121,6 +123,8 @@ void U_CALLCONV initNumberSkeletons(UErrorCode& status) {
b.add(u"()!", STEM_SIGN_ACCOUNTING_ALWAYS, status);
b.add(u"+?", STEM_SIGN_EXCEPT_ZERO, status);
b.add(u"()?", STEM_SIGN_ACCOUNTING_EXCEPT_ZERO, status);
b.add(u"+-", STEM_SIGN_NEGATIVE, status);
b.add(u"()-", STEM_SIGN_ACCOUNTING_NEGATIVE, status);
if (U_FAILURE(status)) { return; }
// Build the CharsTrie
@ -278,6 +282,10 @@ UNumberSignDisplay stem_to_object::signDisplay(skeleton::StemEnum stem) {
return UNUM_SIGN_EXCEPT_ZERO;
case STEM_SIGN_ACCOUNTING_EXCEPT_ZERO:
return UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO;
case STEM_SIGN_NEGATIVE:
return UNUM_SIGN_NEGATIVE;
case STEM_SIGN_ACCOUNTING_NEGATIVE:
return UNUM_SIGN_ACCOUNTING_NEGATIVE;
default:
return UNUM_SIGN_COUNT; // for objects, throw; for enums, return COUNT
}
@ -399,6 +407,12 @@ void enum_to_stem_string::signDisplay(UNumberSignDisplay value, UnicodeString& s
case UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO:
sb.append(u"sign-accounting-except-zero", -1);
break;
case UNUM_SIGN_NEGATIVE:
sb.append(u"sign-negative", -1);
break;
case UNUM_SIGN_ACCOUNTING_NEGATIVE:
sb.append(u"sign-accounting-negative", -1);
break;
default:
UPRV_UNREACHABLE;
}
@ -697,6 +711,8 @@ skeleton::parseStem(const StringSegment& segment, const UCharsTrie& stemTrie, Se
case STEM_SIGN_ACCOUNTING_ALWAYS:
case STEM_SIGN_EXCEPT_ZERO:
case STEM_SIGN_ACCOUNTING_EXCEPT_ZERO:
case STEM_SIGN_NEGATIVE:
case STEM_SIGN_ACCOUNTING_NEGATIVE:
CHECK_NULL(seen, sign, status);
macros.sign = stem_to_object::signDisplay(stem);
return STATE_NULL;
@ -1205,6 +1221,7 @@ void blueprint_helpers::parseScientificStem(const StringSegment& segment, MacroP
} else if (segment.charAt(offset) == u'?') {
signDisplay = UNUM_SIGN_EXCEPT_ZERO;
} else {
// NOTE: Other sign displays are not included because they aren't useful in this context
goto fail;
}
offset++;

2
icu4c/source/i18n/number_skeletons.h
View file

@ -108,6 +108,8 @@ enum StemEnum {
STEM_SIGN_ACCOUNTING_ALWAYS,
STEM_SIGN_EXCEPT_ZERO,
STEM_SIGN_ACCOUNTING_EXCEPT_ZERO,
STEM_SIGN_NEGATIVE,
STEM_SIGN_ACCOUNTING_NEGATIVE,
STEM_DECIMAL_AUTO,
STEM_DECIMAL_ALWAYS,

35
icu4c/source/i18n/unicode/unumberformatter.h
View file

@ -314,9 +314,12 @@ typedef enum UNumberSignDisplay {
* Show the minus sign on negative numbers, and do not show the sign on positive numbers. This is the default
* behavior.
*
* If using this option, a sign will be displayed on negative zero, including negative numbers
* that round to zero. To hide the sign on negative zero, use the NEGATIVE option.
*
* @stable ICU 60
*/
UNUM_SIGN_AUTO,
UNUM_SIGN_AUTO,
/**
* Show the minus sign on negative numbers and the plus sign on positive numbers, including zero.
@ -324,14 +327,14 @@ typedef enum UNumberSignDisplay {
*
* @stable ICU 60
*/
UNUM_SIGN_ALWAYS,
UNUM_SIGN_ALWAYS,
/**
* Do not show the sign on positive or negative numbers.
*
* @stable ICU 60
*/
UNUM_SIGN_NEVER,
UNUM_SIGN_NEVER,
/**
* Use the locale-dependent accounting format on negative numbers, and do not show the sign on positive numbers.
@ -347,7 +350,7 @@ typedef enum UNumberSignDisplay {
*
* @stable ICU 60
*/
UNUM_SIGN_ACCOUNTING,
UNUM_SIGN_ACCOUNTING,
/**
* Use the locale-dependent accounting format on negative numbers, and show the plus sign on
@ -357,7 +360,7 @@ typedef enum UNumberSignDisplay {
*
* @stable ICU 60
*/
UNUM_SIGN_ACCOUNTING_ALWAYS,
UNUM_SIGN_ACCOUNTING_ALWAYS,
/**
* Show the minus sign on negative numbers and the plus sign on positive numbers. Do not show a
@ -365,7 +368,7 @@ typedef enum UNumberSignDisplay {
*
* @stable ICU 61
*/
UNUM_SIGN_EXCEPT_ZERO,
UNUM_SIGN_EXCEPT_ZERO,
/**
* Use the locale-dependent accounting format on negative numbers, and show the plus sign on
@ -374,14 +377,30 @@ typedef enum UNumberSignDisplay {
*
* @stable ICU 61
*/
UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO,
UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO,
#ifndef U_HIDE_DRAFT_API
/**
* Same as AUTO, but do not show the sign on negative zero.
*
* @draft ICU 69
*/
UNUM_SIGN_NEGATIVE,
/**
* Same as ACCOUNTING, but do not show the sign on negative zero.
*
* @draft ICU 69
*/
UNUM_SIGN_ACCOUNTING_NEGATIVE,
#endif // U_HIDE_DRAFT_API
/**
* One more than the highest UNumberSignDisplay value.
*
* @internal ICU 60: The numeric value may change over time; see ICU ticket #12420.
*/
UNUM_SIGN_COUNT
UNUM_SIGN_COUNT = 9,
} UNumberSignDisplay;
/**

60
icu4c/source/test/intltest/numbertest_api.cpp
View file

@ -3782,6 +3782,60 @@ void NumberFormatterApiTest::sign() {
0,
u"$0.00");
assertFormatSingle(
u"Sign Negative Positive",
u"sign-negative",
u"+-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_NEGATIVE),
Locale::getEnglish(),
444444,
u"444,444");
assertFormatSingle(
u"Sign Negative Negative",
u"sign-negative",
u"+-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_NEGATIVE),
Locale::getEnglish(),
-444444,
u"-444,444");
assertFormatSingle(
u"Sign Negative Negative Zero",
u"sign-negative",
u"+-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_NEGATIVE),
Locale::getEnglish(),
-0.0000001,
u"0");
assertFormatSingle(
u"Sign Accounting-Negative Positive",
u"currency/USD sign-accounting-negative",
u"currency/USD ()-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_ACCOUNTING_NEGATIVE).unit(USD),
Locale::getEnglish(),
444444,
u"$444,444.00");
assertFormatSingle(
u"Sign Accounting-Negative Negative",
u"currency/USD sign-accounting-negative",
u"currency/USD ()-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_ACCOUNTING_NEGATIVE).unit(USD),
Locale::getEnglish(),
-444444,
"($444,444.00)");
assertFormatSingle(
u"Sign Accounting-Negative Negative Zero",
u"currency/USD sign-accounting-negative",
u"currency/USD ()-",
NumberFormatter::with().sign(UNumberSignDisplay::UNUM_SIGN_ACCOUNTING_NEGATIVE).unit(USD),
Locale::getEnglish(),
-0.0000001,
u"$0.00");
assertFormatSingle(
u"Sign Accounting Negative Hidden",
u"currency/USD unit-width-hidden sign-accounting",
@ -3871,6 +3925,12 @@ void NumberFormatterApiTest::signNearZero() {
{ UNUM_SIGN_EXCEPT_ZERO, -0.1, u"0" }, // interesting case
{ UNUM_SIGN_EXCEPT_ZERO, -0.9, u"-1" },
{ UNUM_SIGN_EXCEPT_ZERO, -1.1, u"-1" },
{ UNUM_SIGN_NEGATIVE, 1.1, u"1" },
{ UNUM_SIGN_NEGATIVE, 0.9, u"1" },
{ UNUM_SIGN_NEGATIVE, 0.1, u"0" },
{ UNUM_SIGN_NEGATIVE, -0.1, u"0" }, // interesting case
{ UNUM_SIGN_NEGATIVE, -0.9, u"-1" },
{ UNUM_SIGN_NEGATIVE, -1.1, u"-1" },
};
for (auto& cas : cases) {
auto sign = cas.sign;

12
icu4j/main/classes/core/src/com/ibm/icu/impl/number/PatternStringUtils.java
View file

@ -529,6 +529,18 @@ public class PatternStringUtils {
}
break;
case NEGATIVE:
case ACCOUNTING_NEGATIVE:
switch (signum) {
case NEG:
return PatternSignType.NEG;
case NEG_ZERO:
case POS_ZERO:
case POS:
return PatternSignType.POS;
}
break;
case NEVER:
return PatternSignType.POS;

19
icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatter.java
View file

@ -302,6 +302,9 @@ public final class NumberFormatter {
* Show the minus sign on negative numbers, and do not show the sign on positive numbers. This is
* the default behavior.
*
* If using this option, a sign will be displayed on negative zero, including negative numbers
* that round to zero. To hide the sign on negative zero, use the NEGATIVE option.
*
* @stable ICU 60
* @see NumberFormatter
*/
@ -371,6 +374,22 @@ public final class NumberFormatter {
* @see NumberFormatter
*/
ACCOUNTING_EXCEPT_ZERO,
/**
* Same as AUTO, but do not show the sign on negative zero.
*
* @draft ICU 69
* @provisional This API might change or be removed in a future release.
*/
NEGATIVE,
/**
* Same as ACCOUNTING, but do not show the sign on negative zero.
*
* @draft ICU 69
* @provisional This API might change or be removed in a future release.
*/
ACCOUNTING_NEGATIVE,
}
/**

3
icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterImpl.java
View file

@ -193,7 +193,8 @@ class NumberFormatterImpl {
boolean isCompactNotation = (macros.notation instanceof CompactNotation);
boolean isAccounting = macros.sign == SignDisplay.ACCOUNTING
|| macros.sign == SignDisplay.ACCOUNTING_ALWAYS
|| macros.sign == SignDisplay.ACCOUNTING_EXCEPT_ZERO;
|| macros.sign == SignDisplay.ACCOUNTING_EXCEPT_ZERO
|| macros.sign == SignDisplay.ACCOUNTING_NEGATIVE;
Currency currency = isCurrency ? (Currency) macros.unit : DEFAULT_CURRENCY;
UnitWidth unitWidth = UnitWidth.SHORT;
if (macros.unitWidth != null) {

19
icu4j/main/classes/core/src/com/ibm/icu/number/NumberSkeletonImpl.java
View file

@ -113,6 +113,8 @@ class NumberSkeletonImpl {
STEM_SIGN_ACCOUNTING_ALWAYS,
STEM_SIGN_EXCEPT_ZERO,
STEM_SIGN_ACCOUNTING_EXCEPT_ZERO,
STEM_SIGN_NEGATIVE,
STEM_SIGN_ACCOUNTING_NEGATIVE,
STEM_DECIMAL_AUTO,
STEM_DECIMAL_ALWAYS,
@ -189,6 +191,8 @@ class NumberSkeletonImpl {
b.add("sign-accounting-always", StemEnum.STEM_SIGN_ACCOUNTING_ALWAYS.ordinal());
b.add("sign-except-zero", StemEnum.STEM_SIGN_EXCEPT_ZERO.ordinal());
b.add("sign-accounting-except-zero", StemEnum.STEM_SIGN_ACCOUNTING_EXCEPT_ZERO.ordinal());
b.add("sign-negative", StemEnum.STEM_SIGN_NEGATIVE.ordinal());
b.add("sign-accounting-negative", StemEnum.STEM_SIGN_ACCOUNTING_NEGATIVE.ordinal());
b.add("decimal-auto", StemEnum.STEM_DECIMAL_AUTO.ordinal());
b.add("decimal-always", StemEnum.STEM_DECIMAL_ALWAYS.ordinal());
@ -217,6 +221,8 @@ class NumberSkeletonImpl {
b.add("()!", StemEnum.STEM_SIGN_ACCOUNTING_ALWAYS.ordinal());
b.add("+?", StemEnum.STEM_SIGN_EXCEPT_ZERO.ordinal());
b.add("()?", StemEnum.STEM_SIGN_ACCOUNTING_EXCEPT_ZERO.ordinal());
b.add("+-", StemEnum.STEM_SIGN_NEGATIVE.ordinal());
b.add("()-", StemEnum.STEM_SIGN_ACCOUNTING_NEGATIVE.ordinal());
// Build the CharsTrie
// TODO: Use SLOW or FAST here?
@ -351,6 +357,10 @@ class NumberSkeletonImpl {
return SignDisplay.EXCEPT_ZERO;
case STEM_SIGN_ACCOUNTING_EXCEPT_ZERO:
return SignDisplay.ACCOUNTING_EXCEPT_ZERO;
case STEM_SIGN_NEGATIVE:
return SignDisplay.NEGATIVE;
case STEM_SIGN_ACCOUNTING_NEGATIVE:
return SignDisplay.ACCOUNTING_NEGATIVE;
default:
return null; // for objects, throw; for enums, return null
}
@ -478,6 +488,12 @@ class NumberSkeletonImpl {
case ACCOUNTING_EXCEPT_ZERO:
sb.append("sign-accounting-except-zero");
break;
case NEGATIVE:
sb.append("sign-negative");
break;
case ACCOUNTING_NEGATIVE:
sb.append("sign-accounting-negative");
break;
default:
throw new AssertionError();
}
@ -764,6 +780,8 @@ class NumberSkeletonImpl {
case STEM_SIGN_ACCOUNTING_ALWAYS:
case STEM_SIGN_EXCEPT_ZERO:
case STEM_SIGN_ACCOUNTING_EXCEPT_ZERO:
case STEM_SIGN_NEGATIVE:
case STEM_SIGN_ACCOUNTING_NEGATIVE:
checkNull(macros.sign, segment);
macros.sign = StemToObject.signDisplay(stem);
return ParseState.STATE_NULL;
@ -1219,6 +1237,7 @@ class NumberSkeletonImpl {
} else if (segment.charAt(offset) == '?') {
signDisplay = SignDisplay.EXCEPT_ZERO;
} else {
// NOTE: Other sign displays are not included because they aren't useful in this context
break block;
}
offset++;

60
icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
View file

@ -3573,6 +3573,60 @@ public class NumberFormatterApiTest extends TestFmwk {
0,
"$0.00");
assertFormatSingle(
"Sign Negative Positive",
"sign-negative",
"+-",
NumberFormatter.with().sign(SignDisplay.NEGATIVE),
ULocale.ENGLISH,
444444,
"444,444");
assertFormatSingle(
"Sign Negative Negative",
"sign-negative",
"+-",
NumberFormatter.with().sign(SignDisplay.NEGATIVE),
ULocale.ENGLISH,
-444444,
"-444,444");
assertFormatSingle(
"Sign Negative Negative Zero",
"sign-negative",
"+-",
NumberFormatter.with().sign(SignDisplay.NEGATIVE),
ULocale.ENGLISH,
-0.0000001,
"0");
assertFormatSingle(
"Sign Accounting-Negative Positive",
"currency/USD sign-accounting-negative",
"currency/USD ()-",
NumberFormatter.with().sign(SignDisplay.ACCOUNTING_NEGATIVE).unit(USD),
ULocale.ENGLISH,
444444,
"$444,444.00");
assertFormatSingle(
"Sign Accounting-Negative Negative",
"currency/USD sign-accounting-negative",
"currency/USD ()-",
NumberFormatter.with().sign(SignDisplay.ACCOUNTING_NEGATIVE).unit(USD),
ULocale.ENGLISH,
-444444,
"($444,444.00)");
assertFormatSingle(
"Sign Accounting-Negative Negative Zero",
"currency/USD sign-accounting-negative",
"currency/USD ()-",
NumberFormatter.with().sign(SignDisplay.ACCOUNTING_NEGATIVE).unit(USD),
ULocale.ENGLISH,
-0.0000001,
"$0.00");
assertFormatSingle(
"Sign Accounting Negative Hidden",
"currency/USD unit-width-hidden sign-accounting",
@ -3643,6 +3697,12 @@ public class NumberFormatterApiTest extends TestFmwk {
{ SignDisplay.EXCEPT_ZERO, -0.1, "0" }, // interesting case
{ SignDisplay.EXCEPT_ZERO, -0.9, "-1" },
{ SignDisplay.EXCEPT_ZERO, -1.1, "-1" },
{ SignDisplay.NEGATIVE, 1.1, "1" },
{ SignDisplay.NEGATIVE, 0.9, "1" },
{ SignDisplay.NEGATIVE, 0.1, "0" },
{ SignDisplay.NEGATIVE, -0.1, "0" }, // interesting case
{ SignDisplay.NEGATIVE, -0.9, "-1" },
{ SignDisplay.NEGATIVE, -1.1, "-1" },
};
for (Object[] cas : cases) {
SignDisplay sign = (SignDisplay) cas[0];