=================================================================== RCS file: /cvs/mandoc/chars.c,v retrieving revision 1.10 retrieving revision 1.35 diff -u -p -r1.10 -r1.35 --- mandoc/chars.c 2009/10/30 18:43:24 1.10 +++ mandoc/chars.c 2011/04/20 22:50:22 1.35 @@ -1,6 +1,7 @@ -/* $Id: chars.c,v 1.10 2009/10/30 18:43:24 kristaps Exp $ */ +/* $Id: chars.c,v 1.35 2011/04/20 22:50:22 kristaps Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,12 +15,17 @@ * 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 #include #include #include -#include "chars.h" +#include "mandoc.h" +#include "out.h" #define PRINT_HI 126 #define PRINT_LO 32 @@ -28,46 +34,43 @@ struct ln { 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) -#define CHARS_BOTH (0x03) +#define CHARS_BOTH (CHARS_CHAR | CHARS_STRING) }; -#define LINES_MAX 351 +#define LINES_MAX 353 -#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(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 }, -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 { +struct ctab { enum chars type; struct ln **htab; }; 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 ctab *, const char *, size_t, int); void chars_free(void *arg) { - struct tbl *tab; + struct ctab *tab; - tab = (struct tbl *)arg; + tab = (struct ctab *)arg; free(tab->htab); free(tab); @@ -77,7 +80,7 @@ chars_free(void *arg) void * chars_init(enum chars type) { - struct tbl *tab; + struct ctab *tab; struct ln **htab; struct ln *pp; int i, hash; @@ -89,18 +92,9 @@ chars_init(enum chars type) * (they're in-line re-ordered during lookup). */ - tab = malloc(sizeof(struct tbl)); - if (NULL == tab) { - fprintf(stderr, "memory exhausted\n"); - exit(EXIT_FAILURE); - } + tab = mandoc_malloc(sizeof(struct ctab)); + htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **)); - htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **)); - if (NULL == htab) { - fprintf(stderr, "memory exhausted\n"); - exit(EXIT_FAILURE); - } - for (i = 0; i < LINES_MAX; i++) { hash = (int)lines[i].code[0] - PRINT_LO; @@ -120,31 +114,101 @@ chars_init(enum chars type) } +/* + * Special character to Unicode codepoint. + */ +int +chars_spec2cp(void *arg, const char *p, size_t sz) +{ + const struct ln *ln; + + ln = find((struct ctab *)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 ctab *)arg, p, sz, CHARS_STRING); + if (NULL == ln) + return(-1); + return(ln->unicode); +} + + +/* + * Numbered character to literal character, + * represented as a null-terminated string for additional safety. + */ const char * -chars_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz) +chars_num2char(const char *p, size_t sz) { + int i; + static char c[2]; - return(find((struct tbl *)arg, p, sz, rsz, CHARS_CHAR)); + if (sz > 3) + return(NULL); + i = atoi(p); + if (i < 0 || i > 255) + return(NULL); + c[0] = (char)i; + c[1] = '\0'; + return(c); } +/* + * Special character to string array. + */ const char * -chars_a2res(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_STRING)); + ln = find((struct ctab *)arg, p, sz, CHARS_CHAR); + 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) +/* + * Reserved word to string array. + */ +const char * +chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz) { + const struct ln *ln; + + ln = find((struct ctab *)arg, p, sz, CHARS_STRING); + if (NULL == ln) + return(NULL); + + *rsz = strlen(ln->ascii); + return(ln->ascii); +} + + +static const struct ln * +find(struct ctab *tab, const char *p, size_t sz, int type) +{ 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); @@ -161,18 +225,6 @@ find(struct tbl *tab, const char *p, size_t sz, size_t 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; @@ -185,12 +237,7 @@ find(struct tbl *tab, const char *p, size_t sz, size_t htab[hash] = pp; } - if (CHARS_HTML == tab->type) { - *rsz = pp->htmlsz; - return(pp->html); - } - *rsz = pp->asciisz; - return(pp->ascii); + return(pp); } return(NULL); @@ -203,7 +250,7 @@ match(const struct ln *ln, const char *p, size_t sz, i if ( ! (ln->type & type)) return(0); - if (ln->codesz != sz) + if (strncmp(ln->code, p, sz)) return(0); - return(0 == strncmp(ln->code, p, sz)); + return('\0' == ln->code[(int)sz]); }