version 1.70, 2010/05/29 18:47:54 |
version 1.72, 2010/05/30 21:41:46 |
Line 1002 blk_full(MACRO_PROT_ARGS) |
|
Line 1002 blk_full(MACRO_PROT_ARGS) |
|
} |
} |
|
|
ac = ARGS_ERROR; |
ac = ARGS_ERROR; |
|
lac = ARGS_PHRASE; |
|
|
for ( ; ; ) { |
for ( ; ; ) { |
la = *pos; |
la = *pos; |
Line 1013 blk_full(MACRO_PROT_ARGS) |
|
Line 1014 blk_full(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (ARGS_PEND == ac) { |
|
if (ARGS_PPHRASE == lac) |
|
ac = ARGS_PPHRASE; |
|
else |
|
ac = ARGS_PHRASE; |
|
} |
|
|
|
/* Don't emit leading punct. for phrases. */ |
/* Don't emit leading punct. for phrases. */ |
|
|
if (NULL == head && |
if (NULL == head && |
|
ARGS_PEND != ac && |
ARGS_PHRASE != ac && |
ARGS_PHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
Line 1035 blk_full(MACRO_PROT_ARGS) |
|
Line 1030 blk_full(MACRO_PROT_ARGS) |
|
/* Always re-open head for phrases. */ |
/* Always re-open head for phrases. */ |
|
|
if (NULL == head || |
if (NULL == head || |
|
ARGS_PEND == ac || |
ARGS_PHRASE == ac || |
ARGS_PHRASE == ac || |
ARGS_PPHRASE == ac) { |
ARGS_PPHRASE == ac) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
Line 1042 blk_full(MACRO_PROT_ARGS) |
|
Line 1038 blk_full(MACRO_PROT_ARGS) |
|
head = m->last; |
head = m->last; |
} |
} |
|
|
if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { |
if (ARGS_PHRASE == ac || |
|
ARGS_PEND == ac || |
|
ARGS_PPHRASE == ac) { |
if (ARGS_PPHRASE == ac) |
if (ARGS_PPHRASE == ac) |
m->flags |= MDOC_PPHRASE; |
m->flags |= MDOC_PPHRASE; |
if ( ! phrase(m, line, la, buf, ac)) |
if (ARGS_PEND == ac && ARGS_PPHRASE == lac) |
|
m->flags |= MDOC_PPHRASE; |
|
|
|
if (ARGS_PEND == ac) { |
|
if ( ! phrase(m, line, la, buf, lac)) |
|
return(0); |
|
} else if ( ! phrase(m, line, la, buf, ac)) |
return(0); |
return(0); |
|
|
m->flags &= ~MDOC_PPHRASE; |
m->flags &= ~MDOC_PPHRASE; |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
continue; |
continue; |