Fixed `Bf Li' default style (monospace).

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 1461fdf79c2b62c551768fc3dfa01cf5e9329535..9c5dace562cb5e682eff9718b56cbc257690cb7f 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.8 2009/06/15 09:55:43 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,10 +27,10 @@ enum        mdoc_next {
 struct mdoc {
        void             *data;
        struct mdoc_cb    cb;
-       void             *htab;
        int               flags;
-#define        MDOC_HALT        (1 << 0)
-#define        MDOC_LITERAL     (1 << 1)
+#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. */
        int               pflags;
        enum mdoc_next    next;
        struct mdoc_node *last;
@@ -40,8 +40,63 @@ struct       mdoc {
        enum mdoc_sec     lastsec;
 };
 
+enum   merr {
+       ETAILWS = 0,
+       EQUOTPARM,
+       EQUOTTERM,
+       EARGVAL,        
+       EBODYPROL,
+       EPROLBODY,
+       ETEXTPROL,
+       ENOBLANK,
+       ETOOLONG,
+       EESCAPE,
+       EPRINT,
+       ENODAT,
+       ENOPROLOGUE,
+       ELINE,
+       EATT,
+       ENAME,
+       ELISTTYPE,
+       EDISPTYPE,
+       EMULTIDISP,
+       EMULTILIST,
+       ESECNAME,
+       ENAMESECINC,
+       EARGREP,
+       EBOOL,
+       ECOLMIS,
+       ENESTDISP,
+       EMISSWIDTH,
+       EWRONGMSEC,
+       ESECOOO,
+       ESECREP,
+       EBADSTAND,
+       ENOMULTILINE,
+       EMULTILINE,
+       ENOLINE,
+       EPROLOOO,
+       EPROLREP,
+       EBADMSEC,
+       EBADSEC,
+       EFONT,
+       EBADDATE,
+       ENUMFMT,
+       ENOWIDTH,
+       EUTSNAME,
+       EOBS,
+       EIMPBRK,
+       EIGNE,
+       EOPEN,
+       EQUOTPHR,
+       ENOCTX,
+       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 {
@@ -59,27 +114,19 @@ extern     const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
-/* 
- * When GCC2 is deprecated, most of these can be reverted to #define
- * as mdoc_vmsg using __VA_ARGS__.  Until then, use real functions.
- */
-int              mdoc_vwarn(struct mdoc *, int, int, 
-                       enum mdoc_warn, const char *, ...);
-void             mdoc_vmsg(struct mdoc *, int, int, 
-                       const char *, ...);
-int              mdoc_verr(struct mdoc *, int, int, 
-                       const char *, ...);
-int              mdoc_nwarn(struct mdoc *, const struct mdoc_node *,
-                       enum mdoc_warn, const char *, ...);
-int              mdoc_nerr(struct mdoc *, const struct mdoc_node *,
-                       const char *, ...);
-int              mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...);
-int              mdoc_err(struct mdoc *, const char *, ...);
-void             mdoc_msg(struct mdoc *, const char *, ...);
-void             mdoc_pmsg(struct mdoc *, int, int, const char *, ...);
-int              mdoc_pwarn(struct mdoc *, int, int,
-                       enum mdoc_warn,const char *, ...);
-int              mdoc_perr(struct mdoc *, int, int, const char *, ...);
+#define                  mdoc_perr(m, l, p, t) \
+                 mdoc_err((m), (l), (p), 1, (t))
+#define                  mdoc_pwarn(m, l, p, t) \
+                 mdoc_err((m), (l), (p), 0, (t))
+#define                  mdoc_nerr(m, n, t) \
+                 mdoc_err((m), (n)->line, (n)->pos, 1, (t))
+#define                  mdoc_nwarn(m, n, t) \
+                 mdoc_err((m), (n)->line, (n)->pos, 0, (t))
+
+int              mdoc_err(struct mdoc *, int, int, int, enum merr);
+int              mdoc_verr(struct mdoc *, int, int, const char *, ...);
+int              mdoc_vwarn(struct mdoc *, int, int, const char *, ...);
+
 int              mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_word_alloc(struct mdoc *, 
                        int, int, const char *);
@@ -92,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 *);
@@ -102,6 +148,9 @@ enum        mdoc_sec  mdoc_atosec(const char *);
 time_t           mdoc_atotime(const char *);
 
 size_t           mdoc_macro2len(int);
+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 *);
 const char      *mdoc_a2msec(const char *);
@@ -120,13 +169,17 @@ int                 mdoc_argv(struct mdoc *, int, int,
 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 *, 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