More lint fixes.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 69623baff08d7357c2a19d77cf31b40c0e9dc155..186d9a5dd2d4e8962a1bec62006d5c42c4e7f996 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.35 2009/10/20 05:45:21 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>
  *
@@ -16,11 +16,9 @@
  */
 #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>
@@ -254,6 +252,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc__x_pre, mdoc__x_post}, /* %Q */ 
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* sp */ 
+       {mdoc__x_pre, mdoc__x_post}, /* %U */ 
 };
 
 
@@ -416,7 +415,7 @@ print_mdoc_node(MDOC_ARGS)
        struct tag      *t;
 
        child = 1;
-       t = SLIST_FIRST(&h->tags);
+       t = h->tags.head;
 
        bufinit(h);
        switch (n->type) {
@@ -456,10 +455,11 @@ print_mdoc_node(MDOC_ARGS)
 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
@@ -467,15 +467,12 @@ mdoc_root_post(MDOC_ARGS)
         * 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);
@@ -499,7 +496,7 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-       struct htmlpair  tag[2];
+       struct htmlpair  tag[3];
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 
@@ -519,7 +516,10 @@ mdoc_root_pre(MDOC_ARGS)
        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);
@@ -555,7 +555,7 @@ mdoc_sh_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
-       char                     lbuf[BUFSIZ];
+       char                     buf[BUFSIZ];
        struct roffsu            su;
 
        if (MDOC_BODY == n->type) {
@@ -582,11 +582,11 @@ mdoc_sh_pre(MDOC_ARGS)
                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);
        }
 
        /* 
@@ -596,7 +596,7 @@ mdoc_sh_pre(MDOC_ARGS)
 
        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);
 }
@@ -608,7 +608,7 @@ mdoc_ss_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[3];
        const struct mdoc_node  *nn;
-       char                     lbuf[BUFSIZ];
+       char                     buf[BUFSIZ];
        struct roffsu            su;
 
        SCALE_VS_INIT(&su, 1);
@@ -635,11 +635,11 @@ mdoc_ss_pre(MDOC_ARGS)
 
        /* 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);
@@ -649,7 +649,7 @@ mdoc_ss_pre(MDOC_ARGS)
        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);
 }
@@ -953,8 +953,7 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
        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");
@@ -984,7 +983,7 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
                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++);
@@ -1115,11 +1114,14 @@ mdoc_bl_pre(MDOC_ARGS)
                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);
 }
 
@@ -1135,9 +1137,9 @@ mdoc_bl_post(MDOC_ARGS)
        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);
 }
 
@@ -1295,11 +1297,11 @@ mdoc_sx_pre(MDOC_ARGS)
 
        /* FIXME: duplicates? */
 
-       (void)strlcpy(buf, "#", BUFSIZ);
+       strlcpy(buf, "#", BUFSIZ);
        for (nn = n->child; nn; nn = nn->next) {
-               (void)strlcat(buf, nn->string, BUFSIZ);
+               html_idcat(buf, nn->string, BUFSIZ);
                if (nn->next)
-                       (void)strlcat(buf, "_", BUFSIZ);
+                       html_idcat(buf, " ", BUFSIZ);
        }
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");
@@ -1716,7 +1718,10 @@ mdoc_sp_pre(MDOC_ARGS)
        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);
 
 }
 
@@ -1760,6 +1765,9 @@ mdoc_lk_pre(MDOC_ARGS)
        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);
 
@@ -1860,6 +1868,7 @@ mdoc_in_pre(MDOC_ARGS)
        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;
@@ -2150,56 +2159,65 @@ mdoc_lb_pre(MDOC_ARGS)
 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);
 }