Remove "pt" from struct roffsu, as CSS (the only reason it was there) is

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 880a1f6d09dab344911c6ce8a693054181a0ebd0..126274c048feca9bc4de36126f879397bd3b47eb 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,6 @@
-/*     $Id: chars.c,v 1.11 2009/10/31 06:10:57 kristaps Exp $ */
+/*     $Id: chars.c,v 1.20 2010/06/19 20:46:27 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009 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
@@ -14,11 +14,16 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
 #include "chars.h"
 
 #define        PRINT_HI         126
@@ -35,10 +40,10 @@ struct      ln {
        int               type;
 #define        CHARS_CHAR       (1 << 0)
 #define        CHARS_STRING     (1 << 1)
-#define CHARS_BOTH      (0x03)
+#define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 
-#define        LINES_MAX         351
+#define        LINES_MAX         370
 
 #define CHAR(w, x, y, z, a, b) \
        { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR },
@@ -47,9 +52,10 @@ struct       ln {
 #define BOTH(w, x, y, z, a, b) \
        { NULL, (w), (y), (a), (x), (z), (b), CHARS_BOTH },
 
-static struct ln lines[LINES_MAX] = {
+#define        CHAR_TBL_START    static struct ln lines[LINES_MAX] = {
+#define        CHAR_TBL_END      };
+
 #include "chars.in"
-};
 
 struct tbl {
        enum chars        type;
@@ -161,18 +167,6 @@ find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
        if (NULL == (pp = htab[hash]))
                return(NULL);
 
-       if (NULL == pp->next) {
-               if ( ! match(pp, p, sz, type)) 
-                       return(NULL);
-
-               if (CHARS_HTML == tab->type) {
-                       *rsz = pp->htmlsz;
-                       return(pp->html);
-               }
-               *rsz = pp->asciisz;
-               return(pp->ascii);
-       }
-
        for (prev = NULL; pp; pp = pp->next) {
                if ( ! match(pp, p, sz, type)) {
                        prev = pp;