]> git.cameronkatri.com Git - mandoc.git/blobdiff - html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
This one needs config.h too, if only for __BEGIN_DECLS.
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index d3fbf852f8dc14d4bc46d159812a735357054dff..8adf00d19d6937171dbe46d3a3b2cdac673619a1 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,15 +1,15 @@
-/*     $Id: html.c,v 1.170 2014/09/27 09:26:01 kristaps Exp $ */
+/*     $Id: html.c,v 1.186 2015/03/27 21:33:20 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -30,9 +30,9 @@
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
-#include "libmandoc.h"
 #include "out.h"
 #include "html.h"
 #include "out.h"
 #include "html.h"
+#include "manconf.h"
 #include "main.h"
 
 struct htmldata {
 #include "main.h"
 
 struct htmldata {
@@ -68,13 +68,28 @@ static      const struct htmldata htmltags[TAG_MAX] = {
        {"dt",          HTML_CLRLINE}, /* TAG_DT */
        {"dd",          HTML_CLRLINE}, /* TAG_DD */
        {"blockquote",  HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
        {"dt",          HTML_CLRLINE}, /* TAG_DT */
        {"dd",          HTML_CLRLINE}, /* TAG_DD */
        {"blockquote",  HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
-       {"p",           HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */
        {"pre",         HTML_CLRLINE }, /* TAG_PRE */
        {"b",           0 }, /* TAG_B */
        {"i",           0 }, /* TAG_I */
        {"code",        0 }, /* TAG_CODE */
        {"small",       0 }, /* TAG_SMALL */
        {"style",       HTML_CLRLINE}, /* TAG_STYLE */
        {"pre",         HTML_CLRLINE }, /* TAG_PRE */
        {"b",           0 }, /* TAG_B */
        {"i",           0 }, /* TAG_I */
        {"code",        0 }, /* TAG_CODE */
        {"small",       0 }, /* TAG_SMALL */
        {"style",       HTML_CLRLINE}, /* TAG_STYLE */
+       {"math",        HTML_CLRLINE}, /* TAG_MATH */
+       {"mrow",        0}, /* TAG_MROW */
+       {"mi",          0}, /* TAG_MI */
+       {"mo",          0}, /* TAG_MO */
+       {"msup",        0}, /* TAG_MSUP */
+       {"msub",        0}, /* TAG_MSUB */
+       {"msubsup",     0}, /* TAG_MSUBSUP */
+       {"mfrac",       0}, /* TAG_MFRAC */
+       {"msqrt",       0}, /* TAG_MSQRT */
+       {"mfenced",     0}, /* TAG_MFENCED */
+       {"mtable",      0}, /* TAG_MTABLE */
+       {"mtr",         0}, /* TAG_MTR */
+       {"mtd",         0}, /* TAG_MTD */
+       {"munderover",  0}, /* TAG_MUNDEROVER */
+       {"munder",      0}, /* TAG_MUNDER*/
+       {"mover",       0}, /* TAG_MOVER*/
 };
 
 static const char      *const htmlattrs[ATTR_MAX] = {
 };
 
 static const char      *const htmlattrs[ATTR_MAX] = {
@@ -88,6 +103,9 @@ static       const char      *const htmlattrs[ATTR_MAX] = {
        "id", /* ATTR_ID */
        "colspan", /* ATTR_COLSPAN */
        "charset", /* ATTR_CHARSET */
        "id", /* ATTR_ID */
        "colspan", /* ATTR_COLSPAN */
        "charset", /* ATTR_CHARSET */
+       "open", /* ATTR_OPEN */
+       "close", /* ATTR_CLOSE */
+       "mathvariant", /* ATTR_MATHVARIANT */
 };
 
 static const char      *const roffscales[SCALE_MAX] = {
 };
 
 static const char      *const roffscales[SCALE_MAX] = {
@@ -104,68 +122,32 @@ static    const char      *const roffscales[SCALE_MAX] = {
 };
 
 static void     bufncat(struct html *, const char *, size_t);
 };
 
 static void     bufncat(struct html *, const char *, size_t);
-static void     print_ctag(struct html *, enum htmltag);
+static void     print_ctag(struct html *, struct tag *);
 static int      print_escape(char);
 static int      print_encode(struct html *, const char *, int);
 static void     print_metaf(struct html *, enum mandoc_esc);
 static void     print_attr(struct html *, const char *, const char *);
 static int      print_escape(char);
 static int      print_encode(struct html *, const char *, int);
 static void     print_metaf(struct html *, enum mandoc_esc);
 static void     print_attr(struct html *, const char *, const char *);
-static void     *ml_alloc(char *, enum htmltype);
 
 
 
 
-static void *
-ml_alloc(char *outopts, enum htmltype type)
+void *
+html_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
        struct html     *h;
 {
        struct html     *h;
-       const char      *toks[5];
-       char            *v;
-
-       toks[0] = "style";
-       toks[1] = "man";
-       toks[2] = "includes";
-       toks[3] = "fragment";
-       toks[4] = NULL;
 
        h = mandoc_calloc(1, sizeof(struct html));
 
 
        h = mandoc_calloc(1, sizeof(struct html));
 
-       h->type = type;
        h->tags.head = NULL;
        h->tags.head = NULL;
-       h->symtab = mchars_alloc();
+       h->symtab = mchars;
 
 
-       while (outopts && *outopts)
-               switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-               case 0:
-                       h->style = v;
-                       break;
-               case 1:
-                       h->base_man = v;
-                       break;
-               case 2:
-                       h->base_includes = v;
-                       break;
-               case 3:
-                       h->oflags |= HTML_FRAGMENT;
-                       break;
-               default:
-                       break;
-               }
+       h->style = outopts->style;
+       h->base_man = outopts->man;
+       h->base_includes = outopts->includes;
+       if (outopts->fragment)
+               h->oflags |= HTML_FRAGMENT;
 
        return(h);
 }
 
 
        return(h);
 }
 
-void *
-html_alloc(char *outopts)
-{
-
-       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
-}
-
-void *
-xhtml_alloc(char *outopts)
-{
-
-       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
-}
-
 void
 html_free(void *p)
 {
 void
 html_free(void *p)
 {
@@ -179,9 +161,6 @@ html_free(void *p)
                free(tag);
        }
 
                free(tag);
        }
 
-       if (h->symtab)
-               mchars_free(h->symtab);
-
        free(h);
 }
 
        free(h);
 }
 
