Indentation must be measured in units of the surrounding text,

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 98123f71c6bb9ef5ee11b7d99d2753f303d1449c..5a6cc3ed9ba87fe6da147677d3e7faf4a49f6fa2 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.101 2015/04/18 17:01:58 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>


@@ -40,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 */

 };
 
 /*
 };
 
 /*


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

 void             mdoc_elem_alloc(struct roff_man *, int, int,
                        int, struct mdoc_arg *);
 struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,
                        int, struct mdoc_arg *);
 void             mdoc_elem_alloc(struct roff_man *, int, int,
                        int, struct mdoc_arg *);
 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);
 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);
 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 *);

 void             mdoc_node_relink(struct roff_man *, struct roff_node *);
 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 roff_man *, struct roff_node *);
-void             mdoc_valid_post(struct roff_man *);

 void             mdoc_argv(struct roff_man *, int, int,
                        struct mdoc_arg **, int *, char *);
 void             mdoc_argv(struct roff_man *, int, int,
                        struct mdoc_arg **, int *, char *);

-void             mdoc_argv_free(struct mdoc_arg *);

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

-void             mdoc_macroend(struct roff_man *);

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

-
-__END_DECLS