===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- mandoc/Attic/mandoc-db.c	2011/05/03 14:39:27	1.17
+++ mandoc/Attic/mandoc-db.c	2011/05/12 01:45:55	1.20
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.17 2011/05/03 14:39:27 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.20 2011/05/12 01:45:55 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -50,7 +50,8 @@ enum	type {
 	MANDOC_INCLUDES,
 	MANDOC_VARIABLE,
 	MANDOC_STANDARD,
-	MANDOC_AUTHOR
+	MANDOC_AUTHOR,
+	MANDOC_CONFIG
 };
 
 #define	MAN_ARGS	  DB *db, \
@@ -79,6 +80,7 @@ static	void		  pmdoc(DB *, const char *, DBT *, size_t
 				DBT *, DBT *, size_t *, struct mdoc *);
 static	void		  pmdoc_node(MDOC_ARGS);
 static	void		  pmdoc_An(MDOC_ARGS);
+static	void		  pmdoc_Cd(MDOC_ARGS);
 static	void		  pmdoc_Fd(MDOC_ARGS);
 static	void		  pmdoc_In(MDOC_ARGS);
 static	void		  pmdoc_Fn(MDOC_ARGS);
@@ -110,7 +112,7 @@ static	const pmdoc_nf	  mdocs[MDOC_MAX] = {
 	NULL, /* Ad */ 
 	pmdoc_An, /* An */ 
 	NULL, /* Ar */
-	NULL, /* Cd */ 
+	pmdoc_Cd, /* Cd */ 
 	NULL, /* Cm */
 	NULL, /* Dv */ 
 	NULL, /* Er */ 
@@ -226,6 +228,7 @@ main(int argc, char *argv[])
 	char		*fn; /* current file being parsed */
 	const char	*msec, /* manual section */
 	      	 	*mtitle, /* manual title */
+			*arch, /* manual architecture */
 	      		*dir; /* result dir (default: cwd) */
 	char		 ibuf[MAXPATHLEN], /* index fname */
 			 ibbuf[MAXPATHLEN], /* index backup fname */
@@ -362,6 +365,7 @@ main(int argc, char *argv[])
 		mtitle = NULL != mdoc ? 
 			mdoc_meta(mdoc)->title :
 			man_meta(man)->title;
+		arch = NULL != mdoc ? mdoc_meta(mdoc)->arch : NULL;
 
 		assert(msec);
 		assert(mtitle);
@@ -378,6 +382,9 @@ main(int argc, char *argv[])
 		dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1);
 		dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1);
 		dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1);
+		dbt_appendb(&rval, &rsz, arch ? arch : "", 
+				arch ? strlen(arch) + 1 : 1);
+
 		sv = rval.size;
 
 		/* Fix the record number in the btree value. */
@@ -593,6 +600,23 @@ pmdoc_Fd(MDOC_ARGS)
 
 /* ARGSUSED */
 static void
+pmdoc_Cd(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_SYNOPSIS != n->sec)
+		return;
+
+	for (n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			dbt_append(key, ksz, n->string);
+
+	fl = MANDOC_CONFIG;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
 pmdoc_In(MDOC_ARGS)
 {
 	uint32_t	 fl;
@@ -847,6 +871,7 @@ pman_node(MAN_ARGS)
 			/* 
 			 * Go through a special heuristic dance here.
 			 * This is why -man manuals are great!
+			 * (I'm being sarcastic: my eyes are bleeding.)
 			 * Conventionally, one or more manual names are
 			 * comma-specified prior to a whitespace, then a
 			 * dash, then a description.  Try to puzzle out
@@ -884,10 +909,14 @@ pman_node(MAN_ARGS)
 			while (' ' == *start)
 				start++;
 
-			if ('\\' == *start && '-' == *(start + 1))
+			if (0 == strncmp(start, "-", 1))
+				start += 1;
+			else if (0 == strncmp(start, "\\-", 2))
 				start += 2;
-			else if ('-' == *start)
-				start++;
+			else if (0 == strncmp(start, "\\(en", 4))
+				start += 4;
+			else if (0 == strncmp(start, "\\(em", 4))
+				start += 4;
 
 			while (' ' == *start)
 				start++;