===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.161
retrieving revision 1.165
diff -u -p -r1.161 -r1.165
--- mandoc/man.c	2015/04/19 14:57:38	1.161
+++ mandoc/man.c	2015/10/06 18:32:19	1.165
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.161 2015/04/19 14:57:38 schwarze Exp $ */
+/*	$Id: man.c,v 1.165 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -55,13 +55,6 @@ static	int		 man_ptext(struct roff_man *, int, char *,
 static	int		 man_pmacro(struct roff_man *, int, char *, int);
 
 
-void
-man_endparse(struct roff_man *man)
-{
-
-	man_macroend(man);
-}
-
 int
 man_parseln(struct roff_man *man, int ln, char *buf, int offs)
 {
@@ -69,9 +62,9 @@ man_parseln(struct roff_man *man, int ln, char *buf, i
 	if (man->last->type != ROFFT_EQN || ln > man->last->line)
 		man->flags |= MAN_NEWLINE;
 
-	return (roff_getcontrol(man->roff, buf, &offs) ?
+	return roff_getcontrol(man->roff, buf, &offs) ?
 	    man_pmacro(man, ln, buf, offs) :
-	    man_ptext(man, ln, buf, offs));
+	    man_ptext(man, ln, buf, offs);
 }
 
 static void
@@ -104,7 +97,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 	if (man->flags & MAN_LITERAL) {
 		roff_word_alloc(man, line, offs, buf + offs);
 		man_descope(man, line, offs);
-		return(1);
+		return 1;
 	}
 
 	for (i = offs; buf[i] == ' '; i++)
@@ -122,7 +115,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 			roff_elem_alloc(man, line, offs, MAN_sp);
 			man->next = ROFF_NEXT_SIBLING;
 		}
-		return(1);
+		return 1;
 	}
 
 	/*
@@ -159,7 +152,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 		man->last->flags |= MAN_EOS;
 
 	man_descope(man, line, offs);
-	return(1);
+	return 1;
 }
 
 static int
@@ -190,7 +183,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 	if (tok == TOKEN_NONE) {
 		mandoc_msg(MANDOCERR_MACRO, man->parse,
 		    ln, ppos, buf + ppos - 1);
-		return(1);
+		return 1;
 	}
 
 	/* Skip a leading escape sequence or tab. */
@@ -241,7 +234,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 		n = man->last;
 		if (n->type == ROFFT_BODY &&
 		    strcmp(n->prev->child->string, "NAME"))
-			return(2);
+			return 2;
 	}
 
 	/*
@@ -252,14 +245,14 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	if ( ! bline || man->flags & MAN_ELINE ||
 	    man_macros[tok].flags & MAN_NSCOPED)
-		return(1);
+		return 1;
 
 	assert(man->flags & MAN_BLINE);
 	man->flags &= ~MAN_BLINE;
 
 	man_unscope(man, man->last->parent);
 	roff_body_alloc(man, ln, ppos, man->last->tok);
-	return(1);
+	return 1;
 }
 
 void
@@ -290,6 +283,20 @@ man_breakscope(struct roff_man *man, int tok)
 	}
 
 	/*
+	 * Weird special case:
+	 * Switching fill mode closes section headers.
+	 */
+
+	if (man->flags & MAN_BLINE &&
+	    (tok == MAN_nf || tok == MAN_fi) &&
+	    (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {
+		n = man->last;
+		man_unscope(man, n);
+		roff_body_alloc(man, n->line, n->pos, n->tok);
+		man->flags &= ~MAN_BLINE;
+	}
+
+	/*
 	 * A block header next line scope is open,
 	 * and the new macro is not allowed inside block headers.
 	 * Delete the block that is being broken.
@@ -323,51 +330,5 @@ man_mparse(const struct roff_man *man)
 {
 
 	assert(man && man->parse);
-	return(man->parse);
-}
-
-void
-man_deroff(char **dest, const struct roff_node *n)
-{
-	char	*cp;
-	size_t	 sz;
-
-	if (n->type != ROFFT_TEXT) {
-		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;
+	return man->parse;
 }