fix a typo that prevented names from .Dt from getting priority

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 5e749cc9f0c94613f712be11dd443b12b3e0512f..5a6cc3ed9ba87fe6da147677d3e7faf4a49f6fa2 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.99 2015/04/02 23:48:19 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.108 2015/11/07 14:01:16 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -16,37 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 

-enum   mdoc_next {
-       MDOC_NEXT_SIBLING = 0,
-       MDOC_NEXT_CHILD
-};
-
-struct mdoc {
-       struct mparse    *parse; /* parse pointer */
-       const char       *defos; /* default argument for .Os */
-       int               quick; /* abort parse early */
-       int               flags; /* parse flags */
-#define        MDOC_LITERAL     (1 << 1) /* in a literal scope */
-#define        MDOC_PBODY       (1 << 2) /* in the document body */
-#define        MDOC_NEWLINE     (1 << 3) /* first macro/text in a line */
-#define        MDOC_PHRASELIT   (1 << 4) /* literal within a partila phrase */
-#define        MDOC_PPHRASE     (1 << 5) /* within a partial phrase */
-#define        MDOC_FREECOL     (1 << 6) /* `It' invocation should close */
-#define        MDOC_SYNOPSIS    (1 << 7) /* SYNOPSIS-style formatting */
-#define        MDOC_KEEP        (1 << 8) /* in a word keep */
-#define        MDOC_SMOFF       (1 << 9) /* spacing is off */
-#define        MDOC_NODELIMC    (1 << 10) /* disable closing delimiter handling */
-       enum mdoc_next    next; /* where to put the next node */
-       struct roff_node *last; /* the last node parsed */
-       struct roff_node *first; /* the first node parsed */
-       struct roff_node *last_es; /* the most recent Es node */
-       struct roff_meta  meta; /* document meta-data */
-       enum roff_sec     lastnamed;
-       enum roff_sec     lastsec;
-       struct roff      *roff;
-};
-
-#define        MACRO_PROT_ARGS struct mdoc *mdoc, \
+#define        MACRO_PROT_ARGS struct roff_man *mdoc, \

                        int tok, \
                        int line, \
                        int ppos, \
                        int tok, \
                        int line, \
                        int ppos, \


@@ -70,9 +40,7 @@ enum  margserr {
        ARGS_WORD, /* normal word */
        ARGS_PUNCT, /* series of punctuation */
        ARGS_QWORD, /* quoted word */
        ARGS_WORD, /* normal word */
        ARGS_PUNCT, /* series of punctuation */
        ARGS_QWORD, /* quoted word */

-       ARGS_PHRASE, /* Ta'd phrase (-column) */
-       ARGS_PPHRASE, /* tabbed phrase (-column) */
-       ARGS_PEND /* last phrase (-column) */
+       ARGS_PHRASE /* Bl -column phrase */

 };
 
 /*
 };
 
 /*


@@ -94,36 +62,27 @@ enum        mdelim {
 
 extern const struct mdoc_macro *const mdoc_macros;
 
 
 extern const struct mdoc_macro *const mdoc_macros;
 

-__BEGIN_DECLS

 
 void             mdoc_macro(MACRO_PROT_ARGS);
 
 void             mdoc_macro(MACRO_PROT_ARGS);

-void             mdoc_word_alloc(struct mdoc *, int, int, const char *);
-void             mdoc_word_append(struct mdoc *, const char *);
-void             mdoc_elem_alloc(struct mdoc *, int, int,
+void             mdoc_elem_alloc(struct roff_man *, int, int,

                        int, struct mdoc_arg *);
                        int, struct mdoc_arg *);

-struct roff_node *mdoc_block_alloc(struct mdoc *, int, int,
+struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,

                        int, struct mdoc_arg *);
                        int, struct mdoc_arg *);

-struct roff_node *mdoc_head_alloc(struct mdoc *, int, int, int);
-void             mdoc_tail_alloc(struct mdoc *, int, int, int);
-struct roff_node *mdoc_body_alloc(struct mdoc *, int, int, int);
-struct roff_node *mdoc_endbody_alloc(struct mdoc *, int, int, int,
+void             mdoc_tail_alloc(struct roff_man *, int, int, int);
+struct roff_node *mdoc_endbody_alloc(struct roff_man *, int, int, int,

                        struct roff_node *, enum mdoc_endbody);
                        struct roff_node *, enum mdoc_endbody);

-void             mdoc_node_delete(struct mdoc *, struct roff_node *);
-void             mdoc_node_relink(struct mdoc *, struct roff_node *);
-void             mdoc_hash_init(void);
+void             mdoc_node_relink(struct roff_man *, struct roff_node *);
+void             mdoc_node_validate(struct roff_man *);
+void             mdoc_state(struct roff_man *, struct roff_node *);
+void             mdoc_state_reset(struct roff_man *);

 int              mdoc_hash_find(const char *);
 int              mdoc_hash_find(const char *);

+const char      *mdoc_a2arch(const char *);

 const char      *mdoc_a2att(const char *);
 const char      *mdoc_a2lib(const char *);
 const char      *mdoc_a2att(const char *);
 const char      *mdoc_a2lib(const char *);

+enum roff_sec    mdoc_a2sec(const char *);

 const char      *mdoc_a2st(const char *);
 const char      *mdoc_a2st(const char *);

-const char      *mdoc_a2arch(const char *);
-void             mdoc_valid_pre(struct mdoc *, struct roff_node *);
-void             mdoc_valid_post(struct mdoc *);
-void             mdoc_argv(struct mdoc *, int, int,
+void             mdoc_argv(struct roff_man *, int, int,

                        struct mdoc_arg **, int *, char *);
                        struct mdoc_arg **, int *, char *);

-void             mdoc_argv_free(struct mdoc_arg *);
-enum margserr    mdoc_args(struct mdoc *, int,
+enum margserr    mdoc_args(struct roff_man *, int,

                        int *, char *, int, char **);
                        int *, char *, int, char **);

-void             mdoc_macroend(struct mdoc *);

 enum mdelim      mdoc_isdelim(const char *);
 enum mdelim      mdoc_isdelim(const char *);

-
-__END_DECLS