version 1.92, 2015/02/20 23:55:10 |
version 1.96, 2015/10/13 23:30:50 |
Line 83 mandoc_escape(const char **end, const char **start, in |
|
Line 83 mandoc_escape(const char **end, const char **start, in |
|
break; |
break; |
case 'C': |
case 'C': |
if ('\'' != **start) |
if ('\'' != **start) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
*start = ++*end; |
*start = ++*end; |
gly = ESCAPE_SPECIAL; |
gly = ESCAPE_SPECIAL; |
term = '\''; |
term = '\''; |
Line 93 mandoc_escape(const char **end, const char **start, in |
|
Line 93 mandoc_escape(const char **end, const char **start, in |
|
* Escapes taking no arguments at all. |
* Escapes taking no arguments at all. |
*/ |
*/ |
case 'd': |
case 'd': |
/* FALLTHROUGH */ |
|
case 'u': |
case 'u': |
return(ESCAPE_IGNORE); |
case ',': |
|
case '/': |
|
return ESCAPE_IGNORE; |
|
|
/* |
/* |
* The \z escape is supposed to output the following |
* The \z escape is supposed to output the following |
Line 104 mandoc_escape(const char **end, const char **start, in |
|
Line 105 mandoc_escape(const char **end, const char **start, in |
|
* let us just skip the next character. |
* let us just skip the next character. |
*/ |
*/ |
case 'z': |
case 'z': |
return(ESCAPE_SKIPCHAR); |
return ESCAPE_SKIPCHAR; |
|
|
/* |
/* |
* Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where |
* Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where |
* 'X' is the trigger. These have opaque sub-strings. |
* 'X' is the trigger. These have opaque sub-strings. |
*/ |
*/ |
case 'F': |
case 'F': |
/* FALLTHROUGH */ |
|
case 'g': |
case 'g': |
/* FALLTHROUGH */ |
|
case 'k': |
case 'k': |
/* FALLTHROUGH */ |
|
case 'M': |
case 'M': |
/* FALLTHROUGH */ |
|
case 'm': |
case 'm': |
/* FALLTHROUGH */ |
|
case 'n': |
case 'n': |
/* FALLTHROUGH */ |
|
case 'V': |
case 'V': |
/* FALLTHROUGH */ |
|
case 'Y': |
case 'Y': |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 151 mandoc_escape(const char **end, const char **start, in |
|
Line 145 mandoc_escape(const char **end, const char **start, in |
|
* The \B and \w escapes are handled in roff.c, roff_res(). |
* The \B and \w escapes are handled in roff.c, roff_res(). |
*/ |
*/ |
case 'A': |
case 'A': |
/* FALLTHROUGH */ |
|
case 'b': |
case 'b': |
/* FALLTHROUGH */ |
|
case 'D': |
case 'D': |
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
/* FALLTHROUGH */ |
|
case 'X': |
case 'X': |
/* FALLTHROUGH */ |
|
case 'Z': |
case 'Z': |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'o': |
case 'o': |
if (**start == '\0') |
if (**start == '\0') |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
if (gly == ESCAPE_ERROR) |
if (gly == ESCAPE_ERROR) |
gly = ESCAPE_OVERSTRIKE; |
gly = ESCAPE_OVERSTRIKE; |
term = **start; |
term = **start; |
Line 177 mandoc_escape(const char **end, const char **start, in |
|
Line 166 mandoc_escape(const char **end, const char **start, in |
|
* and 'N' resolves to a numerical expression. |
* and 'N' resolves to a numerical expression. |
*/ |
*/ |
case 'h': |
case 'h': |
/* FALLTHROUGH */ |
|
case 'H': |
case 'H': |
/* FALLTHROUGH */ |
|
case 'L': |
case 'L': |
/* FALLTHROUGH */ |
|
case 'l': |
case 'l': |
/* FALLTHROUGH */ |
|
case 'S': |
case 'S': |
/* FALLTHROUGH */ |
|
case 'v': |
case 'v': |
/* FALLTHROUGH */ |
|
case 'x': |
case 'x': |
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
if ('\0' != **start) |
if ('\0' != **start) |
++*end; |
++*end; |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
} |
} |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
term = **start; |
term = **start; |
Line 205 mandoc_escape(const char **end, const char **start, in |
|
Line 188 mandoc_escape(const char **end, const char **start, in |
|
*/ |
*/ |
case 'N': |
case 'N': |
if ('\0' == **start) |
if ('\0' == **start) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
(*end)++; |
(*end)++; |
if (isdigit((unsigned char)**start)) { |
if (isdigit((unsigned char)**start)) { |
*sz = 1; |
*sz = 1; |
return(ESCAPE_IGNORE); |
return ESCAPE_IGNORE; |
} |
} |
(*start)++; |
(*start)++; |
while (isdigit((unsigned char)**end)) |
while (isdigit((unsigned char)**end)) |
Line 217 mandoc_escape(const char **end, const char **start, in |
|
Line 200 mandoc_escape(const char **end, const char **start, in |
|
*sz = *end - *start; |
*sz = *end - *start; |
if ('\0' != **end) |
if ('\0' != **end) |
(*end)++; |
(*end)++; |
return(ESCAPE_NUMBERED); |
return ESCAPE_NUMBERED; |
|
|
/* |
/* |
* Sizes get a special category of their own. |
* Sizes get a special category of their own. |
Line 243 mandoc_escape(const char **end, const char **start, in |
|
Line 226 mandoc_escape(const char **end, const char **start, in |
|
term = '\''; |
term = '\''; |
break; |
break; |
case '3': |
case '3': |
/* FALLTHROUGH */ |
|
case '2': |
case '2': |
/* FALLTHROUGH */ |
|
case '1': |
case '1': |
*sz = (*end)[-1] == 's' && |
*sz = (*end)[-1] == 's' && |
isdigit((unsigned char)(*end)[1]) ? 2 : 1; |
isdigit((unsigned char)(*end)[1]) ? 2 : 1; |
Line 279 mandoc_escape(const char **end, const char **start, in |
|
Line 260 mandoc_escape(const char **end, const char **start, in |
|
while (**end != term) { |
while (**end != term) { |
switch (**end) { |
switch (**end) { |
case '\0': |
case '\0': |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
case '\\': |
case '\\': |
(*end)++; |
(*end)++; |
if (ESCAPE_ERROR == |
if (ESCAPE_ERROR == |
mandoc_escape(end, NULL, NULL)) |
mandoc_escape(end, NULL, NULL)) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
break; |
break; |
default: |
default: |
(*end)++; |
(*end)++; |
Line 295 mandoc_escape(const char **end, const char **start, in |
|
Line 276 mandoc_escape(const char **end, const char **start, in |
|
} else { |
} else { |
assert(*sz > 0); |
assert(*sz > 0); |
if ((size_t)*sz > strlen(*start)) |
if ((size_t)*sz > strlen(*start)) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
*end += *sz; |
*end += *sz; |
} |
} |
|
|
Line 321 mandoc_escape(const char **end, const char **start, in |
|
Line 302 mandoc_escape(const char **end, const char **start, in |
|
|
|
switch (**start) { |
switch (**start) { |
case '3': |
case '3': |
/* FALLTHROUGH */ |
|
case 'B': |
case 'B': |
gly = ESCAPE_FONTBOLD; |
gly = ESCAPE_FONTBOLD; |
break; |
break; |
case '2': |
case '2': |
/* FALLTHROUGH */ |
|
case 'I': |
case 'I': |
gly = ESCAPE_FONTITALIC; |
gly = ESCAPE_FONTITALIC; |
break; |
break; |
Line 334 mandoc_escape(const char **end, const char **start, in |
|
Line 313 mandoc_escape(const char **end, const char **start, in |
|
gly = ESCAPE_FONTPREV; |
gly = ESCAPE_FONTPREV; |
break; |
break; |
case '1': |
case '1': |
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
gly = ESCAPE_FONTROMAN; |
gly = ESCAPE_FONTROMAN; |
break; |
break; |
Line 355 mandoc_escape(const char **end, const char **start, in |
|
Line 333 mandoc_escape(const char **end, const char **start, in |
|
break; |
break; |
if (*sz == 6 && (*start)[1] == '0') |
if (*sz == 6 && (*start)[1] == '0') |
break; |
break; |
|
if (*sz == 5 && (*start)[1] == 'D' && |
|
strchr("89ABCDEF", (*start)[2]) != NULL) |
|
break; |
if ((int)strspn(*start + 1, "0123456789ABCDEFabcdef") |
if ((int)strspn(*start + 1, "0123456789ABCDEFabcdef") |
+ 1 == *sz) |
+ 1 == *sz) |
gly = ESCAPE_UNICODE; |
gly = ESCAPE_UNICODE; |
Line 363 mandoc_escape(const char **end, const char **start, in |
|
Line 344 mandoc_escape(const char **end, const char **start, in |
|
break; |
break; |
} |
} |
|
|
return(gly); |
return gly; |
} |
} |
|
|
/* |
/* |
Line 458 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 439 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
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, parse, ln, *pos, NULL); |
|
|
return(start); |
return start; |
} |
} |
|
|
static int |
static int |
Line 475 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 456 a2time(time_t *t, const char *fmt, const char *p) |
|
#endif |
#endif |
if (NULL != pp && '\0' == *pp) { |
if (NULL != pp && '\0' == *pp) { |
*t = mktime(&tm); |
*t = mktime(&tm); |
return(1); |
return 1; |
} |
} |
|
|
return(0); |
return 0; |
} |
} |
|
|
static char * |
static char * |
Line 491 time2a(time_t t) |
|
Line 472 time2a(time_t t) |
|
|
|
tm = localtime(&t); |
tm = localtime(&t); |
if (tm == NULL) |
if (tm == NULL) |
return(NULL); |
return NULL; |
|
|
/* |
/* |
* Reserve space: |
* Reserve space: |
Line 511 time2a(time_t t) |
|
Line 492 time2a(time_t t) |
|
|
|
if (0 == strftime(p, 4 + 1, "%Y", tm)) |
if (0 == strftime(p, 4 + 1, "%Y", tm)) |
goto fail; |
goto fail; |
return(buf); |
return buf; |
|
|
fail: |
fail: |
free(buf); |
free(buf); |
return(NULL); |
return NULL; |
} |
} |
|
|
char * |
char * |
Line 537 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
Line 518 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
t = 0; |
t = 0; |
} |
} |
out = t ? time2a(t) : NULL; |
out = t ? time2a(t) : NULL; |
return(out ? out : mandoc_strdup(in)); |
return out ? out : mandoc_strdup(in); |
} |
} |
|
|
int |
int |
Line 547 mandoc_eos(const char *p, size_t sz) |
|
Line 528 mandoc_eos(const char *p, size_t sz) |
|
int enclosed, found; |
int enclosed, found; |
|
|
if (0 == sz) |
if (0 == sz) |
return(0); |
return 0; |
|
|
/* |
/* |
* End-of-sentence recognition must include situations where |
* End-of-sentence recognition must include situations where |
Line 559 mandoc_eos(const char *p, size_t sz) |
|
Line 540 mandoc_eos(const char *p, size_t sz) |
|
for (q = p + (int)sz - 1; q >= p; q--) { |
for (q = p + (int)sz - 1; q >= p; q--) { |
switch (*q) { |
switch (*q) { |
case '\"': |
case '\"': |
/* FALLTHROUGH */ |
|
case '\'': |
case '\'': |
/* FALLTHROUGH */ |
|
case ']': |
case ']': |
/* FALLTHROUGH */ |
|
case ')': |
case ')': |
if (0 == found) |
if (0 == found) |
enclosed = 1; |
enclosed = 1; |
break; |
break; |
case '.': |
case '.': |
/* FALLTHROUGH */ |
|
case '!': |
case '!': |
/* FALLTHROUGH */ |
|
case '?': |
case '?': |
found = 1; |
found = 1; |
break; |
break; |
default: |
default: |
return(found && (!enclosed || isalnum((unsigned char)*q))); |
return found && |
|
(!enclosed || isalnum((unsigned char)*q)); |
} |
} |
} |
} |
|
|
return(found && !enclosed); |
return found && !enclosed; |
} |
} |
|
|
/* |
/* |
Line 595 mandoc_strntoi(const char *p, size_t sz, int base) |
|
Line 572 mandoc_strntoi(const char *p, size_t sz, int base) |
|
long v; |
long v; |
|
|
if (sz > 31) |
if (sz > 31) |
return(-1); |
return -1; |
|
|
memcpy(buf, p, sz); |
memcpy(buf, p, sz); |
buf[(int)sz] = '\0'; |
buf[(int)sz] = '\0'; |
Line 604 mandoc_strntoi(const char *p, size_t sz, int base) |
|
Line 581 mandoc_strntoi(const char *p, size_t sz, int base) |
|
v = strtol(buf, &ep, base); |
v = strtol(buf, &ep, base); |
|
|
if (buf[0] == '\0' || *ep != '\0') |
if (buf[0] == '\0' || *ep != '\0') |
return(-1); |
return -1; |
|
|
if (v > INT_MAX) |
if (v > INT_MAX) |
v = INT_MAX; |
v = INT_MAX; |
if (v < INT_MIN) |
if (v < INT_MIN) |
v = INT_MIN; |
v = INT_MIN; |
|
|
return((int)v); |
return (int)v; |
} |
} |