java.lang.Character implemented using icu4c

Removed CharacterData* and CharacterName classes.
+ bugfixes from mnc

Bug: 25442844
Change-Id: I8c20cdf32ca3530dc425c8117c637769463c1f93
(cherry picked from commit 2614ae16db0daf146227484c8e712dcbcc11e964)
diff --git a/NativeCode.mk b/NativeCode.mk
index d25f750..eb2663c 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -117,7 +117,7 @@
 # Define the rules.
 LOCAL_SRC_FILES := $(openjdk_core_src_files)
 LOCAL_C_INCLUDES := $(core_c_includes)
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto libssl libz
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto libicuuc libssl libz
 LOCAL_SHARED_LIBRARIES += libart libnativehelper libdl
 LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
 LOCAL_MODULE_TAGS := optional
@@ -205,7 +205,7 @@
 LOCAL_SRC_FILES := $(openjdk_core_src_files)
 LOCAL_C_INCLUDES := $(core_c_includes)
 LOCAL_CFLAGS := -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DLINUX -D__GLIBC__ # Sigh.
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto-host libz-host
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libicuuc-host libcrypto-host libz-host
 LOCAL_SHARED_LIBRARIES += libart libnativehelper
 LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
 LOCAL_MODULE_TAGS := optional
diff --git a/ojluni/src/main/java/java/lang/Character.java b/ojluni/src/main/java/java/lang/Character.java
index 3a145f4..9030efe 100755
--- a/ojluni/src/main/java/java/lang/Character.java
+++ b/ojluni/src/main/java/java/lang/Character.java
@@ -580,6 +580,23 @@
      */
     public static final int MAX_CODE_POINT = 0X10FFFF;
 
+    private static final byte[] DIRECTIONALITY = new byte[] {
+            DIRECTIONALITY_LEFT_TO_RIGHT, DIRECTIONALITY_RIGHT_TO_LEFT,
+            DIRECTIONALITY_EUROPEAN_NUMBER,
+            DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR,
+            DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR,
+            DIRECTIONALITY_ARABIC_NUMBER,
+            DIRECTIONALITY_COMMON_NUMBER_SEPARATOR,
+            DIRECTIONALITY_PARAGRAPH_SEPARATOR,
+            DIRECTIONALITY_SEGMENT_SEPARATOR, DIRECTIONALITY_WHITESPACE,
+            DIRECTIONALITY_OTHER_NEUTRALS,
+            DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING,
+            DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE,
+            DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC,
+            DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING,
+            DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE,
+            DIRECTIONALITY_POP_DIRECTIONAL_FORMAT,
+            DIRECTIONALITY_NONSPACING_MARK, DIRECTIONALITY_BOUNDARY_NEUTRAL };
 
     /**
      * Instances of this class represent particular subsets of the Unicode
@@ -5263,10 +5280,11 @@
      * @since   1.5
      */
     public static boolean isLowerCase(int codePoint) {
-        return getType(codePoint) == Character.LOWERCASE_LETTER ||
-               CharacterData.of(codePoint).isOtherLowercase(codePoint);
+        return isLowerCaseImpl(codePoint);
     }
 
+    static native boolean isLowerCaseImpl(int codePoint);
+
     /**
      * Determines if the specified character is an uppercase character.
      * <p>
@@ -5329,10 +5347,12 @@
      * @since   1.5
      */
     public static boolean isUpperCase(int codePoint) {
-        return getType(codePoint) == Character.UPPERCASE_LETTER ||
-               CharacterData.of(codePoint).isOtherUppercase(codePoint);
+        return isUpperCaseImpl(codePoint);
     }
 
+    static native boolean isUpperCaseImpl(int codePoint);
+
+
     /**
      * Determines if the specified character is a titlecase character.
      * <p>
@@ -5407,9 +5427,11 @@
      * @since   1.5
      */
     public static boolean isTitleCase(int codePoint) {
-        return getType(codePoint) == Character.TITLECASE_LETTER;
+        return isTitleCaseImpl(codePoint);
     }
 
+    static native boolean isTitleCaseImpl(int codePoint);
+
     /**
      * Determines if the specified character is a digit.
      * <p>
@@ -5480,9 +5502,11 @@
      * @since   1.5
      */
     public static boolean isDigit(int codePoint) {
-        return getType(codePoint) == Character.DECIMAL_DIGIT_NUMBER;
+        return isDigitImpl(codePoint);
     }
 
+    static native boolean isDigitImpl(int codePoint);
+
     /**
      * Determines if a character is defined in Unicode.
      * <p>
@@ -5533,9 +5557,11 @@
      * @since   1.5
      */
     public static boolean isDefined(int codePoint) {
-        return getType(codePoint) != Character.UNASSIGNED;
+        return isDefinedImpl(codePoint);
     }
 
+    static native boolean isDefinedImpl(int codePoint);
+
     /**
      * Determines if the specified character is a letter.
      * <p>
@@ -5605,14 +5631,11 @@
      * @since   1.5
      */
     public static boolean isLetter(int codePoint) {
-        return ((((1 << Character.UPPERCASE_LETTER) |
-            (1 << Character.LOWERCASE_LETTER) |
-            (1 << Character.TITLECASE_LETTER) |
-            (1 << Character.MODIFIER_LETTER) |
-            (1 << Character.OTHER_LETTER)) >> getType(codePoint)) & 1)
-            != 0;
+        return isLetterImpl(codePoint);
     }
 
+    static native boolean isLetterImpl(int codePoint);
+
     /**
      * Determines if the specified character is a letter or digit.
      * <p>
@@ -5659,15 +5682,11 @@
      * @since   1.5
      */
     public static boolean isLetterOrDigit(int codePoint) {
-        return ((((1 << Character.UPPERCASE_LETTER) |
-            (1 << Character.LOWERCASE_LETTER) |
-            (1 << Character.TITLECASE_LETTER) |
-            (1 << Character.MODIFIER_LETTER) |
-            (1 << Character.OTHER_LETTER) |
-            (1 << Character.DECIMAL_DIGIT_NUMBER)) >> getType(codePoint)) & 1)
-            != 0;
+        return isLetterOrDigitImpl(codePoint);
     }
 
+    static native boolean isLetterOrDigitImpl(int codePoint);
+
     /**
      * Determines if the specified character is permissible as the first
      * character in a Java identifier.
@@ -5757,15 +5776,12 @@
      * @since   1.7
      */
     public static boolean isAlphabetic(int codePoint) {
-        return (((((1 << Character.UPPERCASE_LETTER) |
-            (1 << Character.LOWERCASE_LETTER) |
-            (1 << Character.TITLECASE_LETTER) |
-            (1 << Character.MODIFIER_LETTER) |
-            (1 << Character.OTHER_LETTER) |
-            (1 << Character.LETTER_NUMBER)) >> getType(codePoint)) & 1) != 0) ||
-            CharacterData.of(codePoint).isOtherAlphabetic(codePoint);
+        return isAlphabeticImpl(codePoint);
     }
 
+    static native boolean isAlphabeticImpl(int codePoint);
+
+
     /**
      * Determines if the specified character (Unicode code point) is a CJKV
      * (Chinese, Japanese, Korean and Vietnamese) ideograph, as defined by
@@ -5777,9 +5793,11 @@
      * @since   1.7
      */
     public static boolean isIdeographic(int codePoint) {
-        return CharacterData.of(codePoint).isIdeographic(codePoint);
+        return isIdeographicImpl(codePoint);
     }
 
+    static native boolean isIdeographicImpl(int codePoint);
+
     /**
      * Determines if the specified character is
      * permissible as the first character in a Java identifier.
@@ -5837,7 +5855,21 @@
      * @since   1.5
      */
     public static boolean isJavaIdentifierStart(int codePoint) {
-        return CharacterData.of(codePoint).isJavaIdentifierStart(codePoint);
+        // Use precomputed bitmasks to optimize the ASCII range.
+        if (codePoint < 64) {
+            return (codePoint == '$'); // There's only one character in this range.
+        } else if (codePoint < 128) {
+            return (0x7fffffe87fffffeL & (1L << (codePoint - 64))) != 0;
+        }
+        return ((1 << getType(codePoint))
+                & ((1 << UPPERCASE_LETTER)
+                   | (1 << LOWERCASE_LETTER)
+                   | (1  << TITLECASE_LETTER)
+                   | (1  << MODIFIER_LETTER)
+                   | (1  << OTHER_LETTER)
+                   | (1  << CURRENCY_SYMBOL)
+                   | (1  << CONNECTOR_PUNCTUATION)
+                   | (1  << LETTER_NUMBER))) != 0;
     }
 
     /**
@@ -5907,7 +5939,27 @@
      * @since   1.5
      */
     public static boolean isJavaIdentifierPart(int codePoint) {
-        return CharacterData.of(codePoint).isJavaIdentifierPart(codePoint);
+        // Use precomputed bitmasks to optimize the ASCII range.
+        if (codePoint < 64) {
+            return (0x3ff00100fffc1ffL & (1L << codePoint)) != 0;
+        } else if (codePoint < 128) {
+            return (0x87fffffe87fffffeL & (1L << (codePoint - 64))) != 0;
+        }
+        return ((1 << getType(codePoint))
+                & ((1 << UPPERCASE_LETTER)
+                   | (1 << LOWERCASE_LETTER)
+                   | (1 << TITLECASE_LETTER)
+                   | (1 << MODIFIER_LETTER)
+                   | (1 << OTHER_LETTER)
+                   | (1 << CURRENCY_SYMBOL)
+                   | (1 << CONNECTOR_PUNCTUATION)
+                   | (1 << DECIMAL_DIGIT_NUMBER)
+                   | (1 << LETTER_NUMBER)
+                   | (1 << FORMAT)
+                   | (1 << COMBINING_SPACING_MARK)
+                   | (1 << NON_SPACING_MARK))) != 0
+                || (codePoint >= 0 && codePoint <= 8) || (codePoint >= 0xe && codePoint <= 0x1b)
+                || (codePoint >= 0x7f && codePoint <= 0x9f);
     }
 
     /**
@@ -5960,9 +6012,11 @@
      * @since   1.5
      */
     public static boolean isUnicodeIdentifierStart(int codePoint) {
-        return CharacterData.of(codePoint).isUnicodeIdentifierStart(codePoint);
+        return isUnicodeIdentifierStartImpl(codePoint);
     }
 
+    static native boolean isUnicodeIdentifierStartImpl(int codePoint);
+
     /**
      * Determines if the specified character may be part of a Unicode
      * identifier as other than the first character.
@@ -6024,9 +6078,11 @@
      * @since   1.5
      */
     public static boolean isUnicodeIdentifierPart(int codePoint) {
-        return CharacterData.of(codePoint).isUnicodeIdentifierPart(codePoint);
+        return isUnicodeIdentifierPartImpl(codePoint);
     }
 
+    static native boolean isUnicodeIdentifierPartImpl(int codePoint);
+
     /**
      * Determines if the specified character should be regarded as
      * an ignorable character in a Java identifier or a Unicode identifier.
@@ -6089,9 +6145,11 @@
      * @since   1.5
      */
     public static boolean isIdentifierIgnorable(int codePoint) {
-        return CharacterData.of(codePoint).isIdentifierIgnorable(codePoint);
+        return isIdentifierIgnorableImpl(codePoint);
     }
 
+    static native boolean isIdentifierIgnorableImpl(int codePoint);
+
     /**
      * Converts the character argument to lowercase using case
      * mapping information from the UnicodeData file.
@@ -6149,9 +6207,11 @@
      * @since   1.5
      */
     public static int toLowerCase(int codePoint) {
-        return CharacterData.of(codePoint).toLowerCase(codePoint);
+        return toLowerCaseImpl(codePoint);
     }
 
+    static native int toLowerCaseImpl(int codePoint);
+
     /**
      * Converts the character argument to uppercase using case mapping
      * information from the UnicodeData file.
@@ -6209,9 +6269,11 @@
      * @since   1.5
      */
     public static int toUpperCase(int codePoint) {
-        return CharacterData.of(codePoint).toUpperCase(codePoint);
+        return toUpperCaseImpl(codePoint);
     }
 
+    static native int toUpperCaseImpl(int codePoint);
+
     /**
      * Converts the character argument to titlecase using case mapping
      * information from the UnicodeData file. If a character has no
@@ -6268,9 +6330,11 @@
      * @since   1.5
      */
     public static int toTitleCase(int codePoint) {
-        return CharacterData.of(codePoint).toTitleCase(codePoint);
+        return toTitleCaseImpl(codePoint);
     }
 
+    static native int toTitleCaseImpl(int codePoint);
+
     /**
      * Returns the numeric value of the character {@code ch} in the
      * specified radix.
@@ -6374,9 +6438,11 @@
      * @since   1.5
      */
     public static int digit(int codePoint, int radix) {
-        return CharacterData.of(codePoint).digit(codePoint, radix);
+        return digitImpl(codePoint, radix);
     }
 
+    native static int digitImpl(int codePoint, int radix);
+
     /**
      * Returns the {@code int} value that the specified Unicode
      * character represents. For example, the character
@@ -6445,9 +6511,32 @@
      * @since   1.5
      */
     public static int getNumericValue(int codePoint) {
-        return CharacterData.of(codePoint).getNumericValue(codePoint);
+        // This is both an optimization and papers over differences between Java and ICU.
+        if (codePoint < 128) {
+            if (codePoint >= '0' && codePoint <= '9') {
+                return codePoint - '0';
+            }
+            if (codePoint >= 'a' && codePoint <= 'z') {
+                return codePoint - ('a' - 10);
+            }
+            if (codePoint >= 'A' && codePoint <= 'Z') {
+                return codePoint - ('A' - 10);
+            }
+            return -1;
+        }
+        // Full-width uppercase A-Z.
+        if (codePoint >= 0xff21 && codePoint <= 0xff3a) {
+            return codePoint - 0xff17;
+        }
+        // Full-width lowercase a-z.
+        if (codePoint >= 0xff41 && codePoint <= 0xff5a) {
+            return codePoint - 0xff37;
+        }
+        return getNumericValueImpl(codePoint);
     }
 
+    native static int getNumericValueImpl(int codePoint);
+
     /**
      * Determines if the specified character is ISO-LATIN-1 white space.
      * This method returns {@code true} for the following five
@@ -6530,12 +6619,32 @@
      * @since   1.5
      */
     public static boolean isSpaceChar(int codePoint) {
-        return ((((1 << Character.SPACE_SEPARATOR) |
-                  (1 << Character.LINE_SEPARATOR) |
-                  (1 << Character.PARAGRAPH_SEPARATOR)) >> getType(codePoint)) & 1)
-            != 0;
+        // We don't just call into icu4c because of the JNI overhead. Ideally we'd fix that.
+        // SPACE or NO-BREAK SPACE?
+        if (codePoint == 0x20 || codePoint == 0xa0) {
+            return true;
+        }
+        if (codePoint < 0x1000) {
+            return false;
+        }
+        // OGHAM SPACE MARK or MONGOLIAN VOWEL SEPARATOR?
+        if (codePoint == 0x1680 || codePoint == 0x180e) {
+            return true;
+        }
+        if (codePoint < 0x2000) {
+            return false;
+        }
+        if (codePoint <= 0xffff) {
+            // Other whitespace from General Punctuation...
+            return codePoint <= 0x200a || codePoint == 0x2028 || codePoint == 0x2029 || codePoint == 0x202f || codePoint == 0x205f ||
+                codePoint == 0x3000; // ...or CJK Symbols and Punctuation?
+        }
+        // Let icu4c worry about non-BMP code points.
+        return isSpaceCharImpl(codePoint);
     }
 
+    static native boolean isSpaceCharImpl(int codePoint);
+
     /**
      * Determines if the specified character is white space according to Java.
      * A character is a Java whitespace character if and only if it satisfies
@@ -6600,9 +6709,36 @@
      * @since   1.5
      */
     public static boolean isWhitespace(int codePoint) {
-        return CharacterData.of(codePoint).isWhitespace(codePoint);
+        // We don't just call into icu4c because of the JNI overhead. Ideally we'd fix that.
+        // Any ASCII whitespace character?
+        if ((codePoint >= 0x1c && codePoint <= 0x20) || (codePoint >= 0x09 && codePoint <= 0x0d)) {
+            return true;
+        }
+        if (codePoint < 0x1000) {
+            return false;
+        }
+        // OGHAM SPACE MARK or MONGOLIAN VOWEL SEPARATOR?
+        if (codePoint == 0x1680 || codePoint == 0x180e) {
+            return true;
+        }
+        if (codePoint < 0x2000) {
+            return false;
+        }
+        // Exclude General Punctuation's non-breaking spaces (which includes FIGURE SPACE).
+        if (codePoint == 0x2007 || codePoint == 0x202f) {
+            return false;
+        }
+        if (codePoint <= 0xffff) {
+            // Other whitespace from General Punctuation...
+            return codePoint <= 0x200a || codePoint == 0x2028 || codePoint == 0x2029 || codePoint == 0x205f ||
+                codePoint == 0x3000; // ...or CJK Symbols and Punctuation?
+        }
+        // Let icu4c worry about non-BMP code points.
+        return isWhitespaceImpl(codePoint);
     }
 
+    native static boolean isWhitespaceImpl(int codePoint);
+
     /**
      * Determines if the specified character is an ISO control
      * character.  A character is considered to be an ISO control
@@ -6735,9 +6871,16 @@
      * @since   1.5
      */
     public static int getType(int codePoint) {
-        return CharacterData.of(codePoint).getType(codePoint);
+        int type = getTypeImpl(codePoint);
+        // The type values returned by ICU are not RI-compatible. The RI skips the value 17.
+        if (type <= Character.FORMAT) {
+            return type;
+        }
+        return (type + 1);
     }
 
+    static native int getTypeImpl(int codePoint);
+
     /**
      * Determines the character representation for a specific digit in
      * the specified radix. If the value of {@code radix} is not a
@@ -6850,9 +6993,18 @@
      * @since    1.5
      */
     public static byte getDirectionality(int codePoint) {
-        return CharacterData.of(codePoint).getDirectionality(codePoint);
+        if (getType(codePoint) == Character.UNASSIGNED) {
+            return Character.DIRECTIONALITY_UNDEFINED;
+        }
+
+        byte directionality = getDirectionalityImpl(codePoint);
+        if (directionality >= 0 && directionality < DIRECTIONALITY.length) {
+            return DIRECTIONALITY[directionality];
+        }
+        return Character.DIRECTIONALITY_UNDEFINED;
     }
 
+    native static byte getDirectionalityImpl(int codePoint);
     /**
      * Determines whether the character is mirrored according to the
      * Unicode specification.  Mirrored characters should have their
@@ -6892,9 +7044,10 @@
      * @since   1.5
      */
     public static boolean isMirrored(int codePoint) {
-        return CharacterData.of(codePoint).isMirrored(codePoint);
+        return isMirroredImpl(codePoint);
     }
 
