Added mandoc_a2time() for proper date conversion.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 623fa975bc71924b1a038a2308214316e5bbaae3..5f921ad7c101e4fbd9d303bdb21ca545dc9cccd7 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.64 2009/10/13 10:57:25 kristaps Exp $ */
+/*     $Id: html.c,v 1.80 2009/11/02 06:22:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,12 +15,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <assert.h>
-#include <err.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,6 +80,7 @@ static        const char       *const htmlattrs[ATTR_MAX] = {
        "valign",
        "target",
        "id",
+       "summary",
 };
 
 #ifdef __linux__
@@ -99,17 +99,16 @@ html_alloc(char *outopts)
        toks[2] = "includes";
        toks[3] = NULL;
 
-       if (NULL == (h = calloc(1, sizeof(struct html))))
-               return(NULL);
-
-       SLIST_INIT(&h->tags);
-       SLIST_INIT(&h->ords);
-
-       if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
-               free(h);
-               return(NULL);
+       h = calloc(1, sizeof(struct html));
+       if (NULL == h) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
        }
 
+       h->tags.head = NULL;
+       h->ords.head = NULL;
+       h->symtab = chars_init(CHARS_HTML);
+
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
                case (0):
@@ -138,15 +137,13 @@ html_free(void *p)
 
        h = (struct html *)p;
 
-       while ( ! SLIST_EMPTY(&h->ords)) {
-               ord = SLIST_FIRST(&h->ords);
-               SLIST_REMOVE_HEAD(&h->ords, entry);
+       while ((ord = h->ords.head) != NULL) { 
+               h->ords.head = ord->next;
                free(ord);
        }
 
-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+       while ((tag = h->tags.head) != NULL) {
+               h->tags.head = tag->next;       
                free(tag);
        }
        
@@ -192,15 +189,13 @@ static void
 print_spec(struct html *h, const char *p, int len)
 {
        const char      *rhs;
-       int              i;
        size_t           sz;
 
        rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
 
        if (NULL == rhs) 
                return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       fwrite(rhs, 1, sz, stdout);
 }
 
 
@@ -208,15 +203,13 @@ static void
 print_res(struct html *h, const char *p, int len)
 {
        const char      *rhs;
-       int              i;
        size_t           sz;
 
        rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
 
        if (NULL == rhs)
                return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       fwrite(rhs, 1, sz, stdout);
 }
 
 
@@ -323,26 +316,27 @@ print_escape(struct html *h, const char **p)
 static void
 print_encode(struct html *h, const char *p)
 {
+       size_t           sz;
 
        for (; *p; p++) {
+               sz = strcspn(p, "\\<>&");
+
+               fwrite(p, 1, sz, stdout);
+               p += /* LINTED */
+                       sz;
+
                if ('\\' == *p) {
                        print_escape(h, &p);
                        continue;
-               }
-               switch (*p) {
-               case ('<'):
-                       printf("&lt;");
+               } else if ('\0' == *p)
                        break;
-               case ('>'):
+
+               if ('<' == *p)
+                       printf("&lt;");
+               else if ('>' == *p)
                        printf("&gt;");
-                       break;
-               case ('&'):
+               else if ('&' == *p)
                        printf("&amp;");
-                       break;
-               default:
-                       putchar(*p);
-                       break;
-               }
        }
 }
 
@@ -355,25 +349,29 @@ print_otag(struct html *h, enum htmltag tag,
        struct tag      *t;
 
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
-               if (NULL == (t = malloc(sizeof(struct tag))))
-                       err(EXIT_FAILURE, "malloc");
+               t = malloc(sizeof(struct tag));
+               if (NULL == t) {
+                       perror(NULL);
+                       exit(EXIT_FAILURE);
+               }
                t->tag = tag;
-               SLIST_INSERT_HEAD(&h->tags, t, entry);
+               t->next = h->tags.head;
+               h->tags.head = t;
        } else
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
                if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       printf(" ");
+                       putchar(' ');
 
        printf("<%s", htmltags[tag].name);
        for (i = 0; i < sz; i++) {
                printf(" %s=\"", htmlattrs[p[i].key]);
                assert(p->val);
                print_encode(h, p[i].val);
-               printf("\"");
+               putchar('\"');
        }
-       printf(">");
+       putchar('>');
 
        h->flags |= HTML_NOSPACE;
        if (HTML_CLRLINE & htmltags[tag].flags)
@@ -391,11 +389,11 @@ print_ctag(struct html *h, enum htmltag tag)
 {
        
        printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags)
+       if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
-       if (HTML_CLRLINE & htmltags[tag].flags)
                h->flags |= HTML_NEWLINE;
-       else
+               putchar('\n');
+       } else
                h->flags &= ~HTML_NEWLINE;
 }
 
@@ -440,7 +438,7 @@ print_text(struct html *h, const char *p)
                }
 
        if ( ! (h->flags & HTML_NOSPACE))
-               printf(" ");
+               putchar(' ');
 
        h->flags &= ~HTML_NOSPACE;
        h->flags &= ~HTML_NEWLINE;
@@ -468,10 +466,9 @@ print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
+       while ((tag = h->tags.head) != NULL) {
                print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+               h->tags.head = tag->next;
                free(tag);
                if (until && tag == until)
                        return;
@@ -484,12 +481,11 @@ print_stagq(struct html *h, const struct tag *suntil)
 {
        struct tag      *tag;
 
-       while ( ! SLIST_EMPTY(&h->tags)) {
-               tag = SLIST_FIRST(&h->tags);
+       while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
                print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->tags, entry);
+               h->tags.head = tag->next;
                free(tag);
        }
 }
@@ -650,3 +646,31 @@ bufcat_su(struct html *h, const char *p, const struct roffsu *su)
                /* LINTED */
                buffmt(h, "%s: %d%s;", p, (int)v, u);
 }
+
+
+void
+html_idcat(char *dst, const char *src, int sz)
+{
+       int              ssz;
+
+       assert(sz);
+
+       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
+
+       for ( ; *dst != '\0' && sz; dst++, sz--)
+               /* Jump to end. */ ;
+
+       assert(sz > 2);
+
+       /* We can't start with a number (bah). */
+
+       *dst++ = 'x';
+       *dst = '\0';
+       sz--;
+
+       for ( ; *src != '\0' && sz > 1; src++) {
+               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+               sz -= ssz;
+               dst += ssz;
+       }
+}