Let .it accept numerical expressions, not just numerical constants.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index aaf1448c257a1b252b8792c03229db27e3ce6b56..527fe0270375a1b33cd0408998cdba55ca217092 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.91 2014/11/28 03:14:18 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.97 2015/02/02 04:26:44 schwarze Exp $ */

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


@@ -15,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef LIBMDOC_H
-#define LIBMDOC_H

 
 enum   mdoc_next {
        MDOC_NEXT_SIBLING = 0,
 
 enum   mdoc_next {
        MDOC_NEXT_SIBLING = 0,


@@ -56,7 +54,7 @@ struct        mdoc {
                        char *buf
 
 struct mdoc_macro {
                        char *buf
 
 struct mdoc_macro {

-       int             (*fp)(MACRO_PROT_ARGS);
+       void            (*fp)(MACRO_PROT_ARGS);

        int               flags;
 #define        MDOC_CALLABLE    (1 << 0)
 #define        MDOC_PARSED      (1 << 1)
        int               flags;
 #define        MDOC_CALLABLE    (1 << 0)
 #define        MDOC_PARSED      (1 << 1)


@@ -77,13 +75,6 @@ enum margserr {
        ARGS_PEND /* last phrase (-column) */
 };
 
        ARGS_PEND /* last phrase (-column) */
 };
 

-enum   margverr {
-       ARGV_ERROR,
-       ARGV_EOLN, /* end of line */
-       ARGV_ARG, /* valid argument */
-       ARGV_WORD /* normal word (or bad argument---same thing) */
-};
-

 /*
  * A punctuation delimiter is opening, closing, or "middle mark"
  * punctuation.  These govern spacing.
 /*
  * A punctuation delimiter is opening, closing, or "middle mark"
  * punctuation.  These govern spacing.


@@ -105,7 +96,7 @@ extern       const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
 
 __BEGIN_DECLS
 

-int              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_word_alloc(struct mdoc *, int, int, const char *);
 void             mdoc_word_append(struct mdoc *, const char *);
 void             mdoc_elem_alloc(struct mdoc *, int, int,


@@ -115,7 +106,7 @@ struct mdoc_node *mdoc_block_alloc(struct mdoc *, int, int,
 struct mdoc_node *mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
 void             mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
 struct mdoc_node *mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
 struct mdoc_node *mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
 void             mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
 struct mdoc_node *mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);

-void             mdoc_endbody_alloc(struct mdoc *, int, int, enum mdoct,
+struct mdoc_node *mdoc_endbody_alloc(struct mdoc *, int, int, enum mdoct,

                        struct mdoc_node *, enum mdoc_endbody);
 void             mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void             mdoc_node_relink(struct mdoc *, struct mdoc_node *);
                        struct mdoc_node *, enum mdoc_endbody);
 void             mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void             mdoc_node_relink(struct mdoc *, struct mdoc_node *);


@@ -125,19 +116,14 @@ const char         *mdoc_a2att(const char *);
 const char      *mdoc_a2lib(const char *);
 const char      *mdoc_a2st(const char *);
 const char      *mdoc_a2arch(const char *);
 const char      *mdoc_a2lib(const char *);
 const char      *mdoc_a2st(const char *);
 const char      *mdoc_a2arch(const char *);

-const char      *mdoc_a2vol(const char *);

 void             mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
 void             mdoc_valid_post(struct mdoc *);
 void             mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
 void             mdoc_valid_post(struct mdoc *);

-enum margverr    mdoc_argv(struct mdoc *, int, enum mdoct,
+void             mdoc_argv(struct mdoc *, int, enum mdoct,

                        struct mdoc_arg **, int *, char *);
 void             mdoc_argv_free(struct mdoc_arg *);
 enum margserr    mdoc_args(struct mdoc *, int,
                        int *, char *, enum mdoct, char **);
                        struct mdoc_arg **, int *, char *);
 void             mdoc_argv_free(struct mdoc_arg *);
 enum margserr    mdoc_args(struct mdoc *, int,
                        int *, char *, enum mdoct, char **);

-enum margserr    mdoc_zargs(struct mdoc *, int,
-                       int *, char *, char **);
-int              mdoc_macroend(struct mdoc *);
+void             mdoc_macroend(struct mdoc *);

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

-
-#endif /*!LIBMDOC_H*/