Fixed generated prettyprinter so that workpiece.x3d is now handled completly.

CompilerGeneration.jrag

@@ -19,10 +19,10 @@ aspect AbsGrammarGeneration {
     public void Start.genAbsGrammar(PrintStream pStream) {
 		pStream.println("// Predefined types");
 		pStream.println("Start ::= Specification;");
-//         pStream.println("Specification ::= XmlHeader [DocType] Element*;");
-        pStream.println("Specification ::= XmlHeader Element*;");
+        pStream.println("Specification ::= XmlHeader [DocType] Element*;");
+//         pStream.println("Specification ::= XmlHeader Element*;");
         pStream.println("XmlHeader ::= Attribute*;");
-        pStream.println("DocType ::= ;");
+        pStream.println("DocType ::= <STRING>;");
 		pStream.println("abstract Thing : ComplexElement ::=;");
 		pStream.println("abstract Element;");
 //  		pStream.println("ComplexElement : Element ::=  OwlIdentifier Attribute* Element*;");
@@ -109,11 +109,11 @@ aspect GenJavaCC {
         pStream.println("void Specification() #Specification : {}");
         pStream.println("{");
         pStream.println("  XmlHeader()");
-//         pStream.println("  [DocType()]");
+        pStream.println("  ( [DocType()] ) #Opt(true)");
         pStream.println("  ElementList()");
         pStream.println("}");
         pStream.println();
-        pStream.println("void DocType() #Opt : {String s;}");
+        pStream.println("void DocType() #DocType : {String s;}");
         pStream.println("{");
         pStream.println("  <LTBANG>");
         pStream.println("  {");
@@ -122,7 +122,8 @@ aspect GenJavaCC {
         pStream.println("		   s += getData();");
         pStream.println("        } ");
         pStream.println("  }       ");
-        pStream.println("//     {jjtThis.setSTRING(s);}");
+        pStream.println("  <GT>");
+        pStream.println("     {jjtThis.setSTRING(s);}");
         pStream.println("}");
         pStream.println();
         pStream.println("JAVACODE");
@@ -142,6 +143,7 @@ aspect GenJavaCC {
         pStream.println("			}");
         pStream.println("		}");
         pStream.println("		s.append(t.image);");
+        pStream.println("       s.append(\" \");");
         pStream.println("	}");
         pStream.println("	return s.toString();");
         pStream.println("}");
@@ -384,6 +386,12 @@ aspect GenPrettyPrinter {
 		pStream.println("    pStream.println(\"?> \");");
 		pStream.println("  }\n");
 
+		pStream.println("  public void DocType.prettyPrint(String indent, PrintStream pStream) {");
+		pStream.println("    pStream.print(\"<!\");");
+        pStream.println("    pStream.print(getSTRING());");
+		pStream.println("    pStream.println(\"> \");");
+		pStream.println("  }\n");
+
 		pStream.println("  public void AttrValue.prettyPrint(String indent, PrintStream pStream) {");
 		pStream.println("    pStream.print(getSTRING_LITERAL());");
 		pStream.println("  }\n");

JavaCCChunks.jrag

@@ -16,6 +16,9 @@ aspect JavaCCChunks {
 		pStream.println("    NODE_PREFIX                 = \"\";");
 		pStream.println("    JAVA_UNICODE_ESCAPE         = true;");
 		pStream.println("    STATIC                      = false;");
+// 		pStream.println("  	DEBUG_PARSER                = true;");
+// 		pStream.println(" 	DEBUG_LOOKAHEAD             = true;");
+// 		pStream.println("  	DEBUG_TOKEN_MANAGER         = true;");
 		pStream.println("} ");
 		pStream.println();
 		pStream.println("PARSER_BEGIN(XmlParser)");