Two minor improvements:

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 0df07036ebff114c037c898a098f6f7b73ea3a89..ac960a685889db85c29c7bac0e298f4e22cc0c3c 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,61 +1,42 @@
-/* $Id: libman.h,v 1.6 2009/03/25 21:03:13 kristaps Exp $ */
+/*     $Id: libman.h,v 1.86 2018/12/31 10:04:39 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015, 2018 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.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * 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.
  */
-#ifndef LIBMAN_H
-#define LIBMAN_H
 
-#include "man.h"
+struct roff_node;
+struct roff_man;
 
-enum   man_next {
-       MAN_NEXT_SIBLING = 0,
-       MAN_NEXT_CHILD
-};
+#define        MACRO_PROT_ARGS   struct roff_man *man, \
+                         enum roff_tok tok, \
+                         int line, \
+                         int ppos, \
+                         int *pos, \
+                         char *buf
 
-struct man {
-       void            *data;
-       struct man_cb    cb;
-       void            *htab;
-       int              pflags;
-       int              flags;
-#define        MAN_HALT        (1 << 0)
-       enum man_next    next;
-       struct man_node *last;
-       struct man_node *first;
-       struct man_meta  meta;
+struct man_macro {
+       void            (*fp)(MACRO_PROT_ARGS);
+       int               flags;
+#define        MAN_BSCOPED      (1 << 0)  /* Optional next-line block scope. */
+#define        MAN_ESCOPED      (1 << 1)  /* Optional next-line element scope. */
+#define        MAN_NSCOPED      (1 << 2)  /* Allowed in next-line element scope. */
+#define        MAN_XSCOPE       (1 << 3)  /* Exit next-line block scope. */
+#define        MAN_JOIN         (1 << 4)  /* Join arguments together. */
 };
 
-__BEGIN_DECLS
-
-int              man_word_alloc(struct man *, int, int, const char *);
-int              man_elem_alloc(struct man *, int, int, int);
-void             man_node_free(struct man_node *);
-void             man_node_freelist(struct man_node *);
-void            *man_hash_alloc(void);
-int              man_macro(struct man *, int, 
-                       int, int, int *, char *);
-int              man_hash_find(const void *, const char *);
-void             man_hash_free(void *);
-int              man_macroend(struct man *);
-int              man_vwarn(struct man *, int, int, const char *, ...);
-int              man_verr(struct man *, int, int, const char *, ...);
-int              man_valid_post(struct man *);
-int              man_action_post(struct man *);
-
-__END_DECLS
+const struct man_macro *man_macro(enum roff_tok);
 
-#endif /*!LIBMAN_H*/
+void             man_descope(struct roff_man *, int, int, char *);
+void             man_unscope(struct roff_man *, const struct roff_node *);