During validation, drop .br before a text line starting with a

[mandoc.git] / mansearch.h

diff --git a/mansearch.h b/mansearch.h
index 7f68ff676750373cc928cb8e5b8c4912c2ae6e17..355873f83e09e70e2d1a1660bbc6dc0891db489b 100644 (file)
--- a/mansearch.h
+++ b/mansearch.h
@@ -1,7 +1,7 @@
-/*     $Id: mansearch.h,v 1.24 2015/11/07 14:01:16 schwarze Exp $ */
+/*     $Id: mansearch.h,v 1.29 2018/11/22 12:01:46 schwarze Exp $ */

 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * 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


@@ -17,6 +17,15 @@
  */
 
 #define        MANDOC_DB        "mandoc.db"
  */
 
 #define        MANDOC_DB        "mandoc.db"

+#define        MANDOCDB_MAGIC   0x3a7d0cdb
+#define        MANDOCDB_VERSION 1
+
+#define        MACRO_MAX        36
+#define        KEY_arch         0
+#define        KEY_sec          1
+#define        KEY_Nm           38
+#define        KEY_Nd           39
+#define        KEY_MAX          40

 
 #define        TYPE_arch        0x0000000000000001ULL
 #define        TYPE_sec         0x0000000000000002ULL
 
 #define        TYPE_arch        0x0000000000000001ULL
 #define        TYPE_sec         0x0000000000000002ULL


@@ -66,9 +75,11 @@
 #define        NAME_FILE        0x0000004000000010ULL
 #define        NAME_MASK        0x000000000000001fULL
 
 #define        NAME_FILE        0x0000004000000010ULL
 #define        NAME_MASK        0x000000000000001fULL
 

-#define        FORM_CAT         0  /* manual page is preformatted */
-#define        FORM_SRC         1  /* format is mdoc(7) or man(7) */
-#define        FORM_NONE        4  /* format is unknown */
+enum   form {
+       FORM_SRC = 1,   /* Format is mdoc(7) or man(7). */
+       FORM_CAT,       /* Manual page is preformatted. */
+       FORM_NONE       /* Format is unknown. */
+};

 
 enum   argmode {
        ARG_FILE = 0,
 
 enum   argmode {
        ARG_FILE = 0,


@@ -82,9 +93,8 @@ struct        manpage {
        char            *names; /* a list of names with sections */
        char            *output; /* user-defined additional output */
        size_t           ipath; /* number of the manpath */
        char            *names; /* a list of names with sections */
        char            *output; /* user-defined additional output */
        size_t           ipath; /* number of the manpath */

-       uint64_t         bits; /* name type mask */

        int              sec; /* section number, 10 means invalid */
        int              sec; /* section number, 10 means invalid */

-       int              form; /* 0 == catpage */
+       enum form        form;

 };
 
 struct mansearch {
 };
 
 struct mansearch {


@@ -98,7 +108,6 @@ struct       mansearch {
 
 struct manpaths;
 
 
 struct manpaths;
 

-int    mansearch_setup(int);

 int    mansearch(const struct mansearch *cfg, /* options */
                const struct manpaths *paths, /* manpaths */
                int argc, /* size of argv */
 int    mansearch(const struct mansearch *cfg, /* options */
                const struct manpaths *paths, /* manpaths */
                int argc, /* size of argv */