Move mandoc_hyph() into roff_parsetext() as a single conditional. While

here, do some function renames for clarity and make all function
prototypes be in one place.

1 files changed, 1 insertions, 39 deletions

diff --git a/mandoc.c b/mandoc.c
index 8c470f9c..807692ac 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.57 2011/07/27 07:06:29 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.58 2011/07/27 07:32:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -654,44 +654,6 @@ mandoc_eos(const char *p, size_t sz, int enclosed)
 }
 
 /*
- * Choose whether to break at a hyphenated character (identified by the
- * ASCII_HYPH value in the input string).
- */
-int
-mandoc_hyph(const char *start, const char *c)
-{
-	char		l, r;
-
-	l = *(c - 1);
-	r = *(c + 1);
-
-	/* Skip first/last character of buffer. */
-	if (c == start || '\0' == r)
-		return(0);
-
-	/* Skip a number on either side of the hyphen. */
-	if (isdigit((unsigned char)r) || isdigit((unsigned char)l))
-		return(0);
-
-	/* Skip first/last character of word. */
-	if ('\t' == r || '\t' == l)
-		return(0);
-
-	if (' ' == r || ' ' == l)
-		return(0);
-
-	/* Skip double invocations. */
-	if ('-' == r || '-' == l)
-		return(0);
-
-	/* Skip escapes. */
-	if ('\\' == l)
-		return(0);
-
-	return(1);
-}
-
-/*
  * Find out whether a line is a macro line or not.  If it is, adjust the
  * current position and return one; if it isn't, return zero and don't
  * change the current position.