===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.118
retrieving revision 1.120
diff -u -p -r1.118 -r1.120
--- mandoc/mandoc.c	2020/10/24 22:57:39	1.118
+++ mandoc/mandoc.c	2022/04/13 13:19:34	1.120
@@ -1,7 +1,7 @@
-/*	$Id: mandoc.c,v 1.118 2020/10/24 22:57:39 schwarze Exp $ */
+/* $Id: mandoc.c,v 1.120 2022/04/13 13:19:34 schwarze Exp $ */
 /*
+ * Copyright (c) 2011-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -74,12 +74,12 @@ mandoc_font(const char *cp, int sz)
 		case 'C':
 			switch (cp[1]) {
 			case 'B':
-				return ESCAPE_FONTBOLD;
+				return ESCAPE_FONTCB;
 			case 'I':
-				return ESCAPE_FONTITALIC;
+				return ESCAPE_FONTCI;
 			case 'R':
 			case 'W':
-				return ESCAPE_FONTCW;
+				return ESCAPE_FONTCR;
 			default:
 				return ESCAPE_ERROR;
 			}
@@ -114,7 +114,7 @@ mandoc_escape(const char **end, const char **start, in
 	 * it only makes a difference in copy mode.
 	 */
 
-	if (**end == 'E')
+	while (**end == 'E')
 		++*end;
 
 	/*