version 1.156, 2011/07/27 12:41:02 |
version 1.159, 2011/07/27 14:19:26 |
Line 530 roff_parsetext(char *p) |
|
Line 530 roff_parsetext(char *p) |
|
sz = strcspn(p, "-\\"); |
sz = strcspn(p, "-\\"); |
p += sz; |
p += sz; |
|
|
|
if ('\0' == *p) |
|
break; |
|
|
if ('\\' == *p) { |
if ('\\' == *p) { |
/* Skip over escapes. */ |
/* Skip over escapes. */ |
p++; |
p++; |
Line 538 roff_parsetext(char *p) |
|
Line 541 roff_parsetext(char *p) |
|
if (ESCAPE_ERROR == esc) |
if (ESCAPE_ERROR == esc) |
break; |
break; |
continue; |
continue; |
} else if ('-' != *p || p == start) |
} else if (p == start) { |
|
p++; |
continue; |
continue; |
|
} |
|
|
l = *(p - 1); |
l = *(p - 1); |
r = *(p + 1); |
r = *(p + 1); |
|
|
if ('\\' != l && |
if ('\\' != l && |
'\t' != r && '\t' != l && |
'\t' != r && '\t' != l && |
' ' != r && ' ' != l && |
' ' != r && ' ' != l && |
'-' != r && '-' != l && |
'-' != r && '-' != l && |
! isdigit((unsigned char)l) && |
! isdigit((unsigned char)l) && |
! isdigit((unsigned char)r)) |
! isdigit((unsigned char)r)) |
*p = ASCII_HYPH; |
*p = ASCII_HYPH; |
p++; |
p++; |
} |
} |
Line 1519 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 1523 roff_getstrn(const struct roff *r, const char *name, s |
|
{ |
{ |
const struct roffstr *n; |
const struct roffstr *n; |
|
|
n = r->first_string; |
for (n = r->first_string; n; n = n->next) |
while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len])) |
if (0 == strncmp(name, n->name, len) && |
n = n->next; |
'\0' == n->name[(int)len]) |
|
return(n->string); |
|
|
return(n ? n->string : NULL); |
return(NULL); |
} |
} |
|
|
static void |
static void |