ICU-10480 ULI exception data to ICU format, ICU side

X-SVN-Rev: 34621

diff --git a/icu4c/source/data/brkitr/brkfiles.mk b/icu4c/source/data/brkitr/brkfiles.mk
index c8b49820f28341075a8ac9243f6fe94e9e6f4ece..866e076b82a0314b44c533f5ff69d3e45835d7e5 100644 (file)
--- a/icu4c/source/data/brkitr/brkfiles.mk
+++ b/icu4c/source/data/brkitr/brkfiles.mk
@@ -1,6 +1,6 @@
 # *   Copyright (C) 1998-2013, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
-BRK_RES_CLDR_VERSION = 24
+BRK_RES_CLDR_VERSION = 25
 # A list of txt's to build
 # Note:
 #

diff --git a/icu4c/source/data/brkitr/el.txt b/icu4c/source/data/brkitr/el.txt
index 339c299995630ce6e39e81f00005bb17973a1a78..2ea0aeb2e516c5a37dfd8b0cf5c078cbad18387b 100644 (file)
--- a/icu4c/source/data/brkitr/el.txt
+++ b/icu4c/source/data/brkitr/el.txt
@@ -3,11 +3,11 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/el.xml
+// * Source File: <path>/common/segments/el.xml ../../xml/brkitr/el.xml
 // *
 // ***************************************************************************
 el{
-    Version{"1.1"}
+    Version{"2.0.82.42"}
     boundaries{
         sentence:process(dependency){"sent_el.brk"}
     }

diff --git a/icu4c/source/data/brkitr/en.txt b/icu4c/source/data/brkitr/en.txt
index 998613f34bb750afe2e8368f222346410a19a5fe..56be72734df2683da520adbafd3e3a3ea504f4fe 100644 (file)
--- a/icu4c/source/data/brkitr/en.txt
+++ b/icu4c/source/data/brkitr/en.txt
@@ -3,9 +3,36 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/en.xml
+// * Source File: <path>/common/segments/en.xml ../../xml/brkitr/en.xml
 // *
 // ***************************************************************************
 en{
-    Version{"1.1"}
+    Version{"2.0.92.29"}
+    exceptions{
+        SentenceBreak:array{
+            "Maj.",
+            "Mr.",
+            "Lt.Cdr.",
+            "Pvt.",
+            "Lt.",
+            "Hon.B.A.",
+            "exec.",
+            "Md.",
+            "Capt.",
+            "Col.",
+            "Prof.",
+            "Rev.",
+            "Ph.D.",
+            "pp.",
+            "Mrs.",
+            "PP.",
+            "Ms.",
+            "vs.",
+            "Sgt.",
+            "A.D.",
+            "Fri.",
+            "a.m.",
+            "Mt.",
+        }
+    }
 }

diff --git a/icu4c/source/data/brkitr/en_US.txt b/icu4c/source/data/brkitr/en_US.txt
index 622db4a707bae76be37106145765d84902ef40dd..20cd05b10ed06e49354f7599f7a6b2cbb25813f3 100644 (file)
--- a/icu4c/source/data/brkitr/en_US.txt
+++ b/icu4c/source/data/brkitr/en_US.txt
@@ -3,9 +3,9 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/en_US.xml
+// * Source File: <path>/common/segments/en_US.xml ../../xml/brkitr/en_US.xml
 // *
 // ***************************************************************************
 en_US{
-    Version{"1.1"}
+    Version{"2.0.94.49"}
 }

diff --git a/icu4c/source/data/brkitr/en_US_POSIX.txt b/icu4c/source/data/brkitr/en_US_POSIX.txt
index 76e3fba1c109bbda21742888e2765b284c7650c1..1f9450bb8ff60e02487c95942745d47dfc323e9e 100644 (file)
--- a/icu4c/source/data/brkitr/en_US_POSIX.txt
+++ b/icu4c/source/data/brkitr/en_US_POSIX.txt
@@ -3,11 +3,11 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/en_US_POSIX.xml
+// * Source File: <path>/common/segments/en_US_POSIX.xml ../../xml/brkitr/en_US_POSIX.xml
 // *
 // ***************************************************************************
 en_US_POSIX{
-    Version{"1.1"}
+    Version{"2.0.82.42"}
     boundaries{
         word:process(dependency){"word_POSIX.brk"}
     }

diff --git a/icu4c/source/data/brkitr/fi.txt b/icu4c/source/data/brkitr/fi.txt
index bfa5cc21f16bebe0b94d2d18edb08430ee60bd1a..c952dac83e6d3468f08ec8ea28f6a83bb7d283eb 100644 (file)
--- a/icu4c/source/data/brkitr/fi.txt
+++ b/icu4c/source/data/brkitr/fi.txt
@@ -3,11 +3,11 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/fi.xml
+// * Source File: <path>/common/segments/fi.xml ../../xml/brkitr/fi.xml
 // *
 // ***************************************************************************
 fi{
-    Version{"2.2.89.3"}
+    Version{"2.0.82.42"}
     boundaries{
         line:process(dependency){"line_fi.brk"}
     }

diff --git a/icu4c/source/data/brkitr/ja.txt b/icu4c/source/data/brkitr/ja.txt
index 460a187e9170e591d04958c664818a033bf16a5b..62a3799bab1880d04c619c2542c8edf9e3623642 100644 (file)
--- a/icu4c/source/data/brkitr/ja.txt
+++ b/icu4c/source/data/brkitr/ja.txt
@@ -3,11 +3,11 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/ja.xml
+// * Source File: <path>/common/segments/ja.xml ../../xml/brkitr/ja.xml
 // *
 // ***************************************************************************
 ja{
-    Version{"1.1"}
+    Version{"2.0.82.42"}
     boundaries{
         line:process(dependency){"line_ja.brk"}
     }

diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt
index 239d034ad98b86907875814299899e7a7e53af54..01e346f2ef1d60153214076c866597708f484f03 100644 (file)
--- a/icu4c/source/data/brkitr/root.txt
+++ b/icu4c/source/data/brkitr/root.txt
@@ -3,11 +3,11 @@
 // * Copyright (C) 2013 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/xml/brkitr/root.xml
+// * Source File: <path>/common/segments/root.xml ../../xml/brkitr/root.xml
 // *
 // ***************************************************************************
 root{
-    Version{"1.1"}
+    Version{"2.0.92.92"}
     boundaries{
         grapheme:process(dependency){"char.brk"}
         line:process(dependency){"line.brk"}

diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml
index f256b5b5831b52abb1f85fd882086bbe78eea690..ba3d302fe32cc379586a8e9ae474ba42f21b611f 100644 (file)
--- a/icu4c/source/data/build.xml
+++ b/icu4c/source/data/build.xml
@@ -305,7 +305,8 @@
         <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
             <run>
                 <args>
-                    <arg name="--sourcedir"       value="${env.ICU4C_DIR}/source/data/xml/brkitr"/>
+                    <arg name="--sourcedir"       value="${env.CLDR_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" />
                     <arg name="--makefile" value="brkfiles.mk"/>
@@ -330,7 +331,7 @@
         </cldr-build>
     </target>
 
-        <target name="translit" depends="init,setup" description="builds collation files in ICU text format">
+    <target name="translit" depends="init,setup" description="builds collation files in ICU text format">
         <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt">
             <run>
                 <args>