From 096d7158a7d30098cc9d23348cb4732d4d71af0e Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 23 May 2000 22:08:24 +0000
Subject: [PATCH] Adding font CWI (constant width italic) to devdvi.

* font/devdvi/CWI: New file.
* font/devdvi/generate/Makefile: Add generating rule.
* font/devdvi/DESC.in, font/devdvi/Makefile.sub, win32-diffs,
tmac/tmac.dvi: Use it.
* NEWS: Announce it.

* font/devlj4/*: Regenerated (only adding kernings for `cq' glyph).
* font/devlj4/generate/Makefile: Cosmetic changes only.

* man/groff.man: Removed most of the redundant description of
special characters (which is in groff_char.man).  Added font
translation CB->CR for devdvi.  Other minor fixes.

* tmac/tmac.dvi: Improved appearance of (co (copyright) and (rg
(registered) symbols.
---
 ChangeLog                     |  20 +++++
 NEWS                          |   3 +
 font/devdvi/CWI               | 160 ++++++++++++++++++++++++++++++++++++++
 font/devdvi/DESC.in           |   2 +-
 font/devdvi/Makefile.sub      |   2 +-
 font/devdvi/generate/Makefile |   9 ++-
 font/devlj4/ALBB              |  14 ++++
 font/devlj4/ALBR              |  14 ++++
 font/devlj4/AOB               |   1 +
 font/devlj4/AOI               |  13 ++++
 font/devlj4/AOR               |  12 +++
 font/devlj4/GB                |  14 ++++
 font/devlj4/GBI               |  13 ++++
 font/devlj4/GI                |  14 ++++
 font/devlj4/GR                |  16 ++++
 font/devlj4/OB                |  17 ++++
 font/devlj4/OBI               |  14 ++++
 font/devlj4/OI                |  15 ++++
 font/devlj4/OR                |  20 +++++
 font/devlj4/TB                |  17 ++++
 font/devlj4/TBI               |  19 +++++
 font/devlj4/TI                |  22 ++++++
 font/devlj4/TR                |  15 ++++
 font/devlj4/UB                |  17 ++++
 font/devlj4/UBI               |  17 ++++
 font/devlj4/UCB               |  13 ++++
 font/devlj4/UCBI              |  12 +++
 font/devlj4/UCI               |  15 ++++
 font/devlj4/UCR               |  14 ++++
 font/devlj4/UI                |  63 +++++++++++++++
 font/devlj4/UR                |  19 +++++
 font/devlj4/generate/Makefile |  41 ++++++----
 man/groff.man                 | 176 +++++++-----------------------------------
 tmac/tmac.dvi                 |  14 +++-
 win32-diffs                   |   2 +-
 35 files changed, 676 insertions(+), 173 deletions(-)
 create mode 100644 font/devdvi/CWI

diff --git a/ChangeLog b/ChangeLog
index 7f467ad4..d0f73640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-05-23  Werner LEMBERG  <wl@gnu.org>
+
+	Adding font CWI (constant width italic) to devdvi.
+
+	* font/devdvi/CWI: New file.
+	* font/devdvi/generate/Makefile: Add generating rule.
+	* font/devdvi/DESC.in, font/devdvi/Makefile.sub, win32-diffs,
+	tmac/tmac.dvi: Use it.
+	* NEWS: Announce it.
+
+	* font/devlj4/*: Regenerated (only adding kernings for `cq' glyph).
+	* font/devlj4/generate/Makefile: Cosmetic changes only.
+
+	* man/groff.man: Removed most of the redundant description of
+	special characters (which is in groff_char.man).  Added font
+	translation CB->CR for devdvi.  Other minor fixes.
+
+	* tmac/tmac.dvi: Improved appearance of \(co (copyright) and \(rg
+	(registered) symbols.
+
 2000-05-22  Werner LEMBERG  <wl@gnu.org>
 
 	* doc/Makefile: Added rule for creating info files.
diff --git a/NEWS b/NEWS
index 7d84bd56..bf2be5a7 100644
--- a/NEWS
+++ b/NEWS
@@ -120,6 +120,9 @@ Grodvi
 
 The font size 11pt has been changed to 10.95pt (as used in LaTeX 2e).
 
+A new font file CWI (using cmitt10; this is typewriter italic) has been
+added.
+
 Grolbp
 ------
 
diff --git a/font/devdvi/CWI b/font/devdvi/CWI
new file mode 100644
index 00000000..7e7b5408
--- /dev/null
+++ b/font/devdvi/CWI
@@ -0,0 +1,160 @@
+name CWI
+internalname cmitt10
+spacewidth 550498
+slant 14.036243
+checksum -538297224
+designsize 10485760
+charset
+*G	550498,640797,0,182045	2	0000
+*D	550498,640797,0,182045	2	0001
+*H	550498,640797,0,182045	2	0002
+*L	550498,640797,0,182045	2	0003
+*C	550498,640797,0,182045	2	0004
+*P	550498,640797,0,182045	2	0005
+*S	550498,640797,0,182045	2	0006
+*U	550498,640797,0,182045	2	0007
+*F	550498,640797,0,182045	2	0010
+*Q	550498,640797,0,182045	2	0011
+*W	550498,640797,0,182045	2	0012
+ff	550498,640797,0,182045	2	0013
+fi	550498,640797,0,182045	2	0014
+fl	550498,640797,0,182045	2	0015
+Fi	550498,407779,233018,182045	1	0016
+Fl	550498,407779,233018,182045	1	0017
+.i	550498,451470,0,182045	0	0020
+.j	550498,451470,233018,182045	1	0021
+ga	550498,640797,0,182045	2	0022
+char180	550498,640797,0,182045	2	0023
+aa	"
+ah	550498,593466,0,182045	2	0024
+ab	550498,640797,0,182045	2	0025
+char175	550498,593027,0,182045	2	0026
+a-	"
+ao	550498,640797,0,182045	2	0027
+char184	550498,0,203891,182045	1	0030
+ac	"
+char223	550498,640797,233018,182045	3	0031
+ss	"
+char230	550498,451470,0,182045	0	0032
+ae	"
+oe	550498,451470,0,182045	0	0033
+char248	550498,567979,116509,182045	3	0034
+/o	"
+char198	550498,640797,0,182045	2	0035
+AE	"
+OE	550498,640797,0,182045	2	0036
+char216	550498,699051,58254,182045	3	0037
+/O	"
+---	550498,230104,116509,182045	1	0040
+!	550498,640797,0,182045	2	0041
+dq	550498,640797,0,182045	2	0042
+"	"
+sh	550498,640797,0,182045	2	0043
+#	"
+Do	550498,640797,0,182045	2	0044
+$	"
+%	550498,728178,87381,182045	3	0045
+&	550498,640797,0,182045	2	0046
+cq	550498,640797,0,182045	2	0047
+'	"
+(	550498,728178,87379,182045	3	0050
+)	550498,728178,87379,182045	3	0051
+*	550498,546134,0,182045	2	0052
++	550498,556326,-84470,182045	2	0053
+,	550498,131072,145635,182045	1	0054
+\-	550498,556326,-84470,182045	2	0055
+-	"
+.	550498,131072,0,182045	0	0056
+sl	550498,728178,87379,182045	3	0057
+/	"
+0	550498,640797,0,182045	2	0060
+1	550498,640797,0,182045	2	0061
+2	550498,640797,0,182045	2	0062
+3	550498,640797,0,182045	2	0063
+4	550498,640797,233018,182045	3	0064
+5	550498,640797,0,182045	2	0065
+6	550498,640797,0,182045	2	0066
+7	550498,640797,233018,182045	3	0067
+8	550498,640797,0,182045	2	0070
+9	550498,640797,0,182045	2	0071
+:	550498,451470,0,182045	0	0072
+;	550498,451470,145635,182045	1	0073
+<	550498,582542,-58254,182045	2	0074
+=	550498,435813,-204984,182045	0	0075
+>	550498,582542,-58254,182045	2	0076
+?	550498,640797,0,182045	2	0077
+at	550498,640797,0,182045	2	0100
+@	"
+A	550498,640797,0,182045	2	0101
+B	550498,640797,0,182045	2	0102
+C	550498,640797,0,182045	2	0103
+D	550498,640797,0,182045	2	0104
+E	550498,640797,0,182045	2	0105
+F	550498,640797,0,182045	2	0106
+G	550498,640797,0,182045	2	0107
+H	550498,640797,0,182045	2	0110
+I	550498,640797,0,182045	2	0111
+J	550498,640797,0,182045	2	0112
+K	550498,640797,0,182045	2	0113
+L	550498,640797,0,182045	2	0114
+M	550498,640797,0,182045	2	0115
+N	550498,640797,0,182045	2	0116
+O	550498,640797,0,182045	2	0117
+P	550498,640797,0,182045	2	0120
+Q	550498,640797,145635,182045	3	0121
+R	550498,640797,0,182045	2	0122
+S	550498,640797,0,182045	2	0123
+T	550498,640797,0,182045	2	0124
+U	550498,640797,0,182045	2	0125
+V	550498,640797,0,182045	2	0126
+W	550498,640797,0,182045	2	0127
+X	550498,640797,0,182045	2	0130
+Y	550498,640797,0,182045	2	0131
+Z	550498,640797,0,182045	2	0132
+lB	550498,728178,87379,182045	3	0133
+[	"
+rs	550498,728178,87379,182045	3	0134
+\	"
+rB	550498,728178,87379,182045	3	0135
+]	"
+ha	550498,640797,0,182045	2	0136
+^	"
+a^	"
+_	550498,0,99757,182045	1	0137
+oq	550498,640797,0,182045	2	0140
+`	"
+a	550498,451470,0,182045	0	0141
+b	550498,640797,0,182045	2	0142
+c	550498,451470,0,182045	0	0143
+d	550498,640797,0,182045	2	0144
+e	550498,451470,0,182045	0	0145
+f	550498,640797,233018,182045	3	0146
+g	550498,451470,233018,182045	1	0147
+h	550498,640797,0,182045	2	0150
+i	550498,640797,0,182045	2	0151
+j	550498,640797,233018,182045	3	0152
+k	550498,640797,0,182045	2	0153
+l	550498,640797,0,182045	2	0154
+m	550498,451470,0,182045	0	0155
+n	550498,451470,0,182045	0	0156
+o	550498,451470,0,182045	0	0157
+p	550498,451470,233018,182045	1	0160
+q	550498,451470,233018,182045	1	0161
+r	550498,451470,0,182045	0	0162
+s	550498,451470,0,182045	0	0163
+t	550498,640797,0,182045	2	0164
+u	550498,451470,0,182045	0	0165
+v	550498,451470,0,182045	0	0166
+w	550498,451470,0,182045	0	0167
+x	550498,451470,0,182045	0	0170
+y	550498,451470,233018,182045	1	0171
+z	550498,451470,0,182045	0	0172
+{	550498,728178,87379,182045	3	0173
+lC	"
+|	550498,728178,87379,182045	3	0174
+ba	"
+}	550498,728178,87379,182045	3	0175
+rC	"
+~	550498,640797,0,182045	2	0176
+a~	"
+---	550498,640797,0,182045	2	0177
diff --git a/font/devdvi/DESC.in b/font/devdvi/DESC.in
index 11a0a2b1..54c1302b 100644
--- a/font/devdvi/DESC.in
+++ b/font/devdvi/DESC.in
@@ -5,6 +5,6 @@ hor 1
 vert 1
 sizes 500 600 700 800 900 1000 1095 1200 1400 1440 1600 1728 1800
 2000 2074 2200 2400 2488 2800 3600 0
-fonts 13 R I B BI 0 0 0 0 0 MI S EX CW
+fonts 14 R I B BI 0 0 0 0 0 MI S EX CW CWI
 tcommand
 postpro grodvi
diff --git a/font/devdvi/Makefile.sub b/font/devdvi/Makefile.sub
index 8c3248fd..5f30be23 100644
--- a/font/devdvi/Makefile.sub
+++ b/font/devdvi/Makefile.sub
@@ -1,5 +1,5 @@
 DEV=dvi
-DEVFILES=DESC R I B BI CW MI S EX H HI HB SA SB \
+DEVFILES=DESC R I B BI CW CWI MI S EX H HI HB SA SB \
   generate/CompileFonts generate/Makefile generate/msam.map generate/msbm.map \
   generate/texb.map generate/texex.map generate/texi.map generate/texmi.map \
   generate/texr.map generate/texsy.map generate/textt.map
diff --git a/font/devdvi/generate/Makefile b/font/devdvi/generate/Makefile
index 7266666e..c8cd6564 100644
--- a/font/devdvi/generate/Makefile
+++ b/font/devdvi/generate/Makefile
@@ -21,12 +21,15 @@
 #   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)
@@ -57,6 +60,10 @@ CW: $(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 $@
diff --git a/font/devlj4/ALBB b/font/devlj4/ALBB
index 667cd62a..9c0c71f9 100644
--- a/font/devlj4/ALBB
+++ b/font/devlj4/ALBB
@@ -347,12 +347,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -975
 L ' -975
 T char173 -3414
 T hy -3414
 T - -3414
 T en -3414
 T em -3414
+A cq -1461
 A ' -1461
 char173 T -3414
 hy T -3414
@@ -364,23 +366,31 @@ Y hy -1950
 Y - -1950
 Y en -1950
 Y em -1950
+p cq -486
 p ' -486
+e cq -486
 e ' -486
+b cq -486
 b ' -486
+a cq -486
 a ' -486
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -486
 h ' -486
+m cq -486
 m ' -486
+R cq -975
 R ' -975
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -1950
 ' d -1950
 L char173 -486
 L hy -486
@@ -402,6 +412,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -417,8 +428,11 @@ R hy -975
 R - -975
 R en -975
 R em -975
+K cq -486
 K ' -486
+k cq -486
 k ' -486
+O cq -486
 O ' -486
 Z char173 -486
 Z hy -486
diff --git a/font/devlj4/ALBR b/font/devlj4/ALBR
index 25a4f805..684f29ff 100644
--- a/font/devlj4/ALBR
+++ b/font/devlj4/ALBR
@@ -361,12 +361,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -2925
 L ' -2925
 T char173 -3903
 T hy -3903
 T - -3903
 T en -3903
 T em -3903
+A cq -2925
 A ' -2925
 char173 T -3903
 hy T -3903
@@ -378,24 +380,33 @@ Y hy -1950
 Y - -1950
 Y en -1950
 Y em -1950
+p cq -1950
 p ' -1950
+e cq -975
 e ' -975
+b cq -1950
 b ' -1950
+a cq -1461
 a ' -1461
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -1950
 h ' -1950
+n cq -1950
 n ' -1950
+m cq -1950
 m ' -1950
+R cq -975
 R ' -975
 W char173 -1461
 W hy -1461
 W - -1461
 W en -1461
 W em -1461
+cq d -1950
 ' d -1950
 L char173 -975
 L hy -975
@@ -431,9 +442,12 @@ R hy -975
 R - -975
 R en -975
 R em -975
+K cq -486
 K ' -486
 b f -486
+k cq -486
 k ' -486
+O cq -486
 O ' -486
 Z char173 -486
 Z hy -486
diff --git a/font/devlj4/AOB b/font/devlj4/AOB
index 33a3444f..913ca39d 100644
--- a/font/devlj4/AOB
+++ b/font/devlj4/AOB
@@ -361,6 +361,7 @@ K , -486
 k s -486
 G J -1461
 A f -486
+A cq -486
 A ' -486
 Y char173 -975
 Y hy -975
diff --git a/font/devlj4/AOI b/font/devlj4/AOI
index 2fe99558..f43a1afa 100644
--- a/font/devlj4/AOI
+++ b/font/devlj4/AOI
@@ -386,12 +386,14 @@ y f -486
 w f -486
 k s -486
 G J -1461
+L cq -3414
 L ' -3414
 T char173 -1461
 T hy -1461
 T - -1461
 T en -1461
 T em -1461
+A cq -1950
 A ' -1950
 char173 T -1461
 hy T -1461
@@ -403,25 +405,35 @@ Y hy -975
 Y - -975
 Y en -975
 Y em -975
+p cq -1950
 p ' -1950
+c cq -975
 c ' -975
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
+a cq -1950
 a ' -1950
 V char173 -975
 V hy -975
 V - -975
 V en -975
 V em -975
+h cq -1950
 h ' -1950
+n cq -1950
 n ' -1950
+m cq -1950
 m ' -1950
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -1950
 ' d -1950
+s cq -975
 s ' -975
 L char173 -1950
 L hy -1950
@@ -443,6 +455,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -975
 ' s -975
 char173 X -975
 hy X -975
diff --git a/font/devlj4/AOR b/font/devlj4/AOR
index 810cbb20..b9a04852 100644
--- a/font/devlj4/AOR
+++ b/font/devlj4/AOR
@@ -330,12 +330,14 @@ b j -975
 G J -975
 A f -486
 U d -486
+L cq -3903
 L ' -3903
 T char173 -975
 T hy -975
 T - -975
 T en -975
 T em -975
+A cq -2439
 A ' -2439
 char173 T -975
 hy T -975
@@ -347,14 +349,23 @@ Y hy -975
 Y - -975
 Y en -975
 Y em -975
+p cq -1950
 p ' -1950
+c cq -975
 c ' -975
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
+a cq -1461
 a ' -1461
+h cq -1950
 h ' -1950
+n cq -1461
 n ' -1461
+m cq -1461
 m ' -1461
+cq d -1950
 ' d -1950
 L char173 -1461
 L hy -1461
@@ -371,6 +382,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -975
 ' s -975
 char173 A -1461
 hy A -1461
diff --git a/font/devlj4/GB b/font/devlj4/GB
index 2885385d..5433de6b 100644
--- a/font/devlj4/GB
+++ b/font/devlj4/GB
@@ -321,12 +321,14 @@ U d -486
 U s -486
 U a -486
 U q -486
+L cq -2925
 L ' -2925
 T char173 -3414
 T hy -3414
 T - -3414
 T en -3414
 T em -3414
+A cq -2925
 A ' -2925
 char173 T -3414
 hy T -3414
@@ -338,24 +340,33 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -1461
 p ' -1461
+e cq -486
 e ' -486
+b cq -975
 b ' -975
+a cq -975
 a ' -975
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -1461
 R ' -1461
 W char173 -1950
 W hy -1950
 W - -1950
 W en -1950
 W em -1950
+cq d -1461
 ' d -1461
 X char173 -1461
 X hy -1461
@@ -372,6 +383,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -486
 ' s -486
 char173 X -1461
 hy X -1461
@@ -387,7 +399,9 @@ R hy -1461
 R - -1461
 R en -1461
 R em -1461
+G cq -486
 G ' -486
+B cq -486
 B ' -486
 charset
 !	7317,18948,390	2	3617
diff --git a/font/devlj4/GBI b/font/devlj4/GBI
index c10ccfe8..806237c0 100644
--- a/font/devlj4/GBI
+++ b/font/devlj4/GBI
@@ -311,12 +311,14 @@ B o -486
 B y -486
 B U -486
 U o -486
+L cq -4878
 L ' -4878
 T char173 -3903
 T hy -3903
 T - -3903
 T en -3903
 T em -3903
+A cq -2439
 A ' -2439
 char173 T -3903
 hy T -3903
@@ -328,22 +330,29 @@ Y hy -2925
 Y - -2925
 Y en -2925
 Y em -2925
+p cq -486
 p ' -486
+b cq -975
 b ' -975
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -486
 h ' -486
+n cq -486
 n ' -486
+m cq -486
 m ' -486
+R cq -975
 R ' -975
 W char173 -1461
 W hy -1461
 W - -1461
 W en -1461
 W em -1461
+cq d -975
 ' d -975
 L char173 -1950
 L hy -1950
@@ -379,14 +388,18 @@ R hy -975
 R - -975
 R en -975
 R em -975
+v cq -486
 v ' -486
+w cq -486
 w ' -486
+E cq -486
 E ' -486
 Z char173 -1461
 Z hy -1461
 Z - -1461
 Z en -1461
 Z em -1461
+B cq -486
 B ' -486
 w char173 -486
 w hy -486
diff --git a/font/devlj4/GI b/font/devlj4/GI
index 12c949a9..6ca18930 100644
--- a/font/devlj4/GI
+++ b/font/devlj4/GI
@@ -248,12 +248,14 @@ E Y -486
 E W -486
 B o -486
 U o -486
+L cq -4878
 L ' -4878
 T char173 -4389
 T hy -4389
 T - -4389
 T en -4389
 T em -4389
+A cq -2439
 A ' -2439
 char173 T -3414
 hy T -3414
@@ -265,22 +267,29 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -486
 p ' -486
+b cq -975
 b ' -975
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -486
 h ' -486
+n cq -486
 n ' -486
+m cq -486
 m ' -486
+R cq -1950
 R ' -1950
 W char173 -1461
 W hy -1461
 W - -1461
 W en -1461
 W em -1461
+cq d -975
 ' d -975
 F char173 -486
 F hy -486
@@ -316,15 +325,20 @@ R hy -1461
 R - -1461
 R en -1461
 R em -1461
+v cq -486
 v ' -486
+w cq -486
 w ' -486
+E cq -486
 E ' -486
+Z cq -975
 Z ' -975
 Z char173 -486
 Z hy -486
 Z - -486
 Z en -486
 Z em -486
+B cq -486
 B ' -486
 charset
 !	6342,18648,390,2823,786,910	2	3617
diff --git a/font/devlj4/GR b/font/devlj4/GR
index a88d0f2b..169cbd15 100644
--- a/font/devlj4/GR
+++ b/font/devlj4/GR
@@ -415,12 +415,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -3414
 L ' -3414
 T char173 -4389
 T hy -4389
 T - -4389
 T en -4389
 T em -4389
+A cq -2925
 A ' -2925
 char173 T -4389
 hy T -4389
@@ -432,24 +434,33 @@ Y hy -3414
 Y - -3414
 Y en -3414
 Y em -3414
+p cq -975
 p ' -975
+e cq -486
 e ' -486
+b cq -1461
 b ' -1461
+a cq -486
 a ' -486
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -1950
 R ' -1950
 W char173 -1950
 W hy -1950
 W - -1950
 W en -1950
 W em -1950
+cq d -1461
 ' d -1461
 L char173 -1950
 L hy -1950
@@ -471,6 +482,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -486
 ' s -486
 char173 X -1461
 hy X -1461
@@ -486,8 +498,11 @@ R hy -1950
 R - -1950
 R en -1950
 R em -1950
+K cq -486
 K ' -486
+G cq -486
 G ' -486
+E cq -486
 E ' -486
 E char173 -486
 E hy -486
@@ -499,6 +514,7 @@ Z hy -975
 Z - -975
 Z en -975
 Z em -975
+B cq -486
 B ' -486
 J char173 -486
 J hy -486
diff --git a/font/devlj4/OB b/font/devlj4/OB
index 8f0123f6..8ea8f294 100644
--- a/font/devlj4/OB
+++ b/font/devlj4/OB
@@ -371,12 +371,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -2925
 L ' -2925
 T char173 -2925
 T hy -2925
 T - -2925
 T en -2925
 T em -2925
+A cq -3414
 A ' -3414
 char173 T -2925
 hy T -2925
@@ -388,25 +390,35 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -1461
 p ' -1461
+c cq -486
 c ' -486
+e cq -975
 e ' -975
+b cq -1461
 b ' -1461
+a cq -975
 a ' -975
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -1461
 ' d -1461
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
@@ -428,6 +440,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -438,16 +451,20 @@ hy A -1461
 en X -1461
 en A -1461
 em X -1461
+K cq -486
 K ' -486
 t g -486
 b f -486
+k cq -486
 k ' -486
+M cq -486
 M ' -486
 Z char173 -486
 Z hy -486
 Z - -486
 Z en -486
 Z em -486
+cq M -486
 ' M -486
 k char173 -486
 k hy -486
diff --git a/font/devlj4/OBI b/font/devlj4/OBI
index 3f1bb61a..e17fe3f4 100644
--- a/font/devlj4/OBI
+++ b/font/devlj4/OBI
@@ -366,12 +366,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -2439
 L ' -2439
 T char173 -2439
 T hy -2439
 T - -2439
 T en -2439
 T em -2439
+A cq -3414
 A ' -3414
 char173 T -2925
 hy T -2925
@@ -383,24 +385,33 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -486
 p ' -486
+c cq -486
 c ' -486
+e cq -1461
 e ' -1461
+b cq -1950
 b ' -1950
+a cq -975
 a ' -975
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+R cq -486
 R ' -486
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -1461
 ' d -1461
 L char173 -1950
 L hy -1950
@@ -422,6 +433,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -437,8 +449,10 @@ R hy -486
 R - -486
 R en -486
 R em -486
+K cq -486
 K ' -486
 b f -486
+k cq -486
 k ' -486
 Z char173 -486
 Z hy -486
diff --git a/font/devlj4/OI b/font/devlj4/OI
index ad7b993f..bbe9b446 100644
--- a/font/devlj4/OI
+++ b/font/devlj4/OI
@@ -466,12 +466,14 @@ K V -486
 K Y -486
 K W -486
 K U -975
+L cq -2439
 L ' -2439
 T char173 -3414
 T hy -3414
 T - -3414
 T en -3414
 T em -3414
+A cq -3903
 A ' -3903
 char173 T -3903
 hy T -3903
@@ -483,24 +485,33 @@ Y hy -1461
 Y - -1461
 Y en -1461
 Y em -1461
+p cq -1950
 p ' -1950
+c cq -486
 c ' -486
+e cq -975
 e ' -975
+b cq -1461
 b ' -1461
+a cq -1950
 a ' -1950
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+R cq -975
 R ' -975
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -1461
 ' d -1461
 L char173 -1950
 L hy -1950
@@ -527,6 +538,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -542,15 +554,18 @@ R hy -975
 R - -975
 R en -975
 R em -975
+K cq -486
 K ' -486
 t g -486
 b f -486
+k cq -486
 k ' -486
 Z char173 -975
 Z hy -975
 Z - -975
 Z en -975
 Z em -975
+U cq -486
 U ' -486
 k char173 -486
 k hy -486
diff --git a/font/devlj4/OR b/font/devlj4/OR
index bd33367b..edea52a5 100644
--- a/font/devlj4/OR
+++ b/font/devlj4/OR
@@ -434,12 +434,14 @@ U U -975
 U Q -486
 U K -486
 K U -486
+L cq -3414
 L ' -3414
 T char173 -3903
 T hy -3903
 T - -3903
 T en -3903
 T em -3903
+A cq -3903
 A ' -3903
 char173 T -3903
 hy T -3903
@@ -451,26 +453,37 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -1461
 p ' -1461
+c cq -486
 c ' -486
+e cq -975
 e ' -975
+b cq -1461
 b ' -1461
+a cq -1461
 a ' -1461
 V char173 -2439
 V hy -2439
 V - -2439
 V en -2439
 V em -2439
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+m cq -1461
 m ' -1461
+R cq -975
 R ' -975
 W char173 -1461
 W hy -1461
 W - -1461
 W en -1461
 W em -1461
+cq d -1461
 ' d -1461
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
@@ -492,6 +505,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -507,16 +521,22 @@ R hy -975
 R - -975
 R en -975
 R em -975
+k cq -486
 k ' -486
+M cq -486
 M ' -486
+G cq -486
 G ' -486
 Z char173 -975
 Z hy -975
 Z - -975
 Z en -975
 Z em -975
+B cq -486
 B ' -486
+U cq -486
 U ' -486
+cq M -486
 ' M -486
 k char173 -486
 k hy -486
diff --git a/font/devlj4/TB b/font/devlj4/TB
index a942875a..644425aa 100644
--- a/font/devlj4/TB
+++ b/font/devlj4/TB
@@ -520,12 +520,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -3414
 L ' -3414
 T char173 -1461
 T hy -1461
 T - -1461
 T en -1461
 T em -1461
+A cq -3414
 A ' -3414
 char173 T -1461
 hy T -1461
@@ -537,25 +539,35 @@ Y hy -3414
 Y - -3414
 Y en -3414
 Y em -3414
+c cq -975
 c ' -975
+e cq -975
 e ' -975
+b cq -486
 b ' -486
+a cq -1461
 a ' -1461
 V char173 -2439
 V hy -2439
 V - -2439
 V en -2439
 V em -2439
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -975
 R ' -975
 W char173 -1950
 W hy -1950
 W - -1950
 W en -1950
 W em -1950
+cq d -1461
 ' d -1461
+s cq -486
 s ' -486
 L char173 -975
 L hy -975
@@ -582,6 +594,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1950
 hy X -1950
@@ -597,11 +610,15 @@ R hy -975
 R - -975
 R en -975
 R em -975
+K cq -486
 K ' -486
 t g -486
 b f -486
+k cq -486
 k ' -486
+C cq -486
 C ' -486
+E cq -486
 E ' -486
 E char173 -486
 E hy -486
diff --git a/font/devlj4/TBI b/font/devlj4/TBI
index ad37f052..e1a30a87 100644
--- a/font/devlj4/TBI
+++ b/font/devlj4/TBI
@@ -565,12 +565,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -2925
 L ' -2925
 T char173 -975
 T hy -975
 T - -975
 T en -975
 T em -975
+A cq -3414
 A ' -3414
 char173 T -1461
 hy T -1461
@@ -582,24 +584,33 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -1950
 p ' -1950
+c cq -1461
 c ' -1461
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -486
 R ' -486
 W char173 -1950
 W hy -1950
 W - -1950
 W en -1950
 W em -1950
+cq d -975
 ' d -975
 X char173 -1461
 X hy -1461
@@ -616,6 +627,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -486
 ' s -486
 char173 X -1461
 hy X -1461
@@ -631,13 +643,19 @@ R hy -486
 R - -486
 R en -486
 R em -486
+K cq -486
 K ' -486
 t g -486
+v cq -486
 v ' -486
 b f -975
+y cq -486
 y ' -486
+w cq -486
 w ' -486
+C cq -486
 C ' -486
+E cq -486
 E ' -486
 E char173 -486
 E hy -486
@@ -649,6 +667,7 @@ Z hy -486
 Z - -486
 Z en -486
 Z em -486
+J cq -975
 J ' -975
 J char173 -975
 J hy -975
diff --git a/font/devlj4/TI b/font/devlj4/TI
index 4a9254ee..6b4a3ec7 100644
--- a/font/devlj4/TI
+++ b/font/devlj4/TI
@@ -635,12 +635,14 @@ K V -486
 K Y -486
 K W -486
 K U -975
+L cq -1950
 L ' -1950
 T char173 -486
 T hy -486
 T - -486
 T en -486
 T em -486
+A cq -2439
 A ' -2439
 char173 T -486
 hy T -486
@@ -652,24 +654,33 @@ Y hy -1950
 Y - -1950
 Y en -1950
 Y em -1950
+p cq -1950
 p ' -1950
+c cq -1461
 c ' -1461
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
 V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
 V em -1950
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -1461
 R ' -1461
 W char173 -2439
 W hy -2439
 W - -2439
 W en -2439
 W em -2439
+cq d -1461
 ' d -1461
 F char173 -1950
 F hy -1950
@@ -691,6 +702,7 @@ K hy -1950
 K - -1950
 K en -1950
 K em -1950
+cq s -486
 ' s -486
 char173 X -1461
 hy X -1461
@@ -706,32 +718,42 @@ R hy -975
 R - -975
 R en -975
 R em -975
+K cq -486
 K ' -486
 t g -975
+v cq -486
 v ' -486
 b f -486
+y cq -486
 y ' -486
+w cq -486
 w ' -486
+k cq -975
 k ' -975
+P cq -486
 P ' -486
 P char173 -975
 P hy -975
 P - -975
 P en -975
 P em -975
+E cq -486
 E ' -486
 E char173 -975
 E hy -975
 E - -975
 E en -975
 E em -975
+B cq -486
 B ' -486
+J cq -486
 J ' -486
 J char173 -486
 J hy -486
 J - -486
 J en -486
 J em -486
+U cq -486
 U ' -486
 v char173 -486
 v hy -486
diff --git a/font/devlj4/TR b/font/devlj4/TR
index bc011731..64a12437 100644
--- a/font/devlj4/TR
+++ b/font/devlj4/TR
@@ -426,12 +426,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -3903
 L ' -3903
 T char173 -1950
 T hy -1950
 T - -1950
 T en -1950
 T em -1950
+A cq -3903
 A ' -3903
 char173 T -1950
 hy T -1950
@@ -443,26 +445,37 @@ Y hy -3414
 Y - -3414
 Y en -3414
 Y em -3414
+p cq -975
 p ' -975
+c cq -1461
 c ' -1461
+e cq -975
 e ' -975
+b cq -1461
 b ' -1461
+a cq -1461
 a ' -1461
 V char173 -2925
 V hy -2925
 V - -2925
 V en -2925
 V em -2925
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
+R cq -1461
 R ' -1461
 W char173 -2439
 W hy -2439
 W - -2439
 W en -2439
 W em -2439
+cq d -1461
 ' d -1461
+s cq -975
 s ' -975
 F char173 -486
 F hy -486
@@ -484,6 +497,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
@@ -499,6 +513,7 @@ R hy -1461
 R - -1461
 R en -1461
 R em -1461
+K cq -486
 K ' -486
 t g -486
 b f -975
diff --git a/font/devlj4/UB b/font/devlj4/UB
index 8da7c5ea..5c1717fb 100644
--- a/font/devlj4/UB
+++ b/font/devlj4/UB
@@ -389,12 +389,14 @@ a f -486
 k s -486
 G J -486
 A f -486
+L cq -6342
 L ' -6342
 T char173 -4389
 T hy -4389
 T - -4389
 T en -4389
 T em -4389
+A cq -2439
 A ' -2439
 char173 T -4389
 hy T -4389
@@ -406,25 +408,35 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -1461
 p ' -1461
+c cq -975
 c ' -975
+e cq -1461
 e ' -1461
+b cq -1461
 b ' -1461
+a cq -975
 a ' -975
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -2439
 ' d -2439
+s cq -486
 s ' -486
 L char173 -975
 L hy -975
@@ -446,6 +458,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -1950
 ' s -1950
 char173 X -1461
 hy X -1461
@@ -462,9 +475,13 @@ Z hy -975
 Z - -975
 Z en -975
 Z em -975
+cq n -1461
 ' n -1461
+cq m -1461
 ' m -1461
+cq r -1461
 ' r -1461
+cq v -1461
 ' v -1461
 charset
 !	8781,18165	2	3617
diff --git a/font/devlj4/UBI b/font/devlj4/UBI
index 87b5f299..00ffcfcb 100644
--- a/font/devlj4/UBI
+++ b/font/devlj4/UBI
@@ -344,12 +344,14 @@ U o -486
 U v -486
 U y -486
 U w -486
+L cq -6342
 L ' -6342
 T char173 -2925
 T hy -2925
 T - -2925
 T en -2925
 T em -2925
+A cq -2439
 A ' -2439
 char173 T -3414
 hy T -3414
@@ -361,25 +363,35 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -975
 p ' -975
+c cq -1461
 c ' -1461
+e cq -1461
 e ' -1461
+b cq -1461
 b ' -1461
+a cq -1461
 a ' -1461
 V char173 -975
 V hy -975
 V - -975
 V en -975
 V em -975
+h cq -1461
 h ' -1461
+n cq -975
 n ' -975
+m cq -975
 m ' -975
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -2439
 ' d -2439
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
@@ -401,6 +413,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -1461
 ' s -1461
 char173 X -1461
 hy X -1461
@@ -412,9 +425,13 @@ en X -1461
 en A -975
 em X -1461
 b f -486
+cq n -1461
 ' n -1461
+cq m -1461
 ' m -1461
+cq r -1461
 ' r -1461
+cq v -1950
 ' v -1950
 charset
 !	8781,18165,0,2643,33,1012	2	3617
diff --git a/font/devlj4/UCB b/font/devlj4/UCB
index 5d3f3969..28642789 100644
--- a/font/devlj4/UCB
+++ b/font/devlj4/UCB
@@ -358,12 +358,14 @@ k s -975
 R J -486
 G J -486
 A f -486
+L cq -4389
 L ' -4389
 T char173 -2925
 T hy -2925
 T - -2925
 T en -2925
 T em -2925
+A cq -1461
 A ' -1461
 char173 T -2925
 hy T -2925
@@ -375,25 +377,35 @@ Y hy -1461
 Y - -1461
 Y en -1461
 Y em -1461
+p cq -1461
 p ' -1461
+c cq -975
 c ' -975
+e cq -1461
 e ' -1461
+b cq -1461
 b ' -1461
+a cq -975
 a ' -975
 V char173 -486
 V hy -486
 V - -486
 V en -486
 V em -486
+h cq -975
 h ' -975
+n cq -975
 n ' -975
+m cq -975
 m ' -975
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -975
 ' d -975
+s cq -975
 s ' -975
 L char173 -1950
 L hy -1950
@@ -415,6 +427,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -975
 ' s -975
 char173 X -1461
 hy X -1461
diff --git a/font/devlj4/UCBI b/font/devlj4/UCBI
index f9542643..d1876c18 100644
--- a/font/devlj4/UCBI
+++ b/font/devlj4/UCBI
@@ -269,12 +269,14 @@ B Z -486
 S Z -486
 A s -486
 K a -486
+L cq -3903
 L ' -3903
 T char173 -1950
 T hy -1950
 T - -1950
 T en -1950
 T em -1950
+A cq -1461
 A ' -1461
 char173 T -2439
 hy T -2439
@@ -286,25 +288,35 @@ Y hy -975
 Y - -975
 Y en -975
 Y em -975
+p cq -975
 p ' -975
+c cq -975
 c ' -975
+e cq -1461
 e ' -1461
+b cq -1461
 b ' -1461
+a cq -975
 a ' -975
 V char173 -486
 V hy -486
 V - -486
 V en -486
 V em -486
+h cq -1461
 h ' -1461
+n cq -975
 n ' -975
+m cq -975
 m ' -975
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -975
 ' d -975
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
diff --git a/font/devlj4/UCI b/font/devlj4/UCI
index b311dfae..4214f49e 100644
--- a/font/devlj4/UCI
+++ b/font/devlj4/UCI
@@ -395,12 +395,14 @@ C Q -486
 C K -486
 E s -486
 U s -486
+L cq -3414
 L ' -3414
 T char173 -3414
 T hy -3414
 T - -3414
 T en -3414
 T em -3414
+A cq -1461
 A ' -1461
 char173 T -3414
 hy T -3414
@@ -412,25 +414,35 @@ Y hy -1461
 Y - -1461
 Y en -1461
 Y em -1461
+p cq -1950
 p ' -1950
+c cq -1950
 c ' -1950
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
+a cq -1950
 a ' -1950
 V char173 -486
 V hy -486
 V - -486
 V en -486
 V em -486
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+m cq -1461
 m ' -1461
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -486
 ' d -486
+s cq -975
 s ' -975
 L char173 -1950
 L hy -1950
@@ -452,6 +464,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -486
 ' s -486
 char173 X -486
 hy X -486
@@ -462,7 +475,9 @@ hy A -486
 en X -486
 en A -486
 em X -486
+v cq -486
 v ' -486
+C cq -486
 C ' -486
 Z char173 -486
 Z hy -486
diff --git a/font/devlj4/UCR b/font/devlj4/UCR
index 50c1c0d8..3b503992 100644
--- a/font/devlj4/UCR
+++ b/font/devlj4/UCR
@@ -326,12 +326,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -5364
 L ' -5364
 T char173 -3414
 T hy -3414
 T - -3414
 T en -3414
 T em -3414
+A cq -1461
 A ' -1461
 char173 T -3414
 hy T -3414
@@ -343,25 +345,35 @@ Y hy -975
 Y - -975
 Y en -975
 Y em -975
+p cq -975
 p ' -975
+c cq -975
 c ' -975
+e cq -975
 e ' -975
+b cq -975
 b ' -975
+a cq -1461
 a ' -1461
 V char173 -486
 V hy -486
 V - -486
 V en -486
 V em -486
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+m cq -1461
 m ' -1461
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -1950
 ' d -1950
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
@@ -383,6 +395,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -486
 ' s -486
 char173 X -486
 hy X -486
@@ -393,6 +406,7 @@ hy A -486
 en X -486
 en A -486
 em X -486
+K cq -486
 K ' -486
 Z char173 -486
 Z hy -486
diff --git a/font/devlj4/UI b/font/devlj4/UI
index 18bde530..12bcc267 100644
--- a/font/devlj4/UI
+++ b/font/devlj4/UI
@@ -446,12 +446,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -7317
 L ' -7317
 T char173 -4389
 T hy -4389
 T - -4389
 T en -4389
 T em -4389
+A cq -3903
 A ' -3903
 char173 T -4389
 hy T -4389
@@ -463,26 +465,37 @@ Y hy -2439
 Y - -2439
 Y en -2439
 Y em -2439
+p cq -2925
 p ' -2925
+c cq -2925
 c ' -2925
+e cq -2925
 e ' -2925
+b cq -2925
 b ' -2925
+a cq -2925
 a ' -2925
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -2439
 h ' -2439
+n cq -2439
 n ' -2439
+m cq -2439
 m ' -2439
+R cq -975
 R ' -975
 W char173 -486
 W hy -486
 W - -486
 W en -486
 W em -486
+cq d -2925
 ' d -2925
+s cq -1950
 s ' -1950
 L char173 -1950
 L hy -1950
@@ -504,6 +517,7 @@ K hy -975
 K - -975
 K en -975
 K em -975
+cq s -1950
 ' s -1950
 char173 X -1461
 hy X -1461
@@ -514,60 +528,109 @@ hy A -1461
 en X -1461
 en A -1461
 em X -1461
+x cq -1461
 x ' -1461
+X cq -1461
 X ' -1461
+K cq -1461
 K ' -1461
 t g -486
+t cq -975
 t ' -975
+l cq -975
 l ' -975
+r cq -975
 r ' -975
+g cq -975
 g ' -975
+i cq -975
 i ' -975
+v cq -975
 v ' -975
+z cq -975
 z ' -975
+d cq -975
 d ' -975
+y cq -975
 y ' -975
+f cq -975
 f ' -975
+w cq -975
 w ' -975
+j cq -975
 j ' -975
+u cq -975
 u ' -975
+k cq -975
 k ' -975
+T cq -975
 T ' -975
+O cq -975
 O ' -975
+H cq -975
 H ' -975
+N cq -975
 N ' -975
+M cq -975
 M ' -975
+G cq -975
 G ' -975
+I cq -975
 I ' -975
+P cq -975
 P ' -975
+C cq -975
 C ' -975
+V cq -975
 V ' -975
+E cq -975
 E ' -975
+Z cq -975
 Z ' -975
 Z char173 -975
 Z hy -975
 Z - -975
 Z en -975
 Z em -975
+D cq -975
 D ' -975
+B cq -975
 B ' -975
+S cq -975
 S ' -975
+Y cq -975
 Y ' -975
+F cq -975
 F ' -975
+W cq -975
 W ' -975
+J cq -975
 J ' -975
+U cq -975
 U ' -975
+cq t -1461
 ' t -1461
+cq n -1461
 ' n -1461
+cq m -1461
 ' m -1461
+cq l -975
 ' l -975
+cq r -1461
 ' r -1461
+cq v -1461
 ' v -1461
+cq T -975
 ' T -975
+cq N -975
 ' N -975
+cq M -975
 ' M -975
+cq L -975
 ' L -975
+cq R -975
 ' R -975
+cq D -975
 ' D -975
 x char173 -486
 x hy -486
diff --git a/font/devlj4/UR b/font/devlj4/UR
index 7acc2663..b7eba7cf 100644
--- a/font/devlj4/UR
+++ b/font/devlj4/UR
@@ -435,12 +435,14 @@ K V -486
 K Y -486
 K W -486
 K U -486
+L cq -6342
 L ' -6342
 T char173 -4878
 T hy -4878
 T - -4878
 T en -4878
 T em -4878
+A cq -2925
 A ' -2925
 char173 T -4878
 hy T -4878
@@ -452,25 +454,35 @@ Y hy -2925
 Y - -2925
 Y en -2925
 Y em -2925
+p cq -1950
 p ' -1950
+c cq -1461
 c ' -1461
+e cq -1950
 e ' -1950
+b cq -1950
 b ' -1950
+a cq -1461
 a ' -1461
 V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
 V em -1461
+h cq -1461
 h ' -1461
+n cq -1461
 n ' -1461
+m cq -1461
 m ' -1461
 W char173 -975
 W hy -975
 W - -975
 W en -975
 W em -975
+cq d -3414
 ' d -3414
+s cq -486
 s ' -486
 L char173 -1950
 L hy -1950
@@ -492,6 +504,7 @@ K hy -1461
 K - -1461
 K en -1461
 K em -1461
+cq s -1950
 ' s -1950
 char173 X -1461
 hy X -1461
@@ -502,6 +515,7 @@ hy A -1461
 en X -1461
 en A -1461
 em X -1461
+K cq -486
 K ' -486
 t g -486
 b f -486
@@ -510,10 +524,15 @@ Z hy -486
 Z - -486
 Z en -486
 Z em -486
+cq t -975
 ' t -975
+cq n -1461
 ' n -1461
+cq m -1461
 ' m -1461
+cq r -1461
 ' r -1461
+cq v -1461
 ' v -1461
 charset
 !	8781,18165	2	3617
diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
index 09c6ac0a..e830e5f8 100644
--- a/font/devlj4/generate/Makefile
+++ b/font/devlj4/generate/Makefile
@@ -1,32 +1,39 @@
-#Copyright (C) 1994 Free Software Foundation, Inc.
+# Copyright (C) 1994 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.
 
 # Directory containing Autofont TFM files.
 # The TFM files I used are available for ftp as
-# ftp-boi.external.hp.com:/pub/printers/laserjet/win.dos/tfmlj4p.exe
-# This is a self-extracting MS-DOS archive.
-AUTOFONT=/u/jjc/autofont
+#
+#   ftp://ftp.hp.com/pub/faxes/software/tfmlj4.exe
+#
+# This is a self-extracting MS-DOS archive (in ZIP format).
+
+# This is set up so you can do
+#   make -f generate/Makefile
+# in the parent directory of this directory.
+
+AUTOFONT=/usr/local/lib/groff-lj4
 HPFTODIT=hpftodit
 # .05 em
 IFLAG=-i 439
 SFLAG=-s
-srcdir=.
+srcdir=generate
 TEXTMAP=$(srcdir)/text.map
 SPECIALMAP=$(srcdir)/special.map
 
diff --git a/man/groff.man b/man/groff.man
index 8f78d66e..73c91889 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -30,6 +30,10 @@ FDL in the main directory of the groff source package.
 .  ftr CB B
 .\}
 .
+.if '\*[.T]'dvi' \{\
+.  ftr CB CW
+.\}
+.
 .\" a comment macro which does nothing
 .de c
 ..
@@ -241,24 +245,6 @@ FDL in the main directory of the groff source package.
 .  rm @tmp@
 ..
 .
-.c Greek characters
-.de GREEK
-.  ds OLDT@BS \n[.tabs]
-.  br
-.  ie t \{\
-.    ta 7n 10n 30n T 7n 10n
-\&\f(CB\(rs(*\$1\fP\*t\fI\(*\$1\fP\*t\$2\*t\
-\&\f(CB\(rs(*\$3\fP\*t\fI\(*\$3\fP\*t\$4
-.  \}
-.  el \{\
-.    ta 7n 30n T 7n
-\&\f(CB\(rs(*\$1\fP\*t\$2\*t\
-\&\f(CB\(rs(*\$3\fP\*t\$4
-.  \}
-.  ta \*[OLDT@BS]
-.  rm OLDT@BS
-..
-.
 .c --------- registers ---------
 .
 .c synopsis for registers
@@ -2163,88 +2149,30 @@ character maps to itself.
 .SS "SPECIAL CHARACTERS"
 .\" --------------------------------------------------------------------
 Common special characters are predefined by escape sequences of the form
-.(esc xy
+.(esc \fP\f(CIxy
 with characters
 .argument x
 and
 .argument y .
 Some of these exist in the usual font while most of them are only
-available in the special font.
+available in the special font.  Below you'll find a selection of the most
+important glyphs; a complete list can be found in
+.BR groff_char (@MAN7EXT@).
+.RS
 .LP
 .PD 0
 .
-.ESc aa Acute accent
-.ESc ap Approximately
-.ESc br Bar
-.
-.TP 14n
-.(esc bs
-Bell sign, former AT&T copyright mark, not implemented in groff.
-.
 .ESc bu Bullet sign
-.ESc bv Bar Vertical
-.ESc ca Cap operator
-.ESc ci Circle
 .ESc co Copyright
 .ESc ct Cent
-.ESc cu Cup operator
-.ESc da Down arrow
-.ESc di Division sign
 .ESc dd Double dagger
 .ESc de Degree
 .ESc dg Dagger
-.ESc dq Double quote
 .ESc em Em-dash
-.ESc eq Equals
-.ESc es Empty set
-.ESc ff Ligature ff
-.ESc fi Ligature fi
-.ESc Fi Ligature ffi
-.ESc fl Ligature fl
-.ESc Fl Ligature ffl
-.ESc fm Printable form of a prime (single quote)
-.ESc ga Grave accent
-.ESc gr Nabla operator
 .ESc hy Hyphen
-.ESc ib Subset or equal symbol from set theory
-.ESc if Infinity
-.ESc ip Superset or equal symbol from set theory
-.ESc is Integral sign
-.ESc lb Left bottom, lower part of large left brace 
-.ESc lc Left ceiling, upper part of large left bracket
-.ESc lf Left floor, lower part of large left bracket
-.ESc lh Left hand
-.ESc lk Left curley, center part of large left brace
-.ESc lt Left top, upper part of large left brace
-.ESc mi Minus sign; same as \(rs\-
-.ESc mo Member of sign in set theory
-.ESc mu Multiplication sign
-.ESc no Logical NOT sign
-.ESc or Logical OR sign
-.ESc pd Partial differential character
-.ESc pl Plus sign
-.ESc pt Proportional sign
-.ESc rb Right bottom, lower part of large right brace
-.ESc rc Right ceiling, upper part of large right bracket
-.ESc rf Right floor, lower part of large right bracket
 .ESc rg Registered sign
-.ESc rh Right Hand
-.ESc rk Right curley, center part of large right brace
-.ESc rn Upper horizontal bar
-.ESc rt Right Top, upper part of large right brace
-.ESc ru Ruler character
-.ESc sb Subset symbol from set theory
 .ESc sc Section sign
-.ESc sl Slash
-.ESc sp Superset symbol from set theory
-.ESc sq Square
-.ESc sr Square root
-.ESc ts Greek character terminal sigma
-.ESc ua Up arrow
 .ESc ul Underline character
-.ESc 12 A half
-.ESc 14 A quarter
-.ESc 34 Three quarters
 .ESc == Identical
 .ESc >= Larger or equal
 .ESc <= Less or equal
@@ -2252,74 +2180,9 @@ Bell sign, former AT&T copyright mark, not implemented in groff.
 .ESc -> Right arrow
 .ESc <- Left arrow
 .ESc +- Plus-minus sign
-.ESc ** Asterisk
-.ESc ~= Approximately equal
-.
 .PD
-.LP
-Greek letters are defined by appending the corresponding roman character
-to the initial sequence
-.esc (*
-being a 2-letter sequence with an asterisk as its first letter.
-For example, Greek
-.argument alpha
-is defined as
-.esc (*a .
-.LP
-.
-.GREEK a alpha A Alpha
-.GREEK b beta B Beta
-.GREEK c xi C Xi
-.GREEK d delta D Delta
-.GREEK e epsilon E Epsilon
-.GREEK f phi F Phi
-.GREEK g gamma G Gamma
-.GREEK h theta H Theta
-.GREEK i iota I Iota
-.GREEK k kappa K Kappa
-.GREEK l lambda L Lambda
-.GREEK m mu M Mu
-.GREEK n nu N nu
-.GREEK o omikron O Omikron
-.GREEK p pi P Pi
-.GREEK q psi Q Psi
-.GREEK r rho R Rho
-.GREEK s sigma S Sigma
-.GREEK t tau T Tau
-.GREEK u ypsilon U Ypsilon
-.GREEK w omega W Omega
-.GREEK x chi X Chi
-.GREEK y eta Y eta
-.GREEK z zeta Z Zeta
-.
-.if t \{\
-.  LP
-.  text In the order of the Greek alphabet this looks like
-.  ft CR
-.  ds OLDT@BS \n[.tabs]
-.  ta T 0.6c
-.  LP
-.  ne 2v+1u
-\(*a	\(*b	\(*g	\(*d	\(*e	\(*z	\(*g	\(*y	\
-\(*h	\(*i	\(*k	\(*l	\(*m	\(*n	\(*c	\(*o	\
-\(*p	\(*r	\(*s	\(*t	\(*u	\(*f	\(*x	\(*q	\(*z
-.  br
-a	b	g	d	e	z	g	y	\
-h	i	k	l	m	n	c	o	\
-p	r	s	t	u	f	x	q	z
-.  LP
-.  ne 2v+1u
-\(*A	\(*B	\(*G	\(*D	\(*E	\(*Z	\(*G	\(*Y	\
-\(*H	\(*I	\(*K	\(*L	\(*M	\(*N	\(*C	\(*O	\
-\(*P	\(*R	\(*S	\(*T	\(*U	\(*F	\(*X	\(*Q	\(*Z
-.  br
-A	B	G	D	E	Z	G	Y	\
-H	I	K	L	M	N	C	O	\
-P	R	S	T	U	F	X	Q	Z
-.  ft P
-.  ta \*[OLDT@BS]
-.  rm OLDT@BS
-.\}
+.RE
+.
 .\" --------------------------------------------------------------------
 .SH REGISTERS
 .\" --------------------------------------------------------------------
@@ -2346,6 +2209,7 @@ to make clear that we speak about registers.
 Please keep in mind that the
 .esc en[]
 decoration is not part of the register name.
+.
 .\" --------------------------------------------------------------------
 .SS "READ-ONLY REGISTERS"
 .\" --------------------------------------------------------------------
@@ -2545,6 +2409,7 @@ Upper right y-coordinate (in PostScript units) of a given PostScript
 image (set by
 .request .psbb ).
 .PD
+.
 .\" --------------------------------------------------------------------
 .SS "WRITABLE REGISTERS"
 .\" --------------------------------------------------------------------
@@ -2580,6 +2445,7 @@ Current year minus 1900.  For Y2K compliance use register
 .register year
 instead.
 .PD
+.
 .\" --------------------------------------------------------------------
 .SH WARNINGS
 .\" --------------------------------------------------------------------
@@ -2684,6 +2550,7 @@ _
 7@128@syntax@15@32768@escape
 .TE
 .LP
+.
 .\" --------------------------------------------------------------------
 .SH COMPATIBILITY
 .\" --------------------------------------------------------------------
@@ -2876,7 +2743,10 @@ written by Bernd Warken <bwarken@mayn.de>.
 It is distributed under the terms of the FDL (GNU Free Documentation
 License) version 1.1 or later.  You should have received a copy of the
 FDL on your system, it is also available on-line under
-.IR <http://www.gnu.org/copyleft/fdl.html> .
+.RS
+.LP
+.IR http://www.gnu.org/copyleft/fdl.html .
+.RE
 .LP
 Formerly, the extensions of the groff language were kept in the manual
 page
@@ -2899,11 +2769,17 @@ pointers see
 The formatter programs are described in
 .BR groff (@MAN1EXT@)
 and
-.BR troff (@MAN1EXT@).
+.BR troff (@MAN1EXT@);
+a complete of all predefined glyph names can be found in
+.BR groff_char (@MAN7EXT@).
 .LP
 The classical
 .I troff
 documentation is available on-line at
+.RS
+.LP
 .I http://cm.bell-labs.com/cm/cs/cstr.html
+.RE
 and
+.RS
 .IR http://www.kohala.com/start/troff/ .
diff --git a/tmac/tmac.dvi b/tmac/tmac.dvi
index 59c6df50..634f49f9 100755
--- a/tmac/tmac.dvi
+++ b/tmac/tmac.dvi
@@ -2,6 +2,8 @@
 .cp 0
 .ftr CR CW
 .ftr C CW
+.ftr CO CWI
+.ftr CI CWI
 .ftr TT CW
 .ftr HR H
 .\" This uses the dvi-char_1 string in font CW, dvi-char_0 otherwise.
@@ -16,8 +18,16 @@
 .if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
 .if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
 .if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
-.if !c\[co] .char \[co] \z\(ci\h'\w'\(ci'u-\w'c'u/2u'c\h'\w'\(ci'u-\w'c'u/2u'
-.if !c\[rg] .char \[rg] \z\(ci\h'\w'\(ci'u-\w'r'u/2u'r\h'\w'\(ci'u-\w'r'u/2u'
+.if !c\[co] .char \[co] \
+\z\s-2\(ci\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'\
+\s-4C\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'
+.if !c\[rg] .char \[rg] \
+\z\s-2\(ci\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'\
+\s-4R\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'
 .if !c\[fm] .char \[fm] \v'-.35m'\s[\\n(.s*7u/10u]\[prime]\s0\v'.35m'
 .if !c\[de] .char \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
 .if !c\[ct] .char \[ct] \o'c/'
diff --git a/win32-diffs b/win32-diffs
index 974d7638..97ff4b0d 100644
--- a/win32-diffs
+++ b/win32-diffs
@@ -771,7 +771,7 @@ diff -aruN groff/font/devdvi/DESC groff.win32/font/devdvi/DESC
 +vert 1
 +sizes 500 600 700 800 900 1000 1095 1200 1400 1440 1600 1728 1800
 +2000 2074 2200 2400 2488 2800 3600 0
-+fonts 13 R I B BI 0 0 0 0 0 MI S EX CW
++fonts 14 R I B BI 0 0 0 0 0 MI S EX CW CWI
 +tcommand
 +postpro grodvi
 diff -aruN groff/font/devlatin1/B groff.win32/font/devlatin1/B
-- 
2.11.4.GIT