===================================================================
RCS file: /cvs/mandoc/chars.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -p -r1.19 -r1.23
--- mandoc/chars.c	2010/06/01 11:47:28	1.19
+++ mandoc/chars.c	2010/07/18 12:10:08	1.23
@@ -1,6 +1,6 @@
-/*	$Id: chars.c,v 1.19 2010/06/01 11:47:28 kristaps Exp $ */
+/*	$Id: chars.c,v 1.23 2010/07/18 12:10:08 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
@@ -33,10 +33,8 @@ 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)
@@ -45,12 +43,12 @@ struct	ln {
 
 #define	LINES_MAX	  370
 
-#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, chsz, code) \
+	{ NULL, (in), (ch), (chsz), (code), CHARS_CHAR },
+#define STRING(in, ch, chsz, code) \
+	{ NULL, (in), (ch), (chsz), (code), CHARS_STRING },
+#define BOTH(in, ch, chsz, code) \
+	{ NULL, (in), (ch), (chsz), (code), CHARS_BOTH },
 
 #define	CHAR_TBL_START	  static struct ln lines[LINES_MAX] = {
 #define	CHAR_TBL_END	  };
@@ -64,8 +62,7 @@ struct	tbl {
 
 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
@@ -126,31 +123,80 @@ 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 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 *
-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 = ln->asciisz;
+	return(ln->ascii);
 }
 
 
+/* 
+ * Reserved word to string array.
+ */
 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 = ln->asciisz;
+	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);
-	assert(sz > 0);
+	if (0 == sz)
+		return(NULL);
 
 	if (p[0] < PRINT_LO || p[0] > PRINT_HI)
 		return(NULL);
@@ -179,12 +225,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);
@@ -197,7 +238,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]);
 }