Remember to NULL-ify new keys/vals.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index f1089c821c875c8a36a1cf8fc2b9a72165b9b31f..0e4b125f42e75f83a6ae521465e6f553a42799f1 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.64 2011/03/17 01:23:28 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.74 2011/04/19 16:38:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -17,17 +17,14 @@
 #ifndef LIBMDOC_H
 #define LIBMDOC_H
 
-#include "mdoc.h"
-
 enum   mdoc_next {
        MDOC_NEXT_SIBLING = 0,
        MDOC_NEXT_CHILD
 };
 
 struct mdoc {
-       void             *data; /* private application data */
-       mandocmsg         msg; /* message callback */
-       int               flags;
+       struct mparse    *parse; /* parse pointer */
+       int               flags; /* parse flags */
 #define        MDOC_HALT        (1 << 0) /* error in parse: halt */
 #define        MDOC_LITERAL     (1 << 1) /* in a literal scope */
 #define        MDOC_PBODY       (1 << 2) /* in the document body */
@@ -65,27 +62,37 @@ struct      mdoc_macro {
 
 enum   margserr {
        ARGS_ERROR,
-       ARGS_EOLN,
-       ARGS_WORD,
-       ARGS_PUNCT,
-       ARGS_QWORD,
-       ARGS_PHRASE,
-       ARGS_PPHRASE,
-       ARGS_PEND
+       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) */
 };
 
 enum   margverr {
        ARGV_ERROR,
-       ARGV_EOLN,
-       ARGV_ARG,
-       ARGV_WORD
+       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.
+ * Opening punctuation (e.g., the opening parenthesis) suppresses the
+ * following space; closing punctuation (e.g., the closing parenthesis)
+ * suppresses the leading space; middle punctuation (e.g., the vertical
+ * bar) can do either.  The middle punctuation delimiter bends the rules
+ * depending on usage.
+ */
 enum   mdelim {
        DELIM_NONE = 0,
        DELIM_OPEN,
        DELIM_MIDDLE,
-       DELIM_CLOSE
+       DELIM_CLOSE,
+       DELIM_MAX
 };
 
 extern const struct mdoc_macro *const mdoc_macros;
@@ -93,11 +100,9 @@ extern      const struct mdoc_macro *const mdoc_macros;
 __BEGIN_DECLS
 
 #define                  mdoc_pmsg(m, l, p, t) \
-                 (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+                 mandoc_msg((t), (m)->parse, (l), (p), NULL)
 #define                  mdoc_nmsg(m, n, t) \
-                 (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
-int              mdoc_vmsg(struct mdoc *, enum mandocerr, 
-                       int, int, const char *, ...);
+                 mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
 int              mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_word_alloc(struct mdoc *, 
                        int, int, const char *);
@@ -114,12 +119,6 @@ int                  mdoc_endbody_alloc(struct mdoc *m, int line, int pos,
 void             mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void             mdoc_hash_init(void);
 enum mdoct       mdoc_hash_find(const char *);
-#define        DELIMSZ   6 /* maximum size of a delimiter string */
-enum mdelim      mdoc_isdelim(const char *);
-size_t           mdoc_isescape(const char *);
-enum   mdoc_sec  mdoc_str2sec(const char *);
-time_t           mdoc_atotime(const char *);
-size_t           mdoc_macro2len(enum mdoct);
 const char      *mdoc_a2att(const char *);
 const char      *mdoc_a2lib(const char *);
 const char      *mdoc_a2st(const char *);
@@ -131,16 +130,12 @@ int                 mdoc_valid_post(struct mdoc *);
 enum margverr    mdoc_argv(struct mdoc *, int, enum mdoct,
                        struct mdoc_arg **, int *, char *);
 void             mdoc_argv_free(struct mdoc_arg *);
-void             mdoc_argn_free(struct mdoc_arg *, int);
 enum margserr    mdoc_args(struct mdoc *, int,
                        int *, char *, enum mdoct, char **);
 enum margserr    mdoc_zargs(struct mdoc *, int, 
-                       int *, char *, int, char **);
-#define        ARGS_DELIM      (1 << 1)
-#define        ARGS_TABSEP     (1 << 2)
-#define        ARGS_NOWARN     (1 << 3)
-
+                       int *, char *, char **);
 int              mdoc_macroend(struct mdoc *);
+enum mdelim      mdoc_isdelim(const char *);
 
 __END_DECLS