===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_strings.c,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -p -r1.13 -r1.18
--- mandoc/Attic/mdoc_strings.c	2009/11/02 06:22:46	1.13
+++ mandoc/Attic/mdoc_strings.c	2010/05/09 21:06:50	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_strings.c,v 1.13 2009/11/02 06:22:46 kristaps Exp $ */
+/*	$Id: mdoc_strings.c,v 1.18 2010/05/09 21:06:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -57,6 +61,10 @@ static	const struct mdoc_secname secnames[SECNAME_MAX]
 };
 
 
+/* 
+ * FIXME: this is repeated in print_text() (html.c) and term_word()
+ * (term.c).
+ */
 int
 mdoc_iscdelim(char p)
 {
@@ -64,6 +72,10 @@ mdoc_iscdelim(char p)
 	switch (p) {
 	case('|'):
 		/* FALLTHROUGH */
+	case('('):
+		/* FALLTHROUGH */
+	case('['):
+		return(1);
 	case('.'):
 		/* FALLTHROUGH */
 	case(','):
@@ -76,18 +88,10 @@ mdoc_iscdelim(char p)
 		/* FALLTHROUGH */
 	case('!'):
 		/* FALLTHROUGH */
-	case('('):
-		/* FALLTHROUGH */
 	case(')'):
 		/* FALLTHROUGH */
-	case('['):
-		/* FALLTHROUGH */
 	case(']'):
-		/* FALLTHROUGH */
-	case('{'):
-		/* FALLTHROUGH */
-	case('}'):
-		return(1);
+		return(2);
 	default:
 		break;
 	}
@@ -100,11 +104,17 @@ int
 mdoc_isdelim(const char *p)
 {
 
-	if (0 == *p)
+	if ('\0' == p[0])
 		return(0);
-	if (0 != *(p + 1))
-		return(0);
-	return(mdoc_iscdelim(*p));
+	if ('\0' == p[1])
+		return(mdoc_iscdelim(p[0]));
+
+	/*
+	 * XXX; account for groff bubu where the \*(Ba reserved string
+	 * is treated in exactly the same way as the vertical bar.  This
+	 * is the only function that checks for this.
+	 */
+	return(0 == strcmp(p, "\\*(Ba"));
 }
 
 
@@ -123,7 +133,7 @@ mdoc_atosec(const char *p)
 
 /* FIXME: move this into an editable .in file. */
 size_t
-mdoc_macro2len(int macro)
+mdoc_macro2len(enum mdoct macro)
 {
 
 	switch (macro) {