Make args_checkpunct() use mdoc_isdelim() instead of mdoc_iscdelim(),

which is wrong.  Then remove mdoc_iscdelim() alltogether.

1 files changed, 27 insertions, 40 deletions

diff --git a/mdoc_strings.c b/mdoc_strings.c
index 9bcab1df..cd4654b4 100644
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -54,53 +54,40 @@ static	const char * const secnames[SEC__MAX] = {
 	NULL
 };
 
-/* 
- * FIXME: this is repeated in print_text() (html.c) and term_word()
- * (term.c).
- */
-enum mdelim
-mdoc_iscdelim(char p)
-{
-
-	switch (p) {
-	case('('):
-		/* FALLTHROUGH */
-	case('['):
-		return(DELIM_OPEN);
-	case('|'):
-		return(DELIM_MIDDLE);
-	case('.'):
-		/* FALLTHROUGH */
-	case(','):
-		/* FALLTHROUGH */
-	case(';'):
-		/* FALLTHROUGH */
-	case(':'):
-		/* FALLTHROUGH */
-	case('?'):
-		/* FALLTHROUGH */
-	case('!'):
-		/* FALLTHROUGH */
-	case(')'):
-		/* FALLTHROUGH */
-	case(']'):
-		return(DELIM_CLOSE);
-	default:
-		break;
-	}
-
-	return(DELIM_NONE);
-}
-
-
 enum mdelim
 mdoc_isdelim(const char *p)
 {
 
 	if ('\0' == p[0])
 		return(DELIM_NONE);
+
 	if ('\0' == p[1])
-		return(mdoc_iscdelim(p[0]));
+		switch (p[0]) {
+		case('('):
+			/* FALLTHROUGH */
+		case('['):
+			return(DELIM_OPEN);
+		case('|'):
+			return(DELIM_MIDDLE);
+		case('.'):
+			/* FALLTHROUGH */
+		case(','):
+			/* FALLTHROUGH */
+		case(';'):
+			/* FALLTHROUGH */
+		case(':'):
+			/* FALLTHROUGH */
+		case('?'):
+			/* FALLTHROUGH */
+		case('!'):
+			/* FALLTHROUGH */
+		case(')'):
+			/* FALLTHROUGH */
+		case(']'):
+			return(DELIM_CLOSE);
+		default:
+			return(DELIM_NONE);
+		}
 
 	/*
 	 * XXX; account for groff bubu where the \*(Ba reserved string