Changeset 301

Timestamp:

12/01/08 17:51:00 (4 years ago)

Author:

dmisev

Message:

fixed #175

Location:

src/jomdoc/trunk/src

Files:

• jomdoc/org/jomdoc/ntn/rnd/AbstractRenderer.java (modified) (2 diffs)
• jomdoc/org/jomdoc/util/etc/NtnUtil.java (modified) (1 diff)
• test/org/jomdoc/cli/JOMDocTest.java (modified) (2 diffs)

src/jomdoc/trunk/src/jomdoc/org/jomdoc/ntn/rnd/AbstractRenderer.java

@@ -104 +104 @@
     public Document render(Document doc) throws XSLException, IOException, ParsingException {
         Document ret = new Document(doc);
+
+        // preprocessing the input document
         try {
             contract(ret, "OMR");
         } catch (Exception ex) {
-            Log.error("Error contracting OMR elements in the document", ex);
-        }
-        
-        Log.debug("Started rendering document: " + doc.getBaseURI().toString(), 
-                ntnCollector.toString(), ctxCollector.toString());
-        
+            Log.warn("Error contracting OMR elements in the document", ex);
+        }
+        try {
+            nestOMATTR(doc);
+        } catch (Exception ex) {
+            Log.warn("Error nesting OMATTR key -> value lists", ex);
+        }
+
+        // rendering
+        Log.debug("Started rendering document: " + doc.getBaseURI(), ntnCollector, ctxCollector);
         List<Element> mobjs = mobjs(ret);
         
@@ -127 +133 @@
             }
         }
-        
+
+        // transforming the rendered result
         if (xslt != null) {
             Log.debug("Transforming the rendered document, with " + xslt.getBaseURI());

src/jomdoc/trunk/src/jomdoc/org/jomdoc/util/etc/NtnUtil.java

@@ -512 +512 @@
         RefContraction contr = new RefContraction(true);
         contr.evaluate(e, 0);
+    }
+
+    public static void nestOMATTR(Document doc) {
+        DFSTraversor traversor = new DFSTraversor(new Filter() {
+
+            public boolean evaluate(Object node, int depth) {
+                if (!(node instanceof Element)) {
+                    return false;
+                }
+
+                Element e = (Element) node;
+                if (!e.getLocalName().equals(LABEL_OMATTR)) {
+                    return false;
+                }
+
+                int omatpChildren = 0;
+                Element nest = new Element(LABEL_OMATTR, NAMESPACE_OPENMATH);
+                for (int i = 0; i < e.getChildCount(); i++) {
+                    Node n = e.getChild(i);
+                    if (omatpChildren == 2) {
+                        n.detach();
+                        nest.appendChild(n);
+                    } else if (n instanceof Element) {
+                        Element c = (Element) n;
+
+                        if (omatpChildren < 2) {
+                            if (c.getLocalName().equals(LABEL_OMATP)) {
+                                ++omatpChildren;
+                                if (omatpChildren == 2) {
+                                    c.detach();
+                                    nest.appendChild(c);
+                                }
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                }
+                if (omatpChildren == 2) {
+                    e.appendChild(nest);
+                }
+
+                return false;
+            }
+        });
+
+        traversor.traverse(new TraversableXOM(doc.getRootElement()));
     }
 

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

@@ -6 +6 @@
 package org.jomdoc.cli;
 
+import java.io.File;
+import nu.xom.Document;
 import org.jomdoc.Paths;
 import org.jomdoc.util.err.ErrorCode;
 import org.jomdoc.util.etc.Log;
+import org.jomdoc.util.etc.NtnUtil;
 import org.jomdoc.util.etc.StringUtil;
+import org.jomdoc.util.xml.XMLUtil;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -307 +311 @@
      * Ticket #167
      */
+    @Ignore
     @Test
     public void testImportsAware11() {
         render("-t", "/home/dimitar/kwarc/omdoc/examples/varia/fitch-proof.omdoc", "-o", "/home/dimitar/out.xhtml", "-v", "-x", "/home/dimitar/kwarc/jomdoc/xsl2/omdoc2pmml-copymobj.xsl");
     }
+
+    /**
+     * Ticket #175
+     */
+    @Test
+    public void testOmattrNesting() {
+        try {
+            Document doc = XMLUtil.buildDocument(new File(IN + "nesting-omattr.omdoc"));
+            NtnUtil.nestOMATTR(doc);
+            System.out.println(XMLUtil.serialize(doc));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
 }