Remove asciisz from chars.in. It frees up a nice chunk of memory and at

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index aa83bc2885d848187299ae08b43674c574e84ba5..e90644a15475de6d55354cd1a95a3282180c0c98 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,6 +1,6 @@
-/*     $Id: html.c,v 1.98 2010/04/08 07:05:38 kristaps Exp $ */
+/*     $Id: html.c,v 1.109 2010/07/23 00:08:57 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -29,13 +29,12 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "mandoc.h"

 #include "out.h"
 #include "chars.h"
 #include "html.h"
 #include "main.h"
 
 #include "out.h"
 #include "chars.h"
 #include "html.h"
 #include "main.h"
 

-#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
-

 struct htmldata {
        const char       *name;
        int               flags;
 struct htmldata {
        const char       *name;
        int               flags;


@@ -54,7 +53,7 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"h1",          0}, /* TAG_H1 */
        {"h2",          0}, /* TAG_H2 */
        {"span",        0}, /* TAG_SPAN */
        {"h1",          0}, /* TAG_H1 */
        {"h2",          0}, /* TAG_H2 */
        {"span",        0}, /* TAG_SPAN */

-       {"link",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
+       {"link",        HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_LINK */

        {"br",          HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */
        {"a",           0}, /* TAG_A */
        {"table",       HTML_CLRLINE}, /* TAG_TABLE */
        {"br",          HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */
        {"a",           0}, /* TAG_A */
        {"table",       HTML_CLRLINE}, /* TAG_TABLE */


@@ -89,7 +88,8 @@ static        const char      *const htmlattrs[ATTR_MAX] = {
        "summary",
 };
 
        "summary",
 };
 

-static void              print_spec(struct html *, const char *, size_t);
+static void              print_spec(struct html *, enum roffdeco,
+                               const char *, size_t);

 static void              print_res(struct html *, const char *, size_t);
 static void              print_ctag(struct html *, enum htmltag);
 static void              print_doctype(struct html *);
 static void              print_res(struct html *, const char *, size_t);
 static void              print_ctag(struct html *, enum htmltag);
 static void              print_doctype(struct html *);


@@ -216,30 +216,41 @@ print_gen_head(struct html *h)
 
 
 static void
 
 
 static void

-print_spec(struct html *h, const char *p, size_t len)
+print_spec(struct html *h, enum roffdeco d, const char *p, size_t len)

 {
 {

+       int              cp;

        const char      *rhs;
        size_t           sz;
 
        const char      *rhs;
        size_t           sz;
 

-       rhs = chars_a2ascii(h->symtab, p, len, &sz);
-
-       if (NULL == rhs) 
+       if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp && DECO_SSPECIAL == d) {
+               fwrite(p, 1, len, stdout);
+               return;
+       } else if (-1 == cp)

                return;
                return;

-       fwrite(rhs, 1, sz, stdout);
+
+       if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);

 }
 
 
 static void
 print_res(struct html *h, const char *p, size_t len)
 {
 }
 
 
 static void
 print_res(struct html *h, const char *p, size_t len)
 {

+       int              cp;

        const char      *rhs;
        size_t           sz;
 
        const char      *rhs;
        size_t           sz;
 

-       rhs = chars_a2res(h->symtab, p, len, &sz);
-
-       if (NULL == rhs)
+       if ((cp = chars_res2cp(h->symtab, p, len)) > 0) {
+               printf("&#%d;", cp);
+               return;
+       } else if (-1 == cp)

                return;
                return;

-       fwrite(rhs, 1, sz, stdout);
+
+       if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz)))
+               fwrite(rhs, 1, sz, stdout);

 }
 
 
 }
 
 


@@ -296,11 +307,12 @@ print_encode(struct html *h, const char *p, int norecurse)
        int              len, nospace;
        const char      *seq;
        enum roffdeco    deco;
        int              len, nospace;
        const char      *seq;
        enum roffdeco    deco;

+       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };

 
        nospace = 0;
 
        for (; *p; p++) {
 
        nospace = 0;
 
        for (; *p; p++) {

-               sz = strcspn(p, "\\<>&");
+               sz = strcspn(p, rejs);

 
                fwrite(p, 1, sz, stdout);
                p += /* LINTED */
 
                fwrite(p, 1, sz, stdout);
                p += /* LINTED */


@@ -315,6 +327,15 @@ print_encode(struct html *h, const char *p, int norecurse)
                } else if ('&' == *p) {
                        printf("&amp;");
                        continue;
                } else if ('&' == *p) {
                        printf("&amp;");
                        continue;

+               } else if (ASCII_HYPH == *p) {
+                       /*
+                        * Note: "soft hyphens" aren't graphically
+                        * displayed when not breaking the text; we want
+                        * them to be displayed.
+                        */
+                       /*printf("&#173;");*/
+                       putchar('-');
+                       continue;

                } else if ('\0' == *p)
                        break;
 
                } else if ('\0' == *p)
                        break;
 


