===================================================================
RCS file: /cvs/mandoc/libmandoc.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- mandoc/libmandoc.h	2015/01/15 04:26:39	1.55
+++ mandoc/libmandoc.h	2015/04/18 16:06:39	1.56
@@ -1,15 +1,15 @@
-/*	$Id: libmandoc.h,v 1.55 2015/01/15 04:26:39 schwarze Exp $ */
+/*	$Id: libmandoc.h,v 1.56 2015/04/18 16:06:39 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -39,8 +39,7 @@ struct	mchars;
 struct	tbl_span;
 struct	eqn;
 struct	roff;
-struct	mdoc;
-struct	man;
+struct	roff_man;
 
 void		 mandoc_msg(enum mandocerr, struct mparse *,
 			int, int, const char *);
@@ -55,23 +54,23 @@ int		 mandoc_eos(const char *, size_t);
 int		 mandoc_strntoi(const char *, size_t, int);
 const char	*mandoc_a2msec(const char*);
 
-void		 mdoc_free(struct mdoc *);
-struct	mdoc	*mdoc_alloc(struct roff *, struct mparse *,
+void		 mdoc_free(struct roff_man *);
+struct roff_man	*mdoc_alloc(struct roff *, struct mparse *,
 			const char *, int);
-void		 mdoc_reset(struct mdoc *);
-int		 mdoc_parseln(struct mdoc *, int, char *, int);
-void		 mdoc_endparse(struct mdoc *);
-void		 mdoc_addspan(struct mdoc *, const struct tbl_span *);
-void		 mdoc_addeqn(struct mdoc *, const struct eqn *);
+void		 mdoc_reset(struct roff_man *);
+int		 mdoc_parseln(struct roff_man *, int, char *, int);
+void		 mdoc_endparse(struct roff_man *);
+void		 mdoc_addspan(struct roff_man *, const struct tbl_span *);
+void		 mdoc_addeqn(struct roff_man *, const struct eqn *);
 
-void		 man_free(struct man *);
-struct	man	*man_alloc(struct roff *, struct mparse *,
+void		 man_free(struct roff_man *);
+struct roff_man	*man_alloc(struct roff *, struct mparse *,
 			const char *, int);
-void		 man_reset(struct man *);
-int		 man_parseln(struct man *, int, char *, int);
-void		 man_endparse(struct man *);
-void		 man_addspan(struct man *, const struct tbl_span *);
-void		 man_addeqn(struct man *, const struct eqn *);
+void		 man_reset(struct roff_man *);
+int		 man_parseln(struct roff_man *, int, char *, int);
+void		 man_endparse(struct roff_man *);
+void		 man_addspan(struct roff_man *, const struct tbl_span *);
+void		 man_addeqn(struct roff_man *, const struct eqn *);
 
 int		 preconv_cue(const struct buf *, size_t);
 int		 preconv_encode(struct buf *, size_t *,