Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index 1b0bb6878d2efd2b764737f9004061b08867a7c1..08bfcc8e4de596760f2bb3cae3eb39dc3cc45646 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,6 +1,7 @@
-/*     $Id: man.h,v 1.58 2011/03/23 12:33:01 kristaps Exp $ */
+/*     $Id: man.h,v 1.67 2014/12/01 04:05:32 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,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef MAN_H
-#define MAN_H
 
 enum   mant {
        MAN_br = 0,
@@ -51,6 +50,12 @@ enum mant {
        MAN_AT,
        MAN_in,
        MAN_ft,
+       MAN_OP,
+       MAN_EX,
+       MAN_EE,
+       MAN_UR,
+       MAN_UE,
+       MAN_ll,
        MAN_MAX
 };
 
@@ -61,7 +66,6 @@ enum  man_type {
        MAN_BLOCK,
        MAN_HEAD,
        MAN_BODY,
-       MAN_TAIL,
        MAN_TBL,
        MAN_EQN
 };
@@ -72,6 +76,7 @@ struct        man_meta {
        char            *vol; /* `TH' volume */
        char            *title; /* `TH' title (e.g., FOO) */
        char            *source; /* `TH' source (e.g., GNU) */
+       int              hasbody; /* document is not empty */
 };
 
 struct man_node {
@@ -105,7 +110,7 @@ struct      man;
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);
+const struct mparse   *man_mparse(const struct man *);
+void man_deroff(char **, const struct man_node *);
 
 __END_DECLS
-
-#endif /*!MAN_H*/