mandoc/mdoc_html.c - diff

Return to mdoc_html.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_html.c between version 1.25 and 1.75

version 1.25, 2009/10/07 14:50:28

version 1.75, 2010/06/04 22:16:27

Line 14

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <sys/types.h>

#include <sys/param.h>

#include <sys/queue.h>

#include <assert.h>

#include <ctype.h>

#include <err.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include "mandoc.h"

#include "out.h"

#include "html.h"

#include "mdoc.h"

#include "main.h"

#define INDENT 5

#define HALFINDENT 3

Line 37

Line 40

const struct mdoc_node *n, \

struct html *h

#ifndef MIN

#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b))

#endif

struct htmlmdoc {

int (*pre)(MDOC_ARGS);

void (*post)(MDOC_ARGS);

Line 49 static void print_mdoc_nodelist(MDOC_ARGS);

Line 56 static void print_mdoc_nodelist(MDOC_ARGS);

static void a2width(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 int mdoc_root_pre(MDOC_ARGS);

static int mdoc_it_block_pre(MDOC_ARGS, int,

struct roffsu *, int,

struct roffsu *);

static int mdoc_it_head_pre(MDOC_ARGS, int,

struct roffsu *);

static int mdoc_it_body_pre(MDOC_ARGS, int);

static void mdoc__x_post(MDOC_ARGS);

static int mdoc__x_pre(MDOC_ARGS);

Line 84 static void mdoc_dq_post(MDOC_ARGS);

static int mdoc_dq_pre(MDOC_ARGS);

static int mdoc_dv_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_fl_pre(MDOC_ARGS);

static int mdoc_fn_pre(MDOC_ARGS);

Line 96 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_ic_pre(MDOC_ARGS);

static int mdoc_in_pre(MDOC_ARGS);

static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list,

int, struct roffsu *, struct roffsu *);

static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list,

struct roffsu *);

static int mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list,

struct roffsu *);

static int mdoc_it_pre(MDOC_ARGS);

static int mdoc_lb_pre(MDOC_ARGS);

static int mdoc_li_pre(MDOC_ARGS);

Line 127 static int mdoc_vt_pre(MDOC_ARGS);

Line 134 static int mdoc_vt_pre(MDOC_ARGS);

static int mdoc_xr_pre(MDOC_ARGS);

static int mdoc_xx_pre(MDOC_ARGS);

#ifdef __linux__

extern size_t strlcpy(char *, const char *, size_t);

extern size_t strlcat(char *, const char *, size_t);

#endif

static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc_ap_pre, NULL}, /* Ap */

{NULL, NULL}, /* Dd */

Line 157 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 159 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc_ev_pre, NULL}, /* Ev */

{mdoc_ex_pre, NULL}, /* Ex */

{mdoc_fa_pre, NULL}, /* Fa */

{mdoc_fd_pre, NULL}, /* Fd */

{mdoc_fd_pre, mdoc_fd_post}, /* Fd */

{mdoc_fl_pre, NULL}, /* Fl */

{mdoc_fn_pre, NULL}, /* Fn */

{mdoc_ft_pre, NULL}, /* Ft */

Line 199 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 201 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{NULL, NULL}, /* Dc */

{mdoc_dq_pre, mdoc_dq_post}, /* Do */

{mdoc_dq_pre, mdoc_dq_post}, /* Dq */

{NULL, NULL}, /* Ec */

{NULL, NULL}, /* Ec */ /* FIXME: no space */

{NULL, NULL}, /* Ef */

{mdoc_em_pre, NULL}, /* Em */

{NULL, NULL}, /* Eo */

Line 253 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 255 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc__x_pre, mdoc__x_post}, /* %Q */

{mdoc_sp_pre, NULL}, /* br */

{mdoc_sp_pre, NULL}, /* sp */

{mdoc__x_pre, mdoc__x_post}, /* %U */

{NULL, NULL}, /* Ta */

};

Line 264 html_mdoc(void *arg, const struct mdoc *m)

Line 268 html_mdoc(void *arg, const struct mdoc *m)

h = (struct html *)arg;

print_gen_doctype(h);

print_gen_decls(h);

