-/* $Id: mdoc_html.c,v 1.172 2011/07/04 09:42:38 kristaps Exp $ */
+/* $Id: mdoc_html.c,v 1.186 2013/12/24 20:45:27 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
#include "main.h"
#define INDENT 5
-#define HALFINDENT 3
-#define MDOC_ARGS const struct mdoc_meta *m, \
+#define MDOC_ARGS const struct mdoc_meta *meta, \
const struct mdoc_node *n, \
struct html *h
{NULL, NULL}, /* Ec */ /* FIXME: no space */
{NULL, NULL}, /* Ef */
{mdoc_em_pre, NULL}, /* Em */
- {NULL, NULL}, /* Eo */
+ {mdoc_quote_pre, mdoc_quote_post}, /* Eo */
{mdoc_xx_pre, NULL}, /* Fx */
{mdoc_ms_pre, NULL}, /* Ms */
{mdoc_igndelim_pre, NULL}, /* No */
};
void
-html_mdoc(void *arg, const struct mdoc *m)
+html_mdoc(void *arg, const struct mdoc *mdoc)
{
- struct html *h;
- struct tag *t;
-
- h = (struct html *)arg;
-
- 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);
- printf("\n");
+ print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc),
+ (struct html *)arg);
+ putchar('\n');
}
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_BU;
- su->scale = html_strlen(p);
- }
+ else if ( ! a2roffsu(p, su, SCALE_MAX))
+ SCALE_HS_INIT(su, html_strlen(p));
}
static void
print_mdoc(MDOC_ARGS)
{
- struct tag *t;
+ struct tag *t, *tt;
+ struct htmlpair tag;
- t = print_otag(h, TAG_HEAD, 0, NULL);
- print_mdoc_head(m, n, h);
- print_tagq(h, t);
+ PAIR_CLASS_INIT(&tag, "mandoc");
- t = print_otag(h, TAG_BODY, 0, NULL);
- print_mdoc_nodelist(m, n, h);
+ if ( ! (HTML_FRAGMENT & h->oflags)) {
+ print_gen_decls(h);
+ t = print_otag(h, TAG_HTML, 0, NULL);
+ tt = print_otag(h, TAG_HEAD, 0, NULL);
+ print_mdoc_head(meta, n, h);
+ print_tagq(h, tt);
+ print_otag(h, TAG_BODY, 0, NULL);
+ print_otag(h, TAG_DIV, 1, &tag);
+ } else
+ t = print_otag(h, TAG_DIV, 1, &tag);
+
+ print_mdoc_nodelist(meta, n, h);
print_tagq(h, t);
}
print_gen_head(h);
bufinit(h);
- bufcat_fmt(h, "%s(%s)", m->title, m->msec);
+ bufcat_fmt(h, "%s(%s)", meta->title, meta->msec);
- if (m->arch)
- bufcat_fmt(h, " (%s)", m->arch);
+ if (meta->arch)
+ bufcat_fmt(h, " (%s)", meta->arch);
print_otag(h, TAG_TITLE, 0, NULL);
print_text(h, h->buf);
print_mdoc_nodelist(MDOC_ARGS)
{
- print_mdoc_node(m, n, h);
+ print_mdoc_node(meta, n, h);
if (n->next)
- print_mdoc_nodelist(m, n->next, h);
+ print_mdoc_nodelist(meta, n->next, h);
}
{
int child;
struct tag *t;
- struct htmlpair tag;
child = 1;
t = h->tags.head;
switch (n->type) {
case (MDOC_ROOT):
- child = mdoc_root_pre(m, n, h);
+ child = mdoc_root_pre(meta, n, h);
break;
case (MDOC_TEXT):
/* No tables in this mode... */
h->flags |= HTML_NOSPACE;
return;
case (MDOC_EQN):
- PAIR_CLASS_INIT(&tag, "eqn");
- print_otag(h, TAG_SPAN, 1, &tag);
- print_text(h, n->eqn->data);
+ print_eqn(h, n->eqn);
break;
case (MDOC_TBL):
/*
assert(NULL == h->tblt);
if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
- child = (*mdocs[n->tok].pre)(m, n, h);
+ child = (*mdocs[n->tok].pre)(meta, n, h);
break;
}
if (HTML_KEEP & h->flags) {
- if (n->prev && n->prev->line != n->line) {
+ if (n->prev ? (n->prev->lastline != n->line) :
+ (n->parent && n->parent->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_mdoc_nodelist(meta, n->child, h);
print_stagq(h, t);
switch (n->type) {
case (MDOC_ROOT):
- mdoc_root_post(m, n, h);
+ mdoc_root_post(meta, n, h);
break;
case (MDOC_EQN):
break;
default:
if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
- (*mdocs[n->tok].post)(m, n, h);
+ (*mdocs[n->tok].post)(meta, n, h);
break;
}
}
PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
PAIR_CLASS_INIT(&tag[1], "foot");
- if (NULL == h->style) {
- PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
- t = print_otag(h, TAG_TABLE, 3, tag);
- PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
- print_otag(h, TAG_COL, 1, tag);
- print_otag(h, TAG_COL, 1, tag);
- } else
- t = print_otag(h, TAG_TABLE, 2, tag);
+ PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+ t = print_otag(h, TAG_TABLE, 3, tag);
+ PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+ print_otag(h, TAG_COL, 1, tag);
+ print_otag(h, TAG_COL, 1, tag);
- t = print_otag(h, TAG_TBODY, 0, NULL);
+ print_otag(h, TAG_TBODY, 0, NULL);
tt = print_otag(h, TAG_TR, 0, NULL);
PAIR_CLASS_INIT(&tag[0], "foot-date");
print_otag(h, TAG_TD, 1, tag);
-
- print_text(h, m->date);
+ print_text(h, meta->date);
print_stagq(h, tt);
PAIR_CLASS_INIT(&tag[0], "foot-os");
- if (NULL == h->style) {
- PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
- print_otag(h, TAG_TD, 2, tag);
- } else
- print_otag(h, TAG_TD, 1, tag);
-
- print_text(h, m->os);
+ PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+ print_otag(h, TAG_TD, 2, tag);
+ print_text(h, meta->os);
print_tagq(h, t);
}
struct tag *t, *tt;
char b[BUFSIZ], title[BUFSIZ];
- strlcpy(b, m->vol, BUFSIZ);
+ strlcpy(b, meta->vol, BUFSIZ);
- if (m->arch) {
+ if (meta->arch) {
strlcat(b, " (", BUFSIZ);
- strlcat(b, m->arch, BUFSIZ);
+ strlcat(b, meta->arch, BUFSIZ);
strlcat(b, ")", BUFSIZ);
}
- snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
+ snprintf(title, BUFSIZ - 1, "%s(%s)", meta->title, meta->msec);
PAIR_SUMMARY_INIT(&tag[0], "Document Header");
PAIR_CLASS_INIT(&tag[1], "head");
- if (NULL == h->style) {
- PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
- t = print_otag(h, TAG_TABLE, 3, tag);
- PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
- print_otag(h, TAG_COL, 1, tag);
- print_otag(h, TAG_COL, 1, tag);
- print_otag(h, TAG_COL, 1, tag);
- } else
- t = print_otag(h, TAG_TABLE, 2, tag);
+ PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+ t = print_otag(h, TAG_TABLE, 3, tag);
+ PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+ print_otag(h, TAG_COL, 1, tag);
+ print_otag(h, TAG_COL, 1, tag);
+ print_otag(h, TAG_COL, 1, tag);
print_otag(h, TAG_TBODY, 0, NULL);
PAIR_CLASS_INIT(&tag[0], "head-ltitle");
print_otag(h, TAG_TD, 1, tag);
-
print_text(h, title);
print_stagq(h, tt);
PAIR_CLASS_INIT(&tag[0], "head-vol");
- if (NULL == h->style) {
- PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
- print_otag(h, TAG_TD, 2, tag);
- } else
- print_otag(h, TAG_TD, 1, tag);
-
+ PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+ print_otag(h, TAG_TD, 2, tag);
print_text(h, b);
print_stagq(h, tt);
PAIR_CLASS_INIT(&tag[0], "head-rtitle");
- if (NULL == h->style) {
- PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
- print_otag(h, TAG_TD, 2, tag);
- } else
- print_otag(h, TAG_TD, 1, tag);
-
+ PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+ print_otag(h, TAG_TD, 2, tag);
print_text(h, title);
print_tagq(h, t);
return(1);
bufinit(h);
bufcat(h, "x");
- for (n = n->child; n; n = n->next) {
+
+ for (n = n->child; n && MDOC_TEXT == n->type; ) {
bufcat_id(h, n->string);
- if (n->next)
+ if (NULL != (n = n->next))
bufcat_id(h, " ");
}
- PAIR_ID_INIT(&tag, h->buf);
- print_otag(h, TAG_H1, 1, &tag);
+ if (NULL == n) {
+ PAIR_ID_INIT(&tag, h->buf);
+ print_otag(h, TAG_H1, 1, &tag);
+ } else
+ print_otag(h, TAG_H1, 0, NULL);
+
return(1);
}
-
/* ARGSUSED */
static int
mdoc_ss_pre(MDOC_ARGS)
bufinit(h);
bufcat(h, "x");
- for (n = n->child; n; n = n->next) {
+
+ for (n = n->child; n && MDOC_TEXT == n->type; ) {
bufcat_id(h, n->string);
- if (n->next)
+ if (NULL != (n = n->next))
bufcat_id(h, " ");
}
- PAIR_ID_INIT(&tag, h->buf);
- print_otag(h, TAG_H2, 1, &tag);
+ if (NULL == n) {
+ PAIR_ID_INIT(&tag, h->buf);
+ print_otag(h, TAG_H2, 1, &tag);
+ } else
+ print_otag(h, TAG_H2, 0, NULL);
+
return(1);
}
synopsis_pre(h, n);
PAIR_CLASS_INIT(&tag, "name");
print_otag(h, TAG_B, 1, &tag);
- if (NULL == n->child && m->name)
- print_text(h, m->name);
+ if (NULL == n->child && meta->name)
+ print_text(h, meta->name);
return(1);
case (MDOC_HEAD):
print_otag(h, TAG_TD, 0, NULL);
- if (NULL == n->child && m->name)
- print_text(h, m->name);
+ if (NULL == n->child && meta->name)
+ print_text(h, meta->name);
return(1);
case (MDOC_BODY):
print_otag(h, TAG_TD, 0, NULL);
if (MDOC_TEXT == n->type)
len += html_strlen(n->string);
- if (0 == len && m->name)
- len = html_strlen(m->name);
+ if (0 == len && meta->name)
+ len = html_strlen(meta->name);
SCALE_HS_INIT(&su, (double)len);
bufinit(h);
struct roffsu su;
char buf[BUFSIZ];
- bufinit(h);
-
if (MDOC_BODY == n->type) {
if (LIST_column == n->norm->Bl.type)
print_otag(h, TAG_TBODY, 0, NULL);
*/
for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
+ bufinit(h);
a2width(n->norm->Bl.cols[i], &su);
if (i < (int)n->norm->Bl.ncols - 1)
bufcat_su(h, "width", &su);
}
SCALE_VS_INIT(&su, 0);
+ bufinit(h);
bufcat_su(h, "margin-top", &su);
bufcat_su(h, "margin-bottom", &su);
PAIR_STYLE_INIT(&tag[0], h);
bufinit(h);
bufcat(h, "#x");
- for (n = n->child; n; n = n->next) {
+
+ for (n = n->child; n; ) {
bufcat_id(h, n->string);
- if (n->next)
+ if (NULL != (n = n->next))
bufcat_id(h, " ");
}
h->flags |= HTML_LITERAL;
for (nn = n->child; nn; nn = nn->next) {
- print_mdoc_node(m, nn, h);
+ print_mdoc_node(meta, nn, h);
/*
* If the printed node flushes its own line, then we
* needn't do it here as well. This is hacky, but the
struct htmlpair tag;
PAIR_CLASS_INIT(&tag, "lit");
- print_otag(h, TAG_SPAN, 1, &tag);
+ print_otag(h, TAG_CODE, 1, &tag);
return(1);
}
PAIR_CLASS_INIT(&tag, "opt");
print_otag(h, TAG_SPAN, 1, &tag);
break;
+ case (MDOC_Eo):
+ break;
case (MDOC_Do):
/* FALLTHROUGH */
case (MDOC_Dq):
print_text(h, "(");
break;
case (MDOC_Ql):
- /* FALLTHROUGH */
+ print_text(h, "\\(oq");
+ h->flags |= HTML_NOSPACE;
+ PAIR_CLASS_INIT(&tag, "lit");
+ print_otag(h, TAG_CODE, 1, &tag);
+ break;
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
case (MDOC_Bq):
print_text(h, "\\(rB");
break;
+ case (MDOC_Eo):
+ break;
case (MDOC_Qo):
/* FALLTHROUGH */
case (MDOC_Qq):
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
- print_text(h, "\\(aq");
+ print_text(h, "\\(cq");
break;
default:
abort();
git.ckatri.com / mandoc.git / blobdiff