===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.71
retrieving revision 1.79
diff -u -p -r1.71 -r1.79
--- mandoc/mandoc.h	2011/04/29 22:18:12	1.71
+++ mandoc/mandoc.h	2011/07/17 12:52:54	1.79
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.71 2011/04/29 22:18:12 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.79 2011/07/17 12:52:54 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -104,6 +104,9 @@ enum	mandocerr {
 	MANDOCERR_BADESCAPE, /* unknown escape sequence */
 	MANDOCERR_BADQUOTE, /* unterminated quoted string */
 
+	/* related to equations */
+	MANDOCERR_EQNQUOTE, /* unexpected literal in equation */
+
 	MANDOCERR_ERROR, /* ===== start of errors ===== */
 
 	/* related to tables */
@@ -292,21 +295,16 @@ enum	mandoc_esc {
 	ESCAPE_ERROR = 0, /* bail! unparsable escape */
 	ESCAPE_IGNORE, /* escape to be ignored */
 	ESCAPE_SPECIAL, /* a regular special character */
-	ESCAPE_PREDEF, /* a predefined special character */
 	ESCAPE_FONT, /* a generic font mode */
 	ESCAPE_FONTBOLD, /* bold font mode */
 	ESCAPE_FONTITALIC, /* italic font mode */
 	ESCAPE_FONTROMAN, /* roman font mode */
 	ESCAPE_FONTPREV, /* previous font mode */
 	ESCAPE_NUMBERED, /* a numbered glyph */
+	ESCAPE_UNICODE, /* a unicode codepoint */
 	ESCAPE_NOSPACE /* suppress space if the last on a line */
 };
 
-enum	mcharst {
-	MCHARS_ASCII, /* 7-bit ascii representation */
-	MCHARS_HTML /* unicode values */
-};
-
 typedef	void	(*mandocmsg)(enum mandocerr, enum mandoclevel,
 			const char *, int, int, const char *);
 
@@ -329,15 +327,15 @@ const char	 *mparse_strlevel(enum mandoclevel);
 void		 *mandoc_calloc(size_t, size_t);
 void		 *mandoc_malloc(size_t);
 void		 *mandoc_realloc(void *, size_t);
+char		 *mandoc_strdup(const char *);
 
 enum mandoc_esc	  mandoc_escape(const char **, const char **, int *);
 
-struct mchars	 *mchars_init(enum mcharst);
-const char	 *mchars_num2char(const char *, size_t);
+struct mchars	 *mchars_alloc(void);
+char	 	  mchars_num2char(const char *, size_t);
+int		  mchars_num2uc(const char *, size_t);
 const char	 *mchars_spec2str(struct mchars *, const char *, size_t, size_t *);
 int		  mchars_spec2cp(struct mchars *, const char *, size_t);
-const char	 *mchars_res2str(struct mchars *, const char *, size_t, size_t *);
-int		  mchars_res2cp(struct mchars *, const char *, size_t);
 void		  mchars_free(struct mchars *);