version 1.11, 2009/06/12 12:52:51 |
version 1.20, 2009/06/25 08:42:06 |
|
|
enum merr { |
enum merr { |
ETOOLONG, |
ETOOLONG, |
EMALLOC, |
EMALLOC, |
|
EUTSNAME, |
ENUMFMT |
ENUMFMT |
}; |
}; |
|
|
Line 51 static int concat(struct mdoc *, const struct mdoc_n |
|
Line 52 static int concat(struct mdoc *, const struct mdoc_n |
|
|
|
static int post_ar(POST_ARGS); |
static int post_ar(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
|
static int post_bl_head(POST_ARGS); |
static int post_bl_width(POST_ARGS); |
static int post_bl_width(POST_ARGS); |
static int post_bl_tagwidth(POST_ARGS); |
static int post_bl_tagwidth(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
Line 71 static int pre_dl(PRE_ARGS); |
|
Line 73 static int pre_dl(PRE_ARGS); |
|
#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t)) |
#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t)) |
|
|
const struct actions mdoc_actions[MDOC_MAX] = { |
const struct actions mdoc_actions[MDOC_MAX] = { |
{ NULL, NULL }, /* \" */ |
{ NULL, NULL }, /* Ap */ |
{ NULL, post_dd }, /* Dd */ |
{ NULL, post_dd }, /* Dd */ |
{ NULL, post_dt }, /* Dt */ |
{ NULL, post_dt }, /* Dt */ |
{ NULL, post_os }, /* Os */ |
{ NULL, post_os }, /* Os */ |
Line 88 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 90 const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* An */ |
{ NULL, NULL }, /* An */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
Line 178 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 180 const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, NULL }, /* Lb */ |
{ NULL, NULL }, /* Lb */ |
{ NULL, NULL }, /* Ap */ |
|
{ NULL, NULL }, /* Lp */ |
{ NULL, NULL }, /* Lp */ |
{ NULL, post_lk }, /* Lk */ |
{ NULL, post_lk }, /* Lk */ |
{ NULL, NULL }, /* Mt */ |
{ NULL, NULL }, /* Mt */ |
Line 272 perr(struct mdoc *m, int line, int pos, enum merr type |
|
Line 273 perr(struct mdoc *m, int line, int pos, enum merr type |
|
case (ETOOLONG): |
case (ETOOLONG): |
p = "argument text too long"; |
p = "argument text too long"; |
break; |
break; |
|
case (EUTSNAME): |
|
p = "utsname"; |
|
break; |
case (EMALLOC): |
case (EMALLOC): |
p = "memory exhausted"; |
p = "memory exhausted"; |
break; |
break; |
Line 505 post_os(POST_ARGS) |
|
Line 509 post_os(POST_ARGS) |
|
|
|
if (0 == buf[0]) { |
if (0 == buf[0]) { |
if (-1 == uname(&utsname)) |
if (-1 == uname(&utsname)) |
return(mdoc_err(m, "utsname")); |
return(verr(m, EUTSNAME)); |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
return(verr(m, ETOOLONG)); |
return(verr(m, ETOOLONG)); |
if (strlcat(buf, " ", 64) >= 64) |
if (strlcat(buf, " ", 64) >= 64) |
Line 516 post_os(POST_ARGS) |
|
Line 520 post_os(POST_ARGS) |
|
|
|
if (NULL == (m->meta.os = strdup(buf))) |
if (NULL == (m->meta.os = strdup(buf))) |
return(verr(m, EMALLOC)); |
return(verr(m, EMALLOC)); |
m->lastnamed = m->lastsec = SEC_BODY; |
|
|
|
|
m->flags |= MDOC_PBODY; |
return(post_prol(m)); |
return(post_prol(m)); |
} |
} |
|
|
Line 614 post_bl_width(struct mdoc *m) |
|
Line 618 post_bl_width(struct mdoc *m) |
|
*/ |
*/ |
|
|
if (0 == strcmp(p, "Ds")) |
if (0 == strcmp(p, "Ds")) |
width = 8; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |
Line 635 post_bl_width(struct mdoc *m) |
|
Line 639 post_bl_width(struct mdoc *m) |
|
|
|
|
|
static int |
static int |
|
post_bl_head(POST_ARGS) |
|
{ |
|
int i, c; |
|
struct mdoc_node *n, *nn, *nnp; |
|
|
|
if (NULL == m->last->child) |
|
return(1); |
|
|
|
n = m->last->parent; |
|
assert(n->args); |
|
|
|
for (c = 0; c < (int)n->args->argc; c++) |
|
if (MDOC_Column == n->args->argv[c].arg) |
|
break; |
|
|
|
/* Only process -column. */ |
|
|
|
if (c == (int)n->args->argc) |
|
return(1); |
|
|
|
assert(0 == n->args->argv[c].sz); |
|
|
|
/* |
|
* Accomodate for new-style groff column syntax. Shuffle the |
|
* child nodes, all of which must be TEXT, as arguments for the |
|
* column field. Then, delete the head children. |
|
*/ |
|
|
|
n->args->argv[c].sz = (size_t)m->last->nchild; |
|
n->args->argv[c].value = malloc |
|
((size_t)m->last->nchild * sizeof(char *)); |
|
|
|
for (i = 0, nn = m->last->child; nn; i++) { |
|
n->args->argv[c].value[i] = nn->string; |
|
nn->string = NULL; |
|
nnp = nn; |
|
nn = nn->next; |
|
mdoc_node_free(nnp); |
|
} |
|
|
|
m->last->nchild = 0; |
|
m->last->child = NULL; |
|
|
|
return(1); |
|
} |
|
|
|
|
|
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
int i, r, len; |
int i, r, len; |
|
|
|
if (MDOC_HEAD == m->last->type) |
|
return(post_bl_head(m)); |
if (MDOC_BLOCK != m->last->type) |
if (MDOC_BLOCK != m->last->type) |
return(1); |
return(1); |
|
|
|
|
pre_dl(PRE_ARGS) |
pre_dl(PRE_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY == n->type) |
return(1); |
m->flags |= MDOC_LITERAL; |
m->flags |= MDOC_LITERAL; |
|
return(1); |
return(1); |
} |
} |
|
|