version 1.82, 2010/11/29 14:50:33 |
version 1.86, 2010/11/30 10:32:05 |
Line 52 static int concat(struct mdoc *, char *, |
|
Line 52 static int concat(struct mdoc *, char *, |
|
const struct mdoc_node *, size_t); |
const struct mdoc_node *, size_t); |
|
|
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
|
static int post_bl_tagwidth(POST_ARGS); |
static int post_bl_tagwidth(POST_ARGS); |
static int post_bl_width(POST_ARGS); |
static int post_bl_width(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_display(POST_ARGS); |
|
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_lb(POST_ARGS); |
|
static int post_nm(POST_ARGS); |
|
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_pa(POST_ARGS); |
|
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_st(POST_ARGS); |
|
static int post_std(POST_ARGS); |
static int post_std(POST_ARGS); |
|
|
static int pre_bd(PRE_ARGS); |
|
static int pre_dl(PRE_ARGS); |
|
|
|
static const struct actions mdoc_actions[MDOC_MAX] = { |
static const struct actions mdoc_actions[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ NULL, post_dd }, /* Dd */ |
{ NULL, post_dd }, /* Dd */ |
Line 78 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 69 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ss */ |
{ NULL, NULL }, /* Ss */ |
{ NULL, NULL }, /* Pp */ |
{ NULL, NULL }, /* Pp */ |
{ NULL, NULL }, /* D1 */ |
{ NULL, NULL }, /* D1 */ |
{ pre_dl, post_display }, /* Dl */ |
{ NULL, NULL }, /* Dl */ |
{ pre_bd, post_display }, /* Bd */ |
{ NULL, NULL }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, post_bl }, /* Bl */ |
{ NULL, post_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
Line 102 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 93 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* In */ |
{ NULL, NULL }, /* In */ |
{ NULL, NULL }, /* Li */ |
{ NULL, NULL }, /* Li */ |
{ NULL, NULL }, /* Nd */ |
{ NULL, NULL }, /* Nd */ |
{ NULL, post_nm }, /* Nm */ |
{ NULL, NULL }, /* Nm */ |
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, post_pa }, /* Pa */ |
{ NULL, NULL }, /* Pa */ |
{ NULL, post_std }, /* Rv */ |
{ NULL, post_std }, /* Rv */ |
{ NULL, post_st }, /* St */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Vt */ |
{ NULL, NULL }, /* Vt */ |
{ NULL, NULL }, /* Xr */ |
{ NULL, NULL }, /* Xr */ |
Line 176 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 167 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, post_lb }, /* Lb */ |
{ NULL, NULL }, /* Lb */ |
{ NULL, NULL }, /* Lp */ |
{ NULL, NULL }, /* Lp */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, NULL }, /* Mt */ |
{ NULL, NULL }, /* Mt */ |
Line 194 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 185 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
}; |
}; |
|
|
#define RSORD_MAX 14 |
|
|
|
static const enum mdoct rsord[RSORD_MAX] = { |
|
MDOC__A, |
|
MDOC__T, |
|
MDOC__B, |
|
MDOC__I, |
|
MDOC__J, |
|
MDOC__R, |
|
MDOC__N, |
|
MDOC__V, |
|
MDOC__P, |
|
MDOC__Q, |
|
MDOC__D, |
|
MDOC__O, |
|
MDOC__C, |
|
MDOC__U |
|
}; |
|
|
|
|
|
int |
int |
mdoc_action_pre(struct mdoc *m, struct mdoc_node *n) |
mdoc_action_pre(struct mdoc *m, struct mdoc_node *n) |
{ |
{ |
Line 313 post_std(POST_ARGS) |
|
Line 285 post_std(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* The `Nm' macro's first use sets the name of the document. See also |
|
* post_std(), etc. |
|
*/ |
|
static int |
|
post_nm(POST_ARGS) |
|
{ |
|
char buf[BUFSIZ]; |
|
|
|
if (m->meta.name) |
|
return(1); |
|
if ( ! concat(m, buf, n->child, BUFSIZ)) |
|
return(0); |
|
m->meta.name = mandoc_strdup(buf); |
|
return(1); |
|
} |
|
|
|
|
|
/* |
|
* Look up the value of `Lb' for matching predefined strings. If it has |
|
* one, then substitute the current value for the formatted value. Note |
|
* that the lookup may fail (we can provide arbitrary strings). |
|
*/ |
|
/* ARGSUSED */ |
|
static int |
|
post_lb(POST_ARGS) |
|
{ |
|
const char *p; |
|
char *buf; |
|
size_t sz; |
|
|
|
assert(MDOC_TEXT == n->child->type); |
|
p = mdoc_a2lib(n->child->string); |
|
|
|
if (p) { |
|
free(n->child->string); |
|
n->child->string = mandoc_strdup(p); |
|
return(1); |
|
} |
|
|
|
sz = strlen(n->child->string) + |
|
2 + strlen("\\(lqlibrary\\(rq"); |
|
buf = mandoc_malloc(sz); |
|
snprintf(buf, sz, "library \\(lq%s\\(rq", n->child->string); |
|
free(n->child->string); |
|
n->child->string = buf; |
|
return(1); |
|
} |
|
|
|
|
|
/* |
|
* Substitute the value of `St' for the corresponding formatted string. |
|
* We're guaranteed that this exists (it's been verified during the |
|
* validation phase). |
|
*/ |
|
/* ARGSUSED */ |
|
static int |
|
post_st(POST_ARGS) |
|
{ |
|
const char *p; |
|
|
|
assert(MDOC_TEXT == n->child->type); |
|
p = mdoc_a2st(n->child->string); |
|
if (p != NULL) { |
|
free(n->child->string); |
|
n->child->string = mandoc_strdup(p); |
|
} |
|
return(1); |
|
} |
|
|
|
|
|
/* |
|
* Parse out the contents of `Dt'. See in-line documentation for how we |
* Parse out the contents of `Dt'. See in-line documentation for how we |
* handle the various fields of this macro. |
* handle the various fields of this macro. |
*/ |
*/ |
Line 649 post_bl_width(POST_ARGS) |
|
Line 549 post_bl_width(POST_ARGS) |
|
} |
} |
|
|
|
|
/* |
|
* Do processing for -column lists, which can have two distinct styles |
|
* of invocation. Merge this two styles into a consistent form. |
|
*/ |
|
/* ARGSUSED */ |
|
static int |
static int |
post_bl_head(POST_ARGS) |
|
{ |
|
int i, c; |
|
struct mdoc_node *np, *nn, *nnp; |
|
|
|
if (LIST_column != n->data.Bl->type) |
|
return(1); |
|
else if (NULL == n->child) |
|
return(1); |
|
|
|
np = n->parent; |
|
assert(np->args); |
|
|
|
for (c = 0; c < (int)np->args->argc; c++) |
|
if (MDOC_Column == np->args->argv[c].arg) |
|
break; |
|
|
|
assert(c < (int)np->args->argc); |
|
assert(0 == np->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. |
|
*/ |
|
|
|
np->args->argv[c].sz = (size_t)n->nchild; |
|
np->args->argv[c].value = mandoc_malloc |
|
((size_t)n->nchild * sizeof(char *)); |
|
|
|
n->data.Bl->ncols = np->args->argv[c].sz; |
|
n->data.Bl->cols = (const char **)np->args->argv[c].value; |
|
|
|
for (i = 0, nn = n->child; nn; i++) { |
|
np->args->argv[c].value[i] = nn->string; |
|
nn->string = NULL; |
|
nnp = nn; |
|
nn = nn->next; |
|
mdoc_node_delete(NULL, nnp); |
|
} |
|
|
|
n->nchild = 0; |
|
n->child = NULL; |
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
|
|
if (MDOC_HEAD == n->type) |
|
return(post_bl_head(m, n)); |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
Line 732 post_bl(POST_ARGS) |
|
Line 577 post_bl(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* The `Pa' macro defaults to a tilde if no value is provided as an |
|
* argument. |
|
*/ |
|
static int |
|
post_pa(POST_ARGS) |
|
{ |
|
struct mdoc_node *np; |
|
|
|
if (n->child) |
|
return(1); |
|
|
|
np = n; |
|
m->next = MDOC_NEXT_CHILD; |
|
if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) |
|
return(0); |
|
m->last = np; |
|
return(1); |
|
} |
|
|
|
|
|
/* |
|
* Parse the date field in `Dd'. |
* Parse the date field in `Dd'. |
*/ |
*/ |
static int |
static int |
Line 795 post_prol(POST_ARGS) |
|
Line 618 post_prol(POST_ARGS) |
|
mdoc_node_delete(m, n); |
mdoc_node_delete(m, n); |
if (m->meta.title && m->meta.date && m->meta.os) |
if (m->meta.title && m->meta.date && m->meta.os) |
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
return(1); |
|
} |
|
|
|
|
|
/* |
|
* Trigger a literal context. |
|
*/ |
|
static int |
|
pre_dl(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_BODY == n->type) |
|
m->flags |= MDOC_LITERAL; |
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
pre_bd(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_BODY != n->type) |
|
return(1); |
|
|
|
assert(n->data.Bd); |
|
if (DISP_literal == n->data.Bd->type) |
|
m->flags |= MDOC_LITERAL; |
|
if (DISP_unfilled == n->data.Bd->type) |
|
m->flags |= MDOC_LITERAL; |
|
|
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
post_display(POST_ARGS) |
|
{ |
|
|
|
if (MDOC_BODY == n->type) |
|
m->flags &= ~MDOC_LITERAL; |
|
return(1); |
return(1); |
} |
} |