=================================================================== RCS file: /cvs/mandoc/Attic/mlg.c,v retrieving revision 1.22 retrieving revision 1.27 diff -u -p -r1.22 -r1.27 --- mandoc/Attic/mlg.c 2008/12/08 16:29:57 1.22 +++ mandoc/Attic/mlg.c 2008/12/10 12:09:47 1.27 @@ -1,4 +1,4 @@ -/* $Id: mlg.c,v 1.22 2008/12/08 16:29:57 kristaps Exp $ */ +/* $Id: mlg.c,v 1.27 2008/12/10 12:09:47 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -24,22 +24,16 @@ #include #include -#include "libmdocml.h" -#include "private.h" #include "ml.h" /* TODO: literal tokens. */ -#define COLUMNS 72 -#define INDENT 4 -#define MAXINDENT 10 - enum md_tok { MD_TEXT, MD_INLINE_IN, MD_INLINE_OUT, MD_BLK_IN, - MD_BLK_OUT, + MD_BLK_OUT }; struct md_mlg { @@ -59,13 +53,15 @@ struct md_mlg { void *data; }; -static void mlg_roffmsg(void *arg, +static int mlg_roffmsg(void *arg, enum roffmsg, const char *, const char *, const char *); static int mlg_roffhead(void *, const struct tm *, const char *, const char *, - enum roffmsec, const char *); -static int mlg_rofftail(void *); + enum roffmsec, enum roffvol); +static int mlg_rofftail(void *, const struct tm *, + const char *, const char *, + enum roffmsec, enum roffvol); static int mlg_roffin(void *, int, int *, const char **); static int mlg_roffdata(void *, int, @@ -87,7 +83,7 @@ static int mlg_roffblkbodyout(void *, int); static int mlg_ref_special(struct md_mlg *, int, const char *, const char **); static int mlg_formatted_special(struct md_mlg *, - int, const int *, + int, const char *, const int *, const char **, const char **); static int mlg_literal_special(struct md_mlg *, int, const char *, const int *, @@ -109,12 +105,12 @@ static int mlg_string(struct md_mlg *, const char *, const char *); static int mlg_data(struct md_mlg *, int, const char *, const char *); -static void mlg_err(struct md_mlg *, const char *, +static int mlg_err(struct md_mlg *, const char *, const char *, const char *, ...); -static void mlg_msg(struct md_mlg *, +static int mlg_msg(struct md_mlg *, enum roffmsg, const char *, const char *, const char *); -static void mlg_vmsg(struct md_mlg *, enum roffmsg, +static int mlg_vmsg(struct md_mlg *, enum roffmsg, const char *, const char *, const char *, va_list); @@ -240,14 +236,10 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) static int mlg_indent(struct md_mlg *p) { - size_t count; - count = p->indent > MAXINDENT ? - (size_t)MAXINDENT : p->indent; - count *= INDENT; - assert(0 == p->pos); - return(ml_putchars(p->mbuf, ' ', count, &p->pos)); + return(ml_putchars(p->mbuf, ' ', INDENT_SZ * + INDENT(p->indent), &p->pos)); } @@ -291,12 +283,11 @@ mlg_nstring(struct md_mlg *p, const char *start, 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); + if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos))) + return(mlg_err(p, start, buf, "bad string " + "encoding: `%s'", buf)); + else if (-1 == c) return(0); - } else if (-1 == c) - return(0); res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); if (-1 == res) @@ -327,7 +318,7 @@ mlg_data(struct md_mlg *p, int space, if ( ! mlg_nstring(p, start, buf, sz)) return(0); - if (p->indent * INDENT + sz >= COLUMNS) + if (INDENT(p->indent) * INDENT_SZ + sz >= COLUMNS) if ( ! mlg_newline(p)) return(0); @@ -415,7 +406,7 @@ mlg_alloc(const struct md_args *args, static int mlg_roffhead(void *arg, const struct tm *tm, const char *os, - const char *title, enum roffmsec sec, const char *vol) + const char *title, enum roffmsec sec, enum roffvol vol) { struct md_mlg *p; @@ -424,7 +415,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha mlg_mode(p, MD_BLK_IN); - if ( ! (*p->cbs.ml_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++; @@ -433,7 +425,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha static int -mlg_rofftail(void *arg) +mlg_rofftail(void *arg, const struct tm *tm, const char *os, + const char *title, enum roffmsec sec, enum roffvol vol) { struct md_mlg *p; @@ -444,11 +437,11 @@ mlg_rofftail(void *arg) if ( ! mlg_newline(p)) return(0); - if ( ! (*p->cbs.ml_end)(p->mbuf, p->args)) + if ( ! (*p->cbs.ml_end)(p->mbuf, p->args, + tm, os, title, sec, vol)) return(0); mlg_mode(p, MD_BLK_OUT); - return(mlg_newline(p)); } @@ -462,13 +455,12 @@ mlg_literal_special(struct md_mlg *p, int tok, const c if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) return(0); - /* FIXME: must be ml-filtered. */ - - lit = ml_literal(tok, argc, argv, more); + lit = roff_literal(tok, argc, argv, more); assert(lit); - if ( ! ml_puts(p->mbuf, lit, &p->pos)) + if ( ! mlg_string(p, start, lit)) return(0); + while (*more) { if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) return(0); @@ -506,8 +498,9 @@ mlg_ref_special(struct md_mlg *p, int tok, } +/* ARGSUSED */ static int -mlg_formatted_special(struct md_mlg *p, int tok, +mlg_formatted_special(struct md_mlg *p, int tok, const char *start, const int *argc, const char **argv, const char **more) { char buf[256], *lit; @@ -515,16 +508,14 @@ mlg_formatted_special(struct md_mlg *p, int tok, if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) return(0); - /* FIXME: must be ml-filtered. */ + lit = roff_fmtstring(tok); - lit = ml_literal(tok, argc, argv, more); - assert(lit); assert(*more); (void)snprintf(buf, sizeof(buf), lit, *more++); assert(NULL == *more); - if ( ! ml_puts(p->mbuf, buf, &p->pos)) + if ( ! mlg_string(p, start, buf)) return(0); return(mlg_endtag(p, MD_NS_INLINE, tok)); @@ -631,7 +622,7 @@ mlg_roffspecial(void *arg, int tok, const char *start, case (ROFF_Ex): /* NOTREACHED */ case (ROFF_Rv): - return(mlg_formatted_special(p, tok, + return(mlg_formatted_special(p, tok, start, argc, argv, more)); case (ROFF_At): @@ -659,9 +650,8 @@ mlg_roffspecial(void *arg, int tok, const char *start, break; } - mlg_err(p, start, start, "`%s' not yet supported", - toknames[tok]); - return(0); + return(mlg_err(p, start, start, "`%s' not yet supported", + toknames[tok])); } @@ -736,12 +726,12 @@ mlg_roffout(void *arg, int tok) } -static void +static int mlg_roffmsg(void *arg, enum roffmsg lvl, const char *buf, const char *pos, const char *msg) { - mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg); + return(mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg)); } @@ -762,30 +752,32 @@ mlg_roffdata(void *arg, int space, } -static void +static int mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, const char *pos, const char *fmt, va_list ap) { char buf[128]; (void)vsnprintf(buf, sizeof(buf), fmt, ap); - mlg_msg(p, lvl, start, pos, buf); + return(mlg_msg(p, lvl, start, pos, buf)); } -static void +static int mlg_err(struct md_mlg *p, const char *start, const char *pos, const char *fmt, ...) { va_list ap; + int c; va_start(ap, fmt); - mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); + c = mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); va_end(ap); + return(c); } -static void +static int mlg_msg(struct md_mlg *p, enum roffmsg lvl, const char *buf, const char *pos, const char *msg) { @@ -795,15 +787,16 @@ mlg_msg(struct md_mlg *p, enum roffmsg lvl, switch (lvl) { case (ROFF_WARN): - if ( ! (MD_WARN_ALL & p->args->warnings)) - return; level = "warning"; + if ( ! (MD_WARN_ALL & p->args->warnings)) + return(1); break; case (ROFF_ERROR): level = "error"; break; default: abort(); + /* NOTREACHED */ } if (pos) { @@ -831,5 +824,6 @@ mlg_msg(struct md_mlg *p, enum roffmsg lvl, p->rbuf->name, level, msg); (void)fprintf(stderr, "%s\n", b); + return(lvl == ROFF_WARN ? 1 : 0); }