-/* $Id: mdoc_html.c,v 1.19 2009/10/03 19:02:45 kristaps Exp $ */
+/* $Id: mdoc_html.c,v 1.102 2010/08/20 01:02:07 schwarze Exp $ */
/*
- * 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
* purpose with or without fee is hereby granted, provided that the above
* 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
#define MDOC_ARGS const struct mdoc_meta *m, \
const struct mdoc_node *n, \
struct html *h
-#define MAN_ARGS const struct man_meta *m, \
- const struct man_node *n, \
- struct html *h
+
+#ifndef MIN
+#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
struct htmlmdoc {
int (*pre)(MDOC_ARGS);
static void print_mdoc_head(MDOC_ARGS);
static void print_mdoc_node(MDOC_ARGS);
static void print_mdoc_nodelist(MDOC_ARGS);
+static void synopsis_pre(struct html *,
+ const struct mdoc_node *);
-static int a2width(const char *);
-static int a2offs(const char *);
-static int a2list(const struct mdoc_node *);
+static void a2width(const char *, struct roffsu *);
+static void a2offs(const char *, struct roffsu *);
static void mdoc_root_post(MDOC_ARGS);
static int mdoc_root_pre(MDOC_ARGS);
-static int mdoc_tbl_pre(MDOC_ARGS, int);
-static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int);
-static int mdoc_tbl_body_pre(MDOC_ARGS, int, int);
-static int mdoc_tbl_head_pre(MDOC_ARGS, int, int);
static void mdoc__x_post(MDOC_ARGS);
static int mdoc__x_pre(MDOC_ARGS);
static int mdoc_ar_pre(MDOC_ARGS);
static int mdoc_bd_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 int mdoc_bl_pre(MDOC_ARGS);
static void mdoc_bq_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);
static int mdoc_rs_pre(MDOC_ARGS);
static int mdoc_rv_pre(MDOC_ARGS);
static int mdoc_sh_pre(MDOC_ARGS);
+static int mdoc_sm_pre(MDOC_ARGS);
static int mdoc_sp_pre(MDOC_ARGS);
static void mdoc_sq_post(MDOC_ARGS);
static int mdoc_sq_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 */
{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 */
{mdoc_xx_pre, NULL}, /* Fx */
- {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
+ {mdoc_ms_pre, NULL}, /* Ms */
{NULL, NULL}, /* No */
{mdoc_ns_pre, NULL}, /* Ns */
{mdoc_xx_pre, NULL}, /* Nx */
{NULL, NULL}, /* Sc */
{mdoc_sq_pre, mdoc_sq_post}, /* So */
{mdoc_sq_pre, mdoc_sq_post}, /* Sq */
- {NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+ {mdoc_sm_pre, NULL}, /* Sm */
{mdoc_sx_pre, NULL}, /* Sx */
{mdoc_sy_pre, NULL}, /* Sy */
{NULL, NULL}, /* Tn */
{NULL, NULL}, /* Fc */
{mdoc_op_pre, mdoc_op_post}, /* Oo */
{NULL, NULL}, /* Oc */
- {NULL, NULL}, /* Bk */
+ {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
{NULL, NULL}, /* Ek */
{mdoc_bt_pre, NULL}, /* Bt */
{NULL, NULL}, /* Hf */
{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 */
};
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);
}
-static int
-a2list(const struct mdoc_node *n)
-{
- int i;
-
- assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
- 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;
- }
+/*
+ * 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.
+ */
+static void
+a2width(const char *p, struct roffsu *su)
+{
- abort();
- /* NOTREACHED */
+ if ( ! a2roffsu(p, su, SCALE_MAX)) {
+ su->unit = SCALE_EM;
+ su->scale = (int)strlen(p);
+ }
}
-static int
-a2width(const char *p)
+/*
+ * See the same function in mdoc_term.c for documentation.
+ */
+static void
+synopsis_pre(struct html *h, const struct mdoc_node *n)
{
- int i, len;
+ struct roffsu su;
+ struct htmlpair tag;
- if (0 == (len = (int)strlen(p)))
- return(0);
- for (i = 0; i < len - 1; i++)
- if ( ! isdigit((u_char)p[i]))
- break;
+ if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+ return;
+
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-top", &su);
+ PAIR_STYLE_INIT(&tag, h);
- if (i == len - 1)
- if ('n' == p[len - 1] || 'm' == p[len - 1])
- return(atoi(p) + 2);
+ if (n->prev->tok == n->tok &&
+ MDOC_Fo != n->tok &&
+ MDOC_Ft != n->tok &&
+ MDOC_Fn != n->tok) {
+ print_otag(h, TAG_DIV, 0, NULL);
+ return;
+ }
- return(len + 2);
+ switch (n->prev->tok) {
+ case (MDOC_Fd):
+ /* FALLTHROUGH */
+ case (MDOC_Fn):
+ /* FALLTHROUGH */
+ case (MDOC_Fo):
+ /* FALLTHROUGH */
+ case (MDOC_In):
+ /* FALLTHROUGH */
+ case (MDOC_Vt):
+ print_otag(h, TAG_DIV, 1, &tag);
+ break;
+ case (MDOC_Ft):
+ if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+ print_otag(h, TAG_DIV, 1, &tag);
+ break;
+ }
+ /* FALLTHROUGH */
+ default:
+ print_otag(h, TAG_DIV, 0, NULL);
+ break;
+ }
}
-static int
-a2offs(const char *p)
+/*
+ * Calculate the scaling unit passed in an `-offset' argument. This
+ * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
+ * predefined strings (indent, etc.), or the string length of the value.
+ */
+static void
+a2offs(const char *p, struct roffsu *su)
{
- int len, i;
- if (0 == strcmp(p, "left"))
- return(0);
- if (0 == strcmp(p, "indent"))
- return(INDENT + 1);
- if (0 == strcmp(p, "indent-two"))
- return((INDENT + 1) * 2);
+ /* FIXME: "right"? */
- if (0 == (len = (int)strlen(p)))
- return(0);
-
- for (i = 0; i < len - 1; i++)
- if ( ! isdigit((u_char)p[i]))
- break;
-
- if (i == len - 1)
- if ('n' == p[len - 1] || 'm' == p[len - 1])
- return(atoi(p));
-
- return(len);
+ 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, SCALE_MAX)) {
+ su->unit = SCALE_EM;
+ su->scale = (int)strlen(p);
+ }
}
static void
print_mdoc_head(MDOC_ARGS)
{
- char b[BUFSIZ];
print_gen_head(h);
-
- (void)snprintf(b, BUFSIZ - 1,
- "%s(%d)", m->title, m->msec);
+ bufinit(h);
+ buffmt(h, "%s(%s)", m->title, m->msec);
if (m->arch) {
- (void)strlcat(b, " (", BUFSIZ);
- (void)strlcat(b, m->arch, BUFSIZ);
- (void)strlcat(b, ")", BUFSIZ);
+ bufcat(h, " (");
+ bufcat(h, m->arch);
+ bufcat(h, ")");
}
print_otag(h, TAG_TITLE, 0, NULL);
- print_text(h, b);
+ print_text(h, h->buf);
}
struct tag *t;
child = 1;
- t = SLIST_FIRST(&h->tags);
+ t = h->tags.head;
bufinit(h);
-
switch (n->type) {
case (MDOC_ROOT):
child = mdoc_root_pre(m, n, h);
break;
case (MDOC_TEXT):
print_text(h, n->string);
- break;
+ return;
default:
- if (mdocs[n->tok].pre)
+ if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
child = (*mdocs[n->tok].pre)(m, n, h);
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)
print_mdoc_nodelist(m, n->child, h);
print_stagq(h, t);
bufinit(h);
-
switch (n->type) {
case (MDOC_ROOT):
mdoc_root_post(m, n, h);
break;
- case (MDOC_TEXT):
- break;
default:
- if (mdocs[n->tok].post)
+ if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
(*mdocs[n->tok].post)(m, n, h);
break;
}
static void
mdoc_root_post(MDOC_ARGS)
{
- struct tm tm;
- struct htmlpair tag[2];
+ struct htmlpair tag[3];
struct tag *t, *tt;
- char b[BUFSIZ];
+ char b[DATESIZ];
+
+ time2a(m->date, b, DATESIZ);
- (void)localtime_r(&m->date, &tm);
+ /*
+ * 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.
+ */
- 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);
+ PAIR_SUMMARY_INIT(&tag[2], "footer");
- tag[0].key = ATTR_CLASS;
- tag[0].val = "footer";
- tag[1].key = ATTR_STYLE;
- tag[1].val = "width: 100%;";
- t = print_otag(h, TAG_TABLE, 2, tag);
+ t = print_otag(h, TAG_TABLE, 3, tag);
tt = print_otag(h, TAG_TR, 0, NULL);
- tag[0].key = ATTR_STYLE;
- tag[0].val = "width: 50%;";
+ bufinit(h);
+ bufcat_style(h, "width", "50%");
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_TD, 1, tag);
print_text(h, b);
print_stagq(h, tt);
- tag[0].key = ATTR_STYLE;
- tag[0].val = "width: 50%; text-align: right;";
+ bufinit(h);
+ bufcat_style(h, "width", "50%");
+ bufcat_style(h, "text-align", "right");
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_TD, 1, tag);
print_text(h, m->os);
print_tagq(h, t);
static int
mdoc_root_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
+ struct htmlpair tag[3];
struct tag *t, *tt;
char b[BUFSIZ], title[BUFSIZ];
}
(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);
+ PAIR_SUMMARY_INIT(&tag[2], "header");
+
+ t = print_otag(h, TAG_TABLE, 3, tag);
- tag[0].key = ATTR_CLASS;
- tag[0].val = "header";
- tag[1].key = ATTR_STYLE;
- tag[1].val = "width: 100%;";
- t = print_otag(h, TAG_TABLE, 2, tag);
tt = print_otag(h, TAG_TR, 0, NULL);
- tag[0].key = ATTR_STYLE;
- tag[0].val = "width: 10%;";
+ bufinit(h);
+ bufcat_style(h, "width", "10%");
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_TD, 1, tag);
print_text(h, title);
print_stagq(h, tt);
- tag[0].key = ATTR_STYLE;
- tag[0].val = "width: 80%; white-space: nowrap; text-align: center;";
+ bufinit(h);
+ bufcat_style(h, "text-align", "center");
+ bufcat_style(h, "white-space", "nowrap");
+ bufcat_style(h, "width", "80%");
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_TD, 1, tag);
print_text(h, b);
print_stagq(h, tt);
- tag[0].key = ATTR_STYLE;
- tag[0].val = "width: 10%; text-align: right;";
+ bufinit(h);
+ bufcat_style(h, "text-align", "right");
+ bufcat_style(h, "width", "10%");
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_TD, 1, tag);
print_text(h, title);
print_tagq(h, t);
-
return(1);
}
{
struct htmlpair tag[2];
const struct mdoc_node *nn;
+ char buf[BUFSIZ];
+ struct roffsu su;
- if (MDOC_HEAD == n->type) {
- tag[0].key = ATTR_CLASS;
- tag[0].val = "sec-head";
- print_otag(h, TAG_DIV, 1, tag);
- print_otag(h, TAG_SPAN, 1, tag);
-
- for (nn = n->child; nn; nn = nn->next) {
- bufcat(h, nn->string);
- if (nn->next)
- bufncat(h, " ", 1);
- }
- tag[0].key = ATTR_NAME;
- tag[0].val = h->buf;
- print_otag(h, TAG_A, 1, tag);
+ if (MDOC_BODY == n->type) {
+ SCALE_HS_INIT(&su, INDENT);
+ bufcat_su(h, "margin-left", &su);
+ PAIR_CLASS_INIT(&tag[0], "sec-body");
+ PAIR_STYLE_INIT(&tag[1], h);
+ print_otag(h, TAG_DIV, 2, tag);
return(1);
} else if (MDOC_BLOCK == n->type) {
- tag[0].key = ATTR_CLASS;
- tag[0].val = "sec-block";
-
+ PAIR_CLASS_INIT(&tag[0], "sec-block");
if (n->prev && NULL == n->prev->body->child) {
print_otag(h, TAG_DIV, 1, tag);
return(1);
}
-
- bufcat(h, "margin-top: 1em;");
+
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-top", &su);
if (NULL == n->next)
- bufcat(h, "margin-bottom: 1em;");
-
- tag[1].key = ATTR_STYLE;
- tag[1].val = h->buf;
+ bufcat_su(h, "margin-bottom", &su);
+ PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
- buffmt(h, "margin-left: %dem;", INDENT);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "sec-body";
- tag[1].key = ATTR_STYLE;
- tag[1].val = h->buf;
+ buf[0] = '\0';
+ for (nn = n->child; nn; nn = nn->next) {
+ html_idcat(buf, nn->string, BUFSIZ);
+ if (nn->next)
+ html_idcat(buf, " ", BUFSIZ);
+ }
+
+ PAIR_CLASS_INIT(&tag[0], "sec-head");
+ PAIR_ID_INIT(&tag[1], buf);
print_otag(h, TAG_DIV, 2, tag);
return(1);
static int
mdoc_ss_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- int i;
+ struct htmlpair tag[3];
const struct mdoc_node *nn;
+ char buf[BUFSIZ];
+ struct roffsu su;
- i = 0;
+ SCALE_VS_INIT(&su, 1);
if (MDOC_BODY == n->type) {
- tag[i].key = ATTR_CLASS;
- tag[i++].val = "ssec-body";
+ PAIR_CLASS_INIT(&tag[0], "ssec-body");
if (n->parent->next && n->child) {
- bufcat(h, "margin-bottom: 1em;");
- tag[i].key = ATTR_STYLE;
- tag[i++].val = h->buf;
- }
- print_otag(h, TAG_DIV, i, tag);
+ bufcat_su(h, "margin-bottom", &su);
+ PAIR_STYLE_INIT(&tag[1], h);
+ print_otag(h, TAG_DIV, 2, tag);
+ } else
+ print_otag(h, TAG_DIV, 1, tag);
return(1);
} else if (MDOC_BLOCK == n->type) {
- tag[i].key = ATTR_CLASS;
- tag[i++].val = "ssec-block";
+ PAIR_CLASS_INIT(&tag[0], "ssec-block");
if (n->prev) {
- bufcat(h, "margin-top: 1em;");
- tag[i].key = ATTR_STYLE;
- tag[i++].val = h->buf;
- }
- print_otag(h, TAG_DIV, i, tag);
+ bufcat_su(h, "margin-top", &su);
+ PAIR_STYLE_INIT(&tag[1], h);
+ print_otag(h, TAG_DIV, 2, tag);
+ } else
+ print_otag(h, TAG_DIV, 1, tag);
return(1);
}
- buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "ssec-head";
- tag[1].key = ATTR_STYLE;
- tag[1].val = h->buf;
-
- print_otag(h, TAG_DIV, 2, tag);
- print_otag(h, TAG_SPAN, 1, tag);
+ /* TODO: see note in mdoc_sh_pre() about duplicates. */
- bufinit(h);
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
- bufcat(h, nn->string);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- bufcat(h, " ");
+ html_idcat(buf, " ", BUFSIZ);
}
- tag[0].key = ATTR_NAME;
- tag[0].val = h->buf;
- print_otag(h, TAG_A, 1, tag);
+ SCALE_HS_INIT(&su, INDENT - HALFINDENT);
+ su.scale = -su.scale;
+ bufcat_su(h, "margin-left", &su);
+
+ PAIR_CLASS_INIT(&tag[0], "ssec-head");
+ PAIR_STYLE_INIT(&tag[1], h);
+ PAIR_ID_INIT(&tag[2], buf);
+
+ print_otag(h, TAG_DIV, 3, tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "flag";
-
+ 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);
}
if (MDOC_BODY != n->type)
return(1);
- /* XXX - this can contain block elements! */
+ /* XXX: this tag in theory can contain block elements. */
+
print_text(h, "\\(em");
- tag.key = ATTR_CLASS;
- tag.val = "desc-body";
+ PAIR_CLASS_INIT(&tag, "desc-body");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
if (MDOC_BODY != n->type)
return(1);
- /* XXX - this can contain block elements! */
+ /* XXX: this tag in theory can contain block elements. */
+
print_text(h, "\\(lB");
h->flags |= HTML_NOSPACE;
- tag.key = ATTR_CLASS;
- tag.val = "opt";
+ PAIR_CLASS_INIT(&tag, "opt");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_nm_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag;
+ struct roffsu su;
+ const char *cp;
- if ( ! (HTML_NEWLINE & h->flags))
- if (SEC_SYNOPSIS == n->sec) {
- tag.key = ATTR_STYLE;
- tag.val = "clear: both;";
- print_otag(h, TAG_BR, 1, &tag);
+ /*
+ * Accomodate for `Nm' being both an element (which may have
+ * NULL children AND no m->name) and a block.
+ */
+
+ cp = NULL;
+
+ if (MDOC_ELEM == n->type) {
+ if (NULL == n->child && NULL == m->name)
+ return(1);
+ 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);
}
- tag.key = ATTR_CLASS;
- tag.val = "name";
+ 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);
- print_otag(h, TAG_SPAN, 1, &tag);
- if (NULL == n->child)
- print_text(h, m->name);
+ 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);
}
{
struct htmlpair tag[2];
const struct mdoc_node *nn;
- int i;
- i = 0;
- tag[i].key = ATTR_CLASS;
- tag[i++].val = "link-man";
+ 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 ?
+ buffmt_man(h, n->child->string,
+ n->child->next ?
n->child->next->string : NULL);
- tag[i].key = ATTR_HREF;
- tag[i++].val = h->buf;
- }
-
- print_otag(h, TAG_A, i, tag);
+ PAIR_HREF_INIT(&tag[1], h->buf);
+ print_otag(h, TAG_A, 2, tag);
+ } else
+ print_otag(h, TAG_A, 1, tag);
nn = n->child;
print_text(h, nn->string);
print_text(h, nn->string);
h->flags |= HTML_NOSPACE;
print_text(h, ")");
-
return(0);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "arg";
-
+ PAIR_CLASS_INIT(&tag, "arg");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
pp = "BSDI BSD/OS";
break;
case (MDOC_Dx):
- pp = "DragonFlyBSD";
+ pp = "DragonFly";
break;
case (MDOC_Fx):
pp = "FreeBSD";
return(1);
}
- tag.key = ATTR_CLASS;
- tag.val = "unix";
-
+ PAIR_CLASS_INIT(&tag, "unix");
print_otag(h, TAG_SPAN, 1, &tag);
print_text(h, pp);
return(1);
const struct mdoc_node *nn;
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "unix";
-
+ PAIR_CLASS_INIT(&tag, "unix");
print_otag(h, TAG_SPAN, 1, &tag);
for (nn = n->child; nn; nn = nn->next)
/* ARGSUSED */
static int
-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
+mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp,
+ struct roffsu *offs, struct roffsu *width)
{
struct htmlpair tag;
const struct mdoc_node *nn;
+ struct roffsu su;
- switch (t) {
- case (MDOC_Column):
- /* FALLTHROUGH */
- case (MDOC_Item):
- /* FALLTHROUGH */
- case (MDOC_Ohang):
- buffmt(h, "margin-left: %dem; clear: both;", o);
- break;
- default:
- buffmt(h, "margin-left: %dem; clear: both;", w + o);
- break;
+ nn = n->parent->parent;
+
+ /* XXX: see notes in mdoc_it_pre(). */
+
+ if (LIST_column == type) {
+ /* Don't width-pad on the left. */
+ SCALE_HS_INIT(width, 0);
+ /* Also disallow non-compact. */
+ comp = 1;
}
+ if (LIST_diag == type)
+ /* Mandate non-compact with empty prior. */
+ if (n->prev && NULL == n->prev->body->child)
+ comp = 1;
- if ( ! c && MDOC_Column != t) {
- for (nn = n; nn; nn = nn->parent) {
- if (MDOC_BLOCK != nn->type)
- continue;
- switch (nn->tok) {
- case (MDOC_Ss):
- /* FALLTHROUGH */
- case (MDOC_Sh):
- c = 1;
- break;
- default:
- break;
- }
- if (nn->prev)
- break;
- }
- if (MDOC_Diag == t && n->prev)
- if (NULL == n->prev->body->child)
- c = 1;
- if ( ! c)
- bufcat(h, "padding-top: 1em;");
+ bufcat_style(h, "clear", "both");
+ if (offs->scale > 0)
+ bufcat_su(h, "margin-left", offs);
+ if (width->scale > 0)
+ bufcat_su(h, "padding-left", width);
+
+ PAIR_STYLE_INIT(&tag, h);
+
+ /* Mandate compact following `Ss' and `Sh' starts. */
+
+ for (nn = n; nn && ! comp; nn = nn->parent) {
+ if (MDOC_BLOCK != nn->type)
+ continue;
+ if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
+ comp = 1;
+ if (nn->prev)
+ break;
}
- tag.key = ATTR_STYLE;
- tag.val = h->buf;
+ if ( ! comp) {
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "padding-top", &su);
+ }
+
+ PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, 1, &tag);
return(1);
}
/* ARGSUSED */
static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
+mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
{
+ struct htmlpair tag;
+ struct roffsu su;
+
+ switch (type) {
+ case (LIST_item):
+ /* FALLTHROUGH */
+ case (LIST_ohang):
+ /* FALLTHROUGH */
+ 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:
+ /*
+ * XXX: this tricks CSS into aligning the bodies with
+ * the right-padding in the head.
+ */
+ SCALE_HS_INIT(&su, 2);
+ bufcat_su(h, "margin-left", &su);
+ PAIR_STYLE_INIT(&tag, h);
+ print_otag(h, TAG_DIV, 1, &tag);
+ break;
+ }
- print_otag(h, TAG_DIV, 0, NULL);
return(1);
}
/* ARGSUSED */
static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
+mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
{
struct htmlpair tag;
struct ord *ord;
char nbuf[BUFSIZ];
- switch (t) {
- case (MDOC_Item):
- /* FALLTHROUGH */
- case (MDOC_Ohang):
- print_otag(h, TAG_DIV, 0, NULL);
- break;
- case (MDOC_Column):
- buffmt(h, "min-width: %dem;", w);
- bufcat(h, "clear: none;");
- if (n->next && MDOC_HEAD == n->next->type)
- bufcat(h, "float: left;");
- tag.key = ATTR_STYLE;
- tag.val = h->buf;
- print_otag(h, TAG_DIV, 1, &tag);
+ switch (type) {
+ case (LIST_item):
+ return(0);
+ case (LIST_ohang):
+ print_otag(h, TAG_DIV, 0, &tag);
+ return(1);
+ case (LIST_column):
break;
default:
- buffmt(h, "margin-left: -%dem; min-width: %dem;",
- w, w ? w - 1 : 0);
- bufcat(h, "clear: left;");
+ bufcat_su(h, "min-width", width);
+ SCALE_INVERT(width);
+ bufcat_su(h, "margin-left", width);
if (n->next && n->next->child)
- bufcat(h, "float: left;");
- bufcat(h, "padding-right: 1em;");
- tag.key = ATTR_STYLE;
- tag.val = h->buf;
+ bufcat_style(h, "float", "left");
+
+ /* XXX: buffer if we run into body. */
+ SCALE_HS_INIT(width, 1);
+ bufcat_su(h, "margin-right", width);
+ PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, 1, &tag);
break;
}
- switch (t) {
- case (MDOC_Diag):
- tag.key = ATTR_CLASS;
- tag.val = "diag";
+ switch (type) {
+ case (LIST_diag):
+ PAIR_CLASS_INIT(&tag, "diag");
print_otag(h, TAG_SPAN, 1, &tag);
break;
- case (MDOC_Enum):
- ord = SLIST_FIRST(&h->ords);
+ case (LIST_enum):
+ 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:
static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
+mdoc_it_pre(MDOC_ARGS)
{
- int i, w, o, c, wp;
+ int i, 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
+ * mandoc have many peculiarities; furthermore, they don't
+ * translate well into HTML and require a bit of mangling.
+ */
bl = n->parent->parent;
- if (MDOC_BLOCK != n->type)
+ if (MDOC_BLOCK != n->type)
bl = bl->parent;
- assert(bl->args);
-
- w = o = c = 0;
- wp = -1;
-
- for (i = 0; i < (int)bl->args->argc; i++)
- if (MDOC_Width == bl->args->argv[i].arg) {
- assert(bl->args->argv[i].sz);
- wp = i;
- w = a2width(bl->args->argv[i].value[0]);
- } else if (MDOC_Offset == bl->args->argv[i].arg) {
- assert(bl->args->argv[i].sz);
- o = a2offs(bl->args->argv[i].value[0]);
- } else if (MDOC_Compact == bl->args->argv[i].arg)
- c = 1;
-
- if (MDOC_HEAD == n->type && MDOC_Column == type) {
- nn = n->parent->child;
- assert(nn && MDOC_HEAD == nn->type);
- for (i = 0; nn && nn != n; nn = nn->next, i++)
- /* Counter... */ ;
- assert(nn);
- if (wp >= 0 && i < (int)bl->args[wp].argv->sz)
- w = a2width(bl->args->argv[wp].value[i]);
- }
+ SCALE_HS_INIT(&offs, 0);
+
+ assert(bl->data.Bl);
+ type = bl->data.Bl->type;
+ comp = bl->data.Bl->comp;
+
+ if (bl->data.Bl->offs)
+ a2offs(bl->data.Bl->offs, &offs);
switch (type) {
- case (MDOC_Enum):
- /* FALLTHROUGH */
- case (MDOC_Dash):
+ case (LIST_enum):
/* FALLTHROUGH */
- case (MDOC_Hyphen):
+ case (LIST_dash):
/* FALLTHROUGH */
- case (MDOC_Bullet):
- if (w < 4)
- w = 4;
- break;
- case (MDOC_Inset):
+ case (LIST_hyphen):
/* FALLTHROUGH */
- case (MDOC_Diag):
- w = 1;
+ case (LIST_bullet):
+ SCALE_HS_INIT(&width, 2);
break;
default:
- if (0 == w)
- w = 10;
+ SCALE_HS_INIT(&width, INDENT);
break;
}
- switch (n->type) {
- case (MDOC_BLOCK):
+ if (bl->data.Bl->width)
+ a2width(bl->data.Bl->width, &width);
+
+ /* Override width in some cases. */
+
+ switch (type) {
+ case (LIST_ohang):
+ /* FALLTHROUGH */
+ case (LIST_item):
+ /* FALLTHROUGH */
+ case (LIST_inset):
+ /* FALLTHROUGH */
+ case (LIST_diag):
+ SCALE_HS_INIT(&width, 0);
break;
- case (MDOC_HEAD):
- return(mdoc_tbl_head_pre(m, n, h, type, w));
- case (MDOC_BODY):
- return(mdoc_tbl_body_pre(m, n, h, type, w));
default:
- abort();
- /* NOTREACHED */
+ if (0 == width.scale)
+ SCALE_HS_INIT(&width, INDENT);
+ break;
+ }
+
+ if (LIST_column == type && MDOC_BODY == n->type) {
+ nn = n->parent->child;
+ for (i = 0; nn && nn != n; nn = nn->next)
+ if (MDOC_BODY == nn->type)
+ i++;
+ if (i < (int)bl->data.Bl->ncols)
+ a2width(bl->data.Bl->cols[i], &width);
}
- return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
+ 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));
}
{
struct ord *ord;
+ if (MDOC_HEAD == n->type)
+ return(0);
if (MDOC_BLOCK != n->type)
return(1);
- if (MDOC_Enum != a2list(n))
+ assert(n->data.Bl);
+ if (LIST_enum != n->data.Bl->type)
return(1);
- /* Allocate an -enum on the stack of indices. */
-
ord = malloc(sizeof(struct ord));
- if (NULL == ord)
- err(EXIT_FAILURE, "malloc");
+ if (NULL == ord) {
+ perror(NULL);
+ exit(MANDOCLEVEL_SYSERR);
+ }
ord->cookie = n;
ord->pos = 1;
- SLIST_INSERT_HEAD(&h->ords, ord, entry);
-
+ ord->next = h->ords.head;
+ h->ords.head = ord;
return(1);
}
if (MDOC_BLOCK != n->type)
return;
- if (MDOC_Enum != a2list(n))
+ if (LIST_enum != n->data.Bl->type)
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);
}
-static int
-mdoc_it_pre(MDOC_ARGS)
-{
- int type;
-
- if (MDOC_BLOCK == n->type)
- type = a2list(n->parent->parent);
- else
- type = a2list(n->parent->parent->parent);
-
- return(mdoc_tbl_pre(m, n, h, type));
-}
-
-
/* ARGSUSED */
static int
mdoc_ex_pre(MDOC_ARGS)
struct tag *t;
struct htmlpair tag;
- print_text(h, "The");
-
- tag.key = ATTR_CLASS;
- tag.val = "utility";
+ PAIR_CLASS_INIT(&tag, "utility");
+ print_text(h, "The");
for (nn = n->child; nn; nn = nn->next) {
t = print_otag(h, TAG_SPAN, 1, &tag);
print_text(h, nn->string);
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");
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "emph";
-
+ PAIR_CLASS_INIT(&tag, "emph");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_d1_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
+ struct htmlpair tag[2];
+ struct roffsu su;
if (MDOC_BLOCK != n->type)
return(1);
- buffmt(h, "margin-left: %dem;", INDENT);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "lit";
- tag[1].key = ATTR_STYLE;
- tag[1].val = h->buf;
+ /* FIXME: D1 shouldn't be literal. */
+ SCALE_VS_INIT(&su, INDENT - 2);
+ bufcat_su(h, "margin-left", &su);
+ PAIR_CLASS_INIT(&tag[0], "lit");
+ PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
{
struct htmlpair tag[2];
const struct mdoc_node *nn;
+ char buf[BUFSIZ];
- bufcat(h, "#");
+ strlcpy(buf, "#", BUFSIZ);
for (nn = n->child; nn; nn = nn->next) {
- bufcat(h, nn->string);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- bufcat(h, " ");
+ html_idcat(buf, " ", BUFSIZ);
}
- tag[0].key = ATTR_HREF;
- tag[0].val = h->buf;
- tag[1].key = ATTR_CLASS;
- tag[1].val = "link-sec";
+ PAIR_CLASS_INIT(&tag[0], "link-sec");
+ PAIR_HREF_INIT(&tag[1], buf);
print_otag(h, TAG_A, 2, tag);
return(1);
mdoc_bd_pre(MDOC_ARGS)
{
struct htmlpair tag[2];
- int t, c, o, i;
- const struct mdoc_node *bl, *nn;
+ int comp;
+ const struct mdoc_node *nn;
+ struct roffsu su;
- if (MDOC_BLOCK == n->type)
- bl = n;
- else if (MDOC_HEAD == n->type)
+ if (MDOC_HEAD == n->type)
return(0);
- else
- bl = n->parent;
- t = o = c = 0;
+ SCALE_VS_INIT(&su, 0);
- for (i = 0; i < (int)bl->args->argc; i++)
- switch (bl->args->argv[i].arg) {
- case (MDOC_Offset):
- assert(bl->args->argv[i].sz);
- o = a2offs(bl->args->argv[i].value[0]);
- break;
- case (MDOC_Compact):
- c = 1;
- break;
- case (MDOC_Ragged):
- /* FALLTHROUGH */
- case (MDOC_Filled):
- /* FALLTHROUGH */
- case (MDOC_Unfilled):
- /* FALLTHROUGH */
- case (MDOC_Literal):
- t = bl->args->argv[i].arg;
- break;
- }
+ assert(n->data.Bd);
+ if (n->data.Bd->offs)
+ a2offs(n->data.Bd->offs, &su);
+
+ comp = n->data.Bd->comp;
+
+ /* FIXME: -centered, etc. formatting. */
+ /* FIXME: does not respect -offset ??? */
if (MDOC_BLOCK == n->type) {
- if (o)
- buffmt(h, "margin-left: %dem;", o);
- if ( ! c) {
- for (nn = n; nn; nn = nn->parent) {
- if (MDOC_BLOCK != nn->type)
- continue;
- switch (nn->tok) {
- case (MDOC_Ss):
- /* FALLTHROUGH */
- case (MDOC_Sh):
- c = 1;
- break;
- default:
- break;
- }
- if (nn->prev)
- break;
- }
- if ( ! c)
- bufcat(h, "margin-top: 1em;");
+ bufcat_su(h, "margin-left", &su);
+ for (nn = n; nn && ! comp; nn = nn->parent) {
+ if (MDOC_BLOCK != nn->type)
+ continue;
+ if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
+ comp = 1;
+ if (nn->prev)
+ break;
+ }
+ if (comp) {
+ PAIR_STYLE_INIT(&tag[0], h);
+ print_otag(h, TAG_DIV, 1, tag);
+ return(1);
}
- tag[0].key = ATTR_STYLE;
- tag[0].val = h->buf;
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-top", &su);
+ PAIR_STYLE_INIT(&tag[0], h);
print_otag(h, TAG_DIV, 1, tag);
return(1);
}
- if (MDOC_Unfilled != t && MDOC_Literal != t)
+ if (DISP_unfilled != n->data.Bd->type &&
+ DISP_literal != n->data.Bd->type)
return(1);
- bufcat(h, "white-space: pre;");
- tag[0].key = ATTR_STYLE;
- tag[0].val = h->buf;
- tag[1].key = ATTR_CLASS;
- tag[1].val = "lit";
-
+ PAIR_CLASS_INIT(&tag[0], "lit");
+ bufcat_style(h, "white-space", "pre");
+ PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
for (nn = n->child; nn; nn = nn->next) {
print_mdoc_node(m, nn, h);
- if (NULL == nn->next)
+ if (nn->next && nn->next->line == nn->line)
continue;
- if (nn->prev && nn->prev->line < nn->line)
- print_text(h, "\n");
+ print_text(h, "\n");
+ h->flags |= HTML_NOSPACE;
}
return(0);
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "file";
-
+ PAIR_CLASS_INIT(&tag, "file");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "addr";
+ PAIR_CLASS_INIT(&tag, "addr");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
/* TODO: -split and -nosplit (see termp_an_pre()). */
- tag.key = ATTR_CLASS;
- tag.val = "author";
+ PAIR_CLASS_INIT(&tag, "author");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "config";
+ synopsis_pre(h, n);
+ PAIR_CLASS_INIT(&tag, "config");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "define";
+ PAIR_CLASS_INIT(&tag, "define");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "env";
+ PAIR_CLASS_INIT(&tag, "env");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "errno";
+ PAIR_CLASS_INIT(&tag, "errno");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
struct htmlpair tag;
struct tag *t;
- tag.key = ATTR_CLASS;
- tag.val = "farg";
-
+ PAIR_CLASS_INIT(&tag, "farg");
if (n->parent->tok != MDOC_Fo) {
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
static int
mdoc_fd_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag;
- if (SEC_SYNOPSIS == n->sec) {
- if (n->next && MDOC_Fd != n->next->tok) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em;";
- print_otag(h, TAG_DIV, 1, &tag);
- } else
- print_otag(h, TAG_DIV, 0, NULL);
- }
+ synopsis_pre(h, n);
- tag.key = ATTR_CLASS;
- tag.val = "macro";
+ PAIR_CLASS_INIT(&tag, "macro");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_vt_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag;
- if (SEC_SYNOPSIS == n->sec) {
- if (n->next && MDOC_Vt != n->next->tok) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em;";
- print_otag(h, TAG_DIV, 1, &tag);
- } else
- print_otag(h, TAG_DIV, 0, NULL);
- }
+ if (MDOC_BLOCK == n->type) {
+ synopsis_pre(h, n);
+ return(1);
+ } else if (MDOC_ELEM == n->type) {
+ synopsis_pre(h, n);
+ } else if (MDOC_HEAD == n->type)
+ return(0);
- tag.key = ATTR_CLASS;
- tag.val = "type";
+ PAIR_CLASS_INIT(&tag, "type");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_ft_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- if (SEC_SYNOPSIS == n->sec) {
- if (n->prev && MDOC_Fo == n->prev->tok) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-top: 1em;";
- print_otag(h, TAG_DIV, 1, &tag);
- } else
- print_otag(h, TAG_DIV, 0, NULL);
- }
+ struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "ftype";
+ synopsis_pre(h, n);
+ PAIR_CLASS_INIT(&tag, "ftype");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
const char *sp, *ep;
int sz, i;
- if (SEC_SYNOPSIS == n->sec) {
- bufcat(h, "margin-left: 6em;");
- bufcat(h, "text-indent: -6em;");
- if (n->next)
- bufcat(h, "margin-bottom: 1em;");
- tag[0].key = ATTR_STYLE;
- tag[0].val = h->buf;
- print_otag(h, TAG_DIV, 1, tag);
- }
+ synopsis_pre(h, n);
/* Split apart into type and name. */
assert(n->child->string);
sp = n->child->string;
- if ((ep = strchr(sp, ' '))) {
- tag[0].key = ATTR_CLASS;
- tag[0].val = "ftype";
-
+ ep = strchr(sp, ' ');
+ if (NULL != ep) {
+ PAIR_CLASS_INIT(&tag[0], "ftype");
t = print_otag(h, TAG_SPAN, 1, tag);
while (ep) {
print_tagq(h, t);
}
- tag[0].key = ATTR_CLASS;
- tag[0].val = "fname";
+ PAIR_CLASS_INIT(&tag[0], "fname");
+
+ /*
+ * FIXME: only refer to IDs that we know exist.
+ */
+
+#if 0
+ if (MDOC_SYNPRETTY & n->flags) {
+ 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);
}
h->flags |= HTML_NOSPACE;
print_text(h, "(");
+ bufinit(h);
+ PAIR_CLASS_INIT(&tag[0], "farg");
+ bufcat_style(h, "white-space", "nowrap");
+ PAIR_STYLE_INIT(&tag[1], h);
+
for (nn = n->child->next; nn; nn = nn->next) {
- i = 0;
- tag[i].key = ATTR_CLASS;
- tag[i++].val = "farg";
- if (SEC_SYNOPSIS == n->sec) {
- tag[i].key = ATTR_STYLE;
- tag[i++].val = "white-space: nowrap;";
- }
-
+ i = 1;
+ if (MDOC_SYNPRETTY & n->flags)
+ i = 2;
t = print_otag(h, TAG_SPAN, i, tag);
print_text(h, nn->string);
print_tagq(h, t);
}
print_text(h, ")");
-
- if (SEC_SYNOPSIS == n->sec)
+ if (MDOC_SYNPRETTY & n->flags)
print_text(h, ";");
return(0);
}
+/* ARGSUSED */
+static int
+mdoc_sm_pre(MDOC_ARGS)
+{
+
+ assert(n->child && MDOC_TEXT == n->child->type);
+ if (0 == strcmp("on", n->child->string)) {
+ /* FIXME: no p->col to check... */
+ h->flags &= ~HTML_NOSPACE;
+ h->flags &= ~HTML_NONOSPACE;
+ } else
+ h->flags |= HTML_NONOSPACE;
+
+ return(0);
+}
+
+
/* ARGSUSED */
static int
mdoc_sp_pre(MDOC_ARGS)
{
- int len;
- struct htmlpair tag;
+ int len;
+ struct htmlpair tag;
+ struct roffsu su;
switch (n->tok) {
case (MDOC_sp):
+ /* FIXME: can this have a scaling indicator? */
len = n->child ? atoi(n->child->string) : 1;
break;
case (MDOC_br):
len = 0;
break;
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;
break;
}
- buffmt(h, "height: %dem", len);
- tag.key = ATTR_STYLE;
- tag.val = h->buf;
+ SCALE_VS_INIT(&su, len);
+ 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);
}
nn = n->child;
- tag[0].key = ATTR_CLASS;
- tag[0].val = "link-ext";
- tag[1].key = ATTR_HREF;
- tag[1].val = nn->string;
-
+ PAIR_CLASS_INIT(&tag[0], "link-ext");
+ PAIR_HREF_INIT(&tag[1], nn->string);
print_otag(h, TAG_A, 2, tag);
- if (NULL == nn->next)
+ if (NULL == nn->next)
return(1);
for (nn = nn->next; nn; nn = nn->next)
struct tag *t;
const struct mdoc_node *nn;
- tag[0].key = ATTR_CLASS;
- tag[0].val = "link-mail";
+ PAIR_CLASS_INIT(&tag[0], "link-mail");
for (nn = n->child; nn; nn = nn->next) {
bufinit(h);
bufcat(h, "mailto:");
bufcat(h, nn->string);
-
- tag[1].key = ATTR_HREF;
- tag[1].val = h->buf;
-
+ PAIR_HREF_INIT(&tag[1], h->buf);
t = print_otag(h, TAG_A, 2, tag);
print_text(h, nn->string);
print_tagq(h, t);
static int
mdoc_fo_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag;
+ struct tag *t;
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) {
+ synopsis_pre(h, n);
return(1);
+ }
- tag.key = ATTR_CLASS;
- tag.val = "fname";
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ /* XXX: we drop non-initial arguments as per groff. */
+
+ assert(n->child);
+ assert(n->child->string);
+
+ PAIR_CLASS_INIT(&tag, "fname");
+ t = print_otag(h, TAG_SPAN, 1, &tag);
+ print_text(h, n->child->string);
+ print_tagq(h, t);
+ return(0);
}
static void
mdoc_fo_post(MDOC_ARGS)
{
+
if (MDOC_BODY != n->type)
return;
h->flags |= HTML_NOSPACE;
mdoc_in_pre(MDOC_ARGS)
{
const struct mdoc_node *nn;
- struct htmlpair tag[2];
struct tag *t;
+ struct htmlpair tag[2];
int i;
- if (SEC_SYNOPSIS == n->sec) {
- if (n->next && MDOC_In != n->next->tok) {
- tag[0].key = ATTR_STYLE;
- tag[0].val = "margin-bottom: 1em;";
- print_otag(h, TAG_DIV, 1, tag);
- } else
- print_otag(h, TAG_DIV, 0, NULL);
- }
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "includes";
+ synopsis_pre(h, n);
+ PAIR_CLASS_INIT(&tag[0], "includes");
print_otag(h, TAG_SPAN, 1, tag);
- if (SEC_SYNOPSIS == n->sec)
+ if (MDOC_SYNPRETTY & n->flags && 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) {
- assert(MDOC_TEXT == nn->type);
- i = 0;
- tag[i].key = ATTR_CLASS;
- tag[i++].val = "link-includes";
+ 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;
- tag[i++].val = h->buf;
+ PAIR_HREF_INIT(&tag[i], h->buf);
+ i++;
}
t = print_otag(h, TAG_A, i, tag);
print_mdoc_node(m, nn, h);
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "cmd";
-
+ PAIR_CLASS_INIT(&tag, "cmd");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
struct tag *t;
print_otag(h, TAG_DIV, 0, NULL);
-
print_text(h, "The");
for (nn = n->child; nn; nn = nn->next) {
- tag.key = ATTR_CLASS;
- tag.val = "fname";
+ PAIR_CLASS_INIT(&tag, "fname");
t = print_otag(h, TAG_SPAN, 1, &tag);
print_text(h, nn->string);
print_tagq(h, t);
print_text(h, "()");
}
- if (n->child->next)
+ if (n->child && n->child->next)
print_text(h, "functions return");
else
print_text(h, "function returns");
print_text(h, "the value 0 if successful; otherwise the value "
"-1 is returned and the global variable");
- tag.key = ATTR_CLASS;
- tag.val = "var";
+ PAIR_CLASS_INIT(&tag, "var");
t = print_otag(h, TAG_SPAN, 1, &tag);
print_text(h, "errno");
print_tagq(h, t);
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "var";
+ PAIR_CLASS_INIT(&tag, "var");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_bf_pre(MDOC_ARGS)
{
- int i;
- struct htmlpair tag[2];
+ struct htmlpair tag[2];
+ struct roffsu su;
if (MDOC_HEAD == n->type)
return(0);
- else if (MDOC_BLOCK != n->type)
+ else if (MDOC_BODY != n->type)
return(1);
- tag[0].key = ATTR_CLASS;
- tag[0].val = NULL;
+ assert(n->data.Bf);
- if (n->head->child) {
- if ( ! strcmp("Em", n->head->child->string))
- tag[0].val = "emph";
- else if ( ! strcmp("Sy", n->head->child->string))
- tag[0].val = "symb";
- else if ( ! strcmp("Li", n->head->child->string))
- tag[0].val = "lit";
- } else {
- assert(n->args);
- for (i = 0; i < (int)n->args->argc; i++)
- switch (n->args->argv[i].arg) {
- case (MDOC_Symbolic):
- tag[0].val = "symb";
- break;
- case (MDOC_Literal):
- tag[0].val = "lit";
- break;
- case (MDOC_Emphasis):
- tag[0].val = "emph";
- break;
- default:
- break;
- }
- }
-
- /* FIXME: div's have spaces stripped--we want them. */
-
- assert(tag[0].val);
- tag[1].key = ATTR_STYLE;
- tag[1].val = "display: inline; margin-right: 1em;";
+ if (FONT_Em == n->data.Bf->font)
+ PAIR_CLASS_INIT(&tag[0], "emph");
+ else if (FONT_Sy == n->data.Bf->font)
+ PAIR_CLASS_INIT(&tag[0], "symb");
+ else if (FONT_Li == n->data.Bf->font)
+ PAIR_CLASS_INIT(&tag[0], "lit");
+ else
+ PAIR_CLASS_INIT(&tag[0], "none");
+
+ /*
+ * We want this to be inline-formatted, but needs to be div to
+ * accept block children.
+ */
+ bufcat_style(h, "display", "inline");
+ SCALE_HS_INIT(&su, 1);
+ /* Needs a left-margin for spacing. */
+ bufcat_su(h, "margin-left", &su);
+ PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "symb";
+ PAIR_CLASS_INIT(&tag, "symb");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
static int
mdoc_rs_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag;
+ struct roffsu su;
if (MDOC_BLOCK != n->type)
return(1);
if (n->prev && SEC_SEE_ALSO == n->sec) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-top: 1em;";
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-top", &su);
+ PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, 1, &tag);
}
- tag.key = ATTR_CLASS;
- tag.val = "ref";
+ PAIR_CLASS_INIT(&tag, "ref");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "lit";
-
+ PAIR_CLASS_INIT(&tag, "lit");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "symb";
-
+ PAIR_CLASS_INIT(&tag, "symb");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "lib";
-
- 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);
return(1);
}
static int
mdoc__x_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- tag.key = ATTR_CLASS;
+ struct htmlpair tag[2];
switch (n->tok) {
case(MDOC__A):
- tag.val = "ref-auth";
+ PAIR_CLASS_INIT(&tag[0], "ref-auth");
break;
case(MDOC__B):
- tag.val = "ref-book";
+ PAIR_CLASS_INIT(&tag[0], "ref-book");
break;
case(MDOC__C):
- tag.val = "ref-city";
+ PAIR_CLASS_INIT(&tag[0], "ref-city");
break;
case(MDOC__D):
- tag.val = "ref-date";
+ PAIR_CLASS_INIT(&tag[0], "ref-date");
break;
case(MDOC__I):
- tag.val = "ref-issue";
+ PAIR_CLASS_INIT(&tag[0], "ref-issue");
break;
case(MDOC__J):
- tag.val = "ref-jrnl";
+ PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
break;
case(MDOC__N):
- tag.val = "ref-num";
+ PAIR_CLASS_INIT(&tag[0], "ref-num");
break;
case(MDOC__O):
- tag.val = "ref-opt";
+ PAIR_CLASS_INIT(&tag[0], "ref-opt");
break;
case(MDOC__P):
- tag.val = "ref-page";
+ PAIR_CLASS_INIT(&tag[0], "ref-page");
break;
case(MDOC__Q):
- tag.val = "ref-corp";
+ PAIR_CLASS_INIT(&tag[0], "ref-corp");
break;
case(MDOC__R):
- tag.val = "ref-rep";
+ PAIR_CLASS_INIT(&tag[0], "ref-rep");
break;
case(MDOC__T):
- print_text(h, "\\(lq");
- h->flags |= HTML_NOSPACE;
- tag.val = "ref-title";
+ PAIR_CLASS_INIT(&tag[0], "ref-title");
+ break;
+ case(MDOC__U):
+ PAIR_CLASS_INIT(&tag[0], "link-ref");
break;
case(MDOC__V):
- tag.val = "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);
}
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;
+ print_text(h, n->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+ switch (n->type) {
+ case (MDOC_BLOCK):
break;
- default:
+ case (MDOC_HEAD):
+ return(0);
+ case (MDOC_BODY):
+ h->flags |= HTML_PREKEEP;
break;
+ default:
+ abort();
+ /* NOTREACHED */
}
- print_text(h, n->next ? "," : ".");
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+ if (MDOC_BODY == n->type)
+ h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
}
git.ckatri.com / mandoc.git / blobdiff