Tentative fix of quoted punctuation issue noted by Jason McIntyre, e.g., `Li "!"...

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 6c2298f0773c5aed7a9a1936475922b819799e3e..461ac067bbcb87f8853942b717fae538000b89fd 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.1 2009/09/17 07:41:28 kristaps Exp $ */
+/*     $Id: chars.c,v 1.17 2010/03/23 13:25:01 kristaps Exp $ */

 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,42 +14,50 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <assert.h>

-#include <err.h>
+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include "chars.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "chars.h"
 

-#define        ASCII_PRINT_HI   126
-#define        ASCII_PRINT_LO   32
+#define        PRINT_HI         126
+#define        PRINT_LO         32

 
 struct ln {
        struct ln        *next;
        const char       *code;
 
 struct ln {
        struct ln        *next;
        const char       *code;

-       const char       *out;
+       const char       *ascii;
+       const char       *html;

        size_t            codesz;
        size_t            codesz;

-       size_t            outsz;
+       size_t            asciisz;
+       size_t            htmlsz;

        int               type;
 #define        CHARS_CHAR       (1 << 0)
 #define        CHARS_STRING     (1 << 1)
        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         266
+#define        LINES_MAX         369
+
+#define CHAR(w, x, y, z, a, b) \
+       { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR },
+#define STRING(w, x, y, z, a, b) \
+       { NULL, (w), (y), (a), (x), (z), (b), CHARS_STRING },
+#define BOTH(w, x, y, z, a, b) \
+       { NULL, (w), (y), (a), (x), (z), (b), CHARS_BOTH },

 
 

-#define CHAR(w, x, y, z) \
-       { NULL, (w), (y), (x), (z), CHARS_CHAR },
-#define STRING(w, x, y, z) \
-       { NULL, (w), (y), (x), (z), CHARS_STRING },
-#define BOTH(w, x, y, z) \
-       { NULL, (w), (y), (x), (z), CHARS_BOTH },
+#define        CHAR_TBL_START    static struct ln lines[LINES_MAX] = {
+#define        CHAR_TBL_END      };

 
 

-static struct ln lines[LINES_MAX] = {

 #include "chars.in"
 #include "chars.in"

-};

 
 struct tbl {
 
 struct tbl {

+       enum chars        type;

        struct ln       **htab;
 };
 
        struct ln       **htab;
 };
 


@@ -71,7 +79,6 @@ chars_free(void *arg)
 }
 
 
 }
 
 

-/* ARGSUSED */

 void *
 chars_init(enum chars type)
 {
 void *
 chars_init(enum chars type)
 {


@@ -87,21 +94,20 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
         * (they're in-line re-ordered during lookup).
         */
 

-       if (NULL == (tab = malloc(sizeof(struct tbl))))
-               err(1, "malloc");
-
-       htab = calloc(ASCII_PRINT_HI - ASCII_PRINT_LO + 1, 
-                       sizeof(struct ln **));
+       tab = malloc(sizeof(struct tbl));
+       if (NULL == tab) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }

 
 

-       if (NULL == htab)
-               err(1, "malloc");
+       htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
+       if (NULL == htab) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }

 
        for (i = 0; i < LINES_MAX; i++) {
 
        for (i = 0; i < LINES_MAX; i++) {

-               assert(lines[i].codesz > 0);
-               assert(lines[i].code);
-               assert(lines[i].out);
-
-               hash = (int)lines[i].code[0] - ASCII_PRINT_LO;
+               hash = (int)lines[i].code[0] - PRINT_LO;

 
                if (NULL == (pp = htab[hash])) {
                        htab[hash] = &lines[i];
 
                if (NULL == (pp = htab[hash])) {
                        htab[hash] = &lines[i];


@@ -110,11 +116,11 @@ chars_init(enum chars type)
 
                for ( ; pp->next; pp = pp->next)
                        /* Scan ahead. */ ;
 
                for ( ; pp->next; pp = pp->next)
                        /* Scan ahead. */ ;

-

                pp->next = &lines[i];
        }
 
        tab->htab = htab;
                pp->next = &lines[i];
        }
 
        tab->htab = htab;

+       tab->type = type;

        return(tab);
 }
 
        return(tab);
 }
 


@@ -145,7 +151,7 @@ find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
        assert(p);
        assert(sz > 0);
 
        assert(p);
        assert(sz > 0);
 

-       if (p[0] < ASCII_PRINT_LO || p[0] > ASCII_PRINT_HI)
+       if (p[0] < PRINT_LO || p[0] > PRINT_HI)

                return(NULL);
 
        /*
                return(NULL);
 
        /*


@@ -154,35 +160,30 @@ find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
         * to optimise for repeat hits.
         */
 
         * to optimise for repeat hits.
         */
 

-       hash = (int)p[0] - ASCII_PRINT_LO;
+       hash = (int)p[0] - PRINT_LO;

        htab = tab->htab;
 
        if (NULL == (pp = htab[hash]))
                return(NULL);
 
        htab = tab->htab;
 
        if (NULL == (pp = htab[hash]))
                return(NULL);
 

-       if (NULL == pp->next) {
-               if ( ! match(pp, p, sz, type)) 
-                       return(NULL);
-               *rsz = pp->outsz;
-               return(pp->out);
-       }
-

        for (prev = NULL; pp; pp = pp->next) {
                if ( ! match(pp, p, sz, type)) {
                        prev = pp;
                        continue;
                }
 
        for (prev = NULL; pp; pp = pp->next) {
                if ( ! match(pp, p, sz, type)) {
                        prev = pp;
                        continue;
                }
 

-               /* Re-order the hash chain. */
-

                if (prev) {
                        prev->next = pp->next;
                        pp->next = htab[hash];
                        htab[hash] = pp;
                }
 
                if (prev) {
                        prev->next = pp->next;
                        pp->next = htab[hash];
                        htab[hash] = pp;
                }
 

-               *rsz = pp->outsz;
-               return(pp->out);
+               if (CHARS_HTML == tab->type) {
+                       *rsz = pp->htmlsz;
+                       return(pp->html);
+               }
+               *rsz = pp->asciisz;
+               return(pp->ascii);

        }
 
        return(NULL);
        }
 
        return(NULL);