@@ -325,8 +346,10 @@ print_encode(struct html *h, const char *p, int norecurse)
                case (DECO_RESERVED):
                        print_res(h, seq, sz);
                        break;
                case (DECO_RESERVED):
                        print_res(h, seq, sz);
                        break;

+               case (DECO_SSPECIAL):
+                       /* FALLTHROUGH */

                case (DECO_SPECIAL):
                case (DECO_SPECIAL):

-                       print_spec(h, seq, sz);
+                       print_spec(h, deco, seq, sz);

                        break;
                case (DECO_PREVIOUS):
                        /* FALLTHROUGH */
                        break;
                case (DECO_PREVIOUS):
                        /* FALLTHROUGH */


@@ -384,8 +407,18 @@ print_otag(struct html *h, enum htmltag tag,
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))

-               if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       putchar(' ');
+               if ( ! (HTML_CLRLINE & htmltags[tag].flags)) {
+                       /* Manage keeps! */
+                       if ( ! (HTML_KEEP & h->flags)) {
+                               if (HTML_PREKEEP & h->flags)
+                                       h->flags |= HTML_KEEP;
+                               putchar(' ');
+                       } else
+                               printf("&#160;");
+               }
+
+       if ( ! (h->flags & HTML_NONOSPACE))
+               h->flags &= ~HTML_NOSPACE;

 
        /* Print out the tag name and attributes. */
 
 
        /* Print out the tag name and attributes. */
 


@@ -443,21 +476,9 @@ print_gen_decls(struct html *h)
 static void
 print_xmltype(struct html *h)
 {
 static void
 print_xmltype(struct html *h)
 {

-       const char      *decl;

 
 

-       switch (h->type) {
-       case (HTML_XHTML_1_0_STRICT):
-               decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-               break;
-       default:
-               decl = NULL;
-               break;
-       }
-
-       if (NULL == decl)
-               return;
-
-       printf("%s\n", decl);
+       if (HTML_XHTML_1_0_STRICT == h->type)
+               printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

 }
 
 
 }
 
 


@@ -487,11 +508,11 @@ print_doctype(struct html *h)
 
 
 void
 
 
 void

-print_text(struct html *h, const char *p)
+print_text(struct html *h, const char *word)

 {
 
 {
 

-       if (*p && 0 == *(p + 1))
-               switch (*p) {
+       if (word[0] && '\0' == word[1])
+               switch (word[0]) {

                case('.'):
                        /* FALLTHROUGH */
                case(','):
                case('.'):
                        /* FALLTHROUGH */
                case(','):


@@ -514,19 +535,27 @@ print_text(struct html *h, const char *p)
                        break;
                }
 
                        break;
                }
 

-       if ( ! (h->flags & HTML_NOSPACE))
-               putchar(' ');
+       if ( ! (HTML_NOSPACE & h->flags)) {
+               /* Manage keeps! */
+               if ( ! (HTML_KEEP & h->flags)) {
+                       if (HTML_PREKEEP & h->flags)
+                               h->flags |= HTML_KEEP;
+                       putchar(' ');
+               } else
+                       printf("&#160;");
+       }

 
 

-       assert(p);
-       if ( ! print_encode(h, p, 0))
-               h->flags &= ~HTML_NOSPACE;
+       assert(word);
+       if ( ! print_encode(h, word, 0))
+               if ( ! (h->flags & HTML_NONOSPACE))
+                       h->flags &= ~HTML_NOSPACE;

 
        /* 
         * Note that we don't process the pipe: the parser sees it as
         * punctuation, but we don't in terms of typography.
         */
 
        /* 
         * Note that we don't process the pipe: the parser sees it as
         * punctuation, but we don't in terms of typography.
         */

-       if (*p && 0 == *(p + 1))
-               switch (*p) {
+       if (word[0] && '\0' == word[1])
+               switch (word[0]) {

                case('('):
                        /* FALLTHROUGH */
                case('['):
                case('('):
                        /* FALLTHROUGH */
                case('['):


@@ -721,11 +750,11 @@ bufcat_su(struct html *h, const char *p, const struct roffsu *su)
                break;
        }
 
                break;
        }
 

-       if (su->pt)
-               buffmt(h, "%s: %f%s;", p, v, u);
-       else
-               /* LINTED */
-               buffmt(h, "%s: %d%s;", p, (int)v, u);
+       /* 
+        * XXX: the CSS spec isn't clear as to which types accept
+        * integer or real numbers, so we just make them all decimals.
+        */
+       buffmt(h, "%s: %.2f%s;", p, v, u);

 }
 
 
 }