===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/mandoc/mandoc.h	2014/01/22 20:58:35	1.59
--- src/usr.bin/mandoc/mandoc.h	2014/03/19 21:50:59	1.60
***************
*** 1,4 ****
! /*	$Id: mandoc.h,v 1.59 2014/01/22 20:58:35 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mandoc.h,v 1.60 2014/03/19 21:50:59 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 372,386 ****
  };
  
  /*
!  * 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 */
! };
  
  enum	mandoc_esc {
  	ESCAPE_ERROR = 0, /* bail! unparsable escape */
--- 372,383 ----
  };
  
  /*
!  * Parse options.
   */
! #define	MPARSE_MDOC	1  /* assume -mdoc */
! #define	MPARSE_MAN	2  /* assume -man */
! #define	MPARSE_SO	4  /* honour .so requests */
! #define	MPARSE_QUICK	8  /* abort the parse early */
  
  enum	mandoc_esc {
  	ESCAPE_ERROR = 0, /* bail! unparsable escape */
***************
*** 422,429 ****
  			const char *, size_t);
  const char	 *mchars_spec2str(const struct mchars *, 
  			const char *, size_t, size_t *);
! struct mparse	 *mparse_alloc(enum mparset, enum mandoclevel,
! 			mandocmsg, char *, int);
  void		  mparse_free(struct mparse *);
  void		  mparse_keep(struct mparse *);
  enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
--- 419,425 ----
  			const char *, size_t);
  const char	 *mchars_spec2str(const struct mchars *, 
  			const char *, size_t, size_t *);
! struct mparse	 *mparse_alloc(int, enum mandoclevel, mandocmsg, char *);
  void		  mparse_free(struct mparse *);
  void		  mparse_keep(struct mparse *);
  enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);