fix order of messages

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 50c0c5fd1a8cae8fb34d7075b87bc3ff61d3bc3c..57dff61b4aa3d0953b747ce0cc9cec47251fd05e 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,7 +1,7 @@
-/*     $Id: libmdoc.h,v 1.100 2015/04/18 16:06:39 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.112 2017/05/30 16:22:03 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -17,7 +17,7 @@
  */
 
 #define        MACRO_PROT_ARGS struct roff_man *mdoc, \
  */
 
 #define        MACRO_PROT_ARGS struct roff_man *mdoc, \

-                       int tok, \
+                       enum roff_tok tok, \

                        int line, \
                        int ppos, \
                        int *pos, \
                        int line, \
                        int ppos, \
                        int *pos, \


@@ -39,10 +39,7 @@ enum margserr {
        ARGS_EOLN, /* end-of-line */
        ARGS_WORD, /* normal word */
        ARGS_PUNCT, /* series of punctuation */
        ARGS_EOLN, /* end-of-line */
        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 */

 };
 
 /*
 };
 
 /*


@@ -64,36 +61,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 roff_man *, int, int, const char *);
-void             mdoc_word_append(struct roff_man *, const char *);

 void             mdoc_elem_alloc(struct roff_man *, int, int,
 void             mdoc_elem_alloc(struct roff_man *, int, int,

-                       int, struct mdoc_arg *);
+                       enum roff_tok, struct mdoc_arg *);

 struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,
 struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,

-                       int, struct mdoc_arg *);
-struct roff_node *mdoc_head_alloc(struct roff_man *, int, int, int);
-void             mdoc_tail_alloc(struct roff_man *, int, int, int);
-struct roff_node *mdoc_body_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);
-void             mdoc_node_delete(struct roff_man *, struct roff_node *);
+                       enum roff_tok, struct mdoc_arg *);
+void             mdoc_tail_alloc(struct roff_man *, int, int,
+                       enum roff_tok);
+struct roff_node *mdoc_endbody_alloc(struct roff_man *, int, int,
+                       enum roff_tok, struct roff_node *);

 void             mdoc_node_relink(struct roff_man *, struct roff_node *);
 void             mdoc_node_relink(struct roff_man *, struct roff_node *);

-void             mdoc_hash_init(void);
-int              mdoc_hash_find(const char *);
+void             mdoc_node_validate(struct roff_man *);
+void             mdoc_state(struct roff_man *, struct roff_node *);
+void             mdoc_state_reset(struct roff_man *);
+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 roff_man *, struct roff_node *);
-void             mdoc_valid_post(struct roff_man *);
-void             mdoc_argv(struct roff_man *, int, int,
+void             mdoc_argv(struct roff_man *, int, enum roff_tok,

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

-void             mdoc_argv_free(struct mdoc_arg *);

 enum margserr    mdoc_args(struct roff_man *, int,
 enum margserr    mdoc_args(struct roff_man *, int,

-                       int *, char *, int, char **);
-void             mdoc_macroend(struct roff_man *);
+                       int *, char *, enum roff_tok, char **);

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

-
-__END_DECLS