Vastly simplify man(7) block unwinding, similar to mdoc_macro.c 1.171.

[mandoc.git] / main.h

diff --git a/main.h b/main.h
index 29fc0c076340ed22c9d20a2064cfb58328b2cacc..60065e5f4353cfa2afe07922ba277f72e7145e58 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,27 +1,29 @@
-/*     $Id: main.h,v 1.18 2014/12/01 04:05:32 schwarze Exp $ */
+/*     $Id: main.h,v 1.21 2015/03/27 21:33:20 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 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
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#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))
-
+struct manoutput;
 
 /*
  * Definitions for main.c-visible output device functions, e.g., -Thtml
@@ -30,7 +32,8 @@ struct        man;
  * terminal output routines with different character settings.
  */
 
-void            *html_alloc(const struct mchars *, char *);
+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 *);
@@ -41,13 +44,19 @@ void                  tree_man(void *, const struct man *);
 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            *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 *, char *);
-void            *ps_alloc(const struct mchars *, char *);
+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 *);