NamesList in IUP, drop the outdated JSP copy of NamesList.txt (#1128)

* NamesList in IUP

* Remove the hacky subhead and the copy of NamesList which was stuck at 15.1

* missing

* Always ignore the names list in propertywise tests

* Not uniform on Cn

* something something

Author: eggrobin

UnicodeJsps/src/main/java/org/unicode/jsp/Common.java

@@ -45,7 +45,7 @@ public String transform(String source) {
             };
 
     static List<String> XPROPERTY_NAMES =
-            Arrays.asList(new String[] {"toNFC", "toNFD", "toNFKC", "toNFKD", "subhead"});
+            Arrays.asList(new String[] {"toNFC", "toNFD", "toNFKC", "toNFKD"});
     static final int XSTRING_START = UProperty.STRING_LIMIT;
 
     public static String getXStringPropertyValue(int propertyEnum, int codepoint, int nameChoice) {
@@ -59,8 +59,6 @@ public static String getXStringPropertyValue(int propertyEnum, int codepoint, in
                 return Common.MyNormalize(codepoint, Normalizer.NFKC);
             case Common.TO_NFKD:
                 return Common.MyNormalize(codepoint, Normalizer.NFKD);
-            case Common.SUBHEAD:
-                return UnicodeUtilities.getSubheader().getSubheader(codepoint);
         }
         return UCharacter.getStringPropertyValue(propertyEnum, codepoint, nameChoice);
     }
@@ -99,8 +97,7 @@ static String MyNormalize(String string, Mode mode) {
     static final int TO_NFD = UProperty.STRING_LIMIT + 1;
     static final int TO_NFKC = UProperty.STRING_LIMIT + 2;
     static final int TO_NFKD = UProperty.STRING_LIMIT + 3;
-    public static final int SUBHEAD = TO_NFKD + 1;
-    static final int XSTRING_LIMIT = SUBHEAD + 1;
+    static final int XSTRING_LIMIT = TO_NFKD + 1;
     //    static UnicodeSet       isCaseFolded  = new UnicodeSet();
     //    static UnicodeSet       isLowercase   = new UnicodeSet();
     //    static UnicodeSet       isUppercase   = new UnicodeSet();

UnicodeJsps/src/main/java/org/unicode/jsp/GenerateSubheader.java

@@ -74,8 +74,6 @@ public class UnicodeUtilities {
                     .removeAll(new UnicodeSet("[:whitespace:]"))
                     .freeze();
 
-    private static Subheader subheader = null;
-
     static Transliterator toHTML;
     static Transliterator toHTMLInput;
     static String HTML_RULES_CONTROLS;
@@ -449,17 +447,26 @@ public static void showSet(
                                             + "}'>"
                                             + block
                                             + "</a>";
-                    String newSubhead = getSubheader().getSubheader(s);
-                    if (newSubhead == null) {
-                        newSubhead = "<u>no subhead</u>";
-                    } else {
-                        newSubhead =
-                                "<a href='list-unicodeset.jsp?a=\\p{subhead="
-                                        + newSubhead
-                                        + "}'>"
-                                        + newSubhead
-                                        + "</a>";
-                    }
+                    String devSubhead =
+                            getFactory().getProperty("Udev:Names_List_Subheader").getValue(s);
+                    String subhead = getFactory().getProperty("Names_List_Subheader").getValue(s);
+                    String newSubhead =
+                            showDevProperties && devSubhead != null && !devSubhead.equals(subhead)
+                                    ? "<a class='changed' href='list-unicodeset.jsp?a=\\p{U"
+                                            + Settings.latestVersion
+                                            + Settings.latestVersionPhase
+                                            + ":Names_List_Subheader="
+                                            + devSubhead
+                                            + "}'>"
+                                            + devSubhead
+                                            + "</a>"
+                                    : subhead != null
+                                            ? "<a href='list-unicodeset.jsp?a=\\p{Names_List_Subheader="
+                                                    + subhead
+                                                    + "}'>"
+                                                    + subhead
+                                                    + "</a>"
+                                            : "<u>no subheader</u>";
                     newBlock = newBlock + " \u2014 <i>" + newSubhead + "</i>";
                     UnicodeSet set = items.get(newBlock);
                     if (set == null) items.put(newBlock, set = new UnicodeSet());
@@ -2017,31 +2024,6 @@ private static String getPropLink(
         return result;
     }
 
-    static Subheader getSubheader() {
-        if (subheader == null) {
-            // /home/users/jakarta/apache-tomcat-6.0.14/bin
-            // /home/users/jakarta/apache-tomcat-6.0.14/webapps/cldr/utility
-            subheader = new Subheader(UnicodeUtilities.class.getResourceAsStream("NamesList.txt"));
-            //      try {
-            //        final String unicodeDataDirectory = "../webapps/cldr/utility/";
-            //        //System.out.println(canonicalPath);
-            //        subheader = new Subheader(unicodeDataDirectory);
-            //      } catch (IOException e) {
-            //        try {
-            //          final String unicodeDataDirectory = "./jsp/";
-            //          subheader = new Subheader(unicodeDataDirectory);
-            //        } catch (IOException e2) {
-            //          final String[] list = new File("home").list();
-            //          String currentDirectory = list == null ? null : new
-            // TreeSet<String>(Arrays.asList(list)).toString();
-            //          throw (RuntimeException) new IllegalArgumentException("Can't find file
-            // starting from: <" + currentDirectory + ">").initCause(e);
-            //        }
-            //      }
-        }
-        return subheader;
-    }
-
     // static IdnaLabelTester tester = null;
     static String removals =
             new UnicodeSet("[\u1806[:di:]-[:cn:]]").complement().complement().toPattern(false);

UnicodeJsps/src/main/java/org/unicode/jsp/Subheader.java

@@ -162,17 +162,6 @@ public String transform(String source) {
                         .set(NFM.nfm.getSet(null))
                         .setMain("isNFM", "isNFM", UnicodeProperty.BINARY, "1.1"));
 
-        add(
-                new CodepointTransformProperty(
-                                new Transform<Integer, String>() {
-                                    @Override
-                                    public String transform(Integer source) {
-                                        return UnicodeUtilities.getSubheader().getSubheader(source);
-                                    }
-                                },
-                                false)
-                        .setMain("subhead", "subhead", UnicodeProperty.STRING, "1.1"));
-
         add(
                 new UnicodeSetProperty()
                         .set("[:^nfcqc=n:]")