Introduce ARGS_PEND for `It -column' end-of-line special casing.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 3b7c70e949d83f8d61a9854dbf9cbf2cc075800a..83dc6da223ee6c86f2c7a2946fbe414a26a116d0 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.22 2009/10/26 07:11:06 kristaps Exp $ */
+/*     $Id: libman.h,v 1.31 2010/04/08 07:53:01 kristaps Exp $ */

 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -27,13 +27,17 @@ enum        man_next {
 struct man {
        void            *data;
        struct man_cb    cb;
 struct man {
        void            *data;
        struct man_cb    cb;

-       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_LITERAL     (1 << 3)        /* Literal input. */
+       int              pflags; /* parse flags (see man.h) */
+       int              svflags; /* flags saved during roff blocks */
+       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)

        enum man_next    next;
        enum man_next    next;

+       enum man_next    svnext;

        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;
        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;


@@ -41,10 +45,10 @@ struct      man {
 
 enum   merr {
        WNPRINT = 0,
 
 enum   merr {
        WNPRINT = 0,

-       WNMEM,

        WMSEC,
        WDATE,
        WLNSCOPE,
        WMSEC,
        WDATE,
        WLNSCOPE,

+       WLNSCOPE2,

        WTSPACE,
        WTQUOTE,
        WNODATA,
        WTSPACE,
        WTQUOTE,
        WNODATA,


@@ -59,10 +63,14 @@ enum        merr {
        WNOSCOPE,
        WOLITERAL,
        WNLITERAL,
        WNOSCOPE,
        WOLITERAL,
        WNLITERAL,

+       WROFFNEST,
+       WROFFSCOPE,
+       WTITLECASE,
+       WBADCOMMENT,

        WERRMAX
 };
 
        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 ppos, int *pos, char *buf
 
 struct man_macro {


@@ -71,6 +79,8 @@ struct        man_macro {
 #define        MAN_SCOPED       (1 << 0)
 #define        MAN_EXPLICIT     (1 << 1)       /* See blk_imp(). */
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
 #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;
 };
 
 extern const struct man_macro *const man_macros;


@@ -87,14 +97,13 @@ __BEGIN_DECLS
                  man_err((m), (n)->line, (n)->pos, 0, (t))
 
 int              man_word_alloc(struct man *, int, int, const char *);
                  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 *);
+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);
 void             man_hash_init(void);

-int              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)
 int              man_macroend(struct man *);
 int              man_args(struct man *, int, int *, char *, char **);
 #define        ARGS_ERROR      (-1)


@@ -108,7 +117,8 @@ int           man_valid_post(struct man *);
 int              man_valid_pre(struct man *, const struct man_node *);
 int              man_action_post(struct man *);
 int              man_action_pre(struct man *, struct man_node *);
 int              man_valid_pre(struct man *, const 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 *);
+int              man_unscope(struct man *, 
+                       const struct man_node *, enum merr);

 
 __END_DECLS
 
 
 __END_DECLS