CLDR-17736 Update approximate widths (#3808)

unicode-org · Jun 17, 2024 · b62336e · b62336e
1 parent e710b4c
commit b62336e
Show file tree

Hide file tree

Showing 3 changed files with 6,072 additions and 4,441 deletions.
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckDates.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckDates.java
@@ -376,7 +376,7 @@ public CheckCLDR handleCheck(
                     CheckStatus item =
                             new CheckStatus()
                                     .setCause(this)
-                                    .setMainType(CheckStatus.errorType)
+                                    .setMainType(errorOrIfBuildWarning())
                                     .setSubtype(Subtype.abbreviatedDateFieldTooWide)
                                     .setMessage(
                                             "Abbreviated value \"{0}\" can't be longer than the corresponding wide value \"{1}\"",
@@ -468,7 +468,7 @@ && isTooMuchWiderThan(value, abbrValue)
                     CheckStatus item =
                             new CheckStatus()
                                     .setCause(this)
-                                    .setMainType(CheckStatus.errorType)
+                                    .setMainType(errorOrIfBuildWarning())
                                     .setSubtype(Subtype.shortDateFieldInconsistentLength)
                                     .setMessage(message, value, compareValue);
                     result.add(item);
@@ -481,7 +481,7 @@ && isTooMuchWiderThan(value, abbrValue)
                     CheckStatus item =
                             new CheckStatus()
                                     .setCause(this)
-                                    .setMainType(CheckStatus.errorType)
+                                    .setMainType(errorOrIfBuildWarning())
                                     .setSubtype(Subtype.narrowDateFieldTooWide)
                                     .setMessage(
                                             "Narrow value \"{0}\" can't be longer than the corresponding abbreviated value \"{1}\"",
@@ -496,7 +496,7 @@ && isTooMuchWiderThan(value, abbrValue)
                     CheckStatus item =
                             new CheckStatus()
                                     .setCause(this)
-                                    .setMainType(CheckStatus.errorType)
+                                    .setMainType(errorOrIfBuildWarning())
                                     .setSubtype(Subtype.abbreviatedDateFieldTooWide)
                                     .setMessage(
                                             "Abbreviated value \"{0}\" can't be longer than the corresponding wide value \"{1}\"",
@@ -510,7 +510,7 @@ && isTooMuchWiderThan(value, abbrValue)
                 result.add(
                         new CheckStatus()
                                 .setCause(this)
-                                .setMainType(CheckStatus.errorType)
+                                .setMainType(errorOrIfBuildWarning())
                                 .setSubtype(Subtype.illegalDatePattern)
                                 .setMessage(failure));
             }
@@ -729,6 +729,10 @@ && isTooMuchWiderThan(value, abbrValue)
         return this;
     }
 
+    public org.unicode.cldr.test.CheckCLDR.CheckStatus.Type errorOrIfBuildWarning() {
+        return getPhase() != Phase.BUILD ? CheckStatus.errorType : CheckStatus.warningType;
+    }
+
     private boolean isTooMuchWiderThan(String shortString, String longString) {
         // We all 1/3 the width of the reference character as a "fudge factor" in determining the
         // allowable width

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateApproximateWidths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateApproximateWidths.java
@@ -212,8 +212,17 @@ private int getMetrics(int cp) {
             // result = 1;
             // adjusted.add(cp);
             // }
-            if (result > 31 || result < -2) { // just to catch odd results
-                throw new IllegalArgumentException("Value too large " + result);
+            if (result > 31 || result < 0) { // just to catch odd results
+                System.out.println(
+                        "Code point: "
+                                + Utility.hex(cp)
+                                + "; Value out of bounds (0..31)"
+                                + result);
+                if (result > 31) {
+                    result = 31;
+                } else if (result < 0) {
+                    result = 0;
+                }
             }
             return result;
         }