--- /home/cpdev/src/classpath/gnu/xml/stream/XMLParser.java	2006-01-16 17:32:44.000000000 +0000
+++ gnu/xml/stream/XMLParser.java	2006-01-13 17:34:14.000000000 +0000
@@ -2419,11 +2419,11 @@
               }
             else
               {
-                if (!isNameStartCharacter(cp[0], input.xml11))
+                if (!isNameStartCharacter(cp[0]))
                   error("malformed reference in entity value", value);
                 for (int i = 1; i < cp.length; i++)
                   {
-                    if (!isNameCharacter(cp[i], input.xml11))
+                    if (!isNameCharacter(cp[i]))
                       error("malformed reference in entity value", value);
                   }
               }
@@ -3469,13 +3469,13 @@
     int c = readCh();
     if (isName)
       {
-        if (!isNameStartCharacter(c, input.xml11))
+        if (!isNameStartCharacter(c))
           error("not a name start character",
                 "U+" + Integer.toHexString(c));
       }
     else
       {
-        if (!isNameCharacter(c, input.xml11))
+        if (!isNameCharacter(c))
           error("not a name character",
                 "U+" + Integer.toHexString(c));
       }
@@ -3510,7 +3510,7 @@
             reset();
             return intern(buf.toString());
           default:
-            if (!isNameCharacter(c, input.xml11))
+            if (!isNameCharacter(c))
               error("not a name character",
                     "U+" + Integer.toHexString(c));
             else
@@ -3523,7 +3523,7 @@
   /**
    * Indicates whether the specified Unicode character is an XML 1.1 Char.
    */
-  public static boolean isXML11Char(int c)
+  private boolean isXML11Char(int c)
   {
     return ((c >= 0x0001 && c <= 0xD7FF) ||
             (c >= 0xE000 && c < 0xFFFD) || // NB exclude 0xfffd
@@ -3534,7 +3534,7 @@
    * Indicates whether the specified Unicode character is an XML 1.1
    * RestrictedChar.
    */
-  public static boolean isXML11RestrictedChar(int c)
+  private boolean isXML11RestrictedChar(int c)
   {
     return ((c >= 0x0001 && c <= 0x0008) ||
             (c >= 0x000B && c <= 0x000C) ||
@@ -3556,17 +3556,17 @@
           return false;
         if (isName)
           {
-            if (!isNameStartCharacter(cp[0], input.xml11))
+            if (!isNameStartCharacter(cp[0]))
               return false;
           }
         else
           {
-            if (!isNameCharacter(cp[0], input.xml11))
+            if (!isNameCharacter(cp[0]))
               return false;
           }
         for (int i = 1; i < cp.length; i++)
           {
-            if (!isNameCharacter(cp[i], input.xml11))
+            if (!isNameCharacter(cp[i]))
               return false;
           }
         return true;
@@ -3581,9 +3581,9 @@
    * Indicates whether the specified Unicode character is a Name start
    * character.
    */
-  public static boolean isNameStartCharacter(int c, boolean xml11)
+  private boolean isNameStartCharacter(int c)
   {
-    if (xml11)
+    if (input.xml11)
       return ((c >= 0x0041 && c <= 0x005a) ||
               (c >= 0x0061 && c <= 0x007a) ||
               c == 0x3a |
@@ -3608,9 +3608,9 @@
    * Indicates whether the specified Unicode character is a Name non-initial
    * character.
    */
-  public static boolean isNameCharacter(int c, boolean xml11)
+  private boolean isNameCharacter(int c)
   {
-    if (xml11)
+    if (input.xml11)
       return ((c >= 0x0041 && c <= 0x005a) ||
               (c >= 0x0061 && c <= 0x007a) ||
               (c >= 0x0030 && c <= 0x0039) ||