Portability: replaced queue macros in html.c (Joerg Sonnenberger).

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 0bb3ea57b3bef5fe65a7e4b09ed61361a895b51d..a948781c7aa8e7783468dff0fbf88026f021763b 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.27 2009/10/08 23:00:15 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.39 2009/10/26 08:18:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,7 +16,6 @@
  */
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/queue.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -29,6 +28,7 @@
 #include "out.h"
 #include "html.h"
 #include "mdoc.h"
+#include "main.h"
 
 #define        INDENT           5
 #define        HALFINDENT       3
@@ -253,6 +253,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 */ 
 };
 
 
@@ -326,10 +327,10 @@ static void
 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);
+       }
 }
 
 
@@ -342,13 +343,15 @@ static void
 a2offs(const char *p, struct roffsu *su)
 {
 
+       /* FIXME: "right"? */
+
        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)) {
+       else if ( ! a2roffsu(p, su, SCALE_MAX)) {
                su->unit = SCALE_EM;
                su->scale = (int)strlen(p);
        }
@@ -413,7 +416,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) {
@@ -453,10 +456,11 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-       struct tm        tm;
        struct htmlpair  tag[2];
        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
@@ -464,11 +468,6 @@ 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);
@@ -981,7 +980,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++);
@@ -1065,6 +1064,8 @@ mdoc_it_pre(MDOC_ARGS)
        /* Override width in some cases. */
 
        switch (type) {
+       case (MDOC_Item):
+               /* FALLTHROUGH */
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Diag):
@@ -1114,7 +1115,8 @@ mdoc_bl_pre(MDOC_ARGS)
                err(EXIT_FAILURE, "malloc");
        ord->cookie = n;
        ord->pos = 1;
-       SLIST_INSERT_HEAD(&h->ords, ord, entry);
+       ord->next = h->ords.head;
+       h->ords.head = ord;
        return(1);
 }
 
@@ -1130,9 +1132,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);
 }
 
@@ -1269,6 +1271,8 @@ mdoc_d1_pre(MDOC_ARGS)
        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");
@@ -1284,20 +1288,20 @@ mdoc_sx_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
-       char                     lbuf[BUFSIZ];
+       char                     buf[BUFSIZ];
 
        /* FIXME: duplicates? */
 
-       (void)strlcpy(lbuf, "#", BUFSIZ);
+       (void)strlcpy(buf, "#", BUFSIZ);
        for (nn = n->child; nn; nn = nn->next) {
-               (void)strlcat(lbuf, nn->string, BUFSIZ);
+               (void)strlcat(buf, nn->string, BUFSIZ);
                if (nn->next)
-                       (void)strlcat(lbuf, "_", BUFSIZ);
+                       (void)strlcat(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);
@@ -1356,6 +1360,8 @@ mdoc_bd_pre(MDOC_ARGS)
                case (MDOC_Compact):
                        comp = 1;
                        break;
+               case (MDOC_Centred):
+                       /* FALLTHROUGH */
                case (MDOC_Ragged):
                        /* FALLTHROUGH */
                case (MDOC_Filled):
@@ -1365,8 +1371,12 @@ mdoc_bd_pre(MDOC_ARGS)
                case (MDOC_Literal):
                        type = bl->args->argv[i].arg;
                        break;
+               default:
+                       break;
                }
 
+       /* FIXME: -centered, etc. formatting. */
+
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);
                for (nn = n; nn && ! comp; nn = nn->parent) {
@@ -1455,6 +1465,7 @@ mdoc_cd_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
+       print_otag(h, TAG_DIV, 0, NULL);
        PAIR_CLASS_INIT(&tag, "config");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
@@ -1746,6 +1757,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);
 
@@ -1830,6 +1844,8 @@ mdoc_in_pre(MDOC_ARGS)
                        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);
 
@@ -2134,56 +2150,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);
 }