===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- src/usr.bin/mandoc/mandoc.c	2011/10/24 20:29:21	1.29
+++ src/usr.bin/mandoc/mandoc.c	2011/11/12 22:31:22	1.30
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.29 2011/10/24 20:29:21 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.30 2011/11/12 22:31:22 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -365,8 +365,15 @@
 
 	switch (gly) {
 	case (ESCAPE_FONT):
-		if (1 != rlim)
+		/*
+		 * Pretend that the constant-width font modes are the
+		 * same as the regular font modes.
+		 */
+		if (2 == rlim && 'C' == *rstart)
+			rstart++;
+		else if (1 != rlim)
 			break;
+
 		switch (*rstart) {
 		case ('3'):
 			/* FALLTHROUGH */