Compat glue needed for Solaris 9 and 10.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 942a2c6c77aadd32c104dbae89ebb7f86b2a2533..487dacda947f931be42425df41f333e6dc435244 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,7 +1,7 @@
-/*     $Id: html.c,v 1.173 2014/09/28 11:33:15 kristaps Exp $ */
+/*     $Id: html.c,v 1.185 2015/01/21 20:33:25 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -30,7 +30,6 @@
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
 #include "mandoc.h"
 #include "mandoc_aux.h"

-#include "libmandoc.h"

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


@@ -87,6 +86,9 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"mtable",      0}, /* TAG_MTABLE */
        {"mtr",         0}, /* TAG_MTR */
        {"mtd",         0}, /* TAG_MTD */
        {"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] = {


@@ -102,6 +104,7 @@ static      const char      *const htmlattrs[ATTR_MAX] = {
        "charset", /* ATTR_CHARSET */
        "open", /* ATTR_OPEN */
        "close", /* ATTR_CLOSE */
        "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] = {


@@ -118,16 +121,15 @@ 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 *);

 
 
 
 

-static void *
-ml_alloc(char *outopts)
+void *
+html_alloc(const struct mchars *mchars, char *outopts)

 {
        struct html     *h;
        const char      *toks[5];
 {
        struct html     *h;
        const char      *toks[5];


@@ -142,7 +144,7 @@ ml_alloc(char *outopts)
        h = mandoc_calloc(1, sizeof(struct html));
 
        h->tags.head = NULL;
        h = mandoc_calloc(1, sizeof(struct html));
 
        h->tags.head = NULL;

-       h->symtab = mchars_alloc();
+       h->symtab = mchars;

 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {


@@ -165,20 +167,6 @@ ml_alloc(char *outopts)
        return(h);
 }
 
        return(h);
 }
 

-void *
-html_alloc(char *outopts)
-{
-
-       return(ml_alloc(outopts));
-}
-
-void *
-xhtml_alloc(char *outopts)
-{
-
-       return(ml_alloc(outopts));
-}
-

 void
 html_free(void *p)
 {
 void
 html_free(void *p)
 {


@@ -192,9 +180,6 @@ html_free(void *p)
                free(tag);
        }
 
                free(tag);
        }
 

-       if (h->symtab)
-               mchars_free(h->symtab);
-

        free(h);
 }
 
        free(h);
 }
 


@@ -322,6 +307,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


@@ -433,29 +420,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);


@@ -524,14 +518,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


@@ -575,8 +581,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);


@@ -592,17 +599,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;
        }


@@ -616,17 +613,7 @@ 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);

        }
 }
 
        }
 }