===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- mandoc/Attic/mandoc-db.c	2011/04/11 22:56:25	1.11
+++ mandoc/Attic/mandoc-db.c	2011/04/28 10:44:02	1.13
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.11 2011/04/11 22:56:25 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.13 2011/04/28 10:44:02 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -48,7 +48,8 @@ enum	type {
 	MANDOC_FUNCTION,
 	MANDOC_UTILITY,
 	MANDOC_INCLUDES,
-	MANDOC_VARIABLE
+	MANDOC_VARIABLE,
+	MANDOC_STANDARD
 };
 
 #define	MAN_ARGS	  DB *db, \
@@ -82,6 +83,7 @@ static	void		  pmdoc_Fn(MDOC_ARGS);
 static	void		  pmdoc_Fo(MDOC_ARGS);
 static	void		  pmdoc_Nd(MDOC_ARGS);
 static	void		  pmdoc_Nm(MDOC_ARGS);
+static	void		  pmdoc_St(MDOC_ARGS);
 static	void		  pmdoc_Vt(MDOC_ARGS);
 
 typedef	void		(*pmdoc_nf)(MDOC_ARGS);
@@ -126,7 +128,7 @@ static	const pmdoc_nf	  mdocs[MDOC_MAX] = {
 	NULL, /* Ot */
 	NULL, /* Pa */
 	NULL, /* Rv */
-	NULL, /* St */ 
+	pmdoc_St, /* St */ 
 	pmdoc_Vt, /* Va */
 	pmdoc_Vt, /* Vt */ 
 	NULL, /* Xr */ 
@@ -569,6 +571,22 @@ pmdoc_Fn(MDOC_ARGS)
 
 /* ARGSUSED */
 static void
+pmdoc_St(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_STANDARDS != n->sec)
+		return;
+	if (NULL == n->child || MDOC_TEXT != n->child->type)
+		return;
+
+	dbt_append(key, ksz, n->child->string);
+	fl = MANDOC_STANDARD;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
 pmdoc_Vt(MDOC_ARGS)
 {
 	uint32_t	 fl;
@@ -731,7 +749,7 @@ static int
 pman_node(MAN_ARGS)
 {
 	const struct man_node *head, *body;
-	const char	*start;
+	const char	*start, *sv;
 	const char	 nil = '\0';
 	size_t		 sz;
 	uint32_t	 fl;
@@ -760,7 +778,8 @@ pman_node(MAN_ARGS)
 			fl = MANDOC_NAME;
 			memcpy(val->data, &fl, 4);
 
-			start = body->string;
+			assert(body->string);
+			start = sv = body->string;
 
 			/* 
 			 * Go through a special heuristic dance here.
@@ -771,7 +790,7 @@ pman_node(MAN_ARGS)
 			 * the name parts here.
 			 */
 
-			while (start) {
+			for ( ;; ) {
 				sz = strcspn(start, " ,");
 				if ('\0' == start[(int)sz])
 					break;
@@ -782,8 +801,10 @@ pman_node(MAN_ARGS)
 
 				dbt_put(db, dbn, key, val);
 
-				if (' ' == start[(int)sz])
+				if (' ' == start[(int)sz]) {
+					start += (int)sz + 1;
 					break;
+				}
 
 				assert(',' == start[(int)sz]);
 				start += (int)sz + 1;
@@ -791,7 +812,24 @@ pman_node(MAN_ARGS)
 					start++;
 			}
 
-			return(1);
+			if (sv == start) {
+				dbt_init(key, ksz);
+				dbt_append(key, ksz, start);
+				return(1);
+			}
+
+			while (' ' == *start)
+				start++;
+
+			if ('\\' == *start && '-' == *(start + 1))
+				start += 2;
+			else if ('-' == *start)
+				start++;
+
+			while (' ' == *start)
+				start++;
+
+			dbt_appendb(rval, rsz, start, strlen(start) + 1);
 		}
 	}