Bring back the JSPs (#1018)

* Knock out properties.jsp

* knock out UnicodeSet links for multivalued properties on character.jsp

* Drop the now redundant UCharacter-based properties

* Break things

Author: eggrobin

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

@@ -166,6 +166,19 @@ public static String getSimpleSet(
         String a_out;
         a.clear();
         try {
+            if (setA.length() > 4
+                    && setA.startsWith("[:k")
+                    && setA.endsWith(":]")
+                    && setA.contains("=")
+                    && !setA.substring(2, setA.length() - 2).contains(":]")
+                    && XPropertyFactory.make()
+                            .getProperty(setA.substring(2, setA.indexOf("=")))
+                            .isMultivalued()) {
+                throw new Exception(
+                        "POSIX-style queries for multivalued Unihan properties are temporarily disabled.  Try \\p{"
+                                + setA.substring(2, setA.length() - 2)
+                                + "}");
+            }
             // setA = UnicodeSetUtilities.MyNormalize(setA, Normalizer.NFC);
             a.addAll(UnicodeSetUtilities.parseUnicodeSet(setA));
             a_out = UnicodeUtilities.getPrettySet(a, abbreviate, escape);

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

@@ -1648,6 +1648,7 @@ class PropertyAssignment {
             VersionInfo last;
             String value;
         }
+        final boolean isMultivalued = getFactory().getProperty(propName).isMultivalued();
         List<PropertyAssignment> history = new ArrayList<>();
         // TODO(eggrobin): TUP normalization chokes on sufficiently old versions, but this is not
         // worth debugging as we want to get rid of it.
@@ -1732,17 +1733,21 @@ class PropertyAssignment {
                 out.append(
                         "<td"
                                 + defaultClass
-                                + "><a target='u' "
-                                + (isNew ? "class='changed' " : "")
-                                + "href='list-unicodeset.jsp?a=[:"
-                                + (isCurrent ? "" : "U" + last + ":")
-                                + propName
-                                + "="
-                                + hValue
-                                + ":]'>"
+                                + ">"
+                                + (isMultivalued
+                                        ? ""
+                                        : ("<a target='u' "
+                                                + (isNew ? "class='changed' " : "")
+                                                + "href='list-unicodeset.jsp?a=[:"
+                                                + (isCurrent ? "" : "U" + last + ":")
+                                                + propName
+                                                + "="
+                                                + hValue
+                                                + ":]'>"))
                                 + versionRange
                                 + hValue
-                                + "</a></td>");
+                                + (isMultivalued ? "" : "</a>")
+                                + "</td>");
             }
         }
         out.append("</tr>");

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

@@ -145,48 +145,6 @@ public String transform(Integer source) {
                                 },
                                 false)
                         .setMain("toNFKD", "toNFKD", UnicodeProperty.STRING, "1.1"));
-
-        add(
-                new StringTransformProperty(
-                                new StringTransform() {
-                                    @Override
-                                    public String transform(String source) {
-                                        return UCharacter.foldCase(source, true);
-                                    }
-                                },
-                                false)
-                        .setMain("toCasefold", "toCF", UnicodeProperty.STRING, "1.1"));
-        add(
-                new StringTransformProperty(
-                                new StringTransform() {
-                                    @Override
-                                    public String transform(String source) {
-                                        return UCharacter.toLowerCase(ULocale.ROOT, source);
-                                    }
-                                },
-                                false)
-                        .setMain("toLowercase", "toLC", UnicodeProperty.STRING, "1.1"));
-        add(
-                new StringTransformProperty(
-                                new StringTransform() {
-                                    @Override
-                                    public String transform(String source) {
-                                        return UCharacter.toUpperCase(ULocale.ROOT, source);
-                                    }
-                                },
-                                false)
-                        .setMain("toUppercase", "toUC", UnicodeProperty.STRING, "1.1"));
-        add(
-                new StringTransformProperty(
-                                new StringTransform() {
-                                    @Override
-                                    public String transform(String source) {
-                                        return UCharacter.toTitleCase(ULocale.ROOT, source, null);
-                                    }
-                                },
-                                false)
-                        .setMain("toTitlecase", "toTC", UnicodeProperty.STRING, "1.1"));
-
         add(
                 new StringTransformProperty(
                                 new StringTransform() {

UnicodeJsps/src/main/webapp/properties.jsp

@@ -20,7 +20,8 @@ th           { text-align: left }
         UtfParameters utfParameters = new UtfParameters(queryString);
 
         String propForValues = utfParameters.getParameter("a");
-		UnicodeJsp.showPropsTable(out, propForValues, "properties.jsp");
+        // TODO(egg): Cache this page.
+		//UnicodeJsp.showPropsTable(out, propForValues, "properties.jsp");
 %>
 <h2>Key</h2>
 <p>The Categories are from <a target='_blank' href='http://www.unicode.org/reports/tr44#Property_Index'>UCD

unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java

@@ -164,6 +164,10 @@ public UnicodeProperty setMultivalued(boolean value) {
         return this;
     }
 
+    public boolean isMultivalued() {
+        return isMultivalued;
+    }
+
     public UnicodeProperty setDelimiter(String value) {
         delimiter = value;
         delimiterSplitter = Splitter.on(delimiter);