organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-20801 integrate CLDR release-36-alpha2, update MeasureUnits (#809)

Browse source
This commit is contained in:
Peter Edberg 2019-09-03 22:33:27 -07:00 • committed by pedberg-icu
parent f82e4c4401
commit e25796f6e5
2956 changed files with 80228 additions and 30181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/data/brkitr/de.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
de{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"Port.",

2
icu4c/source/data/brkitr/el.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
el{
Version{"2.1.19.14"}
Version{"36"}
boundaries{
sentence:process(dependency){"sent_el.brk"}
}

2
icu4c/source/data/brkitr/en.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"L.P.",

2
icu4c/source/data/brkitr/en_US.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en_US{
Version{"2.1.19.14"}
Version{"36"}
}

2
icu4c/source/data/brkitr/en_US_POSIX.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en_US_POSIX{
Version{"2.1.29.25"}
Version{"36"}
boundaries{
word:process(dependency){"word_POSIX.brk"}
}

2
icu4c/source/data/brkitr/es.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
es{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"Rdos.",

2
icu4c/source/data/brkitr/fr.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fr{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"aux.",

2
icu4c/source/data/brkitr/it.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
it{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"N.B.",

2
icu4c/source/data/brkitr/ja.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ja{
Version{"2.1.44.56"}
Version{"36"}
boundaries{
line:process(dependency){"line_normal.brk"}
line_loose:process(dependency){"line_loose_cj.brk"}

2
icu4c/source/data/brkitr/pt.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pt{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"psicol.",

2
icu4c/source/data/brkitr/root.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
root{
Version{"2.1.49.32"}
Version{"36"}
boundaries{
grapheme:process(dependency){"char.brk"}
line:process(dependency){"line.brk"}

2
icu4c/source/data/brkitr/ru.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ru{
Version{"2.1.19.14"}
Version{"36"}
exceptions{
SentenceBreak:array{
"\u0440\u0443\u0431.",

2
icu4c/source/data/brkitr/zh.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
zh{
Version{"2.1.19.14"}
Version{"36"}
boundaries{
line:process(dependency){"line_cj.brk"}
line_loose:process(dependency){"line_loose_cj.brk"}

2
icu4c/source/data/brkitr/zh_Hant.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
zh_Hant{
Version{"2.1.36.98"}
Version{"36"}
boundaries{
line:process(dependency){"line_cj.brk"}
line_loose:process(dependency){"line_loose_cj.brk"}

101
icu4c/source/data/build.xml
View file

@ -43,13 +43,17 @@
</condition>
<fail unless="is.cldr.classes.set" message="CLDR classes not found in ${cldrtools.dir}. Please either set the CLDR_CLASSES environment variable or build cldr.jar."/>
<echo message="java home: ${java.home}"/>
<property name="env.CLDR_TMP_DIR" location="${env.CLDR_DIR}/../cldr-aux" /> <!-- Hack: see CLDRPaths -->
<property name="cldr.prod.dir" location="${env.CLDR_TMP_DIR}/production/" />
<echo message="java home: ${java.home}"/>
<echo message="java version: ${java.version}"/>
<echo message="ant java version: ${ant.java.version}"/>
<echo message="${ant.version}"/>
<echo message="cldr tools dir: ${cldrtools.dir}"/>
<echo message="cldr tools jar: ${cldrtools.jar}"/>
<echo message="cldr tools classes: ${env.CLDR_CLASSES}"/>
<echo message="CLDR_TMP_DIR: ${env.CLDR_TMP_DIR} "/>
<echo message="cldr.prod.dir (production data): ${cldr.prod.dir}"/>
</target>
<target name="setup" depends="init">
<taskdef name="cldr-build" classname="org.unicode.cldr.ant.CLDRBuild">
@ -60,11 +64,31 @@
<fileset dir="${cldrtools.dir}/libs" includes="*.jar"/>
</classpath>
</taskdef>
<mkdir dir="${env.CLDR_TMP_DIR}"/> <!-- make sure parent dir exists -->
<condition property="cldrprod.exists">
<available file="${cldr.prod.dir}" type="dir"/>
</condition>
</target>
<target name="cleanprod" depends="init, setup" if="cldrprod.exists">
<delete dir="${cldr.prod.dir}" />
</target>
<target name="proddata" depends="init,setup" unless="cldrprod.exists">
<echo message="Rebuilding ${cldr.prod.dir} - takes a while!"/>
<!-- setup prod data -->
<java fork="true" jar="${cldrtools.jar}">
<arg value="org.unicode.cldr.tool.GenerateProductionData" /> <!-- change to short alias 'proddata' or similar when annotated -->
<arg value="-v" />
<!-- TODO: for now, we just let the default source/target paths used.
could set '-s' / '-d' for explicit source/dest -->
</java>
</target>
<!-- target for generating ICU data -->
<target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, pluralRanges, numberingSystems, translit, brkitr, keyTypeData, genderList, dayPeriods" />
<!-- parallel target -->
<target name="pall" depends="init">
<target name="pall" depends="init,setup,proddata">
<parallel threadsPerProcessor ="1">
<sequential>
<ant target='locales' />
@ -101,15 +125,15 @@
</parallel>
</target>
<target name="locales" depends="init,setup" description="builds locale files in ICU text format">
<target name="locales" depends="init,setup,proddata" description="builds locale files in ICU text format">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/main" />
<arg name="--sourcedir" value="${cldr.prod.dir}/common/main" />
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/locales"/>
<arg name="--specialsdir" value="${env.ICU4C_DIR}/source/data/xml/main"/>
<arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="--supplementaldir" value="${cldr.prod.dir}/common/supplemental" />
<arg name="--type" value="locales"/>
<arg name="--depgraphfile" value="../../python/icutools/databuilder/locale_dependencies.py"/>
</args>
@ -117,6 +141,7 @@
<remap sourcePath="/Keys" targetDir="lang" />
<remap sourcePath="/Languages" targetDir="lang" />
<remap sourcePath="/Languages%long" targetDir="lang" />
<remap sourcePath="/Languages%menu" targetDir="lang" />
<remap sourcePath="/Languages%short" targetDir="lang" />
<remap sourcePath="/Languages%secondary" targetDir="lang" />
<remap sourcePath="/Languages%variant" targetDir="lang" />
@ -154,11 +179,11 @@
</run>
</cldr-build>
</target>
<target name="collation" depends="init,setup" description="builds collation files in ICU text format">
<target name="collation" depends="init,setup,proddata" description="builds collation files in ICU text format">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
<run>
<args>
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/collation" />
<arg name="--sourcedir" value="${cldr.prod.dir}/common/collation" />
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/coll"/>
<arg name="--specialsdir" value="${env.ICU4C_DIR}/source/data/xml/collation"/>
<arg name="--type" value="collation"/>
@ -169,11 +194,11 @@
</run>
</cldr-build>
</target>
<target name="rbnf" depends="init,setup" description="builds rbnf files in ICU text format">
<target name="rbnf" depends="init,setup,proddata" description="builds rbnf files in ICU text format">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
<run>
<args>
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/rbnf" />
<arg name="--sourcedir" value="${cldr.prod.dir}/common/rbnf" />
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/rbnf"/>
<arg name="--specialsdir" value="${env.ICU4C_DIR}/source/data/xml/rbnf"/>
<arg name="--type" value="rbnf" />
@ -184,12 +209,12 @@
</run>
</cldr-build>
</target>
<target name="supplementalData" depends="init,setup" description="builds supplementalData.txt from supplementalData.xml">
<target name="supplementalData" depends="init,setup,proddata" description="builds supplementalData.txt from supplementalData.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="supplementalData.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="supplementalData"/>
</args>
@ -200,119 +225,119 @@
</run>
</cldr-build>
</target>
<target name="metadata" depends="init,setup" description="builds metadata.txt from supplementalMetadata.xml">
<target name="metadata" depends="init,setup,proddata" description="builds metadata.txt from supplementalMetadata.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metadata.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="metadata"/>
</args>
</run>
</cldr-build>
</target>
<target name="metaZones" depends="init,setup" description="builds metaZones.txt from metaZones.xml">
<target name="metaZones" depends="init,setup,proddata" description="builds metaZones.txt from metaZones.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metaZones.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="metaZones"/>
</args>
</run>
</cldr-build>
</target>
<target name="windowsZones" depends="init,setup" description="builds windowsZones.txt from windowsZones.xml">
<target name="windowsZones" depends="init,setup,proddata" description="builds windowsZones.txt from windowsZones.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="windowsZones.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="windowsZones"/>
</args>
</run>
</cldr-build>
</target>
<target name="likelySubtags" depends="init,setup" description="builds likelySubtags.txt from likelySubtags.xml">
<target name="likelySubtags" depends="init,setup,proddata" description="builds likelySubtags.txt from likelySubtags.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="likelySubtags.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="likelySubtags"/>
</args>
</run>
</cldr-build>
</target>
<target name="plurals" depends="init,setup" description="builds plurals.txt from plurals.xml">
<target name="plurals" depends="init,setup,proddata" description="builds plurals.txt from plurals.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="plurals.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="plurals"/>
</args>
</run>
</cldr-build>
</target>
<target name="pluralRanges" depends="init,setup" description="builds pluralRanges.txt from pluralRanges.xml">
<target name="pluralRanges" depends="init,setup,proddata" description="builds pluralRanges.txt from pluralRanges.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="pluralRanges.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="pluralRanges"/>
</args>
</run>
</cldr-build>
</target>
<target name="numberingSystems" depends="init,setup" description="builds numberingSystems.txt from numberingSystems.xml">
<target name="numberingSystems" depends="init,setup,proddata" description="builds numberingSystems.txt from numberingSystems.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="numberingSystems.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="numberingSystems"/>
</args>
</run>
</cldr-build>
</target>
<target name="genderList" depends="init,setup" description="builds genderList.txt from genderList.xml">
<target name="genderList" depends="init,setup,proddata" description="builds genderList.txt from genderList.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="genderList.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="genderList"/>
</args>
</run>
</cldr-build>
</target>
<target name="dayPeriods" depends="init,setup" description="builds dayPeriods.txt from dayPeriods.xml">
<target name="dayPeriods" depends="init,setup,proddata" description="builds dayPeriods.txt from dayPeriods.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="dayPeriods.txt" noArgs="true">
<!-- launch the tool and generate the data after reading the config file -->
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
<arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="dayPeriods"/>
</args>
</run>
</cldr-build>
</target>
<target name="brkitr" depends="init,setup" description="builds break iterator files in ICU text format">
<target name="brkitr" depends="init,setup,proddata" description="builds break iterator files in ICU text format">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
<run>
<args>
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/segments"/>
<arg name="--sourcedir" value="${cldr.prod.dir}/common/segments"/>
<arg name="--specialsdir" value="${env.ICU4C_DIR}/source/data/xml/brkitr"/>
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/brkitr"/>
<arg name="--type" value="brkitr" />
@ -325,11 +350,11 @@
</cldr-build>
</target>
<target name="keyTypeData" depends="init,setup" description="builds keyTypeData.txt and timezoneTypes.txt from bcp47/*.xml">
<target name="keyTypeData" depends="init,setup,proddata" description="builds keyTypeData.txt and timezoneTypes.txt from bcp47/*.xml">
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" noArgs="true">
<run>
<args>
<arg name="-s" value="${env.CLDR_DIR}/common/bcp47" />
<arg name="-s" value="${cldr.prod.dir}/common/bcp47" />
<arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
<arg name="-t" value="keyTypeData"/>
</args>
@ -337,12 +362,12 @@
</cldr-build>
</target>
<target name="translit" depends="init,setup" description="builds collation files in ICU text format">
<target name="translit" depends="init,setup,proddata" description="builds collation files in ICU text format">
<cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt">
<run>
<args>
<arg name="-m" value="((?!.*(Canadian|Ethiopic|ug-Latin).*).*)" />
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/transforms" />
<arg name="--sourcedir" value="${cldr.prod.dir}/common/transforms" />
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/translit"/>
<arg name="--commentSkip"/>
<arg name="--approvedOnly"/>
@ -354,11 +379,11 @@
</target>
<!-- we don't generate en.txt or el.txt - so don't change trnsfiles.mk for now. -->
<!--
<target name="trnsfiles" depends="init, setup" description="builds trnsfiles.mk">
<target name="trnsfiles" depends="init, setup,proddata" description="builds trnsfiles.mk">
<cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile="trnsfiles.mk" noArgs="true">
<run>
<args> [ double hyphen not allowed in comments - transpose -" to fix below ]
<arg name=-"-sourcedir" value="${env.CLDR_DIR}/common/transforms" />
<arg name=-"-sourcedir" value="${cldr.prod.dir}/common/transforms" />
<arg name=-"-destdir" value="${env.ICU4C_DIR}/source/data/translit"/>
<arg name=-"-commentSkip"/>
<arg name=-"-writeIndex"/>
@ -366,7 +391,7 @@
</run>
</cldr-build>
</target> -->
<target name="clean" depends="init, setup" description="deletes all txt files and mk files from coll and locales directories">
<target name="clean" depends="init, setup, cleanprod" description="deletes all txt files and mk files from coll and locales directories">
<delete>
<fileset id="locales" dir="${env.ICU4C_DIR}/source/data/locales">
<include name="*.txt" />

79
icu4c/source/data/cldr-icu-readme.txt
View file

@ -35,21 +35,6 @@
#
#----
#
# CLDR dtd caching
#
# Parts of the build process (notably building the new ICU data files in step 4)
# require http: access to files in the CLDR repository; for example, processing
# the files in icu4c/source/data/xml/ may require access to
# http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd
#
# Unless you cache the dtds locally by
# 1. creating a temp directory e.g. ~/.cldrdtd
# 2. setting CLDR_DTD_CACHE to it e.g. -DCLDR_DTD_CACHE=~/.cldrdtd
# your system will make excessive network requests, which will result in the
# Unicode server blocking access.
#
#----
#
# There are several environment variables that need to be defined.
#
# a) Java- and ant-related variables
@ -62,9 +47,6 @@
#
# -Xmx4096m, to give Java more memory; otherwise it may run out
# of heap.
# -DCLDR_DTD_CACHE=~/.cldrdtd (or some other temp directory
# that already exists), to reduce frequent http: access to dtds
# and consequent blockage by Unicode server.
#
# b) CLDR-related variables
#
@ -73,6 +55,9 @@
# CLDR_CLASSES: Path to the CLDR Tools classes directory. If not set, defaults
# to $CLDR_DIR/tools/java/classes
#
# CLDR_TMP_DIR: Parent of temporary CLDR production data.
# Defaults to $CLDR_DIR/../cldr-aux (sibling to CLDR_DIR).
#
# c) ICU-related variables
# These variables only need to be set if you're directly reusing the
# commands below.
@ -140,38 +125,23 @@
# 1a. Java and ant variables, adjust for your system
export JAVA_HOME=`/usr/libexec/java_home`
export ANT_OPTS="-Xmx4096m -DCLDR_DTD_CACHE=~/.cldrdtd"
export ANT_OPTS="-Xmx4096m
# 1b. CLDR variables, adjust for your setup; with cygwin it might be e.g.
# CLDR_DIR=`cygpath -wp /build/cldr`
export CLDR_DIR=$HOME/cldr/trunk
export CLDR_DIR=$HOME/cldr-myfork
# 1c. ICU variables
export ICU4C_DIR=$HOME/icu/icu4c
export ICU4J_ROOT=$HOME/icu/icu4j
export ICU4C_DIR=$HOME/icu-myfork/icu4c
export ICU4J_ROOT=$HOME/icu-myfork/icu4j
# 1d. Pre-populate your CLDR DTD cache. You need to do this only once.
mkdir ~/.cldrdtd
cd ~/.cldrdtd
curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldml.dtd \
-o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldml.dtd
# WAIT before hitting the server again; it WILL NOT give you a second chance!
sleep 5
curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlICU.dtd \
-o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldmlICU.dtd
sleep 5
curl http://www.unicode.org/repos/cldr/trunk/common/dtd/ldmlSupplemental.dtd \
-o http___www.unicode.org_repos_cldr_trunk_common_dtd_ldmlSupplemental.dtd
# 2. Build the CLDR Java tools
# Optionally build the jar, but ant will look inside the classes directory anyway
# 2. Build the CLDR Java tools and jar
cd $CLDR_DIR/tools/java
ant all
#ant jar
ant jar
# 3. Configure ICU4C, build and test without new data first, to verify that
# there are no pre-existing errors. Here <platform> is the runConfigureICU
@ -182,7 +152,7 @@ cd $ICU4C_DIR/source
make all 2>&1 | tee /tmp/icu4c-oldData-makeAll.txt
make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt
# 4. Build the new ICU4C data files; these include .txt files and .mk files.
# 4. Build the new ICU4C data files; these include .txt files and .py files.
# These new files will replace whatever was already present in the ICU4C sources.
# This process uses ant with ICU's data/build.xml and data/icu-config.xml to
# operate (via CLDR's ant/CLDRConverterTool.java and ant/CLDRBuild.java) the
@ -193,22 +163,15 @@ make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt
# Running "ant setup" is not required, but it will print useful errors to
# debug issues with your path when it fails.
#
# If you see timeout errors when building the rbnf data, for example, then you are
# likely not using a CLDR dtd cache; see "CLDR dtd caching" above. If you are using
# a dtd cache and are still having timeout problems, the IP address of your system
# may have been blocked due to previous excessive access. In this case you may need
# to contact a Unicode sysadmin to restore access.
#
# Unfortunately, even if you have your DTD cache variable enabled, you may still
# get blocked and unable to populate your cache because of multiple successive
# requests to download the required DTD files. It is recommended that you
# pre-populate your cache as shown above in step 1d.
cd $ICU4C_DIR/source/data
ant setup
ant clean
ant all 2>&1 | tee /tmp/cldr-newData-buildLog.txt
# NOTE: if you change the CLDR data, please run "ant cleanprod" to clean out the
# temporary production data directory (usually $CLDR_DIR/../cldr-aux/production )
# 5. Check which data files have modifications, which have been added or removed
# (if there are no changes, you may not need to proceed further). Make sure the
# list seems reasonable.
@ -291,6 +254,22 @@ ant check 2>&1 | tee /tmp/icu4j-newData-antCheck.txt
# more failures in ICU4C or ICU4J (except failures that were present before you
# began testing the new CLDR data).
# Note that certain data changes and related test failures may require the
# rebuilding of other kinds of data. For example:
# a) Changes to locale matching data may cause failures in e.g. the following:
# com.ibm.icu.dev.test.util.LocaleDistanceTest (testLoadedDataSameAsBuiltFromScratch)
# com.ibm.icu.dev.test.util.LocaleMatcherTest (testLikelySubtagsLoadedDataSameAsBuiltFromScratch)
# To address these requires building and running the tool
# icu4j/tools/misc/src/com/ibm/icu/dev/tool/locale/LocaleDistanceBuilder.java
# to regenerate the file icu4c/source/data/misc/langInfo.txt and then regenerating
# the ICU4J data jars.
# b) Changes to plurals data may cause failures in e.g. the following
# com.ibm.icu.dev.test.format.PluralRulesTest (TestLocales)
# To address these requires updating the LOCALE_SNAPSHOT data in
# icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
# by modifying the TestLocales() test there to run generateLOCALE_SNAPSHOT() and then
# copying in the updated data.
# 15. Check the file changes; then git add or git rm as necessary, and
# commit the changes.

4
icu4c/source/data/coll/af.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
af{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"&N<<<ʼn"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/am.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
am{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Ethi]"}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/ar.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ar{
Version{"2.1.19.14"}
Version{"36"}
collations{
compat{
Sequence{
@ -9,7 +9,7 @@ ar{
"&ت<<ة<<<ﺔ<<<ﺓ"
"&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -397,7 +397,7 @@ ar{
"‎&ۓ‎=ﮰ‎=ﮱ"
"‎&ۀ‎=ﮤ‎=ﮥ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/as.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
as{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -11,7 +11,7 @@ as{
"&[before 1]ত<ৎ=ত্\u200D"
"&হ<ক্ষ"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/az.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
az{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
@ -9,7 +9,7 @@ az{
"[import az-u-co-standard]"
"[reorder others]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -26,7 +26,7 @@ az{
"&H<x<<<X"
"&Z<w<<<W"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/be.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
be{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -9,7 +9,7 @@ be{
"&Е<ё<<<Ё"
"&у<ў<<<Ў"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/bg.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bg{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Cyrl]"}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/bn.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bn{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -9,7 +9,7 @@ bn{
"[reorder Beng Deva Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
"&ঔ<ং<ঃ<ঁ"
}
Version{"35.1"}
Version{"36"}
}
traditional{
Sequence{
@ -629,7 +629,7 @@ bn{
"&যৌ<<<য়ৌ"
"&য্<<<য়্"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/bo.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bo{
Version{"2.1.23.47"}
Version{"36"}
}

6
icu4c/source/data/coll/bs.txt
View file

@ -1,15 +1,15 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bs{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{"[import hr-u-co-search]"}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{"[import hr]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/bs_Cyrl.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
bs_Cyrl{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[import sr]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ca.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ca{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"&L<ŀ=l·<<<Ŀ=L·"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ceb.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ceb{
Version{"2.1.48.67"}
Version{"36"}
collations{
standard{
Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/chr.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
chr{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Cher]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/cs.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
cs{
Version{"2.1.28.26"}
Version{"36"}
collations{
standard{
Sequence{
@ -11,7 +11,7 @@ cs{
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/cy.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
cy{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -14,7 +14,7 @@ cy{
"&R<rh<<<Rh<<<RH"
"&T<th<<<Th<<<TH"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/da.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
da{
Version{"2.1.34.8"}
Version{"36"}
collations{
search{
Sequence{
@ -9,7 +9,7 @@ da{
"[import da-u-co-standard]"
"[caseFirst off]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -21,7 +21,7 @@ da{
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA"
"&oe<<œ<<<Œ"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/de.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
de{
Version{"2.1.19.14"}
Version{"36"}
collations{
phonebook{
Sequence{
@ -9,14 +9,14 @@ de{
"&OE<<ö<<<Ö"
"&UE<<ü<<<Ü"
}
Version{"35.1"}
Version{"36"}
}
search{
Sequence{
"[import und-u-co-search]"
"[import de-u-co-phonebk]"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/de_AT.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
de_AT{
Version{"2.1.19.14"}
Version{"36"}
collations{
phonebook{
Sequence{
@ -10,7 +10,7 @@ de_AT{
"&u<ü<<<Ü"
"&ss<ß<<<ẞ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/dsb.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
dsb{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -14,7 +14,7 @@ dsb{
"&S<š<<<Š<ś<<<Ś"
"&Z<ž<<<Ž<ź<<<Ź"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/dz.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
dz{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/ee.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ee{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -17,7 +17,7 @@ ee{
"&T<ts<<<Ts<<<TS"
"&V<ʋ<<<Ʋ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/el.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
el{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"[normalization on]"
"[reorder Grek]"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/en.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en{
Version{"2.1.19.14"}
Version{"36"}
}

2
icu4c/source/data/coll/en_US.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en_US{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/en_US_POSIX.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
en_US_POSIX{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"&A<*'\u0020'-'/'<*0-'@'<*ABCDEFGHIJKLMNOPQRSTUVWXYZ<*'['-'`'<*abcdefghijklmnopqrstuvwxyz"
"<*'{'-'\u007F'"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/eo.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
eo{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -12,7 +12,7 @@ eo{
"&S<ŝ<<<Ŝ"
"&U<ŭ<<<Ŭ"
}
Version{"35.1"}
Version{"36"}
}
}
}

8
icu4c/source/data/coll/es.txt
View file

@ -1,18 +1,18 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
es{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"&N<ñ<<<Ñ"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{"&N<ñ<<<Ñ"}
Version{"35.1"}
Version{"36"}
}
traditional{
Sequence{
@ -20,7 +20,7 @@ es{
"&C<ch<<<Ch<<<CH"
"&l<ll<<<Ll<<<LL"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/et.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
et{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"&[before 1]T<š<<<Š<z<<<Z<ž<<<Ž"
"&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/fa.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fa{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -16,7 +16,7 @@ fa{
"&ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ"
"&ی<<*ىےيېۑۍێ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/fa_AF.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fa_AF{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[import ps]"}
Version{"35.1"}
Version{"36"}
}
}
}

8
icu4c/source/data/coll/fi.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fi{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"[import fi-u-co-trad]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -20,7 +20,7 @@ fi{
"&Z\u0335<<ʒ<<<Ʒ"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø"
}
Version{"35.1"}
Version{"36"}
}
traditional{
Sequence{
@ -31,7 +31,7 @@ fi{
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/fil.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fil{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/fo.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fo{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"[import fo-u-co-standard]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -18,7 +18,7 @@ fo{
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<aa<<<Aa<<<AA"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/fr.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fr{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/fr_CA.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
fr_CA{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[backwards 2]"}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/ga.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ga{
Version{"2.1.19.14"}
Version{"36"}
}

6
icu4c/source/data/coll/gl.txt
View file

@ -1,15 +1,15 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gl{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{"[import es-u-co-search]"}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{"[import es]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/gu.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
gu{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -9,7 +9,7 @@ gu{
"[reorder Gujr Deva Beng Guru Orya Taml Telu Knda Mlym Sinh]"
"&ૐ<ં<<ઁ<ઃ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ha.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ha{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -12,7 +12,7 @@ ha{
"&T<ts<<<Ts<<<TS"
"&Y<ƴ<<<ʼy<<<''y<<<Ƴ<<<ʼY<<<''Y"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/haw.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
haw{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"&a<e<<<E<i<<<I<o<<<O<u<<<U"
"&w<ʻ"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/he.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
he{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
@ -11,7 +11,7 @@ he{
"‎&״"
"<<'\u0022'"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -20,7 +20,7 @@ he{
"&[before 2]''<<׳"
"&[before 2]'\u0022'<<״"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/hi.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hi{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -9,7 +9,7 @@ hi{
"[reorder Deva Beng Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
"&ॐ<ं<<ँ<ः"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/hr.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hr{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
@ -9,7 +9,7 @@ hr{
"[import hr-u-co-standard]"
"[reorder others]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -21,7 +21,7 @@ hr{
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/hsb.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hsb{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -13,7 +13,7 @@ hsb{
"&S<š<<<Š"
"&Z<ž<<<Ž<ź<<<Ź"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/hu.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hu{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -44,7 +44,7 @@ hu{
"&Zs<<<Zzs/zs"
"&ZS<<<ZZS/ZS"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/hy.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
hy{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"[reorder Armn]"
"&ք<և<<<Եւ"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/id.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
id{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/ig.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ig{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -15,7 +15,7 @@ ig{
"&S<sh<<<Sh<<<SH"
"&U<ụ<<<Ụ"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/is.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
is{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"[import is-u-co-standard]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -21,7 +21,7 @@ is{
"&[before 1]z<ý<<<Ý"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/it.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
it{
Version{"2.1.19.14"}
Version{"36"}
}

8
icu4c/source/data/coll/ja.txt
View file

File diff suppressed because one or more lines are too long

4
icu4c/source/data/coll/ka.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ka{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Geor]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/kk.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kk{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -10,7 +10,7 @@ kk{
"&Ұ<ү<<<Ү"
"&[before 1]ь<і<<<І"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/kl.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kl{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"[import kl-u-co-standard]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -19,7 +19,7 @@ kl{
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/km.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
km{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -66,7 +66,7 @@ km{
"&ឱ<<<ឲ"
"&ៅ<ុំ<ំ<ាំ<ះ<ិះ<ុះ<េះ<ោះ"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/kn.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kn{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -9,7 +9,7 @@ kn{
"[reorder Knda Deva Beng Guru Gujr Orya Taml Telu Mlym Sinh]"
"&ಔ<ಂ<ಃ<ೱ<ೲ"
}
Version{"35.1"}
Version{"36"}
}
traditional{
Sequence{
@ -651,7 +651,7 @@ kn{
"&ಫೋ<<<ಫ಼ೋ"
"&ಫೌ<<<ಫ಼ೌ"
}
Version{"35.1"}
Version{"36"}
}
}
}

10
icu4c/source/data/coll/ko.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ko{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
@ -283,7 +283,7 @@ ko{
"&ᅩᅣᅵ"
"=ᆧ"
}
Version{"35.1"}
Version{"36"}
}
searchjl{
Sequence{
@ -378,7 +378,7 @@ ko{
"&\u1109\u1109=\u110A<<<\u3146"
"&\u110C\u110C=\u110D<<<\u3149"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -862,14 +862,14 @@ ko{
"&희<<*僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲咥唏嘻悕戲暿欷燹爔豨餼"
"&힐<<*詰犵纈襭頡黠"
}
Version{"35.1"}
Version{"36"}
}
unihan{
Sequence{
"[import und-u-co-private-unihan]"
"[reorder Hang Hani]"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/kok.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
kok{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -11,7 +11,7 @@ kok{
"&ह<ळ"
"<क्ष"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ku.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ku{
Version{"2.1.44.82"}
Version{"36"}
collations{
standard{
Sequence{
@ -15,7 +15,7 @@ ku{
"&î<<í<<<Í"
"&û<<ú<<<Ú"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ky.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ky{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"[reorder Cyrl]"
"&е<ё<<<Ё"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/lb.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lb{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/lkt.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lkt{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -11,7 +11,7 @@ lkt{
"&S<š<<<Š"
"&Z<ž<<<Ž"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/ln.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ln{
Version{"2.1.19.14"}
Version{"36"}
collations{
phonetic{
Sequence{
@ -16,14 +16,14 @@ ln{
"&S<sh<<<sH<<<Sh<<<SH"
"&T<ts<<<tS<<<Ts<<<TS"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
"&E<ɛ<<<Ɛ"
"&O<<ɔ<<<Ɔ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/lo.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lo{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Laoo]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/lt.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lt{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -16,7 +16,7 @@ lt{
"&U<<ų<<<Ų<<ū<<<Ū"
"&Z<ž<<<Ž"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/lv.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
lv{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -15,7 +15,7 @@ lv{
"&[before 1]T<š<<<Š"
"&[before 1]Ʒ<ž<<<Ž"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/mk.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mk{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -10,7 +10,7 @@ mk{
"&ԃ<ѓ<<<Ѓ"
"&ћ<ќ<<<Ќ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ml.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ml{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -17,7 +17,7 @@ ml{
"&മ്<<ം"
"&ന്<<<ൻ്"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/mn.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mn{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Cyrl Mong]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/mr.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mr{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -12,7 +12,7 @@ mr{
"<क्ष"
"<ज्ञ"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/ms.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ms{
Version{"2.1.19.14"}
Version{"36"}
}

4
icu4c/source/data/coll/mt.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
mt{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -12,7 +12,7 @@ mt{
"&[before 1]i<ħ<<<Ħ"
"&[before 1]z<ż<<<Ż"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/my.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
my{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -373,7 +373,7 @@ my{
"&ထမင်း=ထ္မင်း"
"&လက်ဘက်=လ္ဘက်"
}
Version{"35.1"}
Version{"36"}
}
}
}

6
icu4c/source/data/coll/nb.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nb{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{
"[import und-u-co-search]"
"[import nb-u-co-standard]"
}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{
@ -18,7 +18,7 @@ nb{
"&Y<<ü<<<Ü<<ű<<<Ű"
"&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<aa<<<Aa<<<AA"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ne.txt
View file

@ -1,11 +1,11 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ne{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{"[reorder Deva]"}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/nl.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nl{
Version{"2.1.19.14"}
Version{"36"}
}

6
icu4c/source/data/coll/nn.txt
View file

@ -1,15 +1,15 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
nn{
Version{"2.1.19.14"}
Version{"36"}
collations{
search{
Sequence{"[import nb-u-co-search]"}
Version{"35.1"}
Version{"36"}
}
standard{
Sequence{"[import nb-u-co-standard]"}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/om.txt
View file

@ -1,14 +1,14 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
om{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
"&Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<"
"sh<<<Sh"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/or.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
or{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -11,7 +11,7 @@ or{
"&ହ<କ୍ଷ"
"&ଯ<<ୟ"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/pa.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pa{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -10,7 +10,7 @@ pa{
"&ੱ<<ੰ<<ਂ<<ਁ<<਼"
"&ੜ<੍"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/pl.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pl{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -14,7 +14,7 @@ pl{
"&S<ś<<<Ś"
"&Z<ź<<<Ź<ż<<<Ż"
}
Version{"35.1"}
Version{"36"}
}
}
}

4
icu4c/source/data/coll/ps.txt
View file

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
ps{
Version{"2.1.19.14"}
Version{"36"}
collations{
standard{
Sequence{
@ -24,7 +24,7 @@ ps{
"&ی<<*ىےيېۍ<<یٔ<<<ىٔ<<<ئ"
"&\u00A0<<\u200C<<\u200D"
}
Version{"35.1"}
Version{"36"}
}
}
}

2
icu4c/source/data/coll/pt.txt
View file

@ -1,5 +1,5 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
pt{
Version{"2.1.19.14"}
Version{"36"}
}

Some files were not shown because too many files have changed in this diff Show more