===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.210
retrieving revision 1.212
diff -u -p -r1.210 -r1.212
--- mandoc/man_term.c	2018/04/11 17:11:13	1.210
+++ mandoc/man_term.c	2018/08/14 01:27:48	1.212
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.210 2018/04/11 17:11:13 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.212 2018/08/14 01:27:48 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -884,6 +884,8 @@ print_man_node(DECL_ARGS)
 		} else if (*n->string == ' ' && n->flags & NODE_LINE &&
 		    (p->flags & TERMP_NONEWLINE) == 0)
 			term_newln(p);
+		else if (n->flags & NODE_DELIMC)
+			p->flags |= TERMP_NOSPACE;
 
 		term_word(p, n->string);
 		goto out;
@@ -1032,6 +1034,18 @@ print_man_foot(struct termp *p, const struct roff_meta
 
 	term_word(p, title);
 	term_flushln(p);
+
+	/*
+	 * Reset the terminal state for more output after the footer:
+	 * Some output modes, in particular PostScript and PDF, print
+	 * the header and the footer into a buffer such that it can be
+	 * reused for multiple output pages, then go on to format the
+	 * main text.
+	 */
+
+        p->tcol->offset = 0;
+        p->flags = 0;
+
 	free(title);
 }