Remove \*(C+ from the pre-predefined strings. It is always `ds'-defined

when being used in manuals.  Since we now support `ds', it's no longer
necessary to account for it.  From a bug report originally by Thomas
Jeunet.

4 files changed, 5 insertions, 3 deletions

diff --git a/TODO b/TODO
index 3df7a1c0..1ec7bc92 100644
--- a/TODO
+++ b/TODO
@@ -179,3 +179,7 @@ Several areas can be cleaned up to make mandoc even faster.  These are
   in OpenBSD ksh(1) gives the wrong width
   because "\e" is one character in groff, two in mandoc
 
+- Now that `ds' is minimally supported, we can get rid of some
+  predefined strings.  \*(C+ has already been thrown out.  Track these
+  down and whack them.  Look in e.g. gcc.1 for the top-level `ds'
+  invocations.  These are reproduced across most crappy GNU manuals.
diff --git a/chars.c b/chars.c
index ce561d4a..cb8d01c8 100644
--- a/chars.c
+++ b/chars.c
@@ -40,7 +40,7 @@ struct	ln {
 #define CHARS_BOTH	 (CHARS_CHAR | CHARS_STRING)
 };
 
-#define	LINES_MAX	  370
+#define	LINES_MAX	  369
 
 #define CHAR(in, ch, code) \
 	{ NULL, (in), (ch), (code), CHARS_CHAR },
diff --git a/chars.in b/chars.in
index 84049645..b67b2ba7 100644
--- a/chars.in
+++ b/chars.in
@@ -353,7 +353,6 @@ STRING("--",			"--",		8212)
 STRING("PI",			"pi",		960)
 STRING("L\"",			"``",		8220)
 STRING("R\"",			"\'\'",		8221)
-STRING("C+",			"C++",		0)
 STRING("C`",			"`",		8216)
 STRING("C\'",			"\'",		8217)
 STRING("Aq",			"\'",		39)
diff --git a/man.3 b/man.3
index 828acb5f..ca4fce9b 100644
--- a/man.3
+++ b/man.3
@@ -116,7 +116,6 @@ documents to be correctly formatted:
 \e*(PI (pi),
 \e*(L" (left double-quote),
 \e*(R" (right double-quote),
-\e*(C+ (C++),
 \e*(C` (left single-quote),
 \e*(C' (right single-quote),
 \e*(Aq (apostrophe),