t = print_otag(h, TAG_HTML, 0, NULL);

print_mdoc(mdoc_meta(m), mdoc_node(m), h);

print_tagq(h, t);

Line 274 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

* either a native scaling unit (e.g., 1i, 2m) or the string length of

* the value.

Line 326 static void

Line 286 static void

a2width(const char *p, struct roffsu *su)

{

if (a2roffsu(p, su))

if ( ! a2roffsu(p, su, SCALE_MAX)) {

return;

su->unit = SCALE_EM;

su->scale = (int)strlen(p);

}

Line 342 static void

Line 302 static void

a2offs(const char *p, struct roffsu *su)

{

/* FIXME: "right"? */

if (0 == strcmp(p, "left"))

SCALE_HS_INIT(su, 0);

else if (0 == strcmp(p, "indent"))

SCALE_HS_INIT(su, INDENT);

else if (0 == strcmp(p, "indent-two"))

SCALE_HS_INIT(su, INDENT * 2);

else if ( ! a2roffsu(p, su)) {

else if ( ! a2roffsu(p, su, SCALE_MAX)) {

su->unit = SCALE_EM;

su->scale = (int)strlen(p);

}

Line 383 print_mdoc_head(MDOC_ARGS)

Line 345 print_mdoc_head(MDOC_ARGS)

print_gen_head(h);

bufinit(h);

buffmt(h, "%s(%d)", m->title, m->msec);

buffmt(h, "%s(%s)", m->title, m->msec);

if (m->arch) {

bufcat(h, " (");

Line 413 print_mdoc_node(MDOC_ARGS)

Line 375 print_mdoc_node(MDOC_ARGS)

struct tag *t;

child = 1;

t = SLIST_FIRST(&h->tags);

t = h->tags.head;

bufinit(h);

switch (n->type) {

Line 422 print_mdoc_node(MDOC_ARGS)

Line 384 print_mdoc_node(MDOC_ARGS)

break;

case (MDOC_TEXT):

print_text(h, n->string);

break;

return;

default:

if (mdocs[n->tok].pre)

child = (*mdocs[n->tok].pre)(m, n, h);

Line 439 print_mdoc_node(MDOC_ARGS)

Line 401 print_mdoc_node(MDOC_ARGS)

case (MDOC_ROOT):

mdoc_root_post(m, n, h);

break;

case (MDOC_TEXT):

break;

default:

if (mdocs[n->tok].post)

(*mdocs[n->tok].post)(m, n, h);

Line 453 print_mdoc_node(MDOC_ARGS)

Line 413 print_mdoc_node(MDOC_ARGS)

static void

mdoc_root_post(MDOC_ARGS)

{

struct tm tm;

struct htmlpair tag[3];

struct htmlpair tag[2];

struct tag *t, *tt;

char b[BUFSIZ];

char b[DATESIZ];

time2a(m->date, b, DATESIZ);

* XXX: this should use divs, but in Firefox, divs with nested

* divs for some reason puke when trying to put a border line

* below. So I use tables, instead.

(void)localtime_r(&m->date, &tm);

if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))

err(EXIT_FAILURE, "strftime");

PAIR_CLASS_INIT(&tag[0], "footer");

bufcat_style(h, "width", "100%");

PAIR_STYLE_INIT(&tag[1], h);

t = print_otag(h, TAG_TABLE, 2, tag);

PAIR_SUMMARY_INIT(&tag[2], "footer");

t = print_otag(h, TAG_TABLE, 3, tag);

tt = print_otag(h, TAG_TR, 0, NULL);

bufinit(h);

Line 496 mdoc_root_post(MDOC_ARGS)

Line 454 mdoc_root_post(MDOC_ARGS)

static int

mdoc_root_pre(MDOC_ARGS)

{

struct htmlpair tag[2];

struct htmlpair tag[3];

struct tag *t, *tt;

char b[BUFSIZ], title[BUFSIZ];

Line 509 mdoc_root_pre(MDOC_ARGS)

Line 467 mdoc_root_pre(MDOC_ARGS)

}

(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. */

PAIR_CLASS_INIT(&tag[0], "header");

bufcat_style(h, "width", "100%");

PAIR_STYLE_INIT(&tag[1], h);

t = print_otag(h, TAG_TABLE, 2, tag);

PAIR_SUMMARY_INIT(&tag[2], "header");

t = print_otag(h, TAG_TABLE, 3, tag);

tt = print_otag(h, TAG_TR, 0, NULL);

bufinit(h);

Line 552 mdoc_sh_pre(MDOC_ARGS)

Line 513 mdoc_sh_pre(MDOC_ARGS)

{

struct htmlpair tag[2];

const struct mdoc_node *nn;

char lbuf[BUFSIZ];

char buf[BUFSIZ];

struct roffsu su;

if (MDOC_BODY == n->type) {

Line 579 mdoc_sh_pre(MDOC_ARGS)

Line 540 mdoc_sh_pre(MDOC_ARGS)

return(1);

}

lbuf[0] = 0;

buf[0] = '\0';

for (nn = n->child; nn; nn = nn->next) {

(void)strlcat(lbuf, nn->string, BUFSIZ);

html_idcat(buf, nn->string, BUFSIZ);

if (nn->next)

(void)strlcat(lbuf, "_", 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");

tag[1].key = ATTR_ID;

PAIR_ID_INIT(&tag[1], buf);

tag[1].val = lbuf;

print_otag(h, TAG_DIV, 2, tag);

return(1);

}

Line 605 mdoc_ss_pre(MDOC_ARGS)

Line 561 mdoc_ss_pre(MDOC_ARGS)

{

struct htmlpair tag[3];

const struct mdoc_node *nn;

char lbuf[BUFSIZ];

char buf[BUFSIZ];

struct roffsu su;

SCALE_VS_INIT(&su, 1);

Line 632 mdoc_ss_pre(MDOC_ARGS)

Line 588 mdoc_ss_pre(MDOC_ARGS)

/* TODO: see note in mdoc_sh_pre() about duplicates. */

lbuf[0] = 0;

buf[0] = '\0';

for (nn = n->child; nn; nn = nn->next) {

(void)strlcat(lbuf, nn->string, BUFSIZ);

html_idcat(buf, nn->string, BUFSIZ);

if (nn->next)

(void)strlcat(lbuf, "_", BUFSIZ);

html_idcat(buf, " ", BUFSIZ);

}

SCALE_HS_INIT(&su, INDENT - HALFINDENT);

Line 645 mdoc_ss_pre(MDOC_ARGS)

Line 601 mdoc_ss_pre(MDOC_ARGS)

PAIR_CLASS_INIT(&tag[0], "ssec-head");

PAIR_STYLE_INIT(&tag[1], h);

tag[2].key = ATTR_ID;

PAIR_ID_INIT(&tag[2], buf);

tag[2].val = lbuf;

print_otag(h, TAG_DIV, 3, tag);

return(1);

}

Line 660 mdoc_fl_pre(MDOC_ARGS)

Line 616 mdoc_fl_pre(MDOC_ARGS)

PAIR_CLASS_INIT(&tag, "flag");

print_otag(h, TAG_SPAN, 1, &tag);

if (MDOC_Fl == n->tok) {

print_text(h, "\\-");

/* `Cm' has no leading hyphen. */

if (MDOC_Cm == n->tok)

return(1);

print_text(h, "\\-");

if (n->child)

h->flags |= HTML_NOSPACE;

}

else if (n->next && n->next->line == n->line)

h->flags |= HTML_NOSPACE;

return(1);

}

Line 722 mdoc_nm_pre(MDOC_ARGS)

Line 687 mdoc_nm_pre(MDOC_ARGS)

{

struct htmlpair tag;

if ( ! (HTML_NEWLINE & h->flags))

if (NULL == n->child && NULL == m->name)

if (SEC_SYNOPSIS == n->sec) {

return(1);

bufcat_style(h, "clear", "both");

PAIR_STYLE_INIT(&tag, h);

print_otag(h, TAG_BR, 1, &tag);

}

if (SEC_SYNOPSIS == n->sec &&

n->prev && MDOC_LINE & n->flags) {

bufcat_style(h, "clear", "both");

PAIR_STYLE_INIT(&tag, h);

print_otag(h, TAG_BR, 1, &tag);

}

PAIR_CLASS_INIT(&tag, "name");

print_otag(h, TAG_SPAN, 1, &tag);

if (NULL == n->child)

Line 745 mdoc_xr_pre(MDOC_ARGS)

Line 713 mdoc_xr_pre(MDOC_ARGS)

struct htmlpair tag[2];

const struct mdoc_node *nn;

if (NULL == n->child)

return(0);

PAIR_CLASS_INIT(&tag[0], "link-man");

if (h->base_man) {

buffmt_man(h, n->child->string,

n->child->next ?

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);

} else

print_otag(h, TAG_A, 1, tag);

Line 807 mdoc_xx_pre(MDOC_ARGS)

Line 777 mdoc_xx_pre(MDOC_ARGS)

pp = "BSDI BSD/OS";

break;

case (MDOC_Dx):

pp = "DragonFlyBSD";

pp = "DragonFly";

break;

case (MDOC_Fx):

pp = "FreeBSD";

Line 855 mdoc_bx_pre(MDOC_ARGS)

Line 825 mdoc_bx_pre(MDOC_ARGS)

/* ARGSUSED */

static int

mdoc_it_block_pre(MDOC_ARGS, int type, struct roffsu *offs,

mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp,

int comp, struct roffsu *width)

struct roffsu *offs, struct roffsu *width)

{

struct htmlpair tag;

const struct mdoc_node *nn;

struct roffsu su;

nn = n->parent->parent;

assert(nn->args);

/* XXX: see notes in mdoc_it_pre(). */

if (MDOC_Column == type) {

if (LIST_column == type) {

/* Don't width-pad on the left. */

SCALE_HS_INIT(width, 0);

/* Also disallow non-compact. */

comp = 1;

}

if (MDOC_Diag == type)

if (LIST_diag == type)

/* Mandate non-compact with empty prior. */

if (n->prev && NULL == n->prev->body->child)

comp = 1;

Line 910 mdoc_it_block_pre(MDOC_ARGS, int type, struct roffsu *

Line 879 mdoc_it_block_pre(MDOC_ARGS, int type, struct roffsu *

/* ARGSUSED */

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 roffsu su;

switch (type) {

case (MDOC_Item):

case (LIST_item):

/* FALLTHROUGH */

case (MDOC_Ohang):

case (LIST_ohang):

/* 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;

default:

Line 940 mdoc_it_body_pre(MDOC_ARGS, int type)

Line 915 mdoc_it_body_pre(MDOC_ARGS, int type)

/* ARGSUSED */

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 ord *ord;

char nbuf[BUFSIZ];

switch (type) {

case (MDOC_Item):

case (LIST_item):

/* FALLTHROUGH */

return(0);

case (MDOC_Ohang):

case (LIST_ohang):

print_otag(h, TAG_DIV, 0, NULL);

print_otag(h, TAG_DIV, 0, &tag);

return(1);

case (LIST_column):

break;

case (MDOC_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;

default:

bufcat_su(h, "min-width", width);

SCALE_INVERT(width);

Line 976 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) {

case (MDOC_Diag):

case (LIST_diag):

PAIR_CLASS_INIT(&tag, "diag");

print_otag(h, TAG_SPAN, 1, &tag);

break;

case (MDOC_Enum):

case (LIST_enum):

ord = SLIST_FIRST(&h->ords);

ord = h->ords.head;

assert(ord);

nbuf[BUFSIZ - 1] = 0;

(void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);

print_text(h, nbuf);

return(0);

case (MDOC_Dash):

case (LIST_dash):

print_text(h, "\\(en");

return(0);

case (MDOC_Hyphen):

case (LIST_hyphen):

print_text(h, "\\(hy");

return(0);

case (MDOC_Bullet):

case (LIST_bullet):

print_text(h, "\\(bu");

return(0);

default:

Line 1007 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

mdoc_it_pre(MDOC_ARGS)

{

int i, type, wp, comp;

int i, wp, comp;

const struct mdoc_node *bl, *nn;

struct roffsu width, offs;

enum mdoc_list type;

* XXX: be very careful in changing anything, here. Lists in

Line 1021 mdoc_it_pre(MDOC_ARGS)

Line 991 mdoc_it_pre(MDOC_ARGS)

if (MDOC_BLOCK != n->type)

bl = bl->parent;

type = a2list(bl);

type = bl->data.list;

/* Set default width and offset. */

SCALE_HS_INIT(&offs, 0);

switch (type) {

case (MDOC_Enum):

case (LIST_enum):

/* FALLTHROUGH */

case (MDOC_Dash):

case (LIST_dash):

/* FALLTHROUGH */

case (MDOC_Hyphen):

case (LIST_hyphen):

/* FALLTHROUGH */

case (MDOC_Bullet):

case (LIST_bullet):

SCALE_HS_INIT(&width, 2);

break;

default:

Line 1044 mdoc_it_pre(MDOC_ARGS)

Line 1014 mdoc_it_pre(MDOC_ARGS)

/* 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) {

case (MDOC_Column):

wp = i; /* Save for later. */

Line 1065 mdoc_it_pre(MDOC_ARGS)

Line 1036 mdoc_it_pre(MDOC_ARGS)

/* Override width in some cases. */

switch (type) {

case (MDOC_Inset):

case (LIST_ohang):

/* FALLTHROUGH */

case (MDOC_Diag):

case (LIST_item):

/* FALLTHROUGH */

case (LIST_inset):

/* FALLTHROUGH */

case (LIST_diag):

SCALE_HS_INIT(&width, 0);

break;

default:

Line 1076 mdoc_it_pre(MDOC_ARGS)

Line 1051 mdoc_it_pre(MDOC_ARGS)

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,

&offs, comp, &width));

/* Override column widths. */

if (MDOC_Column == type) {

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)

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 1104 mdoc_bl_pre(MDOC_ARGS)

Line 1075 mdoc_bl_pre(MDOC_ARGS)

{

struct ord *ord;

if (MDOC_HEAD == n->type)

return(0);

if (MDOC_BLOCK != n->type)

return(1);

if (MDOC_Enum != a2list(n))

if (LIST_enum != n->data.list)

return(1);

ord = malloc(sizeof(struct ord));

if (NULL == ord)

if (NULL == ord) {

err(EXIT_FAILURE, "malloc");

perror(NULL);

exit(EXIT_FAILURE);

}

ord->cookie = n;

ord->pos = 1;

SLIST_INSERT_HEAD(&h->ords, ord, entry);

ord->next = h->ords.head;

h->ords.head = ord;

return(1);

}

Line 1127 mdoc_bl_post(MDOC_ARGS)

Line 1103 mdoc_bl_post(MDOC_ARGS)

if (MDOC_BLOCK != n->type)

return;

if (MDOC_Enum != a2list(n))

if (LIST_enum != n->data.list)

return;

ord = SLIST_FIRST(&h->ords);

ord = h->ords.head;

assert(ord);

SLIST_REMOVE_HEAD(&h->ords, entry);

h->ords.head = ord->next;

free(ord);

}

Line 1163 mdoc_ex_pre(MDOC_ARGS)

Line 1139 mdoc_ex_pre(MDOC_ARGS)

h->flags &= ~HTML_NOSPACE;

}

if (n->child->next)

if (n->child && n->child->next)

print_text(h, "utilities exit");

else

print_text(h, "utility exits");

Line 1269 mdoc_d1_pre(MDOC_ARGS)

Line 1245 mdoc_d1_pre(MDOC_ARGS)

if (MDOC_BLOCK != n->type)

return(1);

SCALE_VS_INIT(&su, INDENT - 2);

/* FIXME: D1 shouldn't be literal. */

SCALE_VS_INIT(&su, INDENT - 1);

bufcat_su(h, "margin-left", &su);

PAIR_CLASS_INIT(&tag[0], "lit");

PAIR_STYLE_INIT(&tag[1], h);

Line 1284 mdoc_sx_pre(MDOC_ARGS)

Line 1262 mdoc_sx_pre(MDOC_ARGS)

{

struct htmlpair tag[2];

const struct mdoc_node *nn;

char lbuf[BUFSIZ];

char buf[BUFSIZ];

/* FIXME: duplicates? */

strlcpy(buf, "#", BUFSIZ);

(void)strlcpy(lbuf, "#", BUFSIZ);

for (nn = n->child; nn; nn = nn->next) {

(void)strlcat(lbuf, nn->string, BUFSIZ);

html_idcat(buf, nn->string, BUFSIZ);

if (nn->next)

(void)strlcat(lbuf, "_", BUFSIZ);

html_idcat(buf, " ", BUFSIZ);

}

PAIR_CLASS_INIT(&tag[0], "link-sec");

tag[1].key = ATTR_HREF;

PAIR_HREF_INIT(&tag[1], buf);

tag[1].val = lbuf;

print_otag(h, TAG_A, 2, tag);

return(1);

Line 1348 mdoc_bd_pre(MDOC_ARGS)

Line 1323 mdoc_bd_pre(MDOC_ARGS)

SCALE_VS_INIT(&su, 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) {

case (MDOC_Offset):

a2offs(bl->args->argv[i].value[0], &su);

Line 1356 mdoc_bd_pre(MDOC_ARGS)

Line 1331 mdoc_bd_pre(MDOC_ARGS)

case (MDOC_Compact):

comp = 1;

break;

case (MDOC_Centred):

/* FALLTHROUGH */

case (MDOC_Ragged):

/* FALLTHROUGH */

case (MDOC_Filled):

Line 1365 mdoc_bd_pre(MDOC_ARGS)

Line 1342 mdoc_bd_pre(MDOC_ARGS)

case (MDOC_Literal):

type = bl->args->argv[i].arg;

break;

default:

break;

}

/* FIXME: -centered, etc. formatting. */

/* FIXME: does not respect -offset ??? */

if (MDOC_BLOCK == n->type) {

bufcat_su(h, "margin-left", &su);

for (nn = n; nn && ! comp; nn = nn->parent) {

Line 1378 mdoc_bd_pre(MDOC_ARGS)

Line 1360 mdoc_bd_pre(MDOC_ARGS)

break;

}

if (comp) {

print_otag(h, TAG_DIV, 0, tag);

PAIR_STYLE_INIT(&tag[0], h);

print_otag(h, TAG_DIV, 1, tag);

return(1);

}

SCALE_VS_INIT(&su, 1);

Line 1455 mdoc_cd_pre(MDOC_ARGS)

Line 1438 mdoc_cd_pre(MDOC_ARGS)

{

struct htmlpair tag;

print_otag(h, TAG_DIV, 0, NULL);

PAIR_CLASS_INIT(&tag, "config");

print_otag(h, TAG_SPAN, 1, &tag);

return(1);

Line 1527 mdoc_fa_pre(MDOC_ARGS)

Line 1511 mdoc_fa_pre(MDOC_ARGS)

/* ARGSUSED */

static void

mdoc_fd_post(MDOC_ARGS)

{

print_otag(h, TAG_BR, 0, NULL);

}

/* ARGSUSED */

static int

mdoc_fd_pre(MDOC_ARGS)

{

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");

print_otag(h, TAG_SPAN, 1, &tag);

return(1);

Line 1556 mdoc_vt_pre(MDOC_ARGS)

Line 1538 mdoc_vt_pre(MDOC_ARGS)

struct htmlpair tag;

struct roffsu su;

if (SEC_SYNOPSIS == n->sec) {

if (SEC_SYNOPSIS == n->sec && MDOC_BLOCK == n->type) {

if (n->next && MDOC_Vt != n->next->tok) {

SCALE_VS_INIT(&su, 1);

bufcat_su(h, "margin-bottom", &su);

Line 1564 mdoc_vt_pre(MDOC_ARGS)

Line 1546 mdoc_vt_pre(MDOC_ARGS)

print_otag(h, TAG_DIV, 1, &tag);

} else

print_otag(h, TAG_DIV, 0, NULL);

}

return(1);

} else if (MDOC_HEAD == n->type)

return(0);

PAIR_CLASS_INIT(&tag, "type");

print_otag(h, TAG_SPAN, 1, &tag);

Line 1577 static int

Line 1562 static int

mdoc_ft_pre(MDOC_ARGS)

{

struct htmlpair tag;

struct roffsu su;

if (SEC_SYNOPSIS == n->sec) {

if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

if (n->prev && MDOC_Fo == n->prev->tok) {

print_otag(h, TAG_DIV, 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");

print_otag(h, TAG_SPAN, 1, &tag);

Line 1607 mdoc_fn_pre(MDOC_ARGS)

Line 1584 mdoc_fn_pre(MDOC_ARGS)

int sz, i;

struct roffsu su;

/* NB: MDOC_LINE has no effect on this macro! */

if (SEC_SYNOPSIS == n->sec) {

SCALE_HS_INIT(&su, INDENT);

bufcat_su(h, "margin-left", &su);

Line 1624 mdoc_fn_pre(MDOC_ARGS)

Line 1602 mdoc_fn_pre(MDOC_ARGS)

assert(n->child->string);

sp = n->child->string;

if ((ep = strchr(sp, ' '))) {

ep = strchr(sp, ' ');

if (NULL != ep) {

PAIR_CLASS_INIT(&tag[0], "ftype");

t = print_otag(h, TAG_SPAN, 1, tag);

Line 1640 mdoc_fn_pre(MDOC_ARGS)

Line 1619 mdoc_fn_pre(MDOC_ARGS)

}

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);

if (sp) {

(void)strlcpy(nbuf, sp, BUFSIZ);

strlcpy(nbuf, sp, BUFSIZ);

print_text(h, nbuf);

}

Line 1701 mdoc_sp_pre(MDOC_ARGS)

Line 1697 mdoc_sp_pre(MDOC_ARGS)

bufcat_su(h, "height", &su);

PAIR_STYLE_INIT(&tag, h);

print_otag(h, TAG_DIV, 1, &tag);

return(1);

/* So the div isn't empty: */

print_text(h, "\\~");

return(0);

}

Line 1741 mdoc_lk_pre(MDOC_ARGS)

Line 1740 mdoc_lk_pre(MDOC_ARGS)

nn = n->child;

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);

if (NULL == nn->next)

return(1);

for (nn = nn->next; nn; nn = nn->next)

print_text(h, nn->string);

Line 1766 mdoc_mt_pre(MDOC_ARGS)

Line 1767 mdoc_mt_pre(MDOC_ARGS)

bufinit(h);

bufcat(h, "mailto:");

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);

print_text(h, nn->string);

print_tagq(h, t);

Line 1781 static int

Line 1782 static int

mdoc_fo_pre(MDOC_ARGS)

{

struct htmlpair tag;

struct roffsu su;

if (MDOC_BODY == n->type) {

h->flags |= HTML_NOSPACE;

print_text(h, "(");

h->flags |= HTML_NOSPACE;

return(1);

} else if (MDOC_BLOCK == n->type)

} else if (MDOC_BLOCK == n->type && n->next) {

SCALE_VS_INIT(&su, 1);

bufcat_su(h, "margin-bottom", &su);

PAIR_STYLE_INIT(&tag, h);

print_otag(h, TAG_DIV, 1, &tag);

return(1);

}

PAIR_CLASS_INIT(&tag, "fname");

print_otag(h, TAG_SPAN, 1, &tag);

Line 1817 mdoc_in_pre(MDOC_ARGS)

Line 1824 mdoc_in_pre(MDOC_ARGS)

struct tag *t;

struct htmlpair tag[2];

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);

}

PAIR_CLASS_INIT(&tag[0], "includes");

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, "<");

h->flags |= HTML_NOSPACE;

/* XXX -- see warning in termp_in_post(). */

for (nn = n->child; nn; nn = nn->next) {

PAIR_CLASS_INIT(&tag[0], "link-includes");

i = 1;

bufinit(h);

if (h->base_includes) {

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);

print_mdoc_node(m, nn, h);

Line 1856 mdoc_in_pre(MDOC_ARGS)

Line 1851 mdoc_in_pre(MDOC_ARGS)

h->flags |= HTML_NOSPACE;

print_text(h, ">");

if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

print_otag(h, TAG_BR, 0, NULL);

return(0);

}

Line 1898 mdoc_rv_pre(MDOC_ARGS)

Line 1896 mdoc_rv_pre(MDOC_ARGS)

print_text(h, "()");

}

if (n->child->next)

if (n->child && n->child->next)

print_text(h, "functions return");

else

print_text(h, "function returns");

Line 1987 mdoc_bf_pre(MDOC_ARGS)

Line 1985 mdoc_bf_pre(MDOC_ARGS)

else if ( ! strcmp("Li", n->head->child->string))

PAIR_CLASS_INIT(&tag[0], "lit");

} 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) {

case (MDOC_Symbolic):

PAIR_CLASS_INIT(&tag[0], "symb");

Line 2121 mdoc_lb_pre(MDOC_ARGS)

Line 2118 mdoc_lb_pre(MDOC_ARGS)

{

struct htmlpair tag;

if (SEC_SYNOPSIS == n->sec)

if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)

print_otag(h, TAG_DIV, 0, NULL);

PAIR_CLASS_INIT(&tag, "lib");

print_otag(h, TAG_SPAN, 1, &tag);

Line 2133 mdoc_lb_pre(MDOC_ARGS)

Line 2130 mdoc_lb_pre(MDOC_ARGS)

static int

mdoc__x_pre(MDOC_ARGS)

{

struct htmlpair tag;

struct htmlpair tag[2];

switch (n->tok) {

case(MDOC__A):

PAIR_CLASS_INIT(&tag, "ref-auth");

PAIR_CLASS_INIT(&tag[0], "ref-auth");

break;

case(MDOC__B):

PAIR_CLASS_INIT(&tag, "ref-book");

PAIR_CLASS_INIT(&tag[0], "ref-book");

break;

case(MDOC__C):

PAIR_CLASS_INIT(&tag, "ref-city");

PAIR_CLASS_INIT(&tag[0], "ref-city");

break;

case(MDOC__D):

PAIR_CLASS_INIT(&tag, "ref-date");

PAIR_CLASS_INIT(&tag[0], "ref-date");

break;

case(MDOC__I):

PAIR_CLASS_INIT(&tag, "ref-issue");

PAIR_CLASS_INIT(&tag[0], "ref-issue");

break;

case(MDOC__J):

PAIR_CLASS_INIT(&tag, "ref-jrnl");

PAIR_CLASS_INIT(&tag[0], "ref-jrnl");

break;

case(MDOC__N):

PAIR_CLASS_INIT(&tag, "ref-num");

PAIR_CLASS_INIT(&tag[0], "ref-num");

break;

case(MDOC__O):

PAIR_CLASS_INIT(&tag, "ref-opt");

PAIR_CLASS_INIT(&tag[0], "ref-opt");

break;

case(MDOC__P):

PAIR_CLASS_INIT(&tag, "ref-page");

PAIR_CLASS_INIT(&tag[0], "ref-page");

break;

case(MDOC__Q):

PAIR_CLASS_INIT(&tag, "ref-corp");

PAIR_CLASS_INIT(&tag[0], "ref-corp");

break;

case(MDOC__R):

PAIR_CLASS_INIT(&tag, "ref-rep");

PAIR_CLASS_INIT(&tag[0], "ref-rep");

break;

case(MDOC__T):

PAIR_CLASS_INIT(&tag, "ref-title");

PAIR_CLASS_INIT(&tag[0], "ref-title");

print_text(h, "\\(lq");

h->flags |= HTML_NOSPACE;

break;

case(MDOC__U):

PAIR_CLASS_INIT(&tag[0], "link-ref");

break;

case(MDOC__V):

PAIR_CLASS_INIT(&tag, "ref-vol");

PAIR_CLASS_INIT(&tag[0], "ref-vol");

break;

default:

abort();

/* NOTREACHED */

}

print_otag(h, TAG_SPAN, 1, &tag);

if (MDOC__U != n->tok) {

print_otag(h, TAG_SPAN, 1, tag);

return(1);

}

PAIR_HREF_INIT(&tag[1], n->child->string);

print_otag(h, TAG_A, 2, tag);

return(1);

}

Line 2192 static void

Line 2196 static void

mdoc__x_post(MDOC_ARGS)

{

/* TODO: %U */

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 ? "," : ".");

}

CVSweb