version 1.143, 2010/05/31 15:50:48 |
version 1.144, 2010/05/31 20:14:10 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 561 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 561 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
n = m->last; |
n = m->last; |
|
|
/* |
/* |
* Diver directly into list processing if we're encountering a |
* Divert directly to list processing if we're encountering a |
* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry |
* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry |
* (if it's a MDOC_BODY that means it's open, in which case we |
* (a MDOC_BODY means it's already open, in which case we should |
* should process within its context). |
* process within its context in the normal way). |
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.list) { |
LIST_column == n->data.list) { |
|
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
} |
} |
Line 577 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 578 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.list) { |
LIST_column == n->parent->data.list) { |
|
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
} |
} |
Line 677 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 679 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
buf, strlen(buf) > 3 ? "..." : ""); |
buf, strlen(buf) > 3 ? "..." : ""); |
|
|
/* FIXME: logic should be in driver. */ |
/* FIXME: logic should be in driver. */ |
|
/* FIXME: broken, will error out and not omit a message. */ |
return(MDOC_IGN_MACRO & m->pflags ? rc : 0); |
return(MDOC_IGN_MACRO & m->pflags ? rc : 0); |
} |
} |
|
|
Line 688 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 691 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
int |
int |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j, sv; |
int i, j, sv; |
char mac[5]; |
char mac[5]; |
|
struct mdoc_node *n; |
|
|
/* Empty lines are ignored. */ |
/* Empty lines are ignored. */ |
|
|
Line 758 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 762 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
goto err; |
goto err; |
|
|
/* |
/* |
* Begin recursive parse sequence. Since we're at the start of |
* If an initial macro or a list invocation, divert directly |
* the line, we don't need to do callable/parseable checks. |
* into macro processing. |
*/ |
*/ |
|
|
|
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
|
if ( ! mdoc_macro(m, 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.list) { |
|
m->flags |= MDOC_FREECOL; |
|
if ( ! mdoc_macro(m, 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.list) { |
|
m->flags |= MDOC_FREECOL; |
|
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
|
goto err; |
|
return(1); |
|
} |
|
|
|
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
|
|