fix a typo that prevented names from .Dt from getting priority

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 62c7f294d55d2c1e98aa3d03a3a32304c91cfa65..65849602c27cc9d0b92955ebecf7294ea4582397 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.69 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: libman.h,v 1.79 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,28 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-enum   man_next {
-       MAN_NEXT_SIBLING = 0,
-       MAN_NEXT_CHILD
-};
-
-struct man {
-       struct mparse   *parse; /* parse pointer */
-       const char      *defos; /* default OS argument for .TH */
-       int              quick; /* abort parse early */
-       int              flags; /* parse flags */
-#define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
-#define        MAN_BLINE       (1 << 2) /* Next-line block scope. */
-#define        MAN_LITERAL     (1 << 4) /* Literal input. */
-#define        MAN_NEWLINE     (1 << 6) /* first macro/text in a line */
-       enum man_next    next; /* where to put the next node */
-       struct roff_node *last; /* the last parsed node */
-       struct roff_node *first; /* the first parsed node */
-       struct man_meta  meta; /* document meta-data */
-       struct roff     *roff;
-};
-
-#define        MACRO_PROT_ARGS   struct man *man, \
+#define        MACRO_PROT_ARGS   struct roff_man *man, \
                          int tok, \
                          int line, \
                          int ppos, \
@@ -55,19 +34,8 @@ struct       man_macro {
 
 extern const struct man_macro *const man_macros;
 
-__BEGIN_DECLS
 
-void             man_word_alloc(struct man *, int, int, const char *);
-void             man_word_append(struct man *, const char *);
-void             man_block_alloc(struct man *, int, int, int);
-void             man_head_alloc(struct man *, int, int, int);
-void             man_body_alloc(struct man *, int, int, int);
-void             man_elem_alloc(struct man *, int, int, int);
-void             man_node_delete(struct man *, struct roff_node *);
-void             man_hash_init(void);
 int              man_hash_find(const char *);
-void             man_macroend(struct man *);
-void             man_valid_post(struct man *);
-void             man_unscope(struct man *, const struct roff_node *);
-
-__END_DECLS
+void             man_node_validate(struct roff_man *);
+void             man_state(struct roff_man *, struct roff_node *);
+void             man_unscope(struct roff_man *, const struct roff_node *);