Scaling factor made floating point (as per groff.7) and, e.g., gnu/usr.bin/cvs/man...

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 441e407164f988a34dfeafb70264d45adb5ac5f7..60340dbce3057f686bb9080f21a6614ef45a739c 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.28 2009/09/24 15:01:06 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. */
@@ -42,17 +41,13 @@ struct      mdoc {
 };
 
 enum   merr {
-       ETAILWS,
-       ECOLEMPTY,
-       EARGVPARM,
+       ETAILWS = 0,
        EQUOTPARM,
        EQUOTTERM,
        EMALLOC,
        EARGVAL,        
-       ENOCALL,
        EBODYPROL,
        EPROLBODY,
-       ESPACE,
        ETEXTPROL,
        ENOBLANK,
        ETOOLONG,
@@ -66,8 +61,9 @@ enum  merr {
        ELISTTYPE,
        EDISPTYPE,
        EMULTIDISP,
-       ESECNAME,
        EMULTILIST,
+       ESECNAME,
+       ENAMESECINC,
        EARGREP,
        EBOOL,
        ECOLMIS,
@@ -77,30 +73,30 @@ enum        merr {
        ESECOOO,
        ESECREP,
        EBADSTAND,
-       ENAMESECINC,
        ENOMULTILINE,
        EMULTILINE,
        ENOLINE,
        EPROLOOO,
        EPROLREP,
        EBADMSEC,
+       EBADSEC,
        EFONT,
        EBADDATE,
+       ENUMFMT,
        ENOWIDTH,
-       EBADSEC,
        EUTSNAME,
-       ENUMFMT,
        EOBS,
-       EMACPARM,
        EIMPBRK,
        EIGNE,
        EOPEN,
-       EQUOT,
+       EQUOTPHR,
        ENOCTX,
-       ENOPARMS
+       ELIB,
+       EBADCHILD,
+       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 {
@@ -123,9 +119,9 @@ __BEGIN_DECLS
 #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, 0, (t))
-#define                  mdoc_nwarn(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 *, ...);
@@ -143,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 *);
@@ -153,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 *);
@@ -171,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