Removed superfluous FIXMEs in mdoc_term.c.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index b15f6107ca7e039838b6da7243992a71028b7fa7..af72cd967d9a3afab85a52aedc6b9a06b42a0c82 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,20 +1,18 @@
-/* $Id: libman.h,v 1.1 2009/03/23 14:22:11 kristaps Exp $ */
+/*     $Id: libman.h,v 1.14 2009/07/07 09:35:40 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #ifndef LIBMAN_H
 #define LIBMAN_H
  */
 #ifndef LIBMAN_H
 #define LIBMAN_H


@@ -27,39 +25,59 @@ enum        man_next {
 };
 
 struct man {
 };
 
 struct man {

+       void            *data;
+       struct man_cb    cb;

        void            *htab;
        void            *htab;

+       int              pflags;

        int              flags;
        int              flags;

-#define        MAN_LITERAL     (1 << 1)
+#define        MAN_HALT        (1 << 0)
+#define        MAN_NLINE       (1 << 1)

        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;
 };
 
        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;
 };
 

-
-#define        MACRO_PROT_ARGS struct man *man, int tok, int line, \
-                       int ppos, int *pos, char *buf
-
-struct man_macro {
-       int             (*fp)(MACRO_PROT_ARGS);
-       int               flags;
-#define        MDOC_PROLOGUE    (1 << 0)
+enum   merr {
+       WNPRINT = 0,
+       WNMEM,
+       WMSEC,
+       WDATE,
+       WLNSCOPE,
+       WTSPACE,
+       WTQUOTE,
+       WNODATA,
+       WNOTITLE,
+       WESCAPE,
+       WERRMAX

 };
 
 };
 

-extern const struct man_macro *const man_macros;
-

 __BEGIN_DECLS
 
 __BEGIN_DECLS
 

+#define                  man_perr(m, l, p, t) \
+                 man_err((m), (l), (p), 1, (t))
+#define                  man_pwarn(m, l, p, t) \
+                 man_err((m), (l), (p), 0, (t))
+#define                  man_nerr(m, n, t) \
+                 man_err((m), (n)->line, (n)->pos, 1, (t))
+#define                  man_nwarn(m, n, t) \
+                 man_err((m), (n)->line, (n)->pos, 0, (t))
+
+int              man_err(struct man *, int, int, int, enum merr);

 int              man_word_alloc(struct man *, int, int, const char *);
 int              man_elem_alloc(struct man *, int, int, int);
 int              man_word_alloc(struct man *, int, int, const char *);
 int              man_elem_alloc(struct man *, int, int, int);

-int              man_block_alloc(struct man *, int, int, int);
-int              man_head_alloc(struct man *, int, int, int);
-int              man_body_alloc(struct man *, int, int, int);

 void             man_node_free(struct man_node *);
 void             man_node_freelist(struct man_node *);
 void            *man_hash_alloc(void);
 void             man_node_free(struct man_node *);
 void             man_node_freelist(struct man_node *);
 void            *man_hash_alloc(void);

+int              man_macro(struct man *, int, 
+                       int, int, int *, char *);

 int              man_hash_find(const void *, const char *);
 void             man_hash_free(void *);
 int              man_hash_find(const void *, const char *);
 void             man_hash_free(void *);

+int              man_macroend(struct man *);
+int              man_vwarn(struct man *, int, int, const char *, ...);
+int              man_verr(struct man *, int, int, const char *, ...);
+int              man_valid_post(struct man *);
+int              man_action_post(struct man *);

 
 __END_DECLS
 
 
 __END_DECLS