+    native static boolean isMirroredImpl(int codePoint);
     /**
      * Compares two {@code Character} objects numerically.
      *
@@ -6933,43 +7086,6 @@
     }
 
     /**
-     * Converts the character (Unicode code point) argument to uppercase using
-     * information from the UnicodeData file.
-     * <p>
-     *
-     * @param   codePoint   the character (Unicode code point) to be converted.
-     * @return  either the uppercase equivalent of the character, if
-     *          any, or an error flag ({@code Character.ERROR})
-     *          that indicates that a 1:M {@code char} mapping exists.
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isUpperCase(char)
-     * @see     Character#toLowerCase(char)
-     * @see     Character#toTitleCase(char)
-     * @since 1.4
-     */
-    static int toUpperCaseEx(int codePoint) {
-        assert isValidCodePoint(codePoint);
-        return CharacterData.of(codePoint).toUpperCaseEx(codePoint);
-    }
-
-    /**
-     * Converts the character (Unicode code point) argument to uppercase using case
-     * mapping information from the SpecialCasing file in the Unicode
-     * specification. If a character has no explicit uppercase
-     * mapping, then the {@code char} itself is returned in the
-     * {@code char[]}.
-     *
-     * @param   codePoint   the character (Unicode code point) to be converted.
-     * @return a {@code char[]} with the uppercased character.
-     * @since 1.4
-     */
-    static char[] toUpperCaseCharArray(int codePoint) {
-        // As of Unicode 6.0, 1:M uppercasings only happen in the BMP.
-        assert isBmpCodePoint(codePoint);
-        return CharacterData.of(codePoint).toUpperCaseCharArray(codePoint);
-    }
-
-    /**
      * The number of bits used to represent a <tt>char</tt> value in unsigned
      * binary form, constant {@code 16}.
      *
@@ -7021,7 +7137,7 @@
         if (!isValidCodePoint(codePoint)) {
             throw new IllegalArgumentException();
         }
-        String name = CharacterName.get(codePoint);
+        String name = getNameImpl(codePoint);
         if (name != null)
             return name;
         if (getType(codePoint) == UNASSIGNED)
@@ -7033,4 +7149,6 @@
         // should never come here
         return Integer.toHexString(codePoint).toUpperCase(Locale.ENGLISH);
     }
+
+    private static native String getNameImpl(int codePoint);
 }
diff --git a/ojluni/src/main/java/java/lang/CharacterData.java b/ojluni/src/main/java/java/lang/CharacterData.java
deleted file mode 100755
index 597f98c..0000000
--- a/ojluni/src/main/java/java/lang/CharacterData.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-abstract class CharacterData {
-    abstract int getProperties(int ch);
-    abstract int getType(int ch);
-    abstract boolean isWhitespace(int ch);
-    abstract boolean isMirrored(int ch);
-    abstract boolean isJavaIdentifierStart(int ch);
-    abstract boolean isJavaIdentifierPart(int ch);
-    abstract boolean isUnicodeIdentifierStart(int ch);
-    abstract boolean isUnicodeIdentifierPart(int ch);
-    abstract boolean isIdentifierIgnorable(int ch);
-    abstract int toLowerCase(int ch);
-    abstract int toUpperCase(int ch);
-    abstract int toTitleCase(int ch);
-    abstract int digit(int ch, int radix);
-    abstract int getNumericValue(int ch);
-    abstract byte getDirectionality(int ch);
-
-    //need to implement for JSR204
-    int toUpperCaseEx(int ch) {
-        return toUpperCase(ch);
-    }
-
-    char[] toUpperCaseCharArray(int ch) {
-        return null;
-    }
-
-    boolean isOtherLowercase(int ch) {
-        return false;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        return false;
-    }
-
-    boolean isOtherAlphabetic(int ch) {
-        return false;
-    }
-
-    boolean isIdeographic(int ch) {
-        return false;
-    }
-
-    // Character <= 0xff (basic latin) is handled by internal fast-path
-    // to avoid initializing large tables.
-    // Note: performance of this "fast-path" code may be sub-optimal
-    // in negative cases for some accessors due to complicated ranges.
-    // Should revisit after optimization of table initialization.
-
-    static final CharacterData of(int ch) {
-        if (ch >>> 8 == 0) {     // fast-path
-            return CharacterDataLatin1.instance;
-        } else {
-            switch(ch >>> 16) {  //plane 00-16
-            case(0):
-                return CharacterData00.instance;
-            case(1):
-                return CharacterData01.instance;
-            case(2):
-                return CharacterData02.instance;
-            case(14):
-                return CharacterData0E.instance;
-            case(15):   // Private Use
-            case(16):   // Private Use
-                return CharacterDataPrivateUse.instance;
-            default:
-                return CharacterDataUndefined.instance;
-            }
-        }
-    }
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterData00.java b/ojluni/src/main/java/java/lang/CharacterData00.java
deleted file mode 100644
index ce2194d..0000000
--- a/ojluni/src/main/java/java/lang/CharacterData00.java
+++ /dev/null
@@ -1,1460 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Thu Sep 11 09:30:36 BST 2014
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** 
- * The CharacterData00 class encapsulates the large tables once found in
- * java.lang.Character
-*/
-
-class CharacterData00 extends CharacterData {
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-        char offset = (char)ch;
-        int props = A[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    int getPropertiesEx(int ch) {
-        char offset = (char)ch;
-        int props = B[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isOtherLowercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0001) != 0;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0002) != 0;
-    }
-
-    boolean isOtherAlphabetic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0004) != 0;
-    }
-
-    boolean isIdeographic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0010) != 0;
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00020000) != 0) {
-          if ((val & 0x07FC0000) == 0x07FC0000) {
-            switch(ch) {
-              // map the offset overflow chars
-            case 0x0130 : mapChar = 0x0069; break;
-            case 0x2126 : mapChar = 0x03C9; break;
-            case 0x212A : mapChar = 0x006B; break;
-            case 0x212B : mapChar = 0x00E5; break;
-              // map the titlecase chars with both a 1:M uppercase map
-              // and a lowercase map
-            case 0x1F88 : mapChar = 0x1F80; break;
-            case 0x1F89 : mapChar = 0x1F81; break;
-            case 0x1F8A : mapChar = 0x1F82; break;
-            case 0x1F8B : mapChar = 0x1F83; break;
-            case 0x1F8C : mapChar = 0x1F84; break;
-            case 0x1F8D : mapChar = 0x1F85; break;
-            case 0x1F8E : mapChar = 0x1F86; break;
-            case 0x1F8F : mapChar = 0x1F87; break;
-            case 0x1F98 : mapChar = 0x1F90; break;
-            case 0x1F99 : mapChar = 0x1F91; break;
-            case 0x1F9A : mapChar = 0x1F92; break;
-            case 0x1F9B : mapChar = 0x1F93; break;
-            case 0x1F9C : mapChar = 0x1F94; break;
-            case 0x1F9D : mapChar = 0x1F95; break;
-            case 0x1F9E : mapChar = 0x1F96; break;
-            case 0x1F9F : mapChar = 0x1F97; break;
-            case 0x1FA8 : mapChar = 0x1FA0; break;
-            case 0x1FA9 : mapChar = 0x1FA1; break;
-            case 0x1FAA : mapChar = 0x1FA2; break;
-            case 0x1FAB : mapChar = 0x1FA3; break;
-            case 0x1FAC : mapChar = 0x1FA4; break;
-            case 0x1FAD : mapChar = 0x1FA5; break;
-            case 0x1FAE : mapChar = 0x1FA6; break;
-            case 0x1FAF : mapChar = 0x1FA7; break;
-            case 0x1FBC : mapChar = 0x1FB3; break;
-            case 0x1FCC : mapChar = 0x1FC3; break;
-            case 0x1FFC : mapChar = 0x1FF3; break;
-
-            case 0x023A : mapChar = 0x2C65; break;
-            case 0x023E : mapChar = 0x2C66; break;
-            case 0x10A0 : mapChar = 0x2D00; break;
-            case 0x10A1 : mapChar = 0x2D01; break;
-            case 0x10A2 : mapChar = 0x2D02; break;
-            case 0x10A3 : mapChar = 0x2D03; break;
-            case 0x10A4 : mapChar = 0x2D04; break;
-            case 0x10A5 : mapChar = 0x2D05; break;
-            case 0x10A6 : mapChar = 0x2D06; break;
-            case 0x10A7 : mapChar = 0x2D07; break;
-            case 0x10A8 : mapChar = 0x2D08; break;
-            case 0x10A9 : mapChar = 0x2D09; break;
-            case 0x10AA : mapChar = 0x2D0A; break;
-            case 0x10AB : mapChar = 0x2D0B; break;
-            case 0x10AC : mapChar = 0x2D0C; break;
-            case 0x10AD : mapChar = 0x2D0D; break;
-            case 0x10AE : mapChar = 0x2D0E; break;
-            case 0x10AF : mapChar = 0x2D0F; break;
-            case 0x10B0 : mapChar = 0x2D10; break;
-            case 0x10B1 : mapChar = 0x2D11; break;
-            case 0x10B2 : mapChar = 0x2D12; break;
-            case 0x10B3 : mapChar = 0x2D13; break;
-            case 0x10B4 : mapChar = 0x2D14; break;
-            case 0x10B5 : mapChar = 0x2D15; break;
-            case 0x10B6 : mapChar = 0x2D16; break;
-            case 0x10B7 : mapChar = 0x2D17; break;
-            case 0x10B8 : mapChar = 0x2D18; break;
-            case 0x10B9 : mapChar = 0x2D19; break;
-            case 0x10BA : mapChar = 0x2D1A; break;
-            case 0x10BB : mapChar = 0x2D1B; break;
-            case 0x10BC : mapChar = 0x2D1C; break;
-            case 0x10BD : mapChar = 0x2D1D; break;
-            case 0x10BE : mapChar = 0x2D1E; break;
-            case 0x10BF : mapChar = 0x2D1F; break;
-            case 0x10C0 : mapChar = 0x2D20; break;
-            case 0x10C1 : mapChar = 0x2D21; break;
-            case 0x10C2 : mapChar = 0x2D22; break;
-            case 0x10C3 : mapChar = 0x2D23; break;
-            case 0x10C4 : mapChar = 0x2D24; break;
-            case 0x10C5 : mapChar = 0x2D25; break;
-            case 0x1E9E : mapChar = 0x00DF; break;
-            case 0x2C62 : mapChar = 0x026B; break;
-            case 0x2C63 : mapChar = 0x1D7D; break;
-            case 0x2C64 : mapChar = 0x027D; break;
-            case 0x2C6D : mapChar = 0x0251; break;
-            case 0x2C6E : mapChar = 0x0271; break;
-            case 0x2C6F : mapChar = 0x0250; break;
-            case 0x2C70 : mapChar = 0x0252; break;
-            case 0x2C7E : mapChar = 0x023F; break;
-            case 0x2C7F : mapChar = 0x0240; break;
-            case 0xA77D : mapChar = 0x1D79; break;
-            case 0xA78D : mapChar = 0x0265; break;
-              // default mapChar is already set, so no
-              // need to redo it here.
-              // default       : mapChar = ch;
-            }
-          }
-          else {
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-          }
-        }
-        return mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-          if ((val & 0x07FC0000) == 0x07FC0000) {
-            switch(ch) {
-              // map chars with overflow offsets
-            case 0x00B5 : mapChar = 0x039C; break;
-            case 0x017F : mapChar = 0x0053; break;
-            case 0x1FBE : mapChar = 0x0399; break;
-              // map char that have both a 1:1 and 1:M map
-            case 0x1F80 : mapChar = 0x1F88; break;
-            case 0x1F81 : mapChar = 0x1F89; break;
-            case 0x1F82 : mapChar = 0x1F8A; break;
-            case 0x1F83 : mapChar = 0x1F8B; break;
-            case 0x1F84 : mapChar = 0x1F8C; break;
-            case 0x1F85 : mapChar = 0x1F8D; break;
-            case 0x1F86 : mapChar = 0x1F8E; break;
-            case 0x1F87 : mapChar = 0x1F8F; break;
-            case 0x1F90 : mapChar = 0x1F98; break;
-            case 0x1F91 : mapChar = 0x1F99; break;
-            case 0x1F92 : mapChar = 0x1F9A; break;
-            case 0x1F93 : mapChar = 0x1F9B; break;
-            case 0x1F94 : mapChar = 0x1F9C; break;
-            case 0x1F95 : mapChar = 0x1F9D; break;
-            case 0x1F96 : mapChar = 0x1F9E; break;
-            case 0x1F97 : mapChar = 0x1F9F; break;
-            case 0x1FA0 : mapChar = 0x1FA8; break;
-            case 0x1FA1 : mapChar = 0x1FA9; break;
-            case 0x1FA2 : mapChar = 0x1FAA; break;
-            case 0x1FA3 : mapChar = 0x1FAB; break;
-            case 0x1FA4 : mapChar = 0x1FAC; break;
-            case 0x1FA5 : mapChar = 0x1FAD; break;
-            case 0x1FA6 : mapChar = 0x1FAE; break;
-            case 0x1FA7 : mapChar = 0x1FAF; break;
-            case 0x1FB3 : mapChar = 0x1FBC; break;
-            case 0x1FC3 : mapChar = 0x1FCC; break;
-            case 0x1FF3 : mapChar = 0x1FFC; break;
-
-            case 0x023F : mapChar = 0x2C7E; break;
-            case 0x0240 : mapChar = 0x2C7F; break;
-            case 0x0250 : mapChar = 0x2C6F; break;
-            case 0x0251 : mapChar = 0x2C6D; break;
-            case 0x0252 : mapChar = 0x2C70; break;
-            case 0x0265 : mapChar = 0xA78D; break;
-            case 0x026B : mapChar = 0x2C62; break;
-            case 0x0271 : mapChar = 0x2C6E; break;
-            case 0x027D : mapChar = 0x2C64; break;
-            case 0x1D79 : mapChar = 0xA77D; break;
-            case 0x1D7D : mapChar = 0x2C63; break;
-            case 0x2C65 : mapChar = 0x023A; break;
-            case 0x2C66 : mapChar = 0x023E; break;
-            case 0x2D00 : mapChar = 0x10A0; break;
-            case 0x2D01 : mapChar = 0x10A1; break;
-            case 0x2D02 : mapChar = 0x10A2; break;
-            case 0x2D03 : mapChar = 0x10A3; break;
-            case 0x2D04 : mapChar = 0x10A4; break;
-            case 0x2D05 : mapChar = 0x10A5; break;
-            case 0x2D06 : mapChar = 0x10A6; break;
-            case 0x2D07 : mapChar = 0x10A7; break;
-            case 0x2D08 : mapChar = 0x10A8; break;
-            case 0x2D09 : mapChar = 0x10A9; break;
-            case 0x2D0A : mapChar = 0x10AA; break;
-            case 0x2D0B : mapChar = 0x10AB; break;
-            case 0x2D0C : mapChar = 0x10AC; break;
-            case 0x2D0D : mapChar = 0x10AD; break;
-            case 0x2D0E : mapChar = 0x10AE; break;
-            case 0x2D0F : mapChar = 0x10AF; break;
-            case 0x2D10 : mapChar = 0x10B0; break;
-            case 0x2D11 : mapChar = 0x10B1; break;
-            case 0x2D12 : mapChar = 0x10B2; break;
-            case 0x2D13 : mapChar = 0x10B3; break;
-            case 0x2D14 : mapChar = 0x10B4; break;
-            case 0x2D15 : mapChar = 0x10B5; break;
-            case 0x2D16 : mapChar = 0x10B6; break;
-            case 0x2D17 : mapChar = 0x10B7; break;
-            case 0x2D18 : mapChar = 0x10B8; break;
-            case 0x2D19 : mapChar = 0x10B9; break;
-            case 0x2D1A : mapChar = 0x10BA; break;
-            case 0x2D1B : mapChar = 0x10BB; break;
-            case 0x2D1C : mapChar = 0x10BC; break;
-            case 0x2D1D : mapChar = 0x10BD; break;
-            case 0x2D1E : mapChar = 0x10BE; break;
-            case 0x2D1F : mapChar = 0x10BF; break;
-            case 0x2D20 : mapChar = 0x10C0; break;
-            case 0x2D21 : mapChar = 0x10C1; break;
-            case 0x2D22 : mapChar = 0x10C2; break;
-            case 0x2D23 : mapChar = 0x10C3; break;
-            case 0x2D24 : mapChar = 0x10C4; break;
-            case 0x2D25 : mapChar = 0x10C5; break;
-              // ch must have a 1:M case mapping, but we
-              // can't handle it here. Return ch.
-              // since mapChar is already set, no need
-              // to redo it here.
-              //default       : mapChar = ch;
-            }
-          }
-          else {
-            int offset = val  << 5 >> (5+18);
-            mapChar =  ch - offset;
-          }
-        }
-        return mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00008000) != 0) {
-            // There is a titlecase equivalent.  Perform further checks:
-            if ((val & 0x00010000) == 0) {
-                // The character does not have an uppercase equivalent, so it must
-                // already be uppercase; so add 1 to get the titlecase form.
-                mapChar = ch + 1;
-            }
-            else if ((val & 0x00020000) == 0) {
-                // The character does not have a lowercase equivalent, so it must
-                // already be lowercase; so subtract 1 to get the titlecase form.
-                mapChar = ch - 1;
-            }
-            // else {
-            // The character has both an uppercase equivalent and a lowercase
-            // equivalent, so it must itself be a titlecase form; return it.
-            // return ch;
-            //}
-        }
-        else if ((val & 0x00010000) != 0) {
-            // This character has no titlecase equivalent but it does have an
-            // uppercase equivalent, so use that (subtract the signed case offset).
-            mapChar = toUpperCase(ch);
-        }
-        return mapChar;
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-        default: // cannot occur
-        case (0x00000000):         // not numeric
-            retval = -1;
-            break;
-        case (0x00000400):              // simple numeric
-            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            break;
-        case (0x00000800)      :       // "strange" numeric
-            switch (ch) {
-                case 0x0BF1: retval = 100; break;         // TAMIL NUMBER ONE HUNDRED
-                case 0x0BF2: retval = 1000; break;        // TAMIL NUMBER ONE THOUSAND
-                case 0x1375: retval = 40; break;          // ETHIOPIC NUMBER FORTY
-                case 0x1376: retval = 50; break;          // ETHIOPIC NUMBER FIFTY
-                case 0x1377: retval = 60; break;          // ETHIOPIC NUMBER SIXTY
-                case 0x1378: retval = 70; break;          // ETHIOPIC NUMBER SEVENTY
-                case 0x1379: retval = 80; break;          // ETHIOPIC NUMBER EIGHTY
-                case 0x137A: retval = 90; break;          // ETHIOPIC NUMBER NINETY
-                case 0x137B: retval = 100; break;         // ETHIOPIC NUMBER HUNDRED
-                case 0x137C: retval = 10000; break;       // ETHIOPIC NUMBER TEN THOUSAND
-                case 0x215F: retval = 1; break;           // FRACTION NUMERATOR ONE
-                case 0x216C: retval = 50; break;          // ROMAN NUMERAL FIFTY
-                case 0x216D: retval = 100; break;         // ROMAN NUMERAL ONE HUNDRED
-                case 0x216E: retval = 500; break;         // ROMAN NUMERAL FIVE HUNDRED
-                case 0x216F: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND
-                case 0x217C: retval = 50; break;          // SMALL ROMAN NUMERAL FIFTY
-                case 0x217D: retval = 100; break;         // SMALL ROMAN NUMERAL ONE HUNDRED
-                case 0x217E: retval = 500; break;         // SMALL ROMAN NUMERAL FIVE HUNDRED
-                case 0x217F: retval = 1000; break;        // SMALL ROMAN NUMERAL ONE THOUSAND
-                case 0x2180: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND C D
-                case 0x2181: retval = 5000; break;        // ROMAN NUMERAL FIVE THOUSAND
-                case 0x2182: retval = 10000; break;       // ROMAN NUMERAL TEN THOUSAND
-
-                case 0x325C: retval = 32; break;
-
-                case 0x325D: retval = 33; break;          // CIRCLED NUMBER THIRTY THREE
-                case 0x325E: retval = 34; break;          // CIRCLED NUMBER THIRTY FOUR
-                case 0x325F: retval = 35; break;          // CIRCLED NUMBER THIRTY FIVE
-                case 0x32B1: retval = 36; break;          // CIRCLED NUMBER THIRTY SIX
-                case 0x32B2: retval = 37; break;          // CIRCLED NUMBER THIRTY SEVEN
-                case 0x32B3: retval = 38; break;          // CIRCLED NUMBER THIRTY EIGHT
-                case 0x32B4: retval = 39; break;          // CIRCLED NUMBER THIRTY NINE
-                case 0x32B5: retval = 40; break;          // CIRCLED NUMBER FORTY
-                case 0x32B6: retval = 41; break;          // CIRCLED NUMBER FORTY ONE
-                case 0x32B7: retval = 42; break;          // CIRCLED NUMBER FORTY TWO
-                case 0x32B8: retval = 43; break;          // CIRCLED NUMBER FORTY THREE
-                case 0x32B9: retval = 44; break;          // CIRCLED NUMBER FORTY FOUR
-                case 0x32BA: retval = 45; break;          // CIRCLED NUMBER FORTY FIVE
-                case 0x32BB: retval = 46; break;          // CIRCLED NUMBER FORTY SIX
-                case 0x32BC: retval = 47; break;          // CIRCLED NUMBER FORTY SEVEN
-                case 0x32BD: retval = 48; break;          // CIRCLED NUMBER FORTY EIGHT
-                case 0x32BE: retval = 49; break;          // CIRCLED NUMBER FORTY NINE
-                case 0x32BF: retval = 50; break;          // CIRCLED NUMBER FIFTY
-
-                case 0x0D71: retval = 100; break;         // MALAYALAM NUMBER ONE HUNDRED
-                case 0x0D72: retval = 1000; break;        // MALAYALAM NUMBER ONE THOUSAND
-                case 0x2186: retval = 50; break;          // ROMAN NUMERAL FIFTY EARLY FORM
-                case 0x2187: retval = 50000; break;       // ROMAN NUMERAL FIFTY THOUSAND
-                case 0x2188: retval = 100000; break;      // ROMAN NUMERAL ONE HUNDRED THOUSAND
-
-                default:       retval = -2; break;
-            }
-            break;
-        case (0x00000C00):           // Java supradecimal
-            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00004000);
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-        if (directionality == 0xF ) {
-            switch(ch) {
-                case 0x202A :
-                    // This is the only char with LRE
-                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING;
-                    break;
-                case 0x202B :
-                    // This is the only char with RLE
-                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING;
-                    break;
-                case 0x202C :
-                    // This is the only char with PDF
-                    directionality = Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT;
-                    break;
-                case 0x202D :
-                    // This is the only char with LRO
-                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE;
-                    break;
-                case 0x202E :
-                    // This is the only char with RLO
-                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE;
-                    break;
-                default :
-                    directionality = Character.DIRECTIONALITY_UNDEFINED;
-                    break;
-            }
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x80000000) != 0);
-    }
-
-    int toUpperCaseEx(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            if ((val & 0x07FC0000) != 0x07FC0000) {
-                int offset = val  << 5 >> (5+18);
-                mapChar =  ch - offset;
-            }
-            else {
-                switch(ch) {
-                    // map overflow characters
-                    case 0x00B5 : mapChar = 0x039C; break;
-                    case 0x017F : mapChar = 0x0053; break;
-                    case 0x1FBE : mapChar = 0x0399; break;
-
-                    case 0x023F : mapChar = 0x2C7E; break;
-                    case 0x0240 : mapChar = 0x2C7F; break;
-                    case 0x0250 : mapChar = 0x2C6F; break;
-                    case 0x0251 : mapChar = 0x2C6D; break;
-                    case 0x0252 : mapChar = 0x2C70; break;
-                    case 0x0265 : mapChar = 0xA78D; break;
-                    case 0x026B : mapChar = 0x2C62; break;
-                    case 0x0271 : mapChar = 0x2C6E; break;
-                    case 0x027D : mapChar = 0x2C64; break;
-                    case 0x1D79 : mapChar = 0xA77D; break;
-                    case 0x1D7D : mapChar = 0x2C63; break;
-                    case 0x2C65 : mapChar = 0x023A; break;
-                    case 0x2C66 : mapChar = 0x023E; break;
-                    case 0x2D00 : mapChar = 0x10A0; break;
-                    case 0x2D01 : mapChar = 0x10A1; break;
-                    case 0x2D02 : mapChar = 0x10A2; break;
-                    case 0x2D03 : mapChar = 0x10A3; break;
-                    case 0x2D04 : mapChar = 0x10A4; break;
-                    case 0x2D05 : mapChar = 0x10A5; break;
-                    case 0x2D06 : mapChar = 0x10A6; break;
-                    case 0x2D07 : mapChar = 0x10A7; break;
-                    case 0x2D08 : mapChar = 0x10A8; break;
-                    case 0x2D09 : mapChar = 0x10A9; break;
-                    case 0x2D0A : mapChar = 0x10AA; break;
-                    case 0x2D0B : mapChar = 0x10AB; break;
-                    case 0x2D0C : mapChar = 0x10AC; break;
-                    case 0x2D0D : mapChar = 0x10AD; break;
-                    case 0x2D0E : mapChar = 0x10AE; break;
-                    case 0x2D0F : mapChar = 0x10AF; break;
-                    case 0x2D10 : mapChar = 0x10B0; break;
-                    case 0x2D11 : mapChar = 0x10B1; break;
-                    case 0x2D12 : mapChar = 0x10B2; break;
-                    case 0x2D13 : mapChar = 0x10B3; break;
-                    case 0x2D14 : mapChar = 0x10B4; break;
-                    case 0x2D15 : mapChar = 0x10B5; break;
-                    case 0x2D16 : mapChar = 0x10B6; break;
-                    case 0x2D17 : mapChar = 0x10B7; break;
-                    case 0x2D18 : mapChar = 0x10B8; break;
-                    case 0x2D19 : mapChar = 0x10B9; break;
-                    case 0x2D1A : mapChar = 0x10BA; break;
-                    case 0x2D1B : mapChar = 0x10BB; break;
-                    case 0x2D1C : mapChar = 0x10BC; break;
-                    case 0x2D1D : mapChar = 0x10BD; break;
-                    case 0x2D1E : mapChar = 0x10BE; break;
-                    case 0x2D1F : mapChar = 0x10BF; break;
-                    case 0x2D20 : mapChar = 0x10C0; break;
-                    case 0x2D21 : mapChar = 0x10C1; break;
-                    case 0x2D22 : mapChar = 0x10C2; break;
-                    case 0x2D23 : mapChar = 0x10C3; break;
-                    case 0x2D24 : mapChar = 0x10C4; break;
-                    case 0x2D25 : mapChar = 0x10C5; break;
-                    default       : mapChar = Character.ERROR; break;
-                }
-            }
-        }
-        return mapChar;
-    }
-
-    char[] toUpperCaseCharArray(int ch) {
-        char[] upperMap = {(char)ch};
-        int location = findInCharMap(ch);
-        if (location != -1) {
-            upperMap = charMap[location][1];
-        }
-        return upperMap;
-    }
-
-
-    /**
-     * Finds the character in the uppercase mapping table.
-     *
-     * @param ch the <code>char</code> to search
-     * @return the index location ch in the table or -1 if not found
-     * @since 1.4
-     */
-     int findInCharMap(int ch) {
-        if (charMap == null || charMap.length == 0) {
-            return -1;
-        }
-        int top, bottom, current;
-        bottom = 0;
-        top = charMap.length;
-        current = top/2;
-        // invariant: top > current >= bottom && ch >= CharacterData.charMap[bottom][0]
-        while (top - bottom > 1) {
-            if (ch >= charMap[current][0][0]) {
-                bottom = current;
-            } else {
-                top = current;
-            }
-            current = (top + bottom) / 2;
-        }
-        if (ch == charMap[current][0][0]) return current;
-        else return -1;
-    }
-
-    static final CharacterData00 instance = new CharacterData00();
-    private CharacterData00() {};
-
-    // The following tables and code generated using:
-  // java GenerateCharacter -plane 0 -template ../../tools/GenerateCharacter/CharacterData00.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -proplist ../../tools/UnicodeData/PropList.txt -o /usr/local/google/home/haaawk/ojluni/openjdk/build/linux-amd64/gensrc/java/lang/CharacterData00.java -string -usecharforbyte 11 4 1
-      static final char[][][] charMap;
-// The X table has 2048 entries for a total of 4096 bytes.
-
-  static final char X[] = (
-    "\000\020\040\060\100\120\140\160\200\220\240\260\300\320\340\360\200\u0100"+
-    "\u0110\u0120\u0130\u0140\u0150\u0160\u0170\u0170\u0180\u0190\u01A0\u01B0\u01C0"+
-    "\u01D0\u01E0\u01F0\u0200\200\u0210\200\u0220\200\200\u0230\u0240\u0250\u0260"+
-    "\u0270\u0280\u0290\u02A0\u02B0\u02C0\u02D0\u02B0\u02B0\u02E0\u02F0\u0300\u0310"+
-    "\u0320\u02B0\u02B0\u0330\u0340\u0350\u0360\u0370\u0380\u0390\u0390\u0390\u0390"+
-    "\u0390\u03A0\u03B0\u03C0\u03D0\u03E0\u03F0\u0400\u0410\u0420\u0430\u0440\u0450"+
-    "\u0460\u0470\u0480\u0490\u03E0\u04A0\u04B0\u04C0\u04D0\u04E0\u04F0\u0500\u0510"+
-    "\u0520\u0530\u0540\u0550\u0560\u0570\u0580\u0550\u0590\u05A0\u05B0\u05C0\u05D0"+
-    "\u05E0\u05F0\u0600\u0610\u0620\u0390\u0630\u0640\u0650\u0390\u0660\u0670\u0680"+
-    "\u0690\u06A0\u06B0\u06C0\u0390\u06D0\u06E0\u06F0\u0700\u0710\u0720\u0730\u0740"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u0750\u06D0\u0760"+
-    "\u0770\u0780\u06D0\u0790\u06D0\u07A0\u07B0\u07C0\u06D0\u06D0\u07D0\u07E0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u07F0\u0800\u06D0\u06D0\u0810\u0820\u0830\u0840\u0850"+
-    "\u06D0\u0860\u0870\u0880\u0890\u06D0\u08A0\u08B0\u06D0\u08C0\u06D0\u08D0\u08E0"+
-    "\u08F0\u0900\u0910\u06D0\u0920\u0930\u0940\u0950\u06D0\u0960\u0970\u0980\u0990"+
-    "\u0390\u0390\u09A0\u09B0\u09C0\u09D0\u09E0\u09F0\u06D0\u0A00\u06D0\u0A10\u0A20"+
-    "\u0A30\u0390\u0390\u0A40\u0A50\u0A60\u0A70\u0A80\u0A90\u0AA0\u0A80\u0170\u0AB0"+
-    "\200\200\200\200\u0AC0\200\200\200\u0AD0\u0AE0\u0AF0\u0B00\u0B10\u0B20\u0B30"+
-    "\u0B40\u0B50\u0B60\u0B70\u0B80\u0B90\u0BA0\u0BB0\u0BC0\u0BD0\u0BE0\u0BF0\u0C00"+
-    "\u0C10\u0C20\u0C30\u0C40\u0C50\u0C60\u0C70\u0C80\u0C90\u0CA0\u0CB0\u0CC0\u0CD0"+
-    "\u0CE0\u0CF0\u0D00\u0D10\u0D20\u0D30\u0D40\u0940\u0D50\u0D60\u0D70\u0D80\u0D90"+
-    "\u0DA0\u0DB0\u0940\u0940\u0940\u0940\u0940\u0DC0\u0DD0\u0DE0\u0940\u0940\u0940"+
-    "\u0DF0\u0940\u0E00\u0940\u0940\u0E10\u0940\u0940\u0E20\u0E30\u0940\u0E40\u0E50"+
-    "\u0CF0\u0CF0\u0CF0\u0CF0\u0CF0\u0CF0\u0CF0\u0CF0\u0E60\u0E60\u0E60\u0E60\u0E70"+
-    "\u0E80\u0E90\u0EA0\u0EB0\u0EC0\u0ED0\u0EE0\u0EF0\u0F00\u0F10\u0F20\u0940\u0F30"+
-    "\u0F40\u0390\u0390\u0390\u0390\u0390\u0F50\u0F60\u0F70\u0F80\200\200\200\u0F90"+
-    "\u0FA0\u0FB0\u06D0\u0FC0\u0FD0\u0FE0\u0FE0\u0FF0\u1000\u1010\u0390\u0390\u1020"+
-    "\u0940\u0940\u1030\u0940\u0940\u0940\u0940\u0940\u0940\u1040\u1050\u1060\u1070"+
-    "\u0600\u06D0\u1080\u07E0\u06D0\u1090\u10A0\u10B0\u06D0\u06D0\u10C0\u10D0\u0940"+
-    "\u10E0\u10F0\u1100\u1110\u1120\u1100\u1130\u1140\u1150\u0CF0\u0CF0\u0CF0\u1160"+
-    "\u0CF0\u0CF0\u1170\u1180\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u11A0\u0940\u0940\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190"+
-    "\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u1190\u11B0\u0390\u11C0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u11D0\u0940\u11E0\u0A30\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u11F0\u1200\200\u1210\u1220\u06D0\u06D0"+
-    "\u1230\u1240\u1250\200\u1260\u1270\u1280\u0390\u1290\u12A0\u12B0\u06D0\u12C0"+
-    "\u12D0\u12E0\u12F0\u1300\u1310\u1320\u1330\u08E0\u03A0\u1340\u1350\u0390\u06D0"+
-    "\u1360\u1370\u1380\u06D0\u1390\u13A0\u0390\u13B0\u13C0\u0390\u0390\u0390\u0390"+
-    "\u06D0\u13D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0\u06D0"+
-    "\u13E0\u13F0\u1400\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410"+
-    "\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410"+
-    "\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410"+
-    "\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410"+
-    "\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410\u1410"+
-    "\u1410\u1410\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1420"+
-    "\u1420\u1420\u1420\u1420\u1420\u1420\u1420\u1190\u1190\u1190\u1430\u1190\u1440"+
-    "\u1450\u1460\u1190\u1470\u1190\u1470\u1190\u1190\u1480\u0390\u1490\u14A0\u14B0"+
-    "\u02B0\u02B0\u14C0\u14D0\u02B0\u02B0\u02B0\u02B0\u02B0\u02B0\u02B0\u02B0\u02B0"+
-    "\u02B0\u14E0\u14F0\u02B0\u1500\u02B0\u1510\u1520\u1530\u1540\u1550\u1560\u02B0"+
-    "\u02B0\u02B0\u1570\u1580\040\u1590\u15A0\u15B0\u15C0\u15D0\u15E0").toCharArray();
-
-  // The Y table has 5616 entries for a total of 11232 bytes.
-
-  static final char Y[] = (
-    "\000\000\000\000\002\004\006\000\000\000\000\000\000\000\010\004\012\014\016"+
-    "\020\022\024\026\030\032\032\032\032\032\034\036\040\042\044\044\044\044\044"+
-    "\044\044\044\044\044\044\044\046\050\052\054\056\056\056\056\056\056\056\056"+
-    "\056\056\056\056\060\062\064\000\000\066\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\070\072\072\074\076\100\102\104\106\110\112\114\116\120\122"+
-    "\124\126\126\126\126\126\126\126\126\126\126\126\130\126\126\126\132\134\134"+
-    "\134\134\134\134\134\134\134\134\134\136\134\134\134\140\142\142\142\142\142"+
-    "\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142"+
-    "\144\142\142\142\146\150\150\150\150\150\150\150\152\142\142\142\142\142\142"+
-    "\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\154\150"+
-    "\150\152\156\142\142\160\162\164\166\170\172\162\174\176\142\200\202\204\142"+
-    "\142\142\206\210\212\142\206\214\216\150\220\142\222\142\224\226\226\230\232"+
-    "\234\230\236\150\150\150\150\150\150\150\240\142\142\142\142\142\142\142\142"+
-    "\142\242\234\142\244\142\142\142\142\246\142\142\142\142\142\142\142\142\142"+
-    "\212\212\212\250\252\254\256\260\262\142\142\142\142\142\264\266\270\272\274"+
-    "\276\212\212\300\302\304\212\306\304\212\310\304\312\314\212\212\212\304\212"+
-    "\316\320\212\212\322\324\326\212\212\330\332\212\212\212\212\212\212\212\212"+
-    "\212\212\212\212\212\334\334\334\334\336\340\342\342\334\344\344\346\346\346"+
-    "\346\346\342\344\344\344\344\344\344\344\334\334\350\344\344\344\352\354\344"+
-    "\344\344\344\344\344\344\344\356\356\356\356\356\356\356\356\356\356\356\356"+
-    "\356\356\356\356\356\356\360\356\356\356\356\356\356\356\356\356\356\356\356"+
-    "\356\356\356\356\356\356\356\356\356\142\142\352\142\362\364\366\370\362\362"+
-    "\344\372\374\376\u0100\u0102\u0104\126\126\126\126\126\126\126\126\u0106\126"+
-    "\126\126\126\u0108\u010A\u010C\134\134\134\134\134\134\134\134\u010E\134\134"+
-    "\134\134\u0110\u0112\u0114\u0116\u0118\u011A\142\142\142\142\142\142\142\142"+
-    "\142\142\142\142\u011C\u011E\u0120\u0122\u0124\142\u0126\u0128\u012A\u012A"+
-    "\u012A\u012A\u012A\u012A\u012A\u012A\126\126\126\126\126\126\126\126\126\126"+
-    "\126\126\126\126\126\126\134\134\134\134\134\134\134\134\134\134\134\134\134"+
-    "\134\134\134\u012C\u012C\u012C\u012C\u012C\u012C\u012C\u012C\142\u012E\356"+
-    "\356\u0130\142\142\142\142\142\142\142\142\142\142\142\u0132\150\150\150\150"+
-    "\150\150\u0134\142\142\142\142\142\142\142\142\142\142\142\142\362\362\362"+
-    "\362\u0136\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138"+
-    "\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u013A\u013C\u013E\u013E\u013E\u0140"+
-    "\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142"+
-    "\u0142\u0142\u0142\u0142\u0142\u0144\u0146\u0148\362\362\u014A\356\356\356"+
-    "\356\356\356\356\356\356\356\356\356\356\356\356\u014C\u014C\u014C\u014C\u014C"+
-    "\u014C\u014C\u014E\u0150\u0152\u014C\u0150\362\362\362\362\u0154\u0154\u0154"+
-    "\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0156\362\362"+
-    "\u0154\u0158\u015A\362\362\362\362\362\u015C\u015C\362\u015E\u0160\u0162\u0164"+
-    "\074\u014C\u014C\u014C\u014C\u014C\u0166\362\u0168\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016C"+
-    "\u016A\u016A\u016A\u016A\u016E\u014C\u014C\u014C\u014C\u014C\u014C\u0170\u014C"+
-    "\u014C\u014C\u0172\u0172\u0172\u0172\u0172\u0174\u0176\u016A\u0178\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u017A\u014C\u014C\u014C\u017C\u017E\u0170\u014C\u0180\u0182\u0184"+
-    "\356\u0170\u016A\032\032\032\032\032\u016A\u0186\u0188\u0168\u0168\u0168\u0168"+
-    "\u0168\u0168\u0168\u018A\u016E\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u014C\u014C\u014C\u014C\u014C\u014C"+
-    "\u014C\u014C\356\356\356\356\356\u018C\u018E\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u014C\u014C\u014C\u014C\u014C\u0178"+
-    "\362\362\362\362\362\362\362\u0190\u0190\u0190\u0190\u0190\u0154\u0154\u0154"+
-    "\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154"+
-    "\u0192\356\356\356\356\u0194\114\020\u0196\362\362\u0154\u0154\u0154\u0154"+
-    "\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u014C\356\u0198\u014C\u014C\u014C"+
-    "\u014C\u0198\u014C\u0198\u014C\u019A\362\u019C\u019C\u019C\u019C\u019C\u019C"+
-    "\u019C\u015A\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154\u0154"+
-    "\u0154\u0192\356\362\u015A\362\362\362\362\362\362\362\362\362\362\362\362"+
-    "\362\362\362\362\u014C\u019E\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\u019E\u01A0\u01A2"+
-    "\u01A4\u014C\u014C\u014C\u019E\u01A2\u01A6\u01A2\u01A8\356\u0170\u014C\226"+
-    "\226\226\226\226\u014C\u013E\u01AA\u01AA\u01AA\u01AA\u01AA\u01AC\226\226\226"+
-    "\u01AE\226\226\226\u01B0\u01A2\u01AE\226\226\226\u01B2\u01AE\u01B2\u01AE\226"+
-    "\226\226\226\226\226\226\226\226\226\u01B2\226\226\226\u01B2\u01B2\362\226"+
-    "\226\362\u01A0\u01A2\u01A4\u014C\u01B4\u01B6\u01B8\u01B6\u01A6\u01B2\362\362"+
-    "\362\u01B6\362\362\226\u01AE\226\u014C\362\u01AA\u01AA\u01AA\u01AA\u01AA\226"+
-    "\072\u01BA\u01BA\u01BC\u01BE\362\362\u01B0\u019E\u01AE\226\226\u01B2\362\u01AE"+
-    "\u01B2\u01AE\226\226\226\226\226\226\226\226\226\226\u01B2\226\226\226\u01B2"+
-    "\226\u01AE\u01B2\226\362\u018C\u01A2\u01A4\u01B4\362\u01B0\u01B4\u01B0\u019A"+
-    "\362\u01B0\362\362\362\u01AE\226\u01B2\u01B2\362\362\362\u01AA\u01AA\u01AA"+
-    "\u01AA\u01AA\u014C\226\u01C0\362\362\362\362\362\u01B0\u019E\u01AE\226\226"+
-    "\226\226\u01AE\226\u01AE\226\226\226\226\226\226\226\226\226\226\u01B2\226"+
-    "\226\226\u01B2\226\u01AE\226\226\362\u01A0\u01A2\u01A4\u014C\u014C\u01B0\u019E"+
-    "\u01B6\u01A6\362\u01B2\362\362\362\362\362\362\362\226\u014C\362\u01AA\u01AA"+
-    "\u01AA\u01AA\u01AA\u01C2\362\362\362\362\362\362\362\226\226\226\226\u01B2"+
-    "\226\226\226\u01B2\226\u01AE\226\226\362\u01A0\u01A4\u01A4\u014C\u01B4\u01B6"+
-    "\u01B8\u01B6\u01A6\362\362\362\362\u019E\362\362\226\u01AE\226\u014C\362\u01AA"+
-    "\u01AA\u01AA\u01AA\u01AA\u01C4\u01BA\u01BA\u01BA\362\362\362\362\362\u01C6"+
-    "\u01AE\226\226\u01B2\362\226\u01B2\226\226\362\u01AE\u01B2\u01B2\226\362\u01AE"+
-    "\u01B2\362\226\u01B2\362\226\226\226\226\226\226\362\362\u01A2\u019E\u01B8"+
-    "\362\u01A2\u01B8\u01A2\u01A6\362\u01B2\362\362\u01B6\362\362\362\362\362\362"+
-    "\362\u01AA\u01AA\u01AA\u01AA\u01AA\u01C8\u01CA\074\074\u01CC\u01CE\362\362"+
-    "\u01B6\u01A2\u01AE\226\226\226\u01B2\226\u01B2\226\226\226\226\226\226\226"+
-    "\226\226\226\226\u01B2\226\226\226\226\226\u01AE\226\226\362\u01AE\u014C\u019E"+
-    "\u01A2\u01B8\u014C\u01B4\u014C\u019A\362\362\362\u01B0\u01B4\226\362\362\362"+
-    "\226\u014C\362\u01AA\u01AA\u01AA\u01AA\u01AA\362\362\362\362\u01D0\u01D0\u01D2"+
-    "\u01D4\362\u01A2\u01AE\226\226\226\u01B2\226\u01B2\226\226\226\226\226\226"+
-    "\226\226\226\226\226\u01B2\226\226\226\226\226\u01AE\226\226\362\u01A0\u01D6"+
-    "\u01A2\u01A2\u01B8\u01D8\u01B8\u01A2\u019A\362\362\362\u01B6\u01B8\362\362"+
-    "\362\u01B2\226\u014C\362\u01AA\u01AA\u01AA\u01AA\u01AA\u01AE\u01B2\362\362"+
-    "\362\362\362\362\226\226\226\226\226\226\226\226\226\226\226\226\226\u01B2"+
-    "\u01AE\u01A2\u01A4\u014C\u01B4\u01A2\u01B8\u01A2\u01A6\u01B2\362\362\362\u01B6"+
-    "\362\362\362\362\226\u014C\362\u01AA\u01AA\u01AA\u01AA\u01AA\u01C8\u01BA\u01BA"+
-    "\362\u01DA\226\226\226\362\u01A2\u01AE\226\226\226\226\226\226\226\226\u01B2"+
-    "\362\226\226\226\226\226\226\226\226\226\226\226\226\u01AE\226\226\226\226"+
-    "\u01AE\362\226\226\226\u01B2\362\u018C\362\u01B6\u01A2\u014C\u01B4\u01B4\u01A2"+
-    "\u01A2\u01A2\u01A2\362\362\362\362\362\362\362\362\362\u01A2\u01DC\362\362"+
-    "\362\362\362\u01AE\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\u01C0\226\u014C\u014C\u014C\u01B4\362"+
-    "\u01C2\226\226\226\u01DE\356\356\u0170\u01E0\u01E2\u01E2\u01E2\u01E2\u01E2"+
-    "\u013E\362\362\u01AE\u01B2\u01B2\u01AE\u01B2\u01B2\u01AE\362\362\362\226\226"+
-    "\u01AE\226\226\226\u01AE\226\u01AE\u01AE\362\226\u01AE\226\u01C0\226\u014C"+
-    "\u014C\u014C\u01B0\u01C6\362\226\226\u01B2\u01E4\356\356\u0170\362\u01E2\u01E2"+
-    "\u01E2\u01E2\u01E2\362\226\362\u01E6\u01E8\u013E\u013E\u013E\u013E\u013E\u013E"+
-    "\u013E\u01EA\u01E8\u01E8\356\u01E8\u01E8\u01E8\u01EC\u01EC\u01EC\u01EC\u01EC"+
-    "\u01BA\u01BA\u01BA\u01BA\u01BA\u012E\u012E\u012E\022\022\u01EE\226\226\226"+
-    "\226\u01AE\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\u01B2\362\u01B0\u014C\u014C\u014C\u014C\u014C\u014C\u019E\u014C\356\u01E0"+
-    "\356\226\226\u01C0\u014C\u014C\u014C\u014C\u014C\u01B0\u014C\u014C\u014C\u014C"+
-    "\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C"+
-    "\u01B4\u01E8\u01E8\u01E8\u01E8\u01F0\u01E8\u01E8\u01F2\u01E8\u013E\u013E\u01EA"+
-    "\u01E8\u01F4\u01DC\362\362\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\u01F6\u01A4\u014C\u019E\u014C\u014C\u019A"+
-    "\u01A6\u01F8\u01A4\u01C6\u01EC\u01EC\u01EC\u01EC\u01EC\u013E\u013E\u013E\226"+
-    "\226\226\u01A2\u014C\226\226\u014C\u01C6\u01FA\u01FC\u01F6\u01FA\u01EE\u01EE"+
-    "\226\u01C0\u014C\u01C6\226\226\226\226\226\226\u019E\u01A4\u01FE\u01EE\u01EE"+
-    "\u0200\u0202\u01E2\u01E2\u01E2\u01E2\u01E2\u01EE\u01A4\u01E8\u0204\u0204\u0204"+
-    "\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204\u0204"+
-    "\u0204\u0204\u0204\362\362\362\362\362\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\u0206\u01E4\362\226\226\226"+
-    "\226\u01B2\226\226\362\226\226\226\u01B2\u01B2\226\226\362\226\226\226\226"+
-    "\u01B2\226\226\362\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\u01B2\226\226\362\226\226\226\u01B2\u01B2\226\226\362\226\226\226"+
-    "\226\226\226\226\u01B2\226\226\226\226\226\226\226\226\226\226\226\226\u01B2"+
-    "\226\226\362\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\u01B2\u014A\u0170\u01F4\u013E\u013E\u013E\u0208\u020A\u020A\u020A\u020A"+
-    "\u020C\u020E\u01BA\u01BA\u01BA\u0210\362\226\226\226\226\226\226\226\226\074"+
-    "\074\074\074\074\362\362\362\226\226\226\226\226\226\226\226\226\226\u01B2"+
-    "\362\362\362\362\362\u0212\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\u0206\u0214\226\226\226\226\226\226\226"+
-    "\226\u0216\226\226\226\226\226\226\226\226\226\226\226\226\u0218\u021A\362"+
-    "\226\226\226\226\226\u0206\u013E\u021C\u021E\362\362\362\362\362\362\362\226"+
-    "\226\226\226\226\226\u01B2\226\226\u014C\u018C\362\362\362\362\362\226\226"+
-    "\226\226\226\226\226\226\226\u014C\u01E0\u01DC\362\362\362\362\226\226\226"+
-    "\226\226\226\226\226\226\u014C\362\362\362\362\362\362\226\226\226\226\226"+
-    "\226\u01B2\226\u01B2\u014C\362\362\362\362\362\362\226\226\226\226\226\226"+
-    "\226\226\226\226\u0220\u01A4\u014C\u014C\u014C\u01A2\u01A2\u01A2\u01A2\u019E"+
-    "\u01A6\356\356\356\356\356\u013E\u01AC\u013E\u0222\u01A8\362\u01EC\u01EC\u01EC"+
-    "\u01EC\u01EC\362\362\362\u0224\u0224\u0224\u0224\u0224\362\362\362\020\020"+
-    "\020\u0226\020\u0228\356\u022A\u01E2\u01E2\u01E2\u01E2\u01E2\362\362\362\226"+
-    "\u022C\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\362\362\362\362\226\226\226\226\u01C0"+
-    "\u01B2\362\362\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\362\362\362\362\362\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\u01B2\362\u014C\u019E\u01A2\u01A4\u019E\u01A2\362\362\u01A2"+
-    "\u019E\u01A2\u01A2\u01A6\356\362\362\u01CE\362\020\u01AA\u01AA\u01AA\u01AA"+
-    "\u01AA\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\362\226"+
-    "\226\u01B2\362\362\362\362\362\226\226\226\226\226\226\362\362\u01A2\u01A2"+
-    "\u01A2\u01A2\u01A2\u01A2\u01A2\u01A2\u022E\226\226\226\u01A2\362\362\362\u01E2"+
-    "\u01E2\u01E2\u01E2\u01E2\u0230\362\074\074\074\074\074\074\074\074\074\074"+
-    "\074\074\074\074\074\074\074\226\226\226\226\226\226\226\226\226\226\226\u01C0"+
-    "\u019E\u01A2\362\u013E\226\226\226\226\226\226\226\226\226\226\u01F6\u019E"+
-    "\u014C\u014C\u014C\u01B4\u01F8\u019E\u01A4\u014C\u014C\u014C\u019E\u01A2\u01A2"+
-    "\u01A4\u019A\356\356\356\u018C\u014A\u01EC\u01EC\u01EC\u01EC\u01EC\362\362"+
-    "\362\u01E2\u01E2\u01E2\u01E2\u01E2\362\362\362\u013E\u013E\u013E\u01AC\u013E"+
-    "\u013E\u013E\362\362\362\362\362\362\362\362\362\u014C\u014C\u022E\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\u01F8\u014C\u014C\u019E\u019E\u01A2\u01A2\u019E\u01FC\226\226\226"+
-    "\362\362\u01E2\u01E2\u01E2\u01E2\u01E2\u013E\u013E\u013E\u01EA\u01E8\u01E8"+
-    "\u01E8\u01E8\u012E\356\356\356\356\u01E8\u01E8\u01E8\u01E8\u01F2\362\u014C"+
-    "\u022E\226\226\226\226\226\226\226\226\226\226\226\226\226\226\u01F6\u014C"+
-    "\u014C\u01A2\u014C\u0232\362\226\u01E2\u01E2\u01E2\u01E2\u01E2\362\362\362"+
-    "\226\226\226\u01F8\u014C\u01A2\u01A4\u01A4\u014C\u01EE\362\362\362\362\u013E"+
-    "\u013E\226\226\u01A2\u01A2\u01A2\u01A2\u014C\u014C\u014C\u014C\u01A2\356\362"+
-    "\u0146\u013E\u013E\u01EC\u01EC\u01EC\u01EC\u01EC\362\u01AE\226\u01E2\u01E2"+
-    "\u01E2\u01E2\u01E2\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\342\342\342\u013E\362\362\362\362\362\362\362\362\356\u01E0\356\356\356"+
-    "\356\356\356\u0234\356\356\356\u01A0\226\u01A8\226\226\u01B8\362\362\362\362"+
-    "\362\362\212\212\212\212\212\212\212\212\212\212\212\212\212\212\212\212\212"+
-    "\212\212\212\212\212\334\334\334\334\334\334\334\334\334\334\334\334\334\334"+
-    "\334\334\334\334\334\334\334\334\334\334\334\334\334\212\212\212\212\212\212"+
-    "\212\212\212\212\212\u0236\212\304\212\212\212\212\212\212\212\212\212\212"+
-    "\212\212\212\212\u0238\334\334\356\356\356\u018C\362\362\362\362\362\362\362"+
-    "\362\362\362\356\356\142\142\142\142\142\142\142\142\142\142\142\264\264\u023A"+
-    "\212\u023C\u023E\u023E\u023E\u023E\u0240\u0240\u0240\u0240\u023E\u023E\u023E"+
-    "\362\u0240\u0240\u0240\362\u023E\u023E\u023E\u023E\u0240\u0240\u0240\u0240"+
-    "\u023E\u023E\u023E\u023E\u0240\u0240\u0240\u0240\u023E\u023E\u023E\362\u0240"+
-    "\u0240\u0240\362\u0242\u0242\u0242\u0242\u0244\u0244\u0244\u0244\u023E\u023E"+
-    "\u023E\u023E\u0240\u0240\u0240\u0240\u0246\u0248\u0248\u024A\u024C\u024E\u0250"+
-    "\362\264\264\264\264\u0252\u0252\u0252\u0252\264\264\264\264\u0252\u0252\u0252"+
-    "\u0252\264\264\264\264\u0252\u0252\u0252\u0252\u023E\264\u0254\264\u0240\u0256"+
-    "\u0258\u025A\344\264\u0254\264\u025C\u025C\u0258\344\u023E\264\362\264\u0240"+
-    "\u025E\u0260\344\u023E\264\u0262\264\u0240\u0264\u0266\344\362\264\u0254\264"+
-    "\u0268\u026A\u0258\u026C\u026E\u026E\u026E\u0270\u026E\u0272\u0274\u0276\u0278"+
-    "\u0278\u0278\020\u027A\u027C\u027A\u027C\020\020\020\020\u027E\u0280\u0280"+
-    "\u0282\u0284\u0284\u0286\020\u0288\u028A\020\u028C\u028E\020\u0290\u0292\020"+
-    "\020\020\020\020\u0294\u028E\020\020\020\020\u0296\u0274\u0274\u0298\362\362"+
-    "\u0274\u0274\u0274\u029A\362\110\110\110\u029C\u029E\u02A0\u02A2\u02A2\u02A2"+
-    "\u02A2\u02A2\u029C\u029E\u021A\334\334\u02A4\342\342\342\u01E4\362\072\072"+
-    "\072\072\072\072\072\072\072\072\072\072\072\362\362\362\362\362\362\362\362"+
-    "\362\362\362\356\356\356\356\356\356\u02A6\u0130\u02A8\u0130\u02A8\356\356"+
-    "\356\356\356\u018C\362\362\362\362\362\362\362\074\u02AA\074\u02AC\074\u02AE"+
-    "\u0116\212\u0116\u02B0\u02AC\074\u02B2\u0116\u0116\074\074\074\u02AA\u02B4"+
-    "\u02AA\u0204\u0116\u02B6\u0116\u02B8\222\226\332\074\212\u0116\036\u015E\u02B2"+
-    "\212\212\u02BA\074\u02BC\122\122\122\122\122\122\122\122\u02BE\u02BE\u02BE"+
-    "\u02BE\u02BE\u02BE\u02C0\u02C0\u02C2\u02C2\u02C2\u02C2\u02C2\u02C2\u02C4\u02C4"+
-    "\u02C6\u02C8\u02CA\u02C6\u02CC\362\362\362\u015E\u015E\u02CE\074\074\u015E"+
-    "\074\074\u02CE\u02BA\074\u02CE\074\074\074\u02CE\074\074\074\074\074\074\074"+
-    "\074\074\074\074\074\074\074\074\u015E\074\u02CE\u02CE\074\074\074\074\074"+
-    "\074\074\074\074\074\074\074\074\074\074\u015E\u015E\u015E\u015E\u015E\u015E"+
-    "\u02D0\u02D2\036\u015E\u02D2\u02D2\u02D2\u015E\u02D0\u02D4\u02D0\036\u015E"+
-    "\u02D2\u02D2\u02D0\u02D2\036\036\036\u015E\u02D0\u02D2\u02D2\u02D2\u02D2\u015E"+
-    "\u015E\u02D0\u02D0\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\036\u015E"+
-    "\u015E\u02D2\u02D2\u015E\u015E\u015E\u015E\u02D0\036\036\u02D2\u02D2\u02D2"+
-    "\u02D2\u015E\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2"+
-    "\u02D2\u02D2\u02D2\u02D2\036\u02D0\u02D2\036\u015E\u015E\036\u015E\u015E\u015E"+
-    "\u015E\u02D2\u015E\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\036"+
-    "\u015E\u015E\u02D2\u015E\u015E\u015E\u015E\u02D0\u02D2\u02D2\u015E\u02D2\u015E"+
-    "\u015E\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2"+
-    "\u015E\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\074\074\074\074\u02D2"+
-    "\u02D2\074\074\074\074\074\074\074\074\074\074\u02D2\074\074\074\u02D6\u02D8"+
-    "\074\074\074\074\074\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u02DA"+
-    "\u02CE\074\074\074\074\074\074\074\074\074\074\074\u02DC\074\074\u02BA\u015E"+
-    "\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\074\074"+
-    "\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\u015E"+
-    "\u015E\u015E\074\074\074\074\074\074\074\074\074\362\362\362\362\362\362\074"+
-    "\074\074\u01CE\362\362\362\362\362\362\362\362\362\362\362\362\074\074\074"+
-    "\074\074\u01CE\362\362\362\362\362\362\362\362\362\362\u02DE\u02DE\u02DE\u02DE"+
-    "\u02DE\u02DE\u02DE\u02DE\u02DE\u02DE\u02E0\u02E0\u02E0\u02E0\u02E0\u02E0\u02E0"+
-    "\u02E0\u02E0\u02E0\u02E2\u02E2\u02E2\u02E2\u02E2\u02E2\u02E2\u02E2\u02E2\u02E2"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4\u02E4"+
-    "\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6\u02E6"+
-    "\u02E8\u02EA\u02EA\u02EA\u02EA\u02EC\u02EE\u02EE\u02EE\u02EE\u02F0\074\074"+
-    "\074\074\074\074\074\074\074\074\074\u02BA\074\074\074\074\u02BA\074\074\074"+
-    "\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074\074"+
-    "\074\074\074\074\074\u015E\u015E\u015E\u015E\074\074\074\074\074\074\074\u02BA"+
-    "\074\074\074\074\074\074\074\074\074\074\074\074\074\074\u02DA\074\074\074"+
-    "\074\074\074\074\074\074\u02F2\074\074\074\074\074\074\074\074\074\074\074"+
-    "\074\074\074\074\074\074\074\074\022\022\022\022\022\022\022\u02F4\u02F4\u02F4"+
-    "\u02F4\u02F4\u02DE\u02DE\u02DE\u02DE\u02DE\u02F6\u02F6\u02F6\u02F6\u02F6\074"+
-    "\074\074\074\074\074\036\u02D0\u02F8\u02FA\u02D2\u02FC\u02FE\u015E\u015E\u02D0"+
-    "\u02D2\036\u015E\u015E\u02D2\036\u015E\u02D2\u02D2\022\022\022\022\022\u015E"+
-    "\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E"+
-    "\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u029E\u0300"+
-    "\u0300\u0300\u0300\u0300\u0300\u0300\u0300\u0300\u0300\u02FA\u02D0\u02D2\u02D2"+
-    "\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u015E\u015E\u015E\u015E\036"+
-    "\u015E\u015E\u015E\u02D2\u02D2\u02D2\u015E\u02D0\u015E\u015E\u02D2\u02D2\036"+
-    "\u02D2\u015E\022\022\036\u015E\u02D0\u02D0\u02D2\u015E\u02D2\u015E\u015E\u015E"+
-    "\u015E\u015E\u02D2\u02D2\u02D2\u015E\022\u015E\u015E\u015E\u015E\u015E\u015E"+
-    "\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\036\u02D2\u02D2\u015E"+
-    "\036\036\u02D0\u02D0\u02D2\036\u015E\u015E\u02D2\u015E\u015E\u015E\u02D2\036"+
-    "\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u02D0\036"+
-    "\u015E\u015E\u015E\u015E\u015E\u02D2\u015E\u015E\u02D2\u02D2\u02D0\036\u02D0"+
-    "\036\u015E\u02D0\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2"+
-    "\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u015E\u02D2"+
-    "\u02D2\u02D2\u02D2\u02D0\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2"+
-    "\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\u02D2\036\u015E\u015E"+
-    "\036\036\u015E\u02D2\u02D2\036\u015E\u015E\u02D2\036\u015E\u02D0\u015E\u02D0"+
-    "\u02D2\u02D2\u02D0\u015E\074\074\074\074\074\074\074\074\u015E\u015E\u015E"+
-    "\u015E\u015E\u015E\u015E\u015E\u015E\u015E\u02CE\u02BA\u015E\u015E\u02FC\362"+
-    "\074\074\074\074\074\362\362\362\u0138\u0138\u0138\u0138\u0138\u0138\u0138"+
-    "\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138\u0138"+
-    "\u0138\u0138\u0138\u013A\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142"+
-    "\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142\u0142"+
-    "\u0142\u0302\142\u0204\254\256\150\150\u0304\u0204\u023C\142\146\166\212\212"+
-    "\u0238\u0204\142\142\u0306\074\074\u0308\150\u030A\356\362\362\362\u030C\020"+
-    "\u030E\020\264\264\264\264\264\264\264\264\264\264\264\264\264\264\264\264"+
-    "\264\264\264\362\362\362\362\362\226\226\226\226\226\226\226\226\226\226\226"+
-    "\362\362\362\362\u013C\u01DC\362\362\362\362\362\362\u014A\226\226\226\226"+
-    "\226\226\226\226\226\226\226\u01B2\362\362\362\362\226\226\226\u01B2\226\226"+
-    "\226\u01B2\226\226\226\u01B2\226\226\226\u01B2\u014C\u014C\u014C\u014C\u014C"+
-    "\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\u014C\020\u0310"+
-    "\u0310\020\u0288\u028A\u0310\020\020\020\020\u0312\020\u0226\u0310\020\u0310"+
-    "\022\022\022\022\020\020\u0314\020\362\362\362\362\362\362\362\074\074\074"+
-    "\074\074\074\074\074\074\074\074\074\074\u02F2\074\074\074\074\074\074\074"+
-    "\074\074\074\074\074\362\362\362\362\362\362\074\074\074\074\074\074\074\074"+
-    "\074\074\074\362\362\362\362\362\362\362\362\362\362\362\362\362\074\074\074"+
-    "\074\074\074\362\362\012\020\u0316\u0318\022\022\022\022\022\074\022\022\022"+
-    "\022\u031A\u031C\u031E\u0320\u0320\u0320\u0320\356\356\356\u0322\342\342\074"+
-    "\u0324\u0326\u0328\074\226\226\226\226\226\226\226\226\226\226\226\u01B2\u014A"+
-    "\u032A\u032C\u032E\226\226\226\226\226\226\226\226\226\226\226\226\226\u0328"+
-    "\342\u032E\362\362\u01AE\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\362\u01AE\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\u01B2\u01E8\u0330\u0330\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\u01B2\362\362\074\074"+
-    "\362\362\362\362\362\362\226\226\226\226\226\226\226\226\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u02DA\u01CE"+
-    "\u0332\u0332\u0332\u0332\u0332\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u0334\u0336"+
-    "\u0336\u0336\u0336\u0336\122\122\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\074\u02DC\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u0338\122\122\122\122\122\122\122\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\074\074\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01F2\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u02DA\074\u02DC\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\074\u01E8\u01E8\u01E8\u01E8"+
-    "\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u01E8\u02DA\u033A"+
-    "\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\362\362\362\362\362\u033A\u033A\u033A\u033A\u033A\u033A\362\362\362\362\362"+
-    "\362\362\362\362\362\226\226\226\226\226\226\226\226\226\226\u022C\226\226"+
-    "\226\226\226\226\226\226\226\226\226\u01B2\362\074\074\074\074\074\074\074"+
-    "\074\074\074\074\u01CE\362\362\362\362\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\u033C\020\226\226\226\226\226\226\226\226\u01EC\u01EC"+
-    "\u01EC\u01EC\u01EC\226\362\362\362\362\362\362\362\362\362\362\142\142\142"+
-    "\142\142\142\142\u01A8\u0130\u033E\362\362\362\362\356\u0314\142\142\142\142"+
-    "\142\142\142\142\142\142\142\142\362\362\362\362\226\226\226\u0340\u0340\u0340"+
-    "\u0340\u0342\356\u013E\u013E\u013E\362\362\362\362\344\344\344\344\344\344"+
-    "\344\344\344\344\344\u0344\346\346\346\346\344\142\142\142\142\142\142\142"+
-    "\212\142\142\142\142\142\142\142\142\142\142\142\142\142\142\142\u0346\212"+
-    "\212\212\146\150\u0304\142\142\142\142\142\u0348\u034A\u0304\u034C\142\362"+
-    "\362\362\362\362\362\362\142\142\142\142\142\362\362\362\362\362\362\362\362"+
-    "\362\362\362\362\362\362\362\362\362\362\362\362\362\362\362\362\222\226\226"+
-    "\226\u01A0\226\u01A0\226\u01A8\226\226\226\226\226\226\226\226\226\226\226"+
-    "\u01F6\u01A4\u019E\074\074\362\362\u01BA\u01BA\u01BA\u01E8\u034E\362\362\362"+
-    "\226\226\226\226\226\226\226\226\226\226\020\020\362\362\362\362\u01A2\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\u01A2\u01A2\u01A2\u01A2\u01A2\u01A2\u01A2\u01A2\u018C"+
-    "\362\362\362\362\u013E\u01E2\u01E2\u01E2\u01E2\u01E2\362\362\362\356\356\356"+
-    "\356\356\356\356\356\356\226\226\226\u013E\u0214\362\362\u01EC\u01EC\u01EC"+
-    "\u01EC\u01EC\226\226\226\226\226\226\226\226\226\226\226\226\226\226\u014C"+
-    "\u014C\u019A\356\u013E\226\226\226\226\226\226\226\226\226\226\226\u01C0\u014C"+
-    "\u014C\u014C\u014C\u014C\u01FA\362\362\362\362\362\u0146\226\226\226\226\226"+
-    "\226\226\226\226\u01A8\u01A2\u014C\u014C\u01A2\u019E\u01A2\u0350\u013E\u013E"+
-    "\u013E\u013E\u013E\u013E\u013C\u01E2\u01E2\u01E2\u01E2\u01E2\362\362\u013E"+
-    "\226\226\226\226\u01C0\u014C\u014C\u019E\u01A4\u019E\u01A4\u01B4\362\362\362"+
-    "\362\226\u01C0\226\226\226\226\u019E\362\u01E2\u01E2\u01E2\u01E2\u01E2\362"+
-    "\u013E\u013E\226\226\226\226\226\226\226\226\u032E\226\226\u01E6\u01E8\u0202"+
-    "\362\362\226\226\226\226\226\226\226\226\u01C6\u014C\u01C6\u01C0\u01C6\226"+
-    "\226\u019A\u01A8\u01B2\362\362\362\362\362\362\362\362\362\362\362\u01AE\u022C"+
-    "\u013E\u01AE\226\226\u01B2\u01AE\226\226\u01B2\u01AE\226\226\u01B2\362\362"+
-    "\362\362\226\226\226\u01B2\226\226\226\u01B2\362\362\362\362\362\362\362\362"+
-    "\226\u01F6\u01A4\u01A2\u019E\u0352\u0200\362\u01E2\u01E2\u01E2\u01E2\u01E2"+
-    "\362\362\362\226\226\362\362\362\362\362\362\226\226\226\226\226\226\226\226"+
-    "\226\226\226\u01B2\362\u01AE\226\226\226\226\226\226\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\362\362\u0354\u0354\u0354"+
-    "\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354\u0354"+
-    "\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356\u0356"+
-    "\u0356\u0356\u0356\u033A\u033A\u033A\u033A\u033A\u0358\u033A\u033A\u033A\u035A"+
-    "\u033A\u033A\u035C\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u033A\u033A\u035E\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u033A\u033A\u033A\u033A\u0360\u0362\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u0364\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\362\u033A\u033A\u033A"+
-    "\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A\u033A"+
-    "\u033A\u033A\u033A\u033A\u033A\362\362\362\264\264\264\u0254\362\362\362\362"+
-    "\362\u0366\264\264\362\362\u0368\u036A\u0154\u0154\u0154\u0154\u036C\u0154"+
-    "\u0154\u0154\u0154\u0154\u0154\u0156\u0154\u0154\u0156\u0156\u0154\u0368\u0156"+
-    "\u0154\u0154\u0154\u0154\u0154\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u036E\u036E\u036E\u036E"+
-    "\u036E\u036E\u036E\u036E\362\362\362\362\362\362\362\362\u018E\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u0370\362\362\362\362\362\362\362\362"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\362\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\362\362\362\362\362\362\362\362\362\362\362\362\362\362\362\362"+
-    "\362\362\362\362\u016A\u016A\u016A\u016A\u016A\u016A\u0372\362\356\356\356"+
-    "\356\356\356\356\356\020\020\020\u0374\u0376\362\362\362\356\356\356\u018C"+
-    "\362\362\362\362\u0312\u0378\u037A\u037C\u037C\u037C\u037C\u037C\u037C\u037C"+
-    "\u0376\u0374\u0376\020\u028C\u037E\034\u0380\u0382\020\u0384\u0300\u0300\u0386"+
-    "\020\u0388\u02D2\u02FC\u038A\u0286\362\362\u016A\u016A\u038C\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A\u016A"+
-    "\u016A\u016A\u016A\u038C\u038E\u030C\014\016\020\022\024\026\030\032\032\032"+
-    "\032\032\034\036\040\054\056\056\056\056\056\056\056\056\056\056\056\056\060"+
-    "\062\u029E\u0292\022\020\226\226\226\226\226\u032E\226\226\226\226\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\226\342\226\226"+
-    "\226\226\226\226\226\226\226\226\226\226\226\226\226\u01B2\362\226\226\226"+
-    "\362\226\226\226\362\226\226\226\362\226\u01B2\362\072\u0390\u01CC\u0392\u02BA"+
-    "\u015E\u02CE\u01CE\362\362\362\362\u0394\u0396\074\362").toCharArray();
-
-  // The A table has 920 entries for a total of 3680 bytes.
-
-  static final int A[] = new int[920];
-  static final String A_DATA =
-    "\u4800\u100F\u4800\u100F\u4800\u100F\u5800\u400F\u5000\u400F\u5800\u400F\u6000"+
-    "\u400F\u5000\u400F\u5000\u400F\u5000\u400F\u6000\u400C\u6800\030\u6800\030"+
-    "\u2800\030\u2800\u601A\u2800\030\u6800\030\u6800\030\uE800\025\uE800\026\u6800"+
-    "\030\u2000\031\u3800\030\u2000\024\u3800\030\u3800\030\u1800\u3609\u1800\u3609"+
-    "\u3800\030\u6800\030\uE800\031\u6800\031\uE800\031\u6800\030\u6800\030\202"+
-    "\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\uE800\025\u6800\030\uE800\026\u6800\033"+
-    "\u6800\u5017\u6800\033\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\uE800\025\u6800"+
-    "\031\uE800\026\u6800\031\u4800\u100F\u4800\u100F\u5000\u100F\u3800\014\u6800"+
-    "\030\u2800\u601A\u2800\u601A\u6800\034\u6800\034\u6800\033\u6800\034\000\u7002"+
-    "\uE800\035\u6800\031\u4800\u1010\u6800\034\u6800\033\u2800\034\u2800\031\u1800"+
-    "\u060B\u1800\u060B\u6800\033\u07FD\u7002\u6800\034\u6800\030\u6800\033\u1800"+
-    "\u050B\000\u7002\uE800\036\u6800\u080B\u6800\u080B\u6800\u080B\u6800\030\202"+
-    "\u7001\202\u7001\202\u7001\u6800\031\202\u7001\u07FD\u7002\201\u7002\201\u7002"+
-    "\201\u7002\u6800\031\201\u7002\u061D\u7002\006\u7001\005\u7002\u07FF\uF001"+
-    "\u03A1\u7002\000\u7002\006\u7001\005\u7002\006\u7001\005\u7002\u07FD\u7002"+
-    "\u061E\u7001\006\u7001\u04F5\u7002\u034A\u7001\u033A\u7001\006\u7001\005\u7002"+
-    "\u0336\u7001\u0336\u7001\006\u7001\005\u7002\000\u7002\u013E\u7001\u032A\u7001"+
-    "\u032E\u7001\006\u7001\u033E\u7001\u067D\u7002\u034E\u7001\u0346\u7001\u0575"+
-    "\u7002\000\u7002\u034E\u7001\u0356\u7001\u05F9\u7002\u035A\u7001\u036A\u7001"+
-    "\006\u7001\005\u7002\u036A\u7001\000\u7002\000\u7002\005\u7002\u0366\u7001"+
-    "\u0366\u7001\006\u7001\005\u7002\u036E\u7001\000\u7002\000\u7005\000\u7002"+
-    "\u0721\u7002\000\u7005\000\u7005\012\uF001\007\uF003\011\uF002\012\uF001\007"+
-    "\uF003\011\uF002\011\uF002\006\u7001\005\u7002\u013D\u7002\u07FD\u7002\012"+
-    "\uF001\u067E\u7001\u0722\u7001\u05FA\u7001\000\u7002\u07FE\u7001\006\u7001"+
-    "\005\u7002\u0576\u7001\u07FE\u7001\u07FD\u7002\u07FD\u7002\006\u7001\005\u7002"+
-    "\u04F6\u7001\u0116\u7001\u011E\u7001\u07FD\u7002\u07FD\u7002\u07FD\u7002\u0349"+
-    "\u7002\u0339\u7002\000\u7002\u0335\u7002\u0335\u7002\000\u7002\u0329\u7002"+
-    "\000\u7002\u032D\u7002\u0335\u7002\000\u7002\000\u7002\u033D\u7002\000\u7002"+
-    "\u07FD\u7002\u0345\u7002\u034D\u7002\000\u7002\u034D\u7002\u0355\u7002\000"+
-    "\u7002\000\u7002\u0359\u7002\u0369\u7002\000\u7002\000\u7002\u0369\u7002\u0369"+
-    "\u7002\u0115\u7002\u0365\u7002\u0365\u7002\u011D\u7002\000\u7002\u036D\u7002"+
-    "\000\u7002\000\u7005\000\u7002\000\u7004\000\u7004\000\u7004\u6800\u7004\u6800"+
-    "\u7004\000\u7004\000\u7004\000\u7004\u6800\033\u6800\033\u6800\u7004\u6800"+
-    "\u7004\000\u7004\u6800\033\u6800\u7004\u6800\033\000\u7004\u6800\033\u4000"+
-    "\u3006\u4000\u3006\u4000\u3006\u46B1\u3006\u7800\000\u7800\000\000\u7004\u05F9"+
-    "\u7002\u05F9\u7002\u05F9\u7002\u6800\030\u7800\000\232\u7001\u6800\030\226"+
-    "\u7001\226\u7001\226\u7001\u7800\000\u0102\u7001\u7800\000\376\u7001\376\u7001"+
-    "\u07FD\u7002\202\u7001\u7800\000\202\u7001\231\u7002\225\u7002\225\u7002\225"+
-    "\u7002\u07FD\u7002\201\u7002\175\u7002\201\u7002\u0101\u7002\375\u7002\375"+
-    "\u7002\042\u7001\371\u7002\345\u7002\000\u7001\000\u7001\000\u7001\275\u7002"+
-    "\331\u7002\041\u7002\u0159\u7002\u0141\u7002\u07E5\u7002\000\u7002\u0712\u7001"+
-    "\u0181\u7002\u6800\031\006\u7001\005\u7002\u07E6\u7001\000\u7002\u05FA\u7001"+
-    "\u05FA\u7001\u05FA\u7001\u0142\u7001\u0142\u7001\u0141\u7002\u0141\u7002\000"+
-    "\034\u4000\u3006\u4000\007\u4000\007\076\u7001\006\u7001\005\u7002\075\u7002"+
-    "\u7800\000\302\u7001\302\u7001\302\u7001\302\u7001\u7800\000\u7800\000\000"+
-    "\u7004\000\030\000\030\u7800\000\301\u7002\301\u7002\301\u7002\301\u7002\u07FD"+
-    "\u7002\u7800\000\000\030\u6800\024\u7800\000\u7800\000\u4000\u3006\u4000\u3006"+
-    "\u4000\u3006\u0800\024\u4000\u3006\u0800\030\u4000\u3006\u4000\u3006\u0800"+
-    "\030\u0800\u7005\u0800\u7005\u0800\u7005\u7800\000\u0800\u7005\u0800\030\u0800"+
-    "\030\u7800\000\u3000\u1010\u3000\u1010\u6800\031\u6800\031\u1000\031\u2800"+
-    "\030\u2800\030\u1000\u601A\u3800\030\u1000\030\u4000\u3006\u1000\030\u1000"+
-    "\030\u1000\030\u1000\u7005\u1000\u7005\u1000\u7004\u1000\u7005\u1000\u7005"+
-    "\u4000\u3006\u4000\u3006\u4000\u3006\u3000\u3409\u3000\u3409\u2800\030\u3000"+
-    "\030\u3000\030\u1000\030\u4000\u3006\u1000\u7005\u1000\030\u1000\u7005\u4000"+
-    "\u3006\u3000\u1010\u6800\034\u4000\u3006\u4000\u3006\u1000\u7004\u1000\u7004"+
-    "\u4000\u3006\u4000\u3006\u6800\034\u1000\u7005\u1000\034\u1000\034\u1000\u7005"+
-    "\u7800\000\u1000\u1010\u4000\u3006\u7800\000\u7800\000\u1000\u7005\u0800\u3409"+
-    "\u0800\u3409\u0800\u7005\u4000\u3006\u0800\u7004\u0800\u7004\u0800\u7004\u7800"+
-    "\000\u0800\u7004\u4000\u3006\u4000\u3006\u4000\u3006\u0800\030\u0800\030\u4000"+
-    "\u3006\000\u3008\u4000\u3006\000\u7005\000\u3008\000\u3008\000\u3008\u4000"+
-    "\u3006\000\u3008\u4000\u3006\000\u7005\u4000\u3006\000\u3749\000\u3749\000"+
-    "\030\000\u7004\u7800\000\000\u7005\u7800\000\u4000\u3006\000\u7005\u7800\000"+
-    "\u4000\u3006\u7800\000\u7800\000\000\u3008\000\u3008\u7800\000\000\u080B\000"+
-    "\u080B\000\u080B\000\u06EB\000\034\u2800\u601A\000\u7005\u4000\u3006\u7800"+
-    "\000\u2800\u601A\000\034\000\u7005\u4000\u3006\000\u7005\000\u074B\000\u080B"+
-    "\000\u080B\u6800\034\u6800\034\u2800\u601A\u6800\034\u7800\000\u6800\u050B"+
-    "\u6800\u050B\u6800\u04AB\u6800\u04AB\u6800\u04AB\000\034\000\u3008\000\u3006"+
-    "\000\u3006\000\u3008\u7800\000\000\034\000\030\u7800\000\000\u7004\u4000\u3006"+
-    "\u4000\u3006\000\030\000\u3609\000\u3609\000\u7004\u7800\000\000\u7005\000"+
-    "\034\000\034\000\034\000\030\000\034\000\u3409\000\u3409\000\u3008\000\u3008"+
-    "\u4000\u3006\000\034\000\034\u7800\000\000\034\000\030\000\u7005\000\u3008"+
-    "\u4000\u3006\000\u3008\000\u3008\000\u3008\000\u3008\000\u7005\u4000\u3006"+
-    "\000\u3008\000\u3008\u4000\u3006\000\u7005\000\u3008\u07FE\u7001\u07FE\u7001"+
-    "\000\u7005\000\030\000\030\000\u070B\000\u070B\000\u070B\000\u070B\000\u042B"+
-    "\000\u054B\000\u080B\000\u080B\u7800\000\u6800\024\000\u7005\000\030\000\u7005"+
-    "\u6000\u400C\000\u7005\000\u7005\uE800\025\uE800\026\u7800\000\000\u746A\000"+
-    "\u746A\000\u746A\u7800\000\000\u1010\000\u1010\000\030\u2800\u601A\u6800\u060B"+
-    "\u6800\u060B\u6800\024\u6800\030\u6800\030\u4000\u3006\u6000\u400C\u7800\000"+
-    "\000\u7005\000\u7004\000\u3008\000\u7005\000\u04EB\u7800\000\000\u3008\u7800"+
-    "\000\u4000\u3006\000\u3008\000\u7004\u07FD\u7002\000\u7002\000\u7004\u07FD"+
-    "\u7002\355\u7002\u07FE\u7001\000\u7002\u07E1\u7002\u07E1\u7002\u07E2\u7001"+
-    "\u07E2\u7001\u07FD\u7002\u07E1\u7002\u7800\000\u07E2\u7001\u06D9\u7002\u06D9"+
-    "\u7002\u06A9\u7002\u06A9\u7002\u0671\u7002\u0671\u7002\u0601\u7002\u0601\u7002"+
-    "\u0641\u7002\u0641\u7002\u0609\u7002\u0609\u7002\u07FF\uF003\u07FF\uF003\u07FD"+
-    "\u7002\u7800\000\u06DA\u7001\u06DA\u7001\u07FF\uF003\u6800\033\u07FD\u7002"+
-    "\u6800\033\u06AA\u7001\u06AA\u7001\u0672\u7001\u0672\u7001\u7800\000\u6800"+
-    "\033\u07FD\u7002\u07E5\u7002\u0642\u7001\u0642\u7001\u07E6\u7001\u6800\033"+
-    "\u0602\u7001\u0602\u7001\u060A\u7001\u060A\u7001\u6800\033\u7800\000\u6000"+
-    "\u400C\u6000\u400C\u6000\u400C\u6000\014\u6000\u400C\u4800\u1010\u4800\u1010"+
-    "\u4800\u1010\000\u1010\u0800\u1010\u6800\024\u6800\024\u6800\035\u6800\036"+
-    "\u6800\025\u6800\035\u6000\u400D\u5000\u400E\u7800\u1010\u7800\u1010\u7800"+
-    "\u1010\u3800\014\u2800\030\u2800\030\u2800\030\u6800\030\u6800\030\uE800\035"+
-    "\uE800\036\u6800\030\u6800\030\u6800\u5017\u6800\u5017\u6800\030\u3800\031"+
-    "\uE800\025\uE800\026\u6800\030\u6800\031\u6800\030\u6800\030\u6000\u400C\u4800"+
-    "\u1010\u7800\000\u1800\u060B\000\u7004\u2000\031\u2000\031\u6800\031\uE800"+
-    "\025\uE800\026\000\u7004\u1800\u040B\u1800\u040B\000\u7004\000\u7004\u4000"+
-    "\u3006\u4000\007\u4000\007\u4000\u3006\000\u7001\u6800\034\u6800\034\000\u7001"+
-    "\000\u7002\000\u7001\000\u7001\000\u7002\u6800\031\000\u7001\u07FE\u7001\u6800"+
-    "\034\u2800\034\000\u7002\162\u7001\000\u7001\u6800\034\u6800\031\161\u7002"+
-    "\000\034\102\u742A\102\u742A\102\u780A\102\u780A\101\u762A\101\u762A\101\u780A"+
-    "\101\u780A\000\u780A\000\u780A\000\u780A\006\u7001\005\u7002\000\u742A\000"+
-    "\u780A\u6800\u06EB\u6800\031\u6800\034\u6800\031\uE800\031\uE800\031\uE800"+
-    "\031\u2000\031\u2800\031\u6800\034\uE800\025\uE800\026\u6800\034\000\034\u6800"+
-    "\034\u6800\034\000\034\u6800\u042B\u6800\u042B\u6800\u05AB\u6800\u05AB\u1800"+
-    "\u072B\u1800\u072B\152\034\152\034\151\034\151\034\u6800\u06CB\u6800\u040B"+
-    "\u6800\u040B\u6800\u040B\u6800\u040B\u6800\u058B\u6800\u058B\u6800\u058B\u6800"+
-    "\u058B\u6800\u042B\u7800\000\u6800\034\u6800\u056B\u6800\u056B\u6800\u06EB"+
-    "\u6800\u06EB\uE800\031\uE800\025\uE800\026\u6800\031\u6800\031\u7800\000\uE800"+
-    "\031\u7800\000\uE800\026\uE800\025\301\u7002\u7800\000\005\u7002\u07FE\u7001"+
-    "\000\u7002\u6800\034\u6800\034\006\u7001\005\u7002\u4000\u3006\u7800\000\u6800"+
-    "\030\u6800\030\u6800\u080B\uE800\035\uE800\036\u6800\030\u6800\024\u6800\030"+
-    "\u6800\u7004\u6800\034\000\u7004\000\u7005\000\u772A\u6800\024\u6800\025\u6800"+
-    "\026\u6800\026\u6800\034\000\u740A\000\u740A\000\u740A\u6800\024\000\u7004"+
-    "\000\u764A\000\u776A\000\u748A\000\u7004\000\u7005\u6800\030\u4000\u3006\u6800"+
-    "\033\u6800\033\000\u7004\000\u7004\000\u7005\000\u05EB\000\u05EB\000\u042B"+
-    "\000\u042B\u6800\034\u6800\u048B\u6800\u048B\u6800\u048B\000\034\u6800\u080B"+
-    "\000\u7005\000\u7005\000\u7004\u6800\030\u4000\007\u6800\030\000\u776A\000"+
-    "\u776A\000\u776A\000\u762A\u6800\033\u6800\u7004\000\u7004\000\u7002\u6800"+
-    "\u7004\000\033\000\033\006\u7001\000\u7002\u7800\000\u2800\u601A\u2800\034"+
-    "\000\u3008\000\030\000\u3008\000\030\000\023\000\023\000\022\000\022\000\u7005"+
-    "\000\u7705\000\u7005\000\u76E5\000\u7545\000\u7005\000\u75C5\000\u7005\000"+
-    "\u7005\000\u76A5\000\u7005\000\u7665\000\u7005\000\u75A5\u7800\000\u07FD\u7002"+
-    "\u7800\000\u0800\u7005\u4000\u3006\u0800\u7005\u0800\u7005\u2000\031\u1000"+
-    "\033\u1000\033\u6800\025\u6800\026\u1000\u601A\u6800\034\u6800\030\u6800\025"+
-    "\u6800\026\u6800\030\u6800\024\u6800\u5017\u6800\u5017\u6800\025\u6800\026"+
-    "\u6800\025\u6800\u5017\u6800\u5017\u3800\030\u7800\000\u6800\030\u3800\030"+
-    "\u6800\024\uE800\025\uE800\026\u2800\030\u2000\031\u2000\024\u6800\030\u2800"+
-    "\u601A\u1000\u7005\u7800\000\u7800\000\u4800\u1010\u6800\031\u6800\033\u2800"+
-    "\u601A\u7800\000\u7800\000\u6800\u1010\u6800\u1010\u6800\u1010";
-
-  // The B table has 920 entries for a total of 1840 bytes.
-
-  static final char B[] = (
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\001\001\001\000\000\000\000\000"+
-    "\000\000\000\000\001\000\000\000\000\000\000\000\000\005\000\000\001\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\004\004\000\004\000\004\004\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000"+
-    "\000\000\000\000\000\000\004\000\004\000\000\000\000\000\000\004\000\000\000"+
-    "\004\000\000\000\004\000\000\004\004\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\004\004\000\000\000\004\004\000\000"+
-    "\004\004\004\004\004\000\000\000\000\000\000\000\000\000\000\004\000\000\004"+
-    "\000\000\004\004\000\000\000\000\000\000\000\000\004\000\000\000\000\004\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\004\004\004\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\004\000\004\004\000\000\000\004\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\001\000\000\001"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"+
-    "\002\002\002\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\006"+
-    "\006\005\005\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\020\020\000\000\000\000"+
-    "\000\020\020\020\000\000\020\020\020\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\020\020\000\000\000\000\000\000\000\000"+
-    "\000\000\001\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000"+
-    "\000\020\020\020\020\020\020\020\020\020\020\020\020\020\020\000\000\000\000"+
-    "\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000").toCharArray();
-
-  // In all, the character property tables require 19008 bytes.
-
-    static {
-            charMap = new char[][][] {
-        { {'\u00DF'}, {'\u0053', '\u0053', } },
-        { {'\u0130'}, {'\u0130', } },
-        { {'\u0149'}, {'\u02BC', '\u004E', } },
-        { {'\u01F0'}, {'\u004A', '\u030C', } },
-        { {'\u0390'}, {'\u0399', '\u0308', '\u0301', } },
-        { {'\u03B0'}, {'\u03A5', '\u0308', '\u0301', } },
-        { {'\u0587'}, {'\u0535', '\u0552', } },
-        { {'\u1E96'}, {'\u0048', '\u0331', } },
-        { {'\u1E97'}, {'\u0054', '\u0308', } },
-        { {'\u1E98'}, {'\u0057', '\u030A', } },
-        { {'\u1E99'}, {'\u0059', '\u030A', } },
-        { {'\u1E9A'}, {'\u0041', '\u02BE', } },
-        { {'\u1F50'}, {'\u03A5', '\u0313', } },
-        { {'\u1F52'}, {'\u03A5', '\u0313', '\u0300', } },
-        { {'\u1F54'}, {'\u03A5', '\u0313', '\u0301', } },
-        { {'\u1F56'}, {'\u03A5', '\u0313', '\u0342', } },
-        { {'\u1F80'}, {'\u1F08', '\u0399', } },
-        { {'\u1F81'}, {'\u1F09', '\u0399', } },
-        { {'\u1F82'}, {'\u1F0A', '\u0399', } },
-        { {'\u1F83'}, {'\u1F0B', '\u0399', } },
-        { {'\u1F84'}, {'\u1F0C', '\u0399', } },
-        { {'\u1F85'}, {'\u1F0D', '\u0399', } },
-        { {'\u1F86'}, {'\u1F0E', '\u0399', } },
-        { {'\u1F87'}, {'\u1F0F', '\u0399', } },
-        { {'\u1F88'}, {'\u1F08', '\u0399', } },
-        { {'\u1F89'}, {'\u1F09', '\u0399', } },
-        { {'\u1F8A'}, {'\u1F0A', '\u0399', } },
-        { {'\u1F8B'}, {'\u1F0B', '\u0399', } },
-        { {'\u1F8C'}, {'\u1F0C', '\u0399', } },
-        { {'\u1F8D'}, {'\u1F0D', '\u0399', } },
-        { {'\u1F8E'}, {'\u1F0E', '\u0399', } },
-        { {'\u1F8F'}, {'\u1F0F', '\u0399', } },
-        { {'\u1F90'}, {'\u1F28', '\u0399', } },
-        { {'\u1F91'}, {'\u1F29', '\u0399', } },
-        { {'\u1F92'}, {'\u1F2A', '\u0399', } },
-        { {'\u1F93'}, {'\u1F2B', '\u0399', } },
-        { {'\u1F94'}, {'\u1F2C', '\u0399', } },
-        { {'\u1F95'}, {'\u1F2D', '\u0399', } },
-        { {'\u1F96'}, {'\u1F2E', '\u0399', } },
-        { {'\u1F97'}, {'\u1F2F', '\u0399', } },
-        { {'\u1F98'}, {'\u1F28', '\u0399', } },
-        { {'\u1F99'}, {'\u1F29', '\u0399', } },
-        { {'\u1F9A'}, {'\u1F2A', '\u0399', } },
-        { {'\u1F9B'}, {'\u1F2B', '\u0399', } },
-        { {'\u1F9C'}, {'\u1F2C', '\u0399', } },
-        { {'\u1F9D'}, {'\u1F2D', '\u0399', } },
-        { {'\u1F9E'}, {'\u1F2E', '\u0399', } },
-        { {'\u1F9F'}, {'\u1F2F', '\u0399', } },
-        { {'\u1FA0'}, {'\u1F68', '\u0399', } },
-        { {'\u1FA1'}, {'\u1F69', '\u0399', } },
-        { {'\u1FA2'}, {'\u1F6A', '\u0399', } },
-        { {'\u1FA3'}, {'\u1F6B', '\u0399', } },
-        { {'\u1FA4'}, {'\u1F6C', '\u0399', } },
-        { {'\u1FA5'}, {'\u1F6D', '\u0399', } },
-        { {'\u1FA6'}, {'\u1F6E', '\u0399', } },
-        { {'\u1FA7'}, {'\u1F6F', '\u0399', } },
-        { {'\u1FA8'}, {'\u1F68', '\u0399', } },
-        { {'\u1FA9'}, {'\u1F69', '\u0399', } },
-        { {'\u1FAA'}, {'\u1F6A', '\u0399', } },
-        { {'\u1FAB'}, {'\u1F6B', '\u0399', } },
-        { {'\u1FAC'}, {'\u1F6C', '\u0399', } },
-        { {'\u1FAD'}, {'\u1F6D', '\u0399', } },
-        { {'\u1FAE'}, {'\u1F6E', '\u0399', } },
-        { {'\u1FAF'}, {'\u1F6F', '\u0399', } },
-        { {'\u1FB2'}, {'\u1FBA', '\u0399', } },
-        { {'\u1FB3'}, {'\u0391', '\u0399', } },
-        { {'\u1FB4'}, {'\u0386', '\u0399', } },
-        { {'\u1FB6'}, {'\u0391', '\u0342', } },
-        { {'\u1FB7'}, {'\u0391', '\u0342', '\u0399', } },
-        { {'\u1FBC'}, {'\u0391', '\u0399', } },
-        { {'\u1FC2'}, {'\u1FCA', '\u0399', } },
-        { {'\u1FC3'}, {'\u0397', '\u0399', } },
-        { {'\u1FC4'}, {'\u0389', '\u0399', } },
-        { {'\u1FC6'}, {'\u0397', '\u0342', } },
-        { {'\u1FC7'}, {'\u0397', '\u0342', '\u0399', } },
-        { {'\u1FCC'}, {'\u0397', '\u0399', } },
-        { {'\u1FD2'}, {'\u0399', '\u0308', '\u0300', } },
-        { {'\u1FD3'}, {'\u0399', '\u0308', '\u0301', } },
-        { {'\u1FD6'}, {'\u0399', '\u0342', } },
-        { {'\u1FD7'}, {'\u0399', '\u0308', '\u0342', } },
-        { {'\u1FE2'}, {'\u03A5', '\u0308', '\u0300', } },
-        { {'\u1FE3'}, {'\u03A5', '\u0308', '\u0301', } },
-        { {'\u1FE4'}, {'\u03A1', '\u0313', } },
-        { {'\u1FE6'}, {'\u03A5', '\u0342', } },
-        { {'\u1FE7'}, {'\u03A5', '\u0308', '\u0342', } },
-        { {'\u1FF2'}, {'\u1FFA', '\u0399', } },
-        { {'\u1FF3'}, {'\u03A9', '\u0399', } },
-        { {'\u1FF4'}, {'\u038F', '\u0399', } },
-        { {'\u1FF6'}, {'\u03A9', '\u0342', } },
-        { {'\u1FF7'}, {'\u03A9', '\u0342', '\u0399', } },
-        { {'\u1FFC'}, {'\u03A9', '\u0399', } },
-        { {'\uFB00'}, {'\u0046', '\u0046', } },
-        { {'\uFB01'}, {'\u0046', '\u0049', } },
-        { {'\uFB02'}, {'\u0046', '\u004C', } },
-        { {'\uFB03'}, {'\u0046', '\u0046', '\u0049', } },
-        { {'\uFB04'}, {'\u0046', '\u0046', '\u004C', } },
-        { {'\uFB05'}, {'\u0053', '\u0054', } },
-        { {'\uFB06'}, {'\u0053', '\u0054', } },
-        { {'\uFB13'}, {'\u0544', '\u0546', } },
-        { {'\uFB14'}, {'\u0544', '\u0535', } },
-        { {'\uFB15'}, {'\u0544', '\u053B', } },
-        { {'\uFB16'}, {'\u054E', '\u0546', } },
-        { {'\uFB17'}, {'\u0544', '\u053D', } },
-    };
-        { // THIS CODE WAS AUTOMATICALLY CREATED BY GenerateCharacter:
-            char[] data = A_DATA.toCharArray();
-            assert (data.length == (920 * 2));
-            int i = 0, j = 0;
-            while (i < (920 * 2)) {
-                int entry = data[i++] << 16;
-                A[j++] = entry | data[i++];
-            }
-        }
-
-    }        
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterData01.java b/ojluni/src/main/java/java/lang/CharacterData01.java
deleted file mode 100644
index dc8da86..0000000
--- a/ojluni/src/main/java/java/lang/CharacterData01.java
+++ /dev/null
@@ -1,654 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Thu Sep 11 09:30:37 BST 2014
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables once found in
- *  java.lang.Character. 
- */
-
-class CharacterData01 extends CharacterData {
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-        char offset = (char)ch;
-        int props = A[(Y[(X[offset>>5]<<4)|((offset>>1)&0xF)]<<1)|(offset&0x1)];
-        return props;
-    }
-
-    int getPropertiesEx(int ch) {
-        char offset = (char)ch;
-        int props = B[(Y[(X[offset>>5]<<4)|((offset>>1)&0xF)]<<1)|(offset&0x1)];
-        return props;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isOtherLowercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0001) != 0;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0002) != 0;
-    }
- 
-    boolean isOtherAlphabetic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0004) != 0;
-    }
-
-    boolean isIdeographic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0010) != 0;
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00020000) != 0) {
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-        }
-        return  mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            int offset = val  << 5 >> (5+18);
-            mapChar =  ch - offset;
-        }
-        return  mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00008000) != 0) {
-            // There is a titlecase equivalent.  Perform further checks:
-            if ((val & 0x00010000) == 0) {
-                // The character does not have an uppercase equivalent, so it must
-                // already be uppercase; so add 1 to get the titlecase form.
-                mapChar = ch + 1;
-            }
-            else if ((val & 0x00020000) == 0) {
-                // The character does not have a lowercase equivalent, so it must
-                // already be lowercase; so subtract 1 to get the titlecase form.
-                mapChar = ch - 1;
-            }
-            // else {
-            // The character has both an uppercase equivalent and a lowercase
-            // equivalent, so it must itself be a titlecase form; return it.
-            // return ch;
-            //}
-        }
-        else if ((val & 0x00010000) != 0) {
-            // This character has no titlecase equivalent but it does have an
-            // uppercase equivalent, so use that (subtract the signed case offset).
-            mapChar = toUpperCase(ch);
-        }
-        return  mapChar;
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-        default: // cannot occur
-        case (0x00000000):         // not numeric
-            retval = -1;
-            break;
-        case (0x00000400):              // simple numeric
-            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            break;
-        case (0x00000800)      :       // "strange" numeric
-            switch(ch) {
-            case 0x10113: retval = 40; break;      // AEGEAN NUMBER FORTY
-            case 0x10114: retval = 50; break;      // AEGEAN NUMBER FIFTY
-            case 0x10115: retval = 60; break;      // AEGEAN NUMBER SIXTY
-            case 0x10116: retval = 70; break;      // AEGEAN NUMBER SEVENTY
-            case 0x10117: retval = 80; break;      // AEGEAN NUMBER EIGHTY
-            case 0x10118: retval = 90; break;      // AEGEAN NUMBER NINETY
-            case 0x10119: retval = 100; break;     // AEGEAN NUMBER ONE HUNDRED
-            case 0x1011A: retval = 200; break;     // AEGEAN NUMBER TWO HUNDRED
-            case 0x1011B: retval = 300; break;     // AEGEAN NUMBER THREE HUNDRED
-            case 0x1011C: retval = 400; break;     // AEGEAN NUMBER FOUR HUNDRED
-            case 0x1011D: retval = 500; break;     // AEGEAN NUMBER FIVE HUNDRED
-            case 0x1011E: retval = 600; break;     // AEGEAN NUMBER SIX HUNDRED
-            case 0x1011F: retval = 700; break;     // AEGEAN NUMBER SEVEN HUNDRED
-            case 0x10120: retval = 800; break;     // AEGEAN NUMBER EIGHT HUNDRED
-            case 0x10121: retval = 900; break;     // AEGEAN NUMBER NINE HUNDRED
-            case 0x10122: retval = 1000; break;    // AEGEAN NUMBER ONE THOUSAND
-            case 0x10123: retval = 2000; break;    // AEGEAN NUMBER TWO THOUSAND
-            case 0x10124: retval = 3000; break;    // AEGEAN NUMBER THREE THOUSAND
-            case 0x10125: retval = 4000; break;    // AEGEAN NUMBER FOUR THOUSAND
-            case 0x10126: retval = 5000; break;    // AEGEAN NUMBER FIVE THOUSAND
-            case 0x10127: retval = 6000; break;    // AEGEAN NUMBER SIX THOUSAND
-            case 0x10128: retval = 7000; break;    // AEGEAN NUMBER SEVEN THOUSAND
-            case 0x10129: retval = 8000; break;    // AEGEAN NUMBER EIGHT THOUSAND
-            case 0x1012A: retval = 9000; break;    // AEGEAN NUMBER NINE THOUSAND
-            case 0x1012B: retval = 10000; break;   // AEGEAN NUMBER TEN THOUSAND
-            case 0x1012C: retval = 20000; break;   // AEGEAN NUMBER TWENTY THOUSAND
-            case 0x1012D: retval = 30000; break;   // AEGEAN NUMBER THIRTY THOUSAND
-            case 0x1012E: retval = 40000; break;   // AEGEAN NUMBER FORTY THOUSAND
-            case 0x1012F: retval = 50000; break;   // AEGEAN NUMBER FIFTY THOUSAND
-            case 0x10130: retval = 60000; break;   // AEGEAN NUMBER SIXTY THOUSAND
-            case 0x10131: retval = 70000; break;   // AEGEAN NUMBER SEVENTY THOUSAND
-            case 0x10132: retval = 80000; break;   // AEGEAN NUMBER EIGHTY THOUSAND
-            case 0x10133: retval = 90000; break;   // AEGEAN NUMBER NINETY THOUSAND
-            case 0x10323: retval = 50; break;      // OLD ITALIC NUMERAL FIFTY
-
-            case 0x010144: retval = 50; break;     // ACROPHONIC ATTIC FIFTY
-            case 0x010145: retval = 500; break;    // ACROPHONIC ATTIC FIVE HUNDRED
-            case 0x010146: retval = 5000; break;   // ACROPHONIC ATTIC FIVE THOUSAND
-            case 0x010147: retval = 50000; break;  // ACROPHONIC ATTIC FIFTY THOUSAND
-            case 0x01014A: retval = 50; break;     // ACROPHONIC ATTIC FIFTY TALENTS
-            case 0x01014B: retval = 100; break;    // ACROPHONIC ATTIC ONE HUNDRED TALENTS
-            case 0x01014C: retval = 500; break;    // ACROPHONIC ATTIC FIVE HUNDRED TALENTS
-            case 0x01014D: retval = 1000; break;   // ACROPHONIC ATTIC ONE THOUSAND TALENTS
-            case 0x01014E: retval = 5000; break;   // ACROPHONIC ATTIC FIVE THOUSAND TALENTS
-            case 0x010151: retval = 50; break;     // ACROPHONIC ATTIC FIFTY STATERS
-            case 0x010152: retval = 100; break;    // ACROPHONIC ATTIC ONE HUNDRED STATERS
-            case 0x010153: retval = 500; break;    // ACROPHONIC ATTIC FIVE HUNDRED STATERS
-            case 0x010154: retval = 1000; break;   // ACROPHONIC ATTIC ONE THOUSAND STATERS
-            case 0x010155: retval = 10000; break;  // ACROPHONIC ATTIC TEN THOUSAND STATERS
-            case 0x010156: retval = 50000; break;  // ACROPHONIC ATTIC FIFTY THOUSAND STATERS
-            case 0x010166: retval = 50; break;     // ACROPHONIC TROEZENIAN FIFTY
-            case 0x010167: retval = 50; break;     // ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM
-            case 0x010168: retval = 50; break;     // ACROPHONIC HERMIONIAN FIFTY
-            case 0x010169: retval = 50; break;     // ACROPHONIC THESPIAN FIFTY
-            case 0x01016A: retval = 100; break;    // ACROPHONIC THESPIAN ONE HUNDRED
-            case 0x01016B: retval = 300; break;    // ACROPHONIC THESPIAN THREE HUNDRED
-            case 0x01016C: retval = 500; break;    // ACROPHONIC EPIDAUREAN FIVE HUNDRED
-            case 0x01016D: retval = 500; break;    // ACROPHONIC TROEZENIAN FIVE HUNDRED
-            case 0x01016E: retval = 500; break;    // ACROPHONIC THESPIAN FIVE HUNDRED
-            case 0x01016F: retval = 500; break;    // ACROPHONIC CARYSTIAN FIVE HUNDRED
-            case 0x010170: retval = 500; break;    // ACROPHONIC NAXIAN FIVE HUNDRED
-            case 0x010171: retval = 1000; break;   // ACROPHONIC THESPIAN ONE THOUSAND
-            case 0x010172: retval = 5000; break;   // ACROPHONIC THESPIAN FIVE THOUSAND
-            case 0x010174: retval = 50; break;     // ACROPHONIC STRATIAN FIFTY MNAS
-            case 0x010341: retval = 90; break;     // GOTHIC LETTER NINETY
-            case 0x01034A: retval = 900; break;    // GOTHIC LETTER NINE HUNDRED
-            case 0x0103D5: retval = 100; break;    // OLD PERSIAN NUMBER HUNDRED
-            case 0x01085D: retval = 100; break;    // IMPERIAL ARAMAIC NUMBER ONE HUNDRED
-            case 0x01085E: retval = 1000; break;   // IMPERIAL ARAMAIC NUMBER ONE THOUSAND
-            case 0x01085F: retval = 10000; break;  // IMPERIAL ARAMAIC NUMBER TEN THOUSAND
-            case 0x010919: retval = 100; break;    // PHOENICIAN NUMBER ONE HUNDRED
-            case 0x010A46: retval = 100; break;    // KHAROSHTHI NUMBER ONE HUNDRED
-            case 0x010A47: retval = 1000; break;   // KHAROSHTHI NUMBER ONE THOUSAND
-            case 0x010A7E: retval = 50; break;     // OLD SOUTH ARABIAN NUMBER FIFTY
-            case 0x010B5E: retval = 100; break;    // INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED
-            case 0x010B5F: retval = 1000; break;   // INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
-            case 0x010B7E: retval = 100; break;    // INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED
-            case 0x010B7F: retval = 1000; break;   // INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
-            case 0x010E6C: retval = 40; break;     // RUMI NUMBER FORTY
-            case 0x010E6D: retval = 50; break;     // RUMI NUMBER FIFTY
-            case 0x010E6E: retval = 60; break;     // RUMI NUMBER SIXTY
-            case 0x010E6F: retval = 70; break;     // RUMI NUMBER SEVENTY
-            case 0x010E70: retval = 80; break;     // RUMI NUMBER EIGHTY
-            case 0x010E71: retval = 90; break;     // RUMI NUMBER NINETY
-            case 0x010E72: retval = 100; break;    // RUMI NUMBER ONE HUNDRED
-            case 0x010E73: retval = 200; break;    // RUMI NUMBER TWO HUNDRED
-            case 0x010E74: retval = 300; break;    // RUMI NUMBER THREE HUNDRED
-            case 0x010E75: retval = 400; break;    // RUMI NUMBER FOUR HUNDRED
-            case 0x010E76: retval = 500; break;    // RUMI NUMBER FIVE HUNDRED
-            case 0x010E77: retval = 600; break;    // RUMI NUMBER SIX HUNDRED
-            case 0x010E78: retval = 700; break;    // RUMI NUMBER SEVEN HUNDRED
-            case 0x010E79: retval = 800; break;    // RUMI NUMBER EIGHT HUNDRED
-            case 0x010E7A: retval = 900; break;    // RUMI NUMBER NINE HUNDRED
-            case 0x01105E: retval = 40; break;     // BRAHMI NUMBER FORTY
-            case 0x01105F: retval = 50; break;     // BRAHMI NUMBER FIFTY
-            case 0x011060: retval = 60; break;     // BRAHMI NUMBER SIXTY
-            case 0x011061: retval = 70; break;     // BRAHMI NUMBER SEVENTY
-            case 0x011062: retval = 80; break;     // BRAHMI NUMBER EIGHTY
-            case 0x011063: retval = 90; break;     // BRAHMI NUMBER NINETY
-            case 0x011064: retval = 100; break;    // BRAHMI NUMBER ONE HUNDRED
-            case 0x011065: retval = 1000; break;   // BRAHMI NUMBER ONE THOUSAND
-            case 0x01D36C: retval = 40; break;     // COUNTING ROD TENS DIGIT FOUR
-            case 0x01D36D: retval = 50; break;     // COUNTING ROD TENS DIGIT FIVE
-            case 0x01D36E: retval = 60; break;     // COUNTING ROD TENS DIGIT SIX
-            case 0x01D36F: retval = 70; break;     // COUNTING ROD TENS DIGIT SEVEN
-            case 0x01D370: retval = 80; break;     // COUNTING ROD TENS DIGIT EIGHT
-            case 0x01D371: retval = 90; break;     // COUNTING ROD TENS DIGIT NINE
-            default: retval = -2; break;
-            }
-            
-            break;
-        case (0x00000C00):           // Java supradecimal
-            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00004000);
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-        if (directionality == 0xF ) {
-            directionality = Character.DIRECTIONALITY_UNDEFINED;
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x80000000) != 0);
-    }
-
-    static final CharacterData instance = new CharacterData01();
-    private CharacterData01() {};
-
-    // The following tables and code generated using:
-  // java GenerateCharacter -plane 1 -template ../../tools/GenerateCharacter/CharacterData01.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -proplist ../../tools/UnicodeData/PropList.txt -o /usr/local/google/home/haaawk/ojluni/openjdk/build/linux-amd64/gensrc/java/lang/CharacterData01.java -string -usecharforbyte 11 4 1
-  // The X table has 2048 entries for a total of 4096 bytes.
-
-  static final char X[] = (
-    "\000\001\002\003\004\004\004\005\006\007\010\011\012\003\013\014\003\003\003"+
-    "\003\015\004\016\003\017\020\021\003\022\004\023\003\024\025\026\004\027\030"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\031\032\033\003\003\003\003\003\034\035\003\003"+
-    "\003\003\003\003\036\037\040\041\003\003\003\003\042\043\044\045\003\003\003"+
-    "\003\042\042\046\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\047\003\003\003\003\003\003\003\003\003\003\003\003\050\051\052\053\054"+
-    "\055\056\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\004\004\004\004\004\004\004\004\004\004"+
-    "\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\057\003"+
-    "\003\003\003\060\061\062\063\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004"+
-    "\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\004\057"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\004\004\004\004"+
-    "\004\004\004\004\004\004\004\004\004\004\004\004\004\064\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\065\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\066\066\066\066\066\066\066\067"+
-    "\066\070\066\071\072\073\074\003\075\075\076\003\003\003\003\003\075\075\077"+
-    "\100\003\003\003\003\101\102\103\104\105\106\107\110\111\112\113\114\115\101"+
-    "\102\116\104\117\120\121\110\122\123\124\125\126\127\130\131\132\133\134\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\075\135\075\075\136\137\140\003\141\142\066\143\144\003\003\145\146\144"+
-    "\147\003\003\003\003\003\075\150\075\151\136\075\152\153\075\154\155\075\156"+
-    "\075\075\157\075\160\161\162\003\003\003\163\164\165\166\003\075\075\167\003"+
-    "\075\075\075\136\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003").toCharArray();
-
-  // The Y table has 1920 entries for a total of 3840 bytes.
-
-  static final char Y[] = (
-    "\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\002\000\000\000\000\000\000\000\000\000\002\000\001\000\000\000\000\000\000"+
-    "\000\003\000\000\000\000\000\000\000\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\003"+
-    "\003\004\005\003\006\007\007\007\007\010\011\012\012\012\012\012\012\012\012"+
-    "\012\012\012\012\012\012\012\012\003\013\014\014\014\014\015\016\015\015\017"+
-    "\015\015\020\021\015\015\022\023\024\025\026\027\030\031\015\015\015\015\015"+
-    "\015\032\033\034\035\036\036\036\036\036\036\036\036\037\003\003\036\036\036"+
-    "\036\036\036\003\003\003\003\003\003\003\003\003\003\014\014\014\014\014\014"+
-    "\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\040\003\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\003\000\000\000\000"+
-    "\000\000\000\000\002\003\003\003\003\003\003\003\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\002\041\042\003\003\003\003\003\003\000\000"+
-    "\000\000\000\000\000\000\043\000\000\000\000\044\003\003\003\003\003\003\003"+
-    "\003\003\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\045"+
-    "\000\000\003\003\000\000\000\000\046\047\050\003\003\003\003\003\051\051\051"+
-    "\051\051\051\051\051\051\051\051\051\051\051\051\051\051\051\051\051\052\052"+
-    "\052\052\052\052\052\052\052\052\052\052\052\052\052\052\052\052\052\052\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\003\053\053\053\053\053\003\003\003\003\003\003\003\003\003\003"+
-    "\003\054\054\054\003\055\054\054\054\054\054\054\054\054\054\054\054\054\054"+
-    "\054\054\054\054\054\054\054\054\054\056\055\003\055\056\054\054\054\054\054"+
-    "\054\054\054\054\054\054\057\060\061\062\063\054\054\054\054\054\054\054\054"+
-    "\054\054\054\064\065\066\003\067\054\054\054\054\054\054\054\054\054\054\054"+
-    "\054\054\003\003\057\070\071\072\073\003\003\071\071\054\054\056\054\056\054"+
-    "\054\054\054\054\054\054\054\054\054\054\054\054\003\003\074\075\003\076\077"+
-    "\077\100\063\003\003\003\003\101\101\101\101\102\003\003\003\054\054\054\054"+
-    "\054\054\054\054\054\054\054\054\054\054\103\104\054\054\054\054\054\054\054"+
-    "\054\054\054\054\054\054\054\054\054\054\054\054\054\054\054\054\054\054\054"+
-    "\054\003\067\105\105\105\054\054\054\054\054\054\054\054\054\054\054\003\060"+
-    "\060\106\063\054\054\054\054\054\054\054\054\054\055\003\003\060\060\106\063"+
-    "\054\054\054\054\055\003\003\003\003\003\003\003\003\003\003\003\107\107\107"+
-    "\107\107\110\111\111\111\111\111\111\111\111\111\112\113\114\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\071\071\071\071\071\071\071\115\116\116\116\003\003\117\117\117"+
-    "\117\117\120\034\034\034\034\121\121\121\121\121\003\003\003\003\003\003\003"+
-    "\003\074\114\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\122\113\071\123\124\115\125\116\116\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\003\000\000\000\000\000\000\000\002"+
-    "\003\003\003\003\003\003\003\003\126\126\126\126\127\127\127\130\131\131\132"+
-    "\133\133\133\133\134\134\135\136\137\137\137\131\140\141\142\143\144\133\145"+
-    "\146\147\150\151\152\153\154\155\155\156\157\160\161\142\162\163\163\163\163"+
-    "\044\003\003\003\003\003\003\116\116\003\003\003\003\003\003\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\002\003\003\003\000\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\014\014\014\014\014\014\014\014\014\014"+
-    "\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\003\003"+
-    "\003\003\003\014\014\014\005\013\014\014\014\014\014\014\014\014\014\014\014"+
-    "\014\014\164\165\074\014\164\166\166\167\170\170\170\171\074\074\074\172\040"+
-    "\074\074\074\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\074"+
-    "\074\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014"+
-    "\014\014\014\014\014\014\003\036\036\036\036\036\036\036\036\036\036\036\036"+
-    "\036\036\036\036\036\074\173\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\036\036\036\036\036\036\036\036\036\036\036\174\003\003\003\003\175\175"+
-    "\175\175\175\176\012\012\012\003\003\003\003\003\003\003\177\177\177\177\177"+
-    "\177\177\177\177\177\177\177\177\200\200\200\200\200\200\200\200\200\200\200"+
-    "\200\200\177\177\177\177\177\177\177\177\177\177\177\177\177\200\200\200\201"+
-    "\200\200\200\200\200\200\200\200\200\177\177\177\177\177\177\177\177\177\177"+
-    "\177\177\177\200\200\200\200\200\200\200\200\200\200\200\200\200\202\177\003"+
-    "\202\203\202\203\177\202\177\177\177\177\200\200\204\204\200\200\200\204\200"+
-    "\200\200\200\200\177\177\177\177\177\177\177\177\177\177\177\177\177\200\200"+
-    "\200\200\200\200\200\200\200\200\200\200\200\177\203\177\202\203\177\177\177"+
-    "\202\177\177\177\202\200\200\200\200\200\200\200\200\200\200\200\200\200\177"+
-    "\203\177\202\177\177\202\202\003\177\177\177\202\200\200\200\200\200\200\200"+
-    "\200\200\200\200\200\200\177\177\177\177\177\177\177\177\177\177\177\177\177"+
-    "\200\200\200\200\200\200\200\200\200\200\200\200\200\177\177\177\177\177\177"+
-    "\177\200\200\200\200\200\200\200\200\200\177\200\200\200\200\200\200\200\200"+
-    "\200\200\200\200\200\177\177\177\177\177\177\177\177\177\177\177\177\177\200"+
-    "\200\200\200\200\200\200\200\200\200\200\200\200\177\177\177\177\177\177\177"+
-    "\177\200\200\200\003\177\177\177\177\177\177\177\177\177\177\177\177\205\200"+
-    "\200\200\200\200\200\200\200\200\200\200\200\206\200\200\200\177\177\177\177"+
-    "\177\177\177\177\177\177\177\177\205\200\200\200\200\200\200\200\200\200\200"+
-    "\200\200\206\200\200\200\177\177\177\177\177\177\177\177\177\177\177\177\205"+
-    "\200\200\200\200\200\200\200\200\200\200\200\200\206\200\200\200\177\177\177"+
-    "\177\177\177\177\177\177\177\177\177\205\200\200\200\200\200\200\200\200\200"+
-    "\200\200\200\206\200\200\200\177\177\177\177\177\177\177\177\177\177\177\177"+
-    "\205\200\200\200\200\200\200\200\200\200\200\200\200\206\200\200\200\207\003"+
-    "\210\210\210\210\210\211\211\211\211\211\212\212\212\212\212\213\213\213\213"+
-    "\213\214\214\214\214\214\036\036\036\036\036\036\003\003\036\036\036\036\036"+
-    "\036\036\036\036\036\036\036\036\036\036\036\036\036\003\003\003\003\003\003"+
-    "\036\036\036\036\036\036\036\174\215\036\036\036\036\036\036\174\215\036\036"+
-    "\036\036\036\036\036\215\036\036\036\036\036\036\036\216\217\217\217\217\220"+
-    "\003\003\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\005\014"+
-    "\014\014\014\014\014\014\014\014\014\014\014\014\003\003\003\014\014\014\014"+
-    "\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\014\005\003"+
-    "\003\003\003\003\014\014\014\014\014\014\014\014\014\014\014\014\014\014\005"+
-    "\003\003\003\003\003\003\014\014\014\014\014\014\014\014\014\014\014\014\005"+
-    "\003\003\003\014\003\003\003\003\003\003\003\174\003\003\003\003\003\003\003"+
-    "\036\036\036\215\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036"+
-    "\036\036\036\174\003\036\036\174\036\036\174\003\003\003\003\003\003\003\003"+
-    "\003\003\036\036\036\036\036\036\036\036\174\003\003\003\003\003\003\003\036"+
-    "\036\036\036\036\036\036\036\036\036\036\036\036\036\036\174\174\036\036\036"+
-    "\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\221"+
-    "\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036\036"+
-    "\036\036\215\036\174\003\036\036\221\036\036\036\036\036\036\036\036\036\036"+
-    "\036\036\003\003\003\003\003\003\003\003\003\036\036\036\036\036\036\036\036"+
-    "\036\036\036\036\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003\003\003\003\003\003\003\003\003\003\215\036\036\215\036\036\036\036\036"+
-    "\036\036\174\036\174\174\174\174\036\174\036\036\036\003\036\036\215\003\036"+
-    "\036\215\036\036\036\036\036\174\003\215\036\036\036\036\036\003\003\003\003"+
-    "\003\003\003\003\036\036\036\003\003\003\003\003\003\003\003\003\003\003\003"+
-    "\003").toCharArray();
-
-  // The A table has 292 entries for a total of 1168 bytes.
-
-  static final int A[] = new int[292];
-  static final String A_DATA =
-    "\000\u7005\000\u7005\u7800\000\000\u7005\000\u7005\u7800\000\u7800\000\u7800"+
-    "\000\000\030\u6800\030\000\034\u7800\000\u7800\000\000\u074B\000\u074B\000"+
-    "\u074B\000\u074B\000\u046B\000\u058B\000\u080B\000\u080B\000\u080B\u7800\000"+
-    "\000\034\000\034\000\034\u6800\u780A\u6800\u780A\u6800\u77EA\u6800\u744A\u6800"+
-    "\u77AA\u6800\u742A\u6800\u780A\u6800\u76CA\u6800\u774A\u6800\u780A\u6800\u780A"+
-    "\u6800\u766A\u6800\u752A\u6800\u750A\u6800\u74EA\u6800\u74EA\u6800\u74CA\u6800"+
-    "\u74AA\u6800\u748A\u6800\u74CA\u6800\u754A\u6800\u752A\u6800\u750A\u6800\u74EA"+
-    "\u6800\u74CA\u6800\u772A\u6800\u780A\u6800\u764A\u6800\u780A\u6800\u080B\u6800"+
-    "\u080B\u6800\u080B\u6800\u080B\u6800\034\u6800\034\u6800\034\u6800\u06CB\u7800"+
-    "\000\000\034\u4000\u3006\000\u042B\000\u048B\000\u050B\000\u080B\000\u7005"+
-    "\000\u780A\000\u780A\u7800\000\u7800\000\000\030\000\030\000\u760A\000\u760A"+
-    "\000\u76EA\000\u740A\000\u780A\242\u7001\242\u7001\241\u7002\241\u7002\000"+
-    "\u3409\000\u3409\u0800\u7005\u0800\u7005\u0800\u7005\u7800\000\u7800\000\u0800"+
-    "\u7005\u7800\000\u0800\030\u0800\u052B\u0800\u052B\u0800\u052B\u0800\u05EB"+
-    "\u0800\u070B\u0800\u080B\u0800\u080B\u0800\u080B\u0800\u056B\u0800\u066B\u0800"+
-    "\u078B\u0800\u080B\u0800\u050B\u0800\u050B\u7800\000\u6800\030\u0800\u7005"+
-    "\u4000\u3006\u4000\u3006\u4000\u3006\u7800\000\u4000\u3006\u4000\u3006\u7800"+
-    "\000\u4000\u3006\u4000\u3006\u4000\u3006\u7800\000\u7800\000\u4000\u3006\u0800"+
-    "\u042B\u0800\u042B\u0800\u04CB\u0800\u05EB\u0800\030\u0800\030\u0800\030\u7800"+
-    "\000\u0800\u7005\u0800\u048B\u0800\u080B\u0800\030\u6800\030\u6800\030\u0800"+
-    "\u05CB\u0800\u06EB\u3000\u042B\u3000\u042B\u3000\u054B\u3000\u066B\u3000\u080B"+
-    "\u3000\u080B\u3000\u080B\u7800\000\000\u3008\u4000\u3006\000\u3008\000\u7005"+
-    "\u4000\u3006\000\030\000\030\000\030\u6800\u05EB\u6800\u05EB\u6800\u070B\u6800"+
-    "\u042B\000\u3749\000\u3749\000\u3008\000\u3008\u4000\u3006\000\u3008\000\u3008"+
-    "\u4000\u3006\000\030\000\u1010\000\u744A\000\u744A\000\u776A\000\u776A\000"+
-    "\u776A\000\u76AA\000\u76AA\000\u76AA\000\u76AA\000\u758A\000\u758A\000\u758A"+
-    "\000\u746A\000\u746A\000\u746A\000\u77EA\000\u77EA\000\u77CA\000\u77CA\000"+
-    "\u77CA\000\u76AA\000\u768A\000\u768A\000\u768A\000\u700A\000\u700A\000\u75AA"+
-    "\000\u75AA\000\u75AA\000\u758A\000\u752A\000\u750A\000\u750A\000\u74EA\000"+
-    "\u74CA\000\u74AA\000\u74CA\000\u74CA\000\u74AA\000\u748A\000\u748A\000\u746A"+
-    "\000\u746A\000\u744A\000\u742A\000\u740A\000\u770A\000\u770A\000\u770A\000"+
-    "\u764A\000\u764A\000\u764A\000\u764A\000\u762A\000\u762A\000\u760A\000\u752A"+
-    "\000\u752A\000\u780A\000\u780A\000\034\000\u3008\000\u3008\u4000\u3006\000"+
-    "\u3008\000\u3008\000\u3008\u4800\u1010\u4800\u1010\u4800\u1010\u4800\u1010"+
-    "\u4000\u3006\u4000\u3006\000\034\u4000\u3006\u6800\034\u6800\034\u7800\000"+
-    "\000\u042B\000\u042B\000\u054B\000\u066B\000\u7001\000\u7001\000\u7002\000"+
-    "\u7002\000\u7002\u7800\000\000\u7001\u7800\000\u7800\000\000\u7001\u7800\000"+
-    "\000\u7002\000\u7001\000\031\000\u7002\uE800\031\000\u7001\000\u7002\u1800"+
-    "\u3649\u1800\u3649\u1800\u3509\u1800\u3509\u1800\u37C9\u1800\u37C9\u1800\u3689"+
-    "\u1800\u3689\u1800\u3549\u1800\u3549\u7800\000\u6800\034\u1800\u040B\u1800"+
-    "\u07EB\u1800\u07EB\u1800\u07EB\u1800\u07EB\u7800\000\000\034\u6800\034";
-
-  // The B table has 292 entries for a total of 584 bytes.
-
-  static final char B[] = (
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004"+
-    "\004\004\000\004\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\004"+
-    "\004\000\000\000\000\000\000\000\000\000\000\000\004\004\004\004\004\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000").toCharArray();
-
-  // In all, the character property tables require 9104 bytes.
-
-    static {
-                { // THIS CODE WAS AUTOMATICALLY CREATED BY GenerateCharacter:
-            char[] data = A_DATA.toCharArray();
-            assert (data.length == (292 * 2));
-            int i = 0, j = 0;
-            while (i < (292 * 2)) {
-                int entry = data[i++] << 16;
-                A[j++] = entry | data[i++];
-            }
-        }
-
-    }        
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterData02.java b/ojluni/src/main/java/java/lang/CharacterData02.java
deleted file mode 100644
index ab9c28c..0000000
--- a/ojluni/src/main/java/java/lang/CharacterData02.java
+++ /dev/null
@@ -1,391 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Thu Sep 11 09:30:37 BST 2014
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables found in
-    Java.lang.Character. */
-
-class CharacterData02 extends CharacterData {
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-	char offset = (char)ch;
-        int props = A[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    int getPropertiesEx(int ch) {
-        char offset = (char)ch;
-        int props = B[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    boolean isOtherLowercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0001) != 0;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0002) != 0;
-    }
-
-    boolean isOtherAlphabetic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0004) != 0;
-    }
-
-    boolean isIdeographic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0010) != 0;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00020000) != 0) {
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-        }
-        return mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            int offset = val  << 5 >> (5+18);
-            mapChar =  ch - offset;
-        }
-        return mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00008000) != 0) {
-            // There is a titlecase equivalent.  Perform further checks:
-            if ((val & 0x00010000) == 0) {
-                // The character does not have an uppercase equivalent, so it must
-                // already be uppercase; so add 1 to get the titlecase form.
-                mapChar = ch + 1;
-            }
-            else if ((val & 0x00020000) == 0) {
-                // The character does not have a lowercase equivalent, so it must
-                // already be lowercase; so subtract 1 to get the titlecase form.
-                mapChar = ch - 1;
-            }
-            // else {
-            // The character has both an uppercase equivalent and a lowercase
-            // equivalent, so it must itself be a titlecase form; return it.
-            // return ch;
-            //}
-        }
-        else if ((val & 0x00010000) != 0) {
-            // This character has no titlecase equivalent but it does have an
-            // uppercase equivalent, so use that (subtract the signed case offset).
-            mapChar = toUpperCase(ch);
-        }
-        return mapChar;
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-        default: // cannot occur
-        case (0x00000000):         // not numeric
-            retval = -1;
-            break;
-        case (0x00000400):              // simple numeric
-            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            break;
-        case (0x00000800)      :       // "strange" numeric
-            retval = -2;
-            break;
-        case (0x00000C00):           // Java supradecimal
-            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        return (getProperties(ch) & 0x00007000) == 0x00004000;
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-        if (directionality == 0xF ) {
-	        directionality = Character.DIRECTIONALITY_UNDEFINED;
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        return (getProperties(ch) & 0x80000000) != 0;
-    }
-
-    static final CharacterData instance = new CharacterData02();
-    private CharacterData02() {};
-
-    // The following tables and code generated using:
-  // java GenerateCharacter -plane 2 -template ../../tools/GenerateCharacter/CharacterData02.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -proplist ../../tools/UnicodeData/PropList.txt -o /usr/local/google/home/haaawk/ojluni/openjdk/build/linux-amd64/gensrc/java/lang/CharacterData02.java -string -usecharforbyte 11 4 1
-  // The X table has 2048 entries for a total of 4096 bytes.
-
-  static final char X[] = (
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\020\040\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\060\000\000\000\000\000\000\100\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\000\000\000\000\120\000\000\000\000\000\000"+
-    "\000\000\000\000\000\100\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040").toCharArray();
-
-  // The Y table has 96 entries for a total of 192 bytes.
-
-  static final char Y[] = (
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\002\004\004\004\004\004\004\004\004\004\004"+
-    "\004\004\004\004\004\004\004\004\004\004\000\000\000\000\000\000\000\000\000"+
-    "\000\002\004\004\004\004\004\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\004\000\000\000\000\000\000\000\000\006\000\000\000\000\000\000"+
-    "\000").toCharArray();
-
-  // The A table has 8 entries for a total of 32 bytes.
-
-  static final int A[] = new int[8];
-  static final String A_DATA =
-    "\000\u7005\000\u7005\000\u7005\u7800\000\u7800\000\u7800\000\000\u7725\000"+
-    "\u7005";
-
-  // The B table has 8 entries for a total of 16 bytes.
-
-  static final char B[] = (
-    "\020\020\020\000\000\000\020\020").toCharArray();
-
-  // In all, the character property tables require 4320 bytes.
-
-    static {
-                { // THIS CODE WAS AUTOMATICALLY CREATED BY GenerateCharacter:
-            char[] data = A_DATA.toCharArray();
-            assert (data.length == (8 * 2));
-            int i = 0, j = 0;
-            while (i < (8 * 2)) {
-                int entry = data[i++] << 16;
-                A[j++] = entry | data[i++];
-            }
-        }
-
-    }        
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterData0E.java b/ojluni/src/main/java/java/lang/CharacterData0E.java
deleted file mode 100644
index b73478b6..0000000
--- a/ojluni/src/main/java/java/lang/CharacterData0E.java
+++ /dev/null
@@ -1,392 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Thu Sep 11 09:30:37 BST 2014
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables found in
-    Java.lang.Character. */
-
-class CharacterData0E extends CharacterData {
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-        char offset = (char)ch;
-        int props = A[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    int getPropertiesEx(int ch) {
-        char offset = (char)ch;
-        int props = B[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    boolean isOtherLowercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0001) != 0;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0002) != 0;
-    }
-
-    boolean isOtherAlphabetic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0004) != 0;
-    }
-
-    boolean isIdeographic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0010) != 0;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00020000) != 0) {
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-        }
-        return mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            int offset = val  << 5 >> (5+18);
-            mapChar =  ch - offset;
-        }
-        return mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00008000) != 0) {
-            // There is a titlecase equivalent.  Perform further checks:
-            if ((val & 0x00010000) == 0) {
-                // The character does not have an uppercase equivalent, so it must
-                // already be uppercase; so add 1 to get the titlecase form.
-                mapChar = ch + 1;
-            }
-            else if ((val & 0x00020000) == 0) {
-                // The character does not have a lowercase equivalent, so it must
-                // already be lowercase; so subtract 1 to get the titlecase form.
-                mapChar = ch - 1;
-            }
-            // else {
-            // The character has both an uppercase equivalent and a lowercase
-            // equivalent, so it must itself be a titlecase form; return it.
-            // return ch;
-            //}
-        }
-        else if ((val & 0x00010000) != 0) {
-            // This character has no titlecase equivalent but it does have an
-            // uppercase equivalent, so use that (subtract the signed case offset).
-            mapChar = toUpperCase(ch);
-        }
-        return mapChar;
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-        default: // cannot occur
-        case (0x00000000):         // not numeric
-            retval = -1;
-            break;
-        case (0x00000400):              // simple numeric
-            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            break;
-        case (0x00000800)      :       // "strange" numeric
-            retval = -2;
-            break;
-        case (0x00000C00):           // Java supradecimal
-            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00004000);
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-        if (directionality == 0xF ) {
-	        directionality = Character.DIRECTIONALITY_UNDEFINED;
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x80000000) != 0);
-    }
-
-    static final CharacterData instance = new CharacterData0E();
-    private CharacterData0E() {};
-
-    // The following tables and code generated using:
-  // java GenerateCharacter -plane 14 -template ../../tools/GenerateCharacter/CharacterData0E.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -proplist ../../tools/UnicodeData/PropList.txt -o /usr/local/google/home/haaawk/ojluni/openjdk/build/linux-amd64/gensrc/java/lang/CharacterData0E.java -string -usecharforbyte 11 4 1
-  // The X table has 2048 entries for a total of 4096 bytes.
-
-  static final char X[] = (
-    "\000\020\020\020\040\040\040\040\060\060\060\060\060\060\060\100\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040"+
-    "\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040").toCharArray();
-
-  // The Y table has 80 entries for a total of 160 bytes.
-
-  static final char Y[] = (
-    "\000\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\004\004\004"+
-    "\004\004\004\004\004\004\004\004\004\004\004\004\004\002\002\002\002\002\002"+
-    "\002\002\002\002\002\002\002\002\002\002\006\006\006\006\006\006\006\006\006"+
-    "\006\006\006\006\006\006\006\006\006\006\006\006\006\006\006\002\002\002\002"+
-    "\002\002\002\002").toCharArray();
-
-  // The A table has 8 entries for a total of 32 bytes.
-
-  static final int A[] = new int[8];
-  static final String A_DATA =
-    "\u7800\000\u4800\u1010\u7800\000\u7800\000\u4800\u1010\u4800\u1010\u4000\u3006"+
-    "\u4000\u3006";
-
-  // The B table has 8 entries for a total of 16 bytes.
-
-  static final char B[] = (
-    "\000\000\000\000\000\000\000\000").toCharArray();
-
-  // In all, the character property tables require 4288 bytes.
-
-    static {
-                { // THIS CODE WAS AUTOMATICALLY CREATED BY GenerateCharacter:
-            char[] data = A_DATA.toCharArray();
-            assert (data.length == (8 * 2));
-            int i = 0, j = 0;
-            while (i < (8 * 2)) {
-                int entry = data[i++] << 16;
-                A[j++] = entry | data[i++];
-            }
-        }
-
-    }        
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterDataLatin1.java b/ojluni/src/main/java/java/lang/CharacterDataLatin1.java
deleted file mode 100644
index d4db21a..0000000
--- a/ojluni/src/main/java/java/lang/CharacterDataLatin1.java
+++ /dev/null
@@ -1,331 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Thu Sep 11 09:30:36 BST 2014
-/*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables found in
-    Java.lang.Character. */
-
-class CharacterDataLatin1 extends CharacterData {
-
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-        char offset = (char)ch;
-        int props = A[offset];
-        return props;
-    }
-
-    int getPropertiesEx(int ch) {
-        char offset = (char)ch;
-        int props = B[offset];
-        return props;
-    }
-
-    boolean isOtherLowercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0001) != 0;
-    }
-
-    boolean isOtherUppercase(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0002) != 0;
-    }
-
-    boolean isOtherAlphabetic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0004) != 0;
-    }
-
-    boolean isIdeographic(int ch) {
-        int props = getPropertiesEx(ch);
-        return (props & 0x0010) != 0;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if (((val & 0x00020000) != 0) && 
-                ((val & 0x07FC0000) != 0x07FC0000)) { 
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-        }
-        return mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            if ((val & 0x07FC0000) != 0x07FC0000) {
-                int offset = val  << 5 >> (5+18);
-                mapChar =  ch - offset;
-            } else if (ch == 0x00B5) {
-                mapChar = 0x039C;
-            }
-        }
-        return mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        return toUpperCase(ch);
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-            default: // cannot occur
-            case (0x00000000):         // not numeric
-                retval = -1;
-                break;
-            case (0x00000400):              // simple numeric
-                retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-                break;
-            case (0x00000800)      :       // "strange" numeric
-                 retval = -2; 
-                 break;
-            case (0x00000C00):           // Java supradecimal
-                retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-                break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00004000);
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-
-        if (directionality == 0xF ) {
-            directionality = -1;
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x80000000) != 0);
-    }
-
-    int toUpperCaseEx(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-            if ((val & 0x07FC0000) != 0x07FC0000) {
-                int offset = val  << 5 >> (5+18);
-                mapChar =  ch - offset;
-            }
-            else {
-                switch(ch) {
-                    // map overflow characters
-                    case 0x00B5 : mapChar = 0x039C; break;
-                    default       : mapChar = Character.ERROR; break;
-                }
-            }
-        }
-        return mapChar;
-    }
-
-    static char[] sharpsMap = new char[] {'S', 'S'};
-
-    char[] toUpperCaseCharArray(int ch) {
-        char[] upperMap = {(char)ch};
-        if (ch == 0x00DF) {
-            upperMap = sharpsMap;
-        }
-        return upperMap;
-    }
-
-    static final CharacterDataLatin1 instance = new CharacterDataLatin1();
-    private CharacterDataLatin1() {};
-
-    // The following tables and code generated using:
-  // java GenerateCharacter -template ../../tools/GenerateCharacter/CharacterDataLatin1.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -proplist ../../tools/UnicodeData/PropList.txt -o /usr/local/google/home/haaawk/ojluni/openjdk/build/linux-amd64/gensrc/java/lang/CharacterDataLatin1.java -string -usecharforbyte -latin1 8
-  // The A table has 256 entries for a total of 1024 bytes.
-
-  static final int A[] = new int[256];
-  static final String A_DATA =
-    "\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800"+
-    "\u100F\u4800\u100F\u4800\u100F\u5800\u400F\u5000\u400F\u5800\u400F\u6000\u400F"+
-    "\u5000\u400F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800"+
-    "\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F"+
-    "\u4800\u100F\u4800\u100F\u5000\u400F\u5000\u400F\u5000\u400F\u5800\u400F\u6000"+
-    "\u400C\u6800\030\u6800\030\u2800\030\u2800\u601A\u2800\030\u6800\030\u6800"+
-    "\030\uE800\025\uE800\026\u6800\030\u2000\031\u3800\030\u2000\024\u3800\030"+
-    "\u3800\030\u1800\u3609\u1800\u3609\u1800\u3609\u1800\u3609\u1800\u3609\u1800"+
-    "\u3609\u1800\u3609\u1800\u3609\u1800\u3609\u1800\u3609\u3800\030\u6800\030"+
-    "\uE800\031\u6800\031\uE800\031\u6800\030\u6800\030\202\u7FE1\202\u7FE1\202"+
-    "\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1"+
-    "\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202"+
-    "\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1\202\u7FE1"+
-    "\202\u7FE1\uE800\025\u6800\030\uE800\026\u6800\033\u6800\u5017\u6800\033\201"+
-    "\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2"+
-    "\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201"+
-    "\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2\201\u7FE2"+
-    "\201\u7FE2\201\u7FE2\201\u7FE2\uE800\025\u6800\031\uE800\026\u6800\031\u4800"+
-    "\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u5000\u100F"+
-    "\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800"+
-    "\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F"+
-    "\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800"+
-    "\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F\u4800\u100F"+
-    "\u3800\014\u6800\030\u2800\u601A\u2800\u601A\u2800\u601A\u2800\u601A\u6800"+
-    "\034\u6800\034\u6800\033\u6800\034\000\u7002\uE800\035\u6800\031\u4800\u1010"+
-    "\u6800\034\u6800\033\u2800\034\u2800\031\u1800\u060B\u1800\u060B\u6800\033"+
-    "\u07FD\u7002\u6800\034\u6800\030\u6800\033\u1800\u050B\000\u7002\uE800\036"+
-    "\u6800\u080B\u6800\u080B\u6800\u080B\u6800\030\202\u7001\202\u7001\202\u7001"+
-    "\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202"+
-    "\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001"+
-    "\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\u6800\031\202\u7001\202"+
-    "\u7001\202\u7001\202\u7001\202\u7001\202\u7001\202\u7001\u07FD\u7002\201\u7002"+
-    "\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201"+
-    "\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002"+
-    "\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\u6800"+
-    "\031\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002\201\u7002"+
-    "\u061D\u7002";
-
-  // The B table has 256 entries for a total of 512 bytes.
-
-  static final char B[] = (
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"+
-    "\000\000\000\000\000\000\000\000\000").toCharArray();
-
-  // In all, the character property tables require 1024 bytes.
-
-    static {
-                { // THIS CODE WAS AUTOMATICALLY CREATED BY GenerateCharacter:
-            char[] data = A_DATA.toCharArray();
-            assert (data.length == (256 * 2));
-            int i = 0, j = 0;
-            while (i < (256 * 2)) {
-                int entry = data[i++] << 16;
-                A[j++] = entry | data[i++];
-            }
-        }
-
-    }        
-}
-
diff --git a/ojluni/src/main/java/java/lang/CharacterDataPrivateUse.java b/ojluni/src/main/java/java/lang/CharacterDataPrivateUse.java
deleted file mode 100644
index 35c1e5d..0000000
--- a/ojluni/src/main/java/java/lang/CharacterDataPrivateUse.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables found in
-    Java.lang.Character. */
-
-class CharacterDataPrivateUse extends CharacterData {
-
-    int getProperties(int ch) {
-        return 0;
-    }
-
-    int getType(int ch) {
-	return (ch & 0xFFFE) == 0xFFFE
-	    ? Character.UNASSIGNED
-	    : Character.PRIVATE_USE;
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-		return false;
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-		return false;
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-		return false;
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-		return false;
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-		return false;
-    }
-
-    int toLowerCase(int ch) {
-		return ch;
-    }
-
-    int toUpperCase(int ch) {
-		return ch;
-    }
-
-    int toTitleCase(int ch) {
-		return ch;
-    }
-
-    int digit(int ch, int radix) {
-		return -1;
-    }
-
-    int getNumericValue(int ch) {
-		return -1;
-    }
-
-    boolean isWhitespace(int ch) {
-		return false;
-    }
-
-    byte getDirectionality(int ch) {
-	return (ch & 0xFFFE) == 0xFFFE
-	    ? Character.DIRECTIONALITY_UNDEFINED
-	    : Character.DIRECTIONALITY_LEFT_TO_RIGHT;
-    }
-
-    boolean isMirrored(int ch) {
-		return false;
-    }
-
-    static final CharacterData instance = new CharacterDataPrivateUse();
-    private CharacterDataPrivateUse() {};
-}
-
-	
diff --git a/ojluni/src/main/java/java/lang/CharacterDataUndefined.java b/ojluni/src/main/java/java/lang/CharacterDataUndefined.java
deleted file mode 100644
index c974f5d..0000000
--- a/ojluni/src/main/java/java/lang/CharacterDataUndefined.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/** The CharacterData class encapsulates the large tables found in
-    Java.lang.Character. */
-
-class CharacterDataUndefined extends CharacterData {
-
-    int getProperties(int ch) {
-        return 0;
-    }
-
-    int getType(int ch) {
-	return Character.UNASSIGNED;
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-		return false;
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-		return false;
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-		return false;
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-		return false;
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-		return false;
-    }
-
-    int toLowerCase(int ch) {
-		return ch;
-    }
-
-    int toUpperCase(int ch) {
-		return ch;
-    }
-
-    int toTitleCase(int ch) {
-		return ch;
-    }
-
-    int digit(int ch, int radix) {
-		return -1;
-    }
-
-    int getNumericValue(int ch) {
-		return -1;
-    }
-
-    boolean isWhitespace(int ch) {
-		return false;
-    }
-
-    byte getDirectionality(int ch) {
-		return Character.DIRECTIONALITY_UNDEFINED;
-    }
-
-    boolean isMirrored(int ch) {
-		return false;
-    }
-
-    static final CharacterData instance = new CharacterDataUndefined();
-    private CharacterDataUndefined() {};
-}
diff --git a/ojluni/src/main/java/java/lang/CharacterName.java b/ojluni/src/main/java/java/lang/CharacterName.java
deleted file mode 100755
index fa0b2d6..0000000
--- a/ojluni/src/main/java/java/lang/CharacterName.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.lang.ref.SoftReference;
-import java.util.Arrays;
-import java.util.zip.InflaterInputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-class CharacterName {
-
-    private static SoftReference<byte[]> refStrPool;
-    private static int[][] lookup;
-
-    private static synchronized byte[] initNamePool() {
-        byte[] strPool = null;
-        if (refStrPool != null && (strPool = refStrPool.get()) != null)
-            return strPool;
-        DataInputStream dis = null;
-        try {
-            dis = new DataInputStream(new InflaterInputStream(
-                AccessController.doPrivileged(new PrivilegedAction<InputStream>()
-                {
-                    public InputStream run() {
-                        return getClass().getResourceAsStream("uniName.dat");
-                    }
-                })));
-
-            lookup = new int[(Character.MAX_CODE_POINT + 1) >> 8][];
-            int total = dis.readInt();
-            int cpEnd = dis.readInt();
-            byte ba[] = new byte[cpEnd];
-            dis.readFully(ba);
-
-            int nameOff = 0;
-            int cpOff = 0;
-            int cp = 0;
-            do {
-                int len = ba[cpOff++] & 0xff;
-                if (len == 0) {
-                    len = ba[cpOff++] & 0xff;
-                    // always big-endian
-                    cp = ((ba[cpOff++] & 0xff) << 16) |
-                         ((ba[cpOff++] & 0xff) <<  8) |
-                         ((ba[cpOff++] & 0xff));
-                }  else {
-                    cp++;
-                }
-                int hi = cp >> 8;
-                if (lookup[hi] == null) {
-                    lookup[hi] = new int[0x100];
-                }
-                lookup[hi][cp&0xff] = (nameOff << 8) | len;
-                nameOff += len;
-            } while (cpOff < cpEnd);
-            strPool = new byte[total - cpEnd];
-            dis.readFully(strPool);
-            refStrPool = new SoftReference<>(strPool);
-        } catch (Exception x) {
-            throw new InternalError(x.getMessage());
-        } finally {
-            try {
-                if (dis != null)
-                    dis.close();
-            } catch (Exception xx) {}
-        }
-        return strPool;
-    }
-
-    public static String get(int cp) {
-        byte[] strPool = null;
-        if (refStrPool == null || (strPool = refStrPool.get()) == null)
-            strPool = initNamePool();
-        int off = 0;
-        if (lookup[cp>>8] == null ||
-            (off = lookup[cp>>8][cp&0xff]) == 0)
-            return null;
-        return new String(strPool, 0, off >>> 8, off & 0xff);  // ASCII
-    }
-}
diff --git a/ojluni/src/main/java/java/lang/ConditionalSpecialCasing.java b/ojluni/src/main/java/java/lang/ConditionalSpecialCasing.java
deleted file mode 100755
index f45fe3a..0000000
--- a/ojluni/src/main/java/java/lang/ConditionalSpecialCasing.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.text.BreakIterator;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Locale;
-import sun.text.Normalizer;
-
-
-/**
- * This is a utility class for <code>String.toLowerCase()</code> and
- * <code>String.toUpperCase()</code>, that handles special casing with
- * conditions.  In other words, it handles the mappings with conditions
- * that are defined in
- * <a href="http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt">Special
- * Casing Properties</a> file.
- * <p>
- * Note that the unconditional case mappings (including 1:M mappings)
- * are handled in <code>Character.toLower/UpperCase()</code>.
- */
-final class ConditionalSpecialCasing {
-
-    // context conditions.
-    final static int FINAL_CASED =              1;
-    final static int AFTER_SOFT_DOTTED =        2;
-    final static int MORE_ABOVE =               3;
-    final static int AFTER_I =                  4;
-    final static int NOT_BEFORE_DOT =           5;
-
-    // combining class definitions
-    final static int COMBINING_CLASS_ABOVE = 230;
-
-    // Special case mapping entries
-    static Entry[] entry = {
-        //# ================================================================================
-        //# Conditional mappings
-        //# ================================================================================
-        new Entry(0x03A3, new char[]{0x03C2}, new char[]{0x03A3}, null, FINAL_CASED), // # GREEK CAPITAL LETTER SIGMA
-
-        //# ================================================================================
-        //# Locale-sensitive mappings
-        //# ================================================================================
-        //# Lithuanian
-        new Entry(0x0307, new char[]{0x0307}, new char[]{}, "lt",  AFTER_SOFT_DOTTED), // # COMBINING DOT ABOVE
-        new Entry(0x0049, new char[]{0x0069, 0x0307}, new char[]{0x0049}, "lt", MORE_ABOVE), // # LATIN CAPITAL LETTER I
-        new Entry(0x004A, new char[]{0x006A, 0x0307}, new char[]{0x004A}, "lt", MORE_ABOVE), // # LATIN CAPITAL LETTER J
-        new Entry(0x012E, new char[]{0x012F, 0x0307}, new char[]{0x012E}, "lt", MORE_ABOVE), // # LATIN CAPITAL LETTER I WITH OGONEK
-        new Entry(0x00CC, new char[]{0x0069, 0x0307, 0x0300}, new char[]{0x00CC}, "lt", 0), // # LATIN CAPITAL LETTER I WITH GRAVE
-        new Entry(0x00CD, new char[]{0x0069, 0x0307, 0x0301}, new char[]{0x00CD}, "lt", 0), // # LATIN CAPITAL LETTER I WITH ACUTE
-        new Entry(0x0128, new char[]{0x0069, 0x0307, 0x0303}, new char[]{0x0128}, "lt", 0), // # LATIN CAPITAL LETTER I WITH TILDE
-        new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "lt", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
-
-        //# ================================================================================
-        //# Turkish and Azeri
-//      new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
-//      new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
-        new Entry(0x0307, new char[]{}, new char[]{0x0307}, "tr", AFTER_I), // # COMBINING DOT ABOVE
-        new Entry(0x0307, new char[]{}, new char[]{0x0307}, "az", AFTER_I), // # COMBINING DOT ABOVE
-        new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "tr", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
-        new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "az", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
-        new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN SMALL LETTER I
-        new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN SMALL LETTER I
-        //# ================================================================================
-        //# Other
-        new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "en", 0), // # LATIN CAPITALLETTER I WITH DOT ABOVE
-    };
-
-    // A hash table that contains the above entries
-    static Hashtable entryTable = new Hashtable();
-    static {
-        // create hashtable from the entry
-        for (int i = 0; i < entry.length; i ++) {
-            Entry cur = entry[i];
-            Integer cp = new Integer(cur.getCodePoint());
-            HashSet set = (HashSet)entryTable.get(cp);
-            if (set == null) {
-                set = new HashSet();
-            }
-            set.add(cur);
-            entryTable.put(cp, set);
-        }
-    }
-
-    static int toLowerCaseEx(String src, int index, Locale locale) {
-        char[] result = lookUpTable(src, index, locale, true);
-
-        if (result != null) {
-            if (result.length == 1) {
-                return result[0];
-            } else {
-                return Character.ERROR;
-            }
-        } else {
-            // default to Character class' one
-            return Character.toLowerCase(src.codePointAt(index));
-        }
-    }
-
-    static int toUpperCaseEx(String src, int index, Locale locale) {
-        char[] result = lookUpTable(src, index, locale, false);
-
-        if (result != null) {
-            if (result.length == 1) {
-                return result[0];
-            } else {
-                return Character.ERROR;
-            }
-        } else {
-            // default to Character class' one
-            return Character.toUpperCaseEx(src.codePointAt(index));
-        }
-    }
-
-    static char[] toLowerCaseCharArray(String src, int index, Locale locale) {
-        return lookUpTable(src, index, locale, true);
-    }
-
-    static char[] toUpperCaseCharArray(String src, int index, Locale locale) {
-        char[] result = lookUpTable(src, index, locale, false);
-        if (result != null) {
-            return result;
-        } else {
-            return Character.toUpperCaseCharArray(src.codePointAt(index));
-        }
-    }
-
-    private static char[] lookUpTable(String src, int index, Locale locale, boolean bLowerCasing) {
-        HashSet set = (HashSet)entryTable.get(new Integer(src.codePointAt(index)));
-
-        if (set != null) {
-            Iterator iter = set.iterator();
-            String currentLang = locale.getLanguage();
-            while (iter.hasNext()) {
-                Entry entry = (Entry)iter.next();
-                String conditionLang= entry.getLanguage();
-                if (((conditionLang == null) || (conditionLang.equals(currentLang))) &&
-                        isConditionMet(src, index, locale, entry.getCondition())) {
-                    return (bLowerCasing ? entry.getLowerCase() : entry.getUpperCase());
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private static boolean isConditionMet(String src, int index, Locale locale, int condition) {
-        switch (condition) {
-        case FINAL_CASED:
-            return isFinalCased(src, index, locale);
-
-        case AFTER_SOFT_DOTTED:
-            return isAfterSoftDotted(src, index);
-
-        case MORE_ABOVE:
-            return isMoreAbove(src, index);
-
-        case AFTER_I:
-            return isAfterI(src, index);
-
-        case NOT_BEFORE_DOT:
-            return !isBeforeDot(src, index);
-
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Implements the "Final_Cased" condition
-     *
-     * Specification: Within the closest word boundaries containing C, there is a cased
-     * letter before C, and there is no cased letter after C.
-     *
-     * Regular Expression:
-     *   Before C: [{cased==true}][{wordBoundary!=true}]*
-     *   After C: !([{wordBoundary!=true}]*[{cased}])
-     */
-    private static boolean isFinalCased(String src, int index, Locale locale) {
-        BreakIterator wordBoundary = BreakIterator.getWordInstance(locale);
-        wordBoundary.setText(src);
-        int ch;
-
-        // Look for a preceding 'cased' letter
-        for (int i = index; (i >= 0) && !wordBoundary.isBoundary(i);
-                i -= Character.charCount(ch)) {
-
-            ch = src.codePointBefore(i);
-            if (isCased(ch)) {
-
-                int len = src.length();
-                // Check that there is no 'cased' letter after the index
-                for (i = index + Character.charCount(src.codePointAt(index));
-                        (i < len) && !wordBoundary.isBoundary(i);
-                        i += Character.charCount(ch)) {
-
-                    ch = src.codePointAt(i);
-                    if (isCased(ch)) {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Implements the "After_I" condition
-     *
-     * Specification: The last preceding base character was an uppercase I,
-     * and there is no intervening combining character class 230 (ABOVE).
-     *
-     * Regular Expression:
-     *   Before C: [I]([{cc!=230}&{cc!=0}])*
-     */
-    private static boolean isAfterI(String src, int index) {
-        int ch;
-        int cc;
-
-        // Look for the last preceding base character
-        for (int i = index; i > 0; i -= Character.charCount(ch)) {
-
-            ch = src.codePointBefore(i);
-
-            if (ch == 'I') {
-                return true;
-            } else {
-                cc = Normalizer.getCombiningClass(ch);
-                if ((cc == 0) || (cc == COMBINING_CLASS_ABOVE)) {
-                    return false;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Implements the "After_Soft_Dotted" condition
-     *
-     * Specification: The last preceding character with combining class
-     * of zero before C was Soft_Dotted, and there is no intervening
-     * combining character class 230 (ABOVE).
-     *
-     * Regular Expression:
-     *   Before C: [{Soft_Dotted==true}]([{cc!=230}&{cc!=0}])*
-     */
-    private static boolean isAfterSoftDotted(String src, int index) {
-        int ch;
-        int cc;
-
-        // Look for the last preceding character
-        for (int i = index; i > 0; i -= Character.charCount(ch)) {
-
-            ch = src.codePointBefore(i);
-
-            if (isSoftDotted(ch)) {
-                return true;
-            } else {
-                cc = Normalizer.getCombiningClass(ch);
-                if ((cc == 0) || (cc == COMBINING_CLASS_ABOVE)) {
-                    return false;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Implements the "More_Above" condition
-     *
-     * Specification: C is followed by one or more characters of combining
-     * class 230 (ABOVE) in the combining character sequence.
-     *
-     * Regular Expression:
-     *   After C: [{cc!=0}]*[{cc==230}]
-     */
-    private static boolean isMoreAbove(String src, int index) {
-        int ch;
-        int cc;
-        int len = src.length();
-
-        // Look for a following ABOVE combining class character
-        for (int i = index + Character.charCount(src.codePointAt(index));
-                i < len; i += Character.charCount(ch)) {
-
-            ch = src.codePointAt(i);
-            cc = Normalizer.getCombiningClass(ch);
-
-            if (cc == COMBINING_CLASS_ABOVE) {
-                return true;
-            } else if (cc == 0) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Implements the "Before_Dot" condition
-     *
-     * Specification: C is followed by <code>U+0307 COMBINING DOT ABOVE</code>.
-     * Any sequence of characters with a combining class that is
-     * neither 0 nor 230 may intervene between the current character
-     * and the combining dot above.
-     *
-     * Regular Expression:
-     *   After C: ([{cc!=230}&{cc!=0}])*[\u0307]
-     */
-    private static boolean isBeforeDot(String src, int index) {
-        int ch;
-        int cc;
-        int len = src.length();
-
-        // Look for a following COMBINING DOT ABOVE
-        for (int i = index + Character.charCount(src.codePointAt(index));
-                i < len; i += Character.charCount(ch)) {
-
-            ch = src.codePointAt(i);
-
-            if (ch == '\u0307') {
-                return true;
-            } else {
-                cc = Normalizer.getCombiningClass(ch);
-                if ((cc == 0) || (cc == COMBINING_CLASS_ABOVE)) {
-                    return false;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Examines whether a character is 'cased'.
-     *
-     * A character C is defined to be 'cased' if and only if at least one of
-     * following are true for C: uppercase==true, or lowercase==true, or
-     * general_category==titlecase_letter.
-     *
-     * The uppercase and lowercase property values are specified in the data
-     * file DerivedCoreProperties.txt in the Unicode Character Database.
-     */
-    private static boolean isCased(int ch) {
-        int type = Character.getType(ch);
-        if (type == Character.LOWERCASE_LETTER ||
-                type == Character.UPPERCASE_LETTER ||
-                type == Character.TITLECASE_LETTER) {
-            return true;
-        } else {
-            // Check for Other_Lowercase and Other_Uppercase
-            //
-            if ((ch >= 0x02B0) && (ch <= 0x02B8)) {
-                // MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
-                return true;
-            } else if ((ch >= 0x02C0) && (ch <= 0x02C1)) {
-                // MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP
-                return true;
-            } else if ((ch >= 0x02E0) && (ch <= 0x02E4)) {
-                // MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-                return true;
-            } else if (ch == 0x0345) {
-                // COMBINING GREEK YPOGEGRAMMENI
-                return true;
-            } else if (ch == 0x037A) {
-                // GREEK YPOGEGRAMMENI
-                return true;
-            } else if ((ch >= 0x1D2C) && (ch <= 0x1D61)) {
-                // MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI
-                return true;
-            } else if ((ch >= 0x2160) && (ch <= 0x217F)) {
-                // ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND
-                // SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND
-                return true;
-            } else if ((ch >= 0x24B6) && (ch <= 0x24E9)) {
-                // CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z
-                // CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    private static boolean isSoftDotted(int ch) {
-        switch (ch) {
-        case 0x0069: // Soft_Dotted # L&       LATIN SMALL LETTER I
-        case 0x006A: // Soft_Dotted # L&       LATIN SMALL LETTER J
-        case 0x012F: // Soft_Dotted # L&       LATIN SMALL LETTER I WITH OGONEK
-        case 0x0268: // Soft_Dotted # L&       LATIN SMALL LETTER I WITH STROKE
-        case 0x0456: // Soft_Dotted # L&       CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-        case 0x0458: // Soft_Dotted # L&       CYRILLIC SMALL LETTER JE
-        case 0x1D62: // Soft_Dotted # L&       LATIN SUBSCRIPT SMALL LETTER I
-        case 0x1E2D: // Soft_Dotted # L&       LATIN SMALL LETTER I WITH TILDE BELOW
-        case 0x1ECB: // Soft_Dotted # L&       LATIN SMALL LETTER I WITH DOT BELOW
-        case 0x2071: // Soft_Dotted # L&       SUPERSCRIPT LATIN SMALL LETTER I
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * An internal class that represents an entry in the Special Casing Properties.
-     */
-    static class Entry {
-        int ch;
-        char [] lower;
-        char [] upper;
-        String lang;
-        int condition;
-
-        Entry(int ch, char[] lower, char[] upper, String lang, int condition) {
-            this.ch = ch;
-            this.lower = lower;
-            this.upper = upper;
-            this.lang = lang;
-            this.condition = condition;
-        }
-
-        int getCodePoint() {
-            return ch;
-        }
-
-        char[] getLowerCase() {
-            return lower;
-        }
-
-        char[] getUpperCase() {
-            return upper;
-        }
-
-        String getLanguage() {
-            return lang;
-        }
-
-        int getCondition() {
-            return condition;
-        }
-    }
-}
diff --git a/ojluni/src/main/native/Character.cpp b/ojluni/src/main/native/Character.cpp
new file mode 100644
index 0000000..faa27b8
--- /dev/null
+++ b/ojluni/src/main/native/Character.cpp
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Google designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Google in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "jni.h"
+#include "jvm.h"
+#include "JNIHelp.h"
+#include "unicode/uchar.h"
+#include "unicode/uscript.h"
+#include <math.h>
+#include <stdio.h> // For BUFSIZ
+
+#define NATIVE_METHOD(className, functionName, signature) \
+{ #functionName, signature, (void*)(className ## _ ## functionName) }
+
+JNIEXPORT jboolean JNICALL
+Character_isLowerCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_islower(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isUpperCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isupper(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isTitleCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_istitle(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isDigitImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isdigit(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isLetterImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isalpha(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isLetterOrDigitImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isalnum(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isAlphabeticImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_hasBinaryProperty(codePoint, UCHAR_ALPHABETIC);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isIdeographicImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_hasBinaryProperty(codePoint, UCHAR_IDEOGRAPHIC);
+}
+
+JNIEXPORT jint JNICALL
+Character_getTypeImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_charType(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isUnicodeIdentifierStartImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isIDStart(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isUnicodeIdentifierPartImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isIDPart(codePoint);
+}
+
+JNIEXPORT jint JNICALL
+Character_toLowerCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_tolower(codePoint);
+}
+
+JNIEXPORT jint JNICALL
+Character_toUpperCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_toupper(codePoint);
+}
+
+JNIEXPORT jint JNICALL
+Character_toTitleCaseImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_totitle(codePoint);
+}
+
+JNIEXPORT jint JNICALL
+Character_digitImpl(JNIEnv* env, jclass, jint codePoint, jint radix) {
+  return u_digit(codePoint, radix);
+}
+
+JNIEXPORT jint JNICALL
+Character_getNumericValueImpl(JNIEnv* env, jclass, jint codePoint) {
+  double result = u_getNumericValue(codePoint);
+  if (result == U_NO_NUMERIC_VALUE) {
+    return -1;
+  } else if (result < 0 || floor(result + 0.5) != result) {
+    return -2;
+  }
+  return static_cast<jint>(result);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isWhitespaceImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isWhitespace(codePoint);
+}
+
+JNIEXPORT jbyte JNICALL
+Character_getDirectionalityImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_charDirection(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isMirroredImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isMirrored(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isDefinedImpl(JNIEnv* env, jclass, jint codePoint) {
+  return u_isdefined(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isIdentifierIgnorableImpl(JNIEnv* env, jclass, jint codePoint) {
+    return u_isIDIgnorable(codePoint);
+}
+
+JNIEXPORT jboolean JNICALL
+Character_isSpaceCharImpl(JNIEnv*, jclass, jint codePoint) {
+    return u_isJavaSpaceChar(codePoint);
+}
+
+JNIEXPORT jstring JNICALL
+Character_getNameImpl(JNIEnv* env, jclass, jint codePoint) {
+    // U_UNICODE_CHAR_NAME gives us the modern names for characters. For control characters,
+    // we need U_EXTENDED_CHAR_NAME to get "NULL" rather than "BASIC LATIN 0" and so on.
+    // We could just use U_EXTENDED_CHAR_NAME except that it returns strings for characters
+    // that aren't unassigned but that don't have names, and those strings aren't in the form
+    // Java specifies.
+    bool isControl = (codePoint <= 0x1f || (codePoint >= 0x7f && codePoint <= 0x9f));
+    UCharNameChoice nameType = isControl ? U_EXTENDED_CHAR_NAME : U_UNICODE_CHAR_NAME;
+    UErrorCode status = U_ZERO_ERROR;
+    char buf[BUFSIZ]; // TODO: is there a more sensible upper bound?
+    int32_t byteCount = u_charName(codePoint, nameType, &buf[0], sizeof(buf), &status);
+    return (U_FAILURE(status) || byteCount == 0) ? NULL : env->NewStringUTF(buf);
+}
+
+static JNINativeMethod gMethods[] = {
+  NATIVE_METHOD(Character, digitImpl, "!(II)I"),
+  NATIVE_METHOD(Character, getDirectionalityImpl, "!(I)B"),
+  NATIVE_METHOD(Character, getNameImpl, "(I)Ljava/lang/String;"),
+  NATIVE_METHOD(Character, getNumericValueImpl, "!(I)I"),
+  NATIVE_METHOD(Character, getTypeImpl, "!(I)I"),
+  NATIVE_METHOD(Character, isAlphabeticImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isDefinedImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isDigitImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isIdentifierIgnorableImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isIdeographicImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isLetterImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isLetterOrDigitImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isLowerCaseImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isMirroredImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isSpaceCharImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isTitleCaseImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isUnicodeIdentifierPartImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isUnicodeIdentifierStartImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isUpperCaseImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, isWhitespaceImpl, "!(I)Z"),
+  NATIVE_METHOD(Character, toLowerCaseImpl, "!(I)I"),
+  NATIVE_METHOD(Character, toTitleCaseImpl, "!(I)I"),
+  NATIVE_METHOD(Character, toUpperCaseImpl, "!(I)I"),
+};
+
+void register_java_lang_Character(JNIEnv* env) {
+  jniRegisterNativeMethods(env, "java/lang/Character", gMethods, NELEM(gMethods));
+}
diff --git a/ojluni/src/main/native/Register.cpp b/ojluni/src/main/native/Register.cpp
index 174e027..f98db36 100644
--- a/ojluni/src/main/native/Register.cpp
+++ b/ojluni/src/main/native/Register.cpp
@@ -73,6 +73,8 @@
 
 }
 
+extern void register_java_lang_Character(JNIEnv*);
+
 // DalvikVM calls this on startup, so we can statically register all our native methods.
 jint JNI_OnLoad(JavaVM* vm, void*) { JNIEnv* env;
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
@@ -107,6 +109,7 @@
     register_java_net_SocketInputStream(env);
     register_java_net_SocketOutputStream(env);
     register_sun_net_spi_DefaultProxySelector(env);
+    register_java_lang_Character(env);
     register_java_lang_Float(env);
     register_java_lang_Double(env);
     register_java_lang_StrictMath(env);
diff --git a/ojluni/src/main/native/openjdksub.mk b/ojluni/src/main/native/openjdksub.mk
index f481f02..f57fc6c 100644
--- a/ojluni/src/main/native/openjdksub.mk
+++ b/ojluni/src/main/native/openjdksub.mk
@@ -1,4 +1,4 @@
-# -*- mode: makefile -*-
+\# -*- mode: makefile -*-
 # This file is included by the top-level libcore Android.mk.
 # It's not a normal makefile, so we don't include CLEAR_VARS
 # or BUILD_*_LIBRARY.
@@ -64,10 +64,12 @@
     Shutdown.c \
     UNIXProcess_md.c \
     Bits.c \
+    Character.cpp \
     Register.cpp \
 
 LOCAL_C_INCLUDES += \
        libcore/$(srcdir) \
        external/fdlibm \
        external/openssl/include \
-       external/zlib
+       external/zlib \
+       external/icu/icu4c/source/common \
diff --git a/openjdk_java_files.mk b/openjdk_java_files.mk
index 44ee0cd..764be83 100644
--- a/openjdk_java_files.mk
+++ b/openjdk_java_files.mk
@@ -111,16 +111,7 @@
     ojluni/src/main/java/java/lang/AutoCloseable.java \
     ojluni/src/main/java/java/lang/Boolean.java \
     ojluni/src/main/java/java/lang/Byte.java \
-    ojluni/src/main/java/java/lang/CharacterData00.java \
-    ojluni/src/main/java/java/lang/CharacterData01.java \
-    ojluni/src/main/java/java/lang/CharacterData02.java \
-    ojluni/src/main/java/java/lang/CharacterData0E.java \
-    ojluni/src/main/java/java/lang/CharacterData.java \
-    ojluni/src/main/java/java/lang/CharacterDataLatin1.java \
-    ojluni/src/main/java/java/lang/CharacterDataPrivateUse.java \
-    ojluni/src/main/java/java/lang/CharacterDataUndefined.java \
     ojluni/src/main/java/java/lang/Character.java \
-    ojluni/src/main/java/java/lang/CharacterName.java \
     ojluni/src/main/java/java/lang/CharSequence.java \
     ojluni/src/main/java/java/lang/ClassCastException.java \
     ojluni/src/main/java/java/lang/ClassCircularityError.java \
@@ -132,7 +123,6 @@
     ojluni/src/main/java/java/lang/CloneNotSupportedException.java \
     ojluni/src/main/java/java/lang/Comparable.java \
     ojluni/src/main/java/java/lang/Compiler.java \
-    ojluni/src/main/java/java/lang/ConditionalSpecialCasing.java \
     ojluni/src/main/java/java/lang/Deprecated.java \
     ojluni/src/main/java/java/lang/Double.java \
     ojluni/src/main/java/java/lang/EnumConstantNotPresentException.java \