ASCII to Block=ASCII (short for Basic Latin) passim

Author: eggrobin

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

@@ -48,7 +48,7 @@ class BidiCharMap {
 
         for (UnicodeSetIterator it =
                         new UnicodeSetIterator(
-                                new UnicodeSet("[[:ascii:]-[[:cc:]-[:whitespace:]]]"));
+                                new UnicodeSet("[[:Block=ASCII:]-[[:cc:]-[:whitespace:]]]"));
                 it.next(); ) {
             asciiHackMap.put(
                     it.codepoint,

UnicodeJsps/src/test/java/org/unicode/jsptest/TestJsp.java

@@ -743,9 +743,9 @@ public void TestMapping() {
         assertContains(sample, "abcd");
         sample = UnicodeJsp.showTransform("bc > CB; X > xx;", "Abcd");
         assertContains(sample, "ACBd");
-        sample = UnicodeJsp.showTransform("lower", "[[:ascii:]{Abcd}]");
+        sample = UnicodeJsp.showTransform("lower", "[[:Block=ASCII:]{Abcd}]");
         assertContains(sample, "\u00A0A\u00A0");
-        sample = UnicodeJsp.showTransform("bc > CB; X > xx;", "[[:ascii:]{Abcd}]");
+        sample = UnicodeJsp.showTransform("bc > CB; X > xx;", "[[:Block=ASCII:]{Abcd}]");
         assertContains(sample, "\u00A0ACBd\u00A0");
         sample = UnicodeJsp.showTransform("casefold", "[\\u0000-\\u00FF]");
         assertContains(sample, "\u00A0\u00E1\u00A0");
@@ -791,7 +791,7 @@ public void TestStuff() throws IOException {
             UnicodeJsp.showSet(
                     "sc gc",
                     "",
-                    new UnicodeSet("[[:ascii:]{123}{ab}{456}]"),
+                    new UnicodeSet("[[:Block=ASCII:]{123}{ab}{456}]"),
                     false,
                     true,
                     true,
@@ -912,7 +912,7 @@ public void TestParameters() {
 
     @Test
     public void TestRegex() {
-        final String fix = UnicodeRegex.fix("ab[[:ascii:]&[:Ll:]]*c");
+        final String fix = UnicodeRegex.fix("ab[[:Block=ASCII:]&[:Ll:]]*c");
         assertEquals("", "ab[a-z]*c", fix);
         assertEquals(
                 "",
@@ -1028,7 +1028,7 @@ public void TestBnf() {
                         + "host = \\/\\/ reserved+;\n"
                         + "query = [\\=reserved]+;\n"
                         + "fragment = reserved+;\n"
-                        + "reserved = [[:ascii:][:sc=grek:]&[:alphabetic:]];\n",
+                        + "reserved = [[:Block=ASCII:][:sc=grek:]&[:alphabetic:]];\n",
                 "http://αβγ?huh=hi#there"
             },
             //                {

UnicodeJsps/src/test/java/org/unicode/jsptest/TestUnicodeSet.java

@@ -514,7 +514,7 @@ public void TestSets() {
         checkProperties("[:isNFC=false:]", "[\u212B]", "[a]");
         checkProperties("[:toNFD=A\u0300:]", "[\u00C0]");
         checkProperties("[:toLowercase= /a/ :]", "[aA]");
-        checkProperties("[:ASCII:]", "[z]");
+        checkProperties("[:Block=ASCII:]", "[z]");
         checkProperties("[:lowercase:]", "[a]");
         checkProperties("[:toNFC=/\\./:]", "[.]");
         checkProperties("[:toNFKC=/\\./:]", "[\u2024]");
@@ -586,8 +586,8 @@ public void TestSetSyntax() {
         checkProperties("[:subhead=/Syllables/:]", "[\u1200]");
         // showIcuEnums();
         checkProperties("\\p{ccc:0}", "\\p{ccc=0}", "[\u0308]");
-        checkProperties("\\p{isNFC}", "[:ASCII:]", "[\u212B]");
-        checkProperties("[:isNFC=no:]", "[\u212B]", "[:ASCII:]");
+        checkProperties("\\p{isNFC}", "[:Block=ASCII:]", "[\u212B]");
+        checkProperties("[:isNFC=no:]", "[\u212B]", "[:Block=ASCII:]");
         checkProperties("[:dt!=none:]&[:toNFD=/^\\p{ccc:0}/:]", "[\u00A0]", "[\u0340]");
         checkProperties("[:toLowercase!=@code point@:]", "[A-Z\u00C0]", "[abc]");
         checkProperties("[:toNfkc!=@toNfc@:]", "[\\u00A0]", "[abc]");

unicodetools/src/main/java/org/unicode/draft/CldrUtility.java

@@ -702,7 +702,7 @@ public static String toRegex(UnicodeSet source) {
                     "foo",
                     "([ \\- \\\\ \\[ \\] ]) > '\\' $1 ;"
                             //        + " ([:c:]) > &hex($1);"
-                            + " ([[:control:][[:z:]&[:ascii:]]]) > &hex($1);",
+                            + " ([[:control:][[:z:]&[:Block=ASCII:]]]) > &hex($1);",
                     Transliterator.FORWARD);
 
     /**

unicodetools/src/main/java/org/unicode/draft/GeneratePickerData2.java

@@ -135,7 +135,8 @@ class GeneratePickerData2 {
 
     static Comparator<String> buttonComparator =
             new MultilevelComparator(
-                    // new UnicodeSetInclusionFirst(ScriptCategories.parseUnicodeSet("[:ascii:]")),
+                    // new
+                    // UnicodeSetInclusionFirst(ScriptCategories.parseUnicodeSet("[:Block=ASCII:]")),
                     // new
                     // UnicodeSetInclusionFirst(ScriptCategories.parseUnicodeSet("[[:Letter:]&[:^NFKC_QuickCheck=N:]]")),
                     new UnicodeSetInclusionFirst(

unicodetools/src/main/java/org/unicode/idna/IdnaTypes.java

@@ -6,7 +6,7 @@
 public class IdnaTypes {
 
     public static final UnicodeSet OTHER_DOT_SET = new UnicodeSet("[． 。｡]").freeze();
-    public static final UnicodeSet ASCII = new UnicodeSet("[:ASCII:]").freeze();
+    public static final UnicodeSet ASCII = new UnicodeSet("[:Block=ASCII:]").freeze();
     public static final UnicodeSet LABEL_ASCII = new UnicodeSet("[\\-0-9a-zA-Z]").freeze();
     public static final Pattern DOT = Pattern.compile("[.]");
     public static final Pattern DOTS = Pattern.compile("[.． 。｡]");

unicodetools/src/main/java/org/unicode/idna/Uts46.java

@@ -92,7 +92,7 @@ public boolean handleLine(int start, int end, String[] items) {
     // UnicodeSetUtilities.parseUnicodeSet("[[:any:]" +
     // " - [:c:] - [:z:]" +
     // " - [:Block=Ideographic_Description_Characters:]" +
-    // "- [:ascii:] - [\uFFFC \uFFFD]" +
+    // "- [:Block=ASCII:] - [\uFFFC \uFFFD]" +
     // " [\\u002D\\u002Ea-zA-Z0-9]" +
     // "]", TableStyle.simple)
     // .freeze();

unicodetools/src/main/java/org/unicode/jsp/UnicodeRegex.java

@@ -164,7 +164,7 @@ public String compileBnf(String bnfLines) {
      * host = // reserved+;
      * query = [\\=reserved]+;
      * fragment = reserved+;
-     * reserved = [[:ascii:][:alphabetic:]];
+     * reserved = [[:Block=ASCII:][:alphabetic:]];
      * </pre>
      *
      * <p>Caveats: at this point the parsing is simple; for example, # cannot be quoted (use

unicodetools/src/main/java/org/unicode/text/UCA/MakeNamesChart.java

@@ -771,7 +771,7 @@ static String showChar(int cp, boolean addRlmIfNeeded) {
         return result;
     }
 
-    // static final UnicodeSet noname = new UnicodeSet("[[:ascii:][:ideographic:]]");
+    // static final UnicodeSet noname = new UnicodeSet("[[:Block=ASCII:][:ideographic:]]");
     static final Map hasNoNameCan = new TreeMap();
     static final Map hasNameCan = new TreeMap();
     static final Map hasNoNameComp = new TreeMap();

unicodetools/src/main/java/org/unicode/text/UCA/WriteCollationData.java

@@ -1672,9 +1672,9 @@ static final String quoteOperand(String s) {
              * '9' || (c >= 0xA0 && !UCharacterProperty.isRuleWhiteSpace(c))
              */
             needsQuoting =
-                    new UnicodeSet("[[:whitespace:][:z:][:c:][:ascii:]-[a-zA-Z0-9]-[:cn:]]")
+                    new UnicodeSet("[[:whitespace:][:z:][:c:][:Block=ASCII:]-[a-zA-Z0-9]-[:cn:]]")
                             .addAll(cn); //
-            // "[[:ascii:]-[a-zA-Z0-9]-[:c:]-[:z:]]"); //
+            // "[[:Block=ASCII:]-[a-zA-Z0-9]-[:c:]-[:z:]]"); //
             // [:whitespace:][:c:][:z:]
             // for (int i = 0; i <= 0x10FFFF; ++i) {
             // if (UCharacterProperty.isRuleWhiteSpace(i)) needsQuoting.add(i);