Fixed re-adjustment of scope in exiting roff instructions (libman).

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index dfd69b6436936b97032f98da177910c3a91fab48..0676935494e5ad04dd9f961bd5b720150ec21f10 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.16 2009/08/13 11:45:29 kristaps Exp $ */
+/*     $Id: libman.h,v 1.28 2010/03/27 10:04:56 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,12 +27,13 @@ enum        man_next {
 struct man {
        void            *data;
        struct man_cb    cb;
-       void            *htab;
        int              pflags;
        int              flags;
 #define        MAN_HALT        (1 << 0)
-#define        MAN_ELINE       (1 << 1)        /* Next-line element scope. */
-#define        MAN_BLINE       (1 << 2)        /* Next-line block scope. */
+#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. */
        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
@@ -41,10 +42,10 @@ struct      man {
 
 enum   merr {
        WNPRINT = 0,
-       WNMEM,
        WMSEC,
        WDATE,
        WLNSCOPE,
+       WLNSCOPE2,
        WTSPACE,
        WTQUOTE,
        WNODATA,
@@ -54,19 +55,28 @@ enum        merr {
        WHEADARGS,
        WBODYARGS,
        WNHEADARGS,
-       WMACRO,
        WMACROFORM,
        WEXITSCOPE,
+       WNOSCOPE,
+       WOLITERAL,
+       WNLITERAL,
+       WROFFNEST,
+       WROFFSCOPE,
+       WTITLECASE,
        WERRMAX
 };
 
-#define        MACRO_PROT_ARGS   struct man *m, int tok, int line, \
+#define        MACRO_PROT_ARGS   struct man *m, enum mant tok, int line, \
                          int ppos, int *pos, char *buf
 
 struct man_macro {
        int             (*fp)(MACRO_PROT_ARGS);
        int               flags;
 #define        MAN_SCOPED       (1 << 0)
+#define        MAN_EXPLICIT     (1 << 1)       /* See blk_imp(). */
+#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(). */
 };
 
 extern const struct man_macro *const man_macros;
@@ -83,15 +93,13 @@ __BEGIN_DECLS
                  man_err((m), (n)->line, (n)->pos, 0, (t))
 
 int              man_word_alloc(struct man *, int, int, const char *);
-int              man_block_alloc(struct man *, int, int, int);
-int              man_head_alloc(struct man *, int, int, int);
-int              man_body_alloc(struct man *, int, int, int);
-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_hash_find(const void *, const char *);
-void             man_hash_free(void *);
+int              man_block_alloc(struct man *, int, int, enum mant);
+int              man_head_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 *);
 int              man_macroend(struct man *);
 int              man_args(struct man *, int, int *, char *, char **);
 #define        ARGS_ERROR      (-1)
@@ -104,7 +112,9 @@ int           man_verr(struct man *, int, int, const char *, ...);
 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, const struct man_node *);
 int              man_action_post(struct man *);
-int              man_unscope(struct man *, const struct man_node *);
+int              man_action_pre(struct man *, struct man_node *);
+int              man_unscope(struct man *, 
+                       const struct man_node *, enum merr);
 
 __END_DECLS