===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.125
retrieving revision 1.128
diff -u -p -r1.125 -r1.128
--- mandoc/man.c	2014/03/23 11:25:26	1.125
+++ mandoc/man.c	2014/03/30 19:47:48	1.128
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.125 2014/03/23 11:25:26 schwarze Exp $ */
+/*	$Id: man.c,v 1.128 2014/03/30 19:47:48 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -44,7 +45,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"fi",		"RE",		"RS",		"DT",
 	"UC",		"PD",		"AT",		"in",
 	"ft",		"OP",		"EX",		"EE",
-	"UR",		"UE"
+	"UR",		"UE",		"ll"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -705,4 +706,50 @@ man_mparse(const struct man *man)
 
 	assert(man && man->parse);
 	return(man->parse);
+}
+
+void
+man_deroff(char **dest, const struct man_node *n)
+{
+	char	*cp;
+	size_t	 sz;
+
+	if (MAN_TEXT != n->type) {
+		for (n = n->child; n; n = n->next)
+			man_deroff(dest, n);
+		return;
+	}
+
+	/* Skip leading whitespace and escape sequences. */
+
+	cp = n->string;
+	while ('\0' != *cp) {
+		if ('\\' == *cp) {
+			cp++;
+			mandoc_escape((const char **)&cp, NULL, NULL);
+		} else if (isspace((unsigned char)*cp))
+			cp++;
+		else
+			break;
+	}
+
+	/* Skip trailing whitespace. */
+
+	for (sz = strlen(cp); sz; sz--)
+		if (0 == isspace((unsigned char)cp[sz-1]))
+			break;
+
+	/* Skip empty strings. */
+
+	if (0 == sz)
+		return;
+
+	if (NULL == *dest) {
+		*dest = mandoc_strndup(cp, sz);
+		return;
+	}
+
+	mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+	free(*dest);
+	*dest = cp;
 }