===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.4
retrieving revision 1.26
diff -u -p -r1.4 -r1.26
--- mandoc/mandoc.c	2009/10/28 19:21:59	1.4
+++ mandoc/mandoc.c	2010/07/22 14:03:50	1.26
@@ -1,6 +1,6 @@
-/*	$Id: mandoc.c,v 1.4 2009/10/28 19:21:59 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.26 2010/07/22 14:03:50 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -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>
@@ -21,88 +25,167 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "libmandoc.h"
 
+static	int	 a2time(time_t *, const char *, const char *);
+
+
 int
-mandoc_special(const char *p)
+mandoc_special(char *p)
 {
-	int		 c;
+	int		 len, i;
+	char		 term;
+	char		*sv;
 	
-	if ('\\' != *p++)
-		return(0);
+	len = 0;
+	term = '\0';
+	sv = p;
 
-	switch (*p) {
-	case ('\\'):
+	assert('\\' == *p);
+	p++;
+
+	switch (*p++) {
+#if 0
+	case ('Z'):
 		/* FALLTHROUGH */
-	case ('\''):
+	case ('X'):
 		/* FALLTHROUGH */
-	case ('`'):
+	case ('x'):
 		/* FALLTHROUGH */
-	case ('q'):
+	case ('w'):
 		/* FALLTHROUGH */
-	case ('-'):
+	case ('v'):
 		/* FALLTHROUGH */
-	case ('~'):
+	case ('S'):
 		/* FALLTHROUGH */
-	case ('^'):
+	case ('R'):
 		/* FALLTHROUGH */
-	case ('%'):
+	case ('o'):
 		/* FALLTHROUGH */
-	case ('0'):
+	case ('N'):
 		/* FALLTHROUGH */
-	case (' '):
+	case ('l'):
 		/* FALLTHROUGH */
-	case ('|'):
+	case ('L'):
 		/* FALLTHROUGH */
-	case ('&'):
+	case ('H'):
 		/* FALLTHROUGH */
-	case ('.'):
+	case ('h'):
 		/* FALLTHROUGH */
-	case (':'):
+	case ('D'):
 		/* FALLTHROUGH */
-	case ('c'):
-		return(2);
-	case ('e'):
-		return(2);
-	case ('f'):
-		if (0 == *++p || ! isgraph((u_char)*p))
+	case ('C'):
+		/* FALLTHROUGH */
+	case ('b'):
+		/* FALLTHROUGH */
+	case ('B'):
+		/* FALLTHROUGH */
+	case ('a'):
+		/* FALLTHROUGH */
+	case ('A'):
+		if (*p++ != '\'')
 			return(0);
-		return(3);
-	case ('*'):
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		switch (*p) {
+		term = '\'';
+		break;
+#endif
+	case ('s'):
+		if (ASCII_HYPH == *p)
+			*p = '-';
+		if ('+' == *p || '-' == *p)
+			p++;
+
+		i = ('s' != *(p - 1));
+
+		switch (*p++) {
 		case ('('):
-			if (0 == *++p || ! isgraph((u_char)*p))
+			len = 2;
+			break;
+		case ('['):
+			term = ']';
+			break;
+		case ('\''):
+			term = '\'';
+			break;
+		case ('0'):
+			i++;
+			/* FALLTHROUGH */
+		default:
+			len = 1;
+			p--;
+			break;
+		}
+
+		if (ASCII_HYPH == *p)
+			*p = '-';
+		if ('+' == *p || '-' == *p) {
+			if (i++)
 				return(0);
-			return(4);
+			p++;
+		} 
+		
+		if (0 == i)
+			return(0);
+		break;
+#if 0
+	case ('Y'):
+		/* FALLTHROUGH */
+	case ('V'):
+		/* FALLTHROUGH */
+	case ('$'):
+		/* FALLTHROUGH */
+	case ('n'):
+		/* FALLTHROUGH */
+	case ('k'):
+		/* FALLTHROUGH */
+#endif
+	case ('M'):
+		/* FALLTHROUGH */
+	case ('m'):
+		/* FALLTHROUGH */
+	case ('f'):
+		/* FALLTHROUGH */
+	case ('F'):
+		/* FALLTHROUGH */
+	case ('*'):
+		switch (*p++) {
+		case ('('):
+			len = 2;
+			break;
 		case ('['):
-			for (c = 3, p++; *p && ']' != *p; p++, c++)
-				if ( ! isgraph((u_char)*p))
-					break;
-			return(*p == ']' ? c : 0);
+			term = ']';
+			break;
 		default:
+			len = 1;
+			p--;
 			break;
 		}
-		return(3);
+		break;
 	case ('('):
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		if (0 == *++p || ! isgraph((u_char)*p))
-			return(0);
-		return(4);
+		len = 2;
+		break;
 	case ('['):
+		term = ']';
 		break;
 	default:
-		return(0);
+		len = 1;
+		p--;
+		break;
 	}
 
