Changeset 961

Timestamp:

08/05/09 21:34:46 (4 years ago)

Author:

dmisev

Message:

#472

Location:

src/jomdoc/trunk/src

Files:

• jomdoc/org/omdoc/jomdoc/cli/JOMDoc.java (modified) (2 diffs)
• jomdoc/org/omdoc/jomdoc/cli/JOMDocCommandEnvironment.java (modified) (4 diffs)
• jomdoc/org/omdoc/jomdoc/cli/JOMDocOption.java (modified) (1 diff)
• jomdoc/org/omdoc/jomdoc/cli/cmd/RenderCommand.java (modified) (1 diff)
• jomdoc/org/omdoc/jomdoc/cli/cmd/TransformCommand.java (modified) (1 diff)
• jomdoc/org/omdoc/jomdoc/cli/options.properties (modified) (1 diff)
• jomdoc/org/omdoc/jomdoc/util/xml/XMLUtil.java (modified) (1 diff)
• jomdoc/org/omdoc/jomdoc/util/xml/XSLTUtil.java (modified) (1 diff)
• test/org/omdoc/jomdoc/cli/JOMDocTest.java (modified) (1 diff)

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/JOMDoc.java

@@ -240 +240 @@
 
         CommandLine.registerOption(JOMDocOption.ASCII_XML);
+        CommandLine.registerOption(JOMDocOption.NO_PRETTY_PRINT);
     }
 
@@ -290 +291 @@
         if (doc != null && output != null) {
             try {
-                XMLUtil.serialize(doc, output);
+                if (JOMDocCommandEnvironment.noPrettyPrint)
+                    XMLUtil.rawSerialize(doc, output);
+                else
+                    XMLUtil.serialize(doc, output);
 //        new Serializer (output, "UTF-8").write (doc);
             } catch (UnsupportedEncodingException e) {

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/JOMDocCommandEnvironment.java

@@ -84 +84 @@
 
     private boolean asciiXML;
+    public static boolean noPrettyPrint;
 
     public JOMDocCommandEnvironment(String programName, PrintStream out, PrintStream err, InputStream in) {
@@ -151 +152 @@
             return;
         }
+        noPrettyPrint = false;
 
         File file = null;
@@ -223 +225 @@
         } else if (option == JOMDocOption.ASCII_XML) {
             asciiXML = true;
+        } else if (option == JOMDocOption.NO_PRETTY_PRINT) {
+            noPrettyPrint = true;
         } else {
             Log.error("Unknown option: " + option);
@@ -383 +387 @@
         return replaceXPaths;
     }
+
+    public boolean isNoPrettyPrint() {
+        return noPrettyPrint;
+    }
 }

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/JOMDocOption.java

@@ -73 +73 @@
 
     public static final JOMDocOption ASCII_XML = new JOMDocOption("ascii-xml");
+    public static final JOMDocOption NO_PRETTY_PRINT = new JOMDocOption("no-pretty-print");
     
     private JOMDocOption(String name) {

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/cmd/RenderCommand.java

@@ -108 +108 @@
         options.add(JOMDocOption.RENDERING_INFO);
         options.add(JOMDocOption.PROTOTYPE_INFO);
+        options.add(JOMDocOption.NO_PRETTY_PRINT);
 
         return options;

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/cmd/TransformCommand.java

@@ -100 +100 @@
 
         options.add(JOMDocOption.ASCII_XML);
+        options.add(JOMDocOption.NO_PRETTY_PRINT);
 
         return options;

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/cli/options.properties

@@ -64 +64 @@
 
 ascii-xml=transform notation definitions from ASCII to XML
+no-pretty-print=don't pretty print the output

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/util/xml/XMLUtil.java

@@ -220 +220 @@
     /**
      * Serialize a XOM Document.
-     * 
+     *
      * @param xomDocument the XOM Document to be serialized
      * @param os stream where to write the result
-     * @throws IOException 
+     * @throws IOException
+     */
+    public static String rawSerialize(Document xomDocument) throws IOException {
+        OutputStream os = new ByteArrayOutputStream();
+        rawSerialize(xomDocument, os);
+        return os.toString();
+    }
+
+    /**
+     * Serialize a XOM Document.
+     *
+     * @param xomDocument the XOM Document to be serialized
+     * @param os stream where to write the result
+     * @throws IOException
      */
     public static void serialize(Document xomDocument, OutputStream os) throws IOException {
         nu.xom.Serializer serializer = new nu.xom.Serializer(os);
         serializer.setIndent(2);
+        serializer.write(xomDocument);
+    }
+
+    /**
+     * Serialize a XOM Document without pretty printing the result.
+     *
+     * @param xomDocument the XOM Document to be serialized
+     * @param os stream where to write the result
+     * @throws IOException
+     */
+    public static void rawSerialize(Document xomDocument, OutputStream os) throws IOException {
+        nu.xom.Serializer serializer = new nu.xom.Serializer(os);
         serializer.write(xomDocument);
     }

src/jomdoc/trunk/src/jomdoc/org/omdoc/jomdoc/util/xml/XSLTUtil.java

@@ -270 +270 @@
     public static Document getDefaultXSLT() throws IOException, ParsingException {
         if (defaultXslt == null) {
-            InputStream is = XSLTUtil.class.getResourceAsStream(XSLT_DIR + DEFAULT_XSLT_FILE);
-            defaultXslt = XMLUtil.buildDocument(null, is);
+            try {
+                InputStream is = XSLTUtil.class.getResourceAsStream(XSLT_DIR + DEFAULT_XSLT_FILE);
+                defaultXslt = XMLUtil.buildDocument(null, is);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+        }
         }
 

src/jomdoc/trunk/src/test/org/omdoc/jomdoc/cli/JOMDocTest.java

@@ -165 +165 @@
         render(IN + "quant2.omdoc", "-o", OUT + "quant2.omdoc");
     }
+
+    @Ignore
+    @Test
+    public void testNoPrettyPrint() {
+        String out = OUT + "noPrettyPrint.omdoc";
+        String inp = IN + "binomial.omdoc";
+        render(inp, "-o", out, "-X", "--no-pretty-print");
+        rm(out);
+    }
 }