while $() is more modern than ``, it does not work with the

[mandoc.git] / main.h

diff --git a/main.h b/main.h
index 60065e5f4353cfa2afe07922ba277f72e7145e58..19a630cde8b61a0a215568bbfb86fb76823e7bc1 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,7 +1,7 @@
-/*     $Id: main.h,v 1.21 2015/03/27 21:33:20 schwarze Exp $ */
+/*     $Id: main.h,v 1.30 2019/03/03 13:02:11 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2019 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -16,13 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
  * 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;
+struct roff_meta;

 struct manoutput;
 
 /*
 struct manoutput;
 
 /*


@@ -32,34 +26,28 @@ struct      manoutput;
  * terminal output routines with different character settings.
  */
 
  * 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_alloc(const struct manoutput *);
+void             html_mdoc(void *, const struct roff_meta *);
+void             html_man(void *, const struct roff_meta *);
+void             html_reset(void *);

 void             html_free(void *);
 
 void             html_free(void *);
 

-void             tree_mdoc(void *, const struct mdoc *);
-void             tree_man(void *, const struct man *);
+void             tree_mdoc(void *, const struct roff_meta *);
+void             tree_man(void *, const struct roff_meta *);

 
 

-void             man_mdoc(void *, const struct mdoc *);
-void             man_man(void *, const struct man *);
+void             man_mdoc(void *, const struct roff_meta *);

 
 

-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            *locale_alloc(const struct manoutput *);
+void            *utf8_alloc(const struct manoutput *);
+void            *ascii_alloc(const struct manoutput *);

 void             ascii_free(void *);
 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            *pdf_alloc(const struct manoutput *);
+void            *ps_alloc(const struct manoutput *);

 void             pspdf_free(void *);
 
 void             pspdf_free(void *);
 

-void             terminal_mdoc(void *, const struct mdoc *);
-void             terminal_man(void *, const struct man *);
+void             terminal_mdoc(void *, const struct roff_meta *);
+void             terminal_man(void *, const struct roff_meta *);
+void             terminal_sepline(void *);

 
 

-__END_DECLS
+void             markdown_mdoc(void *, const struct roff_meta *);