Added news item for new version.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 3d6bb7ab9c8a2a1b3d75f0097412097866f46a85..9c5dace562cb5e682eff9718b56cbc257690cb7f 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.22 2009/07/29 08:46:06 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.30 2009/10/30 05:58:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,7 +27,6 @@ enum  mdoc_next {
 struct mdoc {
        void             *data;
        struct mdoc_cb    cb;
-       void             *htab;
        int               flags;
 #define        MDOC_HALT        (1 << 0)       /* Error in parse. Halt. */
 #define        MDOC_LITERAL     (1 << 1)       /* In a literal scope. */
@@ -45,7 +44,6 @@ enum  merr {
        ETAILWS = 0,
        EQUOTPARM,
        EQUOTTERM,
-       EMALLOC,
        EARGVAL,        
        EBODYPROL,
        EPROLBODY,
@@ -92,12 +90,13 @@ enum        merr {
        EOPEN,
        EQUOTPHR,
        ENOCTX,
-       ESPACE,
        ELIB,
+       EBADCHILD,
+       ENOTYPE,
        MERRMAX
 };
 
-#define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
+#define        MACRO_PROT_ARGS struct mdoc *m, int tok, int line, \
                        int ppos, int *pos, char *buf
 
 struct mdoc_macro {
@@ -140,9 +139,8 @@ int           mdoc_tail_alloc(struct mdoc *, int, int, int);
 int              mdoc_body_alloc(struct mdoc *, int, int, int);
 void             mdoc_node_free(struct mdoc_node *);
 void             mdoc_node_freelist(struct mdoc_node *);
-void            *mdoc_hash_alloc(void);
-int              mdoc_hash_find(const void *, const char *);
-void             mdoc_hash_free(void *);
+void             mdoc_hash_init(void);
+int              mdoc_hash_find(const char *);
 int              mdoc_iscdelim(char);
 int              mdoc_isdelim(const char *);
 size_t           mdoc_isescape(const char *);
@@ -172,14 +170,16 @@ void                mdoc_argv_free(struct mdoc_arg *);
 int              mdoc_args(struct mdoc *, int,
                        int *, char *, int, char **);
 int              mdoc_zargs(struct mdoc *, int, 
-                       int *, char *, char **);
+                       int *, char *, int, char **);
+#define        ARGS_DELIM      (1 << 1)        /* See args(). */
+#define        ARGS_TABSEP     (1 << 2)        /* See args(). */
+#define        ARGS_NOWARN     (1 << 3)        /* See args(). */
 #define        ARGS_ERROR      (-1)
 #define        ARGS_EOLN       (0)
 #define        ARGS_WORD       (1)
 #define        ARGS_PUNCT      (2)
 #define        ARGS_QWORD      (3)
 #define        ARGS_PHRASE     (4)
-
 int              mdoc_macroend(struct mdoc *);
 
 __END_DECLS