version 1.76, 2010/05/31 11:52:06 |
version 1.78, 2010/05/31 22:39:55 |
Line 1118 blk_full(MACRO_PROT_ARGS) |
|
Line 1118 blk_full(MACRO_PROT_ARGS) |
|
/* If we've already opened our body, exit now. */ |
/* If we've already opened our body, exit now. */ |
|
|
if (NULL != body) |
if (NULL != body) |
return(1); |
goto out; |
|
|
#ifdef UGLY |
#ifdef UGLY |
/* |
/* |
Line 1145 blk_full(MACRO_PROT_ARGS) |
|
Line 1145 blk_full(MACRO_PROT_ARGS) |
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
|
|
out: |
|
if ( ! (MDOC_FREECOL & m->flags)) |
|
return(1); |
|
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
|
return(0); |
|
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
|
return(0); |
|
|
|
m->flags &= ~MDOC_FREECOL; |
return(1); |
return(1); |
} |
} |
|
|
Line 1690 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1700 phrase_ta(MACRO_PROT_ARGS) |
|
n = m->last; |
n = m->last; |
if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos)) |
return(0); |
return(0); |
|
|
/* |
|
* FIXME: this is necessary in bogus constructions like |
|
* .Bl -column foo bar |
|
* .Sy foo Ta bar |
|
* It is, however, an ugly way to do it. |
|
* |
|
* XXX; remove this when the above construct builds an implied |
|
* `It' marker. |
|
*/ |
|
if (NULL == m->last || |
|
MDOC_BODY != m->last->type || |
|
MDOC_It != m->last->tok || |
|
NULL == m->last->parent->parent || |
|
MDOC_Bl != m->last->parent->parent->tok || |
|
LIST_column != m->last->parent->parent->data.list) { |
|
swarn(m, tok, line, ppos, n); |
|
return(0); |
|
} |
|
|
|
if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It)) |
if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It)) |
return(0); |
return(0); |
|
|