version 1.32, 2009/03/06 14:24:49 |
version 1.36, 2009/03/08 20:50:12 |
|
|
* children have been filled in (post-fix order). |
* children have been filled in (post-fix order). |
*/ |
*/ |
|
|
|
enum merr { |
|
ENOWIDTH |
|
}; |
|
|
|
enum mwarn { |
|
WBADSEC, |
|
WNOWIDTH, |
|
WBADDATE |
|
}; |
|
|
struct actions { |
struct actions { |
int (*post)(struct mdoc *); |
int (*post)(struct mdoc *); |
}; |
}; |
|
|
/* Per-macro action routines. */ |
static int nwarn(struct mdoc *, |
|
const struct mdoc_node *, enum mwarn); |
|
static int nerr(struct mdoc *, |
|
const struct mdoc_node *, enum merr); |
static int post_ar(struct mdoc *); |
static int post_ar(struct mdoc *); |
static int post_bl(struct mdoc *); |
static int post_bl(struct mdoc *); |
static int post_bl_width(struct mdoc *); |
static int post_bl_width(struct mdoc *); |
Line 49 static int post_nm(struct mdoc *); |
|
Line 61 static int post_nm(struct mdoc *); |
|
static int post_os(struct mdoc *); |
static int post_os(struct mdoc *); |
static int post_sh(struct mdoc *); |
static int post_sh(struct mdoc *); |
static int post_ex(struct mdoc *); |
static int post_ex(struct mdoc *); |
|
|
static int post_prologue(struct mdoc *); |
static int post_prologue(struct mdoc *); |
|
|
/* Array of macro action routines. */ |
|
|
|
const struct actions mdoc_actions[MDOC_MAX] = { |
const struct actions mdoc_actions[MDOC_MAX] = { |
{ NULL }, /* \" */ |
{ NULL }, /* \" */ |
{ post_dd }, /* Dd */ |
{ post_dd }, /* Dd */ |
Line 162 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 171 const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL }, /* Fr */ |
{ NULL }, /* Fr */ |
{ NULL }, /* Ud */ |
{ NULL }, /* Ud */ |
{ NULL }, /* Lb */ |
{ NULL }, /* Lb */ |
|
{ NULL }, /* Ap */ |
}; |
}; |
|
|
|
|
|
#define merr(m, t) nerr((m), (m)->last, (t)) |
static int |
static int |
|
nerr(struct mdoc *m, const struct mdoc_node *n, enum merr type) |
|
{ |
|
char *p; |
|
|
|
p = NULL; |
|
|
|
switch (type) { |
|
case (ENOWIDTH): |
|
p = "missing width argument"; |
|
break; |
|
} |
|
|
|
assert(p); |
|
return(mdoc_nerr(m, n, p)); |
|
} |
|
|
|
|
|
#define mwarn(m, t) nwarn((m), (m)->last, (t)) |
|
static int |
|
nwarn(struct mdoc *m, const struct mdoc_node *n, enum mwarn type) |
|
{ |
|
char *p; |
|
int c; |
|
|
|
p = NULL; |
|
c = WARN_SYNTAX; |
|
|
|
switch (type) { |
|
case (WBADSEC): |
|
p = "inappropriate document section in manual section"; |
|
c = WARN_COMPAT; |
|
break; |
|
case (WNOWIDTH): |
|
p = "cannot determine default width"; |
|
break; |
|
case (WBADDATE): |
|
p = "malformed date syntax"; |
|
break; |
|
} |
|
|
|
assert(p); |
|
return(mdoc_nwarn(m, n, c, p)); |
|
} |
|
|
|
|
|
static int |
post_ex(struct mdoc *mdoc) |
post_ex(struct mdoc *mdoc) |
{ |
{ |
|
|
Line 174 post_ex(struct mdoc *mdoc) |
|
Line 231 post_ex(struct mdoc *mdoc) |
|
* our name (if it's been set). |
* our name (if it's been set). |
*/ |
*/ |
|
|
if (0 == mdoc->last->data.elem.argc) |
if (NULL == mdoc->last->args) |
return(1); |
return(1); |
if (mdoc->last->data.elem.argv[0].sz) |
if (mdoc->last->args->argv[0].sz) |
return(1); |
return(1); |
|
|
assert(mdoc->meta.name); |
assert(mdoc->meta.name); |
|
|
mdoc_msg(mdoc, "writing %s argument: %s", |
mdoc_msg(mdoc, "writing %s argument: %s", |
mdoc_argnames[MDOC_Std], mdoc->meta.name); |
mdoc_argnames[MDOC_Std], |
|
mdoc->meta.name); |
|
|
mdoc->last->data.elem.argv[0].sz = 1; |
mdoc->last->args->argv[0].value = xcalloc(1, sizeof(char *)); |
mdoc->last->data.elem.argv[0].value = xcalloc(1, sizeof(char *)); |
mdoc->last->args->argv[0].sz = 1; |
mdoc->last->data.elem.argv[0].value[0] = xstrdup(mdoc->meta.name); |
mdoc->last->args->argv[0].value[0] = xstrdup(mdoc->meta.name); |
return(1); |
return(1); |
} |
} |
|
|
Line 240 post_sh(struct mdoc *mdoc) |
|
Line 298 post_sh(struct mdoc *mdoc) |
|
case (9): |
case (9): |
break; |
break; |
default: |
default: |
return(mdoc_warn(mdoc, WARN_COMPAT, |
return(mwarn(mdoc, WBADSEC)); |
"inappropriate section for " |
|
"manual section")); |
|
} |
} |
break; |
break; |
default: |
default: |
Line 288 post_dt(struct mdoc *mdoc) |
|
Line 344 post_dt(struct mdoc *mdoc) |
|
* --> title = TITLE, volume = local, msec = 0, arch = NULL |
* --> title = TITLE, volume = local, msec = 0, arch = NULL |
*/ |
*/ |
|
|
mdoc->meta.title = xstrdup(n->data.text.string); |
mdoc->meta.title = xstrdup(n->string); |
mdoc_msg(mdoc, "title: %s", mdoc->meta.title); |
mdoc_msg(mdoc, "title: %s", mdoc->meta.title); |
|
|
if (NULL == (n = n->next)) { |
if (NULL == (n = n->next)) { |
Line 306 post_dt(struct mdoc *mdoc) |
|
Line 362 post_dt(struct mdoc *mdoc) |
|
* arch = NULL |
* arch = NULL |
*/ |
*/ |
|
|
if ((cp = mdoc_a2msec(n->data.text.string))) { |
if ((cp = mdoc_a2msec(n->string))) { |
mdoc->meta.vol = xstrdup(cp); |
mdoc->meta.vol = xstrdup(cp); |
errno = 0; |
errno = 0; |
lval = strtol(n->data.text.string, &ep, 10); |
lval = strtol(n->string, &ep, 10); |
if (n->data.text.string[0] != '\0' && *ep == '\0') |
if (n->string[0] != '\0' && *ep == '\0') |
mdoc->meta.msec = (int)lval; |
mdoc->meta.msec = (int)lval; |
} else |
} else |
mdoc->meta.vol = xstrdup(n->data.text.string); |
mdoc->meta.vol = xstrdup(n->string); |
|
|
if (NULL == (n = n->next)) { |
if (NULL == (n = n->next)) { |
mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); |
mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); |
Line 329 post_dt(struct mdoc *mdoc) |
|
Line 385 post_dt(struct mdoc *mdoc) |
|
* VOL |
* VOL |
*/ |
*/ |
|
|
if ((cp = mdoc_a2vol(n->data.text.string))) { |
if ((cp = mdoc_a2vol(n->string))) { |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = xstrdup(cp); |
mdoc->meta.vol = xstrdup(cp); |
n = n->next; |
n = n->next; |
} else { |
} else { |
cp = mdoc_a2arch(n->data.text.string); |
cp = mdoc_a2arch(n->string); |
if (NULL == cp) { |
if (NULL == cp) { |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = xstrdup(n->data.text.string); |
mdoc->meta.vol = xstrdup(n->string); |
} else |
} else |
mdoc->meta.arch = xstrdup(cp); |
mdoc->meta.arch = xstrdup(cp); |
} |
} |
|
|
post_bl_tagwidth(struct mdoc *mdoc) |
post_bl_tagwidth(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
struct mdoc_block *b; |
|
int sz; |
int sz; |
char buf[32]; |
char buf[32]; |
|
|
Line 394 post_bl_tagwidth(struct mdoc *mdoc) |
|
Line 449 post_bl_tagwidth(struct mdoc *mdoc) |
|
* to intuit our width from the first body element. |
* to intuit our width from the first body element. |
*/ |
*/ |
|
|
b = &mdoc->last->data.block; |
if (NULL == (n = mdoc->last->body->child)) |
|
|
if (NULL == (n = b->body->child)) |
|
return(1); |
return(1); |
assert(MDOC_It == n->tok); |
|
|
|
/* |
/* |
* Use the text width, if a text node, or the default macro |
* Use the text width, if a text node, or the default macro |
* width if a macro. |
* width if a macro. |
*/ |
*/ |
|
|
if ((n = n->data.block.head->child)) { |
if ((n = n->head->child)) { |
if (MDOC_TEXT != n->type) { |
if (MDOC_TEXT != n->type) { |
if (0 == (sz = mdoc_macro2len(n->tok))) |
if (0 == (sz = (int)mdoc_macro2len(n->tok))) |
sz = -1; |
sz = -1; |
} else |
} else |
sz = (int)strlen(n->data.text.string) + 1; |
sz = (int)strlen(n->string) + 1; |
} else |
} else |
sz = -1; |
sz = -1; |
|
|
if (-1 == sz) { |
if (-1 == sz) { |
if ( ! mdoc_warn(mdoc, WARN_SYNTAX, |
if ( ! mwarn(mdoc, WNOWIDTH)) |
"cannot determine default %s", |
|
mdoc_argnames[MDOC_Width])) |
|
return(0); |
return(0); |
sz = 10; |
sz = 10; |
} |
} |
Line 429 post_bl_tagwidth(struct mdoc *mdoc) |
|
Line 479 post_bl_tagwidth(struct mdoc *mdoc) |
|
* We're guaranteed that a MDOC_Width doesn't already exist. |
* We're guaranteed that a MDOC_Width doesn't already exist. |
*/ |
*/ |
|
|
(b->argc)++; |
if (NULL == mdoc->last->args) { |
b->argv = xrealloc(b->argv, b->argc * sizeof(struct mdoc_arg)); |
mdoc->last->args = xcalloc |
|
(1, sizeof(struct mdoc_arg)); |
|
mdoc->last->args->refcnt = 1; |
|
} |
|
|
b->argv[b->argc - 1].arg = MDOC_Width; |
n = mdoc->last; |
b->argv[b->argc - 1].line = mdoc->last->line; |
sz = (int)n->args->argc; |
b->argv[b->argc - 1].pos = mdoc->last->pos; |
|
b->argv[b->argc - 1].sz = 1; |
(n->args->argc)++; |
b->argv[b->argc - 1].value = xcalloc(1, sizeof(char *)); |
|
b->argv[b->argc - 1].value[0] = xstrdup(buf); |
|
|
|
mdoc_msg(mdoc, "adding %s argument: %dn", |
n->args->argv = xrealloc(n->args->argv, |
mdoc_argnames[MDOC_Width], sz); |
n->args->argc * sizeof(struct mdoc_arg)); |
|
|
|
n->args->argv[sz - 1].arg = MDOC_Width; |
|
n->args->argv[sz - 1].line = mdoc->last->line; |
|
n->args->argv[sz - 1].pos = mdoc->last->pos; |
|
n->args->argv[sz - 1].sz = 1; |
|
n->args->argv[sz - 1].value = xcalloc(1, sizeof(char *)); |
|
n->args->argv[sz - 1].value[0] = xstrdup(buf); |
|
|
|
mdoc_msg(mdoc, "adding %s argument: %s", |
|
mdoc_argnames[MDOC_Width], buf); |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static int |
static int |
post_bl_width(struct mdoc *mdoc) |
post_bl_width(struct mdoc *m) |
{ |
{ |
size_t width; |
size_t width; |
int i, tok; |
int i, tok; |
char buf[32]; |
char buf[32]; |
char **p; |
char *p; |
|
|
for (i = 0; i < (int)mdoc->last->data.block.argc; i++) |
if (NULL == m->last->args) |
if (MDOC_Width == mdoc->last->data.block.argv[i].arg) |
return(merr(m, ENOWIDTH)); |
|
|
|
for (i = 0; i < (int)m->last->args->argc; i++) |
|
if (MDOC_Width == m->last->args->argv[i].arg) |
break; |
break; |
|
|
assert(i < (int)mdoc->last->data.block.argc); |
if (i == (int)m->last->args->argc) |
assert(1 == mdoc->last->data.block.argv[i].sz); |
return(merr(m, ENOWIDTH)); |
p = &mdoc->last->data.block.argv[i].value[0]; |
|
|
|
|
p = m->last->args->argv[i].value[0]; |
|
|
/* |
/* |
* If the value to -width is a macro, then we re-write it to be |
* If the value to -width is a macro, then we re-write it to be |
* the macro's width as set in share/tmac/mdoc/doc-common. |
* the macro's width as set in share/tmac/mdoc/doc-common. |
*/ |
*/ |
|
|
if (xstrcmp(*p, "Ds")) |
if (xstrcmp(p, "Ds")) |
width = 8; |
width = 8; |
else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) |
else if (MDOC_MAX == (tok = mdoc_tokhash_find(m->htab, p))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |
return(mdoc_warn(mdoc, WARN_SYNTAX, |
return(mwarn(m, WNOWIDTH)); |
"%s macro has no length", |
|
mdoc_argnames[MDOC_Width])); |
|
|
|
mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", |
mdoc_msg(m, "re-writing %s argument: %s -> %zun", |
mdoc_argnames[MDOC_Width], *p, width); |
mdoc_argnames[MDOC_Width], p, width); |
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
(void)snprintf(buf, sizeof(buf), "%zun", width); |
(void)snprintf(buf, sizeof(buf), "%zun", width); |
|
|
free(*p); |
free(m->last->args->argv[i].value[0]); |
*p = strdup(buf); |
m->last->args->argv[i].value[0] = xstrdup(buf); |
|
|
return(1); |
return(1); |
} |
} |
Line 493 post_bl_width(struct mdoc *mdoc) |
|
Line 556 post_bl_width(struct mdoc *mdoc) |
|
static int |
static int |
post_bl(struct mdoc *mdoc) |
post_bl(struct mdoc *mdoc) |
{ |
{ |
int i, r; |
int i, r, len; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
if (MDOC_BLOCK != mdoc->last->type) |
return(1); |
return(1); |
Line 506 post_bl(struct mdoc *mdoc) |
|
Line 569 post_bl(struct mdoc *mdoc) |
|
* rewritten into real lengths). |
* rewritten into real lengths). |
*/ |
*/ |
|
|
for (r = i = 0; i < (int)mdoc->last->data.block.argc; i++) { |
len = (int)(mdoc->last->args ? mdoc->last->args->argc : 0); |
if (MDOC_Tag == mdoc->last->data.block.argv[i].arg) |
|
|
for (r = i = 0; i < len; i++) { |
|
if (MDOC_Tag == mdoc->last->args->argv[i].arg) |
r |= 1 << 0; |
r |= 1 << 0; |
if (MDOC_Width == mdoc->last->data.block.argv[i].arg) |
if (MDOC_Width == mdoc->last->args->argv[i].arg) |
r |= 1 << 1; |
r |= 1 << 1; |
} |
} |
|
|
Line 556 post_dd(struct mdoc *mdoc) |
|
Line 621 post_dd(struct mdoc *mdoc) |
|
|
|
(void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); |
(void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); |
|
|
if (0 == (mdoc->meta.date = mdoc_atotime(buf))) |
if (0 == (mdoc->meta.date = mdoc_atotime(buf))) { |
return(mdoc_err(mdoc, "invalid date syntax")); |
if ( ! mwarn(mdoc, WBADDATE)) |
|
return(0); |
|
mdoc->meta.date = time(NULL); |
|
} |
|
|
mdoc_msg(mdoc, "date: %u", mdoc->meta.date); |
mdoc_msg(mdoc, "date: %u", mdoc->meta.date); |
return(post_prologue(mdoc)); |
return(post_prologue(mdoc)); |