While we do not recommend the idiom ".Fl Fl long" for long options

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index e06ae6e60546aa5a6fa5ccee1241cca533c077f3..ff29625194dceca78257afef89521425acf70252 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,7 +1,7 @@
-/*     $Id: libmdoc.h,v 1.106 2015/10/17 00:21:07 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.117 2018/12/31 04:55:46 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,2018 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


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

+struct roff_node;
+struct roff_man;
+struct mdoc_arg;
+

 #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, \


@@ -38,8 +42,8 @@ enum  margserr {
        ARGS_ERROR,
        ARGS_EOLN, /* end-of-line */
        ARGS_WORD, /* normal word */
        ARGS_ERROR,
        ARGS_EOLN, /* end-of-line */
        ARGS_WORD, /* normal word */

+       ARGS_ALLOC, /* normal word from roff_getarg() */

        ARGS_PUNCT, /* series of punctuation */
        ARGS_PUNCT, /* series of punctuation */

-       ARGS_QWORD, /* quoted word */

        ARGS_PHRASE /* Bl -column phrase */
 };
 
        ARGS_PHRASE /* Bl -column phrase */
 };
 


@@ -60,28 +64,24 @@ enum        mdelim {
        DELIM_MAX
 };
 
        DELIM_MAX
 };
 

-extern const struct mdoc_macro *const mdoc_macros;
-
-__BEGIN_DECLS
+const struct mdoc_macro *mdoc_macro(enum roff_tok);

 
 

-void             mdoc_macro(MACRO_PROT_ARGS);

 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 *);
-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);
-void             mdoc_node_relink(struct roff_man *, struct roff_node *);
-int              mdoc_hash_find(const char *);
+                       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_state(struct roff_man *, struct roff_node *);
+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_argv(struct roff_man *, int, int,
+void             mdoc_argv(struct roff_man *, int, enum roff_tok,

                        struct mdoc_arg **, int *, char *);
 enum margserr    mdoc_args(struct roff_man *, int,
                        struct mdoc_arg **, int *, char *);
 enum margserr    mdoc_args(struct roff_man *, int,

-                       int *, char *, int, char **);
+                       int *, char *, enum roff_tok, char **);

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

-
-__END_DECLS