version 1.119, 2012/11/17 00:26:33 |
version 1.122, 2013/09/15 18:26:46 |
Line 612 dword(struct mdoc *mdoc, int line, |
|
Line 612 dword(struct mdoc *mdoc, int line, |
|
*/ |
*/ |
|
|
else if (DELIM_CLOSE == d && mdoc->last->prev && |
else if (DELIM_CLOSE == d && mdoc->last->prev && |
mdoc->last->prev->tok != MDOC_No) |
mdoc->last->prev->tok != MDOC_No && |
|
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->flags |= MDOC_DELIMC; |
mdoc->last->flags |= MDOC_DELIMC; |
|
|
return(1); |
return(1); |
Line 791 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 792 blk_exp_close(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
} |
} |
|
|
|
mdoc->flags &= ~MDOC_NEWLINE; |
|
|
if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf)) |
if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf)) |
return(0); |
return(0); |
break; |
break; |
Line 1758 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
Line 1762 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
static int |
static int |
phrase_ta(MACRO_PROT_ARGS) |
phrase_ta(MACRO_PROT_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
int la; |
int la; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
/* |
/* Make sure we are in a column list or ignore this macro. */ |
* FIXME: this is overly restrictive: if the `Ta' is unexpected, |
n = mdoc->last; |
* it should simply error out with ARGSLOST. |
while (NULL != n && MDOC_Bl != n->tok) |
*/ |
n = n->parent; |
|
if (NULL == n || LIST_column != n->norm->Bl.type) { |
|
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA); |
|
return(1); |
|
} |
|
|
|
/* Advance to the next column. */ |
if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It)) |
if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It)) |