version 1.192, 2014/02/14 22:27:41 |
version 1.196, 2014/03/07 18:30:11 |
|
|
ROFF_am, |
ROFF_am, |
ROFF_ami, |
ROFF_ami, |
ROFF_am1, |
ROFF_am1, |
|
ROFF_as, |
ROFF_cc, |
ROFF_cc, |
|
ROFF_ce, |
ROFF_de, |
ROFF_de, |
ROFF_dei, |
ROFF_dei, |
ROFF_de1, |
ROFF_de1, |
|
|
ROFF_EQ, |
ROFF_EQ, |
ROFF_EN, |
ROFF_EN, |
ROFF_cblock, |
ROFF_cblock, |
ROFF_ccond, |
|
ROFF_USERDEF, |
ROFF_USERDEF, |
ROFF_MAX |
ROFF_MAX |
}; |
}; |
Line 178 static enum rofferr roff_block_text(ROFF_ARGS); |
|
Line 179 static enum rofferr roff_block_text(ROFF_ARGS); |
|
static enum rofferr roff_block_sub(ROFF_ARGS); |
static enum rofferr roff_block_sub(ROFF_ARGS); |
static enum rofferr roff_cblock(ROFF_ARGS); |
static enum rofferr roff_cblock(ROFF_ARGS); |
static enum rofferr roff_cc(ROFF_ARGS); |
static enum rofferr roff_cc(ROFF_ARGS); |
static enum rofferr roff_ccond(ROFF_ARGS); |
static void roff_ccond(struct roff *, int, int); |
static enum rofferr roff_cond(ROFF_ARGS); |
static enum rofferr roff_cond(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
Line 233 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 234 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
|
{ "as", roff_ds, NULL, NULL, 0, NULL }, |
{ "cc", roff_cc, NULL, NULL, 0, NULL }, |
{ "cc", roff_cc, NULL, NULL, 0, NULL }, |
|
{ "ce", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "de", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
Line 263 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 266 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "EQ", roff_EQ, NULL, NULL, 0, NULL }, |
{ "EQ", roff_EQ, NULL, NULL, 0, NULL }, |
{ "EN", roff_EN, NULL, NULL, 0, NULL }, |
{ "EN", roff_EN, NULL, NULL, 0, NULL }, |
{ ".", roff_cblock, NULL, NULL, 0, NULL }, |
{ ".", roff_cblock, NULL, NULL, 0, NULL }, |
{ "\\}", roff_ccond, NULL, NULL, 0, NULL }, |
|
{ NULL, roff_userdef, NULL, NULL, 0, NULL }, |
{ NULL, roff_userdef, NULL, NULL, 0, NULL }, |
}; |
}; |
|
|
Line 786 roff_parse(struct roff *r, const char *buf, int *pos) |
|
Line 788 roff_parse(struct roff *r, const char *buf, int *pos) |
|
'\t' == buf[*pos] || ' ' == buf[*pos]) |
'\t' == buf[*pos] || ' ' == buf[*pos]) |
return(ROFF_MAX); |
return(ROFF_MAX); |
|
|
/* |
/* We stop the macro parse at an escape, tab, space, or nil. */ |
* We stop the macro parse at an escape, tab, space, or nil. |
|
* However, `\}' is also a valid macro, so make sure we don't |
|
* clobber it by seeing the `\' as the end of token. |
|
*/ |
|
|
|
mac = buf + *pos; |
mac = buf + *pos; |
maclen = strcspn(mac + 1, " \\\t\0") + 1; |
maclen = strcspn(mac, " \\\t\0"); |
|
|
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
? ROFF_USERDEF : roffhash_find(mac, maclen); |
? ROFF_USERDEF : roffhash_find(mac, maclen); |
Line 862 roffnode_cleanscope(struct roff *r) |
|
Line 860 roffnode_cleanscope(struct roff *r) |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
static void |
static enum rofferr |
roff_ccond(struct roff *r, int ln, int ppos) |
roff_ccond(ROFF_ARGS) |
|
{ |
{ |
|
|
if (NULL == r->last) { |
if (NULL == r->last) { |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
return(ROFF_IGN); |
return; |
} |
} |
|
|
switch (r->last->tok) { |
switch (r->last->tok) { |
Line 881 roff_ccond(ROFF_ARGS) |
|
Line 878 roff_ccond(ROFF_ARGS) |
|
break; |
break; |
default: |
default: |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
return(ROFF_IGN); |
return; |
} |
} |
|
|
if (r->last->endspan > -1) { |
if (r->last->endspan > -1) { |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); |
return(ROFF_IGN); |
return; |
} |
} |
|
|
if ((*bufp)[pos]) |
|
mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL); |
|
|
|
roffnode_pop(r); |
roffnode_pop(r); |
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
return(ROFF_IGN); |
return; |
} |
} |
|
|
|
|
Line 939 roff_block(ROFF_ARGS) |
|
Line 933 roff_block(ROFF_ARGS) |
|
/* |
/* |
* At the beginning of a `de' macro, clear the existing string |
* At the beginning of a `de' macro, clear the existing string |
* with the same name, if there is one. New content will be |
* with the same name, if there is one. New content will be |
* added from roff_block_text() in multiline mode. |
* appended from roff_block_text() in multiline mode. |
*/ |
*/ |
|
|
if (ROFF_de == tok) |
if (ROFF_de == tok) |
Line 1029 roff_block_sub(ROFF_ARGS) |
|
Line 1023 roff_block_sub(ROFF_ARGS) |
|
*/ |
*/ |
if (ROFF_cblock != t) { |
if (ROFF_cblock != t) { |
if (ROFF_de == tok) |
if (ROFF_de == tok) |
roff_setstr(r, r->last->name, *bufp + ppos, 1); |
roff_setstr(r, r->last->name, *bufp + ppos, 2); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 1045 roff_block_text(ROFF_ARGS) |
|
Line 1039 roff_block_text(ROFF_ARGS) |
|
{ |
{ |
|
|
if (ROFF_de == tok) |
if (ROFF_de == tok) |
roff_setstr(r, r->last->name, *bufp + pos, 1); |
roff_setstr(r, r->last->name, *bufp + pos, 2); |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
Line 1069 roff_cond_sub(ROFF_ARGS) |
|
Line 1063 roff_cond_sub(ROFF_ARGS) |
|
*/ |
*/ |
|
|
if ((ROFF_MAX != t) && |
if ((ROFF_MAX != t) && |
(ROFF_ccond == t || ROFFRULE_ALLOW == rr || |
(ROFFRULE_ALLOW == rr || |
ROFFMAC_STRUCT & roffs[t].flags)) { |
ROFFMAC_STRUCT & roffs[t].flags)) { |
assert(roffs[t].proc); |
assert(roffs[t].proc); |
return((*roffs[t].proc)(r, t, bufp, szp, |
return((*roffs[t].proc)(r, t, bufp, szp, |
ln, ppos, pos, offs)); |
ln, ppos, pos, offs)); |
} |
} |
|
|
|
/* |
|
* If `\}' occurs on a macro line without a preceding macro, |
|
* drop the line completely. |
|
*/ |
|
|
|
ep = *bufp + pos; |
|
if ('\\' == ep[0] && '}' == ep[1]) |
|
rr = ROFFRULE_DENY; |
|
|
/* Always check for the closing delimiter `\}'. */ |
/* Always check for the closing delimiter `\}'. */ |
|
|
ep = &(*bufp)[pos]; |
|
while (NULL != (ep = strchr(ep, '\\'))) { |
while (NULL != (ep = strchr(ep, '\\'))) { |
if ('}' != *(++ep)) |
if ('}' != *(++ep)) |
continue; |
continue; |
|
*ep = '&'; |
/* |
roff_ccond(r, ln, pos); |
* If we're at the end of line, then just chop |
|
* off the \} and resize the buffer. |
|
* If we aren't, then convert it to spaces. |
|
*/ |
|
|
|
if ('\0' == *(ep + 1)) { |
|
*--ep = '\0'; |
|
*szp -= 2; |
|
} else |
|
*(ep - 1) = *ep = ' '; |
|
|
|
roff_ccond(r, ROFF_ccond, bufp, szp, |
|
ln, pos, pos + 2, offs); |
|
break; |
|
} |
} |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
} |
} |
Line 1118 roff_cond_text(ROFF_ARGS) |
|
Line 1106 roff_cond_text(ROFF_ARGS) |
|
if ('}' != *ep) |
if ('}' != *ep) |
continue; |
continue; |
*ep = '&'; |
*ep = '&'; |
roff_ccond(r, ROFF_ccond, bufp, szp, |
roff_ccond(r, ln, pos); |
ln, pos, pos + 2, offs); |
|
} |
} |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
} |
} |
Line 1348 roff_ds(ROFF_ARGS) |
|
Line 1335 roff_ds(ROFF_ARGS) |
|
string++; |
string++; |
|
|
/* The rest is the value. */ |
/* The rest is the value. */ |
roff_setstr(r, name, string, 0); |
roff_setstr(r, name, string, ROFF_as == tok); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 1848 roff_getname(struct roff *r, char **cpp, int ln, int p |
|
Line 1835 roff_getname(struct roff *r, char **cpp, int ln, int p |
|
|
|
/* |
/* |
* Store *string into the user-defined string called *name. |
* Store *string into the user-defined string called *name. |
* In multiline mode, append to an existing entry and append '\n'; |
|
* else replace the existing entry, if there is one. |
|
* To clear an existing entry, call with (*r, *name, NULL, 0). |
* To clear an existing entry, call with (*r, *name, NULL, 0). |
|
* append == 0: replace mode |
|
* append == 1: single-line append mode |
|
* append == 2: multiline append mode, append '\n' after each call |
*/ |
*/ |
static void |
static void |
roff_setstr(struct roff *r, const char *name, const char *string, |
roff_setstr(struct roff *r, const char *name, const char *string, |
int multiline) |
int append) |
{ |
{ |
|
|
roff_setstrn(&r->strtab, name, strlen(name), string, |
roff_setstrn(&r->strtab, name, strlen(name), string, |
string ? strlen(string) : 0, multiline); |
string ? strlen(string) : 0, append); |
} |
} |
|
|
static void |
static void |
roff_setstrn(struct roffkv **r, const char *name, size_t namesz, |
roff_setstrn(struct roffkv **r, const char *name, size_t namesz, |
const char *string, size_t stringsz, int multiline) |
const char *string, size_t stringsz, int append) |
{ |
{ |
struct roffkv *n; |
struct roffkv *n; |
char *c; |
char *c; |
Line 1885 roff_setstrn(struct roffkv **r, const char *name, size |
|
Line 1873 roff_setstrn(struct roffkv **r, const char *name, size |
|
n->val.sz = 0; |
n->val.sz = 0; |
n->next = *r; |
n->next = *r; |
*r = n; |
*r = n; |
} else if (0 == multiline) { |
} else if (0 == append) { |
/* In multiline mode, append; else replace. */ |
|
free(n->val.p); |
free(n->val.p); |
n->val.p = NULL; |
n->val.p = NULL; |
n->val.sz = 0; |
n->val.sz = 0; |
Line 1899 roff_setstrn(struct roffkv **r, const char *name, size |
|
Line 1886 roff_setstrn(struct roffkv **r, const char *name, size |
|
* One additional byte for the '\n' in multiline mode, |
* One additional byte for the '\n' in multiline mode, |
* and one for the terminating '\0'. |
* and one for the terminating '\0'. |
*/ |
*/ |
newch = stringsz + (multiline ? 2u : 1u); |
newch = stringsz + (1 < append ? 2u : 1u); |
|
|
if (NULL == n->val.p) { |
if (NULL == n->val.p) { |
n->val.p = mandoc_malloc(newch); |
n->val.p = mandoc_malloc(newch); |
Line 1926 roff_setstrn(struct roffkv **r, const char *name, size |
|
Line 1913 roff_setstrn(struct roffkv **r, const char *name, size |
|
} |
} |
|
|
/* Append terminating bytes. */ |
/* Append terminating bytes. */ |
if (multiline) |
if (1 < append) |
*c++ = '\n'; |
*c++ = '\n'; |
|
|
*c = '\0'; |
*c = '\0'; |