===================================================================
RCS file: /cvs/mandoc/chars.c,v
retrieving revision 1.37
retrieving revision 1.46
diff -u -p -r1.37 -r1.46
--- mandoc/chars.c	2011/04/30 22:14:02	1.37
+++ mandoc/chars.c	2011/05/24 21:31:23	1.46
@@ -1,4 +1,4 @@
-/*	$Id: chars.c,v 1.37 2011/04/30 22:14:02 kristaps Exp $ */
+/*	$Id: chars.c,v 1.46 2011/05/24 21:31:23 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,11 +20,13 @@
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
+#include "libmandoc.h"
 
 #define	PRINT_HI	 126
 #define	PRINT_LO	 32
@@ -34,20 +36,12 @@ struct	ln {
 	const char	 *code;
 	const char	 *ascii;
 	int		  unicode;
-	int		  type;
-#define	CHARS_CHAR	 (1 << 0)
-#define	CHARS_STRING	 (1 << 1)
-#define CHARS_BOTH	 (CHARS_CHAR | CHARS_STRING)
 };
 
-#define	LINES_MAX	  353
+#define	LINES_MAX	  325
 
 #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 },
+	{ NULL, (in), (ch), (code) },
 
 #define	CHAR_TBL_START	  static struct ln lines[LINES_MAX] = {
 #define	CHAR_TBL_END	  };
@@ -58,9 +52,8 @@ struct	mchars {
 	struct ln	**htab;
 };
 
-static	inline int	  match(const struct ln *,
-				const char *, size_t, int);
-static	const struct ln	 *find(struct mchars *, const char *, size_t, int);
+static	inline int	  match(const struct ln *, const char *, size_t);
+static	const struct ln	 *find(struct mchars *, const char *, size_t);
 
 void
 mchars_free(struct mchars *arg)
@@ -71,7 +64,7 @@ mchars_free(struct mchars *arg)
 }
 
 struct mchars *
-mchars_init(void)
+mchars_alloc(void)
 {
 	struct mchars	 *tab;
 	struct ln	**htab;
@@ -114,49 +107,44 @@ mchars_spec2cp(struct mchars *arg, const char *p, size
 {
 	const struct ln	*ln;
 
-	ln = find(arg, p, sz, CHARS_CHAR);
+	ln = find(arg, p, sz);
 	if (NULL == ln)
 		return(-1);
 	return(ln->unicode);
 }
 
-
-/* 
- * Reserved word to Unicode codepoint.
+/*
+ * Numbered character string to ASCII codepoint.
+ * This can only be a printable character (i.e., alnum, punct, space) so
+ * prevent the character from ruining our state (backspace, newline, and
+ * so on).
+ * If the character is illegal, returns '\0'.
  */
-int
-mchars_res2cp(struct mchars *arg, const char *p, size_t sz)
+char
+mchars_num2char(const char *p, size_t sz)
 {
-	const struct ln	*ln;
+	int		  i;
 
-	ln = find(arg, p, sz, CHARS_STRING);
-	if (NULL == ln)
-		return(-1);
-	return(ln->unicode);
+	if ((i = mandoc_strntou(p, sz, 10)) < 0)
+		return('\0');
+	return(isprint(i) ? i : '\0');
 }
 
-
 /*
- * Numbered character to literal character,
- * represented as a null-terminated string for additional safety.
+ * Hex character string to Unicode codepoint.
+ * If the character is illegal, returns '\0'.
  */
-const char *
-mchars_num2char(const char *p, size_t sz)
+int
+mchars_num2uc(const char *p, size_t sz)
 {
-	int		  i;
-	static char	  c[2];
+	int               i;
 
-	if (sz > 3)
-		return(NULL);
-	i = atoi(p);
-	if (i < 0 || i > 255)
-		return(NULL);
-	c[0] = (char)i;
-	c[1] = '\0';
-	return(c);
+	if ((i = mandoc_strntou(p, sz, 16)) < 0)
+		return('\0');
+	/* FIXME: make sure we're not in a bogus range. */
+	return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
 }
 
-
 /* 
  * Special character to string array.
  */
@@ -165,7 +153,7 @@ mchars_spec2str(struct mchars *arg, const char *p, siz
 {
 	const struct ln	*ln;
 
-	ln = find(arg, p, sz, CHARS_CHAR);
+	ln = find(arg, p, sz);
 	if (NULL == ln)
 		return(NULL);
 
@@ -173,25 +161,8 @@ mchars_spec2str(struct mchars *arg, const char *p, siz
 	return(ln->ascii);
 }
 
-
-/* 
- * Reserved word to string array.
- */
-const char *
-mchars_res2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz)
-{
-	const struct ln	*ln;
-
-	ln = find(arg, p, sz, CHARS_STRING);
-	if (NULL == ln)
-		return(NULL);
-
-	*rsz = strlen(ln->ascii);
-	return(ln->ascii);
-}
-
 static const struct ln *
-find(struct mchars *tab, const char *p, size_t sz, int type)
+find(struct mchars *tab, const char *p, size_t sz)
 {
 	struct ln	 *pp, *prev;
 	struct ln	**htab;
@@ -217,7 +188,7 @@ find(struct mchars *tab, const char *p, size_t sz, int
 		return(NULL);
 
 	for (prev = NULL; pp; pp = pp->next) {
-		if ( ! match(pp, p, sz, type)) {
+		if ( ! match(pp, p, sz)) {
 			prev = pp;
 			continue;
 		}
@@ -235,11 +206,9 @@ find(struct mchars *tab, const char *p, size_t sz, int
 }
 
 static inline int
-match(const struct ln *ln, const char *p, size_t sz, int type)
+match(const struct ln *ln, const char *p, size_t sz)
 {
 
-	if ( ! (ln->type & type))
-		return(0);
 	if (strncmp(ln->code, p, sz))
 		return(0);
 	return('\0' == ln->code[(int)sz]);