-/* $Id: mdoc_html.c,v 1.48 2009/11/16 08:46:59 kristaps Exp $ */
+/* $Id: mdoc_html.c,v 1.61 2010/04/08 08:17:55 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* 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 <assert.h>
#include <ctype.h>
const struct mdoc_node *n, \
struct html *h
+#ifndef MIN
+#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
+
struct htmlmdoc {
int (*pre)(MDOC_ARGS);
void (*post)(MDOC_ARGS);
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 */
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);
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;
+ PAIR_ID_INIT(&tag[1], buf);
+
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
PAIR_CLASS_INIT(&tag[0], "ssec-head");
PAIR_STYLE_INIT(&tag[1], h);
- tag[2].key = ATTR_ID;
- tag[2].val = buf;
+ PAIR_ID_INIT(&tag[2], buf);
+
print_otag(h, TAG_DIV, 3, tag);
return(1);
}
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);
}
struct htmlpair tag[2];
const struct mdoc_node *nn;
+ if (NULL == n->child)
+ return(0);
+
PAIR_CLASS_INIT(&tag[0], "link-man");
if (h->base_man) {
buffmt_man(h, n->child->string,
n->child->next ?
n->child->next->string : NULL);
- tag[1].key = ATTR_HREF;
- tag[1].val = h->buf;
+ PAIR_HREF_INIT(&tag[1], h->buf);
print_otag(h, TAG_A, 2, tag);
} else
print_otag(h, TAG_A, 1, tag);
{
struct ord *ord;
+ if (MDOC_HEAD == n->type)
+ return(0);
if (MDOC_BLOCK != n->type)
return(1);
if (MDOC_Enum != a2list(n))
const struct mdoc_node *nn;
char buf[BUFSIZ];
- /* FIXME: duplicates? */
-
strlcpy(buf, "#", BUFSIZ);
for (nn = n->child; nn; nn = nn->next) {
html_idcat(buf, nn->string, BUFSIZ);
}
PAIR_CLASS_INIT(&tag[0], "link-sec");
- tag[1].key = ATTR_HREF;
- tag[1].val = buf;
+ PAIR_HREF_INIT(&tag[1], buf);
print_otag(h, TAG_A, 2, tag);
return(1);
}
/* FIXME: -centered, etc. formatting. */
+ /* FIXME: does not respect -offset ??? */
if (MDOC_BLOCK == n->type) {
bufcat_su(h, "margin-left", &su);
struct htmlpair tag;
struct roffsu su;
- if (SEC_SYNOPSIS == n->sec) {
+ if (SEC_SYNOPSIS == n->sec && MDOC_BLOCK == n->type) {
if (n->next && MDOC_Vt != n->next->tok) {
SCALE_VS_INIT(&su, 1);
bufcat_su(h, "margin-bottom", &su);
print_otag(h, TAG_DIV, 1, &tag);
} else
print_otag(h, TAG_DIV, 0, NULL);
- }
+
+ return(1);
+ } else if (MDOC_HEAD == n->type)
+ return(0);
PAIR_CLASS_INIT(&tag, "type");
print_otag(h, TAG_SPAN, 1, &tag);
mdoc_ft_pre(MDOC_ARGS)
{
struct htmlpair tag;
- struct roffsu su;
- if (SEC_SYNOPSIS == n->sec) {
- if (n->prev && MDOC_Fo == n->prev->tok) {
- 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);
- }
+ if (SEC_SYNOPSIS == n->sec)
+ print_otag(h, TAG_DIV, 0, NULL);
PAIR_CLASS_INIT(&tag, "ftype");
print_otag(h, TAG_SPAN, 1, &tag);
}
PAIR_CLASS_INIT(&tag[0], "fname");
+
+ /*
+ * FIXME: only refer to IDs that we know exist.
+ */
+
+#if 0
+ if (SEC_SYNOPSIS == n->sec) {
+ nbuf[0] = '\0';
+ html_idcat(nbuf, sp, BUFSIZ);
+ PAIR_ID_INIT(&tag[1], nbuf);
+ } else {
+ strlcpy(nbuf, "#", BUFSIZ);
+ html_idcat(nbuf, sp, BUFSIZ);
+ PAIR_HREF_INIT(&tag[1], nbuf);
+ }
+#endif
+
t = print_otag(h, TAG_SPAN, 1, tag);
if (sp) {
- (void)strlcpy(nbuf, sp, BUFSIZ);
+ strlcpy(nbuf, sp, BUFSIZ);
print_text(h, nbuf);
}
nn = n->child;
PAIR_CLASS_INIT(&tag[0], "link-ext");
- tag[1].key = ATTR_HREF;
- tag[1].val = nn->string;
+ PAIR_HREF_INIT(&tag[1], nn->string);
print_otag(h, TAG_A, 2, tag);
if (NULL == nn->next)
bufinit(h);
bufcat(h, "mailto:");
bufcat(h, nn->string);
- PAIR_STYLE_INIT(&tag[1], h);
+ PAIR_HREF_INIT(&tag[1], h->buf);
t = print_otag(h, TAG_A, 2, tag);
print_text(h, nn->string);
print_tagq(h, t);
mdoc_fo_pre(MDOC_ARGS)
{
struct htmlpair tag;
+ struct roffsu su;
if (MDOC_BODY == n->type) {
h->flags |= HTML_NOSPACE;
print_text(h, "(");
h->flags |= HTML_NOSPACE;
return(1);
- } else if (MDOC_BLOCK == n->type)
+ } else if (MDOC_BLOCK == n->type && n->next) {
+ SCALE_VS_INIT(&su, 1);
+ bufcat_su(h, "margin-bottom", &su);
+ PAIR_STYLE_INIT(&tag, h);
+ print_otag(h, TAG_DIV, 1, &tag);
return(1);
+ }
PAIR_CLASS_INIT(&tag, "fname");
print_otag(h, TAG_SPAN, 1, &tag);
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);
break;
case(MDOC__T):
PAIR_CLASS_INIT(&tag[0], "ref-title");
- print_text(h, "\\(lq");
- h->flags |= HTML_NOSPACE;
break;
case(MDOC__U):
PAIR_CLASS_INIT(&tag[0], "link-ref");
mdoc__x_post(MDOC_ARGS)
{
+ /* TODO: %U */
+
h->flags |= HTML_NOSPACE;
- switch (n->tok) {
- case (MDOC__T):
- print_text(h, "\\(rq");
- h->flags |= HTML_NOSPACE;
- break;
- default:
- break;
- }
print_text(h, n->next ? "," : ".");
}
git.ckatri.com / mandoc.git / blobdiff