version 1.113, 2011/12/03 23:59:14 |
version 1.114, 2012/01/02 15:48:05 |
Line 228 mdoc_macroend(struct mdoc *m) |
|
Line 228 mdoc_macroend(struct mdoc *m) |
|
static enum mdoct |
static enum mdoct |
lookup(enum mdoct from, const char *p) |
lookup(enum mdoct from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
return(MDOC_MAX); |
return(MDOC_MAX); |
Line 984 in_line(MACRO_PROT_ARGS) |
|
Line 983 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la, nl; |
int la, nl, nparsed; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *body; /* save of body macro */ |
struct mdoc_node *body; /* save of body macro */ |
Line 995 blk_full(MACRO_PROT_ARGS) |
|
Line 994 blk_full(MACRO_PROT_ARGS) |
|
enum margverr av; |
enum margverr av; |
char *p; |
char *p; |
|
|
|
/* |
|
* Exception: `-diag' lists are not parsed, but lists in general |
|
* are parsed. |
|
*/ |
|
nparsed = 0; |
|
if (MDOC_It == tok && NULL != m->last && |
|
MDOC_Bl == m->last->tok && |
|
LIST_diag == m->last->norm->Bl.type) |
|
nparsed = 1; |
|
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & m->flags; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
Line 1146 blk_full(MACRO_PROT_ARGS) |
|
Line 1155 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = nparsed || ARGS_QWORD == ac ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |