version 1.69, 2010/05/29 18:58:52 |
version 1.72, 2010/06/03 13:44:36 |
Line 100 static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_l |
|
Line 100 static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_l |
|
int, struct roffsu *, struct roffsu *); |
int, struct roffsu *, struct roffsu *); |
static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, |
static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, |
struct roffsu *); |
struct roffsu *); |
static int mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list); |
static int mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list, |
|
struct roffsu *); |
static int mdoc_it_pre(MDOC_ARGS); |
static int mdoc_it_pre(MDOC_ARGS); |
static int mdoc_lb_pre(MDOC_ARGS); |
static int mdoc_lb_pre(MDOC_ARGS); |
static int mdoc_li_pre(MDOC_ARGS); |
static int mdoc_li_pre(MDOC_ARGS); |
Line 254 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 255 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_sp_pre, NULL}, /* br */ |
{mdoc_sp_pre, NULL}, /* br */ |
{mdoc_sp_pre, NULL}, /* sp */ |
{mdoc_sp_pre, NULL}, /* sp */ |
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
|
{NULL, NULL}, /* Ta */ |
}; |
}; |
|
|
|
|
Line 830 mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int |
|
Line 832 mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int |
|
struct roffsu su; |
struct roffsu su; |
|
|
nn = n->parent->parent; |
nn = n->parent->parent; |
assert(nn->args); |
|
|
|
/* XXX: see notes in mdoc_it_pre(). */ |
/* XXX: see notes in mdoc_it_pre(). */ |
|
|
Line 877 mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int |
|
Line 878 mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type) |
mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
struct roffsu su; |
Line 888 mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type) |
|
Line 889 mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type) |
|
case (LIST_ohang): |
case (LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_column): |
case (LIST_column): |
|
bufcat_su(h, "min-width", width); |
|
bufcat_style(h, "clear", "none"); |
|
if (n->next) |
|
bufcat_style(h, "float", "left"); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
break; |
break; |
default: |
default: |
/* |
/* |
Line 920 mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struc |
|
Line 927 mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struc |
|
print_otag(h, TAG_DIV, 0, &tag); |
print_otag(h, TAG_DIV, 0, &tag); |
return(1); |
return(1); |
case (LIST_column): |
case (LIST_column): |
bufcat_su(h, "min-width", width); |
|
bufcat_style(h, "clear", "none"); |
|
if (n->next && MDOC_HEAD == n->next->type) |
|
bufcat_style(h, "float", "left"); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
break; |
break; |
default: |
default: |
bufcat_su(h, "min-width", width); |
bufcat_su(h, "min-width", width); |
Line 1012 mdoc_it_pre(MDOC_ARGS) |
|
Line 1013 mdoc_it_pre(MDOC_ARGS) |
|
|
|
/* Get width, offset, and compact arguments. */ |
/* Get width, offset, and compact arguments. */ |
|
|
for (wp = -1, comp = i = 0; i < (int)bl->args->argc; i++) |
wp = -1; |
|
for (comp = i = 0; bl->args && i < (int)bl->args->argc; i++) |
switch (bl->args->argv[i].arg) { |
switch (bl->args->argv[i].arg) { |
case (MDOC_Column): |
case (MDOC_Column): |
wp = i; /* Save for later. */ |
wp = i; /* Save for later. */ |
Line 1048 mdoc_it_pre(MDOC_ARGS) |
|
Line 1050 mdoc_it_pre(MDOC_ARGS) |
|
break; |
break; |
} |
} |
|
|
/* Flip to body/block processing. */ |
if (LIST_column == type && MDOC_BODY == n->type) { |
|
|
if (MDOC_BODY == n->type) |
|
return(mdoc_it_body_pre(m, n, h, type)); |
|
if (MDOC_BLOCK == n->type) |
|
return(mdoc_it_block_pre(m, n, h, type, comp, |
|
&offs, &width)); |
|
|
|
/* Override column widths. */ |
|
|
|
if (LIST_column == type) { |
|
nn = n->parent->child; |
nn = n->parent->child; |
for (i = 0; nn && nn != n; nn = nn->next, i++) |
for (i = 0; nn && nn != n; nn = nn->next) |
/* Counter... */ ; |
if (MDOC_BODY == nn->type) |
|
i++; |
if (i < (int)bl->args->argv[wp].sz) |
if (i < (int)bl->args->argv[wp].sz) |
a2width(bl->args->argv[wp].value[i], &width); |
a2width(bl->args->argv[wp].value[i], &width); |
} |
} |
|
|
return(mdoc_it_head_pre(m, n, h, type, &width)); |
if (MDOC_HEAD == n->type) |
|
return(mdoc_it_head_pre(m, n, h, type, &width)); |
|
else if (MDOC_BODY == n->type) |
|
return(mdoc_it_body_pre(m, n, h, type, &width)); |
|
|
|
return(mdoc_it_block_pre(m, n, h, type, comp, &offs, &width)); |
} |
} |
|
|
|
|
Line 1324 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1322 mdoc_bd_pre(MDOC_ARGS) |
|
SCALE_VS_INIT(&su, 0); |
SCALE_VS_INIT(&su, 0); |
|
|
type = comp = 0; |
type = comp = 0; |
for (i = 0; i < (int)bl->args->argc; i++) |
for (i = 0; bl->args && i < (int)bl->args->argc; i++) |
switch (bl->args->argv[i].arg) { |
switch (bl->args->argv[i].arg) { |
case (MDOC_Offset): |
case (MDOC_Offset): |
a2offs(bl->args->argv[i].value[0], &su); |
a2offs(bl->args->argv[i].value[0], &su); |
Line 1999 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1997 mdoc_bf_pre(MDOC_ARGS) |
|
else if ( ! strcmp("Li", n->head->child->string)) |
else if ( ! strcmp("Li", n->head->child->string)) |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
} else { |
} else { |
assert(n->args); |
for (i = 0; n->args && i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) |
|
switch (n->args->argv[i].arg) { |
switch (n->args->argv[i].arg) { |
case (MDOC_Symbolic): |
case (MDOC_Symbolic): |
PAIR_CLASS_INIT(&tag[0], "symb"); |
PAIR_CLASS_INIT(&tag[0], "symb"); |