X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTibDoc.java;h=ee1a8612e8839e2d69e580196cd34cbfefee80d8;hp=dae47a680c898fd3aa157c7d3712727d0625cafa;hb=2ca60a30895e90a0458361974402cee001498784;hpb=d948b6363742aa34d9269cb4a49407e439ee896d

diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java
index dae47a6..ee1a861 100644
--- a/src/edu/berkeley/sbp/tib/TibDoc.java
+++ b/src/edu/berkeley/sbp/tib/TibDoc.java
@@ -612,12 +612,13 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
         public static class Link extends Text {
             public Text[] t;
             public Url u;
-            public @bind.as("link")  Link(@bind.arg Text[] t, @bind.arg Url u)  { this.t = t; this.u = u; }
-            public Link(String s, Url u) { this(new Text[] { new Chars(s) }, u); }
+            public Input.Region region;
+            public @bind.as("link")  Link(Input.Region region, @bind.arg Text[] t, @bind.arg Url u)  { this.region = region; this.t = t; this.u = u; }
+            public Link(String s, Url u) { this(null,new Text[] { new Chars(s) }, u); }
             public void toHTML(HTML h) {
                 h.tag("a",
                       new Object[] { "href", u==null ? "" : u.toString() },
-                      new P(t));
+                      new P(/*t*/region+""));
             }
         }
 
@@ -683,11 +684,11 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
     public static void main(String[] s) throws Exception {
         try {
 
-            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
+            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
             
-            AnnotationGrammarBindingResolver resolver = new AnnotationGrammarBindingResolver(TD.class);
+            AnnotationGrammarBindings resolver = new AnnotationGrammarBindings(TD.class);
             resolver.add(MetaGrammarBindings.class, "meta");
-            Union tibgram = MetaGrammar.make(res, "s", resolver);
+            Union tibgram = Grammar.create(res, "s", resolver);
 
             System.err.println("parsing " + s[1]);
             Tree t = new CharParser(tibgram).parse(new Tib(new FileInputStream(s[1]))).expand1();