From ea02c27746628977c16bd9f8665b1ceed267c88f Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Wed, 15 Sep 2010 13:10:30 +0000
Subject: Remove last pod2man escapes.  These render ok, although \*(-- renders
 as O- because the underlying macro depends on \(*W, which a prior pod2man
 preamble `tr' macro rewrites as "-".  This is an error in groff as this
 tramples on the real \(*W, or Greek omega.

---
 TODO     |  5 -----
 chars.c  |  2 +-
 chars.in | 17 ++---------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/TODO b/TODO
index 427172a8..3fa7a76d 100644
--- a/TODO
+++ b/TODO
@@ -181,8 +181,3 @@ Several areas can be cleaned up to make mandoc even faster.  These are
   .Bl -tag -width "\eD{format}XX" -compact
   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 17d16850..5288abbe 100644
--- a/chars.c
+++ b/chars.c
@@ -40,7 +40,7 @@ struct	ln {
 #define CHARS_BOTH	 (CHARS_CHAR | CHARS_STRING)
 };
 
-#define	LINES_MAX	  362
+#define	LINES_MAX	  351
 
 #define CHAR(in, ch, code) \
 	{ NULL, (in), (ch), (code), CHARS_CHAR },
diff --git a/chars.in b/chars.in
index 6d8e4fdb..5f5e091c 100644
--- a/chars.in
+++ b/chars.in
@@ -348,19 +348,6 @@ CHAR("Po",			"L",		163)
 CHAR("Cs",			"x",		164)
 CHAR("Fn",			"f",		402)
 
-/* pod2man holdovers. */
-STRING("--",			"--",		8212)
-STRING("PI",			"pi",		960)
-STRING("L\"",			"``",		8220)
-STRING("R\"",			"\'\'",		8221)
-STRING("C`",			"`",		8216)
-STRING("C\'",			"\'",		8217)
-STRING("Aq",			"\'",		39)
-STRING("^",			"^",		94)
-STRING(",",			",",		44)
-STRING("~",			"~",		126)
-STRING("/",			"/",		47)
-
 /* Old style. */
 STRING("Am",			"&",		38)
 STRING("Ba",			"|",		124)
@@ -374,9 +361,7 @@ STRING("Na",			"NaN",		0)
 STRING("Ne",			"!=",		8800)
 STRING("Pi",			"pi",		960)
 STRING("Pm",			"+-",		177)
-STRING("R",			"(R)",		174)
 STRING("Rq",			"\'\'",		8221)
-STRING("Tm",			"tm",		8482)
 STRING("left-bracket",		"[",		91)
 STRING("left-parenthesis",	"(",		40)
 STRING("left-singlequote",	"`",		8216)
@@ -384,10 +369,12 @@ STRING("lp",			"(",		40)
 STRING("q",			"\"",		34)
 STRING("quote-left",		"`",		8216)
 STRING("quote-right",		"\'",		8217)
+STRING("R",			"(R)",		174)
 STRING("right-bracket",		"]",		93)
 STRING("right-parenthesis",	")",		41)
 STRING("right-singlequote",	"\'",		8217)
 STRING("rp",			")",		41)
+STRING("Tm",			"(Tm)",		8482)
 
 /* Lines. */
 CHAR("ba",			"|",		124)
-- 
cgit