===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/mandoc/main.h	2014/12/31 16:50:54	1.15
--- src/usr.bin/mandoc/main.h	2015/03/27 21:17:16	1.16
***************
*** 1,15 ****
! /*	$OpenBSD: main.h,v 1.15 2014/12/31 16:50:54 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2014 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
   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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
--- 1,15 ----
! /*	$OpenBSD: main.h,v 1.16 2015/03/27 21:17:16 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 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 AUTHORS DISCLAIM ALL WARRANTIES
   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * 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
***************
*** 23,28 ****
--- 23,29 ----
  struct	mchars;
  struct	mdoc;
  struct	man;
+ struct	manoutput;
  
  /*
   * Definitions for main.c-visible output device functions, e.g., -Thtml
***************
*** 31,37 ****
   * terminal output routines with different character settings.
   */
  
! void		 *html_alloc(const struct mchars *, char *);
  void		  html_mdoc(void *, const struct mdoc *);
  void		  html_man(void *, const struct man *);
  void		  html_free(void *);
--- 32,39 ----
   * terminal output routines with different character settings.
   */
  
! void		 *html_alloc(const struct mchars *,
! 			const struct manoutput *);
  void		  html_mdoc(void *, const struct mdoc *);
  void		  html_man(void *, const struct man *);
  void		  html_free(void *);
***************
*** 42,55 ****
  void		  man_mdoc(void *, const struct mdoc *);
  void		  man_man(void *, const struct man *);
  
! void		 *locale_alloc(const struct mchars *, char *);
! void		 *utf8_alloc(const struct mchars *, char *);
! void		 *ascii_alloc(const struct mchars *, char *);
  void		  ascii_free(void *);
  void		  ascii_sepline(void *);
  
! void		 *pdf_alloc(const struct mchars *, char *);
! void		 *ps_alloc(const struct mchars *, char *);
  void		  pspdf_free(void *);
  
  void		  terminal_mdoc(void *, const struct mdoc *);
--- 44,62 ----
  void		  man_mdoc(void *, const struct mdoc *);
  void		  man_man(void *, const struct man *);
  
! void		 *locale_alloc(const struct mchars *,
! 			const struct manoutput *);
! void		 *utf8_alloc(const struct mchars *,
! 			const struct manoutput *);
! void		 *ascii_alloc(const struct mchars *,
! 			const struct manoutput *);
  void		  ascii_free(void *);
  void		  ascii_sepline(void *);
  
! void		 *pdf_alloc(const struct mchars *,
! 			const struct manoutput *);
! void		 *ps_alloc(const struct mchars *,
! 			const struct manoutput *);
  void		  pspdf_free(void *);
  
  void		  terminal_mdoc(void *, const struct mdoc *);