version 1.62, 2010/05/14 12:55:22 |
version 1.63, 2010/05/14 13:31:20 |
Line 888 in_line(MACRO_PROT_ARGS) |
|
Line 888 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, nl; |
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 */ |
struct mdoc_node *body; /* save of body macro */ |
Line 900 blk_full(MACRO_PROT_ARGS) |
|
Line 900 blk_full(MACRO_PROT_ARGS) |
|
enum margverr av; |
enum margverr av; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
Line 1033 blk_full(MACRO_PROT_ARGS) |
|
Line 1035 blk_full(MACRO_PROT_ARGS) |
|
head = m->last; |
head = m->last; |
} |
} |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* If we've already opened our body, exit now. */ |
/* If we've already opened our body, exit now. */ |
Line 1073 blk_full(MACRO_PROT_ARGS) |
|
Line 1075 blk_full(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, nl; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
Line 1081 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1083 blk_part_imp(MACRO_PROT_ARGS) |
|
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A macro that spans to the end of the line. This is generally |
* A macro that spans to the end of the line. This is generally |
* (but not necessarily) called as the first macro. The block |
* (but not necessarily) called as the first macro. The block |
Line 1156 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1160 blk_part_imp(MACRO_PROT_ARGS) |
|
* been closed by another macro (like `Oc' closing `Op'). This |
* been closed by another macro (like `Oc' closing `Op'). This |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
|
* |
|
* FIXME - this should be ifdef'd OpenBSD? |
*/ |
*/ |
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (body == n) |
if (body == n) |
Line 1169 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1175 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |