=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.139 retrieving revision 1.148 diff -u -p -r1.139 -r1.148 --- mandoc/mdoc.c 2010/05/26 09:35:35 1.139 +++ mandoc/mdoc.c 2010/06/26 16:07:08 1.148 @@ -1,6 +1,6 @@ -/* $Id: mdoc.c,v 1.139 2010/05/26 09:35:35 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.148 2010/06/26 16:07:08 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,6 +29,7 @@ #include #include "mandoc.h" +#include "regs.h" #include "libmdoc.h" #include "libmandoc.h" @@ -69,7 +70,7 @@ const char *const __mdoc_macronames[MDOC_MAX] = { /* LINTED */ "Dx", "%Q", "br", "sp", /* LINTED */ - "%U" + "%U", "Ta" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -96,8 +97,12 @@ static struct mdoc_node *node_alloc(struct mdoc *, int enum mdoct, enum mdoc_type); static int node_append(struct mdoc *, struct mdoc_node *); -static int mdoc_ptext(struct mdoc *, int, char *, int); -static int mdoc_pmacro(struct mdoc *, int, char *, int); +static int mdoc_ptext(struct mdoc *, + const struct regset *, + int, char *, int); +static int mdoc_pmacro(struct mdoc *, + const struct regset *, + int, char *, int); static int macrowarn(struct mdoc *, int, const char *, int); @@ -229,7 +234,8 @@ mdoc_endparse(struct mdoc *m) * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int -mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) +mdoc_parseln(struct mdoc *m, const struct regset *regs, + int ln, char *buf, int offs) { if (MDOC_HALT & m->flags) @@ -237,8 +243,8 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int of m->flags |= MDOC_NEWLINE; return(('.' == buf[offs] || '\'' == buf[offs]) ? - mdoc_pmacro(m, ln, buf, offs) : - mdoc_ptext(m, ln, buf, offs)); + mdoc_pmacro(m, regs, ln, buf, offs) : + mdoc_ptext(m, regs, ln, buf, offs)); } @@ -258,8 +264,7 @@ mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, int -mdoc_macro(struct mdoc *m, enum mdoct tok, - int ln, int pp, int *pos, char *buf) +mdoc_macro(MACRO_PROT_ARGS) { assert(tok < MDOC_MAX); @@ -267,26 +272,27 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, if (MDOC_PROLOGUE & mdoc_macros[tok].flags && MDOC_PBODY & m->flags) - return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY)); + return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY)); /* If we're in the prologue, deny "body" macros. */ if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && ! (MDOC_PBODY & m->flags)) { - if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG)) + if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) return(0); if (NULL == m->meta.title) - m->meta.title = mandoc_strdup("unknown"); + m->meta.title = mandoc_strdup("UNKNOWN"); if (NULL == m->meta.vol) - m->meta.vol = mandoc_strdup("local"); + m->meta.vol = mandoc_strdup("LOCAL"); if (NULL == m->meta.os) - m->meta.os = mandoc_strdup("local"); + m->meta.os = mandoc_strdup("LOCAL"); if (0 == m->meta.date) m->meta.date = time(NULL); m->flags |= MDOC_PBODY; } - return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf)); + return((*mdoc_macros[tok].fp) + (m, regs, tok, line, ppos, pos, buf)); } @@ -540,9 +546,11 @@ mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) * control character. */ static int -mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) +mdoc_ptext(struct mdoc *m, const struct regset *regs, + int line, char *buf, int offs) { - char *c, *ws, *end; + char *c, *ws, *end; + struct mdoc_node *n; /* Ignore bogus comments. */ @@ -556,7 +564,35 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of if (SEC_NONE == m->lastnamed) return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT)); + assert(m->last); + n = m->last; + /* + * Divert directly to list processing if we're encountering a + * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry + * (a MDOC_BODY means it's already open, in which case we should + * process within its context in the normal way). + */ + + if (MDOC_Bl == n->tok && MDOC_BODY == n->type && + LIST_column == n->data.Bl.type) { + /* `Bl' is open without any children. */ + m->flags |= MDOC_FREECOL; + return(mdoc_macro(m, regs, MDOC_It, + line, offs, &offs, buf)); + } + + if (MDOC_It == n->tok && MDOC_BLOCK == n->type && + NULL != n->parent && + MDOC_Bl == n->parent->tok && + LIST_column == n->parent->data.Bl.type) { + /* `Bl' has block-level `It' children. */ + m->flags |= MDOC_FREECOL; + return(mdoc_macro(m, regs, MDOC_It, + line, offs, &offs, buf)); + } + + /* * Search for the beginning of unescaped trailing whitespace (ws) * and for the first character not to be output (end). */ @@ -568,6 +604,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of case '-': if (mandoc_hyph(buf + offs, c)) *c = ASCII_HYPH; + ws = NULL; break; case ' ': if (NULL == ws) @@ -652,6 +689,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int buf, strlen(buf) > 3 ? "..." : ""); /* FIXME: logic should be in driver. */ + /* FIXME: broken, will error out and not omit a message. */ return(MDOC_IGN_MACRO & m->pflags ? rc : 0); } @@ -661,11 +699,13 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int * character. */ int -mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) +mdoc_pmacro(struct mdoc *m, const struct regset *regs, + int ln, char *buf, int offs) { - enum mdoct tok; - int i, j, sv; - char mac[5]; + enum mdoct tok; + int i, j, sv; + char mac[5]; + struct mdoc_node *n; /* Empty lines are ignored. */ @@ -733,11 +773,52 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) goto err; - /* - * Begin recursive parse sequence. Since we're at the start of - * the line, we don't need to do callable/parseable checks. + /* + * If an initial macro or a list invocation, divert directly + * into macro processing. */ - if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) + + if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { + if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) + goto err; + return(1); + } + + n = m->last; + assert(m->last); + + /* + * If the first macro of a `Bl -column', open an `It' block + * context around the parsed macro. + */ + + if (MDOC_Bl == n->tok && MDOC_BODY == n->type && + LIST_column == n->data.Bl.type) { + m->flags |= MDOC_FREECOL; + if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) + goto err; + return(1); + } + + /* + * If we're following a block-level `It' within a `Bl -column' + * context (perhaps opened in the above block or in ptext()), + * then open an `It' block context around the parsed macro. + */ + + if (MDOC_It == n->tok && MDOC_BLOCK == n->type && + NULL != n->parent && + MDOC_Bl == n->parent->tok && + LIST_column == n->parent->data.Bl.type) { + m->flags |= MDOC_FREECOL; + if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) + goto err; + return(1); + } + + /* Normal processing of a macro. */ + + if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) goto err; return(1);