ICU-13099 Merging the follow up fix for #13120 ICU4J manifest still contains IBM copyright (r40048) to maint-59.

X-SVN-Rev: 40049

.gitattributes

@@ -50,7 +50,6 @@ README text !eol
 
 icu4c/icu4c.css -text
 icu4c/source/aclocal.m4 -text
-icu4c/source/allinone/icucheck.bat -text
 icu4c/source/config/m4/icu-conditional.m4 -text
 icu4c/source/data/curr/pool.res -text
 icu4c/source/data/in/coll/ucadata-implicithan.icu -text
@@ -504,11 +503,6 @@ icu4j/tools/build/icu4j56.api3.gz -text
 icu4j/tools/build/icu4j57.api3.gz -text
 icu4j/tools/build/icu4j58.api3.gz -text
 icu4j/tools/build/icu4j59.api3.gz -text
-tools/currency/.classpath -text
-tools/currency/.project -text
-tools/currency/.settings/org.eclipse.core.resources.prefs -text
-tools/currency/.settings/org.eclipse.jdt.core.prefs -text
-tools/currency/.settings/org.eclipse.jdt.ui.prefs -text
 tools/multi/c/Makefile-c.inc -text
 tools/multi/c/patch/3_0 -text
 tools/multi/c/patch/3_2 -text
@@ -540,7 +534,6 @@ tools/release/java/.classpath -text
 tools/release/java/.project -text
 tools/release/java/Makefile -text
 tools/release/java/icu4c.css -text
-tools/release/java/lib/LICENSE.txt -text
 tools/release/java/lib/README.TXT -text
 tools/release/java/lib/serializer.jar -text
 tools/release/java/lib/xalan.jar -text

icu4c/APIChangeReport.html

@@ -62,6 +62,10 @@
 <span class=""><span></span></span></td>
 </tr>
 <tr class="row1">
+<td class="file">platform.h</td><td class="proto"><tt>#define</tt> U_HAVE_RVALUE_REFERENCES</td><td class="">Internal</td><td>(missing)<br>
+<span class=""><span></span></span></td>
+</tr>
+<tr class="row0">
 <td class="file">unistr.h</td><td class="proto"><tt>#define</tt> U_STRING_CASE_MAPPER_DEFINED</td><td class="">Internal</td><td>(missing)<br>
 <span class=""><span></span></span></td>
 </tr>
@@ -98,157 +102,151 @@
 </tr>
 </THEAD>
 <tr class="row1">
