version 1.54, 2010/05/07 05:39:35 |
version 1.57, 2010/05/07 06:05:38 |
|
|
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
{ |
{ |
int lastarg; |
int lastarg; |
enum margerr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if (0 == buf[*pos]) |
if (0 == buf[*pos]) |
Line 632 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 632 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
lastarg = *pos; |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
assert(ARGS_PHRASE != ac); |
|
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
|
|
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
int j, lastarg, maxargs, flushed; |
int j, lastarg, maxargs, flushed; |
enum margerr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|
Line 732 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 731 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, cnt, d, nc; |
int la, lastpunct, cnt, d, nc; |
|
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr ac; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
|
|
Line 764 in_line(MACRO_PROT_ARGS) |
|
Line 764 in_line(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 883 in_line(MACRO_PROT_ARGS) |
|
Line 883 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int c, la; |
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 891 blk_full(MACRO_PROT_ARGS) |
|
Line 891 blk_full(MACRO_PROT_ARGS) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
#endif |
#endif |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr ac; |
|
enum margverr av; |
char *p; |
char *p; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
Line 914 blk_full(MACRO_PROT_ARGS) |
|
Line 915 blk_full(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 963 blk_full(MACRO_PROT_ARGS) |
|
Line 964 blk_full(MACRO_PROT_ARGS) |
|
/* Don't emit leading punct. for phrases. */ |
/* Don't emit leading punct. for phrases. */ |
|
|
if (NULL == head && ARGS_PHRASE != ac && |
if (NULL == head && ARGS_PHRASE != ac && |
|
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
1 == mdoc_isdelim(p)) { |
1 == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
Line 972 blk_full(MACRO_PROT_ARGS) |
|
Line 974 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Always re-open head for phrases. */ |
/* Always re-open head for phrases. */ |
|
|
if (NULL == head || ARGS_PHRASE == ac) { |
if (NULL == head || 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; |
} |
} |
|
|
if (ARGS_PHRASE == ac) { |
if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { |
if ( ! phrase(m, line, la, buf)) |
if ( ! phrase(m, line, la, buf)) |
return(0); |
return(0); |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
Line 1047 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1050 blk_part_imp(MACRO_PROT_ARGS) |
|
{ |
{ |
int la; |
int la; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margerr ac; |
enum margserr ac; |
char *p; |
char *p; |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *body; /* saved body context */ |
Line 1082 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1085 blk_part_imp(MACRO_PROT_ARGS) |
|
la = *pos; |
la = *pos; |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
assert(ARGS_PHRASE != ac); |
|
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
|
|
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la; |
int la; |
enum margerr 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; |
Line 1185 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1186 blk_part_exp(MACRO_PROT_ARGS) |
|
if (ARGS_EOLN == ac) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(ARGS_PHRASE != ac); |
|
|
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
Line 1269 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1268 blk_part_exp(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
int la, flushed, j, c, maxargs; |
int la, flushed, j, maxargs; |
enum margerr ac; |
enum margserr ac; |
|
enum margverr av; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
Line 1303 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1303 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 1404 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1404 in_line_argn(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int c, la; |
int la; |
enum margerr ac; |
enum margserr ac; |
|
enum margverr av; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum mdoct ntok; |
enum mdoct ntok; |
Line 1416 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1417 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
|
|
phrase(struct mdoc *m, int line, int ppos, char *buf) |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
{ |
{ |
int la, pos; |
int la, pos; |
enum margerr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum mdoct ntok; |
char *p; |
char *p; |
|
|