version 1.66, 2010/05/17 23:57:06 |
version 1.70, 2010/05/30 22:56:02 |
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 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 1048 mdoc_it_pre(MDOC_ARGS) |
|
Line 1049 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 1080 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1077 mdoc_bl_pre(MDOC_ARGS) |
|
return(0); |
return(0); |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
if (MDOC_Enum != n->data.list) |
if (LIST_enum != n->data.list) |
return(1); |
return(1); |
|
|
ord = malloc(sizeof(struct ord)); |
ord = malloc(sizeof(struct ord)); |
Line 1104 mdoc_bl_post(MDOC_ARGS) |
|
Line 1101 mdoc_bl_post(MDOC_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return; |
return; |
if (MDOC_Enum != n->data.list) |
if (LIST_enum != n->data.list) |
return; |
return; |
|
|
ord = h->ords.head; |
ord = h->ords.head; |