CLDR-19188 Fix the version 48 and 48.1 DTD delta charts (#5308)

Author: macchiati

tools/cldr-code/src/main/java/org/unicode/cldr/tool/ChartDtdDelta.java

@@ -22,7 +22,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import org.unicode.cldr.draft.FileUtilities;
-import org.unicode.cldr.tool.ToolConstants.ChartStatus;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.CldrUtility;
@@ -139,21 +138,22 @@ public void writeContents(FormattedFileWriter pw) throws IOException {
                         .addColumn("Attributes", "class='target'", null, "class='target'", true)
                         .setSpanRows(false);
 
-        String last = null;
+        CldrVersion last = null;
 
-        for (String current :
-                ToolConstants.CHART_STATUS != ChartStatus.release
-                        ? ToolConstants.CLDR_RELEASE_AND_DEV_VERSION_SET
-                        : ToolConstants.CLDR_RELEASE_VERSION_SET) {
+        for (CldrVersion current : CldrVersion.CLDR_VERSIONS_ASCENDING) {
+            if (current.compareTo(CldrVersion.from(ToolConstants.CHART_VERSION)) > 0) {
+                continue;
+            }
             System.out.println("DTD delta: " + current);
-            final boolean finalVersion = current.equals(ToolConstants.DEV_VERSION);
-            String currentName = finalVersion ? ToolConstants.CHART_DISPLAY_VERSION : current;
+            final boolean finalVersion =
+                    current.equals(CldrVersion.from(ToolConstants.DEV_VERSION));
+            String currentName =
+                    finalVersion ? ToolConstants.CHART_DISPLAY_VERSION : current.toString();
             for (DtdType type : TYPES) {
                 String firstVersion = type.firstVersion; // FIRST_VERSION.get(type);
                 if (firstVersion != null
                         && current != null
-                        && VersionInfo.getInstance(current)
-                                        .compareTo(VersionInfo.getInstance(firstVersion))
+                        && current.getVersionInfo().compareTo(VersionInfo.getInstance(firstVersion))
                                 < 0) {
                     // skip if current is too old to have “type”
                     continue;
@@ -167,7 +167,7 @@ public void writeContents(FormattedFileWriter pw) throws IOException {
                                             // && ToolConstants.CHART_STATUS !=
                                             // ToolConstants.ChartStatus.release
                                             ? null
-                                            : current);
+                                            : current.toString());
                 } catch (Exception e) {
                     if (!(e.getCause() instanceof FileNotFoundException)) {
                         throw e;
@@ -178,18 +178,15 @@ public void writeContents(FormattedFileWriter pw) throws IOException {
                 DtdData dtdLast = null;
                 if (last != null
                         && (firstVersion == null
-                                || VersionInfo.getInstance(last)
+                                || last.getVersionInfo()
                                                 .compareTo(VersionInfo.getInstance(firstVersion))
                                         >= 0)) {
                     // only read if last isn’t too old to have “type”
-                    dtdLast = DtdData.getInstance(type, last);
+                    dtdLast = DtdData.getInstance(type, last.toString());
                 }
                 diff(currentName, dtdLast, dtdCurrent);
             }
             last = current;
-            if (current.contentEquals(ToolConstants.CHART_VERSION)) {
-                break;
-            }
         }
 
         for (DiffElement datum : data) {

tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java

@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CLDRPaths;
 
@@ -73,6 +74,7 @@ public enum CldrVersion {
     v46_1,
     v47_0,
     v48_0,
+    v48_1,
     /**
      * @see CLDRFile#GEN_VERSION
      */
@@ -112,10 +114,9 @@ public static CldrVersion from(String versionString) {
                 || versionString.equals(CLDRFile.GEN_VERSION + ".0")) {
             return CldrVersion.baseline;
         }
-        return valueOf(
-                versionString.charAt(0) < 'A'
-                        ? "v" + versionString.replace('.', '_')
-                        : versionString);
+        return versionString.charAt(0) > '9'
+                ? valueOf(versionString)
+                : from(VersionInfo.getInstance(versionString));
     }
 
     public VersionInfo getVersionInfo() {
@@ -156,10 +157,11 @@ private CldrVersion() {
 
     static {
         EnumSet<CldrVersion> temp = EnumSet.allOf(CldrVersion.class);
-        CLDR_VERSIONS_ASCENDING = ImmutableList.copyOf(temp);
+        CLDR_VERSIONS_ASCENDING =
+                temp.stream().filter(x -> x != x.unknown).collect(Collectors.toUnmodifiableList());
         CLDR_VERSIONS_DESCENDING = ImmutableList.copyOf(Lists.reverse(CLDR_VERSIONS_ASCENDING));
         Map<VersionInfo, CldrVersion> temp2 = new LinkedHashMap<>();
-        for (CldrVersion item : CLDR_VERSIONS_ASCENDING) {
+        for (CldrVersion item : temp) {
             VersionInfo version2 = item.versionInfo;
             temp2.put(version2, item);
             if (version2.getMilli() != 0) {

tools/cldr-code/src/main/java/org/unicode/cldr/tool/ToolConstants.java

@@ -31,7 +31,7 @@ public enum ChartStatus {
                     "1.7.2", "1.8.1", "1.9.1", "2.0.1", "21.0", "22.1", "23.1", "24.0", "25.0",
                     "26.0", "27.0", "28.0", "29.0", "30.0", "31.0", "32.0", "33.0", "33.1", "34.0",
                     "35.0", "35.1", "36.0", "36.1", "37.0", "38.0", "38.1", "39.0", "40.0", "41.0",
-                    "42.0", "43.0", "44.0", "44.1", "45.0", "46.0", "46.1", "47.0", "48.0"
+                    "42.0", "43.0", "44.0", "44.1", "45.0", "46.0", "46.1", "47.0", "48.0", "48.1"
                     // add to this once the release is final!
                     );
     public static final Set<VersionInfo> CLDR_VERSIONS_VI =