version 1.73, 2010/05/30 21:50:23 |
version 1.74, 2010/05/30 22:56:02 |
Line 937 blk_full(MACRO_PROT_ARGS) |
|
Line 937 blk_full(MACRO_PROT_ARGS) |
|
#ifdef UGLY |
#ifdef UGLY |
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
|
enum mdoc_type mtt; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac, lac; |
enum margserr ac, lac; |
enum margverr av; |
enum margverr av; |
Line 1030 blk_full(MACRO_PROT_ARGS) |
|
Line 1031 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
/* |
/* Open a head if one hasn't been opened. */ |
* Open a head if one hasn't been opened. Re-open head |
|
* for phrases. |
|
*/ |
|
|
|
if (NULL == head || |
if (NULL == head) { |
ARGS_PEND == ac || |
|
ARGS_PHRASE == ac || |
|
ARGS_PPHRASE == ac) { |
|
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = m->last; |
Line 1048 blk_full(MACRO_PROT_ARGS) |
|
Line 1043 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PEND == ac || |
ARGS_PEND == ac || |
ARGS_PPHRASE == ac) { |
ARGS_PPHRASE == ac) { |
/* |
/* |
|
* If we haven't opened a body yet, rewind the |
|
* head; if we have, rewind that instead. |
|
*/ |
|
|
|
mtt = body ? MDOC_BODY : MDOC_HEAD; |
|
if ( ! rew_sub(mtt, m, tok, line, ppos)) |
|
return(0); |
|
|
|
/* Then allocate our body context. */ |
|
|
|
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
|
return(0); |
|
body = m->last; |
|
|
|
/* |
* Process phrases: set whether we're in a |
* Process phrases: set whether we're in a |
* partial-phrase (this effects line handling) |
* partial-phrase (this effects line handling) |
* then call down into the phrase parser. |
* then call down into the phrase parser. |
*/ |
*/ |
|
|
if (ARGS_PPHRASE == ac) |
if (ARGS_PPHRASE == ac) |
m->flags |= MDOC_PPHRASE; |
m->flags |= MDOC_PPHRASE; |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
Line 1064 blk_full(MACRO_PROT_ARGS) |
|
Line 1075 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
|
|
m->flags &= ~MDOC_PPHRASE; |
m->flags &= ~MDOC_PPHRASE; |
|
|
/* Close out active phrase. */ |
|
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
|
return(0); |
|
continue; |
continue; |
} |
} |
|
|