version 1.107, 2018/08/20 18:06:56 |
version 1.109, 2018/12/14 05:18:02 |
Line 304 mandoc_escape(const char **end, const char **start, in |
|
Line 304 mandoc_escape(const char **end, const char **start, in |
|
case ESCAPE_FONT: |
case ESCAPE_FONT: |
if (*sz == 2) { |
if (*sz == 2) { |
if (**start == 'C') { |
if (**start == 'C') { |
|
if ((*start)[1] == 'W' || |
|
(*start)[1] == 'R') { |
|
gly = ESCAPE_FONTCW; |
|
break; |
|
} |
/* |
/* |
* Treat constant-width font modes |
* Treat other constant-width font modes |
* just like regular font modes. |
* just like regular font modes. |
*/ |
*/ |
(*start)++; |
(*start)++; |
Line 462 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 467 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
|
|
/* Quoted argument without a closing quote. */ |
/* Quoted argument without a closing quote. */ |
if (1 == quoted) |
if (1 == quoted) |
mandoc_msg(MANDOCERR_ARG_QUOTE, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_ARG_QUOTE, ln, *pos, NULL); |
|
|
/* NUL-terminate this argument and move to the next one. */ |
/* NUL-terminate this argument and move to the next one. */ |
if (pairs) |
if (pairs) |
Line 476 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 481 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
*cpp = cp; |
*cpp = cp; |
|
|
if ('\0' == *cp && (white || ' ' == cp[-1])) |
if ('\0' == *cp && (white || ' ' == cp[-1])) |
mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_SPACE_EOL, ln, *pos, NULL); |
|
|
return start; |
return start; |
} |
} |
Line 557 mandoc_normdate(struct roff_man *man, char *in, int ln |
|
Line 562 mandoc_normdate(struct roff_man *man, char *in, int ln |
|
/* No date specified: use today's date. */ |
/* No date specified: use today's date. */ |
|
|
if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) { |
if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) { |
mandoc_msg(MANDOCERR_DATE_MISSING, man->parse, ln, pos, NULL); |
mandoc_msg(MANDOCERR_DATE_MISSING, ln, pos, NULL); |
return time2a(time(NULL)); |
return time2a(time(NULL)); |
} |
} |
|
|
Line 567 mandoc_normdate(struct roff_man *man, char *in, int ln |
|
Line 572 mandoc_normdate(struct roff_man *man, char *in, int ln |
|
a2time(&t, "%b %d, %Y", in)) { |
a2time(&t, "%b %d, %Y", in)) { |
cp = time2a(t); |
cp = time2a(t); |
if (t > time(NULL) + 86400) |
if (t > time(NULL) + 86400) |
mandoc_msg(MANDOCERR_DATE_FUTURE, man->parse, |
mandoc_msg(MANDOCERR_DATE_FUTURE, ln, pos, "%s", cp); |
ln, pos, cp); |
|
else if (*in != '$' && strcmp(in, cp) != 0) |
else if (*in != '$' && strcmp(in, cp) != 0) |
mandoc_msg(MANDOCERR_DATE_NORM, man->parse, |
mandoc_msg(MANDOCERR_DATE_NORM, ln, pos, "%s", cp); |
ln, pos, cp); |
|
return cp; |
return cp; |
} |
} |
|
|
/* In man(7), do not warn about the legacy format. */ |
/* In man(7), do not warn about the legacy format. */ |
|
|
if (a2time(&t, "%Y-%m-%d", in) == 0) |
if (a2time(&t, "%Y-%m-%d", in) == 0) |
mandoc_msg(MANDOCERR_DATE_BAD, man->parse, ln, pos, in); |
mandoc_msg(MANDOCERR_DATE_BAD, ln, pos, "%s", in); |
else if (t > time(NULL) + 86400) |
else if (t > time(NULL) + 86400) |
mandoc_msg(MANDOCERR_DATE_FUTURE, man->parse, ln, pos, in); |
mandoc_msg(MANDOCERR_DATE_FUTURE, ln, pos, "%s", in); |
else if (man->macroset == MACROSET_MDOC) |
else if (man->macroset == MACROSET_MDOC) |
mandoc_vmsg(MANDOCERR_DATE_LEGACY, man->parse, |
mandoc_msg(MANDOCERR_DATE_LEGACY, ln, pos, "Dd %s", in); |
ln, pos, "Dd %s", in); |
|
|
|
/* Use any non-mdoc(7) date verbatim. */ |
/* Use any non-mdoc(7) date verbatim. */ |
|
|