===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.331
retrieving revision 1.335
diff -u -p -r1.331 -r1.335
--- mandoc/roff.c	2018/08/16 13:54:06	1.331
+++ mandoc/roff.c	2018/08/18 22:05:43	1.335
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.331 2018/08/16 13:54:06 schwarze Exp $ */
+/*	$Id: roff.c,v 1.335 2018/08/18 22:05:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -327,6 +327,7 @@ const char *__roff_name[MAN_MAX + 1] = {
 	"Dx",		"%Q",		"%U",		"Ta",
 	NULL,
 	"TH",		"SH",		"SS",		"TP",
+	"TQ",
 	"LP",		"PP",		"P",		"IP",
 	"HP",		"SM",		"SB",		"BI",
 	"IB",		"BR",		"RB",		"R",
@@ -334,7 +335,8 @@ const char *__roff_name[MAN_MAX + 1] = {
 	"nf",		"fi",
 	"RE",		"RS",		"DT",		"UC",
 	"PD",		"AT",		"in",
-	"OP",		"EX",		"EE",		"UR",
+	"SY",		"YS",		"OP",
+	"EX",		"EE",		"UR",
 	"UE",		"MT",		"ME",		NULL
 };
 const	char *const *roff_name = __roff_name;
@@ -1203,9 +1205,17 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 			r->man->next = ROFF_NEXT_SIBLING;
 		}
 
-		/* Discard comments. */
+		/* Line continuation with comment. */
 
-		while (stesc > start && stesc[-1] == ' ')
+		if (stesc[1] == '#') {
+			*stesc = '\0';
+			return ROFF_APPEND;
+		}
+
+		/* Discard normal comments. */
+
+		while (stesc > start && stesc[-1] == ' ' &&
+		    (stesc == start + 1 || stesc[-2] != '\\'))
 			stesc--;
 		*stesc = '\0';
 		break;