From 06e6c7dc6e33f32a1df66e14e39620b5d0c2b20a Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Mon, 16 Aug 2010 09:51:17 +0000
Subject: 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.

---
 TODO     | 6 +++++-
 chars.c  | 4 ++--
 chars.in | 3 +--
 man.3    | 5 ++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index 05a2e9e3..85160158 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 ************************************************************************
 * Official mandoc TODO.
-* $Id: TODO,v 1.39 2010/08/15 17:38:41 schwarze Exp $
+* $Id: TODO,v 1.40 2010/08/16 09:51:17 kristaps Exp $
 ************************************************************************
 
 ************************************************************************
@@ -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 a0731e99..908584d3 100644
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*	$Id: chars.c,v 1.25 2010/07/31 23:52:58 schwarze Exp $ */
+/*	$Id: chars.c,v 1.26 2010/08/16 09:51:17 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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 5db07566..3c7db90c 100644
--- a/chars.in
+++ b/chars.in
@@ -1,4 +1,4 @@
-/*	$Id: chars.in,v 1.32 2010/07/31 23:52:58 schwarze Exp $ */
+/*	$Id: chars.in,v 1.33 2010/08/16 09:51:17 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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 aefe977f..ac897816 100644
--- a/man.3
+++ b/man.3
@@ -1,4 +1,4 @@
-.\"	$Id: man.3,v 1.22 2010/07/07 15:04:54 kristaps Exp $
+.\"	$Id: man.3,v 1.23 2010/08/16 09:51:17 kristaps Exp $
 .\"
 .\" Copyright (c) 2009-2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 7 2010 $
+.Dd $Mdocdate: August 16 2010 $
 .Dt MAN 3
 .Os
 .Sh NAME
@@ -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),
-- 
cgit v1.2.3