Regression fixes after merging 1.11.3 to OpenBSD (rev. 1.20):

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 2bc500273b956f60cd529e27eb26f25f7a878a2e..a0f26776416b7c8fd8314279a912deadfa0fe62b 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.38 2010/06/26 16:07:08 kristaps Exp $ */
+/*     $Id: libman.h,v 1.53 2011/07/18 07:48:14 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,18 +17,13 @@
 #ifndef LIBMAN_H
 #define LIBMAN_H
 
-#include "regs.h"
-#include "man.h"
-
 enum   man_next {
        MAN_NEXT_SIBLING = 0,
        MAN_NEXT_CHILD
 };
 
 struct man {
-       void            *data;
-       mandocmsg        msg;
-       int              pflags; /* parse flags (see man.h) */
+       struct mparse   *parse; /* parse pointer */
        int              flags; /* parse flags */
 #define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
@@ -36,14 +31,15 @@ struct      man {
 #define        MAN_ILINE       (1 << 3) /* Ignored in next-line scope. */
 #define        MAN_LITERAL     (1 << 4) /* Literal input. */
 #define        MAN_BPLINE      (1 << 5)
-       enum man_next    next;
-       struct man_node *last;
-       struct man_node *first;
-       struct man_meta  meta;
+#define        MAN_NEWLINE     (1 << 6) /* first macro/text in a line */
+       enum man_next    next; /* where to put the next node */
+       struct man_node *last; /* the last parsed node */
+       struct man_node *first; /* the first parsed node */
+       struct man_meta  meta; /* document meta-data */
+       struct roff     *roff;
 };
 
 #define        MACRO_PROT_ARGS   struct man *m, \
-                         const struct regset *regs, \
                          enum mant tok, \
                          int line, \
                          int ppos, \
@@ -65,29 +61,21 @@ extern      const struct man_macro *const man_macros;
 __BEGIN_DECLS
 
 #define                  man_pmsg(m, l, p, t) \
-                 (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+                 mandoc_msg((t), (m)->parse, (l), (p), NULL)
 #define                  man_nmsg(m, n, t) \
-                 (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
+                 mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
 int              man_word_alloc(struct man *, int, int, const char *);
 int              man_block_alloc(struct man *, int, int, enum mant);
 int              man_head_alloc(struct man *, int, int, enum mant);
+int              man_tail_alloc(struct man *, int, int, enum mant);
 int              man_body_alloc(struct man *, int, int, enum mant);
 int              man_elem_alloc(struct man *, int, int, enum mant);
 void             man_node_delete(struct man *, struct man_node *);
 void             man_hash_init(void);
-enum   mant      man_hash_find(const char *);
+enum mant        man_hash_find(const char *);
 int              man_macroend(struct man *);
-int              man_args(struct man *, int, int *, char *, char **);
-#define        ARGS_ERROR      (-1)
-#define        ARGS_EOLN       (0)
-#define        ARGS_WORD       (1)
-#define        ARGS_QWORD      (1)
-int              man_vmsg(struct man *, enum mandocerr,
-                       int, int, const char *, ...);
 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, struct man_node *);
-int              man_action_post(struct man *);
-int              man_action_pre(struct man *, struct man_node *);
 int              man_unscope(struct man *, 
                        const struct man_node *, enum mandocerr);