version 1.83, 2010/06/12 12:38:01 |
version 1.98, 2010/07/19 11:11:54 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 72 static int mdoc_aq_pre(MDOC_ARGS); |
|
Line 72 static int mdoc_aq_pre(MDOC_ARGS); |
|
static int mdoc_ar_pre(MDOC_ARGS); |
static int mdoc_ar_pre(MDOC_ARGS); |
static int mdoc_bd_pre(MDOC_ARGS); |
static int mdoc_bd_pre(MDOC_ARGS); |
static int mdoc_bf_pre(MDOC_ARGS); |
static int mdoc_bf_pre(MDOC_ARGS); |
|
static void mdoc_bk_post(MDOC_ARGS); |
|
static int mdoc_bk_pre(MDOC_ARGS); |
static void mdoc_bl_post(MDOC_ARGS); |
static void mdoc_bl_post(MDOC_ARGS); |
static int mdoc_bl_pre(MDOC_ARGS); |
static int mdoc_bl_pre(MDOC_ARGS); |
static void mdoc_bq_post(MDOC_ARGS); |
static void mdoc_bq_post(MDOC_ARGS); |
Line 207 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 209 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_em_pre, NULL}, /* Em */ |
{mdoc_em_pre, NULL}, /* Em */ |
{NULL, NULL}, /* Eo */ |
{NULL, NULL}, /* Eo */ |
{mdoc_xx_pre, NULL}, /* Fx */ |
{mdoc_xx_pre, NULL}, /* Fx */ |
{mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */ |
{mdoc_ms_pre, NULL}, /* Ms */ |
{NULL, NULL}, /* No */ |
{NULL, NULL}, /* No */ |
{mdoc_ns_pre, NULL}, /* Ns */ |
{mdoc_ns_pre, NULL}, /* Ns */ |
{mdoc_xx_pre, NULL}, /* Nx */ |
{mdoc_xx_pre, NULL}, /* Nx */ |
Line 236 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 238 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{NULL, NULL}, /* Fc */ |
{NULL, NULL}, /* Fc */ |
{mdoc_op_pre, mdoc_op_post}, /* Oo */ |
{mdoc_op_pre, mdoc_op_post}, /* Oo */ |
{NULL, NULL}, /* Oc */ |
{NULL, NULL}, /* Oc */ |
{NULL, NULL}, /* Bk */ |
{mdoc_bk_pre, mdoc_bk_post}, /* Bk */ |
{NULL, NULL}, /* Ek */ |
{NULL, NULL}, /* Ek */ |
{mdoc_bt_pre, NULL}, /* Bt */ |
{mdoc_bt_pre, NULL}, /* Bt */ |
{NULL, NULL}, /* Hf */ |
{NULL, NULL}, /* Hf */ |
Line 303 synopsis_pre(struct html *h, const struct mdoc_node *n |
|
Line 305 synopsis_pre(struct html *h, const struct mdoc_node *n |
|
struct roffsu su; |
struct roffsu su; |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (NULL == n->prev || SEC_SYNOPSIS != n->sec) |
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
return; |
return; |
|
|
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
Line 436 print_mdoc_node(MDOC_ARGS) |
|
Line 438 print_mdoc_node(MDOC_ARGS) |
|
print_text(h, n->string); |
print_text(h, n->string); |
return; |
return; |
default: |
default: |
if (mdocs[n->tok].pre) |
if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) |
child = (*mdocs[n->tok].pre)(m, n, h); |
child = (*mdocs[n->tok].pre)(m, n, h); |
break; |
break; |
} |
} |
|
|
|
if (HTML_KEEP & h->flags) { |
|
if (n->prev && n->prev->line != n->line) { |
|
h->flags &= ~HTML_KEEP; |
|
h->flags |= HTML_PREKEEP; |
|
} else if (NULL == n->prev) { |
|
if (n->parent && n->parent->line != n->line) { |
|
h->flags &= ~HTML_KEEP; |
|
h->flags |= HTML_PREKEEP; |
|
} |
|
} |
|
} |
|
|
if (child && n->child) |
if (child && n->child) |
print_mdoc_nodelist(m, n->child, h); |
print_mdoc_nodelist(m, n->child, h); |
|
|
Line 452 print_mdoc_node(MDOC_ARGS) |
|
Line 466 print_mdoc_node(MDOC_ARGS) |
|
mdoc_root_post(m, n, h); |
mdoc_root_post(m, n, h); |
break; |
break; |
default: |
default: |
if (mdocs[n->tok].post) |
if (mdocs[n->tok].post && ENDBODY_NOT == n->end) |
(*mdocs[n->tok].post)(m, n, h); |
(*mdocs[n->tok].post)(m, n, h); |
break; |
break; |
} |
} |
Line 735 mdoc_op_post(MDOC_ARGS) |
|
Line 749 mdoc_op_post(MDOC_ARGS) |
|
static int |
static int |
mdoc_nm_pre(MDOC_ARGS) |
mdoc_nm_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
struct roffsu su; |
|
const char *cp; |
|
|
if (NULL == n->child && NULL == m->name) |
/* |
return(1); |
* Accomodate for `Nm' being both an element (which may have |
|
* NULL children AND no m->name) and a block. |
|
*/ |
|
|
synopsis_pre(h, n); |
cp = NULL; |
|
|
PAIR_CLASS_INIT(&tag, "name"); |
if (MDOC_ELEM == n->type) { |
print_otag(h, TAG_SPAN, 1, &tag); |
if (NULL == n->child && NULL == m->name) |
if (NULL == n->child) |
return(1); |
print_text(h, m->name); |
synopsis_pre(h, n); |
|
PAIR_CLASS_INIT(&tag, "name"); |
|
print_otag(h, TAG_SPAN, 1, &tag); |
|
if (NULL == n->child) |
|
print_text(h, m->name); |
|
} else if (MDOC_BLOCK == n->type) { |
|
synopsis_pre(h, n); |
|
|
|
bufcat_style(h, "clear", "both"); |
|
if (n->head->child || m->name) { |
|
if (n->head->child && MDOC_TEXT == |
|
n->head->child->type) |
|
cp = n->head->child->string; |
|
if (NULL == cp || '\0' == *cp) |
|
cp = m->name; |
|
|
|
SCALE_HS_INIT(&su, (double)strlen(cp)); |
|
bufcat_su(h, "padding-left", &su); |
|
} |
|
|
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} else if (MDOC_HEAD == n->type) { |
|
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
|
|
if (n->child && MDOC_TEXT == n->child->type) |
|
cp = n->child->string; |
|
if (NULL == cp || '\0' == *cp) |
|
cp = m->name; |
|
|
|
SCALE_HS_INIT(&su, (double)strlen(cp)); |
|
|
|
bufcat_style(h, "float", "left"); |
|
bufcat_su(h, "min-width", &su); |
|
SCALE_INVERT(&su); |
|
bufcat_su(h, "margin-left", &su); |
|
|
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
|
|
if (NULL == n->child) |
|
print_text(h, m->name); |
|
} else if (MDOC_BODY == n->type) { |
|
SCALE_HS_INIT(&su, 2); |
|
bufcat_su(h, "margin-left", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1020 mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struc |
|
Line 1087 mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struc |
|
static int |
static int |
mdoc_it_pre(MDOC_ARGS) |
mdoc_it_pre(MDOC_ARGS) |
{ |
{ |
int i, wp, comp; |
int i, comp; |
const struct mdoc_node *bl, *nn; |
const struct mdoc_node *bl, *nn; |
struct roffsu width, offs; |
struct roffsu width, offs; |
enum mdoc_list type; |
enum mdoc_list type; |
Line 1037 mdoc_it_pre(MDOC_ARGS) |
|
Line 1104 mdoc_it_pre(MDOC_ARGS) |
|
|
|
SCALE_HS_INIT(&offs, 0); |
SCALE_HS_INIT(&offs, 0); |
|
|
type = bl->data.Bl.type; |
assert(bl->data.Bl); |
comp = bl->data.Bl.comp; |
type = bl->data.Bl->type; |
|
comp = bl->data.Bl->comp; |
|
|
if (bl->data.Bl.offs) |
if (bl->data.Bl->offs) |
a2offs(bl->data.Bl.offs, &offs); |
a2offs(bl->data.Bl->offs, &offs); |
|
|
switch (type) { |
switch (type) { |
case (LIST_enum): |
case (LIST_enum): |
Line 1058 mdoc_it_pre(MDOC_ARGS) |
|
Line 1126 mdoc_it_pre(MDOC_ARGS) |
|
break; |
break; |
} |
} |
|
|
wp = -1; |
if (bl->data.Bl->width) |
for (i = 0; bl->args && i < (int)bl->args->argc; i++) |
a2width(bl->data.Bl->width, &width); |
switch (bl->args->argv[i].arg) { |
|
case (MDOC_Column): |
|
wp = i; /* Save for later. */ |
|
break; |
|
case (MDOC_Width): |
|
a2width(bl->args->argv[i].value[0], &width); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* Override width in some cases. */ |
/* Override width in some cases. */ |
|
|
Line 1094 mdoc_it_pre(MDOC_ARGS) |
|
Line 1152 mdoc_it_pre(MDOC_ARGS) |
|
for (i = 0; nn && nn != n; nn = nn->next) |
for (i = 0; nn && nn != n; nn = nn->next) |
if (MDOC_BODY == nn->type) |
if (MDOC_BODY == nn->type) |
i++; |
i++; |
if (i < (int)bl->args->argv[wp].sz) |
if (i < (int)bl->data.Bl->ncols) |
a2width(bl->args->argv[wp].value[i], &width); |
a2width(bl->data.Bl->cols[i], &width); |
} |
} |
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
Line 1117 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1175 mdoc_bl_pre(MDOC_ARGS) |
|
return(0); |
return(0); |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
if (LIST_enum != n->data.Bl.type) |
assert(n->data.Bl); |
|
if (LIST_enum != n->data.Bl->type) |
return(1); |
return(1); |
|
|
ord = malloc(sizeof(struct ord)); |
ord = malloc(sizeof(struct ord)); |
Line 1141 mdoc_bl_post(MDOC_ARGS) |
|
Line 1200 mdoc_bl_post(MDOC_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return; |
return; |
if (LIST_enum != n->data.Bl.type) |
if (LIST_enum != n->data.Bl->type) |
return; |
return; |
|
|
ord = h->ords.head; |
ord = h->ords.head; |
Line 1356 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1415 mdoc_bd_pre(MDOC_ARGS) |
|
|
|
SCALE_VS_INIT(&su, 0); |
SCALE_VS_INIT(&su, 0); |
|
|
if (n->data.Bd.offs) |
assert(n->data.Bd); |
a2offs(n->data.Bd.offs, &su); |
if (n->data.Bd->offs) |
|
a2offs(n->data.Bd->offs, &su); |
|
|
comp = n->data.Bd.comp; |
comp = n->data.Bd->comp; |
|
|
/* FIXME: -centered, etc. formatting. */ |
/* FIXME: -centered, etc. formatting. */ |
/* FIXME: does not respect -offset ??? */ |
/* FIXME: does not respect -offset ??? */ |
Line 1386 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1446 mdoc_bd_pre(MDOC_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
if (DISP_unfilled != n->data.Bd.type && |
if (DISP_unfilled != n->data.Bd->type && |
DISP_literal != n->data.Bd.type) |
DISP_literal != n->data.Bd->type) |
return(1); |
return(1); |
|
|
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
Line 1613 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1673 mdoc_fn_pre(MDOC_ARGS) |
|
*/ |
*/ |
|
|
#if 0 |
#if 0 |
if (SEC_SYNOPSIS == n->sec) { |
if (MDOC_SYNPRETTY & n->flags) { |
nbuf[0] = '\0'; |
nbuf[0] = '\0'; |
html_idcat(nbuf, sp, BUFSIZ); |
html_idcat(nbuf, sp, BUFSIZ); |
PAIR_ID_INIT(&tag[1], nbuf); |
PAIR_ID_INIT(&tag[1], nbuf); |
Line 1643 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1703 mdoc_fn_pre(MDOC_ARGS) |
|
|
|
for (nn = n->child->next; nn; nn = nn->next) { |
for (nn = n->child->next; nn; nn = nn->next) { |
i = 1; |
i = 1; |
if (SEC_SYNOPSIS == n->sec) |
if (MDOC_SYNPRETTY & n->flags) |
i = 2; |
i = 2; |
t = print_otag(h, TAG_SPAN, i, tag); |
t = print_otag(h, TAG_SPAN, i, tag); |
print_text(h, nn->string); |
print_text(h, nn->string); |
Line 1653 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1713 mdoc_fn_pre(MDOC_ARGS) |
|
} |
} |
|
|
print_text(h, ")"); |
print_text(h, ")"); |
if (SEC_SYNOPSIS == n->sec) |
if (MDOC_SYNPRETTY & n->flags) |
print_text(h, ";"); |
print_text(h, ";"); |
|
|
return(0); |
return(0); |
Line 1677 mdoc_sp_pre(MDOC_ARGS) |
|
Line 1737 mdoc_sp_pre(MDOC_ARGS) |
|
len = 0; |
len = 0; |
break; |
break; |
default: |
default: |
|
assert(n->parent); |
|
if ((NULL == n->next || NULL == n->prev) && |
|
(MDOC_Ss == n->parent->tok || |
|
MDOC_Sh == n->parent->tok)) |
|
return(0); |
len = 1; |
len = 1; |
break; |
break; |
} |
} |
Line 1823 mdoc_in_pre(MDOC_ARGS) |
|
Line 1888 mdoc_in_pre(MDOC_ARGS) |
|
PAIR_CLASS_INIT(&tag[0], "includes"); |
PAIR_CLASS_INIT(&tag[0], "includes"); |
print_otag(h, TAG_SPAN, 1, tag); |
print_otag(h, TAG_SPAN, 1, tag); |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) |
print_text(h, "#include"); |
print_text(h, "#include"); |
|
|
print_text(h, "<"); |
print_text(h, "<"); |
Line 1958 mdoc_ap_pre(MDOC_ARGS) |
|
Line 2023 mdoc_ap_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bf_pre(MDOC_ARGS) |
mdoc_bf_pre(MDOC_ARGS) |
{ |
{ |
int i; |
|
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
struct roffsu su; |
struct roffsu su; |
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
else if (MDOC_BLOCK != n->type) |
else if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
PAIR_CLASS_INIT(&tag[0], "lit"); |
assert(n->data.Bf); |
|
|
if (n->head->child) { |
if (FONT_Em == n->data.Bf->font) |
if ( ! strcmp("Em", n->head->child->string)) |
PAIR_CLASS_INIT(&tag[0], "emph"); |
PAIR_CLASS_INIT(&tag[0], "emph"); |
else if (FONT_Sy == n->data.Bf->font) |
else if ( ! strcmp("Sy", n->head->child->string)) |
PAIR_CLASS_INIT(&tag[0], "symb"); |
PAIR_CLASS_INIT(&tag[0], "symb"); |
else if (FONT_Li == n->data.Bf->font) |
else if ( ! strcmp("Li", n->head->child->string)) |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
else |
} else { |
PAIR_CLASS_INIT(&tag[0], "none"); |
for (i = 0; n->args && i < (int)n->args->argc; i++) |
|
switch (n->args->argv[i].arg) { |
|
case (MDOC_Symbolic): |
|
PAIR_CLASS_INIT(&tag[0], "symb"); |
|
break; |
|
case (MDOC_Literal): |
|
PAIR_CLASS_INIT(&tag[0], "lit"); |
|
break; |
|
case (MDOC_Emphasis): |
|
PAIR_CLASS_INIT(&tag[0], "emph"); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* FIXME: div's have spaces stripped--we want them. */ |
/* |
|
* We want this to be inline-formatted, but needs to be div to |
|
* accept block children. |
|
*/ |
bufcat_style(h, "display", "inline"); |
bufcat_style(h, "display", "inline"); |
SCALE_HS_INIT(&su, 1); |
SCALE_HS_INIT(&su, 1); |
bufcat_su(h, "margin-right", &su); |
/* Needs a left-margin for spacing. */ |
|
bufcat_su(h, "margin-left", &su); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_DIV, 2, tag); |
print_otag(h, TAG_DIV, 2, tag); |
return(1); |
return(1); |
Line 2192 mdoc__x_post(MDOC_ARGS) |
|
Line 2244 mdoc__x_post(MDOC_ARGS) |
|
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->next ? "," : "."); |
print_text(h, n->next ? "," : "."); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
mdoc_bk_pre(MDOC_ARGS) |
|
{ |
|
|
|
switch (n->type) { |
|
case (MDOC_BLOCK): |
|
break; |
|
case (MDOC_HEAD): |
|
return(0); |
|
case (MDOC_BODY): |
|
h->flags |= HTML_PREKEEP; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static void |
|
mdoc_bk_post(MDOC_ARGS) |
|
{ |
|
|
|
if (MDOC_BODY == n->type) |
|
h->flags &= ~(HTML_KEEP | HTML_PREKEEP); |
} |
} |