@@ -203,7 +182,8 @@ print_gen_head(struct html *h)
              "td.head-rtitle, td.foot-os { text-align: right; }\n"
              "td.head-vol { text-align: center; }\n"
              "table.foot td { width: 50%; }\n"
              "td.head-rtitle, td.foot-os { text-align: right; }\n"
              "td.head-vol { text-align: center; }\n"
              "table.foot td { width: 50%; }\n"
-             "table.head td { width: 33%; }\n");
+             "table.head td { width: 33%; }\n"
+             "div.spacer { margin: 1em 0; }\n");
        print_tagq(h, t);
 
        if (h->style) {
        print_tagq(h, t);
 
        if (h->style) {
@@ -308,6 +288,8 @@ html_strlen(const char *cp)
                case ESCAPE_NUMBERED:
                        /* FALLTHROUGH */
                case ESCAPE_SPECIAL:
                case ESCAPE_NUMBERED:
                        /* FALLTHROUGH */
                case ESCAPE_SPECIAL:
+                       /* FALLTHROUGH */
+               case ESCAPE_OVERSTRIKE:
                        if (skip)
                                skip = 0;
                        else
                        if (skip)
                                skip = 0;
                        else
@@ -419,29 +401,36 @@ print_encode(struct html *h, const char *p, int norecurse)
                case ESCAPE_UNICODE:
                        /* Skip past "u" header. */
                        c = mchars_num2uc(seq + 1, len - 1);
                case ESCAPE_UNICODE:
                        /* Skip past "u" header. */
                        c = mchars_num2uc(seq + 1, len - 1);
-                       if ('\0' != c)
-                               printf("&#x%x;", c);
                        break;
                case ESCAPE_NUMBERED:
                        c = mchars_num2char(seq, len);
                        break;
                case ESCAPE_NUMBERED:
                        c = mchars_num2char(seq, len);
-                       if ( ! ('\0' == c || print_escape(c)))
-                               putchar(c);
+                       if (c < 0)
+                               continue;
                        break;
                case ESCAPE_SPECIAL:
                        c = mchars_spec2cp(h->symtab, seq, len);
                        break;
                case ESCAPE_SPECIAL:
                        c = mchars_spec2cp(h->symtab, seq, len);
-                       if (c > 0)
-                               printf("&#%d;", c);
-                       else if (-1 == c && 1 == len &&
-                           !print_escape(*seq))
-                               putchar((int)*seq);
+                       if (c <= 0)
+                               continue;
                        break;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
                        break;
                case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       if (len == 0)
+                               continue;
+                       c = seq[len - 1];
                        break;
                default:
                        break;
                default:
-                       break;
+                       continue;
                }
                }
