version 1.54, 2010/01/30 08:42:20 |
version 1.77, 2010/06/06 10:50:56 |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
|
#include "mandoc.h" |
#include "out.h" |
#include "out.h" |
#include "html.h" |
#include "html.h" |
#include "mdoc.h" |
#include "mdoc.h" |
Line 56 static void print_mdoc_nodelist(MDOC_ARGS); |
|
Line 57 static void print_mdoc_nodelist(MDOC_ARGS); |
|
static void a2width(const char *, struct roffsu *); |
static void a2width(const char *, struct roffsu *); |
static void a2offs(const char *, struct roffsu *); |
static void a2offs(const char *, struct roffsu *); |
|
|
static int a2list(const struct mdoc_node *); |
|
|
|
static void mdoc_root_post(MDOC_ARGS); |
static void mdoc_root_post(MDOC_ARGS); |
static int mdoc_root_pre(MDOC_ARGS); |
static int mdoc_root_pre(MDOC_ARGS); |
|
|
Line 85 static void mdoc_dq_post(MDOC_ARGS); |
|
Line 84 static void mdoc_dq_post(MDOC_ARGS); |
|
static int mdoc_dq_pre(MDOC_ARGS); |
static int mdoc_dq_pre(MDOC_ARGS); |
static int mdoc_dv_pre(MDOC_ARGS); |
static int mdoc_dv_pre(MDOC_ARGS); |
static int mdoc_fa_pre(MDOC_ARGS); |
static int mdoc_fa_pre(MDOC_ARGS); |
|
static void mdoc_fd_post(MDOC_ARGS); |
static int mdoc_fd_pre(MDOC_ARGS); |
static int mdoc_fd_pre(MDOC_ARGS); |
static int mdoc_fl_pre(MDOC_ARGS); |
static int mdoc_fl_pre(MDOC_ARGS); |
static int mdoc_fn_pre(MDOC_ARGS); |
static int mdoc_fn_pre(MDOC_ARGS); |
Line 97 static void mdoc_fo_post(MDOC_ARGS); |
|
Line 97 static void mdoc_fo_post(MDOC_ARGS); |
|
static int mdoc_fo_pre(MDOC_ARGS); |
static int mdoc_fo_pre(MDOC_ARGS); |
static int mdoc_ic_pre(MDOC_ARGS); |
static int mdoc_ic_pre(MDOC_ARGS); |
static int mdoc_in_pre(MDOC_ARGS); |
static int mdoc_in_pre(MDOC_ARGS); |
static int mdoc_it_block_pre(MDOC_ARGS, int, int, |
static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list, |
struct roffsu *, struct roffsu *); |
int, struct roffsu *, struct roffsu *); |
static int mdoc_it_head_pre(MDOC_ARGS, int, |
static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, |
struct roffsu *); |
struct roffsu *); |
static int mdoc_it_body_pre(MDOC_ARGS, int); |
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 158 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 159 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_ev_pre, NULL}, /* Ev */ |
{mdoc_ev_pre, NULL}, /* Ev */ |
{mdoc_ex_pre, NULL}, /* Ex */ |
{mdoc_ex_pre, NULL}, /* Ex */ |
{mdoc_fa_pre, NULL}, /* Fa */ |
{mdoc_fa_pre, NULL}, /* Fa */ |
{mdoc_fd_pre, NULL}, /* Fd */ |
{mdoc_fd_pre, mdoc_fd_post}, /* Fd */ |
{mdoc_fl_pre, NULL}, /* Fl */ |
{mdoc_fl_pre, NULL}, /* Fl */ |
{mdoc_fn_pre, NULL}, /* Fn */ |
{mdoc_fn_pre, NULL}, /* Fn */ |
{mdoc_ft_pre, NULL}, /* Ft */ |
{mdoc_ft_pre, NULL}, /* Ft */ |
Line 200 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 201 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{NULL, NULL}, /* Dc */ |
{NULL, NULL}, /* Dc */ |
{mdoc_dq_pre, mdoc_dq_post}, /* Do */ |
{mdoc_dq_pre, mdoc_dq_post}, /* Do */ |
{mdoc_dq_pre, mdoc_dq_post}, /* Dq */ |
{mdoc_dq_pre, mdoc_dq_post}, /* Dq */ |
{NULL, NULL}, /* Ec */ |
{NULL, NULL}, /* Ec */ /* FIXME: no space */ |
{NULL, NULL}, /* Ef */ |
{NULL, NULL}, /* Ef */ |
{mdoc_em_pre, NULL}, /* Em */ |
{mdoc_em_pre, NULL}, /* Em */ |
{NULL, NULL}, /* Eo */ |
{NULL, NULL}, /* Eo */ |
Line 255 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 256 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 276 html_mdoc(void *arg, const struct mdoc *m) |
|
Line 278 html_mdoc(void *arg, const struct mdoc *m) |
|
|
|
|
|
/* |
/* |
* Return the list type for `Bl', e.g., `Bl -column' returns |
|
* MDOC_Column. This can ONLY be run for lists; it will abort() if no |
|
* list type is found. |
|
*/ |
|
static int |
|
a2list(const struct mdoc_node *n) |
|
{ |
|
int i; |
|
|
|
assert(n->args); |
|
for (i = 0; i < (int)n->args->argc; i++) |
|
switch (n->args->argv[i].arg) { |
|
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hang): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Column): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ohang): |
|
return(n->args->argv[i].arg); |
|
default: |
|
break; |
|
} |
|
|
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
|
|
/* |
|
* Calculate the scaling unit passed in a `-width' argument. This uses |
* Calculate the scaling unit passed in a `-width' argument. This uses |
* either a native scaling unit (e.g., 1i, 2m) or the string length of |
* either a native scaling unit (e.g., 1i, 2m) or the string length of |
* the value. |
* the value. |
Line 387 print_mdoc_head(MDOC_ARGS) |
|
Line 345 print_mdoc_head(MDOC_ARGS) |
|
|
|
print_gen_head(h); |
print_gen_head(h); |
bufinit(h); |
bufinit(h); |
buffmt(h, "%s(%d)", m->title, m->msec); |
buffmt(h, "%s(%s)", m->title, m->msec); |
|
|
if (m->arch) { |
if (m->arch) { |
bufcat(h, " ("); |
bufcat(h, " ("); |
Line 509 mdoc_root_pre(MDOC_ARGS) |
|
Line 467 mdoc_root_pre(MDOC_ARGS) |
|
} |
} |
|
|
(void)snprintf(title, BUFSIZ - 1, |
(void)snprintf(title, BUFSIZ - 1, |
"%s(%d)", m->title, m->msec); |
"%s(%s)", m->title, m->msec); |
|
|
/* XXX: see note in mdoc_root_post() about divs. */ |
/* XXX: see note in mdoc_root_post() about divs. */ |
|
|
Line 589 mdoc_sh_pre(MDOC_ARGS) |
|
Line 547 mdoc_sh_pre(MDOC_ARGS) |
|
html_idcat(buf, " ", BUFSIZ); |
html_idcat(buf, " ", BUFSIZ); |
} |
} |
|
|
/* |
|
* TODO: make sure there are no duplicates, as HTML does not |
|
* allow for multiple `id' tags of the same name. |
|
*/ |
|
|
|
PAIR_CLASS_INIT(&tag[0], "sec-head"); |
PAIR_CLASS_INIT(&tag[0], "sec-head"); |
tag[1].key = ATTR_ID; |
PAIR_ID_INIT(&tag[1], buf); |
tag[1].val = buf; |
|
print_otag(h, TAG_DIV, 2, tag); |
print_otag(h, TAG_DIV, 2, tag); |
return(1); |
return(1); |
} |
} |
Line 648 mdoc_ss_pre(MDOC_ARGS) |
|
Line 601 mdoc_ss_pre(MDOC_ARGS) |
|
|
|
PAIR_CLASS_INIT(&tag[0], "ssec-head"); |
PAIR_CLASS_INIT(&tag[0], "ssec-head"); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
tag[2].key = ATTR_ID; |
PAIR_ID_INIT(&tag[2], buf); |
tag[2].val = buf; |
|
print_otag(h, TAG_DIV, 3, tag); |
print_otag(h, TAG_DIV, 3, tag); |
return(1); |
return(1); |
} |
} |
Line 671 mdoc_fl_pre(MDOC_ARGS) |
|
Line 624 mdoc_fl_pre(MDOC_ARGS) |
|
|
|
print_text(h, "\\-"); |
print_text(h, "\\-"); |
|
|
/* A blank `Fl' should incur a subsequent space. */ |
|
|
|
if (n->child) |
if (n->child) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
else if (n->next && n->next->line == n->line) |
|
h->flags |= HTML_NOSPACE; |
|
|
return(1); |
return(1); |
} |
} |
Line 734 mdoc_nm_pre(MDOC_ARGS) |
|
Line 687 mdoc_nm_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (SEC_SYNOPSIS == n->sec && n->prev) { |
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
|
|
if (SEC_SYNOPSIS == n->sec && |
|
n->prev && MDOC_LINE & n->flags) { |
bufcat_style(h, "clear", "both"); |
bufcat_style(h, "clear", "both"); |
PAIR_STYLE_INIT(&tag, h); |
PAIR_STYLE_INIT(&tag, h); |
print_otag(h, TAG_BR, 1, &tag); |
print_otag(h, TAG_BR, 1, &tag); |
Line 756 mdoc_xr_pre(MDOC_ARGS) |
|
Line 713 mdoc_xr_pre(MDOC_ARGS) |
|
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
|
if (NULL == n->child) |
|
return(0); |
|
|
PAIR_CLASS_INIT(&tag[0], "link-man"); |
PAIR_CLASS_INIT(&tag[0], "link-man"); |
|
|
if (h->base_man) { |
if (h->base_man) { |
buffmt_man(h, n->child->string, |
buffmt_man(h, n->child->string, |
n->child->next ? |
n->child->next ? |
n->child->next->string : NULL); |
n->child->next->string : NULL); |
tag[1].key = ATTR_HREF; |
PAIR_HREF_INIT(&tag[1], h->buf); |
tag[1].val = h->buf; |
|
print_otag(h, TAG_A, 2, tag); |
print_otag(h, TAG_A, 2, tag); |
} else |
} else |
print_otag(h, TAG_A, 1, tag); |
print_otag(h, TAG_A, 1, tag); |
Line 866 mdoc_bx_pre(MDOC_ARGS) |
|
Line 825 mdoc_bx_pre(MDOC_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp, |
struct roffsu *offs, struct roffsu *width) |
struct roffsu *offs, struct roffsu *width) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
Line 874 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
Line 833 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
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(). */ |
|
|
if (MDOC_Column == type) { |
if (LIST_column == type) { |
/* Don't width-pad on the left. */ |
/* Don't width-pad on the left. */ |
SCALE_HS_INIT(width, 0); |
SCALE_HS_INIT(width, 0); |
/* Also disallow non-compact. */ |
/* Also disallow non-compact. */ |
comp = 1; |
comp = 1; |
} |
} |
if (MDOC_Diag == type) |
if (LIST_diag == type) |
/* Mandate non-compact with empty prior. */ |
/* Mandate non-compact with empty prior. */ |
if (n->prev && NULL == n->prev->body->child) |
if (n->prev && NULL == n->prev->body->child) |
comp = 1; |
comp = 1; |
Line 921 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
Line 879 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_it_body_pre(MDOC_ARGS, int 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; |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Item): |
case (LIST_item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ohang): |
case (LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_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 951 mdoc_it_body_pre(MDOC_ARGS, int type) |
|
Line 915 mdoc_it_body_pre(MDOC_ARGS, int type) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width) |
mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct ord *ord; |
struct ord *ord; |
char nbuf[BUFSIZ]; |
char nbuf[BUFSIZ]; |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Item): |
case (LIST_item): |
return(0); |
return(0); |
case (MDOC_Ohang): |
case (LIST_ohang): |
print_otag(h, TAG_DIV, 0, &tag); |
print_otag(h, TAG_DIV, 0, &tag); |
return(1); |
return(1); |
case (MDOC_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 987 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
Line 945 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
} |
} |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (LIST_diag): |
PAIR_CLASS_INIT(&tag, "diag"); |
PAIR_CLASS_INIT(&tag, "diag"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
break; |
break; |
case (MDOC_Enum): |
case (LIST_enum): |
ord = h->ords.head; |
ord = h->ords.head; |
assert(ord); |
assert(ord); |
nbuf[BUFSIZ - 1] = 0; |
nbuf[BUFSIZ - 1] = 0; |
(void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); |
(void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); |
print_text(h, nbuf); |
print_text(h, nbuf); |
return(0); |
return(0); |
case (MDOC_Dash): |
case (LIST_dash): |
print_text(h, "\\(en"); |
print_text(h, "\\(en"); |
return(0); |
return(0); |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
print_text(h, "\\(hy"); |
print_text(h, "\\(hy"); |
return(0); |
return(0); |
case (MDOC_Bullet): |
case (LIST_bullet): |
print_text(h, "\\(bu"); |
print_text(h, "\\(bu"); |
return(0); |
return(0); |
default: |
default: |
Line 1018 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
Line 976 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
static int |
static int |
mdoc_it_pre(MDOC_ARGS) |
mdoc_it_pre(MDOC_ARGS) |
{ |
{ |
int i, type, wp, comp; |
int i, wp, 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; |
|
|
/* |
/* |
* XXX: be very careful in changing anything, here. Lists in |
* XXX: be very careful in changing anything, here. Lists in |
Line 1032 mdoc_it_pre(MDOC_ARGS) |
|
Line 991 mdoc_it_pre(MDOC_ARGS) |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
bl = bl->parent; |
bl = bl->parent; |
|
|
type = a2list(bl); |
type = bl->data.list; |
|
|
/* Set default width and offset. */ |
/* Set default width and offset. */ |
|
|
SCALE_HS_INIT(&offs, 0); |
SCALE_HS_INIT(&offs, 0); |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Enum): |
case (LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bullet): |
case (LIST_bullet): |
SCALE_HS_INIT(&width, 2); |
SCALE_HS_INIT(&width, 2); |
break; |
break; |
default: |
default: |
Line 1055 mdoc_it_pre(MDOC_ARGS) |
|
Line 1014 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 1076 mdoc_it_pre(MDOC_ARGS) |
|
Line 1036 mdoc_it_pre(MDOC_ARGS) |
|
/* Override width in some cases. */ |
/* Override width in some cases. */ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Ohang): |
case (LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (LIST_item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Diag): |
case (LIST_diag): |
SCALE_HS_INIT(&width, 0); |
SCALE_HS_INIT(&width, 0); |
break; |
break; |
default: |
default: |
Line 1091 mdoc_it_pre(MDOC_ARGS) |
|
Line 1051 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 (MDOC_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 1119 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1075 mdoc_bl_pre(MDOC_ARGS) |
|
{ |
{ |
struct ord *ord; |
struct ord *ord; |
|
|
|
if (MDOC_HEAD == n->type) |
|
return(0); |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
if (MDOC_Enum != a2list(n)) |
if (LIST_enum != n->data.list) |
return(1); |
return(1); |
|
|
ord = malloc(sizeof(struct ord)); |
ord = malloc(sizeof(struct ord)); |
Line 1145 mdoc_bl_post(MDOC_ARGS) |
|
Line 1103 mdoc_bl_post(MDOC_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return; |
return; |
if (MDOC_Enum != a2list(n)) |
if (LIST_enum != n->data.list) |
return; |
return; |
|
|
ord = h->ords.head; |
ord = h->ords.head; |
Line 1181 mdoc_ex_pre(MDOC_ARGS) |
|
Line 1139 mdoc_ex_pre(MDOC_ARGS) |
|
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NOSPACE; |
} |
} |
|
|
if (n->child->next) |
if (n->child && n->child->next) |
print_text(h, "utilities exit"); |
print_text(h, "utilities exit"); |
else |
else |
print_text(h, "utility exits"); |
print_text(h, "utility exits"); |
Line 1306 mdoc_sx_pre(MDOC_ARGS) |
|
Line 1264 mdoc_sx_pre(MDOC_ARGS) |
|
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
|
/* FIXME: duplicates? */ |
|
|
|
strlcpy(buf, "#", BUFSIZ); |
strlcpy(buf, "#", BUFSIZ); |
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
html_idcat(buf, nn->string, BUFSIZ); |
html_idcat(buf, nn->string, BUFSIZ); |
Line 1316 mdoc_sx_pre(MDOC_ARGS) |
|
Line 1272 mdoc_sx_pre(MDOC_ARGS) |
|
} |
} |
|
|
PAIR_CLASS_INIT(&tag[0], "link-sec"); |
PAIR_CLASS_INIT(&tag[0], "link-sec"); |
tag[1].key = ATTR_HREF; |
PAIR_HREF_INIT(&tag[1], buf); |
tag[1].val = buf; |
|
|
|
print_otag(h, TAG_A, 2, tag); |
print_otag(h, TAG_A, 2, tag); |
return(1); |
return(1); |
Line 1368 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1323 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 1392 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1347 mdoc_bd_pre(MDOC_ARGS) |
|
} |
} |
|
|
/* FIXME: -centered, etc. formatting. */ |
/* FIXME: -centered, etc. formatting. */ |
|
/* FIXME: does not respect -offset ??? */ |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
Line 1404 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1360 mdoc_bd_pre(MDOC_ARGS) |
|
break; |
break; |
} |
} |
if (comp) { |
if (comp) { |
print_otag(h, TAG_DIV, 0, tag); |
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_DIV, 1, tag); |
return(1); |
return(1); |
} |
} |
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
Line 1554 mdoc_fa_pre(MDOC_ARGS) |
|
Line 1511 mdoc_fa_pre(MDOC_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
mdoc_fd_post(MDOC_ARGS) |
|
{ |
|
|
|
print_otag(h, TAG_BR, 0, NULL); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
mdoc_fd_pre(MDOC_ARGS) |
mdoc_fd_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
|
|
|
if (SEC_SYNOPSIS == n->sec) { |
|
if (n->next && MDOC_Fd != n->next->tok) { |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-bottom", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} else |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
} |
|
|
|
PAIR_CLASS_INIT(&tag, "macro"); |
PAIR_CLASS_INIT(&tag, "macro"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
return(1); |
Line 1583 mdoc_vt_pre(MDOC_ARGS) |
|
Line 1538 mdoc_vt_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
struct roffsu su; |
|
|
if (MDOC_BLOCK == n->type) { |
if (SEC_SYNOPSIS == n->sec && MDOC_BLOCK == n->type) { |
if (n->prev && MDOC_Vt != n->prev->tok) { |
if (n->next && MDOC_Vt != n->next->tok) { |
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-bottom", &su); |
PAIR_STYLE_INIT(&tag, h); |
PAIR_STYLE_INIT(&tag, h); |
print_otag(h, TAG_DIV, 1, &tag); |
print_otag(h, TAG_DIV, 1, &tag); |
} else |
} else |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_DIV, 0, NULL); |
|
|
return(1); |
return(1); |
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
mdoc_ft_pre(MDOC_ARGS) |
mdoc_ft_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
|
|
|
if (SEC_SYNOPSIS == n->sec) { |
if (SEC_SYNOPSIS == n->sec && n->prev) |
if (n->prev && MDOC_Fo == n->prev->tok) { |
print_otag(h, TAG_BR, 0, NULL); |
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} else |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
} |
|
|
|
PAIR_CLASS_INIT(&tag, "ftype"); |
PAIR_CLASS_INIT(&tag, "ftype"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
Line 1637 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1584 mdoc_fn_pre(MDOC_ARGS) |
|
int sz, i; |
int sz, i; |
struct roffsu su; |
struct roffsu su; |
|
|
|
/* NB: MDOC_LINE has no effect on this macro! */ |
if (SEC_SYNOPSIS == n->sec) { |
if (SEC_SYNOPSIS == n->sec) { |
SCALE_HS_INIT(&su, INDENT); |
SCALE_HS_INIT(&su, INDENT); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
su.scale = -su.scale; |
su.scale = -su.scale; |
bufcat_su(h, "text-indent", &su); |
bufcat_su(h, "text-indent", &su); |
if (n->next) { |
if (n->prev && MDOC_Ft != n->prev->tok) { |
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
bufcat_su(h, "margin-bottom", &su); |
bufcat_su(h, "margin-top", &su); |
} |
} |
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
print_otag(h, TAG_DIV, 1, tag); |
print_otag(h, TAG_DIV, 1, tag); |
} |
} |
Line 1671 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1619 mdoc_fn_pre(MDOC_ARGS) |
|
} |
} |
|
|
PAIR_CLASS_INIT(&tag[0], "fname"); |
PAIR_CLASS_INIT(&tag[0], "fname"); |
|
|
|
/* |
|
* FIXME: only refer to IDs that we know exist. |
|
*/ |
|
|
|
#if 0 |
|
if (SEC_SYNOPSIS == n->sec) { |
|
nbuf[0] = '\0'; |
|
html_idcat(nbuf, sp, BUFSIZ); |
|
PAIR_ID_INIT(&tag[1], nbuf); |
|
} else { |
|
strlcpy(nbuf, "#", BUFSIZ); |
|
html_idcat(nbuf, sp, BUFSIZ); |
|
PAIR_HREF_INIT(&tag[1], nbuf); |
|
} |
|
#endif |
|
|
t = print_otag(h, TAG_SPAN, 1, tag); |
t = print_otag(h, TAG_SPAN, 1, tag); |
|
|
if (sp) { |
if (sp) { |
(void)strlcpy(nbuf, sp, BUFSIZ); |
strlcpy(nbuf, sp, BUFSIZ); |
print_text(h, nbuf); |
print_text(h, nbuf); |
} |
} |
|
|
Line 1775 mdoc_lk_pre(MDOC_ARGS) |
|
Line 1740 mdoc_lk_pre(MDOC_ARGS) |
|
nn = n->child; |
nn = n->child; |
|
|
PAIR_CLASS_INIT(&tag[0], "link-ext"); |
PAIR_CLASS_INIT(&tag[0], "link-ext"); |
tag[1].key = ATTR_HREF; |
PAIR_HREF_INIT(&tag[1], nn->string); |
tag[1].val = nn->string; |
|
print_otag(h, TAG_A, 2, tag); |
print_otag(h, TAG_A, 2, tag); |
|
|
if (NULL == nn->next) |
if (NULL == nn->next) |
Line 1803 mdoc_mt_pre(MDOC_ARGS) |
|
Line 1767 mdoc_mt_pre(MDOC_ARGS) |
|
bufinit(h); |
bufinit(h); |
bufcat(h, "mailto:"); |
bufcat(h, "mailto:"); |
bufcat(h, nn->string); |
bufcat(h, nn->string); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_HREF_INIT(&tag[1], h->buf); |
t = print_otag(h, TAG_A, 2, tag); |
t = print_otag(h, TAG_A, 2, tag); |
print_text(h, nn->string); |
print_text(h, nn->string); |
print_tagq(h, t); |
print_tagq(h, t); |
Line 1817 mdoc_mt_pre(MDOC_ARGS) |
|
Line 1781 mdoc_mt_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_fo_pre(MDOC_ARGS) |
mdoc_fo_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
struct roffsu su; |
|
struct tag *t; |
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BODY == n->type) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, "("); |
print_text(h, "("); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
return(1); |
return(1); |
} else if (MDOC_BLOCK == n->type) |
} else if (MDOC_BLOCK == n->type) { |
|
if (SEC_SYNOPSIS != n->sec) |
|
return(1); |
|
if (NULL == n->prev || MDOC_Ft == n->prev->tok) { |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
return(1); |
|
} |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
return(1); |
return(1); |
|
} |
|
|
|
/* XXX: we drop non-initial arguments as per groff. */ |
|
|
|
assert(n->child); |
|
assert(n->child->string); |
|
|
PAIR_CLASS_INIT(&tag, "fname"); |
PAIR_CLASS_INIT(&tag, "fname"); |
print_otag(h, TAG_SPAN, 1, &tag); |
t = print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
print_text(h, n->child->string); |
|
print_tagq(h, t); |
|
return(0); |
} |
} |
|
|
|
|
Line 1854 mdoc_in_pre(MDOC_ARGS) |
|
Line 1838 mdoc_in_pre(MDOC_ARGS) |
|
struct tag *t; |
struct tag *t; |
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
int i; |
int i; |
struct roffsu su; |
|
|
|
if (SEC_SYNOPSIS == n->sec) { |
|
if (n->next && MDOC_In != n->next->tok) { |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-bottom", &su); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_DIV, 1, tag); |
|
} else |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
} |
|
|
|
/* FIXME: there's a buffer bug in here somewhere. */ |
|
|
|
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) |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
print_text(h, "#include"); |
print_text(h, "#include"); |
|
|
print_text(h, "<"); |
print_text(h, "<"); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
/* XXX -- see warning in termp_in_post(). */ |
|
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
PAIR_CLASS_INIT(&tag[0], "link-includes"); |
PAIR_CLASS_INIT(&tag[0], "link-includes"); |
i = 1; |
i = 1; |
bufinit(h); |
bufinit(h); |
if (h->base_includes) { |
if (h->base_includes) { |
buffmt_includes(h, nn->string); |
buffmt_includes(h, nn->string); |
tag[i].key = ATTR_HREF; |
PAIR_HREF_INIT(&tag[i], h->buf); |
tag[i++].val = h->buf; |
i++; |
} |
} |
t = print_otag(h, TAG_A, i, tag); |
t = print_otag(h, TAG_A, i, tag); |
print_mdoc_node(m, nn, h); |
print_mdoc_node(m, nn, h); |
Line 1896 mdoc_in_pre(MDOC_ARGS) |
|
Line 1865 mdoc_in_pre(MDOC_ARGS) |
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, ">"); |
print_text(h, ">"); |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
|
print_otag(h, TAG_BR, 0, NULL); |
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 1938 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1910 mdoc_rv_pre(MDOC_ARGS) |
|
print_text(h, "()"); |
print_text(h, "()"); |
} |
} |
|
|
if (n->child->next) |
if (n->child && n->child->next) |
print_text(h, "functions return"); |
print_text(h, "functions return"); |
else |
else |
print_text(h, "function returns"); |
print_text(h, "function returns"); |
Line 2027 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1999 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"); |
Line 2161 mdoc_lb_pre(MDOC_ARGS) |
|
Line 2132 mdoc_lb_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (SEC_SYNOPSIS == n->sec) |
if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags) |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_DIV, 0, NULL); |
PAIR_CLASS_INIT(&tag, "lib"); |
PAIR_CLASS_INIT(&tag, "lib"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
Line 2211 mdoc__x_pre(MDOC_ARGS) |
|
Line 2182 mdoc__x_pre(MDOC_ARGS) |
|
break; |
break; |
case(MDOC__T): |
case(MDOC__T): |
PAIR_CLASS_INIT(&tag[0], "ref-title"); |
PAIR_CLASS_INIT(&tag[0], "ref-title"); |
print_text(h, "\\(lq"); |
|
h->flags |= HTML_NOSPACE; |
|
break; |
break; |
case(MDOC__U): |
case(MDOC__U): |
PAIR_CLASS_INIT(&tag[0], "link-ref"); |
PAIR_CLASS_INIT(&tag[0], "link-ref"); |
|
|
mdoc__x_post(MDOC_ARGS) |
mdoc__x_post(MDOC_ARGS) |
{ |
{ |
|
|
|
/* TODO: %U */ |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
switch (n->tok) { |
|
case (MDOC__T): |
|
print_text(h, "\\(rq"); |
|
h->flags |= HTML_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
print_text(h, n->next ? "," : "."); |
print_text(h, n->next ? "," : "."); |
} |
} |