version 1.155, 2011/07/27 07:32:26 |
version 1.160, 2011/07/27 14:23:27 |
|
|
}; |
}; |
|
|
struct roffstr { |
struct roffstr { |
char *name; /* key of symbol */ |
char *key; /* key of symbol */ |
char *string; /* current value */ |
char *val; /* current value */ |
struct roffstr *next; /* next in list */ |
struct roffstr *next; /* next in list */ |
}; |
}; |
|
|
Line 166 static const char *roff_getstrn(const struct roff *, |
|
Line 166 static const char *roff_getstrn(const struct roff *, |
|
const char *, size_t); |
const char *, size_t); |
static enum rofferr roff_line_ignore(ROFF_ARGS); |
static enum rofferr roff_line_ignore(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
|
static void roff_openeqn(struct roff *, const char *, |
|
int, int, const char *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static enum rofferr roff_parsetext(char *); |
static enum rofferr roff_parsetext(char *); |
static void roff_res(struct roff *, |
static void roff_res(struct roff *, |
Line 528 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 536 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 1258 roff_T_(ROFF_ARGS) |
|
Line 1264 roff_T_(ROFF_ARGS) |
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
int |
#if 0 |
|
static int |
roff_closeeqn(struct roff *r) |
roff_closeeqn(struct roff *r) |
{ |
{ |
|
|
return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0); |
return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0); |
} |
} |
|
#endif |
|
|
void |
static void |
roff_openeqn(struct roff *r, const char *name, int line, |
roff_openeqn(struct roff *r, const char *name, int line, |
int offs, const char *buf) |
int offs, const char *buf) |
{ |
{ |
Line 1457 roff_setstr(struct roff *r, const char *name, const ch |
|
Line 1465 roff_setstr(struct roff *r, const char *name, const ch |
|
|
|
/* Search for an existing string with the same name. */ |
/* Search for an existing string with the same name. */ |
n = r->first_string; |
n = r->first_string; |
while (n && strcmp(name, n->name)) |
while (n && strcmp(name, n->key)) |
n = n->next; |
n = n->next; |
|
|
if (NULL == n) { |
if (NULL == n) { |
/* Create a new string table entry. */ |
/* Create a new string table entry. */ |
n = mandoc_malloc(sizeof(struct roffstr)); |
n = mandoc_malloc(sizeof(struct roffstr)); |
n->name = mandoc_strdup(name); |
n->key = mandoc_strdup(name); |
n->string = NULL; |
n->val = NULL; |
n->next = r->first_string; |
n->next = r->first_string; |
r->first_string = n; |
r->first_string = n; |
} else if (0 == multiline) { |
} else if (0 == multiline) { |
/* In multiline mode, append; else replace. */ |
/* In multiline mode, append; else replace. */ |
free(n->string); |
free(n->val); |
n->string = NULL; |
n->val = NULL; |
} |
} |
|
|
if (NULL == string) |
if (NULL == string) |
Line 1481 roff_setstr(struct roff *r, const char *name, const ch |
|
Line 1489 roff_setstr(struct roff *r, const char *name, const ch |
|
* and one for the terminating '\0'. |
* and one for the terminating '\0'. |
*/ |
*/ |
newch = strlen(string) + (multiline ? 2u : 1u); |
newch = strlen(string) + (multiline ? 2u : 1u); |
if (NULL == n->string) { |
if (NULL == n->val) { |
n->string = mandoc_malloc(newch); |
n->val = mandoc_malloc(newch); |
*n->string = '\0'; |
*n->val = '\0'; |
oldch = 0; |
oldch = 0; |
} else { |
} else { |
oldch = strlen(n->string); |
oldch = strlen(n->val); |
n->string = mandoc_realloc(n->string, oldch + newch); |
n->val = mandoc_realloc(n->val, oldch + newch); |
} |
} |
|
|
/* Skip existing content in the destination buffer. */ |
/* Skip existing content in the destination buffer. */ |
c = n->string + (int)oldch; |
c = n->val + (int)oldch; |
|
|
/* Append new content to the destination buffer. */ |
/* Append new content to the destination buffer. */ |
while (*string) { |
while (*string) { |
Line 1515 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->key, len) && |
n = n->next; |
'\0' == n->key[(int)len]) |
|
return(n->val); |
|
|
return(n ? n->string : NULL); |
return(NULL); |
} |
} |
|
|
static void |
static void |
Line 1528 roff_freestr(struct roff *r) |
|
Line 1537 roff_freestr(struct roff *r) |
|
struct roffstr *n, *nn; |
struct roffstr *n, *nn; |
|
|
for (n = r->first_string; n; n = nn) { |
for (n = r->first_string; n; n = nn) { |
free(n->name); |
free(n->key); |
free(n->string); |
free(n->val); |
nn = n->next; |
nn = n->next; |
free(n); |
free(n); |
} |
} |