-/* $Id: mdoc_html.c,v 1.31 2009/10/18 11:14:04 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>
{mdoc__x_pre, mdoc__x_post}, /* %Q */
{mdoc_sp_pre, NULL}, /* br */
{mdoc_sp_pre, NULL}, /* sp */
+ {mdoc__x_pre, mdoc__x_post}, /* %U */
};
a2width(const char *p, struct roffsu *su)
{
- if (a2roffsu(p, su))
- return;
- su->unit = SCALE_EM;
- su->scale = (int)strlen(p);
+ if ( ! a2roffsu(p, su, SCALE_MAX)) {
+ su->unit = SCALE_EM;
+ su->scale = (int)strlen(p);
+ }
}
SCALE_HS_INIT(su, INDENT);
else if (0 == strcmp(p, "indent-two"))
SCALE_HS_INIT(su, INDENT * 2);
- else if ( ! a2roffsu(p, su)) {
+ else if ( ! a2roffsu(p, su, SCALE_MAX)) {
su->unit = SCALE_EM;
su->scale = (int)strlen(p);
}
struct tag *t;
child = 1;
- t = SLIST_FIRST(&h->tags);
+ t = h->tags.head;
bufinit(h);
switch (n->type) {
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);
/*
* XXX: this should use divs, but in Firefox, divs with nested
* below. So I use tables, instead.
*/
- (void)localtime_r(&m->date, &tm);
-
- if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
- err(EXIT_FAILURE, "strftime");
-
PAIR_CLASS_INIT(&tag[0], "footer");
bufcat_style(h, "width", "100%");
PAIR_STYLE_INIT(&tag[1], h);
- t = print_otag(h, TAG_TABLE, 2, tag);
+ PAIR_SUMMARY_INIT(&tag[2], "footer");
+
+ t = print_otag(h, TAG_TABLE, 3, tag);
tt = print_otag(h, TAG_TR, 0, NULL);
bufinit(h);
static int
mdoc_root_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
+ struct htmlpair tag[3];
struct tag *t, *tt;
char b[BUFSIZ], title[BUFSIZ];
PAIR_CLASS_INIT(&tag[0], "header");
bufcat_style(h, "width", "100%");
PAIR_STYLE_INIT(&tag[1], h);
- t = print_otag(h, TAG_TABLE, 2, tag);
+ PAIR_SUMMARY_INIT(&tag[2], "header");
+
+ t = print_otag(h, TAG_TABLE, 3, tag);
+
tt = print_otag(h, TAG_TR, 0, NULL);
bufinit(h);
{
struct htmlpair tag[2];
const struct mdoc_node *nn;
- char lbuf[BUFSIZ];
+ char buf[BUFSIZ];
struct roffsu su;
if (MDOC_BODY == n->type) {
return(1);
}
- lbuf[0] = 0;
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
- (void)strlcat(lbuf, nn->string, BUFSIZ);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- (void)strlcat(lbuf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
/*
PAIR_CLASS_INIT(&tag[0], "sec-head");
tag[1].key = ATTR_ID;
- tag[1].val = lbuf;
+ tag[1].val = buf;
print_otag(h, TAG_DIV, 2, tag);
return(1);
}
{
struct htmlpair tag[3];
const struct mdoc_node *nn;
- char lbuf[BUFSIZ];
+ char buf[BUFSIZ];
struct roffsu su;
SCALE_VS_INIT(&su, 1);
/* TODO: see note in mdoc_sh_pre() about duplicates. */
- lbuf[0] = 0;
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
- (void)strlcat(lbuf, nn->string, BUFSIZ);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- (void)strlcat(lbuf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
SCALE_HS_INIT(&su, INDENT - HALFINDENT);
PAIR_CLASS_INIT(&tag[0], "ssec-head");
PAIR_STYLE_INIT(&tag[1], h);
tag[2].key = ATTR_ID;
- tag[2].val = lbuf;
+ tag[2].val = buf;
print_otag(h, TAG_DIV, 3, tag);
return(1);
}
case (MDOC_Item):
/* FALLTHROUGH */
case (MDOC_Ohang):
- print_otag(h, TAG_DIV, 0, NULL);
- break;
+ return(0);
case (MDOC_Column):
bufcat_su(h, "min-width", width);
bufcat_style(h, "clear", "none");
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++);
/* Override width in some cases. */
switch (type) {
+ case (MDOC_Item):
+ /* FALLTHROUGH */
case (MDOC_Inset):
/* FALLTHROUGH */
case (MDOC_Diag):
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);
}
if (MDOC_BLOCK != n->type)
return(1);
+ /* FIXME: D1 shouldn't be literal. */
+
SCALE_VS_INIT(&su, INDENT - 2);
bufcat_su(h, "margin-left", &su);
PAIR_CLASS_INIT(&tag[0], "lit");
{
struct htmlpair tag[2];
const struct mdoc_node *nn;
- char lbuf[BUFSIZ];
+ char buf[BUFSIZ];
/* FIXME: duplicates? */
- (void)strlcpy(lbuf, "#", BUFSIZ);
+ strlcpy(buf, "#", BUFSIZ);
for (nn = n->child; nn; nn = nn->next) {
- (void)strlcat(lbuf, nn->string, BUFSIZ);
+ html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- (void)strlcat(lbuf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
PAIR_CLASS_INIT(&tag[0], "link-sec");
tag[1].key = ATTR_HREF;
- tag[1].val = lbuf;
+ tag[1].val = buf;
print_otag(h, TAG_A, 2, tag);
return(1);
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);
}
tag[1].val = nn->string;
print_otag(h, TAG_A, 2, tag);
+ if (NULL == nn->next)
+ return(1);
+
for (nn = nn->next; nn; nn = nn->next)
print_text(h, nn->string);
print_otag(h, TAG_DIV, 0, NULL);
}
+ /* FIXME: there's a buffer bug in here somewhere. */
+
PAIR_CLASS_INIT(&tag[0], "includes");
print_otag(h, TAG_SPAN, 1, tag);
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;
static int
mdoc__x_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct htmlpair tag[2];
switch (n->tok) {
case(MDOC__A):
- PAIR_CLASS_INIT(&tag, "ref-auth");
+ PAIR_CLASS_INIT(&tag[0], "ref-auth");
break;
case(MDOC__B):
- PAIR_CLASS_INIT(&tag, "ref-book");
+ PAIR_CLASS_INIT(&tag[0], "ref-book");
break;
case(MDOC__C):
- PAIR_CLASS_INIT(&tag, "ref-city");
+ PAIR_CLASS_INIT(&tag[0], "ref-city");
break;
case(MDOC__D):
- PAIR_CLASS_INIT(&tag, "ref-date");
+ PAIR_CLASS_INIT(&tag[0], "ref-date");
break;
case(MDOC__I):
- PAIR_CLASS_INIT(&tag, "ref-issue");
+ PAIR_CLASS_INIT(&tag[0], "ref-issue");
break;
case(MDOC__J):
- PAIR_CLASS_INIT(&tag, "ref-jrnl");
+ PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
break;
case(MDOC__N):
- PAIR_CLASS_INIT(&tag, "ref-num");
+ PAIR_CLASS_INIT(&tag[0], "ref-num");
break;
case(MDOC__O):
- PAIR_CLASS_INIT(&tag, "ref-opt");
+ PAIR_CLASS_INIT(&tag[0], "ref-opt");
break;
case(MDOC__P):
- PAIR_CLASS_INIT(&tag, "ref-page");
+ PAIR_CLASS_INIT(&tag[0], "ref-page");
break;
case(MDOC__Q):
- PAIR_CLASS_INIT(&tag, "ref-corp");
+ PAIR_CLASS_INIT(&tag[0], "ref-corp");
break;
case(MDOC__R):
- PAIR_CLASS_INIT(&tag, "ref-rep");
+ PAIR_CLASS_INIT(&tag[0], "ref-rep");
break;
case(MDOC__T):
- PAIR_CLASS_INIT(&tag, "ref-title");
+ PAIR_CLASS_INIT(&tag[0], "ref-title");
print_text(h, "\\(lq");
h->flags |= HTML_NOSPACE;
break;
+ case(MDOC__U):
+ PAIR_CLASS_INIT(&tag[0], "link-ref");
+ break;
case(MDOC__V):
- PAIR_CLASS_INIT(&tag, "ref-vol");
+ PAIR_CLASS_INIT(&tag[0], "ref-vol");
break;
default:
abort();
/* NOTREACHED */
}
- print_otag(h, TAG_SPAN, 1, &tag);
+ if (MDOC__U != n->tok) {
+ print_otag(h, TAG_SPAN, 1, tag);
+ return(1);
+ }
+
+ PAIR_HREF_INIT(&tag[1], n->child->string);
+ print_otag(h, TAG_A, 2, tag);
return(1);
}
git.ckatri.com / mandoc.git / blobdiff