=================================================================== RCS file: /cvs/mandoc/Attic/mlg.c,v retrieving revision 1.8 retrieving revision 1.15 diff -u -p -r1.8 -r1.15 --- mandoc/Attic/mlg.c 2008/12/04 23:10:51 1.8 +++ mandoc/Attic/mlg.c 2008/12/06 19:41:41 1.15 @@ -1,4 +1,4 @@ -/* $Id: mlg.c,v 1.8 2008/12/04 23:10:51 kristaps Exp $ */ +/* $Id: mlg.c,v 1.15 2008/12/06 19:41:41 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -51,16 +52,16 @@ struct md_mlg { size_t pos; enum md_tok last; void *arg; - ml_begintag begintag; - ml_endtag endtag; - ml_begin begin; - ml_end end; + struct ml_cbs cbs; int flags; #define ML_OVERRIDE_ONE (1 << 0) #define ML_OVERRIDE_ALL (1 << 1) + void *data; }; +static char *mlg_literal(int); +static char *mlg_At_literal(const char *); static void mlg_roffmsg(void *arg, enum roffmsg, const char *, const char *, char *); static int mlg_roffhead(void *, const struct tm *, @@ -82,7 +83,6 @@ static int mlg_roffblkbodyin(void *, int, int *, char **); static int mlg_roffblkbodyout(void *, int); -static int mlg_endblk(struct md_mlg *, enum md_ns, int); static int mlg_begintag(struct md_mlg *, enum md_ns, int, int *, char **); static int mlg_endtag(struct md_mlg *, enum md_ns, int); @@ -92,11 +92,14 @@ static void mlg_mode(struct md_mlg *, enum md_tok); static int mlg_data(struct md_mlg *, int, const char *, char *); static void mlg_err(struct md_mlg *, const char *, - const char *, char *); + const char *, const char *, ...); static void mlg_warn(struct md_mlg *, const char *, - const char *, char *); + const char *, const char *, ...); static void mlg_msg(struct md_mlg *, enum roffmsg, const char *, const char *, char *); +static void mlg_vmsg(struct md_mlg *, enum roffmsg, + const char *, const char *, + const char *, va_list); #ifdef __linux__ extern size_t strlcat(char *, const char *, size_t); @@ -104,24 +107,52 @@ extern size_t strlcpy(char *, const char *, size_t); #endif -static int -mlg_endblk(struct md_mlg *p, enum md_ns ns, int tok) +static char * +mlg_At_literal(const char *p) { + if (NULL == p) + return("AT&T UNIX"); + if (0 == strcmp(p, "v6")) + return("Version 6 AT&T UNIX"); + else if (0 == strcmp(p, "v7")) + return("Version 7 AT&T UNIX"); + else if (0 == strcmp(p, "32v")) + return("Version 32v AT&T UNIX"); + else if (0 == strcmp(p, "V.1")) + return("AT&T System V.1 UNIX"); + else if (0 == strcmp(p, "V.4")) + return("AT&T System V.4 UNIX"); - p->indent--; + abort(); + /* NOTREACHED */ +} - if (0 != p->pos) { - if ( ! mlg_newline(p)) - return(0); - if ( ! mlg_indent(p)) - return(0); - } else if ( ! mlg_indent(p)) - return(0); - mlg_mode(p, MD_BLK_OUT); - if ( ! mlg_endtag(p, ns, tok)) - return(0); - return(mlg_newline(p)); +static char * +mlg_literal(int tok) +{ + switch (tok) { + case (ROFF_Bt): + return("is currently in beta test."); + case (ROFF_Ud): + return("currently under development."); + case (ROFF_Fx): + return("FreeBSD"); + case (ROFF_Nx): + return("NetBSD"); + case (ROFF_Ox): + return("OpenBSD"); + case (ROFF_Ux): + return("UNIX"); + case (ROFF_Bx): + return("BSD"); + case (ROFF_Bsx): + return("BSDI BSD/OS"); + default: + break; + } + abort(); + /* NOTREACHED */ } @@ -137,7 +168,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, case (MD_NS_INLINE): if ( ! (ML_OVERRIDE_ONE & p->flags) && ! (ML_OVERRIDE_ALL & p->flags) && - p->pos + 11 > COLUMNS) + p->pos + 11 >= COLUMNS) if ( ! mlg_newline(p)) return(0); if (0 != p->pos && (MD_TEXT == p->last || @@ -166,7 +197,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos)) return(0); - res = (*p->begintag)(p->mbuf, p->args, ns, tok, + res = (*p->cbs.ml_begintag)(p->mbuf, p->data, p->args, ns, tok, argc, (const char **)argv); if (-1 == res) return(0); @@ -195,21 +226,46 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) { ssize_t res; - /* TODO: extra rules for block/inline. */ + assert(MD_NS_DEFAULT != ns); + switch (ns) { + case (MD_NS_INLINE): + break; + default: + p->indent--; + if (0 != p->pos) { + if ( ! mlg_newline(p)) + return(0); + if ( ! mlg_indent(p)) + return(0); + } else if ( ! mlg_indent(p)) + return(0); + break; + } + if ( ! ml_nputs(p->mbuf, "pos)) return(0); - res = (*p->endtag)(p->mbuf, p->args, ns, tok); + res = (*p->cbs.ml_endtag)(p->mbuf, p->data, p->args, ns, tok); if (-1 == res) return(0); assert(res >= 0); p->pos += (size_t)res; - /* TODO: extra rules for block/inline. */ + if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos)) + return(0); + + switch (ns) { + case (MD_NS_INLINE): + mlg_mode(p, MD_INLINE_OUT); + break; + default: + mlg_mode(p, MD_BLK_OUT); + break; + } - return(ml_nputs(p->mbuf, ">", 1, &p->pos)); + return(1); } @@ -218,7 +274,8 @@ mlg_indent(struct md_mlg *p) { size_t count; - count = p->indent > MAXINDENT ? (size_t)MAXINDENT : p->indent; + count = p->indent > MAXINDENT ? + (size_t)MAXINDENT : p->indent; count *= INDENT; assert(0 == p->pos); @@ -229,12 +286,9 @@ mlg_indent(struct md_mlg *p) static int mlg_newline(struct md_mlg *p) { - size_t dummy; - if ( ! ml_nputs(p->mbuf, "\n", 1, &dummy)) - return(0); p->pos = 0; - return(1); + return(ml_nputs(p->mbuf, "\n", 1, NULL)); } @@ -324,6 +378,9 @@ mlg_exit(struct md_mlg *p, int flush) c = roff_free(p->tree, flush); free(p); + + (*p->cbs.ml_free)(p->data); + return(c); } @@ -332,8 +389,7 @@ struct md_mlg * mlg_alloc(const struct md_args *args, const struct md_rbuf *rbuf, struct md_mbuf *mbuf, - ml_begintag begintag, ml_endtag endtag, - ml_begin begin, ml_end end) + const struct ml_cbs *cbs) { struct roffcb cb; struct md_mlg *p; @@ -358,17 +414,17 @@ mlg_alloc(const struct md_args *args, p->args = args; p->mbuf = mbuf; p->rbuf = rbuf; - p->begintag = begintag; - p->endtag = endtag; - p->begin = begin; - p->end = end; - if (NULL == (p->tree = roff_alloc(&cb, p))) { + (void)memcpy(&p->cbs, cbs, sizeof(struct ml_cbs)); + + if (NULL == (p->tree = roff_alloc(&cb, p))) free(p); - return(NULL); - } + else if ( ! (*p->cbs.ml_alloc)(&p->data)) + free(p); + else + return(p); - return(p); + return(NULL); } @@ -382,7 +438,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha p = (struct md_mlg *)arg; mlg_mode(p, MD_BLK_IN); - if ( ! (*p->begin)(p->mbuf, p->args, tm, os, title, sec, vol)) + + if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, tm, os, title, sec, vol)) return(0); p->indent++; @@ -398,18 +455,19 @@ mlg_rofftail(void *arg) assert(arg); p = (struct md_mlg *)arg; - if (0 != p->pos && ! mlg_newline(p)) + if (0 != p->pos) + if ( ! mlg_newline(p)) + return(0); + + if ( ! (*p->cbs.ml_end)(p->mbuf, p->args)) return(0); mlg_mode(p, MD_BLK_OUT); - if ( ! (*p->end)(p->mbuf, p->args)) - return(0); return(mlg_newline(p)); } -/* ARGSUSED */ static int mlg_roffspecial(void *arg, int tok, const char *start, char **more) { @@ -418,21 +476,40 @@ mlg_roffspecial(void *arg, int tok, const char *start, assert(arg); p = (struct md_mlg *)arg; + /* + * First handle macros without content. + */ + switch (tok) { + case (ROFF_Ns): + p->flags |= ML_OVERRIDE_ONE; + return(1); + case (ROFF_Sm): + assert(*more); + if (0 == strcmp(*more, "on")) + p->flags |= ML_OVERRIDE_ALL; + else + p->flags &= ~ML_OVERRIDE_ALL; + return(1); + default: + break; + } + + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + + switch (tok) { case (ROFF_Xr): if ( ! *more) { - mlg_err(p, start, start, - "missing required argument"); + mlg_err(p, start, start, "missing argument"); return(0); } - if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL)) - return(0); if ( ! ml_puts(p->mbuf, *more++, &p->pos)) return(0); if (*more) { if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) return(0); - if ( ! mlg_data(p, 0, start, *more++)) + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) return(0); if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) return(0); @@ -441,27 +518,69 @@ mlg_roffspecial(void *arg, int tok, const char *start, mlg_err(p, start, start, "too many arguments"); return(0); } - if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) + break; + case (ROFF_Sx): + /* FALLTHROUGH */ + case (ROFF_Nm): + assert(*more); + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) return(0); - mlg_mode(p, MD_INLINE_OUT); + assert(NULL == *more); break; - case (ROFF_Fn): + case (ROFF_Ex): + assert(*more); + if ( ! ml_puts(p->mbuf, "The ", &p->pos)) + return(0); + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Xr, NULL, NULL)) + return(0); + if ( ! ml_puts(p->mbuf, *more++, &p->pos)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Xr)) + return(0); + if ( ! ml_puts(p->mbuf, " utility exits 0 on success, " + "and >0 if an error " + "occurs.", &p->pos)) + return(0); + assert(NULL == *more); break; - case (ROFF_Ns): - p->flags |= ML_OVERRIDE_ONE; + case (ROFF_At): + if ( ! ml_puts(p->mbuf, mlg_At_literal(*more), &p->pos)) + return(0); break; - case (ROFF_Sm): - assert(*more); - if (0 == strcmp(*more, "on")) - p->flags |= ML_OVERRIDE_ALL; - else - p->flags &= ~ML_OVERRIDE_ALL; + case (ROFF_Bx): + /* FALLTHROUGH */ + case (ROFF_Bsx): + /* FALLTHROUGH */ + case (ROFF_Fx): + /* FALLTHROUGH */ + case (ROFF_Nx): + /* FALLTHROUGH */ + case (ROFF_Ox): + if ( ! ml_puts(p->mbuf, mlg_literal(tok), &p->pos)) + return(0); + while (*more) { + if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) + return(0); + if ( ! ml_putstring(p->mbuf, *more++, &p->pos)) + return(0); + } break; - default: + case (ROFF_Bt): + /* FALLTHROUGH */ + case (ROFF_Ud): + /* FALLTHROUGH */ + case (ROFF_Ux): + assert(NULL == *more); + if ( ! ml_puts(p->mbuf, mlg_literal(tok), &p->pos)) + return(0); break; + default: + mlg_err(p, start, start, "`%s' not yet supported", + toknames[tok]); + return(0); } - return(1); + return(mlg_endtag(p, MD_NS_INLINE, tok)); } @@ -478,7 +597,7 @@ static int mlg_roffblkout(void *arg, int tok) { - return(mlg_endblk((struct md_mlg *)arg, MD_NS_BLOCK, tok)); + return(mlg_endtag((struct md_mlg *)arg, MD_NS_BLOCK, tok)); } @@ -495,7 +614,7 @@ static int mlg_roffblkbodyout(void *arg, int tok) { - return(mlg_endblk((struct md_mlg *)arg, MD_NS_BODY, tok)); + return(mlg_endtag((struct md_mlg *)arg, MD_NS_BODY, tok)); } @@ -512,7 +631,7 @@ static int mlg_roffblkheadout(void *arg, int tok) { - return(mlg_endblk((struct md_mlg *)arg, MD_NS_HEAD, tok)); + return(mlg_endtag((struct md_mlg *)arg, MD_NS_HEAD, tok)); } @@ -528,16 +647,8 @@ mlg_roffin(void *arg, int tok, int *argc, char **argv) static int mlg_roffout(void *arg, int tok) { - struct md_mlg *p; - assert(arg); - p = (struct md_mlg *)arg; - - if (0 == p->pos && ! mlg_indent(p)) - return(0); - - mlg_mode(p, MD_INLINE_OUT); - return(mlg_endtag(p, MD_NS_INLINE, tok)); + return(mlg_endtag((struct md_mlg *)arg, MD_NS_INLINE, tok)); } @@ -562,27 +673,47 @@ mlg_roffdata(void *arg, int space, const char *start, return(0); mlg_mode(p, MD_TEXT); + return(1); } static void -mlg_err(struct md_mlg *p, const char *buf, const char *pos, char *msg) +mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, + const char *pos, const char *fmt, va_list ap) { + char buf[128]; - mlg_msg(p, ROFF_ERROR, buf, pos, msg); + (void)vsnprintf(buf, sizeof(buf), fmt, ap); + mlg_msg(p, lvl, start, pos, buf); } static void -mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg) +mlg_warn(struct md_mlg *p, const char *start, + const char *pos, const char *fmt, ...) { + va_list ap; - mlg_msg(p, ROFF_WARN, buf, pos, msg); + va_start(ap, fmt); + mlg_vmsg(p, ROFF_WARN, start, pos, fmt, ap); + va_end(ap); } static void +mlg_err(struct md_mlg *p, const char *start, + const char *pos, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); + va_end(ap); +} + + +static void mlg_msg(struct md_mlg *p, enum roffmsg lvl, const char *buf, const char *pos, char *msg) { @@ -608,5 +739,4 @@ mlg_msg(struct md_mlg *p, enum roffmsg lvl, else (void)fprintf(stderr, "%s: %s: %s\n", p->rbuf->name, level, msg); - }