=================================================================== RCS file: /cvs/mandoc/Attic/mlg.c,v retrieving revision 1.16 retrieving revision 1.19 diff -u -p -r1.16 -r1.19 --- mandoc/Attic/mlg.c 2008/12/06 21:10:31 1.16 +++ mandoc/Attic/mlg.c 2008/12/07 21:30:49 1.19 @@ -1,4 +1,4 @@ -/* $Id: mlg.c,v 1.16 2008/12/06 21:10:31 kristaps Exp $ */ +/* $Id: mlg.c,v 1.19 2008/12/07 21:30:49 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -62,6 +62,7 @@ struct md_mlg { static char *mlg_literal(int); static char *mlg_At_literal(const char *); +static char *mlg_fmt(int); static char *mlg_St_literal(int); static void mlg_roffmsg(void *arg, enum roffmsg, const char *, const char *, char *); @@ -91,12 +92,14 @@ static int mlg_endtag(struct md_mlg *, enum md_ns, i static int mlg_indent(struct md_mlg *); static int mlg_newline(struct md_mlg *); static void mlg_mode(struct md_mlg *, enum md_tok); +static int mlg_nstring(struct md_mlg *, + const char *, const char *, size_t); +static int mlg_string(struct md_mlg *, + const char *, const char *); static int mlg_data(struct md_mlg *, int, const char *, char *); static void mlg_err(struct md_mlg *, const char *, const char *, const char *, ...); -static void mlg_warn(struct md_mlg *, const 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, @@ -200,6 +203,7 @@ mlg_St_literal(int argc) static char * mlg_At_literal(const char *p) { + if (NULL == p) return("AT&T UNIX"); if (0 == strcmp(p, "v6")) @@ -219,8 +223,34 @@ mlg_At_literal(const char *p) static char * +mlg_fmt(int tok) +{ + + switch (tok) { + case (ROFF_Ex): + return ("The %s utility exits 0 on success, and " + ">0 if an error occurs."); + case (ROFF_Rv): + return ("The %s() function returns the value 0 if " + "successful; otherwise the value -1 " + "is returned and the global variable " + "errno " + "is set to indicate the error."); + case (ROFF_In): + return("#include <%s>"); + default: + break; + } + + abort(); + /* NOTREACHED */ +} + + +static char * mlg_literal(int tok) { + switch (tok) { case (ROFF_Bt): return("is currently in beta test."); @@ -392,10 +422,46 @@ mlg_mode(struct md_mlg *p, enum md_tok ns) static int +mlg_string(struct md_mlg *p, const char *start, const char *buf) +{ + + return(mlg_nstring(p, start, buf, strlen(buf))); +} + + +static int +mlg_nstring(struct md_mlg *p, const char *start, + const char *buf, size_t sz) +{ + int c; + ssize_t res; + + assert(p->mbuf); + assert(0 != p->indent); + + res = (*p->cbs.ml_beginstring)(p->mbuf, p->args, buf, sz); + if (-1 == res) + return(0); + + if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos))) { + mlg_err(p, start, buf, "bad string " + "encoding: `%s'", buf); + return(0); + } else if (-1 == c) + return(0); + + res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); + if (-1 == res) + return(0); + + return(1); +} + + +static int mlg_data(struct md_mlg *p, int space, const char *start, char *buf) { size_t sz; - int c; assert(p->mbuf); assert(0 != p->indent); @@ -409,17 +475,8 @@ mlg_data(struct md_mlg *p, int space, const char *star if (0 == p->pos) { if ( ! mlg_indent(p)) return(0); - - c = ml_nputstring(p->mbuf, buf, sz, &p->pos); - - if (0 == c) { - mlg_err(p, start, buf, "bad char sequence"); + if ( ! mlg_nstring(p, start, buf, sz)) return(0); - } else if (c > 1) { - mlg_warn(p, start, buf, "bogus char sequence"); - return(0); - } else if (-1 == c) - return(0); if (p->indent * INDENT + sz >= COLUMNS) if ( ! mlg_newline(p)) @@ -438,18 +495,7 @@ mlg_data(struct md_mlg *p, int space, const char *star return(0); } - c = ml_nputstring(p->mbuf, buf, sz, &p->pos); - - if (0 == c) { - mlg_err(p, start, buf, "bad char sequence"); - return(0); - } else if (c > 1) { - mlg_warn(p, start, buf, "bogus char sequence"); - return(0); - } else if (-1 == c) - return(0); - - return(1); + return(mlg_nstring(p, start, buf, sz)); } @@ -564,6 +610,7 @@ mlg_roffspecial(void *arg, int tok, const char *start, const int *argc, const char **argv, char **more) { struct md_mlg *p; + char buf[256]; assert(arg); p = (struct md_mlg *)arg; @@ -587,6 +634,52 @@ mlg_roffspecial(void *arg, int tok, const char *start, break; } + /* + * Handle macros put into different-token tags. + */ + + switch (tok) { + case (ROFF_Fn): + assert(*more); + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) + return(0); + if (*more) { + if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) + return(0); + p->flags |= ML_OVERRIDE_ONE; + if ( ! mlg_begintag(p, MD_NS_INLINE, + ROFF_Fa, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) + return(0); + while (*more) { + if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos)) + return(0); + if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) + return(0); + if ( ! mlg_string(p, start, *more++)) + return(0); + if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa)) + return(0); + } + if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) + return(0); + } + return(1); + default: + break; + } + + /* + * Now handle macros in their environments. + */ + if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) return(0); @@ -600,7 +693,7 @@ mlg_roffspecial(void *arg, int tok, const char *start, while (*more) { if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) return(0); - if ( ! ml_putstring(p->mbuf, *more++, &p->pos)) + if ( ! mlg_string(p, start, *more++)) return(0); } break; @@ -615,7 +708,7 @@ mlg_roffspecial(void *arg, int tok, const char *start, if (*more) { if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) return(0); - if ( ! ml_puts(p->mbuf, *more++, &p->pos)) + if ( ! mlg_string(p, start, *more++)) return(0); if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) return(0); @@ -625,34 +718,36 @@ mlg_roffspecial(void *arg, int tok, const char *start, return(0); } break; + case (ROFF_Sx): /* FALLTHROUGH */ case (ROFF_Nm): assert(*more); - if ( ! ml_puts(p->mbuf, *more++, &p->pos)) + if ( ! mlg_string(p, start, *more++)) return(0); assert(NULL == *more); break; + + case (ROFF_In): + /* NOTREACHED */ case (ROFF_Ex): + /* NOTREACHED */ + case (ROFF_Rv): assert(*more); - if ( ! ml_puts(p->mbuf, "The ", &p->pos)) + /* FIXME: *more must be ml-filtered. */ + (void)snprintf(buf, sizeof(buf), + mlg_fmt(tok), *more++); + if ( ! ml_puts(p->mbuf, buf, &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_At): + /* FIXME: *more must be ml-filtered. */ if ( ! ml_puts(p->mbuf, mlg_At_literal(*more), &p->pos)) return(0); break; + case (ROFF_Bx): /* FALLTHROUGH */ case (ROFF_Bsx): @@ -667,10 +762,11 @@ mlg_roffspecial(void *arg, int tok, const char *start, while (*more) { if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) return(0); - if ( ! ml_putstring(p->mbuf, *more++, &p->pos)) + if ( ! mlg_string(p, start, *more++)) return(0); } break; + case (ROFF_Bt): /* FALLTHROUGH */ case (ROFF_Ud): @@ -680,6 +776,7 @@ mlg_roffspecial(void *arg, int tok, const char *start, 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]); @@ -792,18 +889,6 @@ mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const cha (void)vsnprintf(buf, sizeof(buf), fmt, ap); mlg_msg(p, lvl, start, pos, buf); -} - - -static void -mlg_warn(struct md_mlg *p, const char *start, - const char *pos, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - mlg_vmsg(p, ROFF_WARN, start, pos, fmt, ap); - va_end(ap); }