+               if ((c < 0x20 && c != 0x09) ||
+                   (c > 0x7E && c < 0xA0))
+                       c = 0xFFFD;
+               if (c > 0x7E)
+                       printf("&#%d;", c);
+               else if ( ! print_escape(c))
+                       putchar(c);
        }
 
        return(nospace);
        }
 
        return(nospace);
@@ -494,16 +483,10 @@ print_otag(struct html *h, enum htmltag tag,
        for (i = 0; i < sz; i++)
                print_attr(h, htmlattrs[p[i].key], p[i].val);
 
        for (i = 0; i < sz; i++)
                print_attr(h, htmlattrs[p[i].key], p[i].val);
 
-       /* Accommodate for XML "well-formed" singleton escaping. */
+       /* Accommodate for "well-formed" singleton escaping. */
 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
-               switch (h->type) {
-               case HTML_XHTML_1_0_STRICT:
-                       putchar('/');
-                       break;
-               default:
-                       break;
-               }
+               putchar('/');
 
        putchar('>');
 
 
        putchar('>');
 
@@ -516,14 +499,26 @@ print_otag(struct html *h, enum htmltag tag,
 }
 
 static void
 }
 
 static void
-print_ctag(struct html *h, enum htmltag tag)
+print_ctag(struct html *h, struct tag *tag)
 {
 
 {
 
-       printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags) {
+       /*
+        * Remember to close out and nullify the current
+        * meta-font and table, if applicable.
+        */
+       if (tag == h->metaf)
+               h->metaf = NULL;
+       if (tag == h->tblt)
+               h->tblt = NULL;
+
+       printf("</%s>", htmltags[tag->tag].name);
+       if (HTML_CLRLINE & htmltags[tag->tag].flags) {
                h->flags |= HTML_NOSPACE;
                putchar('\n');
        }
                h->flags |= HTML_NOSPACE;
                putchar('\n');
        }
+
+       h->tags.head = tag->next;
+       free(tag);
 }
 
 void
 }
 
 void
@@ -567,8 +562,9 @@ print_text(struct html *h, const char *word)
        if ( ! print_encode(h, word, 0)) {
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
        if ( ! print_encode(h, word, 0)) {
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONEWLINE;
        } else
        } else
-               h->flags |= HTML_NOSPACE;
+               h->flags |= HTML_NOSPACE | HTML_NONEWLINE;
 
        if (h->metaf) {
                print_tagq(h, h->metaf);
 
        if (h->metaf) {
                print_tagq(h, h->metaf);
@@ -584,17 +580,7 @@ print_tagq(struct html *h, const struct tag *until)
        struct tag      *tag;
 
        while ((tag = h->tags.head) != NULL) {
        struct tag      *tag;
 
        while ((tag = h->tags.head) != NULL) {
-               /*
-                * Remember to close out and nullify the current
-                * meta-font and table, if applicable.
-                */
-               if (tag == h->metaf)
-                       h->metaf = NULL;
-               if (tag == h->tblt)
-                       h->tblt = NULL;
-               print_ctag(h, tag->tag);
-               h->tags.head = tag->next;
-               free(tag);
+               print_ctag(h, tag);
                if (until && tag == until)
                        return;
        }
                if (until && tag == until)
                        return;
        }
@@ -608,20 +594,22 @@ print_stagq(struct html *h, const struct tag *suntil)
        while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
        while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
-               /*
-                * Remember to close out and nullify the current
-                * meta-font and table, if applicable.
-                */
-               if (tag == h->metaf)
-                       h->metaf = NULL;
-               if (tag == h->tblt)
-                       h->tblt = NULL;
-               print_ctag(h, tag->tag);
-               h->tags.head = tag->next;
-               free(tag);
+               print_ctag(h, tag);
        }
 }
 
        }
 }
 
+void
+print_paragraph(struct html *h)
+{
+       struct tag      *t;
+       struct htmlpair  tag;
+
+       PAIR_CLASS_INIT(&tag, "spacer");
+       t = print_otag(h, TAG_DIV, 1, &tag);
+       print_tagq(h, t);
+}
+
+
 void
 bufinit(struct html *h)
 {
 void
 bufinit(struct html *h)
 {
A git conversion mirror of mandoc.bsd.lv