X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/29cecee7ff6894517a32d929aecee283bb85058c..dad3f5fc59c880f22cf4466047c31f280b9f8cc8:/main.h

diff --git a/main.h b/main.h
index beb0481c..9b04a781 100644
--- a/main.h
+++ b/main.h
@@ -1,6 +1,7 @@
-/*	$Id: main.h,v 1.16 2014/04/20 16:46:04 schwarze Exp $ */
+/*	$Id: main.h,v 1.20 2014/12/31 16:52:40 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
@@ -14,17 +15,15 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef	MAIN_H
-#define	MAIN_H
+
+#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 
 __BEGIN_DECLS
 
+struct	mchars;
 struct	mdoc;
 struct	man;
 
-#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
-
-
 /*
  * Definitions for main.c-visible output device functions, e.g., -Thtml
  * and -Tascii.  Note that ascii_alloc() is named as such in
@@ -32,8 +31,7 @@ struct	man;
  * terminal output routines with different character settings.
  */
 
-void		 *html_alloc(char *);
-void		 *xhtml_alloc(char *);
+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 *);
@@ -44,18 +42,17 @@ void		  tree_man(void *, const struct man *);
 void		  man_mdoc(void *, const struct mdoc *);
 void		  man_man(void *, const struct man *);
 
-void		 *locale_alloc(char *);
-void		 *utf8_alloc(char *);
-void		 *ascii_alloc(char *);
+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(char *);
-void		 *ps_alloc(char *);
+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 *);
 void		  terminal_man(void *, const struct man *);
 
 __END_DECLS
-
-#endif /*!MAIN_H*/