===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.62
retrieving revision 1.66
diff -u -p -r1.62 -r1.66
--- mandoc/mandoc.h	2011/03/20 11:41:24	1.62
+++ mandoc/mandoc.h	2011/03/22 10:35:26	1.66
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.62 2011/03/20 11:41:24 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.66 2011/03/22 10:35:26 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -137,6 +137,7 @@ enum	mandocerr {
 
 	MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
+	MANDOCERR_NOTMANUAL, /* manual isn't really a manual */
 	MANDOCERR_COLUMNS, /* column syntax is inconsistent */
 	MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
 	MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */
@@ -277,42 +278,6 @@ struct	eqn {
 };
 
 /*
- * Available registers (set in libroff, accessed elsewhere).
- */
-enum	regs {
-	REG_nS = 0,
-	REG__MAX
-};
-
-/*
- * A register (struct reg) can consist of many types: this consists of
- * normalised types from the original string form.
- */
-union	regval {
-	unsigned  u; /* unsigned integer */
-};
-
-/*
- * A single register entity.  If "set" is zero, the value of the
- * register should be the default one, which is per-register.  It's
- * assumed that callers know which type in "v" corresponds to which
- * register value.
- */
-struct	reg {
-	int		  set; /* whether set or not */
-	union regval	  v; /* parsed data */
-};
-
-/*
- * The primary interface to setting register values is in libroff,
- * although libmdoc and libman from time to time will manipulate
- * registers (such as `.Sh SYNOPSIS' enabling REG_nS).
- */
-struct	regset {
-	struct reg	  regs[REG__MAX];
-};
-
-/*
  * A punctuation delimiter, used only in mdoc(7) documents, is opening,
  * closing, or "middle mark" punctuation.  These govern spacing.
  * Opening punctuation (e.g., the opening parenthesis) suppresses the
@@ -339,10 +304,8 @@ enum	mparset {
 	MPARSE_MAN /* assume -man */
 };
 
-typedef	void	(*mandocmsg)(enum mandocerr, void *,
-			int, int, const char *);
-typedef	int	(*mevt_open)(void *, const char *);
-typedef	void	(*mevt_close)(void *, const char *);
+typedef	void	(*mandocmsg)(enum mandocerr, enum mandoclevel,
+			const char *, int, int, const char *);
 
 struct	mparse;
 struct	mdoc;
@@ -352,9 +315,8 @@ __BEGIN_DECLS
 
 void		  mparse_free(struct mparse *);
 void		  mparse_reset(struct mparse *);
-struct mparse	 *mparse_alloc(enum mparset, mevt_open, 
-			mevt_close, mandocmsg, void *);
-void		  mparse_setstatus(struct mparse *, enum mandoclevel);
+struct mparse	 *mparse_alloc(enum mparset, 
+			enum mandoclevel, mandocmsg, void *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 void		  mparse_result(struct mparse *, struct mdoc **, struct man **);