===================================================================
RCS file: /cvs/mandoc/Attic/apropos_db.h,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- mandoc/Attic/apropos_db.h	2011/11/20 15:43:14	1.6
+++ mandoc/Attic/apropos_db.h	2011/11/27 23:11:37	1.10
@@ -1,4 +1,4 @@
-/*	$Id: apropos_db.h,v 1.6 2011/11/20 15:43:14 kristaps Exp $ */
+/*	$Id: apropos_db.h,v 1.10 2011/11/27 23:11:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,12 +18,18 @@
 #define APROPOS_H
 
 struct	res {
+	char		*type; /* file type: mdoc, man or cat */
 	char		*file; /* file in file-system */
 	char		*cat; /* category (3p, 3, etc.) */
 	char		*title; /* title (FOO, etc.) */
 	char		*arch; /* arch (or empty string) */
 	char		*desc; /* description (from Nd) */
 	unsigned int	 rec; /* record in index */
+	/*
+	 * The index volume.  This indexes into the array of directories
+	 * searched for manual page databases.
+	 */
+	unsigned int	 volume;
 };
 
 struct	opts {
@@ -35,11 +41,12 @@ __BEGIN_DECLS
 
 struct	expr;
 
-int	 	 apropos_search(int, char **, const struct opts *, 
-			const struct expr *, size_t, void *, 
+int	 	 apropos_search(int, char **, const struct opts *,
+			const struct expr *, size_t, void *,
 			void (*)(struct res *, size_t, void *));
 struct	expr	*exprcomp(int, char *[], size_t *);
 void		 exprfree(struct expr *);
+struct	expr	*termcomp(int, char *[], size_t *);
 
 __END_DECLS