===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.60
retrieving revision 1.65
diff -u -p -r1.60 -r1.65
--- mandoc/mandoc.h	2011/03/17 09:16:38	1.60
+++ mandoc/mandoc.h	2011/03/22 09:48:13	1.65
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.60 2011/03/17 09:16:38 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.65 2011/03/22 09:48:13 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -277,42 +277,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
@@ -328,10 +292,32 @@ enum	mdelim {
 	DELIM_CLOSE
 };
 
-typedef	int	(*mandocmsg)(enum mandocerr, void *,
-			int, int, const char *);
+/*
+ * The type of parse sequence.  This value is usually passed via the
+ * mandoc(1) command line of -man and -mdoc.  It's almost exclusively
+ * -mandoc but the others have been retained for compatibility.
+ */
+enum	mparset {
+	MPARSE_AUTO, /* magically determine the document type */
+	MPARSE_MDOC, /* assume -mdoc */
+	MPARSE_MAN /* assume -man */
+};
 
+typedef	void	(*mandocmsg)(enum mandocerr, enum mandoclevel,
+			const char *, int, int, const char *);
+
+struct	mparse;
+struct	mdoc;
+struct	man;
+
 __BEGIN_DECLS
+
+void		  mparse_free(struct mparse *);
+void		  mparse_reset(struct mparse *);
+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 **);
 
 void		 *mandoc_calloc(size_t, size_t);
 void		 *mandoc_malloc(size_t);