-/* $Id: mdoc_html.c,v 1.11 2009/09/25 12:43:05 kristaps Exp $ */
+/* $Id: mdoc_html.c,v 1.43 2009/10/30 18:53:08 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
*/
#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 "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
struct htmlmdoc {
int (*pre)(MDOC_ARGS);
static void print_mdoc_node(MDOC_ARGS);
static void print_mdoc_nodelist(MDOC_ARGS);
-static int a2width(const char *);
-static int a2offs(const char *);
+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_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_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, int, int,
+ struct roffsu *, struct roffsu *);
+static int mdoc_it_head_pre(MDOC_ARGS, int,
+ struct roffsu *);
+static int mdoc_it_body_pre(MDOC_ARGS, int);
static int mdoc_it_pre(MDOC_ARGS);
static int mdoc_lb_pre(MDOC_ARGS);
static int mdoc_li_pre(MDOC_ARGS);
{mdoc__x_pre, mdoc__x_post}, /* %Q */
{mdoc_sp_pre, NULL}, /* br */
{mdoc_sp_pre, NULL}, /* sp */
+ {mdoc__x_pre, mdoc__x_post}, /* %U */
};
-static char buf[BUFSIZ]; /* XXX */
-
-#define bufcat(x) (void)strlcat(buf, (x), BUFSIZ)
-#define bufinit() buf[0] = 0
-#define buffmt(...) (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__)
void
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(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):
}
-static int
-a2width(const char *p)
+/*
+ * 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)
{
- int i, len;
- 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) + 2);
-
- return(len + 2);
+ if ( ! a2roffsu(p, su, SCALE_MAX)) {
+ su->unit = SCALE_EM;
+ su->scale = (int)strlen(p);
+ }
}
-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);
-
- 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));
+ /* FIXME: "right"? */
- 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(%d)", 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);
-
- bufinit();
+ t = h->tags.head;
+ bufinit(h);
switch (n->type) {
case (MDOC_ROOT):
child = mdoc_root_pre(m, n, h);
print_stagq(h, t);
- bufinit();
-
+ bufinit(h);
switch (n->type) {
case (MDOC_ROOT):
mdoc_root_post(m, n, h);
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);
- 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);
+ /* 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);
+
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(nn->string);
- if (nn->next)
- bufcat(" ");
- }
- tag[0].key = ATTR_NAME;
- tag[0].val = 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("margin-top: 1em;");
+
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-top", &su);
if (NULL == n->next)
- bufcat("margin-bottom: 1em;");
-
- tag[1].key = ATTR_STYLE;
- tag[1].val = buf;
+ bufcat_su(h, "margin-bottom", &su);
+ PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
- buffmt("margin-left: %dem;", INDENT);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "sec-body";
- tag[1].key = ATTR_STYLE;
- tag[1].val = 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);
+ }
+ /*
+ * 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;
+ tag[1].val = 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("margin-bottom: 1em;");
- tag[i].key = ATTR_STYLE;
- tag[i++].val = 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("margin-top: 1em;");
- tag[i].key = ATTR_STYLE;
- tag[i++].val = 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("margin-left: -%dem;", INDENT - HALFINDENT);
+ /* TODO: see note in mdoc_sh_pre() about duplicates. */
- tag[0].key = ATTR_CLASS;
- tag[0].val = "ssec-head";
- tag[1].key = ATTR_STYLE;
- tag[1].val = buf;
-
- print_otag(h, TAG_DIV, 2, tag);
- print_otag(h, TAG_SPAN, 1, tag);
-
- bufinit();
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
- bufcat(nn->string);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- bufcat(" ");
+ html_idcat(buf, " ", BUFSIZ);
}
- tag[0].key = ATTR_NAME;
- tag[0].val = 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);
+ tag[2].key = ATTR_ID;
+ tag[2].val = 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, "\\-");
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);
}
if ( ! (HTML_NEWLINE & h->flags))
if (SEC_SYNOPSIS == n->sec) {
- tag.key = ATTR_STYLE;
- tag.val = "clear: both;";
+ bufcat_style(h, "clear", "both");
+ PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_BR, 1, &tag);
}
- tag.key = ATTR_CLASS;
- tag.val = "name";
-
+ PAIR_CLASS_INIT(&tag, "name");
print_otag(h, TAG_SPAN, 1, &tag);
if (NULL == n->child)
print_text(h, m->name);
mdoc_xr_pre(MDOC_ARGS)
{
struct htmlpair tag[2];
- const char *name, *sec;
const struct mdoc_node *nn;
- nn = n->child;
- name = nn && nn->string ? nn->string : "";
- nn = nn ? nn->next : NULL;
- sec = nn && nn->string ? nn->string : "";
+ PAIR_CLASS_INIT(&tag[0], "link-man");
- buffmt("%s%s%s.html", name, name && sec ? "." : "", sec);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "link-man";
- tag[1].key = ATTR_HREF;
- tag[1].val = buf;
- print_otag(h, TAG_A, 2, tag);
+ if (h->base_man) {
+ buffmt_man(h, n->child->string,
+ n->child->next ?
+ n->child->next->string : NULL);
+ tag[1].key = ATTR_HREF;
+ tag[1].val = 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);
+
if (NULL == (nn = nn->next))
return(0);
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);
}
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, int type, int comp,
+ struct roffsu *offs, struct roffsu *width)
{
- struct htmlpair tag;
+ 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("margin-left: %dem; clear: both;", o);
- break;
- default:
- buffmt("margin-left: %dem; clear: both;", w + o);
- break;
+ nn = n->parent->parent;
+ assert(nn->args);
+
+ /* XXX: see notes in mdoc_it_pre(). */
+
+ if (MDOC_Column == type) {
+ /* Don't width-pad on the left. */
+ SCALE_HS_INIT(width, 0);
+ /* Also disallow non-compact. */
+ comp = 1;
+ }
+ if (MDOC_Diag == type)
+ /* Mandate non-compact with empty prior. */
+ if (n->prev && NULL == n->prev->body->child)
+ comp = 1;
+
+ 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;
}
- if ( ! c && MDOC_Column != t) {
- if (n->prev && n->prev->body->child)
- bufcat("padding-top: 1em;");
- else if (NULL == n->prev)
- bufcat("padding-top: 1em;");
+ if ( ! comp) {
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "padding-top", &su);
}
- tag.key = ATTR_STYLE;
- tag.val = buf;
+ 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, int type)
{
+ struct htmlpair tag;
+ struct roffsu su;
+
+ switch (type) {
+ case (MDOC_Item):
+ /* FALLTHROUGH */
+ case (MDOC_Ohang):
+ /* FALLTHROUGH */
+ case (MDOC_Column):
+ 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, int type, struct roffsu *width)
{
struct htmlpair tag;
struct ord *ord;
char nbuf[BUFSIZ];
- switch (t) {
+ switch (type) {
case (MDOC_Item):
/* FALLTHROUGH */
case (MDOC_Ohang):
- print_otag(h, TAG_DIV, 0, NULL);
- break;
+ return(0);
case (MDOC_Column):
- buffmt("min-width: %dem;", w);
- bufcat("clear: none;");
+ bufcat_su(h, "min-width", width);
+ bufcat_style(h, "clear", "none");
if (n->next && MDOC_HEAD == n->next->type)
- bufcat("float: left;");
- tag.key = ATTR_STYLE;
- tag.val = buf;
+ bufcat_style(h, "float", "left");
+ PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, 1, &tag);
break;
default:
- buffmt("margin-left: -%dem; min-width: %dem;",
- w, w ? w - 1 : 0);
- bufcat("clear: left;");
+ bufcat_su(h, "min-width", width);
+ SCALE_INVERT(width);
+ bufcat_su(h, "margin-left", width);
if (n->next && n->next->child)
- bufcat("float: left;");
- bufcat("padding-right: 1em;");
- tag.key = ATTR_STYLE;
- tag.val = 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) {
+ switch (type) {
case (MDOC_Diag):
- tag.key = ATTR_CLASS;
- tag.val = "diag";
+ PAIR_CLASS_INIT(&tag, "diag");
print_otag(h, TAG_SPAN, 1, &tag);
break;
case (MDOC_Enum):
- ord = SLIST_FIRST(&h->ords);
+ ord = h->ords.head;
assert(ord);
nbuf[BUFSIZ - 1] = 0;
(void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
+mdoc_it_pre(MDOC_ARGS)
{
- int i, w, o, c, wp;
+ int i, type, wp, comp;
const struct mdoc_node *bl, *nn;
+ struct roffsu width, offs;
+
+ /*
+ * 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;
- /* FIXME: fmt_vspace() equivalent. */
+ type = a2list(bl);
- assert(bl->args);
+ /* Set default width and offset. */
- 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);
switch (type) {
case (MDOC_Enum):
case (MDOC_Hyphen):
/* FALLTHROUGH */
case (MDOC_Bullet):
- if (w < 4)
- w = 4;
+ SCALE_HS_INIT(&width, 2);
+ break;
+ default:
+ SCALE_HS_INIT(&width, INDENT);
break;
+ }
+
+ /* Get width, offset, and compact arguments. */
+
+ for (wp = -1, comp = i = 0; i < (int)bl->args->argc; i++)
+ switch (bl->args->argv[i].arg) {
+ case (MDOC_Column):
+ wp = i; /* Save for later. */
+ break;
+ case (MDOC_Width):
+ a2width(bl->args->argv[i].value[0], &width);
+ break;
+ case (MDOC_Offset):
+ a2offs(bl->args->argv[i].value[0], &offs);
+ break;
+ case (MDOC_Compact):
+ comp = 1;
+ break;
+ default:
+ break;
+ }
+
+ /* Override width in some cases. */
+
+ switch (type) {
+ case (MDOC_Item):
+ /* FALLTHROUGH */
case (MDOC_Inset):
/* FALLTHROUGH */
case (MDOC_Diag):
- w = 1;
+ SCALE_HS_INIT(&width, 0);
break;
default:
- if (0 == w)
- w = 10;
+ if (0 == width.scale)
+ SCALE_HS_INIT(&width, INDENT);
break;
}
- switch (n->type) {
- case (MDOC_BLOCK):
- 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 */
+ /* Flip to body/block processing. */
+
+ 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;
+ for (i = 0; nn && nn != n; nn = nn->next, i++)
+ /* Counter... */ ;
+ if (i < (int)bl->args->argv[wp].sz)
+ a2width(bl->args->argv[wp].value[i], &width);
}
- return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
+ return(mdoc_it_head_pre(m, n, h, type, &width));
}
return(1);
ord = malloc(sizeof(struct ord));
- if (NULL == ord)
- err(EXIT_FAILURE, "malloc");
+ if (NULL == ord) {
+ fprintf(stderr, "memory exhausted\n");
+ 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);
}
if (MDOC_Enum != a2list(n))
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);
{
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("margin-left: %dem;", INDENT);
-
- tag[0].key = ATTR_CLASS;
- tag[0].val = "lit";
- tag[1].key = ATTR_STYLE;
- tag[1].val = 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("#");
+ /* FIXME: duplicates? */
+
+ strlcpy(buf, "#", BUFSIZ);
for (nn = n->child; nn; nn = nn->next) {
- bufcat(nn->string);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- bufcat(" ");
+ html_idcat(buf, " ", BUFSIZ);
}
- tag[0].key = ATTR_HREF;
- tag[0].val = buf;
- tag[1].key = ATTR_CLASS;
- tag[1].val = "link-sec";
+ PAIR_CLASS_INIT(&tag[0], "link-sec");
+ tag[1].key = ATTR_HREF;
+ tag[1].val = 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;
-
- /* FIXME: fmt_vspace() shit. */
+ int type, comp, i;
+ const struct mdoc_node *bl, *nn;
+ struct roffsu su;
if (MDOC_BLOCK == n->type)
bl = n;
else
bl = n->parent;
- t = o = c = 0;
+ SCALE_VS_INIT(&su, 0);
+ type = comp = 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]);
+ a2offs(bl->args->argv[i].value[0], &su);
break;
case (MDOC_Compact):
- c = 1;
+ comp = 1;
break;
+ case (MDOC_Centred):
+ /* FALLTHROUGH */
case (MDOC_Ragged):
/* FALLTHROUGH */
case (MDOC_Filled):
case (MDOC_Unfilled):
/* FALLTHROUGH */
case (MDOC_Literal):
- t = bl->args->argv[i].arg;
+ type = bl->args->argv[i].arg;
+ break;
+ default:
break;
}
+ /* FIXME: -centered, etc. formatting. */
+
if (MDOC_BLOCK == n->type) {
- if (o)
- buffmt("margin-left: %dem;", o);
- bufcat("margin-top: 1em;");
- tag[0].key = ATTR_STYLE;
- tag[0].val = buf;
+ 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) {
+ print_otag(h, TAG_DIV, 0, tag);
+ return(1);
+ }
+ 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);
}
- switch (t) {
- case (MDOC_Unfilled):
- case (MDOC_Literal):
- break;
- default:
+ if (MDOC_Unfilled != type && MDOC_Literal != type)
return(1);
- }
-
- bufcat("white-space: pre;");
- tag[0].key = ATTR_STYLE;
- tag[0].val = 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 (n = n->child; n; n = n->next) {
+ for (nn = n->child; nn; nn = nn->next) {
h->flags |= HTML_NOSPACE;
- print_mdoc_node(m, n, h);
- if (n->next)
+ print_mdoc_node(m, nn, h);
+ if (NULL == nn->next)
+ continue;
+ if (nn->prev && nn->prev->line < nn->line)
+ print_text(h, "\n");
+ else if (NULL == nn->prev)
print_text(h, "\n");
}
{
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);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "author";
+ /* TODO: -split and -nosplit (see termp_an_pre()). */
+
+ PAIR_CLASS_INIT(&tag, "author");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
{
struct htmlpair tag;
- tag.key = ATTR_CLASS;
- tag.val = "config";
+ print_otag(h, TAG_DIV, 0, NULL);
+ 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;
+ struct roffsu su;
if (SEC_SYNOPSIS == n->sec) {
if (n->next && MDOC_Fd != n->next->tok) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em;";
+ 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);
}
- 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;
+ struct roffsu su;
if (SEC_SYNOPSIS == n->sec) {
if (n->next && MDOC_Vt != n->next->tok) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em;";
+ 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);
}
- 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;
+ struct htmlpair tag;
+ struct roffsu su;
if (SEC_SYNOPSIS == n->sec) {
if (n->prev && MDOC_Fo == n->prev->tok) {
- 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);
} else
print_otag(h, TAG_DIV, 0, NULL);
}
- tag.key = ATTR_CLASS;
- tag.val = "ftype";
+ PAIR_CLASS_INIT(&tag, "ftype");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
mdoc_fn_pre(MDOC_ARGS)
{
struct tag *t;
- struct htmlpair tag;
+ struct htmlpair tag[2];
const struct mdoc_node *nn;
char nbuf[BUFSIZ];
const char *sp, *ep;
- int sz;
+ int sz, i;
+ struct roffsu su;
if (SEC_SYNOPSIS == n->sec) {
+ SCALE_HS_INIT(&su, INDENT);
+ bufcat_su(h, "margin-left", &su);
+ su.scale = -su.scale;
+ bufcat_su(h, "text-indent", &su);
if (n->next) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em";
- print_otag(h, TAG_DIV, 1, &tag);
- } else
- print_otag(h, TAG_DIV, 0, NULL);
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-bottom", &su);
+ }
+ PAIR_STYLE_INIT(&tag[0], h);
+ print_otag(h, TAG_DIV, 1, tag);
}
/* Split apart into type and name. */
-
- tag.key = ATTR_CLASS;
- tag.val = "ftype";
- t = print_otag(h, TAG_SPAN, 1, &tag);
-
assert(n->child->string);
sp = n->child->string;
- while ((ep = strchr(sp, ' '))) {
- sz = MIN((int)(ep - sp), BUFSIZ - 1);
- (void)memcpy(nbuf, sp, (size_t)sz);
- nbuf[sz] = '\0';
- print_text(h, nbuf);
- sp = ++ep;
+
+ ep = strchr(sp, ' ');
+ if (NULL != ep) {
+ PAIR_CLASS_INIT(&tag[0], "ftype");
+ t = print_otag(h, TAG_SPAN, 1, tag);
+
+ while (ep) {
+ sz = MIN((int)(ep - sp), BUFSIZ - 1);
+ (void)memcpy(nbuf, sp, (size_t)sz);
+ nbuf[sz] = '\0';
+ print_text(h, nbuf);
+ sp = ++ep;
+ ep = strchr(sp, ' ');
+ }
+ print_tagq(h, t);
}
- print_tagq(h, t);
-
- tag.key = ATTR_CLASS;
- tag.val = "fname";
- t = print_otag(h, TAG_SPAN, 1, &tag);
+ PAIR_CLASS_INIT(&tag[0], "fname");
+ t = print_otag(h, TAG_SPAN, 1, tag);
if (sp) {
(void)strlcpy(nbuf, sp, BUFSIZ);
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) {
- tag.key = ATTR_CLASS;
- tag.val = "farg";
- t = print_otag(h, TAG_SPAN, 1, &tag);
+ i = 1;
+ if (SEC_SYNOPSIS == n->sec)
+ i = 2;
+ t = print_otag(h, TAG_SPAN, i, tag);
print_text(h, nn->string);
print_tagq(h, t);
if (nn->next)
}
print_text(h, ")");
-
if (SEC_SYNOPSIS == n->sec)
print_text(h, ";");
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):
break;
}
- buffmt("height: %dem", len);
- tag.key = ATTR_STYLE;
- tag.val = 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";
+ PAIR_CLASS_INIT(&tag[0], "link-ext");
tag[1].key = ATTR_HREF;
tag[1].val = 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();
- bufcat("mailto:");
- bufcat(nn->string);
-
- tag[1].key = ATTR_HREF;
- tag[1].val = buf;
-
+ bufinit(h);
+ bufcat(h, "mailto:");
+ bufcat(h, nn->string);
+ PAIR_STYLE_INIT(&tag[1], h);
t = print_otag(h, TAG_A, 2, tag);
print_text(h, nn->string);
print_tagq(h, t);
} else if (MDOC_BLOCK == n->type)
return(1);
- tag.key = ATTR_CLASS;
- tag.val = "fname";
+ PAIR_CLASS_INIT(&tag, "fname");
print_otag(h, TAG_SPAN, 1, &tag);
return(1);
}
mdoc_in_pre(MDOC_ARGS)
{
const struct mdoc_node *nn;
- struct htmlpair tag;
+ 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) {
- tag.key = ATTR_STYLE;
- tag.val = "margin-bottom: 1em;";
- print_otag(h, TAG_DIV, 1, &tag);
+ 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);
}
- tag.key = ATTR_CLASS;
- tag.val = "includes";
+ /* FIXME: there's a buffer bug in here somewhere. */
- print_otag(h, TAG_SPAN, 1, &tag);
+ PAIR_CLASS_INIT(&tag[0], "includes");
+ print_otag(h, TAG_SPAN, 1, tag);
if (SEC_SYNOPSIS == n->sec)
print_text(h, "#include");
/* 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");
+ i = 1;
+ bufinit(h);
+ if (h->base_includes) {
+ buffmt_includes(h, nn->string);
+ tag[i].key = ATTR_HREF;
+ tag[i++].val = h->buf;
+ }
+ t = print_otag(h, TAG_A, i, tag);
print_mdoc_node(m, nn, h);
+ print_tagq(h, t);
+ }
h->flags |= HTML_NOSPACE;
print_text(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, "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];
+ int i;
+ struct htmlpair tag[2];
+ struct roffsu su;
if (MDOC_HEAD == n->type)
return(0);
else if (MDOC_BLOCK != n->type)
return(1);
- tag[0].key = ATTR_CLASS;
- tag[0].val = NULL;
+ PAIR_CLASS_INIT(&tag[0], "lit");
if (n->head->child) {
if ( ! strcmp("Em", n->head->child->string))
- tag[0].val = "emph";
+ PAIR_CLASS_INIT(&tag[0], "emph");
else if ( ! strcmp("Sy", n->head->child->string))
- tag[0].val = "symb";
+ PAIR_CLASS_INIT(&tag[0], "symb");
else if ( ! strcmp("Li", n->head->child->string))
- tag[0].val = "lit";
+ PAIR_CLASS_INIT(&tag[0], "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";
+ PAIR_CLASS_INIT(&tag[0], "symb");
break;
case (MDOC_Literal):
- tag[0].val = "lit";
+ PAIR_CLASS_INIT(&tag[0], "lit");
break;
case (MDOC_Emphasis):
- tag[0].val = "emph";
+ PAIR_CLASS_INIT(&tag[0], "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;";
+ bufcat_style(h, "display", "inline");
+ SCALE_HS_INIT(&su, 1);
+ bufcat_su(h, "margin-right", &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)
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):
+ PAIR_CLASS_INIT(&tag[0], "ref-title");
print_text(h, "\\(lq");
h->flags |= HTML_NOSPACE;
- tag.val = "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);
}
git.ckatri.com / mandoc.git / blobdiff