Delete two preprocessor constants that are no longer used.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index fe16224e8e36b6ebb29e2be6684ec30c6648f820..d734f546ea874812795718b1bb7de8f297196860 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,15 +1,15 @@
-/*     $Id: html.c,v 1.183 2014/12/02 10:08:06 schwarze Exp $ */
+/*     $Id: html.c,v 1.191 2015/10/13 22:59:54 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * 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.
  *
- * 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
- * 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
@@ -32,6 +32,7 @@
 #include "mandoc_aux.h"
 #include "out.h"
 #include "html.h"
+#include "manconf.h"
 #include "main.h"
 
 struct htmldata {
@@ -121,7 +122,7 @@ static      const char      *const roffscales[SCALE_MAX] = {
 };
 
 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);
@@ -129,42 +130,20 @@ static    void     print_attr(struct html *, const char *, const char *);
 
 
 void *
-html_alloc(const struct mchars *mchars, char *outopts)
+html_alloc(const struct manoutput *outopts)
 {
        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->tags.head = NULL;
-       h->symtab = mchars;
+       h->style = outopts->style;
+       h->base_man = outopts->man;
+       h->base_includes = outopts->includes;
+       if (outopts->fragment)
+               h->oflags |= HTML_FRAGMENT;
 
-       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;
-               }
-
-       return(h);
+       return h;
 }
 
 void
@@ -237,13 +216,11 @@ print_metaf(struct html *h, enum mandoc_esc deco)
                font = HTMLFONT_BI;
                break;
        case ESCAPE_FONT:
-               /* FALLTHROUGH */
        case ESCAPE_FONTROMAN:
                font = HTMLFONT_NONE;
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        if (h->metaf) {
@@ -301,12 +278,11 @@ html_strlen(const char *cp)
                cp++;
                switch (mandoc_escape(&cp, NULL, NULL)) {
                case ESCAPE_ERROR:
-                       return(sz);
+                       return sz;
                case ESCAPE_UNICODE:
-                       /* FALLTHROUGH */
                case ESCAPE_NUMBERED:
-                       /* FALLTHROUGH */
                case ESCAPE_SPECIAL:
+               case ESCAPE_OVERSTRIKE:
                        if (skip)
                                skip = 0;
                        else
@@ -319,7 +295,7 @@ html_strlen(const char *cp)
                        break;
                }
        }
-       return(sz);
+       return sz;
 }
 
 static int
@@ -340,17 +316,17 @@ print_escape(char c)
                printf("&quot;");
                break;
        case ASCII_NBRSP:
-               putchar('-');
+               printf("&nbsp;");
                break;
        case ASCII_HYPH:
                putchar('-');
-               /* FALLTHROUGH */
+               break;
        case ASCII_BREAK:
                break;
        default:
-               return(0);
+               return 0;
        }
-       return(1);
+       return 1;
 }
 
 static int
@@ -389,15 +365,10 @@ print_encode(struct html *h, const char *p, int norecurse)
 
                switch (esc) {
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTPREV:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBOLD:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTITALIC:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBI:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTROMAN:
                        if (0 == norecurse)
                                print_metaf(h, esc);
@@ -425,7 +396,7 @@ print_encode(struct html *h, const char *p, int norecurse)
                                continue;
                        break;
                case ESCAPE_SPECIAL:
-                       c = mchars_spec2cp(h->symtab, seq, len);
+                       c = mchars_spec2cp(seq, len);
                        if (c <= 0)
                                continue;
                        break;
@@ -433,6 +404,11 @@ print_encode(struct html *h, const char *p, int norecurse)
                        if ('\0' == *p)
                                nospace = 1;
                        continue;
+               case ESCAPE_OVERSTRIKE:
+                       if (len == 0)
+                               continue;
+                       c = seq[len - 1];
+                       break;
                default:
                        continue;
                }
@@ -445,7 +421,7 @@ print_encode(struct html *h, const char *p, int norecurse)
                        putchar(c);
        }
 
-       return(nospace);
+       return nospace;
 }
 
 static void
@@ -507,18 +483,30 @@ print_otag(struct html *h, enum htmltag tag,
        if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags)
                putchar('\n');
 
-       return(t);
+       return t;
 }
 
 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->tags.head = tag->next;
+       free(tag);
 }
 
 void
@@ -580,17 +568,7 @@ print_tagq(struct html *h, const struct tag *until)
        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;
        }
@@ -604,17 +582,7 @@ print_stagq(struct html *h, const struct tag *suntil)
        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);
        }
 }