copy "%(FullPath)" ..\..\include\unicode
@@ -1687,4 +1702,4 @@
-
\ No newline at end of file
+
diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index bb2521d10de..406bb69d8f7 100644
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -228,6 +228,9 @@
formatting
+
+ formatting
+
formatting
@@ -1071,6 +1074,9 @@
formatting
+
+ formatting
+
formatting
@@ -1197,4 +1203,4 @@
misc
-
\ No newline at end of file
+
diff --git a/icu4c/source/i18n/scientificformathelper.cpp b/icu4c/source/i18n/scientificformathelper.cpp
new file mode 100644
index 00000000000..c9d7fdf58e3
--- /dev/null
+++ b/icu4c/source/i18n/scientificformathelper.cpp
@@ -0,0 +1,158 @@
+/*
+**********************************************************************
+* Copyright (c) 2014, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*/
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/scientificformathelper.h"
+#include "unicode/dcfmtsym.h"
+#include "unicode/fpositer.h"
+#include "unicode/utf16.h"
+
+#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+
+// TODO: Add U_DRAFT_API directives.
+// TODO: Add U_FORMATTING directives
+
+U_NAMESPACE_BEGIN
+
+static UChar kExponentDigits[] = {0x2070, 0xB9, 0xB2, 0xB3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079};
+
+static UnicodeString getMultiplicationSymbol(const DecimalFormatSymbols &dfs) {
+ static UChar multSign = 0xD7;
+ return UnicodeString(FALSE, &multSign, 1);
+}
+
+ScientificFormatHelper::ScientificFormatHelper(
+ const DecimalFormatSymbols &dfs, UErrorCode &status) : fPreExponent() {
+ if (U_FAILURE(status)) {
+ return;
+ }
+ fPreExponent.append(getMultiplicationSymbol(dfs));
+ fPreExponent.append(dfs.getSymbol(DecimalFormatSymbols::kOneDigitSymbol));
+ fPreExponent.append(dfs.getSymbol(DecimalFormatSymbols::kZeroDigitSymbol));
+}
+
+ScientificFormatHelper::ScientificFormatHelper(
+ const ScientificFormatHelper &other) : fPreExponent(other.fPreExponent) {
+}
+
+ScientificFormatHelper &ScientificFormatHelper::operator=(const ScientificFormatHelper &other) {
+ if (this == &other) {
+ return *this;
+ }
+ fPreExponent = other.fPreExponent;
+ return *this;
+}
+
+ScientificFormatHelper::~ScientificFormatHelper() {
+}
+
+UnicodeString &ScientificFormatHelper::insetMarkup(
+ const UnicodeString &s,
+ FieldPositionIterator &fpi,
+ const UnicodeString &beginMarkup,
+ const UnicodeString &endMarkup,
+ UnicodeString &result,
+ UErrorCode & /* status */) const {
+ FieldPosition fp;
+ int32_t copyFromOffset = 0;
+ while (fpi.next(fp)) {
+ switch (fp.getField()) {
+ case UNUM_EXPONENT_SYMBOL_FIELD:
+ result.append(s, copyFromOffset, fp.getBeginIndex() - copyFromOffset);
+ copyFromOffset = fp.getEndIndex();
+ result.append(fPreExponent);
+ result.append(beginMarkup);
+ break;
+ case UNUM_EXPONENT_FIELD:
+ result.append(s, copyFromOffset, fp.getEndIndex() - copyFromOffset);
+ copyFromOffset = fp.getEndIndex();
+ result.append(endMarkup);
+ break;
+ default:
+ break;
+ }
+ }
+ result.append(s, copyFromOffset, s.length() - copyFromOffset);
+ return result;
+}
+
+static UBool copyAsSuperscript(
+ const UnicodeString &s,
+ int32_t beginIndex,
+ int32_t endIndex,
+ UnicodeString &result,
+ UErrorCode &status) {
+ if (U_FAILURE(status)) {
+ return FALSE;
+ }
+ for (int32_t i = beginIndex; i < endIndex;) {
+ UChar32 c = s.char32At(i);
+ int32_t digit = u_charDigitValue(c);
+ if (digit < 0) {
+ status = U_INVALID_CHAR_FOUND;
+ return FALSE;
+ }
+ result.append(kExponentDigits[digit]);
+ i += U16_LENGTH(c);
+ }
+ return TRUE;
+}
+
+static UBool isMinusSign(UChar ch) {
+ // TODO: revisit this.
+ return (ch == 0x2D);
+}
+
+UnicodeString &ScientificFormatHelper::toSuperscriptExponentDigits(
+ const UnicodeString &s,
+ FieldPositionIterator &fpi,
+ UnicodeString &result,
+ UErrorCode &status) const {
+ FieldPosition fp;
+ int32_t copyFromOffset = 0;
+ while (fpi.next(fp)) {
+ switch (fp.getField()) {
+ case UNUM_EXPONENT_SYMBOL_FIELD:
+ result.append(s, copyFromOffset, fp.getBeginIndex() - copyFromOffset);
+ copyFromOffset = fp.getEndIndex();
+ result.append(fPreExponent);
+ break;
+ case UNUM_EXPONENT_SIGN_FIELD:
+ {
+ int32_t beginIndex = fp.getBeginIndex();
+ int32_t endIndex = fp.getEndIndex();
+ if (endIndex - beginIndex == 1 && isMinusSign(s[beginIndex])) {
+ result.append(s, copyFromOffset, beginIndex - copyFromOffset);
+ result.append(0x207B);
+ } else {
+ status = U_INVALID_CHAR_FOUND;
+ return result;
+ }
+ copyFromOffset = endIndex;
+ }
+ break;
+ case UNUM_EXPONENT_FIELD:
+ result.append(s, copyFromOffset, fp.getBeginIndex() - copyFromOffset);
+ if (!copyAsSuperscript(
+ s, fp.getBeginIndex(), fp.getEndIndex(), result, status)) {
+ return result;
+ }
+ copyFromOffset = fp.getEndIndex();
+ break;
+ default:
+ break;
+ }
+ }
+ result.append(s, copyFromOffset, s.length() - copyFromOffset);
+ return result;
+}
+
+U_NAMESPACE_END
+
+#endif /* !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/unicode/scientificformathelper.h b/icu4c/source/i18n/unicode/scientificformathelper.h
new file mode 100644
index 00000000000..9498ca3d5f3
--- /dev/null
+++ b/icu4c/source/i18n/unicode/scientificformathelper.h
@@ -0,0 +1,131 @@
+/*
+**********************************************************************
+* Copyright (c) 2014, International Business Machines
+* Corporation and others. All Rights Reserved.
+**********************************************************************
+*/
+#ifndef SCIFORMATHELPER_H
+#define SCIFORMATHELPER_H
+
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#ifndef U_HIDE_DRAFT_API
+
+#include "unicode/unistr.h"
+
+/**
+ * \file
+ * \brief C++ API: Formatter for measure objects.
+ */
+
+U_NAMESPACE_BEGIN
+
+class DecimalFormatSymbols;
+class FieldPositionIterator;
+
+/**
+ * A helper class for formatting in user-friendly scientific notation.
+ *
+ * Sample code:
+ *
+ * UErrorCode status = U_ZERO_ERROR;
+ * DecimalFormat *decfmt = (DecimalFormat *)
+ * NumberFormat::createScientificInstance("en", status);
+ * UnicodeString appendTo;
+ * FieldPositionIterator fpositer;
+ * decfmt->format(1.23456e-78, appendTo, &fpositer, status);
+ * ScientificFormatHelper helper(*decfmt->getDecimalFormatSymbols(), status);
+ * UnicodeString result;
+ *
+ * // result = "1.23456×10-78"
+ * helper.insetMarkup(appendTo, fpositer, "", "", result, status));
+ *
+ *
+ * @see NumberFormat
+ * @draft ICU 54
+ */
+class U_I18N_API ScientificFormatHelper : public UObject {
+ public:
+ /**
+ * Constructor.
+ * @param symbols comes from DecimalFormat instance used for default
+ * scientific notation.
+ * @param status any error reported here.
+ * @draft ICU 54
+ */
+ ScientificFormatHelper(const DecimalFormatSymbols &symbols, UErrorCode& status);
+
+ /**
+ * Copy constructor.
+ * @draft ICU 54
+ */
+ ScientificFormatHelper(const ScientificFormatHelper &other);
+
+ /**
+ * Assignment operator.
+ * @draft ICU 54
+ */
+ ScientificFormatHelper &operator=(const ScientificFormatHelper &other);
+
+ /**
+ * Destructor.
+ * @draft ICU 54
+ */
+ virtual ~ScientificFormatHelper();
+
+ /**
+ * Makes scientific notation user-friendly by surrounding exponent with
+ * html to make it superscript.
+ * @param s the original formatted scientific notation e.g "6.02e23"
+ * s is output from NumberFormat::createScientificInstance()->format().
+ * @param fpi the FieldPositionIterator from the format call.
+ * fpi is output from NumberFormat::createScientificInstance()->format().
+ * @param beginMarkup the start html for the exponent e.g ""
+ * @param endMarkup the end html for the exponent e.g ""
+ * @param result user-friendly scientific notation stored here.
+ * @param status any error returned here. When status is set to a non-zero
+ * error, the value of result is unspecified, and client should fallback
+ * to using s for scientific notation.
+ * @return the value stored in result.
+ * @draft ICU 54
+ */
+ UnicodeString &insetMarkup(
+ const UnicodeString &s,
+ FieldPositionIterator &fpi,
+ const UnicodeString &beginMarkup,
+ const UnicodeString &endMarkup,
+ UnicodeString &result,
+ UErrorCode &status) const;
+
+ /**
+ * Makes scientific notation user-friendly by using specific code points
+ * for superscript 0..9 and - in the exponent rather than by using
+ * html.
+ * @param s the original formatted scientific notation e.g "6.02e23"
+ * s is output from NumberFormat::createScientificInstance()->format().
+ * @param fpi the corresponding FieldPositionIterator from the format call.
+ * fpi is output from NumberFormat::createScientificInstance()->format().
+ * @param result user-friendly scientific notation stored here.
+ * @param status any error returned here. When status is set to a non-zero
+ * error, the value of result is unspecified, and client should fallback
+ * to using s for scientific notation.
+ * @return the value stored in result.
+ * @draft ICU 54
+ */
+ UnicodeString &toSuperscriptExponentDigits(
+ const UnicodeString &s,
+ FieldPositionIterator &fpi,
+ UnicodeString &result,
+ UErrorCode &status) const;
+ private:
+ UnicodeString fPreExponent;
+};
+
+U_NAMESPACE_END
+
+#endif /* U_HIDE_DRAFT_API */
+
+#endif /* !UCONFIG_NO_FORMATTING */
+#endif
diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in
index 48bfa5b5cd0..d3e72c25cc2 100644
--- a/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@@ -57,7 +57,7 @@ uobjtest.o idnaref.o idnaconf.o nptrans.o punyref.o testidn.o testidna.o uts46te
incaltst.o calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o \
windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o dtifmtts.o \
tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o \
-reldatefmttest.o lrucachetest.o simplepatternformattertest.o measfmttest.o
+reldatefmttest.o lrucachetest.o simplepatternformattertest.o measfmttest.o scientificformathelpertest.o
DEPS = $(OBJECTS:.o=.d)
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 4e6c55c2216..eca085ddf15 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -324,6 +324,7 @@
false
+
@@ -570,4 +571,4 @@
-
\ No newline at end of file
+
diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters
index 05df5301e4a..a0193c78b8a 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj.filters
+++ b/icu4c/source/test/intltest/intltest.vcxproj.filters
@@ -268,6 +268,9 @@
formatting
+
+ formatting
+
formatting
diff --git a/icu4c/source/test/intltest/itformat.cpp b/icu4c/source/test/intltest/itformat.cpp
index ed08d47bd56..9053fe25395 100644
--- a/icu4c/source/test/intltest/itformat.cpp
+++ b/icu4c/source/test/intltest/itformat.cpp
@@ -63,6 +63,7 @@ extern IntlTest *createCompactDecimalFormatTest();
extern IntlTest *createGenderInfoTest();
extern IntlTest *createRelativeDateTimeFormatterTest();
extern IntlTest *createMeasureFormatTest();
+extern IntlTest *createScientificFormatHelperTest();
#define TESTCLASS(id, TestClass) \
case id: \
@@ -177,6 +178,15 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam
callTest(*test, par);
}
break;
+ case 48:
+ name = "ScientificFormatHelperTest";
+ if (exec) {
+ logln("ScientificFormatHelperTest test---");
+ logln((UnicodeString)"");
+ LocalPointer test(createScientificFormatHelperTest());
+ callTest(*test, par);
+ }
+ break;
default: name = ""; break; //needed to end loop
}
if (exec) {
diff --git a/icu4c/source/test/intltest/scientificformathelpertest.cpp b/icu4c/source/test/intltest/scientificformathelpertest.cpp
new file mode 100644
index 00000000000..4dbf6c96029
--- /dev/null
+++ b/icu4c/source/test/intltest/scientificformathelpertest.cpp
@@ -0,0 +1,77 @@
+/*
+*******************************************************************************
+* Copyright (C) 2014, International Business Machines Corporation and *
+* others. All Rights Reserved. *
+*******************************************************************************
+*
+* File SCIFORMATHELPERTEST.CPP
+*
+*******************************************************************************
+*/
+#include
+#include
+
+#include "intltest.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/scientificformathelper.h"
+#include "unicode/numfmt.h"
+#include "unicode/decimfmt.h"
+
+#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+
+class ScientificFormatHelperTest : public IntlTest {
+public:
+ ScientificFormatHelperTest() {
+ }
+
+ void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0);
+private:
+ void TestBasic();
+};
+
+void ScientificFormatHelperTest::runIndexedTest(
+ int32_t index, UBool exec, const char *&name, char *) {
+ if (exec) {
+ logln("TestSuite ScientificFormatHelperTest: ");
+ }
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestBasic);
+ TESTCASE_AUTO_END;
+}
+
+void ScientificFormatHelperTest::TestBasic() {
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer decfmt((DecimalFormat *) NumberFormat::createScientificInstance("en", status));
+ UnicodeString appendTo("String: ");
+ FieldPositionIterator fpositer;
+ decfmt->format(1.23456e-78, appendTo, &fpositer, status);
+ FieldPositionIterator fpositer2(fpositer);
+ FieldPositionIterator fpositer3(fpositer);
+ ScientificFormatHelper helper(*decfmt->getDecimalFormatSymbols(), status);
+ UnicodeString result;
+ assertEquals(
+ "insetMarkup",
+ "String: 1.23456×10-78",
+ helper.insetMarkup(appendTo, fpositer, "", "", result, status));
+ result.remove();
+ assertEquals(
+ "toSuperscriptExponentDigits",
+ "String: 1.23456×10⁻⁷⁸",
+ helper.toSuperscriptExponentDigits(appendTo, fpositer2, result, status));
+ assertSuccess("", status);
+ result.remove();
+
+ // The 'a' is an invalid exponent character.
+ helper.toSuperscriptExponentDigits("String: 1.23456e-7a", fpositer3, result, status);
+ if (status != U_INVALID_CHAR_FOUND) {
+ errln("Expected U_INVALID_CHAR_FOUND");
+ }
+}
+
+extern IntlTest *createScientificFormatHelperTest() {
+ return new ScientificFormatHelperTest();
+}
+
+#endif /* !UCONFIG_NO_FORMATTING */