On a new RS nesting level, the saved width starts from the default

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 4e211d0756b4b1403fd70e37bea6857712d0cdce..5e749cc9f0c94613f712be11dd443b12b3e0512f 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,22 +1,20 @@
-/*     $Id: libmdoc.h,v 1.92 2014/11/28 04:47:03 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.99 2015/04/02 23:48:19 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 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015 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
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * 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,


@@ -39,17 +37,17 @@ struct      mdoc {
 #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 */
 #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 mdoc_node *last; /* the last node parsed */
-       struct mdoc_node *first; /* the first node parsed */
-       struct mdoc_node *last_es; /* the most recent Es node */
-       struct mdoc_meta  meta; /* document meta-data */
-       enum mdoc_sec     lastnamed;
-       enum mdoc_sec     lastsec;
+       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, \
        struct roff      *roff;
 };
 
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, \

-                       enum mdoct tok, \
+                       int tok, \

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


@@ -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.


@@ -109,35 +100,30 @@ 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,

-                       enum mdoct, struct mdoc_arg *);
-struct mdoc_node *mdoc_block_alloc(struct mdoc *, int, int,
-                       enum mdoct, struct mdoc_arg *);
-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 *, enum mdoc_endbody);
-void             mdoc_node_delete(struct mdoc *, struct mdoc_node *);
-void             mdoc_node_relink(struct mdoc *, struct mdoc_node *);
+                       int, struct mdoc_arg *);
+struct roff_node *mdoc_block_alloc(struct mdoc *, int, int,
+                       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,
+                       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_hash_init(void);

-enum mdoct       mdoc_hash_find(const char *);
+int              mdoc_hash_find(const char *);

 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_a2att(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_pre(struct mdoc *, struct roff_node *);

 void             mdoc_valid_post(struct mdoc *);
 void             mdoc_valid_post(struct mdoc *);

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

                        struct mdoc_arg **, int *, char *);
 void             mdoc_argv_free(struct mdoc_arg *);
 enum margserr    mdoc_args(struct mdoc *, int,
                        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 *, char *, int, char **);

 void             mdoc_macroend(struct mdoc *);
 enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS
 void             mdoc_macroend(struct mdoc *);
 enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS

-
-#endif /*!LIBMDOC_H*/