Changeset 295

Timestamp:

11/30/08 23:37:58 (4 years ago)

Author:

dmisev

Message:

 

Location:

src/jomdoc/trunk/src

Files:

• jomdoc/org/jomdoc/ntn/coll/ntn/D.java (modified) (4 diffs)
• jomdoc/org/jomdoc/ntn/coll/ntn/NotationCollector.java (modified) (2 diffs)
• test/org/jomdoc/cli/JOMDocTest.java (modified) (1 diff)

src/jomdoc/trunk/src/jomdoc/org/jomdoc/ntn/coll/ntn/D.java

@@ -27 +27 @@
 import nu.xom.Element;
 import nu.xom.ParsingException;
+import org.jomdoc.ntn.rnd.Renderer;
 import org.jomdoc.util.etc.IOUtil;
 import org.jomdoc.util.etc.NtnUtil;
@@ -47 +48 @@
 
     private F f;
+
+    private Renderer renderer;
 
     /* cdbase -> D (cache for already loaded documents) */
@@ -105 +108 @@
     public List<Element> getNotations(Element mobj) throws Exception {
         Element e = null;
-        if (NotationCollector.renderer != null && NotationCollector.renderer.getCurrent() != null) {
-            e = XMLUtil.getParent(NotationCollector.renderer.getCurrent(), XMLSymbols.LABEL_THEORY);
+        if (renderer != null && renderer.getCurrent() != null) {
+            e = XMLUtil.getParent(renderer.getCurrent(), XMLSymbols.LABEL_THEORY);
         } else {
             e = XMLUtil.getParent(mobj, XMLSymbols.LABEL_THEORY);
@@ -129 +132 @@
     });
 
+    public void setRenderer(Renderer renderer) {
+        this.renderer = renderer;
+    }
+
     @Override
     public String toString() {

src/jomdoc/trunk/src/jomdoc/org/jomdoc/ntn/coll/ntn/NotationCollector.java

@@ -62 +62 @@
     private static boolean useDefault = true;
 
-    public static Renderer renderer;
+    public Renderer renderer;
 
     /**
@@ -108 +108 @@
             if (srcs == null || srcs.contains(notationSource)) {
                 try {
+                    if (notationSource instanceof D) {
+                        ((D)notationSource).setRenderer(renderer);
+                    }
                     tmp = notationSource.getNotations(mobj);
                     if (tmp != null && !tmp.isEmpty())

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

@@ -273 +273 @@
     @Test
     public void testImportsAware7() {
-        render("-t", "/home/dimitar/kwarc/omdoc/examples/varia/jobad.omdoc", "-o", "/home/dimitar/out.omdoc", "-v");
+        render("-p", "-t", "/home/dimitar/kwarc/omdoc/examples/varia/jobad.omdoc", "-o", "/home/dimitar/out.omdoc", "-v");
     }
 }