version 1.47, 2010/03/31 07:13:53 |
version 1.49, 2010/03/31 08:04:57 |
Line 538 rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
Line 538 rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
return(1); |
return(1); |
break; |
break; |
case (MDOC_Oc): |
case (MDOC_Oc): |
#ifdef UGLY |
|
if (MDOC_Op == p->tok) |
if (MDOC_Op == p->tok) |
return(1); |
return(1); |
#endif |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 881 blk_full(MACRO_PROT_ARGS) |
|
Line 879 blk_full(MACRO_PROT_ARGS) |
|
int c, la; |
int c, la; |
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 */ |
|
#ifdef UGLY |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
#endif |
char *p; |
char *p; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
Line 923 blk_full(MACRO_PROT_ARGS) |
|
Line 924 blk_full(MACRO_PROT_ARGS) |
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
head = NULL; |
head = body = NULL; |
|
|
/* |
/* |
* The `Nd' macro has all arguments in its body: it's a hybrid |
* The `Nd' macro has all arguments in its body: it's a hybrid |
Line 938 blk_full(MACRO_PROT_ARGS) |
|
Line 939 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
body = m->last; |
} |
} |
|
|
for (;;) { |
for (;;) { |
Line 994 blk_full(MACRO_PROT_ARGS) |
|
Line 996 blk_full(MACRO_PROT_ARGS) |
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* See notes on `Nd' hybrid, above. */ |
/* If we've already opened our body, exit now. */ |
|
|
if (MDOC_Nd == tok) |
if (NULL != body) |
return(1); |
return(1); |
|
|
#ifdef UGLY |
#ifdef UGLY |
/* |
/* |
* If there is an open sub-block requiring explicit close-out, |
* If there is an open (i.e., unvalidated) sub-block requiring |
* postpone switching the current block from head to body until |
* explicit close-out, postpone switching the current block from |
* the rew_sub() call closing out that sub-block. |
* head to body until the rew_sub() call closing out that |
|
* sub-block. |
*/ |
*/ |
for (n = m->last; n && n != head; n = n->parent) { |
for (n = m->last; n && n != head; n = n->parent) { |
if (MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
if (MDOC_BLOCK == n->type && |
MDOC_BLOCK == n->type) { |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
|
! (MDOC_VALID & n->flags)) { |
|
assert( ! (MDOC_ACTED & n->flags)); |
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
Line 1102 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1107 blk_part_imp(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
#ifdef UGLY |
|
/* |
/* |
* If we can't rewind to our body, then our scope has already |
* If we can't rewind to our body, then our scope has already |
* been closed by another macro (like `Oc' closing `Op'). This |
* been closed by another macro (like `Oc' closing `Op'). This |
Line 1112 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1116 blk_part_imp(MACRO_PROT_ARGS) |
|
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (body == n) |
if (body == n) |
break; |
break; |
#endif |
|
|
|
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
return(0); |
return(0); |