From 2bccc558ed796ddb488cf1a9906dedc16772170e Mon Sep 17 00:00:00 2001 From: John Emmons Date: Thu, 3 Apr 2008 14:11:39 +0000 Subject: [PATCH] ICU-6094 Add dependency info on ucadata.icu to root collation X-SVN-Rev: 23736 --- icu4c/source/data/coll/root.txt | 2757 +--------------------- icu4c/source/data/xml/collation/root.xml | 13 +- icu4c/source/tools/toolutil/pkgitems.cpp | 3 +- 3 files changed, 11 insertions(+), 2762 deletions(-) diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt index 12d8efb1c79..5e8eadaa9ed 100644 --- a/icu4c/source/data/coll/root.txt +++ b/icu4c/source/data/coll/root.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2007 International Business Machines +// * Copyright (C) 2008 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/collation/root.xml @@ -11,2762 +11,13 @@ */ root{ UCARules:process(uca_rules){"../unidata/UCARules.txt"} - Version{"1.26"} + Version{"1.28"} collations{ default{"standard"} standard{ Sequence{""} - Version{"1.5"} - } - unihan{ - Sequence{ - "&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À" - "&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È" - "&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề" - "&[before 2]i<<ī<<<Ī<<í<<<Í<<ǐ<<<Ǐ<<ì<<<Ì" - "&[before 2]m< - + %icu; ] > @@ -14,12 +14,9 @@ - diff --git a/icu4c/source/tools/toolutil/pkgitems.cpp b/icu4c/source/tools/toolutil/pkgitems.cpp index 85f753b008f..7c36ef98e81 100644 --- a/icu4c/source/tools/toolutil/pkgitems.cpp +++ b/icu4c/source/tools/toolutil/pkgitems.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 2003-2007, International Business Machines +* Copyright (C) 2003-2008, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -215,6 +215,7 @@ ures_enumDependencies(const UDataSwapper *ds, break; } useResSuffix = FALSE; + break; } else { // we ignore all other strings break;