delete some TODO entries that were already fixed

[mandoc.git] / main.h

diff --git a/main.h b/main.h
index 75637b36b5f29adf5f8949b9b2d9de255ee4b43e..19dd0f653964b48ad921e4f6c185fb2cb3b43968 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,57 +1,64 @@
-/*     $Id: main.h,v 1.11 2011/05/17 14:38:34 kristaps Exp $ */
+/*     $Id: main.h,v 1.22 2015/04/18 16:06:40 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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.
  *
  *
  * 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
  * 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.
  */
  * 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.
  */

-#ifndef        MAIN_H
-#define        MAIN_H
-
-__BEGIN_DECLS
-
-struct mdoc;
-struct man;

 
 #define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
 
 #define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 

+__BEGIN_DECLS
+
+struct mchars;
+struct roff_man;
+struct manoutput;

 
 

-/* 
+/*

  * Definitions for main.c-visible output device functions, e.g., -Thtml
  * and -Tascii.  Note that ascii_alloc() is named as such in
  * anticipation of latin1_alloc() and so on, all of which map into the
  * terminal output routines with different character settings.
  */
 
  * Definitions for main.c-visible output device functions, e.g., -Thtml
  * and -Tascii.  Note that ascii_alloc() is named as such in
  * anticipation of latin1_alloc() and so on, all of which map into the
  * terminal output routines with different character settings.
  */
 

-void            *html_alloc(char *);
-void            *xhtml_alloc(char *);
-void             html_mdoc(void *, const struct mdoc *);
-void             html_man(void *, const struct man *);
+void            *html_alloc(const struct mchars *,
+                       const struct manoutput *);
+void             html_mdoc(void *, const struct roff_man *);
+void             html_man(void *, const struct roff_man *);

 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_man *);
+void             tree_man(void *, const struct roff_man *);

 
 

-void            *locale_alloc(char *);
-void            *ascii_alloc(char *);
+void             man_mdoc(void *, const struct roff_man *);
+void             man_man(void *, const struct roff_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_free(void *);

+void             ascii_sepline(void *);

 
 

-void            *pdf_alloc(char *);
-void            *ps_alloc(char *);
+void            *pdf_alloc(const struct mchars *,
+                       const struct manoutput *);
+void            *ps_alloc(const struct mchars *,
+                       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_man *);
+void             terminal_man(void *, const struct roff_man *);

 
 __END_DECLS
 
 __END_DECLS

-
-#endif /*!MAIN_H*/