version 1.59, 2010/05/09 10:17:02 |
version 1.62, 2010/05/14 12:55:22 |
Line 48 static int append_delims(struct mdoc *, |
|
Line 48 static int append_delims(struct mdoc *, |
|
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup_raw(const char *); |
static enum mdoct lookup_raw(const char *); |
static int phrase(struct mdoc *, int, int, |
static int phrase(struct mdoc *, int, int, |
char *, enum margserr, int); |
char *, enum margserr); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct rew_alt(enum mdoct); |
static int rew_dobreak(enum mdoct, |
static int rew_dobreak(enum mdoct, |
const struct mdoc_node *); |
const struct mdoc_node *); |
Line 653 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 653 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
static int |
static int |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
int j, lastarg, maxargs, flushed; |
int j, lastarg, maxargs, flushed, nl; |
enum margserr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ec): |
case (MDOC_Ec): |
maxargs = 1; |
maxargs = 1; |
Line 723 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 725 blk_exp_close(MACRO_PROT_ARGS) |
|
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 732 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 734 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, cnt, d, nc; |
int la, lastpunct, cnt, d, nc, nl; |
enum margverr av; |
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* Whether we allow ignored elements (those without content, |
* Whether we allow ignored elements (those without content, |
* usually because of reserved words) to squeak by. |
* usually because of reserved words) to squeak by. |
Line 815 in_line(MACRO_PROT_ARGS) |
|
Line 819 in_line(MACRO_PROT_ARGS) |
|
} |
} |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 875 in_line(MACRO_PROT_ARGS) |
|
Line 879 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 884 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, pcnt; |
int 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 */ |
struct mdoc_node *body; /* save of body macro */ |
Line 955 blk_full(MACRO_PROT_ARGS) |
|
Line 959 blk_full(MACRO_PROT_ARGS) |
|
|
|
ac = ARGS_ERROR; |
ac = ARGS_ERROR; |
|
|
for (pcnt = 0; ; ) { |
for ( ; ; ) { |
la = *pos; |
la = *pos; |
lac = ac; |
lac = ac; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
Line 1003 blk_full(MACRO_PROT_ARGS) |
|
Line 1007 blk_full(MACRO_PROT_ARGS) |
|
else if (ARGS_PEND == ac && ARGS_PHRASE == lac) |
else if (ARGS_PEND == ac && ARGS_PHRASE == lac) |
ac = ARGS_PHRASE; |
ac = ARGS_PHRASE; |
|
|
if ( ! phrase(m, line, la, buf, ac, pcnt++)) |
if ( ! phrase(m, line, la, buf, ac)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 1180 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1184 blk_part_imp(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la, nl; |
enum margserr ac; |
enum margserr ac; |
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *body; /* keep track of body */ |
struct mdoc_node *body; /* keep track of body */ |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* The opening of an explicit macro having zero or more leading |
* The opening of an explicit macro having zero or more leading |
* punctuation nodes; a head with optional single element (the |
* punctuation nodes; a head with optional single element (the |
Line 1279 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1285 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
|
|
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
int la, flushed, j, maxargs; |
int la, flushed, j, maxargs, nl; |
enum margserr ac; |
enum margserr ac; |
enum margverr av; |
enum margverr av; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
* Only open the scope once the first non-leading-punctuation is |
* Only open the scope once the first non-leading-punctuation is |
Line 1415 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1423 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
if ( ! nl) |
if (ppos > 1) |
|
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 1492 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1499 in_line_eoln(MACRO_PROT_ARGS) |
|
static int |
static int |
ctx_synopsis(MACRO_PROT_ARGS) |
ctx_synopsis(MACRO_PROT_ARGS) |
{ |
{ |
|
int nl; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
if (SEC_SYNOPSIS != m->lastsec) |
if (SEC_SYNOPSIS != m->lastsec) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |
if (ppos > 1) |
if ( ! nl) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* |
/* |
Line 1526 obsolete(MACRO_PROT_ARGS) |
|
Line 1536 obsolete(MACRO_PROT_ARGS) |
|
* macro is encountered. |
* macro is encountered. |
*/ |
*/ |
static int |
static int |
phrase(struct mdoc *m, int line, int ppos, char *buf, |
phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac) |
enum margserr ac, int count) |
|
{ |
{ |
int la, pos; |
int la, pos; |
enum margserr aac; |
enum margserr aac; |
Line 1538 phrase(struct mdoc *m, int line, int ppos, char *buf, |
|
Line 1547 phrase(struct mdoc *m, int line, int ppos, char *buf, |
|
ARGS_PEND == ac || |
ARGS_PEND == ac || |
ARGS_PPHRASE == ac); |
ARGS_PPHRASE == ac); |
|
|
if (count && ARGS_PPHRASE == ac) |
|
return(mdoc_word_alloc(m, line, ppos, &buf[ppos])); |
|
|
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
/* Note: no calling context! */ |
aac = mdoc_zargs(m, line, &pos, buf, ARGS_PPHRASED, &p); |
aac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
|
|
|
if (ARGS_ERROR == aac) |
if (ARGS_ERROR == aac) |
return(0); |
return(0); |