we already parse the GNU tbl(7) "nospaces" option,

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 62c7f294d55d2c1e98aa3d03a3a32304c91cfa65..ac960a685889db85c29c7bac0e298f4e22cc0c3c 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,7 +1,7 @@
-/*     $Id: libman.h,v 1.69 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: libman.h,v 1.86 2018/12/31 10:04:39 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
@@ -16,29 +16,11 @@
  * 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;
-};
+struct roff_node;
+struct roff_man;
 
-#define        MACRO_PROT_ARGS   struct man *man, \
-                         int tok, \
+#define        MACRO_PROT_ARGS   struct roff_man *man, \
+                         enum roff_tok tok, \
                          int line, \
                          int ppos, \
                          int *pos, \
@@ -47,27 +29,14 @@ struct      man {
 struct man_macro {
        void            (*fp)(MACRO_PROT_ARGS);
        int               flags;
-#define        MAN_SCOPED       (1 << 0)  /* Optional next-line scope. */
-#define        MAN_NSCOPED      (1 << 1)  /* Allowed in next-line element scope. */
-#define        MAN_BSCOPE       (1 << 2)  /* Break next-line block scope. */
-#define        MAN_JOIN         (1 << 3)  /* Join arguments together. */
+#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. */
 };
 
-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 *);
+const struct man_macro *man_macro(enum roff_tok);
 
-__END_DECLS
+void             man_descope(struct roff_man *, int, int, char *);
+void             man_unscope(struct roff_man *, const struct roff_node *);