Improve -Tascii output for Unicode escape sequences: For the first 512

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 30c159f7da436f89dfe7100ae91187e3a2b408f7..e852927cd2cdb23120e62a408ed5bdd3e1322fb8 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.51 2011/03/23 15:33:57 kristaps Exp $ */
+/*     $Id: libman.h,v 1.63 2014/08/01 21:24:17 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 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
@@ -24,22 +24,20 @@ enum        man_next {
 
 struct man {
        struct mparse   *parse; /* parse pointer */
+       int              quick; /* abort parse early */
        int              flags; /* parse flags */
-#define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
 #define        MAN_BLINE       (1 << 2) /* Next-line block scope. */
-#define        MAN_ILINE       (1 << 3) /* Ignored in next-line scope. */
 #define        MAN_LITERAL     (1 << 4) /* Literal input. */
-#define        MAN_BPLINE      (1 << 5)
 #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 regset   *regs; /* registers */
+       struct roff     *roff;
 };
 
-#define        MACRO_PROT_ARGS   struct man *m, \
+#define        MACRO_PROT_ARGS   struct man *man, \
                          enum mant tok, \
                          int line, \
                          int ppos, \
@@ -54,16 +52,13 @@ struct      man_macro {
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
 #define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
 #define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */
+#define        MAN_BSCOPE       (1 << 5)       /* Break BLINE scope. */
 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define                  man_pmsg(m, l, p, t) \
-                 mandoc_msg((t), (m)->parse, (l), (p), NULL)
-#define                  man_nmsg(m, n, t) \
-                 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);
@@ -75,9 +70,7 @@ void            man_hash_init(void);
 enum mant        man_hash_find(const char *);
 int              man_macroend(struct man *);
 int              man_valid_post(struct man *);
-int              man_valid_pre(struct man *, struct man_node *);
-int              man_unscope(struct man *, 
-                       const struct man_node *, enum mandocerr);
+int              man_unscope(struct man *, const struct man_node *);
 
 __END_DECLS