-<td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createBit(UErrorCode&amp;)</td><td class="stabchange">Stable<br>ICU 54</td><td>Draft<br>
-<span class="verchange"><span>ICU 58</span>
-<br>
-<b class="bigwarn" title="A draft API has the wrong version.">(should be ICU 59)</b></span></td>
-</tr>
-<tr class="row0">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createGallonImperial(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createMilePerGallonImperial(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createMilligramPerDeciliter(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createMillimolePerLiter(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createPartPerMillion(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">reldatefmt.h</td><td class="proto">UnicodeString&amp; icu::RelativeDateTimeFormatter::format(double, URelativeDateTimeUnit, UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">reldatefmt.h</td><td class="proto">UnicodeString&amp; icu::RelativeDateTimeFormatter::formatNumeric(double, URelativeDateTimeUnit, UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">SimpleFormatter&amp; icu::SimpleFormatter::operator=(const SimpleFormatter&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">UBool icu::SimpleFormatter::applyPattern(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">UBool icu::SimpleFormatter::applyPatternMinMaxArguments(const UnicodeString&amp;, int32_t, int32_t, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString icu::SimpleFormatter::getTextWithNoArguments()</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString&amp; icu::SimpleFormatter::format(const UnicodeString&amp;, UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString&amp; icu::SimpleFormatter::format(const UnicodeString&amp;, const UnicodeString&amp;, UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString&amp; icu::SimpleFormatter::format(const UnicodeString&amp;, const UnicodeString&amp;, const UnicodeString&amp;, UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString&amp; icu::SimpleFormatter::formatAndAppend(const UnicodeString* const*, int32_t, UnicodeString&amp;, int32_t*, int32_t, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">UnicodeString&amp; icu::SimpleFormatter::formatAndReplace(const UnicodeString* const*, int32_t, UnicodeString&amp;, int32_t*, int32_t, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">icu::SimpleFormatter::SimpleFormatter()</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">icu::SimpleFormatter::SimpleFormatter(const SimpleFormatter&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">icu::SimpleFormatter::SimpleFormatter(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">icu::SimpleFormatter::SimpleFormatter(const UnicodeString&amp;, int32_t, int32_t, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">simpleformatter.h</td><td class="proto">icu::SimpleFormatter::~SimpleFormatter()</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">simpleformatter.h</td><td class="proto">int32_t icu::SimpleFormatter::getArgumentLimit()</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_EMOJI_MODIFIER_BASE</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_EMOJI_MODIFIER</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_EMOJI_PRESENTATION</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_EMOJI</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatField::UDAT_AM_PM_MIDNIGHT_NOON_FIELD</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto">URelativeDateTimeFormatter* ureldatefmt_open(const char*, UNumberFormat*, UDateRelativeDateTimeFormatterStyle, UDisplayContext, UErrorCode*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_DAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_FRIDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_HOUR</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_MINUTE</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_MONDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_MONTH</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_QUARTER</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_SATURDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_SECOND</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_SUNDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_THURSDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_TUESDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_WEDNESDAY</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_WEEK</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto"><tt>enum</tt> URelativeDateTimeUnit::UDAT_REL_UNIT_YEAR</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto">int32_t ureldatefmt_combineDateAndTime(const URelativeDateTimeFormatter*, const UChar*, int32_t, const UChar*, int32_t, UChar*, int32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto">int32_t ureldatefmt_format(const URelativeDateTimeFormatter*, double, URelativeDateTimeUnit, UChar*, int32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto">int32_t ureldatefmt_formatNumeric(const URelativeDateTimeFormatter*, double, URelativeDateTimeUnit, UChar*, int32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ureldatefmt.h</td><td class="proto">void ureldatefmt_close(URelativeDateTimeFormatter*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">utmscale.h</td><td class="proto"><tt>enum</tt> UDateTimeScale::UDTS_MAX_SCALE</td><td class="stabchange">Stable<br>ICU 3.2</td><td>Deprecated<br>
 <span class="verchange"><span>ICU 59</span></span></td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">utmscale.h</td><td class="proto"><tt>enum</tt> UTimeScaleValue::UTSV_MAX_SCALE_VALUE</td><td class="stabchange">Stable<br>ICU 3.2</td><td>Deprecated<br>
 <span class="verchange"><span>ICU 59</span></span></td>
 </tr>
@@ -265,6 +263,22 @@
 </tr>
 </THEAD>
 <tr class="row1">
+<td class="file">localpointer.h</td><td class="proto">LocalArray&lt;T&gt;&amp; icu::LocalArray&lt; T &gt;::operator=(LocalArray&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
+<td class="file">localpointer.h</td><td class="proto">LocalPointer&lt;T&gt;&amp; icu::LocalPointer&lt; T &gt;::operator=(LocalPointer&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
+<td class="file">localpointer.h</td><td class="proto">icu::LocalArray&lt; T &gt;::LocalArray(LocalArray&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
+<td class="file">localpointer.h</td><td class="proto">icu::LocalPointer&lt; T &gt;::LocalPointer(LocalPointer&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createGallonImperial(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
 <tr class="row0">
@@ -346,6 +360,14 @@
 <td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatField::UDAT_AM_PM_MIDNIGHT_NOON_FIELD</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
 <tr class="row0">
+<td class="file">unistr.h</td><td class="proto">UnicodeString&amp; icu::UnicodeString::operator=(UnicodeString&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
+<td class="file">unistr.h</td><td class="proto">icu::UnicodeString::UnicodeString(UnicodeString&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
 <td class="file">ureldatefmt.h</td><td class="proto">URelativeDateTimeFormatter* ureldatefmt_open(const char*, UNumberFormat*, UDateRelativeDateTimeFormatterStyle, UDisplayContext, UErrorCode*)</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>ICU 57</td>
 </tr>
 <tr class="row1">
@@ -554,6 +576,22 @@
 <span class=""><span>ICU 59</span></span></td>
 </tr>
 <tr class="row1">
+<td class="file">localpointer.h</td><td class="proto">LocalArray&lt;T&gt;&amp; icu::LocalArray&lt; T &gt;::operator=(LocalArray&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
+<td class="file">localpointer.h</td><td class="proto">LocalPointer&lt;T&gt;&amp; icu::LocalPointer&lt; T &gt;::operator=(LocalPointer&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
+<td class="file">localpointer.h</td><td class="proto">icu::LocalArray&lt; T &gt;::LocalArray(LocalArray&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
+<td class="file">localpointer.h</td><td class="proto">icu::LocalPointer&lt; T &gt;::LocalPointer(LocalPointer&lt; T &gt;&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
 <td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createPoint(UErrorCode&amp;)</td><td class="">(missing)</td><td>Draft<br>
 <span class=""><span>ICU 59</span></span></td>
 </tr>
@@ -590,6 +628,14 @@
 <span class=""><span>ICU 59</span></span></td>
 </tr>
 <tr class="row0">
+<td class="file">unistr.h</td><td class="proto">UnicodeString&amp; icu::UnicodeString::operator=(UnicodeString&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row1">
+<td class="file">unistr.h</td><td class="proto">icu::UnicodeString::UnicodeString(UnicodeString&amp;&amp;) U_NOEXCEPT</td><td class="">(missing)</td><td>Stable<br>
+<span class=""><span>ICU 56</span></span></td>
+</tr>
+<tr class="row0">
 <td class="file">unistr.h</td><td class="proto">icu::UnicodeString::UnicodeString(const std::nullptr_t)</td><td class="">(missing)</td><td>Draft<br>
 <span class=""><span>ICU 59</span></span></td>
 </tr>
@@ -655,70 +701,66 @@
 <td class="file">measfmt.h</td><td class="proto">void icu::MeasureFormat::parseObject(const UnicodeString&amp;, Formattable&amp;, ParsePosition&amp;)</td><td class="" colspan="2" align="center">Draft<br>ICU 53</td>
 </tr>
 <tr class="row1">
-<td class="file">measunit.h</td><td class="proto"><tt>static</tt> MeasureUnit* icu::MeasureUnit::createBit(UErrorCode&amp;)</td><td class="stabchange">Stable<br>ICU 54</td><td>Draft<br>
-<span class="verchange"><span>ICU 58</span></span></td>
-</tr>
-<tr class="row0">
 <td class="file">ubiditransform.h</td><td class="proto">UBiDiTransform* ubiditransform_open(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ubiditransform.h</td><td class="proto"><tt>enum</tt> UBiDiMirroring::UBIDI_MIRRORING_OFF</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ubiditransform.h</td><td class="proto"><tt>enum</tt> UBiDiMirroring::UBIDI_MIRRORING_ON</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ubiditransform.h</td><td class="proto"><tt>enum</tt> UBiDiOrder::UBIDI_LOGICAL</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ubiditransform.h</td><td class="proto"><tt>enum</tt> UBiDiOrder::UBIDI_VISUAL</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">ubiditransform.h</td><td class="proto">uint32_t ubiditransform_transform(UBiDiTransform*, const UChar*, int32_t, UChar*, int32_t, UBiDiLevel, UBiDiOrder, UBiDiLevel, UBiDiOrder, UBiDiMirroring, uint32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">ubiditransform.h</td><td class="proto">void ubiditransform_close(UBiDiTransform*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_NO_SUBSTITUTE</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_SUBSTITUTE</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContextType::UDISPCTX_TYPE_SUBSTITUTE_HANDLING</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">unistr.h</td><td class="proto">UnicodeString&amp; icu::UnicodeString::moveFrom(UnicodeString&amp;) U_NOEXCEPT</td><td class="" colspan="2" align="center">Draft<br>ICU 56</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uregex.h</td><td class="proto"><tt>enum</tt> URegexpFlag::UREGEX_CANON_EQ</td><td class="" colspan="2" align="center">Draft<br>ICU 2.4</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uspoof.h</td><td class="proto">URestrictionLevel uspoof_getCheckResultRestrictionLevel(const USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uspoof.h</td><td class="proto">USpoofCheckResult* uspoof_openCheckResult(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uspoof.h</td><td class="proto">U_NAMESPACE_END int32_t uspoof_getCheckResultChecks(const USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uspoof.h</td><td class="proto">const USet* uspoof_getCheckResultNumerics(const USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uspoof.h</td><td class="proto"><tt>enum</tt> USpoofChecks::USPOOF_CONFUSABLE</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uspoof.h</td><td class="proto">int32_t uspoof_check2(const USpoofChecker*, const UChar*, int32_t, USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uspoof.h</td><td class="proto">int32_t uspoof_check2UTF8(const USpoofChecker*, const char*, int32_t, USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row1">
+<tr class="row0">
 <td class="file">uspoof.h</td><td class="proto">int32_t uspoof_check2UnicodeString(const USpoofChecker*, const icu::UnicodeString&amp;, USpoofCheckResult*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
-<tr class="row0">
+<tr class="row1">
 <td class="file">uspoof.h</td><td class="proto">void uspoof_closeCheckResult(USpoofCheckResult*)</td><td class="" colspan="2" align="center">Draft<br>ICU 58</td>
 </tr>
 </table>
@@ -737,7 +779,7 @@
 <a href="#_top">(jump back to top)</a>
 <hr>
 <p>
-<i><font size="-1">Contents generated by StableAPI tool on Thu Mar 30 13:49:33 PDT 2017<br>Copyright (C) 2017, International Business Machines Corporation, All Rights Reserved.</font></i>
+<i><font size="-1">Contents generated by StableAPI tool on Wed Apr 05 23:17:58 UTC 2017<br>Copyright (C) 2017, International Business Machines Corporation, All Rights Reserved.</font></i>
 </p>
 </body>
 </html>

icu4c/readme.html

@@ -23,7 +23,7 @@
         milestone - if the release note is a milestone release
 -->
 
-  <body class="rc">
+  <body>
   <!-- <body> -->
     <p class="only-draft"><b>Note:</b> This is a draft readme.</p>
 
@@ -44,7 +44,7 @@
     <p class="note only-rc">This is a release candidate version of ICU4C.
       It is not recommended for production use.</p>
 
-    <p>Last updated: 2017-Mar-29<br/>
+    <p>Last updated: 2017-Apr-12<br/>
       Copyright &copy; 2016 and later: Unicode, Inc. and others. License &amp; terms of use:
       <a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a><br/>
       Copyright &copy; 1997-2016 International Business Machines Corporation and others.
@@ -744,9 +744,9 @@
     <ul>
       <li>Microsoft Windows</li>
 
-      <li>Microsoft Visual C++ (see the ICU download page for the currently compatible version)</li>
+      <li>Microsoft Visual C++ (part of <a href="https://www.visualstudio.com/">Visual Studio</a>) (see the ICU download page for the currently compatible version)</li>
       
-      <li><i><b>Optional:</b></i> A version of the Windows 10 SDK (if you want to build the UWP projects)</li>
+      <li><i><b>Optional:</b></i> A version of the <a href="https://developer.microsoft.com/windows/downloads">Windows 10 SDK</a> (if you want to build the UWP projects)</li>
     </ul>
         <p class="note"><a href="#HowToBuildCygwin">Cygwin</a> is required if using a version of MSVC other than the one
         compatible with the supplied project files or if other compilers are used to build ICU. (e.g. GCC)</p>
@@ -1131,9 +1131,9 @@
       configure option.</li>
 
       <li>The latest versions of z/OS use <a
-      href="http://www.ibm.com/support/docview.wss?uid=swg2120240">XPLINK
+      href="https://www.ibm.com/support/knowledgecenter/SSLTBW_2.2.0/com.ibm.zos.v2r2.cbcux01/oebind6.htm">XPLINK
       version (C128) of the C++ standard library</a> by default. You may see <a
-      href="http://www.ibm.com/support/docview.wss?uid=swg21376279">an
+      href="https://www.ibm.com/support/knowledgecenter/SSLTBW_2.2.0/com.ibm.zos.v2r2.cbcux01/oebind5.htm">an
       error</a> when running with XPLINK disabled. To avoid this error,
       set the following environment variable or similar:
 
@@ -1307,7 +1307,7 @@ cd ../../..</samp></pre>
       <li>Test ICU. <pre><samp>gmake check</samp></pre>
         (The <tt> QIBM_MULTI_THREADED=Y</tt> flag will be automatically applied to intltest -
           you can look at the <a href=
-      "http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/apis/concept4.htm">
+      "https://www.ibm.com/support/knowledgecenter/ssw_ibm_i_73/rzahw/rzahwceeco.htm">
       iSeries Information Center</a> for more details regarding the running of multiple threads
       on IBM i.)</li>
     </ol>

icu4c/source/Doxyfile.in

@@ -194,7 +194,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = 
 INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = U_EXPORT2= U_STABLE= U_DRAFT= U_INTERNAL= U_SYSTEM= U_DEPRECATED= U_OBSOLETE= U_CALLCONV= U_CDECL_BEGIN= U_CDECL_END=  U_NO_THROW=\ "U_NAMESPACE_BEGIN=namespace icu{" "U_NAMESPACE_END=}" U_SHOW_CPLUSPLUS_API=1 U_DEFINE_LOCAL_OPEN_POINTER()= U_IN_DOXYGEN=1 U_OVERRIDE= U_FINAL= UCONFIG_ENABLE_PLUGINS=1 U_CHAR16_IS_TYPEDEF=0 U_CPLUSPLUS_VERSION=11
+PREDEFINED             = U_EXPORT2= U_STABLE= U_DRAFT= U_INTERNAL= U_SYSTEM= U_DEPRECATED= U_OBSOLETE= U_CALLCONV= U_CDECL_BEGIN= U_CDECL_END=  U_NO_THROW=\  "U_NAMESPACE_BEGIN=namespace icu{" "U_NAMESPACE_END=}" U_SHOW_CPLUSPLUS_API=1 U_DEFINE_LOCAL_OPEN_POINTER()= U_IN_DOXYGEN=1 U_OVERRIDE=override U_FINAL=final UCONFIG_ENABLE_PLUGINS=1 U_CHAR16_IS_TYPEDEF=0 U_CPLUSPLUS_VERSION=11 U_HAVE_RVALUE_REFERENCES=1 U_WCHAR_IS_UTF16
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

icu4c/source/Makefile.in

@@ -327,9 +327,10 @@ $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config
 	-$(RMV) $@
 	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
 	chmod u+w $@
+	@echo "# Following from icu/icu4c/source/config/Makefile.inc" >> $@
+	LC_ALL=C $(SED) -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
 	@echo "# Following from @platform_make_fragment@" >> $@
-	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
-	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
+	LC_ALL=C $(SED) -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
 	cat $(top_srcdir)/config/icu-config-bottom >> $@
 	chmod u-w $@
 

icu4c/source/allinone/icucheck.bat

@@ -1,131 +1,131 @@
-@echo off
-REM Copyright (C) 2016 and later: Unicode, Inc. and others.
-REM License & terms of use: http://www.unicode.org/copyright.html
-REM  ********************************************************************
-REM  * COPYRIGHT:
-REM  * Copyright (c) 2010-2014, International Business Machines Corporation
-REM  * and others. All Rights Reserved.
-REM  ********************************************************************
-
-set ICU_ARCH=%1
-set ICU_DBRL=%2
-
-if "%1" == "" (
-echo Usage: %0 "x86 or x64"  "Debug or Release"
-exit /b 1
-)
-
-if "%2" == "" (
-echo Usage: %0 %1 "Debug or Release"
-exit /b 1
-)
-
-set ICU_OPATH=%PATH%
-
-set ICU_ICUDIR="%~dp0"\..\..
-
-if "%ICU_ARCH%" == "x64" (
-set ICU_BINDIR=%~dp0\..\..\bin64
-) else (
-set ICU_BINDIR=%~dp0\..\..\bin
-)
-
-set PATH=%ICU_BINDIR%;%PATH%
-
-echo testing ICU in %ICU_ICUDIR%  arch=%ICU_ARCH% type=%ICU_DBRL%
-pushd %ICU_ICUDIR%
-
-@rem factor these out
-set ICUINFO_CMD=%ICU_ICUDIR%\source\tools\icuinfo\%ICU_ARCH%\%ICU_DBRL%\icuinfo.exe
-set INTLTEST_CMD=%ICU_ICUDIR%\source\test\intltest\%ICU_ARCH%\%ICU_DBRL%\intltest.exe
-set IOTEST_CMD=%ICU_ICUDIR%\source\test\iotest\%ICU_ARCH%\%ICU_DBRL%\iotest.exe
-set CINTLTST_CMD=%ICU_ICUDIR%\source\test\cintltst\%ICU_ARCH%\%ICU_DBRL%\cintltst.exe
-set LETEST_CMD=%ICU_ICUDIR%\source\test\letest\%ICU_ARCH%\%ICU_DBRL%\letest.exe
-
-set ICUFAILED=
-set ICURUN=
-set ICUFAILCNT=0
-
-@echo on
-
-@set THT=icuinfo
-@echo ==== %THT% =========================================================================
-%ICUINFO_CMD% %ICUINFO_OPTS%
-
-@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
-@set ICUFAILED=%ICUFAILED% %THT%
-@set ICUFAILCNT=1
-:OK_icuinfo
-@set ICURUN=%ICURUN% %THT%
-
-@set THT=intltest
-@echo ==== %THT% =========================================================================
-@cd %ICU_ICUDIR%\source\test\intltest
-%INTLTEST_CMD% %INTLTEST_OPTS%
-
-@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
-@set ICUFAILED=%ICUFAILED% %THT%
-@set ICUFAILCNT=1
-:OK_intltest
-@set ICURUN=%ICURUN% %THT%
-
-@set THT=iotest
-@echo ==== %THT% =========================================================================
-@cd %ICU_ICUDIR%\source\test\iotest
-%IOTEST_CMD% %IOTEST_OPTS%
-
-@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
-@set ICUFAILED=%ICUFAILED% %THT%
-@set ICUFAILCNT=1
-:OK_IOTEST
-@set ICURUN=%ICURUN% %THT%
-
-@set THT=cintltst
-@echo ==== %THT% =========================================================================
-@cd %ICU_ICUDIR%\source\test\cintltst
-%CINTLTST_CMD% %CINTLTST_OPTS%
-
-@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
-@set ICUFAILED=%ICUFAILED% %THT%
-@set ICUFAILCNT=1
-:OK_cintltst
-@set ICURUN=%ICURUN% %THT%
-
-@REM  (Layout is deprecated - this would require HarfBuzz)
-@REM  @set THT=letest
-@REM  @echo ==== %THT% =========================================================================
-@REM  @cd %ICU_ICUDIR%\source\test\letest
-@REM  %LETST_CMD% %LETEST_OPTS%
-
-@REM  @IF NOT ERRORLEVEL 1 GOTO OK_%THT%
-@REM  @set ICUFAILED=%ICUFAILED% %THT%
-@REM  @set ICUFAILCNT=1
-@REM  :OK_letest
-@REM  @set ICURUN=%ICURUN% %THT%
-
-@echo off
-
-REM clean up
-set PATH=%ICU_OPATH%
-REM unset ICU_OPATH
-popd
-
-@REM done
-
-echo -
-echo -
-echo -
-echo ============================================================
-echo Summary: ICU in %ICU_ICUDIR%  arch=%ICU_ARCH% type=%ICU_DBRL%
-echo -
-echo Tests Run    : %ICURUN%
-
-if %ICUFAILCNT% == 0 (
-	echo " - All Passed!"
-	exit /b 0
-)
-echo Failing Tests: %ICUFAILED%
-echo -
-echo FAILED!
-
-exit /b 1
+@echo off
+REM Copyright (C) 2016 and later: Unicode, Inc. and others.
+REM License & terms of use: http://www.unicode.org/copyright.html
+REM  ********************************************************************
+REM  * COPYRIGHT:
+REM  * Copyright (c) 2010-2014, International Business Machines Corporation
+REM  * and others. All Rights Reserved.
+REM  ********************************************************************
+
+set ICU_ARCH=%1
+set ICU_DBRL=%2
+
+if "%1" == "" (
+echo Usage: %0 "x86 or x64"  "Debug or Release"
+exit /b 1
+)
+
+if "%2" == "" (
+echo Usage: %0 %1 "Debug or Release"
+exit /b 1
+)
+
+set ICU_OPATH=%PATH%
+
+set ICU_ICUDIR="%~dp0"\..\..
+
+if "%ICU_ARCH%" == "x64" (
+set ICU_BINDIR=%~dp0\..\..\bin64
+) else (
+set ICU_BINDIR=%~dp0\..\..\bin
+)
+
+set PATH=%ICU_BINDIR%;%PATH%
+
+echo testing ICU in %ICU_ICUDIR%  arch=%ICU_ARCH% type=%ICU_DBRL%
+pushd %ICU_ICUDIR%
+
+@rem factor these out
+set ICUINFO_CMD=%ICU_ICUDIR%\source\tools\icuinfo\%ICU_ARCH%\%ICU_DBRL%\icuinfo.exe
+set INTLTEST_CMD=%ICU_ICUDIR%\source\test\intltest\%ICU_ARCH%\%ICU_DBRL%\intltest.exe
+set IOTEST_CMD=%ICU_ICUDIR%\source\test\iotest\%ICU_ARCH%\%ICU_DBRL%\iotest.exe
+set CINTLTST_CMD=%ICU_ICUDIR%\source\test\cintltst\%ICU_ARCH%\%ICU_DBRL%\cintltst.exe
+set LETEST_CMD=%ICU_ICUDIR%\source\test\letest\%ICU_ARCH%\%ICU_DBRL%\letest.exe
+
+set ICUFAILED=
+set ICURUN=
+set ICUFAILCNT=0
+
+@echo on
+
+@set THT=icuinfo
+@echo ==== %THT% =========================================================================
+%ICUINFO_CMD% %ICUINFO_OPTS%
+
+@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
+@set ICUFAILED=%ICUFAILED% %THT%
+@set ICUFAILCNT=1
+:OK_icuinfo
+@set ICURUN=%ICURUN% %THT%
+
+@set THT=intltest
+@echo ==== %THT% =========================================================================
+@cd %ICU_ICUDIR%\source\test\intltest
+%INTLTEST_CMD% %INTLTEST_OPTS%
+
+@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
+@set ICUFAILED=%ICUFAILED% %THT%
+@set ICUFAILCNT=1
+:OK_intltest
+@set ICURUN=%ICURUN% %THT%
+
+@set THT=iotest
+@echo ==== %THT% =========================================================================
+@cd %ICU_ICUDIR%\source\test\iotest
+%IOTEST_CMD% %IOTEST_OPTS%
+
+@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
+@set ICUFAILED=%ICUFAILED% %THT%
+@set ICUFAILCNT=1
+:OK_IOTEST
+@set ICURUN=%ICURUN% %THT%
+
+@set THT=cintltst
+@echo ==== %THT% =========================================================================
+@cd %ICU_ICUDIR%\source\test\cintltst
+%CINTLTST_CMD% %CINTLTST_OPTS%
+
+@IF NOT ERRORLEVEL 1 GOTO OK_%THT%
+@set ICUFAILED=%ICUFAILED% %THT%
+@set ICUFAILCNT=1
+:OK_cintltst
+@set ICURUN=%ICURUN% %THT%
+
+@REM  (Layout is deprecated - this would require HarfBuzz)
+@REM  @set THT=letest
+@REM  @echo ==== %THT% =========================================================================
+@REM  @cd %ICU_ICUDIR%\source\test\letest
+@REM  %LETST_CMD% %LETEST_OPTS%
+
+@REM  @IF NOT ERRORLEVEL 1 GOTO OK_%THT%
+@REM  @set ICUFAILED=%ICUFAILED% %THT%
+@REM  @set ICUFAILCNT=1
+@REM  :OK_letest
+@REM  @set ICURUN=%ICURUN% %THT%
+
+@echo off
+
+REM clean up
+set PATH=%ICU_OPATH%
+REM unset ICU_OPATH
+popd
+
+@REM done
+
+echo -
+echo -
+echo -
+echo ============================================================
+echo Summary: ICU in %ICU_ICUDIR%  arch=%ICU_ARCH% type=%ICU_DBRL%
+echo -
+echo Tests Run    : %ICURUN%
+
+if %ICUFAILCNT% == 0 (
+	echo " - All Passed!"
+	exit /b 0
+)
+echo Failing Tests: %ICUFAILED%
+echo -
+echo FAILED!
+
+exit /b 1

icu4c/source/common/locmap.cpp

@@ -138,9 +138,8 @@ static const ILcidPosixElement locmap_ ## id [] =
 ////////////////////////////////////////////
 */
 
-// For Windows this table is be a list of exceptions rather than a complete list as 
+// TODO: For Windows ideally this table would be a list of exceptions rather than a complete list as 
 // LocaleNameToLCID and LCIDToLocaleName provide 90% of these.
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0436, af, af_ZA)
 
@@ -216,7 +215,6 @@ ILCID_POSIX_SUBTABLE(ca) {
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0483, co, co_FR)
 ILCID_POSIX_ELEMENT_ARRAY(0x045c, chr,chr_US)
-#endif /* !USE_WINDOWS_LCID_MAPPING_API */
 
 // ICU has chosen different names for these.
 ILCID_POSIX_SUBTABLE(ckb) {
@@ -225,37 +223,29 @@ ILCID_POSIX_SUBTABLE(ckb) {
     {0x0492, "ckb_Arab_IQ"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 /* Declared as cs_CZ to get around compiler errors on z/OS, which defines cs as a function */
 ILCID_POSIX_ELEMENT_ARRAY(0x0405, cs, cs_CZ)
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0452, cy, cy_GB)
 ILCID_POSIX_ELEMENT_ARRAY(0x0406, da, da_DK)
 
-#endif
-
 // Windows doesn't know POSIX or BCP47 Unicode phonebook sort names
 ILCID_POSIX_SUBTABLE(de) {
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x07,   "de"},
     {0x0c07, "de_AT"},
     {0x0807, "de_CH"},
     {0x0407, "de_DE"},
     {0x1407, "de_LI"},
     {0x1007, "de_LU"},
-#endif
     {0x10407,"de_DE@collation=phonebook"},  /*This is really de_DE_PHONEBOOK on Windows*/
     {0x10407,"de@collation=phonebook"}  /*This is really de_DE_PHONEBOOK on Windows*/
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0465, dv, dv_MV)
 ILCID_POSIX_ELEMENT_ARRAY(0x0408, el, el_GR)
-#endif
 
 // Windows uses an empty string for 'invariant'
 ILCID_POSIX_SUBTABLE(en) {
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x09,   "en"},
     {0x0c09, "en_AU"},
     {0x2809, "en_BZ"},
@@ -272,14 +262,11 @@ ILCID_POSIX_SUBTABLE(en) {
     {0x4809, "en_SG"},
     {0x2C09, "en_TT"},
     {0x0409, "en_US"},
-#endif
     {0x007f, "en_US_POSIX"}, /* duplicate for round-tripping */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x2409, "en_VI"},  /* Virgin Islands AKA Caribbean Islands (en_CB). On Windows8+ This is 0x1000 or dynamically assigned */
     {0x1c09, "en_ZA"},
     {0x3009, "en_ZW"},
     {0x2409, "en_029"},
-#endif
     {0x0409, "en_AS"},  /* Alias for en_US. Leave last.  On Windows8+ This is 0x1000 or dynamically assigned */
     {0x0409, "en_GU"},  /* Alias for en_US. Leave last.  On Windows8+ This is 0x1000 or dynamically assigned */
     {0x0409, "en_MH"},  /* Alias for en_US. Leave last.  On Windows8+ This is 0x1000 or dynamically assigned */
@@ -293,7 +280,6 @@ ILCID_POSIX_SUBTABLE(en_US_POSIX) {
 
 // Windows doesn't know POSIX or BCP47 Unicode traditional sort names
 ILCID_POSIX_SUBTABLE(es) {
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x0a,   "es"},
     {0x2c0a, "es_AR"},
     {0x400a, "es_BO"},
@@ -317,27 +303,21 @@ ILCID_POSIX_SUBTABLE(es) {
     {0x380a, "es_UY"},
     {0x200a, "es_VE"},
     {0x580a, "es_419"},
-#endif
     {0x040a, "es_ES@collation=traditional"},
     {0x040a, "es@collation=traditional"}        // Windows will treat this as es-ES@collation=traditional
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0425, et, et_EE)
 ILCID_POSIX_ELEMENT_ARRAY(0x042d, eu, eu_ES)
-#endif
 
 /* ISO-639 doesn't distinguish between Persian and Dari.*/
 ILCID_POSIX_SUBTABLE(fa) {
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x29,   "fa"},
     {0x0429, "fa_IR"},  /* Persian/Farsi (Iran) */
-#endif
     {0x048c, "fa_AF"}   /* Persian/Dari (Afghanistan) */
 };
 
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 /* duplicate for roundtripping */
 ILCID_POSIX_SUBTABLE(fa_AF) {
     {0x8c,   "fa_AF"},  /* Persian/Dari (Afghanistan) */
@@ -458,10 +438,8 @@ ILCID_POSIX_SUBTABLE(iu) {
     {0x085d, "iu_Latn_CA"},
     {0x7c5d, "iu_Latn"}
 };
-#endif
 
 ILCID_POSIX_ELEMENT_ARRAY(0x040d, iw, iw_IL)    /*Left in for compatibility*/
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0411, ja, ja_JP)
 ILCID_POSIX_ELEMENT_ARRAY(0x0437, ka, ka_GE)
 ILCID_POSIX_ELEMENT_ARRAY(0x043f, kk, kk_KZ)
@@ -477,20 +455,14 @@ ILCID_POSIX_SUBTABLE(ko) {
 
 ILCID_POSIX_ELEMENT_ARRAY(0x0457, kok, kok_IN)
 ILCID_POSIX_ELEMENT_ARRAY(0x0471, kr,  kr_NG)
-#endif
 
 ILCID_POSIX_SUBTABLE(ks) {         /* We could add PK and CN too */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x60,   "ks"},
-#endif
     {0x0860, "ks_IN"},              /* Documentation doesn't mention script */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     {0x0460, "ks_Arab_IN"},
     {0x0860, "ks_Deva_IN"}
-#endif
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0440, ky, ky_KG)   /* Kyrgyz is spoken in Kyrgyzstan */
 ILCID_POSIX_ELEMENT_ARRAY(0x0476, la, la_IT)   /* TODO: Verify the country */
 ILCID_POSIX_ELEMENT_ARRAY(0x046e, lb, lb_LU)
@@ -535,7 +507,6 @@ ILCID_POSIX_SUBTABLE(nl) {
     {0x0813, "nl_BE"},
     {0x0413, "nl_NL"}
 };
-#endif
 
 /* The "no" locale split into nb and nn.  By default in ICU, "no" is nb.*/
 // TODO: Not all of these are needed on Windows, but I don't know how ICU treats preferred ones here.
@@ -549,7 +520,6 @@ ILCID_POSIX_SUBTABLE(no) {
     {0x0814, "no_NO_NY"}/* really nn_NO */
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x046c, nso,nso_ZA)   /* TODO: Verify the ISO-639 code */
 ILCID_POSIX_ELEMENT_ARRAY(0x0482, oc, oc_FR)
 
@@ -592,7 +562,6 @@ ILCID_POSIX_SUBTABLE(qu) {
     {0x086b, "quz_EC"},
     {0x0C6b, "quz_PE"}
 };
-#endif
 
 ILCID_POSIX_SUBTABLE(quc) {
     {0x93,   "quc"},
@@ -623,7 +592,6 @@ ILCID_POSIX_SUBTABLE(qut) {
     {0x0486, "quc_Latn_GT"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0417, rm, rm_CH)
 
 ILCID_POSIX_SUBTABLE(ro) {
@@ -631,7 +599,6 @@ ILCID_POSIX_SUBTABLE(ro) {
     {0x0418, "ro_RO"},
     {0x0818, "ro_MD"}
 };
-#endif
 
 // TODO: This is almost certainly 'wrong'.  0 in Windows is a synonym for LOCALE_USER_DEFAULT.
 // More likely this is a similar concept to the Windows 0x7f Invariant locale ""
@@ -640,7 +607,6 @@ ILCID_POSIX_SUBTABLE(root) {
     {0x00,   "root"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_SUBTABLE(ru) {
     {0x19,   "ru"},
     {0x0419, "ru_RU"},
@@ -650,7 +616,6 @@ ILCID_POSIX_SUBTABLE(ru) {
 ILCID_POSIX_ELEMENT_ARRAY(0x0487, rw, rw_RW)
 ILCID_POSIX_ELEMENT_ARRAY(0x044f, sa, sa_IN)
 ILCID_POSIX_ELEMENT_ARRAY(0x0485, sah,sah_RU)
-#endif
 
 ILCID_POSIX_SUBTABLE(sd) {
     {0x59,   "sd"},
@@ -659,7 +624,6 @@ ILCID_POSIX_SUBTABLE(sd) {
     {0x0859, "sd_PK"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_SUBTABLE(se) {
     {0x3b,   "se"},
     {0x0c3b, "se_FI"},
@@ -742,7 +706,6 @@ ILCID_POSIX_SUBTABLE(tzm) {
     {0x045f, "tzm_Arab_MA"},
     {0x045f, "tmz"}
 };
-#endif
 
 ILCID_POSIX_SUBTABLE(ug) {
     {0x80,   "ug"},
@@ -750,7 +713,6 @@ ILCID_POSIX_SUBTABLE(ug) {
     {0x0480, "ug_Arab_CN"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0422, uk, uk_UA)
 
 ILCID_POSIX_SUBTABLE(ur) {
@@ -758,7 +720,6 @@ ILCID_POSIX_SUBTABLE(ur) {
     {0x0820, "ur_IN"},
     {0x0420, "ur_PK"}
 };
-#endif
 
 ILCID_POSIX_SUBTABLE(uz) {
     {0x43,   "uz"},
@@ -775,13 +736,11 @@ ILCID_POSIX_SUBTABLE(ve) { /* TODO: Verify the country */
     {0x0433, "ven_ZA"}
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x042a, vi, vi_VN)
 ILCID_POSIX_ELEMENT_ARRAY(0x0488, wo, wo_SN)
 ILCID_POSIX_ELEMENT_ARRAY(0x0434, xh, xh_ZA)
 ILCID_POSIX_ELEMENT_ARRAY(0x043d, yi, yi)
 ILCID_POSIX_ELEMENT_ARRAY(0x046a, yo, yo_NG)
-#endif
 
 // Windows & ICU tend to different names for some of these
 // TODO: Windows probably does not need all of these entries, but I don't know how the precedence works.
@@ -811,13 +770,10 @@ ILCID_POSIX_SUBTABLE(zh) {
     // TODO: Alternate collations for other LCIDs are missing, eg: 0x50804
 };
 
-#ifndef USE_WINDOWS_LCID_MAPPING_API
 ILCID_POSIX_ELEMENT_ARRAY(0x0435, zu, zu_ZA)
-#endif
 
 /* This must be static and grouped by LCID. */
 static const ILcidPosixMap gPosixIDmap[] = {
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(af),    /*  af  Afrikaans                 0x36 */
     ILCID_POSIX_MAP(am),    /*  am  Amharic                   0x5e */
     ILCID_POSIX_MAP(ar),    /*  ar  Arabic                    0x01 */
@@ -834,28 +790,20 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(br),    /*  br  Breton                    0x7e */
     ILCID_POSIX_MAP(ca),    /*  ca  Catalan                   0x03 */
     ILCID_POSIX_MAP(chr),   /*  chr Cherokee                  0x5c */
-#endif
     ILCID_POSIX_MAP(ckb),   /*  ckb Sorani (Central Kurdish)  0x92 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(co),    /*  co  Corsican                  0x83 */
     ILCID_POSIX_MAP(cs),    /*  cs  Czech                     0x05 */
     ILCID_POSIX_MAP(cy),    /*  cy  Welsh                     0x52 */
     ILCID_POSIX_MAP(da),    /*  da  Danish                    0x06 */
-#endif
     ILCID_POSIX_MAP(de),    /*  de  German                    0x07 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(dv),    /*  dv  Divehi                    0x65 */
     ILCID_POSIX_MAP(el),    /*  el  Greek                     0x08 */
-#endif
     ILCID_POSIX_MAP(en),    /*  en  English                   0x09 */
     ILCID_POSIX_MAP(en_US_POSIX), /*    invariant             0x7f */
     ILCID_POSIX_MAP(es),    /*  es  Spanish                   0x0a */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(et),    /*  et  Estonian                  0x25 */
     ILCID_POSIX_MAP(eu),    /*  eu  Basque                    0x2d */
-#endif
     ILCID_POSIX_MAP(fa),    /*  fa  Persian/Farsi             0x29 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(fa_AF), /*  fa  Persian/Dari              0x8c */
     ILCID_POSIX_MAP(ff),    /*  ff  Fula                      0x67 */
     ILCID_POSIX_MAP(fi),    /*  fi  Finnish                   0x0b */
@@ -885,9 +833,7 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(is),    /*  is  Icelandic                 0x0f */
     ILCID_POSIX_MAP(it),    /*  it  Italian                   0x10 */
     ILCID_POSIX_MAP(iu),    /*  iu  Inuktitut                 0x5d */
-#endif
     ILCID_POSIX_MAP(iw),    /*  iw  Hebrew                    0x0d */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(ja),    /*  ja  Japanese                  0x11 */
     ILCID_POSIX_MAP(ka),    /*  ka  Georgian                  0x37 */
     ILCID_POSIX_MAP(kk),    /*  kk  Kazakh                    0x3f */
@@ -897,9 +843,7 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(ko),    /*  ko  Korean                    0x12 */
     ILCID_POSIX_MAP(kok),   /*  kok Konkani                   0x57 */
     ILCID_POSIX_MAP(kr),    /*  kr  Kanuri                    0x71 */
-#endif
     ILCID_POSIX_MAP(ks),    /*  ks  Kashmiri                  0x60 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(ky),    /*  ky  Kyrgyz                    0x40 */
     ILCID_POSIX_MAP(lb),    /*  lb  Luxembourgish             0x6e */
     ILCID_POSIX_MAP(la),    /*  la  Latin                     0x76 */
@@ -920,9 +864,7 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(ne),    /*  ne  Nepali                    0x61 */
     ILCID_POSIX_MAP(nl),    /*  nl  Dutch                     0x13 */
 /*    ILCID_POSIX_MAP(nn),    //  no  Norwegian                 0x14 */
-#endif
     ILCID_POSIX_MAP(no),    /*  *   Norwegian                 0x14 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(nso),   /*  nso Sotho, Northern (Sepedi dialect) 0x6c */
     ILCID_POSIX_MAP(oc),    /*  oc  Occitan                   0x82 */
     ILCID_POSIX_MAP(om),    /*  om  Oromo                     0x72 */
@@ -933,22 +875,16 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(ps),    /*  ps  Pashto                    0x63 */
     ILCID_POSIX_MAP(pt),    /*  pt  Portuguese                0x16 */
     ILCID_POSIX_MAP(qu),    /*  qu  Quechua                   0x6B */
-#endif
     ILCID_POSIX_MAP(quc),   /*  quc K'iche                    0x93 */
     ILCID_POSIX_MAP(qut),   /*  qut K'iche                    0x86 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(rm),    /*  rm  Raeto-Romance/Romansh     0x17 */
     ILCID_POSIX_MAP(ro),    /*  ro  Romanian                  0x18 */
-#endif
     ILCID_POSIX_MAP(root),  /*  root                          0x00 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(ru),    /*  ru  Russian                   0x19 */
     ILCID_POSIX_MAP(rw),    /*  rw  Kinyarwanda               0x87 */
     ILCID_POSIX_MAP(sa),    /*  sa  Sanskrit                  0x4f */
     ILCID_POSIX_MAP(sah),   /*  sah Yakut                     0x85 */
-#endif
     ILCID_POSIX_MAP(sd),    /*  sd  Sindhi                    0x59 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(se),    /*  se  Sami                      0x3b */
 /*    ILCID_POSIX_MAP(sh),    //  sh  Serbo-Croatian            0x1a */
     ILCID_POSIX_MAP(si),    /*  si  Sinhalese                 0x5b */
@@ -972,25 +908,18 @@ static const ILcidPosixMap gPosixIDmap[] = {
     ILCID_POSIX_MAP(ts),    /*  ts  Tsonga                    0x31 */
     ILCID_POSIX_MAP(tt),    /*  tt  Tatar                     0x44 */
     ILCID_POSIX_MAP(tzm),   /*  tzm Tamazight                 0x5f */
-#endif
     ILCID_POSIX_MAP(ug),    /*  ug  Uighur                    0x80 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(uk),    /*  uk  Ukrainian                 0x22 */
     ILCID_POSIX_MAP(ur),    /*  ur  Urdu                      0x20 */
-#endif
     ILCID_POSIX_MAP(uz),    /*  uz  Uzbek                     0x43 */
     ILCID_POSIX_MAP(ve),    /*  ve  Venda                     0x33 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(vi),    /*  vi  Vietnamese                0x2a */
     ILCID_POSIX_MAP(wo),    /*  wo  Wolof                     0x88 */
     ILCID_POSIX_MAP(xh),    /*  xh  Xhosa                     0x34 */
     ILCID_POSIX_MAP(yi),    /*  yi  Yiddish                   0x3d */
     ILCID_POSIX_MAP(yo),    /*  yo  Yoruba                    0x6a */
-#endif
     ILCID_POSIX_MAP(zh),    /*  zh  Chinese                   0x04 */
-#ifndef USE_WINDOWS_LCID_MAPPING_API
     ILCID_POSIX_MAP(zu),    /*  zu  Zulu                      0x35 */
-#endif
 };
 
 static const uint32_t gLocaleCount = UPRV_LENGTHOF(gPosixIDmap);

icu4c/source/common/putil.cpp

@@ -43,8 +43,24 @@
 // Must be before any other #includes.
 #include "uposixdefs.h"
 
-/* include ICU headers */
-#include "unicode/utypes.h"
+// First, the platform type. Need this for U_PLATFORM.
+#include "unicode/platform.h"
+
+#if U_PLATFORM == U_PF_MINGW && defined __STRICT_ANSI__
+/* tzset isn't defined in strict ANSI on MinGW. */
+#undef __STRICT_ANSI__
+#endif
+
+/*
+ * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement.
+ */
+#include <time.h>
+
+#if !U_PLATFORM_USES_ONLY_WIN32_API
+#include <sys/time.h>
+#endif
+
+/* include the rest of the ICU headers */
 #include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "putilimp.h"
@@ -119,20 +135,6 @@ using namespace Microsoft::WRL::Wrappers;
 #   include <sys/neutrino.h>
 #endif
 
-#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
-/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */
-#undef __STRICT_ANSI__
-#endif
-
-/*
- * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement.
- */
-#include <time.h>
-
-#if !U_PLATFORM_USES_ONLY_WIN32_API
-#include <sys/time.h>
-#endif
-
 /*
  * Only include langinfo.h if we have a way to get the codeset. If we later
  * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
@@ -666,7 +668,7 @@ uprv_timezone()
 /* Note that U_TZNAME does *not* have to be tzname, but if it is,
    some platforms need to have it declared here. */
 
-#if defined(U_TZNAME) && (U_PLATFORM == U_PF_IRIX || U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && !U_PLATFORM_USES_ONLY_WIN32_API))
+#if defined(U_TZNAME) && (U_PLATFORM == U_PF_IRIX || U_PLATFORM_IS_DARWIN_BASED)
 /* RS6000 and others reject char **tzname.  */
 extern U_IMPORT char *U_TZNAME[];
 #endif

icu4c/source/common/putilimp.h

@@ -87,7 +87,7 @@ typedef size_t uintptr_t;
 
 #ifdef U_HAVE_NL_LANGINFO_CODESET
     /* Use the predefined value. */
-#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U_PF_QNX
+#elif U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U_PF_QNX
 #   define U_HAVE_NL_LANGINFO_CODESET 0
 #else
 #   define U_HAVE_NL_LANGINFO_CODESET 1

icu4c/source/common/unistr_titlecase_brkiter.cpp

@@ -50,7 +50,11 @@ UnicodeString::toTitle(BreakIterator *titleIter, const Locale &locale, uint32_t
       return *this;
     }
   }
-  bi->setText(*this);
+  // Because the "this" string is both the source and the destination,
+  // make a copy of the original source for use by the break iterator.
+  // See tickets #13127 and #13128
+  UnicodeString copyOfInput(*this);
+  bi->setText(copyOfInput);
   caseMap(ustrcase_getCaseLocale(locale.getBaseName()), options, bi, ustrcase_internalToTitle);
   if(titleIter==NULL) {
     delete bi;

icu4c/source/common/wintz.cpp

@@ -15,7 +15,7 @@
 
 // This file contains only desktop Windows behavior
 // Windows UWP calls Windows::Globalization directly, so this isn't needed there.
-#if U_PLATFORM_HAS_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0)
+#if U_PLATFORM_USES_ONLY_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0)
 
 #include "wintz.h"
 #include "cmemory.h"
@@ -381,4 +381,4 @@ uprv_detectWindowsTimeZone()
     return icuid;
 }
 
-#endif /* U_PLATFORM_HAS_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0) */
+#endif /* U_PLATFORM_USES_ONLY_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0) */

icu4c/source/common/wintz.h

@@ -18,7 +18,7 @@
 
 // This file contains only desktop windows behavior
 // Windows UWP calls Windows::Globalization directly, so this isn't needed there.
-#if U_PLATFORM_HAS_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0)
+#if U_PLATFORM_USES_ONLY_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0)
 
 /**
  * \file 
@@ -33,6 +33,6 @@ U_CDECL_END
 U_CFUNC const char* U_EXPORT2
 uprv_detectWindowsTimeZone();
 
-#endif /* U_PLATFORM_HAS_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0) */
+#endif /* U_PLATFORM_USES_ONLY_WIN32_API && (U_PLATFORM_HAS_WINUWP_API == 0) */
 
 #endif /* __WINTZ */

icu4c/source/config/dist.mk

@@ -63,13 +63,14 @@ $(DISTY_FILE_TGZ) $(DISTY_FILE_ZIP) $(DISTY_DATA_ZIP):  $(DISTY_DAT) $(DISTY_TMP
 	echo exporting $(SVNVER)
 	svn export -r $(shell echo $(SVNVER) | tr -d 'a-zA-Z' ) $(SVNURL) "$(DISTY_TMP)/icu"
 	( cd $(DISTY_TMP)/icu/source ; zip -rlq $(DISTY_DATA_ZIP) data )
-	$(RMV) $(DISTY_RMDIR)
 	$(MKINSTALLDIRS) $(DISTY_IN)
 	echo DISTY_DAT=$(DISTY_DAT)
 	cp $(DISTY_DAT) $(DISTY_IN)
 	( cd $(DISTY_TMP)/icu ; python as_is/bomlist.py > as_is/bomlist.txt || rm -f as_is/bomlist.txt )
-	( cd $(DISTY_TMP) ; tar cfpz $(DISTY_FILE_TGZ) icu )
 	( cd $(DISTY_TMP) ; zip -rlq $(DISTY_FILE_ZIP) icu )
+	$(RMV) $(DISTY_RMDIR)
+	( cd $(DISTY_TMP)/icu ; python as_is/bomlist.py > as_is/bomlist.txt || rm -f as_is/bomlist.txt )
+	( cd $(DISTY_TMP) ; tar cfpz $(DISTY_FILE_TGZ) icu )
 	ls -l $(DISTY_FILE)
 
 dist-local: $(DISTY_FILES)

icu4c/source/config/make2sh.sed

@@ -4,7 +4,7 @@
 s%^\([a-zA-Z0-9\._-]*\)[ 	]*+=%\1=$(\1) %
 s%^[A-Z]*_SO_TARG*%## &%
 s%^SHARED_OBJECT.*%## &%
-s%^_%.*%## &%
+s@^_%.*@## &@
 s%^LD_SONAME.*%## &%
 s%$(\([^\)]*\))%${\1}%g
 s%^	%#M#	%

icu4c/source/configure

@@ -681,6 +681,7 @@ PLUGINS_TRUE
 U_ENABLE_TRACING
 U_DISABLE_RENAMING
 AR
+SED
 RANLIB
 U_DEFAULT_SHOW_DRAFT
 UCLN_NO_AUTO_CLEANUP
@@ -5560,6 +5561,77 @@ else
 fi
 
 
+# need sed
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
 # look for 'ar' the proper way
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

icu4c/source/configure.ac

@@ -371,6 +371,9 @@ AC_SUBST(U_DEFAULT_SHOW_DRAFT)
 
 AC_PROG_RANLIB
 
+# need sed
+AC_PROG_SED
+
 # look for 'ar' the proper way
 AC_CHECK_TOOL(AR, ar, false)
 
@@ -1349,6 +1352,7 @@ AC_CONFIG_FILES([icudefs.mk \
 		tools/pkgdata/Makefile \
 		tools/tzcode/Makefile \
 		tools/gencfu/Makefile \
+		tools/escapesrc/Makefile \
 		test/Makefile \
 		test/compat/Makefile \
 		test/testdata/Makefile \

icu4c/source/data/brkitr/brkfiles.mk

@@ -1,17 +1,17 @@
 # © 2016 and later: Unicode, Inc. and others.
 # License & terms of use: http://www.unicode.org/copyright.html#License
-BRK_RES_CLDR_VERSION = %version%
+BRK_RES_CLDR_VERSION = 31.0.1
 # A list of txt's to build
 # Note:
 #
 #   If you are thinking of modifying this file, READ THIS.
 #
 # Instead of changing this file [unless you want to check it back in],
-# you should consider creating a '%local%' file in this same directory.
+# you should consider creating a 'brklocal.mk' file in this same directory.
 # Then, you can have your local changes remain even if you upgrade or
 # reconfigure ICU.
 #
-# Example '%local%' files:
+# Example 'brklocal.mk' files:
 #
 #  * To add an additional locale to the list:
 #    _____________________________________________________

icu4c/source/data/coll/af.txt

@@ -5,7 +5,7 @@ af{
     collations{
         standard{
             Sequence{"&N<<<ʼn"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/am.txt

@@ -5,7 +5,7 @@ am{
     collations{
         standard{
             Sequence{"[reorder Ethi]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ar.txt

@@ -9,7 +9,7 @@ ar{
                 "&ت<<ة<<<ﺔ<<<ﺓ"
                 "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -397,7 +397,7 @@ ar{
                 "‎&ۓ‎=ﮰ‎=ﮱ"
                 "‎&ۀ‎=ﮤ‎=ﮥ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/as.txt

@@ -11,7 +11,7 @@ as{
                 "&[before 1]ত<ৎ=ত্\u200D"
                 "&হ<ক্ষ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/az.txt

@@ -9,7 +9,7 @@ az{
                 "[import az-u-co-standard]"
                 "[reorder others]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -26,7 +26,7 @@ az{
                 "&H<x<<<X"
                 "&Z<w<<<W"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/be.txt

@@ -9,7 +9,7 @@ be{
                 "&Е<ё<<<Ё"
                 "&у<ў<<<Ў"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/bg.txt

@@ -5,7 +5,7 @@ bg{
     collations{
         standard{
             Sequence{"[reorder Cyrl]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/bn.txt

@@ -9,7 +9,7 @@ bn{
                 "[reorder Beng Deva Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
                 "&ঔ<ং<ঃ<ঁ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         traditional{
             Sequence{
@@ -629,7 +629,7 @@ bn{
                 "&যৌ<<<য়ৌ"
                 "&য্<<<য়্"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/bs.txt

@@ -5,11 +5,11 @@ bs{
     collations{
         search{
             Sequence{"[import hr-u-co-search]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{"[import hr]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/bs_Cyrl.txt

@@ -5,7 +5,7 @@ bs_Cyrl{
     collations{
         standard{
             Sequence{"[import sr]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ca.txt

@@ -8,7 +8,7 @@ ca{
                 "[import und-u-co-search]"
                 "&L<ŀ=l·<<<Ŀ=L·"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/chr.txt

@@ -5,7 +5,7 @@ chr{
     collations{
         standard{
             Sequence{"[reorder Cher]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/colfiles.mk

@@ -1,17 +1,17 @@
 # © 2016 and later: Unicode, Inc. and others.
 # License & terms of use: http://www.unicode.org/copyright.html#License
-COLLATION_CLDR_VERSION = %version%
+COLLATION_CLDR_VERSION = 31.0.1
 # A list of txt's to build
 # Note:
 #
 #   If you are thinking of modifying this file, READ THIS.
 #
 # Instead of changing this file [unless you want to check it back in],
-# you should consider creating a '%local%' file in this same directory.
+# you should consider creating a 'collocal.mk' file in this same directory.
 # Then, you can have your local changes remain even if you upgrade or
 # reconfigure ICU.
 #
-# Example '%local%' files:
+# Example 'collocal.mk' files:
 #
 #  * To add an additional locale to the list:
 #    _____________________________________________________

icu4c/source/data/coll/cs.txt

@@ -11,7 +11,7 @@ cs{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/cy.txt

@@ -14,7 +14,7 @@ cy{
                 "&R<rh<<<Rh<<<RH"
                 "&T<th<<<Th<<<TH"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/da.txt

@@ -9,7 +9,7 @@ da{
                 "[import da-u-co-standard]"
                 "[caseFirst off]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -20,7 +20,7 @@ da{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<aa<<<Aa<<<AA"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/de.txt

@@ -9,14 +9,14 @@ de{
                 "&OE<<ö<<<Ö"
                 "&UE<<ü<<<Ü"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         search{
             Sequence{
                 "[import und-u-co-search]"
                 "[import de-u-co-phonebk]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/de_AT.txt

@@ -10,7 +10,7 @@ de_AT{
                 "&u<ü<<<Ü"
                 "&ss<ß<<<ẞ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/dsb.txt

@@ -14,7 +14,7 @@ dsb{
                 "&S<š<<<Š<ś<<<Ś"
                 "&Z<ž<<<Ž<ź<<<Ź"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ee.txt

@@ -17,7 +17,7 @@ ee{
                 "&T<ts<<<Ts<<<TS"
                 "&V<ʋ<<<Ʋ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/el.txt

@@ -8,7 +8,7 @@ el{
                 "[normalization on]"
                 "[reorder Grek]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/en_US_POSIX.txt

@@ -8,7 +8,7 @@ en_US_POSIX{
                 "&A<*'\u0020'-'/'<*0-'@'<*ABCDEFGHIJKLMNOPQRSTUVWXYZ<*'['-'`'<*abcdefghijklmnopqrstuvwxyz"
                 "<*'{'-'\u007F'"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/eo.txt

@@ -12,7 +12,7 @@ eo{
                 "&S<ŝ<<<Ŝ"
                 "&U<ŭ<<<Ŭ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/es.txt

@@ -8,11 +8,11 @@ es{
                 "[import und-u-co-search]"
                 "&N<ñ<<<Ñ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{"&N<ñ<<<Ñ"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
         traditional{
             Sequence{
@@ -20,7 +20,7 @@ es{
                 "&C<ch<<<Ch<<<CH"
                 "&l<ll<<<Ll<<<LL"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/et.txt

@@ -8,7 +8,7 @@ et{
                 "&[before 1]T<š<<<Š<z<<<Z<ž<<<Ž"
                 "&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fa.txt

@@ -16,7 +16,7 @@ fa{
                 "&ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ"
                 "&ی<<*ىےيېۑۍێ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fa_AF.txt

@@ -5,7 +5,7 @@ fa_AF{
     collations{
         standard{
             Sequence{"[import ps]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fi.txt

@@ -8,7 +8,7 @@ fi{
                 "[import und-u-co-search]"
                 "[import fi-u-co-trad]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -20,7 +20,7 @@ fi{
                 "&Z\u0335<<ʒ<<<Ʒ"
                 "&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         traditional{
             Sequence{
@@ -31,7 +31,7 @@ fi{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fil.txt

@@ -5,7 +5,7 @@ fil{
     collations{
         standard{
             Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fo.txt

@@ -8,7 +8,7 @@ fo{
                 "[import und-u-co-search]"
                 "[import fo-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -18,7 +18,7 @@ fo{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<aa<<<Aa<<<AA"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/fr_CA.txt

@@ -5,7 +5,7 @@ fr_CA{
     collations{
         standard{
             Sequence{"[backwards 2]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/gl.txt

@@ -5,11 +5,11 @@ gl{
     collations{
         search{
             Sequence{"[import es-u-co-search]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{"[import es]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/gu.txt

@@ -9,7 +9,7 @@ gu{
                 "[reorder Gujr Deva Beng Guru Orya Taml Telu Knda Mlym Sinh]"
                 "&ૐ<ં<<ઁ<ઃ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ha.txt

@@ -12,7 +12,7 @@ ha{
                 "&T<ts<<<Ts<<<TS"
                 "&Y<ƴ<<<ʼy<<<''y<<<Ƴ<<<ʼY<<<''Y"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/haw.txt

@@ -8,7 +8,7 @@ haw{
                 "&a<e<<<E<i<<<I<o<<<O<u<<<U"
                 "&w<ʻ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/he.txt

@@ -11,7 +11,7 @@ he{
                 "‎&״"
                 "<<'\u0022'"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -20,7 +20,7 @@ he{
                 "&[before 2]''<<׳"
                 "&[before 2]'\u0022'<<״"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/hi.txt

@@ -9,7 +9,7 @@ hi{
                 "[reorder Deva Beng Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
                 "&ॐ<ं<<ँ<ः"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/hr.txt

@@ -9,7 +9,7 @@ hr{
                 "[import hr-u-co-standard]"
                 "[reorder others]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -21,7 +21,7 @@ hr{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/hsb.txt

@@ -13,7 +13,7 @@ hsb{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž<ź<<<Ź"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/hu.txt

@@ -44,7 +44,7 @@ hu{
                 "&Zs<<<Zzs/zs"
                 "&ZS<<<ZZS/ZS"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/hy.txt

@@ -8,7 +8,7 @@ hy{
                 "[reorder Armn]"
                 "&ք<և<<<Եւ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ig.txt

@@ -15,7 +15,7 @@ ig{
                 "&S<sh<<<Sh<<<SH"
                 "&U<ụ<<<Ụ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/is.txt

@@ -8,7 +8,7 @@ is{
                 "[import und-u-co-search]"
                 "[import is-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -21,7 +21,7 @@ is{
                 "&[before 1]z<ý<<<Ý"
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ka.txt

@@ -5,7 +5,7 @@ ka{
     collations{
         standard{
             Sequence{"[reorder Geor]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/kk.txt

@@ -10,7 +10,7 @@ kk{
                 "&Ұ<ү<<<Ү"
                 "&[before 1]ь<і<<<І"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/kl.txt

@@ -8,7 +8,7 @@ kl{
                 "[import und-u-co-search]"
                 "[import kl-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -19,7 +19,7 @@ kl{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/km.txt

@@ -66,7 +66,7 @@ km{
                 "&ឱ<<<ឲ"
                 "&ៅ<ុំ<ំ<ាំ<ះ<ិះ<ុះ<េះ<ោះ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/kn.txt

@@ -9,7 +9,7 @@ kn{
                 "[reorder Knda Deva Beng Guru Gujr Orya Taml Telu Mlym Sinh]"
                 "&ಔ<ಂ<ಃ<ೱ<ೲ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         traditional{
             Sequence{
@@ -651,7 +651,7 @@ kn{
                 "&ಫೋ<<<ಫ಼ೋ"
                 "&ಫೌ<<<ಫ಼ೌ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ko.txt

@@ -283,7 +283,7 @@ ko{
                 "&ᅩᅣᅵ"
                 "=ᆧ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         searchjl{
             Sequence{
@@ -378,7 +378,7 @@ ko{
                 "&\u1109\u1109=\u110A<<<\u3146"
                 "&\u110C\u110C=\u110D<<<\u3149"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -862,14 +862,14 @@ ko{
                 "&희<<*僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲咥唏嘻悕戲暿欷燹爔豨餼"
                 "&힐<<*詰犵纈襭頡黠"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         unihan{
             Sequence{
                 "[import und-u-co-private-unihan]"
                 "[reorder Hang Hani]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/kok.txt

@@ -11,7 +11,7 @@ kok{
                 "&ह<ळ"
                 "<क्ष"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ky.txt

@@ -8,7 +8,7 @@ ky{
                 "[reorder Cyrl]"
                 "&е<ё<<<Ё"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/lkt.txt

@@ -11,7 +11,7 @@ lkt{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ln.txt

@@ -16,14 +16,14 @@ ln{
                 "&S<sh<<<sH<<<Sh<<<SH"
                 "&T<ts<<<tS<<<Ts<<<TS"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
                 "&E<ɛ<<<Ɛ"
                 "&O<<ɔ<<<Ɔ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/lo.txt

@@ -5,7 +5,7 @@ lo{
     collations{
         standard{
             Sequence{"[reorder Laoo]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/lt.txt

@@ -16,7 +16,7 @@ lt{
                 "&U<<ų<<<Ų<<ū<<<Ū"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/lv.txt

@@ -15,7 +15,7 @@ lv{
                 "&[before 1]T<š<<<Š"
                 "&[before 1]Ʒ<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/mk.txt

@@ -10,7 +10,7 @@ mk{
                 "&ԃ<ѓ<<<Ѓ"
                 "&ћ<ќ<<<Ќ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ml.txt

@@ -17,7 +17,7 @@ ml{
                 "&മ്<<ം"
                 "&ന്<<<ൻ്"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/mn.txt

@@ -5,7 +5,7 @@ mn{
     collations{
         standard{
             Sequence{"[reorder Cyrl Mong]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/mr.txt

@@ -12,7 +12,7 @@ mr{
                 "<क्ष"
                 "<ज्ञ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/mt.txt

@@ -12,7 +12,7 @@ mt{
                 "&[before 1]i<ħ<<<Ħ"
                 "&[before 1]z<ż<<<Ż"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/my.txt

@@ -373,7 +373,7 @@ my{
                 "&ထမင်း=ထ္မင်း"
                 "&လက်ဘက်=လ္ဘက်"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/nb.txt

@@ -8,7 +8,7 @@ nb{
                 "[import und-u-co-search]"
                 "[import nb-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -18,7 +18,7 @@ nb{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ne.txt

@@ -5,7 +5,7 @@ ne{
     collations{
         standard{
             Sequence{"[reorder Deva]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/nn.txt

@@ -5,11 +5,11 @@ nn{
     collations{
         search{
             Sequence{"[import nb-u-co-search]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{"[import nb-u-co-standard]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/om.txt

@@ -8,7 +8,7 @@ om{
                 "&Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<"
                 "sh<<<Sh"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/or.txt

@@ -11,7 +11,7 @@ or{
                 "&ହ<କ୍ଷ"
                 "&ଯ<<ୟ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/pa.txt

@@ -10,7 +10,7 @@ pa{
                 "&ੱ<<ੰ<<ਂ<<ਁ<<਼"
                 "&ੜ<੍"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/pl.txt

@@ -14,7 +14,7 @@ pl{
                 "&S<ś<<<Ś"
                 "&Z<ź<<<Ź<ż<<<Ż"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ps.txt

@@ -24,7 +24,7 @@ ps{
                 "&ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ"
                 "&\u00A0<<\u200C<<\u200D"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/ro.txt

@@ -10,7 +10,7 @@ ro{
                 "&S<ş=ș<<<Ş=Ș"
                 "&T<ţ=ț<<<Ţ=Ț"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/root.txt

@@ -312,7 +312,7 @@ root{
                 "< 🏴󠁧󠁢󠁳󠁣󠁴󠁿"
                 "< 🏴󠁧󠁢󠁷󠁬󠁳󠁿"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         eor{
             Sequence{
@@ -852,7 +852,7 @@ root{
                 "&ք"
                 "<և"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         private-unihan{
             Sequence{
@@ -1095,7 +1095,7 @@ root{
                 "&龟=\uFDD0龟"
                 "&龠=\uFDD0龠"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         search{
             Sequence{
@@ -1212,11 +1212,11 @@ root{
                 "&ᅮᅵ"
                 "=ᅱ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{""}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
     depends:process(dependency){"ucadata.icu"}

icu4c/source/data/coll/ru.txt

@@ -5,7 +5,7 @@ ru{
     collations{
         standard{
             Sequence{"[reorder Cyrl]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/se.txt

@@ -8,7 +8,7 @@ se{
                 "[import und-u-co-search]"
                 "[import se-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -53,7 +53,7 @@ se{
                 "<<<Ô<<ǫ"
                 "<<<Ǫ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/si.txt

@@ -10,7 +10,7 @@ si{
                 "&ඖ<ං<ඃ"
                 "&ජ්ඤ<<ඥ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -19,7 +19,7 @@ si{
                 "&ඖ<ං<ඃ"
                 "&ඥ<ඤ"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sk.txt

@@ -21,7 +21,7 @@ sk{
                 "&Y<ý<<<Ý"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -33,7 +33,7 @@ sk{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sl.txt

@@ -10,7 +10,7 @@ sl{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/smn.txt

@@ -8,7 +8,7 @@ smn{
                 "[import und-u-co-search]"
                 "[import smn-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -19,7 +19,7 @@ smn{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž<æ<<<Æ<ø<<<Ø<å<<<Å<ã<<<Ã<ä<<<Ä<á<<<Á<ö<<<Ö"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sq.txt

@@ -17,7 +17,7 @@ sq{
                 "&[before 1]Y<xh<<<Xh<<<XH"
                 "&[before 1]Ʒ<zh<<<Zh<<<ZH"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sr.txt

@@ -8,7 +8,7 @@ sr{
                 "[reorder Cyrl]"
                 "[suppressContractions [Ии]]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sr_Latn.txt

@@ -5,11 +5,11 @@ sr_Latn{
     collations{
         search{
             Sequence{"[import hr-u-co-search]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{"[import hr]"}
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }

icu4c/source/data/coll/sv.txt

@@ -12,14 +12,14 @@ sv{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         search{
             Sequence{
                 "[import und-u-co-search]"
                 "[import sv-u-co-standard]"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
         standard{
             Sequence{
@@ -30,7 +30,7 @@ sv{
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
             }
-            Version{"31"}
+            Version{"31.0.1"}
         }
     }
 }