7 files changed, 47 insertions, 33 deletions
diff --git a/contrib/groff/devdvi/generate/Makefile b/contrib/groff/devdvi/generate/Makefile
index aeca977..c8cd656 100644
--- a/contrib/groff/devdvi/generate/Makefile
+++ b/contrib/groff/devdvi/generate/Makefile
@@ -1,32 +1,35 @@
-#Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.com)
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
+#      Written by James Clark (jjc@jclark.com)
 #
-#This file is part of groff.
+# This file is part of groff.
 #
-#groff is free software; you can redistribute it and/or modify it under
-#the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 2, or (at your option) any later
-#version.
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version.
 #
-#groff is distributed in the hope that it will be useful, but WITHOUT ANY
-#WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#for more details.
+# groff is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
 #
-#You should have received a copy of the GNU General Public License along
-#with groff; see the file COPYING.  If not, write to the Free Software
-#Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License along
+# with groff; see the file COPYING.  If not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # This is set up so you can do:
 #   make -f generate/Makefile
 # in the parent directory of the directory containing this file.
 
+# Note that the following font files have manually added kerning values for
+# `` and '': B, BI, I, R.
+
 srcdir=.
 tfmdir=/usr/local/lib/groff-tfm
 gfdir=/usr/local/lib/groff-gf
 
 TFMTODIT=tfmtodit
-FONTS=R I B BI CW MI S EX H HI HB SA SB
+FONTS=R I B BI CW CWI MI S EX H HI HB SA SB
 SPECIALFLAG=-s
 
 all: $(FONTS)
@@ -54,33 +57,44 @@ BI: $(srcdir)/texi.map
 # CW is special because it contains "
 
 CW: $(srcdir)/textt.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/cmtt10.tfm $(srcdir)/textt.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/cmtt10.tfm $(srcdir)/textt.map $@
+
+CWI: $(srcdir)/textt.map
+	$(TFMTODIT) \
+	  $(tfmdir)/cmitt10.tfm $(srcdir)/textt.map $@
 
 MI: $(srcdir)/texmi.map
-	$(TFMTODIT) $(SPECIALFLAG) -k 0177 $(tfmdir)/cmmi10.tfm $(srcdir)/texmi.map $@
+	$(TFMTODIT) $(SPECIALFLAG) -k 0177 \
+	  $(tfmdir)/cmmi10.tfm $(srcdir)/texmi.map $@
 
 S: $(srcdir)/texsy.map
-	$(TFMTODIT) $(SPECIALFLAG) -k 060 $(tfmdir)/cmsy10.tfm $(srcdir)/texsy.map $@
+	$(TFMTODIT) $(SPECIALFLAG) -k 060 \
+	  $(tfmdir)/cmsy10.tfm $(srcdir)/texsy.map $@
 
 EX: $(srcdir)/texex.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/cmex10.tfm $(srcdir)/texex.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/cmex10.tfm $(srcdir)/texex.map $@
 
-H: $(srcdir)/texr.map
-	$(TFMTODIT) -g $(gfdir)/cmss10.300gf $(tfmdir)/cmss10.tfm $(srcdir)/texb.map $@
+H: $(srcdir)/texb.map
+	$(TFMTODIT) -g $(gfdir)/cmss10.300gf \
+	  $(tfmdir)/cmss10.tfm $(srcdir)/texb.map $@
 
-HB: $(srcdir)/texr.map
+HB: $(srcdir)/texb.map
 	$(TFMTODIT) -g $(gfdir)/cmssbx10.300gf \
 	  $(tfmdir)/cmssbx10.tfm $(srcdir)/texb.map $@
 
-HI: $(srcdir)/texr.map
+HI: $(srcdir)/texb.map
 	$(TFMTODIT) -g $(gfdir)/cmssi10.300gf \
 	  $(tfmdir)/cmssi10.tfm $(srcdir)/texb.map $@
 
 SA: $(srcdir)/msam.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/msam10.tfm $(srcdir)/msam.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/msam10.tfm $(srcdir)/msam.map $@
 
 SB: $(srcdir)/msbm.map
-	$(TFMTODIT) $(SPECIALFLAG) $(tfmdir)/msbm10.tfm $(srcdir)/msbm.map $@
+	$(TFMTODIT) $(SPECIALFLAG) \
+	  $(tfmdir)/msbm10.tfm $(srcdir)/msbm.map $@
 
 clean:
 
diff --git a/contrib/groff/devdvi/generate/cork.map b/contrib/groff/devdvi/generate/cork.map
index 52cac9c..4e4a35a 100644
--- a/contrib/groff/devdvi/generate/cork.map
+++ b/contrib/groff/devdvi/generate/cork.map
@@ -31,12 +31,12 @@
 30 Fi
 31 Fl
 33 !
-34 "
+34 " dq
 35 # sh
 36 $ Do
 37 %
 38 &
-39 ' aq
+39 ' aq cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texb.map b/contrib/groff/devdvi/generate/texb.map
index 6700833..b2bcd15 100644
--- a/contrib/groff/devdvi/generate/texb.map
+++ b/contrib/groff/devdvi/generate/texb.map
@@ -36,7 +36,7 @@
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texi.map b/contrib/groff/devdvi/generate/texi.map
index 835c642..4ca802a 100644
--- a/contrib/groff/devdvi/generate/texi.map
+++ b/contrib/groff/devdvi/generate/texi.map
@@ -36,7 +36,7 @@
 36 Po char163
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texr.map b/contrib/groff/devdvi/generate/texr.map
index bebf67b..7db0e5f 100644
--- a/contrib/groff/devdvi/generate/texr.map
+++ b/contrib/groff/devdvi/generate/texr.map
@@ -36,7 +36,7 @@
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *
diff --git a/contrib/groff/devdvi/generate/texsy.map b/contrib/groff/devdvi/generate/texsy.map
index 2c970bc..fe98eb2 100644
--- a/contrib/groff/devdvi/generate/texsy.map
+++ b/contrib/groff/devdvi/generate/texsy.map
@@ -1,5 +1,5 @@
 0 \- mi
-1 md
+1 md pc
 2 mu char215
 3 **
 4 di char247
diff --git a/contrib/groff/devdvi/generate/textt.map b/contrib/groff/devdvi/generate/textt.map
index 1461d0a..80e8911 100644
--- a/contrib/groff/devdvi/generate/textt.map
+++ b/contrib/groff/devdvi/generate/textt.map
@@ -31,12 +31,12 @@
 30 OE
 31 /O char216
 33 !
-34 "
+34 " dq
 35 # sh
 36 $ Do
 37 %
 38 &
-39 '
+39 ' cq
 40 (
 41 )
 42 *