version 1.62, 2010/05/13 06:22:11 |
version 1.68, 2010/05/29 18:47:54 |
|
|
#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 97 static void mdoc_fo_post(MDOC_ARGS); |
|
Line 96 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); |
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 276 html_mdoc(void *arg, const struct mdoc *m) |
|
Line 275 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 342 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 464 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 729 mdoc_nm_pre(MDOC_ARGS) |
|
Line 684 mdoc_nm_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
|
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
|
if (SEC_SYNOPSIS == n->sec && |
if (SEC_SYNOPSIS == n->sec && |
n->prev && MDOC_LINE & n->flags) { |
n->prev && MDOC_LINE & n->flags) { |
bufcat_style(h, "clear", "both"); |
bufcat_style(h, "clear", "both"); |
Line 864 mdoc_bx_pre(MDOC_ARGS) |
|
Line 822 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 876 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
Line 834 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
|
|
/* 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 919 mdoc_it_block_pre(MDOC_ARGS, int type, int comp, |
|
Line 877 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 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): |
break; |
break; |
default: |
default: |
/* |
/* |
Line 949 mdoc_it_body_pre(MDOC_ARGS, int type) |
|
Line 907 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_su(h, "min-width", width); |
bufcat_style(h, "clear", "none"); |
bufcat_style(h, "clear", "none"); |
if (n->next && MDOC_HEAD == n->next->type) |
if (n->next && MDOC_HEAD == n->next->type) |
Line 985 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
Line 943 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 1016 mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w |
|
Line 974 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 1030 mdoc_it_pre(MDOC_ARGS) |
|
Line 989 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 1074 mdoc_it_pre(MDOC_ARGS) |
|
Line 1033 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 1099 mdoc_it_pre(MDOC_ARGS) |
|
Line 1058 mdoc_it_pre(MDOC_ARGS) |
|
|
|
/* Override column widths. */ |
/* Override column widths. */ |
|
|
if (MDOC_Column == type) { |
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, i++) |
/* Counter... */ ; |
/* Counter... */ ; |
Line 1121 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1080 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 != 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 1104 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 1140 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 1289 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1248 mdoc_d1_pre(MDOC_ARGS) |
|
|
|
/* FIXME: D1 shouldn't be literal. */ |
/* FIXME: D1 shouldn't be literal. */ |
|
|
SCALE_VS_INIT(&su, INDENT - 2); |
SCALE_VS_INIT(&su, INDENT - 1); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
Line 1402 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1361 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 1950 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 2131 mdoc_li_pre(MDOC_ARGS) |
|
Line 2091 mdoc_li_pre(MDOC_ARGS) |
|
|
|
PAIR_CLASS_INIT(&tag, "lit"); |
PAIR_CLASS_INIT(&tag, "lit"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
|
if (NULL == n->child) |
|
print_text(h, ""); |
return(1); |
return(1); |
} |
} |
|
|