version 1.103, 2015/04/18 16:06:40 |
version 1.105, 2015/10/06 18:32:19 |
Line 422 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
Line 422 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
|
|
if (v == NULL) |
if (v == NULL) |
v = &v_local; |
v = &v_local; |
fl = tok == MDOC_MAX ? ARGSFL_NONE : mdocargs[tok].flags; |
fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags; |
if (tok != MDOC_It) |
if (tok != MDOC_It) |
return(args(mdoc, line, pos, buf, fl, v)); |
return args(mdoc, line, pos, buf, fl, v); |
|
|
/* |
/* |
* We know that we're in an `It', so it's reasonable to expect |
* We know that we're in an `It', so it's reasonable to expect |
Line 440 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
Line 440 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
break; |
break; |
} |
} |
|
|
return(args(mdoc, line, pos, buf, fl, v)); |
return args(mdoc, line, pos, buf, fl, v); |
} |
} |
|
|
static enum margserr |
static enum margserr |
Line 453 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 453 args(struct roff_man *mdoc, int line, int *pos, |
|
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & mdoc->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
return(ARGS_EOLN); |
return ARGS_EOLN; |
/* |
/* |
* If we're not in a partial phrase and the flag for |
* If we're not in a partial phrase and the flag for |
* being a phrase literal is still set, the punctuation |
* being a phrase literal is still set, the punctuation |
Line 464 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 464 args(struct roff_man *mdoc, int line, int *pos, |
|
mdoc->parse, line, *pos, NULL); |
mdoc->parse, line, *pos, NULL); |
|
|
mdoc->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
return(ARGS_EOLN); |
return ARGS_EOLN; |
} |
} |
|
|
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
|
if (ARGSFL_DELIM == fl) |
if (ARGSFL_DELIM == fl) |
if (args_checkpunct(buf, *pos)) |
if (args_checkpunct(buf, *pos)) |
return(ARGS_PUNCT); |
return ARGS_PUNCT; |
|
|
/* |
/* |
* First handle TABSEP items, restricted to `Bl -column'. This |
* First handle TABSEP items, restricted to `Bl -column'. This |
Line 538 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 538 args(struct roff_man *mdoc, int line, int *pos, |
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(rc); |
return rc; |
} |
} |
|
|
/* |
/* |
Line 575 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 575 args(struct roff_man *mdoc, int line, int *pos, |
|
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & mdoc->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
return(ARGS_QWORD); |
return ARGS_QWORD; |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mdoc->parse, line, *pos, NULL); |
mdoc->parse, line, *pos, NULL); |
return(ARGS_QWORD); |
return ARGS_QWORD; |
} |
} |
|
|
mdoc->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
buf[(*pos)++] = '\0'; |
buf[(*pos)++] = '\0'; |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_QWORD); |
return ARGS_QWORD; |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
Line 594 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 594 args(struct roff_man *mdoc, int line, int *pos, |
|
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
line, *pos, NULL); |
line, *pos, NULL); |
|
|
return(ARGS_QWORD); |
return ARGS_QWORD; |
} |
} |
|
|
p = &buf[*pos]; |
p = &buf[*pos]; |
*v = mandoc_getarg(mdoc->parse, &p, line, pos); |
*v = mandoc_getarg(mdoc->parse, &p, line, pos); |
|
|
return(ARGS_WORD); |
return ARGS_WORD; |
} |
} |
|
|
/* |
/* |
Line 622 args_checkpunct(const char *buf, int i) |
|
Line 622 args_checkpunct(const char *buf, int i) |
|
dbuf[j] = buf[i]; |
dbuf[j] = buf[i]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return 0; |
|
|
dbuf[j] = '\0'; |
dbuf[j] = '\0'; |
if (DELIM_CLOSE != mdoc_isdelim(dbuf)) |
if (DELIM_CLOSE != mdoc_isdelim(dbuf)) |
return(0); |
return 0; |
|
|
while (' ' == buf[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
Line 639 args_checkpunct(const char *buf, int i) |
|
Line 639 args_checkpunct(const char *buf, int i) |
|
dbuf[j++] = buf[i++]; |
dbuf[j++] = buf[i++]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return 0; |
|
|
dbuf[j] = '\0'; |
dbuf[j] = '\0'; |
d = mdoc_isdelim(dbuf); |
d = mdoc_isdelim(dbuf); |
if (DELIM_NONE == d || DELIM_OPEN == d) |
if (DELIM_NONE == d || DELIM_OPEN == d) |
return(0); |
return 0; |
|
|
while (' ' == buf[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
return('\0' == buf[i]); |
return '\0' == buf[i]; |
} |
} |
|
|
static void |
static void |