checkpoint

[sbp.git] / src / edu / berkeley / sbp / tib / TibDoc.java

diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java
index d8f24ff..e264029 100644 (file)
--- a/src/edu/berkeley/sbp/tib/TibDoc.java
+++ b/src/edu/berkeley/sbp/tib/TibDoc.java
@@ -357,12 +357,41 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
 
         public static class Paragraph extends Dump { }
         public @tag("P") static class P extends Paragraph {
-            Object text;
+            public Text[] text;
         }
         public @tag("HR") static class HR extends Paragraph { }
         public @tag("Blockquote") static class Blockquote extends Paragraph {
             Object text;
         }
+
+        public static class Text extends Dump { }
+        public @tag static class Chars extends Text {
+            public String text;
+        }
+        public @tag static class Block extends Text { public Text[] text; }
+        public static class TextWrap extends Text {
+            public Text text;
+        }
+        public static @tag class Verbatim   extends Text { public char[] c; }
+        //public @tag class Blockquote extends TextWrap { }
+        public static @tag class Underline extends TextWrap { }
+        public static @tag class Footnote extends TextWrap { }
+        public static @tag class TT extends TextWrap { }
+        //public @tag class Citation extends Text {       "[" word "]" }
+        public static @tag class Strikethrough extends TextWrap { }
+        //public @tag class Superscript extends TextWrap { }
+        //public @tag class Subscript extends TextWrap { }
+        public static @tag class Smallcap extends TextWrap { }
+        //public @tag class Keyword extends TextWrap { }
+        public static @tag class Bold extends TextWrap { }
+        public static @tag class Italic extends TextWrap { }
+
+        public static class Command extends Text { }
+        public static @tag class Today extends Command { }
+        public static @tag class LineBreak extends Command { }
+
+        public static class Glyph extends Text { }
+        public static @tag("emdash") class Emdash extends Glyph { }
     }
 
     public static void main(String[] s) throws Exception {
@@ -379,7 +408,25 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
                                             TibDoc.TD.P.class,
                                             TibDoc.TD.HR.class,
                                             TibDoc.TD.Blockquote.class,
-                                            TibDoc.TD.KeyVal.class
+                                            TibDoc.TD.KeyVal.class,
+                                            TibDoc.TD.Text.class,
+                                            TibDoc.TD.TextWrap.class,
+                                            TibDoc.TD.Verbatim.class,
+                                            TibDoc.TD.Blockquote.class,
+                                            TibDoc.TD.Underline.class,
+                                            TibDoc.TD.Footnote.class,
+                                            TibDoc.TD.TT.class,
+                                            TibDoc.TD.Strikethrough.class,
+                                            //TibDoc.TD.Superscript.class,
+                                            //TibDoc.TD.Subscript.class,
+                                            TibDoc.TD.Smallcap.class,
+                                            TibDoc.TD.Bold.class,
+                                            //TibDoc.TD.Keyword.class,
+                                            TibDoc.TD.Italic.class,
+                                            TibDoc.TD.Today.class,
+                                            TibDoc.TD.LineBreak.class,
+                                            TibDoc.TD.Chars.class,
+                                            TibDoc.TD.Emdash.class,
                                         });
             Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
             MetaGrammar.Meta.MetaGrammarFile mgf = m.new MetaGrammarFile(res);