version 1.63, 2010/05/30 11:00:53 |
version 1.70, 2010/06/13 21:02:48 |
Line 68 static int post_st(POST_ARGS); |
|
Line 68 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_bd(PRE_ARGS); |
static int pre_bl(PRE_ARGS); |
|
static int pre_dl(PRE_ARGS); |
static int pre_dl(PRE_ARGS); |
static int pre_offset(PRE_ARGS); |
|
|
|
static const struct actions mdoc_actions[MDOC_MAX] = { |
static const struct actions mdoc_actions[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
Line 84 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 82 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ pre_dl, post_display }, /* Dl */ |
{ pre_dl, post_display }, /* Dl */ |
{ pre_bd, post_display }, /* Bd */ |
{ pre_bd, post_display }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pre_bl, post_bl }, /* Bl */ |
{ NULL, post_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* It */ |
{ NULL, NULL }, /* It */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
Line 194 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 192 static const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* br */ |
{ NULL, NULL }, /* br */ |
{ NULL, NULL }, /* sp */ |
{ NULL, NULL }, /* sp */ |
{ NULL, NULL }, /* %U */ |
{ NULL, NULL }, /* %U */ |
|
{ NULL, NULL }, /* Ta */ |
}; |
}; |
|
|
#define RSORD_MAX 14 |
#define RSORD_MAX 14 |
|
|
post_bl_tagwidth(POST_ARGS) |
post_bl_tagwidth(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn; |
struct mdoc_node *nn; |
size_t sz; |
size_t sz, ssz; |
int i; |
int i; |
char buf[NUMSIZ]; |
char buf[NUMSIZ]; |
|
|
/* Defaults to ten ens. */ |
sz = 10; |
|
|
sz = 10; /* XXX: make this a macro value. */ |
|
|
|
for (nn = n->body->child; nn; nn = nn->next) { |
for (nn = n->body->child; nn; nn = nn->next) { |
if (MDOC_It == nn->tok) |
if (MDOC_It != nn->tok) |
break; |
continue; |
} |
|
|
|
if (nn) { |
|
assert(MDOC_BLOCK == nn->type); |
assert(MDOC_BLOCK == nn->type); |
nn = nn->head->child; |
nn = nn->head->child; |
if (MDOC_TEXT != nn->type) { |
|
sz = mdoc_macro2len(nn->tok); |
if (MDOC_TEXT == nn->type) { |
if (sz == 0) { |
|
if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG)) |
|
return(0); |
|
sz = 10; |
|
} |
|
} else |
|
sz = strlen(nn->string) + 1; |
sz = strlen(nn->string) + 1; |
|
break; |
|
} |
|
|
|
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
|
sz = ssz; |
|
else if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG)) |
|
return(0); |
|
|
|
break; |
} |
} |
|
|
|
/* Defaults to ten ens. */ |
|
|
snprintf(buf, NUMSIZ, "%zun", sz); |
snprintf(buf, NUMSIZ, "%zun", sz); |
|
|
/* |
/* |
Line 666 post_bl_tagwidth(POST_ARGS) |
|
Line 666 post_bl_tagwidth(POST_ARGS) |
|
* We're guaranteed that a MDOC_Width doesn't already exist. |
* We're guaranteed that a MDOC_Width doesn't already exist. |
*/ |
*/ |
|
|
nn = n; |
assert(n->args); |
assert(nn->args); |
i = (int)(n->args->argc)++; |
i = (int)(nn->args->argc)++; |
|
|
|
nn->args->argv = mandoc_realloc(nn->args->argv, |
n->args->argv = mandoc_realloc(n->args->argv, |
nn->args->argc * sizeof(struct mdoc_argv)); |
n->args->argc * sizeof(struct mdoc_argv)); |
|
|
nn->args->argv[i].arg = MDOC_Width; |
n->args->argv[i].arg = MDOC_Width; |
nn->args->argv[i].line = n->line; |
n->args->argv[i].line = n->line; |
nn->args->argv[i].pos = n->pos; |
n->args->argv[i].pos = n->pos; |
nn->args->argv[i].sz = 1; |
n->args->argv[i].sz = 1; |
nn->args->argv[i].value = mandoc_malloc(sizeof(char *)); |
n->args->argv[i].value = mandoc_malloc(sizeof(char *)); |
nn->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
|
/* Set our width! */ |
|
n->data.Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 695 post_bl_width(POST_ARGS) |
|
Line 697 post_bl_width(POST_ARGS) |
|
int i; |
int i; |
enum mdoct tok; |
enum mdoct tok; |
char buf[NUMSIZ]; |
char buf[NUMSIZ]; |
char *p; |
|
|
|
if (NULL == n->args) |
|
return(1); |
|
|
|
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Width == n->args->argv[i].arg) |
|
break; |
|
|
|
if (i == (int)n->args->argc) |
|
return(1); |
|
p = n->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 (0 == strcmp(p, "Ds")) |
if (0 == strcmp(n->data.Bl.width, "Ds")) |
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(p))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl.width))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |
return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH)); |
return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH)); |
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
|
assert(n->args); |
|
|
|
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Width == n->args->argv[i].arg) |
|
break; |
|
|
|
assert(i < (int)n->args->argc); |
|
|
snprintf(buf, NUMSIZ, "%zun", width); |
snprintf(buf, NUMSIZ, "%zun", width); |
free(n->args->argv[i].value[0]); |
free(n->args->argv[i].value[0]); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
|
/* Set our width! */ |
|
n->data.Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 740 post_bl_head(POST_ARGS) |
|
Line 741 post_bl_head(POST_ARGS) |
|
int i, c; |
int i, c; |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
|
|
if (NULL == n->child) |
if (LIST_column != n->data.Bl.type) |
return(1); |
return(1); |
|
else if (NULL == n->child) |
|
return(1); |
|
|
np = n->parent; |
np = n->parent; |
assert(np->args); |
assert(np->args); |
Line 750 post_bl_head(POST_ARGS) |
|
Line 753 post_bl_head(POST_ARGS) |
|
if (MDOC_Column == np->args->argv[c].arg) |
if (MDOC_Column == np->args->argv[c].arg) |
break; |
break; |
|
|
if (c == (int)np->args->argc) |
assert(c < (int)np->args->argc); |
return(1); |
|
assert(0 == np->args->argv[c].sz); |
assert(0 == np->args->argv[c].sz); |
|
|
/* |
/* |
Line 781 post_bl_head(POST_ARGS) |
|
Line 783 post_bl_head(POST_ARGS) |
|
static int |
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
int i, r, len; |
struct mdoc_node *nn; |
|
const char *ww; |
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(post_bl_head(m, n)); |
return(post_bl_head(m, n)); |
Line 796 post_bl(POST_ARGS) |
|
Line 799 post_bl(POST_ARGS) |
|
* rewritten into real lengths). |
* rewritten into real lengths). |
*/ |
*/ |
|
|
len = (int)(n->args ? n->args->argc : 0); |
ww = n->data.Bl.width; |
|
|
for (r = i = 0; i < len; i++) { |
if (LIST_tag == n->data.Bl.type && NULL == n->data.Bl.width) { |
if (MDOC_Tag == n->args->argv[i].arg) |
|
r |= 1 << 0; |
|
if (MDOC_Width == n->args->argv[i].arg) |
|
r |= 1 << 1; |
|
} |
|
|
|
if (r & (1 << 0) && ! (r & (1 << 1))) { |
|
if ( ! post_bl_tagwidth(m, n)) |
if ( ! post_bl_tagwidth(m, n)) |
return(0); |
return(0); |
} else if (r & (1 << 1)) |
} else if (NULL != n->data.Bl.width) { |
if ( ! post_bl_width(m, n)) |
if ( ! post_bl_width(m, n)) |
return(0); |
return(0); |
|
} else |
|
return(1); |
|
|
|
assert(n->data.Bl.width); |
|
|
|
/* If it has changed, propogate new width to children. */ |
|
|
|
if (ww == n->data.Bl.width) |
|
return(1); |
|
|
|
for (nn = n->child; nn; nn = nn->next) |
|
if (MDOC_Bl == nn->tok) |
|
nn->data.Bl.width = n->data.Bl.width; |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 830 post_pa(POST_ARGS) |
|
Line 839 post_pa(POST_ARGS) |
|
|
|
np = n; |
np = n; |
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
/* XXX: make into macro value. */ |
|
if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) |
if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) |
return(0); |
return(0); |
m->last = np; |
m->last = np; |
Line 936 pre_dl(PRE_ARGS) |
|
Line 944 pre_dl(PRE_ARGS) |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
pre_offset(PRE_ARGS) |
|
{ |
|
int i; |
|
|
|
/* |
|
* Make sure that an empty offset produces an 8n length space as |
|
* stipulated by mdoc.samples. |
|
*/ |
|
|
|
assert(n->args); |
|
for (i = 0; i < (int)n->args->argc; i++) { |
|
if (MDOC_Offset != n->args->argv[i].arg) |
|
continue; |
|
if (n->args->argv[i].sz) |
|
break; |
|
assert(1 == n->args->refcnt); |
|
/* If no value set, length of <string>. */ |
|
n->args->argv[i].sz++; |
|
n->args->argv[i].value = mandoc_malloc(sizeof(char *)); |
|
n->args->argv[i].value[0] = mandoc_strdup("8n"); |
|
break; |
|
} |
|
|
|
return(1); |
|
} |
|
|
|
|
|
static int |
|
pre_bl(PRE_ARGS) |
|
{ |
|
int pos; |
|
|
|
if (MDOC_BLOCK != n->type) { |
|
assert(n->parent); |
|
assert(MDOC_BLOCK == n->parent->type); |
|
assert(MDOC_Bl == n->parent->tok); |
|
assert(LIST__NONE != n->parent->data.list); |
|
n->data.list = n->parent->data.list; |
|
return(1); |
|
} |
|
|
|
assert(LIST__NONE == n->data.list); |
|
|
|
for (pos = 0; pos < (int)n->args->argc; pos++) { |
|
switch (n->args->argv[pos].arg) { |
|
case (MDOC_Bullet): |
|
n->data.list = LIST_bullet; |
|
break; |
|
case (MDOC_Dash): |
|
n->data.list = LIST_dash; |
|
break; |
|
case (MDOC_Enum): |
|
n->data.list = LIST_enum; |
|
break; |
|
case (MDOC_Hyphen): |
|
n->data.list = LIST_hyphen; |
|
break; |
|
case (MDOC_Item): |
|
n->data.list = LIST_item; |
|
break; |
|
case (MDOC_Tag): |
|
n->data.list = LIST_tag; |
|
break; |
|
case (MDOC_Diag): |
|
n->data.list = LIST_diag; |
|
break; |
|
case (MDOC_Hang): |
|
n->data.list = LIST_hang; |
|
break; |
|
case (MDOC_Ohang): |
|
n->data.list = LIST_ohang; |
|
break; |
|
case (MDOC_Inset): |
|
n->data.list = LIST_inset; |
|
break; |
|
case (MDOC_Column): |
|
n->data.list = LIST_column; |
|
break; |
|
default: |
|
break; |
|
} |
|
if (LIST__NONE != n->data.list) |
|
break; |
|
} |
|
|
|
assert(LIST__NONE != n->data.list); |
|
return(pre_offset(m, n)); |
|
} |
|
|
|
|
|
static int |
|
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
int i; |
|
|
|
if (MDOC_BLOCK == n->type) |
|
return(pre_offset(m, n)); |
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
/* Enter literal context if `Bd -literal' or `-unfilled'. */ |
if (DISP_literal == n->data.Bd.type) |
|
m->flags |= MDOC_LITERAL; |
for (n = n->parent, i = 0; i < (int)n->args->argc; i++) |
if (DISP_unfilled == n->data.Bd.type) |
if (MDOC_Literal == n->args->argv[i].arg) |
m->flags |= MDOC_LITERAL; |
m->flags |= MDOC_LITERAL; |
|
else if (MDOC_Unfilled == n->args->argv[i].arg) |
|
m->flags |= MDOC_LITERAL; |
|
|
|
return(1); |
return(1); |
} |
} |