Fix to auto-closing of LINK tag in -Txhtml (thanks to Daniel Friesel).

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index c6633890f72b36108d2af5a84661f9bee4936d35..98058a27f28d1ecf04a60e8550bfc2d89a97d117 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.18 2009/07/12 20:50:08 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.34 2010/04/08 07:53:01 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. */
@@ -43,13 +42,9 @@ struct       mdoc {
 
 enum   merr {
        ETAILWS = 0,
-       ECOLEMPTY,
-       EARGVPARM,
        EQUOTPARM,
        EQUOTTERM,
-       EMALLOC,
        EARGVAL,        
-       ENOCALL,
        EBODYPROL,
        EPROLBODY,
        ETEXTPROL,
@@ -90,19 +85,20 @@ enum        merr {
        ENOWIDTH,
        EUTSNAME,
        EOBS,
-       EMACPARM,
        EIMPBRK,
        EIGNE,
        EOPEN,
        EQUOTPHR,
        ENOCTX,
-       ESPACE,
        ELIB,
+       EBADCHILD,
+       ENOTYPE,
+       EBADCOMMENT,
        MERRMAX
 };
 
-#define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
-                       int ppos, int *pos, char *buf
+#define        MACRO_PROT_ARGS struct mdoc *m, enum mdoct tok, \
+                       int line, int ppos, int *pos, char *buf
 
 struct mdoc_macro {
        int             (*fp)(MACRO_PROT_ARGS);
@@ -136,17 +132,15 @@ int                 mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_word_alloc(struct mdoc *, 
                        int, int, const char *);
 int              mdoc_elem_alloc(struct mdoc *, int, int, 
-                       int, struct mdoc_arg *);
+                       enum mdoct, struct mdoc_arg *);
 int              mdoc_block_alloc(struct mdoc *, int, int, 
-                       int, struct mdoc_arg *);
-int              mdoc_head_alloc(struct mdoc *, int, int, int);
-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 *);
+                       enum mdoct, struct mdoc_arg *);
+int              mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
+int              mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
+int              mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
+void             mdoc_node_delete(struct mdoc *, struct mdoc_node *);
+void             mdoc_hash_init(void);
+enum mdoct       mdoc_hash_find(const char *);
 int              mdoc_iscdelim(char);
 int              mdoc_isdelim(const char *);
 size_t           mdoc_isescape(const char *);
@@ -166,22 +160,27 @@ int                 mdoc_valid_post(struct mdoc *);
 int              mdoc_action_pre(struct mdoc *, 
                        const struct mdoc_node *);
 int              mdoc_action_post(struct mdoc *);
-int              mdoc_argv(struct mdoc *, int, int,
+int              mdoc_argv(struct mdoc *, int, enum mdoct,
                        struct mdoc_arg **, int *, char *);
 #define        ARGV_ERROR      (-1)
 #define        ARGV_EOLN       (0)
 #define        ARGV_ARG        (1)
 #define        ARGV_WORD       (2)
 void             mdoc_argv_free(struct mdoc_arg *);
+void             mdoc_argn_free(struct mdoc_arg *, int);
 int              mdoc_args(struct mdoc *, int,
+                       int *, char *, enum mdoct, char **);
+int              mdoc_zargs(struct mdoc *, int, 
                        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