Changeset 1529

Timestamp:

06/18/20 13:50:48 (4 years ago)

Author:

bnemhaus

Message:

When running the "WriteTree tex" action, the presence of the annotation "@flowwalker" is tested for. If it is present then the flow walker is used!

Location:

trunk/src/org/expeditee

Files:

• agents/WriteTree.java (modified) (1 diff)
• io/DefaultTreeWriter.java (modified) (3 diffs)
• io/TEXWriter.java (modified) (2 diffs)

trunk/src/org/expeditee/agents/WriteTree.java

@@ -60 +60 @@
 
                 _format = format.trim();
+                
 
                 int ind = params.indexOf(" ");

trunk/src/org/expeditee/io/DefaultTreeWriter.java

@@ -20 +20 @@
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
@@ -47 +48 @@
                 try {
                         initialise(toWrite);
-                        outputTree(toWrite);
+                        //outputTree(toWrite);
+                        outputTreeFlowWalkerStyle(toWrite);
 
                 } catch (IOException ioe) {
@@ -184 +186 @@
         }
 
+        protected void outputTreeFlowWalkerStyle(Frame toWrite) {
+                XGroupItem.doImplicitBoxing = true;
+                XGroupItem xgroup = new XGroupItem(toWrite, new ArrayList<Item>(toWrite.getAllItems()));
+                xgroup.repositionOutOfFlowGroups(xgroup);
+                xgroup.mapInXGroupItemsRecursive(xgroup.getGroupedItemList());
+                
+                ArrayList<Item> yxOverlappingItemList = xgroup.getYXOverlappingItemList();
+                
+                for(Item i: yxOverlappingItemList) {
+                        if (i instanceof Text) {
+                                Text t = (Text) i;
+                                if (t.isAnnotation()) { continue; }
+                                Text titleItem = t.getParent().getTitleItem();
+                                if (t.equals(titleItem)) { continue; }
+                                if (t.hasLink()) {
+                                        Frame toWalk = FrameIO.LoadFrame(t.getAbsoluteLink());
+                                        outputTreeFlowWalkerStyle(toWalk);
+                                        continue;
+                                }
+                                try {
+                                        this.writeItem(t);
+                                } catch (IOException e) {
+                                        System.err.println("DefaultTreeWriter::outputTreeFlowWalkerStyle::IOException while writing item.");
+                                        System.err.println(e.getMessage());
+                                }
+                        }
+                }
+        }
+        
         protected String finaliseTree() throws IOException {
                 return "Tree" + finalise();

trunk/src/org/expeditee/io/TEXWriter.java

@@ -32 +32 @@
         // may be needed for sectioning commands
         private Text _title = null;
+        private boolean useFlowWalker = false;
+        
+        public String writeTree(Frame toWrite) throws IOException {
+                try {
+                        initialise(toWrite);
+                        if (useFlowWalker) {
+                                System.err.println("USING FLOW WALKER FOR TEXTWriter");
+                                outputTreeFlowWalkerStyle(toWrite);
+                        } else {
+                                outputTree(toWrite);
+                        }
+                } catch (IOException ioe) {
+                        _running = false;
+                        throw ioe;
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                _running = false;
+                return finaliseTree();
+        }
 
         @Override
         protected void initialise(Frame start, Writer writer) throws IOException {
                 _format = ".tex";
+                Text annotation = start.getAnnotation("flowwalker");
+                if (annotation != null) {
+                        useFlowWalker  = true;
+                }
                 super.initialise(start, writer);
         }
@@ -104 +128 @@
 
         @Override
-        protected void writeText(Text text) throws IOException {
+        protected void writeText(Text text) throws IOException {        
                 for (String s : text.getTextList()) {
                         _writer.write(s);