`Ad' is supposed to underline. Found whilst trolling through manuals.

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index cbcbaea9d940515008b2961925eac75196a67623..2f03f450de7b9ea38aef0bb0e96423a939e6c35c 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,6 +1,6 @@
-/*     $Id: man.h,v 1.27 2010/03/27 10:13:16 kristaps Exp $ */
+/*     $Id: man.h,v 1.41 2010/07/22 23:03:15 kristaps Exp $ */

 /*
 /*

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

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -55,12 +55,8 @@ enum mant {
        MAN_Sp,
        MAN_Vb,
        MAN_Ve,
        MAN_Sp,
        MAN_Vb,
        MAN_Ve,

-       MAN_de,
-       MAN_dei,
-       MAN_am,
-       MAN_ami,
-       MAN_ig,
-       MAN_dot,
+       MAN_AT,
+       MAN_in,

        MAN_MAX
 };
 
        MAN_MAX
 };
 


@@ -74,8 +70,9 @@ enum  man_type {
 };
 
 struct man_meta {
 };
 
 struct man_meta {

-       int              msec;
+       char            *msec;

        time_t           date;
        time_t           date;

+       char            *rawdate;

        char            *vol;
        char            *title;
        char            *source;
        char            *vol;
        char            *title;
        char            *source;


@@ -93,6 +90,7 @@ struct        man_node {
        int              flags;
 #define        MAN_VALID       (1 << 0)
 #define        MAN_ACTED       (1 << 1)
        int              flags;
 #define        MAN_VALID       (1 << 0)
 #define        MAN_ACTED       (1 << 1)

+#define        MAN_EOS         (1 << 2)

        enum man_type    type;
        char            *string;
        struct man_node *head;
        enum man_type    type;
        char            *string;
        struct man_node *head;


@@ -100,24 +98,18 @@ struct     man_node {
 };
 
 #define        MAN_IGN_MACRO    (1 << 0)
 };
 
 #define        MAN_IGN_MACRO    (1 << 0)

-#define        MAN_IGN_CHARS    (1 << 1)

 #define        MAN_IGN_ESCAPE   (1 << 2)
 
 extern const char *const *man_macronames;
 
 #define        MAN_IGN_ESCAPE   (1 << 2)
 
 extern const char *const *man_macronames;
 

-struct man_cb {
-       int     (*man_warn)(void *, int, int, const char *);
-       int     (*man_err)(void *, int, int, const char *);
-};
-

 __BEGIN_DECLS
 
 struct man;
 
 void             man_free(struct man *);
 __BEGIN_DECLS
 
 struct man;
 
 void             man_free(struct man *);

-struct man      *man_alloc(void *, int, const struct man_cb *);
+struct man      *man_alloc(struct regset *, void *, int, mandocmsg);

 void             man_reset(struct man *);
 void             man_reset(struct man *);

-int              man_parseln(struct man *, int, char *buf);
+int              man_parseln(struct man *, int, char *, int);

 int              man_endparse(struct man *);
 
 const struct man_node *man_node(const struct man *);
 int              man_endparse(struct man *);
 
 const struct man_node *man_node(const struct man *);