diff options
| author | stanley lieber <stanley.lieber@gmail.com> | 2011-09-19 19:21:54 -0500 |
|---|---|---|
| committer | stanley lieber <stanley.lieber@gmail.com> | 2011-09-19 19:21:54 -0500 |
| commit | 7a29aa57cbc0a5ccf015ded763b54046235275ec (patch) | |
| tree | d4f0819f33a75cf80ae94d756282c6886946a5c9 | |
| parent | dbaea2b342c2e87f13239d1f4240c7919a8184c8 (diff) | |
| download | plan9front-7a29aa57cbc0a5ccf015ded763b54046235275ec.tar.xz | |
html2ms: underline links
| -rw-r--r-- | sys/src/cmd/html2ms.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/sys/src/cmd/html2ms.c b/sys/src/cmd/html2ms.c index fd175d72f..dc98e59f3 100644 --- a/sys/src/cmd/html2ms.c +++ b/sys/src/cmd/html2ms.c @@ -28,11 +28,12 @@ struct Tag { }; struct Text { - char font; + char* font; int pre; int pos; int space; int output; + int underline; }; void eatwhite(void); @@ -122,28 +123,35 @@ onbr(Text *text, Tag *tag) void restorefont(Text *text, Tag *tag) { - text->font = tag->restore; - text->pos += Bprint(&out, "\\f%c", text->font); + text->font = tag->aux; + text->pos += Bprint(&out, "\\f%s", text->font); } void onfont(Text *text, Tag *tag) { if(text->font == 0) - text->font = 'R'; - tag->restore = text->font; + text->font = "R"; + tag->aux = text->font; tag->close = restorefont; if(cistrcmp(tag->tag, "i") == 0) - text->font = 'I'; + text->font = "I"; else if(cistrcmp(tag->tag, "b") == 0) - text->font = 'B'; - text->pos += Bprint(&out, "\\f%c", text->font); + text->font = "B"; + text->pos += Bprint(&out, "\\f%s", text->font); +} + +void +ona(Text *text, Tag *) +{ + text->underline = 1; } struct { char *tag; void (*open)(Text *, Tag *); } ontag[] = { + "a", ona, "br", onbr, "hr", onbr, "b", onfont, @@ -154,6 +162,7 @@ struct { "h3", onh, "h4", onh, "h5", onh, + "h6", onh, "li", onli, "pre", onpre, "head", ongarbage, @@ -300,7 +309,7 @@ Rune parserune(int c) { char buf[10]; - int i, n; + int n; Rune r; n = 0; @@ -425,7 +434,10 @@ parsetext(Text *text, Tag *tag) text->pos = 0; if(text->space){ text->space = 0; - if(text->pos >= 70){ + if(text->underline){ + emit(text, ""); + text->pos = Bprint(&out, ".UL "); + } else if(text->pos >= 70){ text->pos = 0; Bputc(&out, '\n'); } else if(text->pos > 0){ |