version 1.186, 2013/10/22 20:38:00 |
version 1.188, 2013/12/25 00:50:05 |
Line 1360 roff_ds(ROFF_ARGS) |
|
Line 1360 roff_ds(ROFF_ARGS) |
|
} |
} |
|
|
void |
void |
roff_setreg(struct roff *r, const char *name, int val) |
roff_setreg(struct roff *r, const char *name, int val, char sign) |
{ |
{ |
struct roffreg *reg; |
struct roffreg *reg; |
|
|
Line 1375 roff_setreg(struct roff *r, const char *name, int val) |
|
Line 1375 roff_setreg(struct roff *r, const char *name, int val) |
|
reg = mandoc_malloc(sizeof(struct roffreg)); |
reg = mandoc_malloc(sizeof(struct roffreg)); |
reg->key.p = mandoc_strdup(name); |
reg->key.p = mandoc_strdup(name); |
reg->key.sz = strlen(name); |
reg->key.sz = strlen(name); |
|
reg->val = 0; |
reg->next = r->regtab; |
reg->next = r->regtab; |
r->regtab = reg; |
r->regtab = reg; |
} |
} |
|
|
reg->val = val; |
if ('+' == sign) |
|
reg->val += val; |
|
else if ('-' == sign) |
|
reg->val -= val; |
|
else |
|
reg->val = val; |
} |
} |
|
|
int |
int |
Line 1426 roff_nr(ROFF_ARGS) |
|
Line 1432 roff_nr(ROFF_ARGS) |
|
{ |
{ |
const char *key; |
const char *key; |
char *val; |
char *val; |
|
size_t sz; |
int iv; |
int iv; |
|
char sign; |
|
|
val = *bufp + pos; |
val = *bufp + pos; |
key = roff_getname(r, &val, ln, pos); |
key = roff_getname(r, &val, ln, pos); |
|
|
iv = mandoc_strntoi(val, strlen(val), 10); |
sign = *val; |
|
if ('+' == sign || '-' == sign) |
|
val++; |
|
|
roff_setreg(r, key, iv); |
sz = strspn(val, "0123456789"); |
|
iv = sz ? mandoc_strntoi(val, sz, 10) : 0; |
|
|
|
roff_setreg(r, key, iv, sign); |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 1720 roff_userdef(ROFF_ARGS) |
|
Line 1733 roff_userdef(ROFF_ARGS) |
|
|
|
/* |
/* |
* Collect pointers to macro argument strings |
* Collect pointers to macro argument strings |
* and null-terminate them. |
* and NUL-terminate them. |
*/ |
*/ |
cp = *bufp + pos; |
cp = *bufp + pos; |
for (i = 0; i < 9; i++) |
for (i = 0; i < 9; i++) |