-	for (c = 3, p++; *p && ']' != *p; p++, c++)
-		if ( ! isgraph((u_char)*p))
-			break;
+	if (term) {
+		for ( ; *p && term != *p; p++)
+			if (ASCII_HYPH == *p)
+				*p = '-';
+		return(*p ? (int)(p - sv) : 0);
+	}
 
-	return(*p == ']' ? c : 0);
+	for (i = 0; *p && i < len; i++, p++)
+		if (ASCII_HYPH == *p)
+			*p = '-';
+	return(i == len ? (int)(p - sv) : 0);
 }
 
 
@@ -113,7 +196,7 @@ mandoc_calloc(size_t num, size_t size)
 
 	ptr = calloc(num, size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
+		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -128,7 +211,7 @@ mandoc_malloc(size_t size)
 
 	ptr = malloc(size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
+		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -142,7 +225,7 @@ mandoc_realloc(void *ptr, size_t size)
 
 	ptr = realloc(ptr, size);
 	if (NULL == ptr) {
-		fprintf(stderr, "memory exhausted\n");
+		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -150,19 +233,6 @@ mandoc_realloc(void *ptr, size_t size)
 }
 
 
-void *
-mandoc_reallocf(void *old_ptr, size_t size) /* FIXME: remove (not used) */
-{
-	void		*ptr;
-
-	ptr = realloc(old_ptr, size);
-	if (NULL == ptr)
-		free(old_ptr);
-
-	return(ptr);
-}
-
-
 char *
 mandoc_strdup(const char *ptr)
 {
@@ -170,9 +240,134 @@ mandoc_strdup(const char *ptr)
 
 	p = strdup(ptr);
 	if (NULL == p) {
-		fprintf(stderr, "memory exhausted\n");
+		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
 
 	return(p);
+}
+
+
+static int
+a2time(time_t *t, const char *fmt, const char *p)
+{
+	struct tm	 tm;
+	char		*pp;
+
+	memset(&tm, 0, sizeof(struct tm));
+
+	pp = strptime(p, fmt, &tm);
+	if (NULL != pp && '\0' == *pp) {
+		*t = mktime(&tm);
+		return(1);
+	}
+
+	return(0);
+}
+
+
+/*
+ * Convert from a manual date string (see mdoc(7) and man(7)) into a
+ * date according to the stipulated date type.
+ */
+time_t
+mandoc_a2time(int flags, const char *p)
+{
+	time_t		 t;
+
+	if (MTIME_MDOCDATE & flags) {
+		if (0 == strcmp(p, "$" "Mdocdate$"))
+			return(time(NULL));
+		if (a2time(&t, "$" "Mdocdate: %b %d %Y $", p))
+			return(t);
+	}
+
+	if (MTIME_CANONICAL & flags || MTIME_REDUCED & flags) 
+		if (a2time(&t, "%b %d, %Y", p))
+			return(t);
+
+	if (MTIME_ISO_8601 & flags) 
+		if (a2time(&t, "%Y-%m-%d", p))
+			return(t);
+
+	if (MTIME_REDUCED & flags) {
+		if (a2time(&t, "%d, %Y", p))
+			return(t);
+		if (a2time(&t, "%Y", p))
+			return(t);
+	}
+
+	return(0);
+}
+
+
+int
+mandoc_eos(const char *p, size_t sz, int enclosed)
+{
+	const char *q;
+	int found;
+
+	if (0 == sz)
+		return(0);
+
+	/*
+	 * End-of-sentence recognition must include situations where
+	 * some symbols, such as `)', allow prior EOS punctuation to
+	 * propogate outward.
+	 */
+
+	found = 0;
+	for (q = p + (int)sz - 1; q >= p; q--) {
+		switch (*q) {
+		case ('\"'):
+			/* FALLTHROUGH */
+		case ('\''):
+			/* FALLTHROUGH */
+		case (']'):
+			/* FALLTHROUGH */
+		case (')'):
+			if (0 == found)
+				enclosed = 1;
+			break;
+		case ('.'):
+			/* FALLTHROUGH */
+		case ('!'):
+			/* FALLTHROUGH */
+		case ('?'):
+			found = 1;
+			break;
+		default:
+			return(found && (!enclosed || isalnum(*q)));
+		}
+	}
+
+	return(found && !enclosed);
+}
+
+
+int
+mandoc_hyph(const char *start, const char *c)
+{
+
+	/*
+	 * Choose whether to break at a hyphenated character.  We only
+	 * do this if it's free-standing within a word.
+	 */
+
+	/* Skip first/last character of buffer. */
+	if (c == start || '\0' == *(c + 1))
+		return(0);
+	/* Skip first/last character of word. */
+	if ('\t' == *(c + 1) || '\t' == *(c - 1))
+		return(0);
+	if (' ' == *(c + 1) || ' ' == *(c - 1))
+		return(0);
+	/* Skip double invocations. */
+	if ('-' == *(c + 1) || '-' == *(c - 1))
+		return(0);
+	/* Skip escapes. */
+	if ('\\' == *(c - 1))
+		return(0);
+
+	return(1);
 }