summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2011-11-12 22:31:23 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2011-11-12 22:31:23 +0000
commit1f83a6d516dd9b712874ff76db6d9c81a62079bc (patch)
tree5383be5eab93edaf7812a3a2eaa638fdb9fdf2ea
parentc0f83b82fdee92308bd30cb6eb4c4d9836001c2b (diff)
Parse and ignore the C font family in \f escapes.
Helps with some real-world manuals that (incorrectly) assume that the C font family means "constant width". Suggested by Andreas Vogele, patch by kristaps@.
-rw-r--r--usr.bin/mandoc/mandoc.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/mandoc/mandoc.c b/usr.bin/mandoc/mandoc.c
index 716940f257c..7e1c66ed9ec 100644
--- a/usr.bin/mandoc/mandoc.c
+++ b/usr.bin/mandoc/mandoc.c
@@ -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 @@ out:
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 */