enclosures sometimes cause bogus end-of-sentence

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index c4d7e7b12a37d5dc0041c7c9a6063fe93e50c3e9..43fedd6a58e0389fc6f1c1c47a688228ec537879 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,6 @@
-/*     $Id: chars.c,v 1.8 2009/09/23 09:06:44 kristaps Exp $ */
+/*     $Id: chars.c,v 1.30 2010/09/15 13:10:30 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010 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
  *
  * 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.
  */
  * 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 <stdlib.h>
 #include <string.h>
 

+#include "mandoc.h"

 #include "chars.h"
 
 #define        PRINT_HI         126
 #include "chars.h"
 
 #define        PRINT_HI         126


@@ -28,28 +33,26 @@ struct      ln {
        struct ln        *next;
        const char       *code;
        const char       *ascii;
        struct ln        *next;
        const char       *code;
        const char       *ascii;

-       const char       *html;
-       size_t            codesz;
-       size_t            asciisz;
-       size_t            htmlsz;
+       int               unicode;

        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         337
+#define        LINES_MAX         351
+
+#define CHAR(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_CHAR },
+#define STRING(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_STRING },
+#define BOTH(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_BOTH },

 
 

-#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_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 {
        enum chars        type;
 
 struct tbl {
        enum chars        type;


@@ -58,8 +61,7 @@ struct        tbl {
 
 static inline int        match(const struct ln *,
                                const char *, size_t, int);
 
 static inline int        match(const struct ln *,
                                const char *, size_t, int);

-static const char       *find(struct tbl *, const char *, 
-                               size_t, size_t *, int);
+static const struct ln  *find(struct tbl *, const char *, size_t, int);

 
 
 void
 
 
 void


@@ -89,13 +91,17 @@ 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");
-       tab->type = type;
+       tab = malloc(sizeof(struct tbl));
+       if (NULL == tab) {
+               perror(NULL);
+               exit((int)MANDOCLEVEL_SYSERR);
+       }

 
        htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
 
        htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));

-       if (NULL == htab)
-               err(1, "malloc");
+       if (NULL == htab) {
+               perror(NULL);
+               exit((int)MANDOCLEVEL_SYSERR);
+       }

 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;
 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;


@@ -111,35 +117,85 @@ chars_init(enum chars type)
        }
 
        tab->htab = htab;
        }
 
        tab->htab = htab;

+       tab->type = type;

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

+/* 
+ * Special character to Unicode codepoint.
+ */
+int
+chars_spec2cp(void *arg, const char *p, size_t sz)
+{
+       const struct ln *ln;
+
+       ln = find((struct tbl *)arg, p, sz, CHARS_CHAR);
+       if (NULL == ln)
+               return(-1);
+       return(ln->unicode);
+}
+
+
+/* 
+ * Reserved word to Unicode codepoint.
+ */
+int
+chars_res2cp(void *arg, const char *p, size_t sz)
+{
+       const struct ln *ln;
+
+       ln = find((struct tbl *)arg, p, sz, CHARS_STRING);
+       if (NULL == ln)
+               return(-1);
+       return(ln->unicode);
+}
+
+
+/* 
+ * Special character to string array.
+ */

 const char *
 const char *

-chars_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz)
+chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz)

 {
 {

+       const struct ln *ln;

 
 

-       return(find((struct tbl *)arg, p, sz, rsz, CHARS_CHAR));
+       ln = find((struct tbl *)arg, p, sz, CHARS_CHAR);
+       if (NULL == ln)
+               return(NULL);
+
+       *rsz = strlen(ln->ascii);
+       return(ln->ascii);

 }
 
 
 }
 
 

+/* 
+ * Reserved word to string array.
+ */

 const char *
 const char *

-chars_a2res(void *arg, const char *p, size_t sz, size_t *rsz)
+chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)

 {
 {

+       const struct ln *ln;

 
 

-       return(find((struct tbl *)arg, p, sz, rsz, CHARS_STRING));
+       ln = find((struct tbl *)arg, p, sz, CHARS_STRING);
+       if (NULL == ln)
+               return(NULL);
+
+       *rsz = strlen(ln->ascii);
+       return(ln->ascii);

 }
 
 
 }
 
 

-static const char *
-find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
+static const struct ln *
+find(struct tbl *tab, const char *p, size_t sz, int type)

 {
        struct ln        *pp, *prev;
        struct ln       **htab;
        int               hash;
 
        assert(p);
 {
        struct ln        *pp, *prev;
        struct ln       **htab;
        int               hash;
 
        assert(p);

-       assert(sz > 0);
+       if (0 == sz)
+               return(NULL);

 
        if (p[0] < PRINT_LO || p[0] > PRINT_HI)
                return(NULL);
 
        if (p[0] < PRINT_LO || p[0] > PRINT_HI)
                return(NULL);


@@ -156,18 +212,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 = 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;
        for (prev = NULL; pp; pp = pp->next) {
                if ( ! match(pp, p, sz, type)) {
                        prev = pp;


@@ -180,12 +224,7 @@ find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
                        htab[hash] = pp;
                }
 
                        htab[hash] = pp;
                }
 

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

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


@@ -198,7 +237,7 @@ match(const struct ln *ln, const char *p, size_t sz, int type)
 
        if ( ! (ln->type & type))
                return(0);
 
        if ( ! (ln->type & type))
                return(0);

-       if (ln->codesz != sz)
+       if (strncmp(ln->code, p, sz))

                return(0);
                return(0);

-       return(0 == strncmp(ln->code, p, sz));
+       return('\0' == ln->code[(int)sz]);

 }
 }