=================================================================== RCS file: /cvs/mandoc/Attic/xml.c,v retrieving revision 1.3 retrieving revision 1.8 diff -u -p -r1.3 -r1.8 --- mandoc/Attic/xml.c 2008/12/01 09:25:18 1.3 +++ mandoc/Attic/xml.c 2008/12/02 13:20:24 1.8 @@ -1,4 +1,4 @@ -/* $Id: xml.c,v 1.3 2008/12/01 09:25:18 kristaps Exp $ */ +/* $Id: xml.c,v 1.8 2008/12/02 13:20:24 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -28,20 +28,21 @@ #include "libmdocml.h" #include "private.h" -#define INDENT 4 -#define COLUMNS 60 +#define MAXINDENT 8 +#define COLUMNS 72 -#ifdef __linux__ /* FIXME */ -#define strlcat strncat -#endif +enum md_ns { + MD_NS_BLOCK, + MD_NS_INLINE, + MD_NS_DEFAULT +}; enum md_tok { - MD_BLKIN, + MD_BLKIN, /* Controls spacing. */ MD_BLKOUT, MD_IN, MD_OUT, - MD_TEXT, - MD_OVERRIDE + MD_TEXT }; struct md_xml { @@ -54,7 +55,9 @@ struct md_xml { size_t pos; enum md_tok last; int flags; -#define MD_LITERAL (1 << 0) /* FIXME */ +#define MD_LITERAL (1 << 0) /* TODO */ +#define MD_OVERRIDE_ONE (1 << 1) +#define MD_OVERRIDE_ALL (1 << 2) }; static void roffmsg(void *arg, enum roffmsg, @@ -66,8 +69,9 @@ static int roffdata(void *, int, char *); static int roffout(void *, int); static int roffblkin(void *, int, int *, char **); static int roffblkout(void *, int); -static int roffspecial(void *, int); +static int roffspecial(void *, int, int *, char **, char **); +static void mbuf_mode(struct md_xml *, enum md_ns); static int mbuf_newline(struct md_xml *); static int mbuf_indent(struct md_xml *); static int mbuf_data(struct md_xml *, int, char *); @@ -78,9 +82,87 @@ static int mbuf_nputstring(struct md_xml *, static int mbuf_puts(struct md_xml *, const char *); static int mbuf_nputs(struct md_xml *, const char *, size_t); +static int mbuf_begintag(struct md_xml *, const char *, + enum md_ns, int *, char **); +static int mbuf_endtag(struct md_xml *, + const char *, enum md_ns); +static void +mbuf_mode(struct md_xml *p, enum md_ns ns) +{ + p->flags &= ~MD_OVERRIDE_ONE; + p->last = ns; +} + + static int +mbuf_begintag(struct md_xml *p, const char *name, enum md_ns ns, + int *argc, char **argv) +{ + int i; + + if ( ! mbuf_nputs(p, "<", 1)) + return(0); + + switch (ns) { + case (MD_NS_BLOCK): + if ( ! mbuf_nputs(p, "block:", 6)) + return(0); + break; + case (MD_NS_INLINE): + if ( ! mbuf_nputs(p, "inline:", 7)) + return(0); + break; + default: + break; + } + + if ( ! mbuf_puts(p, name)) + return(0); + + for (i = 0; ROFF_ARGMAX != argc[i]; i++) { + if ( ! mbuf_nputs(p, " ", 1)) + return(0); + if ( ! mbuf_puts(p, tokargnames[argc[i]])) + return(0); + if ( ! mbuf_nputs(p, "=\"", 2)) + return(0); + if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) + return(0); + if ( ! mbuf_nputs(p, "\"", 1)) + return(0); + } + return(mbuf_nputs(p, ">", 1)); +} + + +static int +mbuf_endtag(struct md_xml *p, const char *tag, enum md_ns ns) +{ + if ( ! mbuf_nputs(p, "", 1)); +} + + +static int mbuf_putstring(struct md_xml *p, const char *buf) { @@ -91,9 +173,9 @@ mbuf_putstring(struct md_xml *p, const char *buf) static int mbuf_nputstring(struct md_xml *p, const char *buf, size_t sz) { - size_t i; + int i; - for (i = 0; i < sz; i++) { + for (i = 0; i < (int)sz; i++) { switch (buf[i]) { case ('&'): if ( ! md_buf_puts(p->mbuf, "&", 5)) @@ -105,6 +187,16 @@ mbuf_nputstring(struct md_xml *p, const char *buf, siz return(0); p->pos += 6; break; + case ('<'): + if ( ! md_buf_puts(p->mbuf, "<", 4)) + return(0); + p->pos += 4; + break; + case ('>'): + if ( ! md_buf_puts(p->mbuf, ">", 4)) + return(0); + p->pos += 4; + break; default: if ( ! md_buf_putchar(p->mbuf, buf[i])) return(0); @@ -141,11 +233,11 @@ mbuf_indent(struct md_xml *p) assert(p->pos == 0); /* LINTED */ - for (i = 0; i < MIN(p->indent, INDENT); i++) + for (i = 0; i < MIN(p->indent, MAXINDENT); i++) if ( ! md_buf_putstring(p->mbuf, " ")) return(0); - p->pos += i * INDENT; + p->pos += i * 4; return(1); } @@ -171,6 +263,9 @@ mbuf_data(struct md_xml *p, int space, char *buf) assert(p->mbuf); assert(0 != p->indent); + if (MD_OVERRIDE_ONE & p->flags || MD_OVERRIDE_ALL & p->flags) + space = 0; + if (MD_LITERAL & p->flags) return(mbuf_putstring(p, buf)); @@ -195,11 +290,11 @@ mbuf_data(struct md_xml *p, int space, char *buf) return(0); if ( ! mbuf_nputstring(p, bufp, sz)) return(0); - if (p->indent * INDENT + sz >= COLUMNS) { + if (p->indent * MAXINDENT + sz >= COLUMNS) if ( ! mbuf_newline(p)) return(0); - continue; - } + if ( ! (MD_OVERRIDE_ALL & p->flags)) + space = 1; continue; } @@ -216,9 +311,8 @@ mbuf_data(struct md_xml *p, int space, char *buf) if ( ! mbuf_nputstring(p, bufp, sz)) return(0); - if ( ! space && p->pos >= COLUMNS) - if ( ! mbuf_newline(p)) - return(0); + if ( ! (MD_OVERRIDE_ALL & p->flags)) + space = 1; } return(1); @@ -302,7 +396,7 @@ roffhead(void *arg) return(0); p->indent++; - p->last = MD_BLKIN; + mbuf_mode(p, MD_BLKIN); return(mbuf_newline(p)); } @@ -318,27 +412,35 @@ rofftail(void *arg) if (0 != p->pos && ! mbuf_newline(p)) return(0); - if ( ! mbuf_puts(p, "")) + mbuf_mode(p, MD_BLKOUT); + if ( ! mbuf_endtag(p, "mdoc", MD_NS_DEFAULT)) return(0); - - p->last = MD_BLKOUT; return(mbuf_newline(p)); } /* ARGSUSED */ static int -roffspecial(void *arg, int tok) +roffspecial(void *arg, int tok, int *argc, char **argv, char **more) { struct md_xml *p; assert(arg); p = (struct md_xml *)arg; + /* FIXME: this is completely ad hoc. */ + switch (tok) { case (ROFF_Ns): - p->last = MD_OVERRIDE; + p->flags |= MD_OVERRIDE_ONE; break; + case (ROFF_Sm): + assert(*more); + if (0 == strcmp(*more, "on")) + p->flags |= MD_OVERRIDE_ALL; + else + p->flags &= ~MD_OVERRIDE_ALL; + break; default: break; } @@ -351,7 +453,6 @@ static int roffblkin(void *arg, int tok, int *argc, char **argv) { struct md_xml *p; - int i; assert(arg); p = (struct md_xml *)arg; @@ -364,33 +465,14 @@ roffblkin(void *arg, int tok, int *argc, char **argv) } else if ( ! mbuf_indent(p)) return(0); - if ( ! mbuf_nputs(p, "<", 1)) - return(0); - if ( ! mbuf_nputs(p, "block:", 6)) - return(0); - if ( ! mbuf_puts(p, toknames[tok])) - return(0); - /* FIXME: xml won't like standards args (e.g., p1003.1-90). */ - for (i = 0; ROFF_ARGMAX != argc[i]; i++) { - if ( ! mbuf_nputs(p, " ", 1)) - return(0); - if ( ! mbuf_puts(p, tokargnames[argc[i]])) - return(0); - if ( ! mbuf_nputs(p, "=\"", 2)) - return(0); - if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) - return(0); - if ( ! mbuf_nputs(p, "\"", 1)) - return(0); - } + p->indent++; + mbuf_mode(p, MD_BLKIN); - if ( ! mbuf_nputs(p, ">", 1)) + if ( ! mbuf_begintag(p, toknames[tok], MD_NS_BLOCK, + argc, argv)) return(0); - - p->last = MD_BLKIN; - p->indent++; return(mbuf_newline(p)); } @@ -413,16 +495,9 @@ roffblkout(void *arg, int tok) } else if ( ! mbuf_indent(p)) return(0); - if ( ! mbuf_nputs(p, "", 1)) - return(0); - - p->last = MD_BLKOUT; return(mbuf_newline(p)); } @@ -431,57 +506,28 @@ static int roffin(void *arg, int tok, int *argc, char **argv) { struct md_xml *p; - int i; assert(arg); p = (struct md_xml *)arg; - /* - * FIXME: put all of this in a buffer, then check the buffer - * length versus the column width for nicer output. This is a - * bit hacky. - */ - - if (p->pos + 11 > COLUMNS) + if ( ! (MD_OVERRIDE_ONE & p->flags) && + ! (MD_OVERRIDE_ALL & p->flags) && + p->pos + 11 > COLUMNS) if ( ! mbuf_newline(p)) return(0); - if (0 != p->pos) { - switch (p->last) { - case (MD_TEXT): - /* FALLTHROUGH */ - case (MD_OUT): - if ( ! mbuf_nputs(p, " ", 1)) - return(0); - break; - default: - break; - } - } else if ( ! mbuf_indent(p)) - return(0); + if (0 != p->pos && (MD_TEXT == p->last || MD_OUT == p->last) + && ! (MD_OVERRIDE_ONE & p->flags) + && ! (MD_OVERRIDE_ALL & p->flags)) + if ( ! mbuf_nputs(p, " ", 1)) + return(0); - p->last = MD_IN; - - if ( ! mbuf_nputs(p, "<", 1)) + if (0 == p->pos && ! mbuf_indent(p)) return(0); - if ( ! mbuf_nputs(p, "inline:", 7)) - return(0); - if ( ! mbuf_puts(p, toknames[tok])) - return(0); - for (i = 0; ROFF_ARGMAX != argc[i]; i++) { - if ( ! mbuf_nputs(p, " ", 1)) - return(0); - if ( ! mbuf_puts(p, tokargnames[argc[i]])) - return(0); - if ( ! mbuf_nputs(p, "=\"", 2)) - return(0); - if ( ! mbuf_putstring(p, argv[i] ? argv[i] : "true")) - return(0); - if ( ! mbuf_nputs(p, "\"", 1)) - return(0); - } - return(mbuf_nputs(p, ">", 1)); + mbuf_mode(p, MD_IN); + return(mbuf_begintag(p, toknames[tok], + MD_NS_INLINE, argc, argv)); } @@ -493,20 +539,11 @@ roffout(void *arg, int tok) assert(arg); p = (struct md_xml *)arg; - /* Continue with a regular out token. */ - if (0 == p->pos && ! mbuf_indent(p)) return(0); - p->last = MD_OUT; - - if ( ! mbuf_nputs(p, "", 1)); + mbuf_mode(p, MD_OUT); + return(mbuf_endtag(p, toknames[tok], MD_NS_INLINE)); } @@ -554,6 +591,7 @@ roffdata(void *arg, int space, char *buf) if ( ! mbuf_data(p, space, buf)) return(0); - p->last = MD_TEXT; + mbuf_mode(p, MD_TEXT); return(1); } +