===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.137
retrieving revision 1.140
diff -u -p -r1.137 -r1.140
--- mandoc/mdoc.c	2010/05/24 13:39:47	1.137
+++ mandoc/mdoc.c	2010/05/30 11:00:53	1.140
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.137 2010/05/24 13:39:47 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.140 2010/05/30 11:00:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -276,11 +276,11 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, 
 		if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG))
 			return(0);
 		if (NULL == m->meta.title)
-			m->meta.title = mandoc_strdup("unknown");
+			m->meta.title = mandoc_strdup("UNKNOWN");
 		if (NULL == m->meta.vol)
-			m->meta.vol = mandoc_strdup("local");
+			m->meta.vol = mandoc_strdup("LOCAL");
 		if (NULL == m->meta.os)
-			m->meta.os = mandoc_strdup("local");
+			m->meta.os = mandoc_strdup("LOCAL");
 		if (0 == m->meta.date)
 			m->meta.date = time(NULL);
 		m->flags |= MDOC_PBODY;
@@ -560,9 +560,15 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	 * Search for the beginning of unescaped trailing whitespace (ws)
 	 * and for the first character not to be output (end).
 	 */
+
+	/* FIXME: replace with strcspn(). */
 	ws = NULL;
 	for (c = end = buf + offs; *c; c++) {
 		switch (*c) {
+		case '-':
+			if (mandoc_hyph(buf + offs, c))
+				*c = ASCII_HYPH;
+			break;
 		case ' ':
 			if (NULL == ws)
 				ws = c;