===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.174
retrieving revision 1.178
diff -u -p -r1.174 -r1.178
--- mandoc/man.c	2017/06/03 15:55:24	1.174
+++ mandoc/man.c	2018/08/23 19:33:27	1.178
@@ -1,7 +1,7 @@
-/*	$Id: man.c,v 1.174 2017/06/03 15:55:24 schwarze Exp $ */
+/*	$Id: man.c,v 1.178 2018/08/23 19:33:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -76,6 +76,8 @@ static int
 man_ptext(struct roff_man *man, int line, char *buf, int offs)
 {
 	int		 i;
+	const char 	*cp, *sp;
+	char		*ep;
 
 	/* Literal free-form text whitespace is preserved. */
 
@@ -89,19 +91,36 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 		/* Skip leading whitespace. */ ;
 
 	/*
-	 * Blank lines are ignored in next line scope and right
-	 * after headings but add a single vertical space elsewhere.
+	 * Blank lines are ignored in next line scope
+	 * and right after headings and cancel preceding \c,
+	 * but add a single vertical space elsewhere.
 	 */
 
 	if (buf[i] == '\0') {
-		if (man->flags & (MAN_ELINE | MAN_BLINE))
+		if (man->flags & (MAN_ELINE | MAN_BLINE)) {
 			mandoc_msg(MANDOCERR_BLK_BLANK, man->parse,
 			    line, 0, NULL);
-		else if (man->last->tok != MAN_SH &&
-		    man->last->tok != MAN_SS) {
-			roff_elem_alloc(man, line, offs, ROFF_sp);
-			man->next = ROFF_NEXT_SIBLING;
+			return 1;
 		}
+		if (man->last->tok == MAN_SH || man->last->tok == MAN_SS)
+			return 1;
+		switch (man->last->type) {
+		case ROFFT_TEXT:
+			sp = man->last->string;
+			cp = ep = strchr(sp, '\0') - 2;
+			if (cp < sp || cp[0] != '\\' || cp[1] != 'c')
+				break;
+			while (cp > sp && cp[-1] == '\\')
+				cp--;
+			if ((ep - cp) % 2)
+				break;
+			*ep = '\0';
+			return 1;
+		default:
+			break;
+		}
+		roff_elem_alloc(man, line, offs, ROFF_sp);
+		man->next = ROFF_NEXT_SIBLING;
 		return 1;
 	}
 
@@ -219,8 +238,8 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	/* Call to handler... */
 
-	assert(man_macros[tok].fp);
-	(*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf);
+	assert(man_macro(tok)->fp != NULL);
+	(*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf);
 
 	/* In quick mode (for mandocdb), abort after the NAME section. */
 
@@ -238,7 +257,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 	 */
 
 	if ( ! bline || man->flags & MAN_ELINE ||
-	    man_macros[tok].flags & MAN_NSCOPED)
+	    man_macro(tok)->flags & MAN_NSCOPED)
 		return 1;
 
 	assert(man->flags & MAN_BLINE);
@@ -261,11 +280,13 @@ man_breakscope(struct roff_man *man, int tok)
 	 */
 
 	if (man->flags & MAN_ELINE && (tok < MAN_TH ||
-	    ! (man_macros[tok].flags & MAN_NSCOPED))) {
+	    (man_macro(tok)->flags & MAN_NSCOPED) == 0)) {
 		n = man->last;
-		assert(n->type != ROFFT_TEXT);
-		if (man_macros[n->tok].flags & MAN_NSCOPED)
+		if (n->type == ROFFT_TEXT)
 			n = n->parent;
+		if (n->tok < MAN_TH ||
+		    man_macro(n->tok)->flags & MAN_NSCOPED)
+			n = n->parent;
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
@@ -296,17 +317,18 @@ man_breakscope(struct roff_man *man, int tok)
 	 */
 
 	if (man->flags & MAN_BLINE && (tok < MAN_TH ||
-	    man_macros[tok].flags & MAN_BSCOPE)) {
+	    man_macro(tok)->flags & MAN_BSCOPE)) {
 		n = man->last;
 		if (n->type == ROFFT_TEXT)
 			n = n->parent;
-		if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
+		if (n->tok < MAN_TH ||
+		    (man_macro(n->tok)->flags & MAN_BSCOPE) == 0)
 			n = n->parent;
 
 		assert(n->type == ROFFT_HEAD);
 		n = n->parent;
 		assert(n->type == ROFFT_BLOCK);
-		assert(man_macros[n->tok].flags & MAN_SCOPED);
+		assert(man_macro(n->tok)->flags & MAN_SCOPED);
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
@@ -315,14 +337,6 @@ man_breakscope(struct roff_man *man, int tok)
 		roff_node_delete(man, n);
 		man->flags &= ~MAN_BLINE;
 	}
-}
-
-const struct mparse *
-man_mparse(const struct roff_man *man)
-{
-
-	assert(man && man->parse);
-	return man->parse;
 }
 
 void