X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTibDoc.java;h=572ccbe31fb3f90fdbbcc18bf158a4327bfe368f;hp=2400ea4c97ddd88d20a1d531352e2c1a4b8d66f2;hb=87a031919defe819658fc5f0ddeb2476193151c4;hpb=683552e3855cac7417a6f456867a0c1dd96502a4 diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java index 2400ea4..572ccbe 100644 --- a/src/edu/berkeley/sbp/tib/TibDoc.java +++ b/src/edu/berkeley/sbp/tib/TibDoc.java @@ -330,34 +330,34 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix public static class TD { - public @tag static class Doc extends Dump { + public @bind.as static class Doc extends Dump { public @arg Header head; public @arg Body body; } - public @tag static class Header extends Dump { + public @bind.as static class Header extends Dump { public @arg KeyVal[] attrs; // FIXME: it would be nice to be able to // void KeyVal(String, String) { ... } imperatively } - public @tag static class Body extends Dump { + public @bind.as static class Body extends Dump { public Section[] sections; } - public @tag("Section") static class Section extends Dump { + public @bind.as("Section") static class Section extends Dump { public String header; public Paragraph[] paragraphs; } - public @tag static class KeyVal extends Dump { + public @bind.as static class KeyVal extends Dump { public @arg String key; public @arg Object val; } public abstract static class Paragraph extends Dump implements ToHTML { } - public @tag("P") static class P extends Paragraph { + public @bind.as("P") static class P extends Paragraph { public Text[] text; public P() { } public P(Text[] text) { this.text = text; } @@ -370,24 +370,24 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix } } - public @tag("HR") static class HR extends Paragraph { + public @bind.as("HR") static class HR extends Paragraph { public void toHTML(HTML h) { h.tag("hr"); } } - public @tag("Blockquote") static class Blockquote extends Paragraph { + public @bind.as("Blockquote") static class Blockquote extends Paragraph { Text[] text; public void toHTML(HTML h) { h.tag("blockquote", new P(text)); } } public abstract static class Text extends Dump implements ToHTML { } - public @tag static class Chars extends Text { + public @bind.as static class Chars extends Text { public String text; public Chars() { } public Chars(String text) { this.text = text; } public void toHTML(HTML h) { h.appendText(" " + text + " "); } public String toString() { return text; } } - public @tag static class Block extends Text { + public @bind.as static class Block extends Text { public Text[] text; public void toHTML(HTML h) { for(Text t : text) t.toHTML(h); } } @@ -402,32 +402,32 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix public String htmlTag() { return null; } public Object[] htmlTagParams() { return null; } } - public static @tag class Verbatim extends Text { public char[] c; public void toHTML(HTML h) { } } - //public @tag class Blockquote extends TextWrap { } - public static @tag class Underline extends TextWrap { public String htmlTag() { return "u"; } } - public static @tag class Footnote extends TextWrap { public String htmlTag() { return "small"; } } - public static @tag class TT extends TextWrap { public String htmlTag() { return "tt"; } } - //public @tag class Citation extends Text { "[" word "]" } - public static @tag class Strikethrough extends TextWrap { public String htmlTag() { return "strikethrough"; } } - public static @tag class Superscript extends TextWrap { public String htmlTag() { return "sup"; } } - public static @tag class Subscript extends TextWrap { public String htmlTag() { return "sub"; } } - public static @tag class Smallcap extends TextWrap { public String htmlTag() { return "sc"; } } - public static @tag class Keyword extends TextWrap { public String htmlTag() { return "sc"; } } - public static @tag class Bold extends TextWrap { public String htmlTag() { return "b"; } } - public static @tag class Italic extends TextWrap { public String htmlTag() { return "i"; } } + public static @bind.as class Verbatim extends Text { public char[] c; public void toHTML(HTML h) { } } + //public @bind.as class Blockquote extends TextWrap { } + public static @bind.as class Underline extends TextWrap { public String htmlTag() { return "u"; } } + public static @bind.as class Footnote extends TextWrap { public String htmlTag() { return "small"; } } + public static @bind.as class TT extends TextWrap { public String htmlTag() { return "tt"; } } + //public @bind.as class Citation extends Text { "[" word "]" } + public static @bind.as class Strikethrough extends TextWrap { public String htmlTag() { return "strikethrough"; } } + public static @bind.as class Superscript extends TextWrap { public String htmlTag() { return "sup"; } } + public static @bind.as class Subscript extends TextWrap { public String htmlTag() { return "sub"; } } + public static @bind.as class Smallcap extends TextWrap { public String htmlTag() { return "sc"; } } + public static @bind.as class Keyword extends TextWrap { public String htmlTag() { return "sc"; } } + public static @bind.as class Bold extends TextWrap { public String htmlTag() { return "b"; } } + public static @bind.as class Italic extends TextWrap { public String htmlTag() { return "i"; } } public abstract static class Command extends Text { } - public static @tag class Today extends Command { public void toHTML(HTML h) { } } - public static @tag class LineBreak extends Command { public void toHTML(HTML h) { h.tag("br"); } } + public static @bind.as class Today extends Command { public void toHTML(HTML h) { } } + public static @bind.as class LineBreak extends Command { public void toHTML(HTML h) { h.tag("br"); } } public abstract static class Glyph extends Text { } - public static @tag("emdash") class Emdash extends Glyph { public void toHTML(HTML h) { h.append("&emdash;"); } } + public static @bind.as("emdash") class Emdash extends Glyph { public void toHTML(HTML h) { h.append("&emdash;"); } } public static class Link extends Text { public Text[] t; public Url u; - public @tag("LinkText") Link(Text[] t, Url u) { this.t = t; this.u = u; } - public @tag("LinkChars") Link(String s, Url u) { this(new Text[] { new Chars(s) }, u); } + public @bind.as("LinkText") Link(Text[] t, Url u) { this.t = t; this.u = u; } + public @bind.as("LinkChars") Link(String s, Url u) { this(new Text[] { new Chars(s) }, u); } public void toHTML(HTML h) { h.tag("a", new Object[] { "href", u==null ? "" : u.toString() }, @@ -438,7 +438,7 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix public static class Host { public String name; public String toString() { return name; } - public @tag("DNS") Host(String[][] parts) { + public @bind.as("DNS") Host(String[][] parts) { name = ""; for(String[] s : parts) { for(String ss : s) @@ -446,7 +446,7 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix name += "."; } } - public @tag("IP") Host(int a, int b, int c, int d) { name = a+"."+b+"."+c+"."+d; } + public @bind.as("IP") Host(int a, int b, int c, int d) { name = a+"."+b+"."+c+"."+d; } } public static class Url extends Text { @@ -456,7 +456,7 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix public String pass; public String port; public String path; - public @tag("URL") Url(String method, String[] login, Host host, String port, String path) { + public @bind.as("URL") Url(String method, String[] login, Host host, String port, String path) { this.method = method; this.user = login==null ? null : login.length >= 1 ? login[0] : null; this.pass = login==null ? null : login.length >= 2 ? login[1] : null; @@ -464,16 +464,16 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix this.port = port; this.path = path; } - public @tag("Mailto") Url(String email) { this("mailto", null, null, "25", email); } + public @bind.as("Mailto") Url(String email) { this("mailto", null, null, "25", email); } public void toHTML(HTML h) { new Link(toString(), this).toHTML(h); } public String toString() { return method + "://" + host + "/" + path; } } - public static @tag("lf") String lf() { return "\r"; } - public static @tag("cr") String cr() { return "\n"; } - public static @tag("\"\"") String empty() { return ""; } - public static @tag("urlescape") String urlescape(char a, char b) { return ((char)((a-'0') * 16 + (b-'0')))+""; } + public static @bind.as("lf") String lf() { return "\r"; } + public static @bind.as("cr") String cr() { return "\n"; } + public static @bind.as("\"\"") String empty() { return ""; } + public static @bind.as("urlescape") String urlescape(char a, char b) { return ((char)((a-'0') * 16 + (b-'0')))+""; } } public static void main(String[] s) throws Exception {