Hooked up -Tascii to a2roffdeco backend.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index dfd69b6436936b97032f98da177910c3a91fab48..c0b5cb462f43389c2d3a7673798e1f1d4544c8c2 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.23 2009/10/30 05:58:36 kristaps Exp $ */

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


@@ -27,12 +27,12 @@ enum        man_next {
 struct man {
        void            *data;
        struct man_cb    cb;
 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. */
        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. */

        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
        enum man_next    next;
        struct man_node *last;
        struct man_node *first;


@@ -41,7 +41,6 @@ struct        man {
 
 enum   merr {
        WNPRINT = 0,
 
 enum   merr {
        WNPRINT = 0,

-       WNMEM,

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


@@ -54,9 +53,11 @@ enum merr {
        WHEADARGS,
        WBODYARGS,
        WNHEADARGS,
        WHEADARGS,
        WBODYARGS,
        WNHEADARGS,

-       WMACRO,

        WMACROFORM,
        WEXITSCOPE,
        WMACROFORM,
        WEXITSCOPE,

+       WNOSCOPE,
+       WOLITERAL,
+       WNLITERAL,

        WERRMAX
 };
 
        WERRMAX
 };
 


@@ -67,6 +68,8 @@ struct        man_macro {
        int             (*fp)(MACRO_PROT_ARGS);
        int               flags;
 #define        MAN_SCOPED       (1 << 0)
        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(). */

 };
 
 extern const struct man_macro *const man_macros;
 };
 
 extern const struct man_macro *const man_macros;


@@ -89,9 +92,8 @@ 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_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 *);
+void             man_hash_init(void);
+int              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)


@@ -104,6 +106,7 @@ 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_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_unscope(struct man *, const struct man_node *);
 
 __END_DECLS
 int              man_unscope(struct man *, const struct man_node *);
 
 __END_DECLS