* font/devdvi/generate/*.map: Remove all `charXXX' entries.

* font/devdvi/generate/cork.map: Add 'y and 'Y.
* font/devdvi/*: Updated.
* tmac/dvi.tmac: Formatting.

Add font `HBI' for the dvi output.

* font/devdvi/HBI: New file.
* font/devdvi/Makefile.sub (DEVFILES): Updated.
* font/devdvi/generate/Makefile (HBI): New rule.
(FONTS): Updated.
(srcdir): Fixed.
* NEWS: Updated.
* font/devdvi/DESC.in: Don't mount CWI.

27 files changed, 653 insertions, 438 deletions

diff --git a/ChangeLog b/ChangeLog
index f0e01eab..7c6b457a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-02-26  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devdvi/generate/*.map: Remove all `charXXX' entries.
+	* font/devdvi/generate/cork.map: Add 'y and 'Y.
+	* font/devdvi/*: Updated.
+	* tmac/dvi.tmac: Formatting.
+
+	Add font `HBI' for the dvi output.
+
+	* font/devdvi/HBI: New file.
+	* font/devdvi/Makefile.sub (DEVFILES): Updated.
+	* font/devdvi/generate/Makefile (HBI): New rule.
+	(FONTS): Updated.
+	(srcdir): Fixed.
+	* NEWS: Updated.
+	* font/devdvi/DESC.in: Don't mount CWI.
+
 2002-02-25  Werner LEMBERG  <wl@gnu.org>
 
 	* man/groff_char.man: Added some missing PS glyph names (from the
diff --git a/NEWS b/NEWS
index f91694b1..f89c78fa 100644
--- a/NEWS
+++ b/NEWS
@@ -200,6 +200,11 @@ Grops
 
 o Color support has been added.
 
+Grodvi
+------
+
+o A new font file HBI (using cmssbxo10; this is slanted sans serif bold
+  extended) has been added.
 
 Grotty
 ------
diff --git a/font/devdvi/B b/font/devdvi/B
index 53a2b9c8..710c0e6a 100755
--- a/font/devdvi/B
+++ b/font/devdvi/B
@@ -223,27 +223,19 @@ Fl	1004880,728178	2	0017
 .i	334960,466034	0	0020
 .j	368456,466034,203890	1	0021
 ga	602928,728178	2	0022
-char180	602928,728178	2	0023
-aa	"
+aa	602928,728178	2	0023
 ah	602928,662642	2	0024
 ab	602928,728178	2	0025
-char175	602928,625066	2	0026
-a-	"
+a-	602928,625066	2	0026
 ao	911674,728178	2	0027
-char184	535936,0,178403	1	0030
-ac	"
-char223	626230,728178	2	0031
-ss	"
-char230	870896,466034	0	0032
-ae	"
+ac	535936,0,178403	1	0030
+ss	626230,728178	2	0031
+ae	870896,466034	0	0032
 oe	937888,466034	0	0033
-char248	602928,567979,101946	3	0034
-/o	"
-char198	1092261,719440	2	0035
-AE	"
+/o	602928,567979,101946	3	0034
+AE	1092261,719440	2	0035
 OE	1226245,719440	2	0036
-char216	937888,770413,50973	3	0037
-/O	"
+/O	937888,770413,50973	3	0037
 ---	334960,466034	0	0040
 !	367000,728178	2	0041
 rq	632056,728178	2	0042
@@ -260,8 +252,7 @@ cq	334960,728178	2	0047
 *	602928,786432	2	0052
 +	937888,664096,139808	3	0053
 ,	334960,163112,203890	1	0054
-char173	401952,466034	0	0055
-hy	"
+hy	401952,466034	0	0055
 -	"
 .	334960,163112	0	0056
 sl	602928,786432,262144	3	0057
@@ -278,11 +269,9 @@ sl	602928,786432,262144	3	0057
 9	602928,675749	2	0071
 :	334960,466034	0	0072
 ;	334960,466034,203890	1	0073
-char161	367000,524288,203890	3	0074
-r!	"
+r!	367000,524288,203890	3	0074
 =	937888,410110,-114178	0	0075
-char191	569432,524288,203890	3	0076
-r?	"
+r?	569432,524288,203890	3	0076
 ?	569432,728178	2	0077
 at	937888,728178	2	0100
 @	"
@@ -354,5 +343,4 @@ em	1205856,466034,0,33496	0	0174
 a"	602928,728178	2	0175
 ~	602928,728178	2	0176
 a~	"
-char168	602928,728178	2	0177
-ad	"
+ad	602928,728178	2	0177
diff --git a/font/devdvi/BI b/font/devdvi/BI
index 35e28246..adb746a2 100755
--- a/font/devdvi/BI
+++ b/font/devdvi/BI
@@ -229,34 +229,25 @@ Fl	1110902,728178,203890,113890	3	0017
 .i	372824,466034,0,98840	0	0020
 .j	403699,466034,203890,48354	1	0021
 ga	619819,728178	2	0022
-char180	619819,728178,0,89421	2	0023
-aa	"
+aa	619819,728178,0,89421	2	0023
 ah	619819,662642,0,86728	2	0024
 ab	619819,728178,0,108354	2	0025
-char175	619819,623318,0,109518	2	0026
-a-	"
+a-	619819,623318,0,109518	2	0026
 ao	994973,728178	2	0027
-char184	558070,0,178403	1	0030
-ac	"
-char223	697302,728178,203890,102090	3	0031
-ss	"
-char230	866814,466034,0,89131	0	0032
-ae	"
+ac	558070,0,178403	1	0030
+ss	697302,728178,203890,102090	3	0031
+ae	866814,466034,0,89131	0	0032
 oe	866814,466034,0,89131	0	0033
-char248	619819,567979,101946,99179	3	0034
-/o	"
-char198	1072450,719440,0,119859	2	0035
-AE	"
+/o	619819,567979,101946,99179	3	0034
+AE	1072450,719440,0,119859	2	0035
 OE	1195947,719440,0,119859	2	0036
-char216	928563,770413,50973,95027	3	0037
-/O	"
+/O	928563,770413,50973,95027	3	0037
 ---	311075,466034	0	0040
 !	404864,728178,0,119714	2	0041
 rq	650696,728178,0,83248	2	0042
 sh	990312,728178,203888,71653	3	0043
 #	"
-char163	910723,728178	2	0044
-Po	"
+Po	910723,728178	2	0044
 %	990312,786432,58254,134859	3	0045
 &	928563,728178,0,89421	2	0046
 cq	372824,728178,0,135734	2	0047
@@ -266,8 +257,7 @@ cq	372824,728178,0,135734	2	0047
 *	619819,786432,0,150296	2	0052
 +	928563,632637,108349,34661	3	0053
 ,	372824,154374,203890	1	0054
-char173	434573,466034,0,27379	0	0055
-hy	"
+hy	434573,466034,0,27379	0	0055
 -	"
 .	372824,154374	0	0056
 sl	619819,786432,262144,165733	3	0057
@@ -284,11 +274,9 @@ sl	619819,786432,262144,165733	3	0057
 9	619819,675749,0,138062	2	0071
 :	372824,466034,0,70198	0	0072
 ;	372824,466034,203890,70198	1	0073
-char161	404864,524288,203890,68741	3	0074
-r!	"
+r!	404864,524288,203890,68741	3	0074
 =	928563,410110,-114178,71653	0	0075
-char191	619819,524288,203890	3	0076
-r?	"
+r?	619819,524288,203890	3	0076
 ?	619819,728178,0,120296	2	0077
 at	928563,728178,0,96555	2	0100
 @	"
@@ -361,5 +349,4 @@ em	1239638,466034,0,102880	0	0174
 a"	619819,728178,0,120296	2	0175
 ~	619819,728178,0,120296	2	0176
 a~	"
-char168	619819,728178,0,120298	2	0177
-ad	"
+ad	619819,728178,0,120298	2	0177
diff --git a/font/devdvi/CW b/font/devdvi/CW
index 2039d23e..8a01912d 100644
--- a/font/devdvi/CW
+++ b/font/devdvi/CW
@@ -24,27 +24,19 @@ Fl	550498,407779,233018	1	0017
 .i	550498,451470	0	0020
 .j	550498,451470,233018	1	0021
 ga	550498,640797	2	0022
-char180	550498,640797	2	0023
-aa	"
+aa	550498,640797	2	0023
 ah	550498,593466	2	0024
 ab	550498,640797	2	0025
-char175	550498,593027	2	0026
-a-	"
+a-	550498,593027	2	0026
 ao	550498,640797	2	0027
-char184	550498,0,203891	1	0030
-ac	"
-char223	550498,640797	2	0031
-ss	"
-char230	550498,451470	0	0032
-ae	"
+ac	550498,0,203891	1	0030
+ss	550498,640797	2	0031
+ae	550498,451470	0	0032
 oe	550498,451470	0	0033
-char248	550498,567979,116509	3	0034
-/o	"
-char198	550498,640797	2	0035
-AE	"
+/o	550498,567979,116509	3	0034
+AE	550498,640797	2	0035
 OE	550498,640797	2	0036
-char216	550498,699051,58254	3	0037
-/O	"
+/O	550498,699051,58254	3	0037
 ---	550498,230104,116509	1	0040
 !	550498,640797	2	0041
 dq	550498,640797	2	0042
diff --git a/font/devdvi/CWI b/font/devdvi/CWI
index 7e7b5408..d2417543 100644
--- a/font/devdvi/CWI
+++ b/font/devdvi/CWI
@@ -24,27 +24,19 @@ 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	"
+aa	550498,640797,0,182045	2	0023
 ah	550498,593466,0,182045	2	0024
 ab	550498,640797,0,182045	2	0025
-char175	550498,593027,0,182045	2	0026
-a-	"
+a-	550498,593027,0,182045	2	0026
 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	"
+ac	550498,0,203891,182045	1	0030
+ss	550498,640797,233018,182045	3	0031
+ae	550498,451470,0,182045	0	0032
 oe	550498,451470,0,182045	0	0033
-char248	550498,567979,116509,182045	3	0034
-/o	"
-char198	550498,640797,0,182045	2	0035
-AE	"
+/o	550498,567979,116509,182045	3	0034
+AE	550498,640797,0,182045	2	0035
 OE	550498,640797,0,182045	2	0036
-char216	550498,699051,58254,182045	3	0037
-/O	"
+/O	550498,699051,58254,182045	3	0037
 ---	550498,230104,116509,182045	1	0040
 !	550498,640797,0,182045	2	0041
 dq	550498,640797,0,182045	2	0042
diff --git a/font/devdvi/DESC.in b/font/devdvi/DESC.in
index 54c1302b..81a9133c 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 14 R I B BI 0 0 0 0 0 MI S EX CW CWI
+fonts 14 R I B BI 0 0 0 0 0 MI S EX CW
 tcommand
 postpro grodvi
diff --git a/font/devdvi/H b/font/devdvi/H
index f563c189..21f698cd 100755
--- a/font/devdvi/H
+++ b/font/devdvi/H
@@ -172,27 +172,19 @@ Fl	853427,728178	2	0017
 .i	250494,466034	0	0020
 .j	279622,466034,203890	1	0021
 ga	524290,728178	2	0022
-char180	524290,728178	2	0023
-aa	"
+aa	524290,728178	2	0023
 ah	524290,662642	2	0024
 ab	524290,728178	2	0025
-char175	524290,638464	2	0026
-a-	"
+a-	524290,638464	2	0026
 ao	699054,728178	2	0027
-char184	466035,0,178403	1	0030
-ac	"
-char223	503902,728178	2	0031
-ss	"
-char230	757307,466034	0	0032
-ae	"
+ac	466035,0,178403	1	0030
+ss	503902,728178	2	0031
+ae	757307,466034	0	0032
 oe	815562,466034	0	0033
-char248	524290,567979,101946	3	0034
-/o	"
-char198	902944,728178	2	0035
-AE	"
+/o	524290,567979,101946	3	0034
+AE	902944,728178	2	0035
 OE	1019453,728178	2	0036
-char216	815562,779150,50973	3	0037
-/O	"
+/O	815562,779150,50973	3	0037
 ---	250494,466034	0	0040
 !	334963,728178	2	0041
 rq	524290,728178	2	0042
@@ -209,8 +201,7 @@ cq	291272,728178	2	0047
 *	524290,786432	2	0052
 +	815562,611670,87382	3	0053
 ,	291272,87381,131072	1	0054
-char173	349526,466034	0	0055
-hy	"
+hy	349526,466034	0	0055
 -	"
 .	291272,87381	0	0056
 sl	524290,786432,262144	3	0057
@@ -227,11 +218,9 @@ sl	524290,786432,262144	3	0057
 9	524290,687400	2	0071
 :	291272,466034	0	0072
 ;	291272,466034,131072	1	0073
-char161	334963,524288,203890	3	0074
-r!	"
+r!	334963,524288,203890	3	0074
 =	815562,387973,-136315	0	0075
-char191	495163,524288,203890	3	0076
-r?	"
+r?	495163,524288,203890	3	0076
 ?	495163,728178	2	0077
 at	699053,728178	2	0100
 @	"
@@ -303,5 +292,4 @@ em	1048579,466034,0,29128	0	0174
 a"	524290,728178	2	0175
 ~	524290,709454	2	0176
 a~	"
-char168	524290,712366	2	0177
-ad	"
+ad	524290,712366	2	0177
diff --git a/font/devdvi/HB b/font/devdvi/HB
index c0cc6e2c..bd915844 100644
--- a/font/devdvi/HB
+++ b/font/devdvi/HB
@@ -172,27 +172,19 @@ Fl	934986,728178	2	0017
 .i	267971,480597	0	0020
 .j	300011,480597,203890	1	0021
 ga	576720,728178	2	0022
-char180	576720,728178	2	0023
-aa	"
+aa	576720,728178	2	0023
 ah	576720,666283	2	0024
 ab	576720,728178	2	0025
-char175	576720,668757	2	0026
-a-	"
+a-	576720,668757	2	0026
 ao	768960,728178	2	0027
-char184	512640,0,178403	1	0030
-ac	"
-char223	592739,728178	2	0031
-ss	"
-char230	833040,480597	0	0032
-ae	"
+ac	512640,0,178403	1	0030
+ss	592739,728178	2	0031
+ae	833040,480597	0	0032
 oe	897120,480597	0	0033
-char248	576720,582542,101946	3	0034
-/o	"
-char198	993240,728178	2	0035
-AE	"
+/o	576720,582542,101946	3	0034
+AE	993240,728178	2	0035
 OE	1121400,728178	2	0036
-char216	897120,779150,50973	3	0037
-/O	"
+/O	897120,779150,50973	3	0037
 ---	267971,480597	0	0040
 !	384480,728178	2	0041
 rq	585458,728178	2	0042
@@ -209,8 +201,7 @@ cq	320400,728178	2	0047
 *	576720,786432	2	0052
 +	897120,646624,122336	3	0053
 ,	320400,136898,110683	1	0054
-char173	384480,480597	0	0055
-hy	"
+hy	384480,480597	0	0055
 -	"
 .	320400,136898	0	0056
 sl	576720,786432,262144	3	0057
@@ -227,11 +218,9 @@ sl	576720,786432,262144	3	0057
 9	576720,728178	2	0071
 :	320400,480597	0	0072
 ;	320400,480597,110683	1	0073
-char161	384480,524288,203890	3	0074
-r!	"
+r!	384480,524288,203890	3	0074
 =	897120,425984,-98304	0	0075
-char191	544680,524288,203890	3	0076
-r?	"
+r?	544680,524288,203890	3	0076
 ?	544680,728178	2	0077
 at	768960,728178	2	0100
 @	"
@@ -303,5 +292,4 @@ em	1153440,480597,0,32040	0	0174
 a"	576720,728178	2	0175
 ~	576720,728178	2	0176
 a~	"
-char168	576720,728178	2	0177
-ad	"
+ad	576720,728178	2	0177
diff --git a/font/devdvi/HBI b/font/devdvi/HBI
new file mode 100644
index 00000000..4e9efd08
--- /dev/null
+++ b/font/devdvi/HBI
@@ -0,0 +1,296 @@
+name HBI
+internalname cmssbxo10
+spacewidth 384480
+slant 11.999911
+ligatures ff fi fl ffi ffl 0
+checksum 461961576
+designsize 10485760
+kernpairs
+ff cq 80101
+ff ' 80101
+ff ? 80101
+ff ! 80101
+ff ) 80101
+ff rB 80101
+ff ] 80101
+cq ? 128160
+' ? 128160
+cq ! 128160
+' ! 128160
+A t -32040
+A C -32040
+A O -32040
+A G -32040
+A U -32040
+A Q -32040
+A T -96120
+A Y -96120
+A V -128160
+A W -128160
+D X -32040
+D W -32040
+D A -32040
+D V -32040
+D Y -32040
+F o -32040
+F e -32040
+F u -32040
+F r -32040
+F a -32040
+F A -96120
+F O -32040
+F C -32040
+F G -32040
+F Q -32040
+I I 32040
+K O -32040
+K C -32040
+K G -32040
+K Q -32040
+L T -96120
+L Y -96120
+L V -128160
+L W -128160
+O X -32040
+O W -32040
+O A -32040
+O V -32040
+O Y -32040
+P A -96120
+P o -32040
+P e -32040
+P a -32040
+P . -96120
+P , -96120
+T y -96120
+T e -96120
+T o -96120
+T r -96120
+T a -96120
+T A -96120
+T u -96120
+V o -32040
+V e -32040
+V u -32040
+V r -32040
+V a -32040
+V A -96120
+V O -32040
+V C -32040
+V G -32040
+V Q -32040
+W o -32040
+W e -32040
+W u -32040
+W r -32040
+W a -32040
+W A -96120
+W O -32040
+W C -32040
+W G -32040
+W Q -32040
+X O -32040
+X C -32040
+X G -32040
+X Q -32040
+Y e -96120
+Y o -96120
+Y r -96120
+Y a -96120
+Y A -96120
+Y u -96120
+a r -32040
+a y -32040
+a w -32040
+b e 32040
+b o 32040
+b x -32040
+b d 32040
+b c 32040
+b q 32040
+b r -32040
+b y -32040
+b w -32040
+f cq 80101
+f ' 80101
+f ? 80101
+f ! 80101
+f ) 80101
+f rB 80101
+f ] 80101
+g j 32040
+k e -32040
+k a -32040
+k o -32040
+k c -32040
+o e 32040
+o o 32040
+o x -32040
+o d 32040
+o c 32040
+o q 32040
+o r -32040
+o y -32040
+o w -32040
+p e 32040
+p o 32040
+p x -32040
+p d 32040
+p c 32040
+p q 32040
+p r -32040
+p y -32040
+p w -32040
+t y -32040
+t w -32040
+u w -32040
+w e -32040
+w a -32040
+w o -32040
+w c -32040
+y o -32040
+y e -32040
+y a -32040
+y . -96120
+y , -96120
+charset
+*G	608760,728178,0,138757,0,-21443	2	0000
+*D	961200,728178	2	0001
+*H	897120,728178,0,76304,-78474,44264	2	0002
+*L	704880,728178	2	0003
+*C	768960,728178,0,132349,0,66174	2	0004
+*P	833040,728178,0,90698,0,45349	2	0005
+*S	833040,728178,0,122738,0,61370	2	0006
+*U	897120,728178,0,91782,-155862,-68418	2	0007
+*F	833040,728178,0,45349,-109429,45349	2	0010
+*Q	897120,728178,0,91782,-155862,-18190	2	0011
+*W	833040,728178,0,84043,0,42022	2	0012
+ff	672840,728178,0,234878	2	0013
+fi	614586,728178,0,121282	2	0014
+fl	614586,728178,0,124194	2	0015
+Fi	934986,728178,0,121282	2	0016
+Fl	934986,728178,0,124194	2	0017
+.i	267971,480597,0,71570	0	0020
+.j	300011,480597,203890,71570	1	0021
+ga	576720,728178	2	0022
+aa	576720,728178,0,90698	2	0023
+ah	576720,666283,0,60066	2	0024
+ab	576720,728178,0,96523	2	0025
+a-	576720,668757,0,94086	2	0026
+ao	839126,728178	2	0027
+ac	512640,0,178403	1	0030
+ss	592739,728178,0,90698	2	0031
+ae	833040,480597,0,78936	0	0032
+oe	897120,480597,0,78936	0	0033
+/o	576720,582542,101946,34810	3	0034
+AE	993240,728178,0,122738	2	0035
+OE	1121400,728178,0,122738	2	0036
+/O	897120,779150,50973,76304	3	0037
+---	267971,480597	0	0040
+!	384480,728178,0,63027	2	0041
+rq	585458,728178,0,28947	2	0042
+sh	961200,728178,203888,58506	3	0043
+#	"
+Do	576720,786432,58254,122738	3	0044
+$	"
+%	1079109,786432,58254,29870	3	0045
+&	870906,728178,0,32248	2	0046
+cq	320400,728178,0,95067	2	0047
+'	"
+(	448560,786432,262144,135120	3	0050
+)	448560,786432,262144,23680	3	0051
+*	576720,786432,0,119099	2	0052
++	897120,646624,122336,23680	3	0053
+,	320400,136898,110683	1	0054
+hy	384480,480597,0,19037	0	0055
+-	"
+.	320400,136898	0	0056
+sl	576720,786432,262144,135120	3	0057
+/	"
+0	576720,728178,0,122738	2	0060
+1	576720,728178,0,122738	2	0061
+2	576720,728178,0,122738	2	0062
+3	576720,728178,0,122738	2	0063
+4	576720,728178,0,122738	2	0064
+5	576720,728178,0,122738	2	0065
+6	576720,728178,0,122738	2	0066
+7	576720,728178,0,122738	2	0067
+8	576720,728178,0,122738	2	0070
+9	576720,728178,0,122738	2	0071
+:	320400,480597,0,42443	0	0072
+;	320400,480597,110683,42443	1	0073
+r!	384480,524288,203890,19690	3	0074
+=	897120,425984,-98304,58506	0	0075
+r?	544680,524288,203890	3	0076
+?	544680,728178,0,123822	2	0077
+at	768960,728178,0,76304	2	0100
+@	"
+A	768960,728178	2	0101
+B	768960,728178,0,84043,0,42022	2	0102
+C	736920,728178,0,122738,-78474,61370	2	0103
+D	833040,728178,0,76304,0,44264	2	0104
+E	672840,728178,0,122738,0,61370	2	0105
+F	640800,728178,0,138757,0,-21443	2	0106
+G	768960,728178,0,122738,-78474,61370	2	0107
+H	833040,728178,0,90698,0,45349	2	0110
+I	346614,728178,0,138757,0,69379	2	0111
+J	544680,728178,0,90698,0,13309	2	0112
+K	801000,728178,0,122738,0,61370	2	0113
+L	608760,728178,0,0,0,64080	2	0114
+M	1025280,728178,0,90698,0,13309	2	0115
+N	833040,728178,0,90698,0,13309	2	0116
+O	833040,728178,0,76304,-78474,44264	2	0117
+P	736920,728178,0,84043,0,-76157	2	0120
+Q	833040,728178,110683,76304,-78474,76304	3	0121
+R	736920,728178,0,84043,0,63032	2	0122
+S	640800,728178,0,90698,0,45349	2	0123
+T	768960,728178,0,138757,-116083,-21443	2	0124
+U	801000,728178,0,90698,-78474,13309	2	0125
+V	768960,728178,0,170798,-106717,-85522	2	0126
+W	1089360,728178,0,170798,-106717,10598	2	0127
+X	768960,728178,0,138757,0,69379	2	0130
+Y	768960,728178,0,183613,-122738,-72707	2	0131
+Z	704880,728178,0,122738,0,61370	2	0132
+lB	359722,786432,262144,167160	3	0133
+[	"
+lq	585458,728178,0,148370	2	0134
+rB	359722,786432,262144,110362	3	0135
+]	"
+ha	576720,728178,0,55680	2	0136
+^	"
+a^	"
+a.	320400,728178,0,103805	2	0137
+oq	320400,728178,0,95067	2	0140
+`	"
+a	550506,480597,0,40613	0	0141
+b	588371,728178,0,35056	2	0142
+c	512640,480597,0,89338	0	0143
+d	588371,728178,0,124194	2	0144
+e	535942,480597,0,78936	0	0145
+f	352440,728178,0,234878	2	0146
+g	576720,480597,203890,118174	1	0147
+h	588371,728178,0,48352	2	0150
+i	267971,728178,0,130019	2	0151
+j	300011,728178,203890,124194	3	0152
+k	556331,728178,0,89338	2	0153
+l	267971,728178,0,124194	2	0154
+m	908771,480597,0,48352	0	0155
+n	588371,480597,0,48352	0	0156
+o	576720,480597,0,71507	0	0157
+p	588371,480597,203890,44669	1	0160
+q	588371,480597,203890,71570	1	0161
+r	390306,480597,0,118174	0	0162
+s	442152,480597,0,82930	0	0163
+t	423802,617914,0,76522	2	0164
+u	588371,480597,0,71570	0	0165
+v	524291,480597,0,118174	0	0166
+w	780611,480597,0,118174	0	0167
+x	524291,480597,0,98949	0	0170
+y	524291,480597,203890,118174	1	0171
+z	499533,480597,0,96037	0	0172
+en	576720,480597,0,95173	0	0173
+em	1153440,480597,0,95173	0	0174
+a"	576720,728178,0,90698	2	0175
+~	576720,728178,0,90698	2	0176
+a~	"
+ad	576720,728178,0,87784	2	0177
diff --git a/font/devdvi/HI b/font/devdvi/HI
index 4f96bdb5..f98081e5 100644
--- a/font/devdvi/HI
+++ b/font/devdvi/HI
@@ -173,27 +173,19 @@ Fl	853427,728178,0,99435	2	0017
 .i	250494,466034,0,43715	0	0020
 .j	279622,466034,203890,43715	1	0021
 ga	524290,728178	2	0022
-char180	524290,728178,0,96523	2	0023
-aa	"
+aa	524290,728178,0,96523	2	0023
 ah	524290,662642,0,88419	2	0024
 ab	524290,728178,0,99435	2	0025
-char175	524290,638464,0,92018	2	0026
-a-	"
+a-	524290,638464,0,92018	2	0026
 ao	773347,728178	2	0027
-char184	466035,0,178403	1	0030
-ac	"
-char223	503902,728178,0,96523	2	0031
-ss	"
-char230	757307,466034,0,71070	0	0032
-ae	"
+ac	466035,0,178403	1	0030
+ss	503902,728178,0,96523	2	0031
+ae	757307,466034,0,71070	0	0032
 oe	815562,466034,0,71070	0	0033
-char248	524290,567979,101946,50821	3	0034
-/o	"
-char198	902944,728178,0,125650	2	0035
-AE	"
+/o	524290,567979,101946,50821	3	0034
+AE	902944,728178,0,125650	2	0035
 OE	1019453,728178,0,125650	2	0036
-char216	815562,779150,50973,79216	3	0037
-/O	"
+/O	815562,779150,50973,79216	3	0037
 ---	250494,466034	0	0040
 !	334963,728178,0,60114	2	0041
 rq	524290,728178,0,3315	2	0042
@@ -210,8 +202,7 @@ cq	291272,728178,0,81960	2	0047
 *	524290,786432,0,123469	2	0052
 +	815562,611670,87382,26592	3	0053
 ,	291272,87381,131072	1	0054
-char173	349526,466034,0,20402	0	0055
-hy	"
+hy	349526,466034,0,20402	0	0055
 -	"
 .	291272,87381	0	0056
 sl	524290,786432,262144,138032	3	0057
@@ -228,11 +219,9 @@ sl	524290,786432,262144,138032	3	0057
 9	524290,687400,0,116982	2	0071
 :	291272,466034,0,26240	0	0072
 ;	291272,466034,131072,26240	1	0073
-char161	334963,524288,203890,16776	3	0074
-r!	"
+r!	334963,524288,203890,16776	3	0074
 =	815562,387973,-136315,53338	0	0075
-char191	495163,524288,203890	3	0076
-r?	"
+r?	495163,524288,203890	3	0076
 ?	495163,728178,0,123822	2	0077
 at	699053,728178,0,79216	2	0100
 @	"
@@ -304,5 +293,4 @@ em	1048579,466034,0,90349	0	0174
 a"	524290,728178,0,96523	2	0175
 ~	524290,709454,0,92544	2	0176
 a~	"
-char168	524290,712366,0,66949	2	0177
-ad	"
+ad	524290,712366,0,66949	2	0177
diff --git a/font/devdvi/I b/font/devdvi/I
index 2323eed5..adcd0275 100755
--- a/font/devdvi/I
+++ b/font/devdvi/I
@@ -230,34 +230,25 @@ Fl	937888,728178,203890,108354	3	0017
 .i	321562,451470,0,80440	0	0020
 .j	348358,451470,203890,39176	1	0021
 ga	535936,728178	2	0022
-char180	535936,728178,0,101654	2	0023
-aa	"
+aa	535936,728178,0,101654	2	0023
 ah	535936,659002,0,86982	2	0024
 ab	535936,728178,0,113306	2	0025
-char175	535936,588949,0,108354	2	0026
-a-	"
+a-	535936,588949,0,108354	2	0026
 ao	871672,728178	2	0027
-char184	482342,0,178403	1	0030
-ac	"
-char223	562733,728178,203890,110245	3	0031
-ss	"
-char230	750310,451470,0,78789	0	0032
-ae	"
+ac	482342,0,178403	1	0030
+ss	562733,728178,203890,110245	3	0031
+ae	750310,451470,0,78789	0	0032
 oe	750310,451470,0,78789	0	0033
-char248	535936,553416,101946,96411	3	0034
-/o	"
-char198	925654,716526,0,126120	2	0035
-AE	"
+/o	535936,553416,101946,96411	3	0034
+AE	925654,716526,0,126120	2	0035
 OE	1032842,716526,0,126120	2	0036
-char216	803904,767499,50973,98595	3	0037
-/O	"
+/O	803904,767499,50973,98595	3	0037
 ---	267968,451470	0	0040
 !	321562,728178,0,130200	2	0041
 rq	539432,728178,0,72994	2	0042
 sh	857498,728178,203888,69378	3	0043
 #	"
-char163	806453,728178	2	0044
-Po	"
+Po	806453,728178	2	0044
 %	857498,786432,58254,143014	3	0045
 &	803904,728178,0,101654	2	0046
 cq	321562,728178,0,130200	2	0047
@@ -267,8 +258,7 @@ cq	321562,728178,0,130200	2	0047
 *	535936,786432,0,156413	2	0052
 +	803904,588949,59418,38739	3	0053
 ,	321562,110683,203890	1	0054
-char173	375155,451470,0,29637	0	0055
-hy	"
+hy	375155,451470,0,29637	0	0055
 -	"
 .	321562,110683	0	0056
 sl	535936,786432,262144,169811	3	0057
@@ -285,11 +275,9 @@ sl	535936,786432,262144,169811	3	0057
 9	535936,675749,0,142141	2	0071
 :	321562,451470,0,61022	0	0072
 ;	321562,451470,203890,61022	1	0073
-char161	321562,524288,203890,79227	3	0074
-r!	"
+r!	321562,524288,203890,79227	3	0074
 =	803904,384696,-139592,69378	0	0075
-char191	535936,524288,203890	3	0076
-r?	"
+r?	535936,524288,203890	3	0076
 ?	535936,728178,0,128451	2	0077
 at	803904,728178,0,100634	2	0100
 @	"
@@ -362,5 +350,4 @@ em	1071872,451470,0,96552	0	0174
 a"	535936,728178,0,128451	2	0175
 ~	535936,700301,0,121482	2	0176
 a~	"
-char168	535936,700301,0,109832	2	0177
-ad	"
+ad	535936,700301,0,109832	2	0177
diff --git a/font/devdvi/MI b/font/devdvi/MI
index 37d94cfd..d3b0fcfa 100644
--- a/font/devdvi/MI
+++ b/font/devdvi/MI
@@ -27,8 +27,7 @@ charset
 *i	371130,451470	0	0023
 *k	604147,451470	0	0024
 *l	611672,728178	2	0025
-char181	631819,451470,203890	1	0026
-*m	"
+*m	631819,451470,203890	1	0026
 mc	"
 *n	517979,451470,0,66750	0	0027
 *c	458754,728178,203890,48242	3	0030
diff --git a/font/devdvi/Makefile.sub b/font/devdvi/Makefile.sub
index 5f30be23..9b35fac9 100644
--- a/font/devdvi/Makefile.sub
+++ b/font/devdvi/Makefile.sub
@@ -1,5 +1,5 @@
 DEV=dvi
-DEVFILES=DESC R I B BI CW CWI MI S EX H HI HB SA SB \
+DEVFILES=DESC R I B BI CW CWI MI S EX H HI HB HBI 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/R b/font/devdvi/R
index 2c7fe300..fc93c86b 100755
--- a/font/devdvi/R
+++ b/font/devdvi/R
@@ -291,27 +291,19 @@ Fl	873816,728178	2	0017
 .i	291272,451470	0	0020
 .j	320400,451470,203890	1	0021
 ga	524290,728178	2	0022
-char180	524290,728178	2	0023
-aa	"
+aa	524290,728178	2	0023
 ah	524290,659002	2	0024
 ab	524290,728178	2	0025
-char175	524290,595357	2	0026
-a-	"
+a-	524290,595357	2	0026
 ao	786434,728178	2	0027
-char184	466035,0,178403	1	0030
-ac	"
-char223	524291,728178	2	0031
-ss	"
-char230	757307,451470	0	0032
-ae	"
+ac	466035,0,178403	1	0030
+ss	524291,728178	2	0031
+ae	757307,451470	0	0032
 oe	815562,451470	0	0033
-char248	524290,553416,101946	3	0034
-/o	"
-char198	946634,716526	2	0035
-AE	"
+/o	524290,553416,101946	3	0034
+AE	946634,716526	2	0035
 OE	1063142,716526	2	0036
-char216	815562,767499,50973	3	0037
-/O	"
+/O	815562,767499,50973	3	0037
 ---	291272,451470	0	0040
 !	291272,728178	2	0041
 rq	524290,728178	2	0042
@@ -329,8 +321,7 @@ cq	291272,728178	2	0047
 pl	815562,611670,87382	3	0053
 +	"
 ,	291272,110683,203890	1	0054
-char173	349526,451470	0	0055
-hy	"
+hy	349526,451470	0	0055
 -	"
 .	291272,110683	0	0056
 sl	524290,786432,262144	3	0057
@@ -347,12 +338,10 @@ sl	524290,786432,262144	3	0057
 9	524290,675749	2	0071
 :	291272,451470	0	0072
 ;	291272,451470,203890	1	0073
-char161	291272,524288,203890	3	0074
-r!	"
+r!	291272,524288,203890	3	0074
 eq	815562,384696,-139592	0	0075
 =	"
-char191	495163,524288,203890	3	0076
-r?	"
+r?	495163,524288,203890	3	0076
 ?	495163,728178	2	0077
 at	815562,728178	2	0100
 @	"
@@ -437,5 +426,4 @@ em	1048579,451470,0,29128	0	0174
 a"	524290,728178	2	0175
 ~	524290,700301	2	0176
 a~	"
-char168	524290,700301	2	0177
-ad	"
+ad	524290,700301	2	0177
diff --git a/font/devdvi/S b/font/devdvi/S
index 75abc6c8..9305dedf 100644
--- a/font/devdvi/S
+++ b/font/devdvi/S
@@ -9,14 +9,11 @@ mi	815562,611670,87382	3	0000
 \-	"
 md	291272,466035,-58253	2	0001
 pc	"
-char215	815562,611670,87382	3	0002
-mu	"
+mu	815562,611670,87382	3	0002
 **	524290,487880,-36408	2	0003
-char247	815562,611670,87382	3	0004
-di	"
+di	815562,611670,87382	3	0004
 ---	524290,466035,-58253	2	0005
-char177	815562,611670,87382	3	0006
-+-	"
++-	815562,611670,87382	3	0006
 -+	815562,611670,87382	3	0007
 c+	815562,611670,87382	3	0010
 ---	815562,611670,87382	3	0011
@@ -71,8 +68,7 @@ slashnot	0,728178,203888	3	0066
 ---	0,384696,-139592	0	0067
 fa	582544,728178	2	0070
 te	582544,728178	2	0071
-char172	699053,451470	0	0072
-no	"
+no	699053,451470	0	0072
 es	524290,786432,58254	3	0073
 Re	757307,728178	2	0074
 Im	757307,728178	2	0075
@@ -141,12 +137,10 @@ gr	873816,716526	2	0162
 ---	699053,582544	2	0165
 ---	815562,666864,142576	3	0166
 ---	815562,666864,142576	3	0167
-char167	466037,728178,203890	3	0170
-sc	"
+sc	466037,728178,203890	3	0170
 dg	466035,728178,203890	3	0171
 dd	466035,728178,203890	3	0172
-char182	640798,728178,203890	3	0173
-ps	"
+ps	640798,728178,203890	3	0173
 CL	815562,728178,135926	3	0174
 DI	815562,728178,135926	3	0175
 HE	815562,728178,135926	3	0176
diff --git a/font/devdvi/SA b/font/devdvi/SA
index 91879fc7..e78e6011 100644
--- a/font/devdvi/SA
+++ b/font/devdvi/SA
@@ -92,8 +92,7 @@ lesseqgtr	815562,928714,404426	3	0121
 gtreqless	815562,928714,404426	3	0122
 lesseqqgtr	815562,1030294,506006	3	0123
 gtreqqless	815562,1030294,506006	3	0124
-char165	786434,707789,0,26214	2	0125
-Ye	"
+Ye	786434,707789,0,26214	2	0125
 yen	"
 Rrightarrow	1048579,667592,143304	3	0126
 Lleftarrow	1048579,667592,143304	3	0127
@@ -126,7 +125,6 @@ ggg	1398106,576570,36882	3	0157
 ulcorner	524290,725867	2	0160
 urcorner	524290,725867	2	0161
 rg	992648,725867,163146	3	0162
-char174	"
 circledR	"
 circledS	946045,725867,163146	3	0163
 pitchfork	699053,725867	2	0164
diff --git a/font/devdvi/generate/Makefile b/font/devdvi/generate/Makefile
index 8e3d1447..2110ea63 100644
--- a/font/devdvi/generate/Makefile
+++ b/font/devdvi/generate/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000 Free Software Foundation, Inc.
+# Copyright (C) 1989-2002 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
 # This file is part of groff.
@@ -24,12 +24,12 @@
 # Note that the following font files have manually added kerning values for
 # `` and '': B, BI, I, R.
 
-srcdir=.
+srcdir=generate
 tfmdir=/usr/local/lib/groff-tfm
 gfdir=/usr/local/lib/groff-gf
 
 TFMTODIT=tfmtodit
-FONTS=R I B BI CW CWI MI S EX H HI HB SA SB
+FONTS=R I B BI CW CWI MI S EX H HI HB HBI SA SB
 SPECIALFLAG=-s
 
 all: $(FONTS)
@@ -88,6 +88,10 @@ HI: $(srcdir)/texb.map
 	$(TFMTODIT) -g $(gfdir)/cmssi10.300gf \
 	  $(tfmdir)/cmssi10.tfm $(srcdir)/texb.map $@
 
+HBI: $(srcdir)/texb.map
+	$(TFMTODIT) -g $(gfdir)/cmssbxo10.300gf \
+	  $(tfmdir)/cmssbxo10.tfm $(srcdir)/texb.map $@
+
 SA: $(srcdir)/msam.map
 	$(TFMTODIT) $(SPECIALFLAG) \
 	  $(tfmdir)/msam10.tfm $(srcdir)/msam.map $@
diff --git a/font/devdvi/generate/cork.map b/font/devdvi/generate/cork.map
index 4e4a35ad..07f2171e 100755
--- a/font/devdvi/generate/cork.map
+++ b/font/devdvi/generate/cork.map
@@ -1,17 +1,17 @@
 # Map for DC/EC fonts with Cork encoding.
 # Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 0 ga
-1 aa char180
+1 aa
 2 a^
 3 a~
-4 ad char168
+4 ad
 5 a"
 6 ao
 7 ah
 8 ab
-9 a- char175
+9 a-
 10 a.
-11 ac char184
+11 ac
 12 ho
 13 bq
 14 fo
@@ -19,8 +19,8 @@
 16 lq
 17 rq
 18 Bq
-19 Fo char171
-20 Fc char187
+19 Fo
+20 Fc
 21 en
 22 em
 25 .i
@@ -124,83 +124,83 @@
 124 | or bv ba
 125 } rC
 126 ~
-127 hy char173
+127 hy
 130 'C
 138 /L
 146 vS
 152 :Y
 154 vZ
 156 IJ
-159 sc char167
+159 sc
 162 'c
 170 (l
 178 vs
-184 :y char255
+184 :y
 186 vz
 188 ij
-189 r! char161
-190 r? char191
-191 Po char163
-192 `A char192
-193 'A char193
-194 ^A char194
-195 ~A char195
-196 :A char196
-197 oA char197
-198 AE char198
-199 ,C char199
-200 `E char200
-201 'E char201
-202 ^E char202
-203 :E char203
-204 `I char204
-205 'I char205
-206 ^I char206
-207 :I char207
-208 -D char208
-209 ~N char209
-210 `O char210
-211 'O char211
-212 ^O char212
-213 ~O char213
-214 :O char214
+189 r!
+190 r?
+191 Po
+192 `A
+193 'A
+194 ^A
+195 ~A
+196 :A
+197 oA
+198 AE
+199 ,C
+200 `E
+201 'E
+202 ^E
+203 :E
+204 `I
+205 'I
+206 ^I
+207 :I
+208 -D
+209 ~N
+210 `O
+211 'O
+212 ^O
+213 ~O
+214 :O
 215 OE
-216 /O char216
-217 `U char217
-218 'U char218
-219 ^U char219
-220 :U char220
-221 char221
-222 TP char222
-224 `a char224
-225 'a char225
-226 ^a char226
-227 ~a char227
-228 :a char228
-229 oa char229
-230 ae char230
-231 ,c char231
-232 `e char232
-233 'e char233
-234 ^e char234
-235 :e char235
-236 `i char236
-237 'i char237
-238 ^i char238
-239 :i char239
-240 Sd char240
-241 ~n char241
-242 `o char242
-243 'o char243
-244 ^o char244
-245 ~o char245
-246 :o char246
+216 /O
+217 `U
+218 'U
+219 ^U
+220 :U
+221 'Y
+222 TP
+224 `a
+225 'a
+226 ^a
+227 ~a
+228 :a
+229 oa
+230 ae
+231 ,c
+232 `e
+233 'e
+234 ^e
+235 :e
+236 `i
+237 'i
+238 ^i
+239 :i
+240 Sd
+241 ~n
+242 `o
+243 'o
+244 ^o
+245 ~o
+246 :o
 247 oe
-248 /o char248
-249 `u char249
-250 'u char250
-251 ^u char251
-252 :u char252
-253 char253
-254 Tp char254
-255 ss char223
+248 /o
+249 `u
+250 'u
+251 ^u
+252 :u
+253 'y
+254 Tp
+255 ss
diff --git a/font/devdvi/generate/msam.map b/font/devdvi/generate/msam.map
index 90006c95..20a22e61 100644
--- a/font/devdvi/generate/msam.map
+++ b/font/devdvi/generate/msam.map
@@ -82,7 +82,7 @@
 82	gtreqless
 83	lesseqqgtr
 84	gtreqqless
-85	yen Ye char165
+85	yen Ye
 86	Rrightarrow
 87	Lleftarrow
 88	checkmark OK
@@ -111,7 +111,7 @@
 111	ggg
 112	ulcorner
 113	urcorner
-114	circledR char174 rg
+114	circledR rg
 115	circledS
 116	pitchfork
 117	dotplus
diff --git a/font/devdvi/generate/texb.map b/font/devdvi/generate/texb.map
index b2bcd153..6ea689f5 100644
--- a/font/devdvi/generate/texb.map
+++ b/font/devdvi/generate/texb.map
@@ -17,19 +17,19 @@
 16 .i
 17 .j
 18 ga
-19 aa char180
+19 aa
 20 ah
 21 ab
-22 a- char175
+22 a-
 23 ao
-24 ac char184
-25 ss char223
-26 ae char230
+24 ac
+25 ss
+26 ae
 27 oe
-28 /o char248
-29 AE char198
+28 /o
+29 AE
 30 OE
-31 /O char216
+31 /O
 33 !
 34 rq
 35 # sh
@@ -42,7 +42,7 @@
 42 *
 43 +
 44 ,
-45 - hy char173
+45 - hy
 46 .
 47 / sl
 48 0
@@ -57,9 +57,9 @@
 57 9
 58 :
 59 ;
-60 r! char161
+60 r!
 61 =
-62 r? char191
+62 r?
 63 ?
 64 @ at
 65 A
@@ -124,4 +124,4 @@
 124 em
 125 a"
 126 a~ ~
-127 ad char168
+127 ad
diff --git a/font/devdvi/generate/texi.map b/font/devdvi/generate/texi.map
index 4ca802a2..82497eb8 100644
--- a/font/devdvi/generate/texi.map
+++ b/font/devdvi/generate/texi.map
@@ -17,23 +17,23 @@
 16 .i
 17 .j
 18 ga
-19 aa char180
+19 aa
 20 ah
 21 ab
-22 a- char175
+22 a-
 23 ao
-24 ac char184
-25 ss char223
-26 ae char230
+24 ac
+25 ss
+26 ae
 27 oe
-28 /o char248
-29 AE char198
+28 /o
+29 AE
 30 OE
-31 /O char216
+31 /O
 33 !
 34 rq
 35 # sh
-36 Po char163
+36 Po
 37 %
 38 &
 39 ' cq
@@ -42,7 +42,7 @@
 42 *
 43 +
 44 ,
-45 - hy char173
+45 - hy
 46 .
 47 / sl
 48 0
@@ -57,9 +57,9 @@
 57 9
 58 :
 59 ;
-60 r! char161
+60 r!
 61 =
-62 r? char191
+62 r?
 63 ?
 64 @ at
 65 A
@@ -124,4 +124,4 @@
 124 em
 125 a"
 126 a~ ~
-127 ad char168
+127 ad
diff --git a/font/devdvi/generate/texmi.map b/font/devdvi/generate/texmi.map
index f243c19a..41b47429 100644
--- a/font/devdvi/generate/texmi.map
+++ b/font/devdvi/generate/texmi.map
@@ -9,7 +9,7 @@
 19 *i
 20 *k
 21 *l
-22 *m mc char181
+22 *m mc
 23 *n
 24 *c
 25 *p
diff --git a/font/devdvi/generate/texr.map b/font/devdvi/generate/texr.map
index 7db0e5f7..73abe162 100644
--- a/font/devdvi/generate/texr.map
+++ b/font/devdvi/generate/texr.map
@@ -17,19 +17,19 @@
 16 .i
 17 .j
 18 ga
-19 aa char180
+19 aa
 20 ah
 21 ab
-22 a- char175
+22 a-
 23 ao
-24 ac char184
-25 ss char223
-26 ae char230
+24 ac
+25 ss
+26 ae
 27 oe
-28 /o char248
-29 AE char198
+28 /o
+29 AE
 30 OE
-31 /O char216
+31 /O
 33 !
 34 rq
 35 # sh
@@ -42,7 +42,7 @@
 42 *
 43 + pl
 44 ,
-45 - hy char173
+45 - hy
 46 .
 47 / sl
 48 0
@@ -57,9 +57,9 @@
 57 9
 58 :
 59 ;
-60 r! char161
+60 r!
 61 = eq
-62 r? char191
+62 r?
 63 ?
 64 @ at
 65 A *A
@@ -124,4 +124,4 @@
 124 em
 125 a"
 126 a~ ~
-127 ad char168
+127 ad
diff --git a/font/devdvi/generate/texsy.map b/font/devdvi/generate/texsy.map
index fe98eb25..ed86918b 100644
--- a/font/devdvi/generate/texsy.map
+++ b/font/devdvi/generate/texsy.map
@@ -1,9 +1,9 @@
 0 \- mi
 1 md pc
-2 mu char215
+2 mu
 3 **
-4 di char247
-6 +- char177
+4 di
+6 +-
 7 -+
 8 c+
 10 c*
@@ -39,7 +39,7 @@
 54 slashnot
 56 fa
 57 te
-58 no char172
+58 no
 59 es
 60 Re
 61 Im
@@ -90,10 +90,10 @@
 110 \ rs
 112 sr
 114 gr
-120 sc char167
+120 sc
 121 dg
 122 dd
-123 ps char182
+123 ps
 124 CL
 125 DI
 126 HE
diff --git a/font/devdvi/generate/textt.map b/font/devdvi/generate/textt.map
index 80e8911e..c980496c 100644
--- a/font/devdvi/generate/textt.map
+++ b/font/devdvi/generate/textt.map
@@ -17,19 +17,19 @@
 16 .i
 17 .j
 18 ga
-19 aa char180
+19 aa
 20 ah
 21 ab
-22 a- char175
+22 a-
 23 ao
-24 ac char184
-25 ss char223
-26 ae char230
+24 ac
+25 ss
+26 ae
 27 oe
-28 /o char248
-29 AE char198
+28 /o
+29 AE
 30 OE
-31 /O char216
+31 /O
 33 !
 34 " dq
 35 # sh
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 5fec4270..25ca1890 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -9,8 +9,8 @@
 .ftr TT CW
 .ftr HR H
 .\" This uses the dvi-char_1 string in font CW, dvi-char_0 otherwise.
-.char _ \R'dvi-char_ \\n(.f=\f(CW\\n(.f\fP'\\*[dvi-char_\\n[dvi-char_]]
-.char \[ul] \R'dvi-char_ \w'M'=\w'i''\\*[dvi-char_\\n[dvi-char_]]
+.char _ \R'dvi-char_ \\n[.f]==\f[CW]\\n[.f]\f[P]'\\*[dvi-char_\\n[dvi-char_]]
+.char \[ul] \R'dvi-char_ \w'M'==\w'i''\\*[dvi-char_\\n[dvi-char_]]
 .\" Normally use a rule.
 .\" This is designed so that \(ul, \(rn and \(br form corners.
 .ds dvi-char_0 \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
@@ -21,40 +21,43 @@
 .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\s-2\(ci\s0\
-\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'\
+\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'
+\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'\
+\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'
+\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/'
-.if !c\[sq] .char \[sq] \Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
+.if !c\[sq] .char \[sq] \
+\Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
 \D'R .04m -.4m'\v'.04m'\D'R -.4m -.04m'\D'R .04m .4m''\h'.5m'
 .\"char \[sq] \h'.05m'\D'l .4m 0'\D'l 0 -.4m'\D'l -.4m 0'\D'l 0 .4m'\h'.45m'
-.if !c\[!=] .char \[!=] \[slashnot]\(eq
-.if !c\[tm] .char \[tm] \v'-.3m'\s[\\n(.s/2u]TM\s0\v'.3m'
+.if !c\[!=] .char \[!=] \[slashnot]\[eq]
+.if !c\[tm] .char \[tm] \v'-.3m'\s[\\n[.s]/2u]TM\s0\v'.3m'
 .if !c\[aq] .char \[aq] '
 .if !c\[bq] .char \[bq] ,
-.if !c\[Bq] .char \[Bq] ,\h'\w'\(rq'u-(2u*\w"'"u)',
+.if !c\[Bq] .char \[Bq] ,\h'\w'\[rq]'u-(2u*\w"'"u)',
 .if !c\[ho] .char \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
 .if !c\[-D] .char \[-D] \Z'\v'-.1m'\h'.05m'-'D
-.if !c\[Sd] .char \[Sd] \Z'\v'-.3m'\h'.35m'-'\(pd
-.if !c\[TP] .char \[TP] I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'D\
-\v'-.33m'\s0\v'.33m'
+.if !c\[Sd] .char \[Sd] \Z'\v'-.3m'\h'.35m'-'\[pd]
+.if !c\[TP] .char \[TP] \
+I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'\
+D\v'-.33m'\s0\v'.33m'
 .if !c\[Tp] .char \[Tp] \zlp
-.if !c\[nb] .char \[nb] \[slashnot]\(sb
-.cflags 8 \(an
-.if !c\[an] .char \[an] \h'-.167m'\(mi\h'-.167m'
+.if !c\[nb] .char \[nb] \[slashnot]\[sb]
+.cflags 8 \[an]
+.if !c\[an] .char \[an] \h'-.167m'\[mi]\h'-.167m'
 .\" Define some fractions.
 .de dvi-frac
-.if !c\[\\$1\\$2] .char \[\\$1\\$2] \
-\v'-.25m'\s[\\\\n(.s*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
-/\h'-.2m'\v'.25m'\s[\\\\n(.s*7u/10u]\\$2\s0\v'-.25m'
+.  if !c\[\\$1\\$2] \
+.    char \[\\$1\\$2] \
+\v'-.25m'\s[\\\\n[.s]*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
+/\h'-.2m'\v'.25m'\s[\\\\n[.s]*7u/10u]\\$2\s0\v'-.25m'
 ..
 .dvi-frac 1 2
 .dvi-frac 3 4
@@ -67,81 +70,82 @@
 .if !c\[S1] .char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
 .if !c\[S2] .char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
 .if !c\[S3] .char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
-.if !c\[Of] .char \[Of] \v'-.2m'\s'\En(.s*6u/10u'\o'_a'\s0\v'.2m'
-.if !c\[Om] .char \[Om] \v'-.2m'\s'\En(.s*6u/10u'\o'_o'\s0\v'.2m'
+.if !c\[Of] .char \[Of] \v'-.2m'\s'\En[.s]*6u/10u'\o'_a'\s0\v'.2m'
+.if !c\[Om] .char \[Om] \v'-.2m'\s'\En[.s]*6u/10u'\o'_o'\s0\v'.2m'
 .if !c\[Fo] .char \[Fo] <<
 .if !c\[Fc] .char \[Fc] >>
 .if !c\[bb] .char \[bb] |
 .if !c\[Ye] .char \[Ye] \o'-Y'
 .if !c\[Cs] .char \[Cs] \o'\[mu]o'
 .de dvi-achar
-.\" Note that character definitions are always interpreted with
-.\" compatibility mode off.
-.if !c\\$1 \{\
-.char \\$1 \\$3\
+.  \" Note that character definitions are always interpreted with
+.  \" compatibility mode off.
+.  if !c\\$1 \{\
+.    char \\$1 \
+\\$3\
 \k[acc]\
 \h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
 \v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
 \\$2\
 \v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
 \h'|\\\\n[acc]u'
-.\}
-.hcode \\$1\\$4
+.  \}
+.  hcode \\$1\\$4
 ..
-.dvi-achar \(`A \` A a
-.dvi-achar \('A \' A a
-.dvi-achar \(^A ^ A a
-.dvi-achar \(~A ~ A a
-.dvi-achar \(:A \(ad A a
-.dvi-achar \(oA \(ao A a
-.dvi-achar \(`E \` E e
-.dvi-achar \('E \' E e
-.dvi-achar \(^E ^ E e
-.dvi-achar \(:E \(ad E e
-.dvi-achar \(`I \` I i
-.dvi-achar \('I \' I i
-.dvi-achar \(^I ^ I i
-.dvi-achar \(:I \(ad I i
-.dvi-achar \(~N ~ N n
-.dvi-achar \(`O \` O o
-.dvi-achar \('O \' O o
-.dvi-achar \(^O ^ O o
-.dvi-achar \(~O ~ O o
-.dvi-achar \(:O \(ad O o
-.dvi-achar \(`U \` U u
-.dvi-achar \('U \' U u
-.dvi-achar \(^U ^ U u
-.dvi-achar \(:U \(ad U u
-.dvi-achar \('Y \' Y y
-.dvi-achar \(`a \` a a
-.dvi-achar \('a \' a a
-.dvi-achar \(^a ^ a a
-.dvi-achar \(~a ~ a a
-.dvi-achar \(:a \(ad a a
-.dvi-achar \(oa \(ao a a
-.dvi-achar \(`e \` e e
-.dvi-achar \('e \' e e
-.dvi-achar \(^e ^ e e
-.dvi-achar \(:e \(ad e e
-.dvi-achar \(`i \` \(.i i
-.dvi-achar \('i \' \(.i i
-.dvi-achar \(^i ^ \(.i i
-.dvi-achar \(:i \(ad \(.i i
-.dvi-achar \(~n ~ n n
-.dvi-achar \(`o \` o o
-.dvi-achar \('o \' o o
-.dvi-achar \(^o ^ o o
-.dvi-achar \(~o ~ o o
-.dvi-achar \(:o \(ad o o
-.dvi-achar \(`u \` u u
-.dvi-achar \('u \' u u
-.dvi-achar \(^u ^ u u
-.dvi-achar \(:u \(ad u u
-.dvi-achar \('y \' y y
-.dvi-achar \(:y \(ad y y
-.if !c\(,C .char \(,C \o'\(acC'
-.hcode \(,Cc
-.if !c\(,c .char \(,c \o'\(acc'
-.hcode \(,cc
+.dvi-achar \[`A] \`    A     a
+.dvi-achar \['A] \'    A     a
+.dvi-achar \[^A] ^     A     a
+.dvi-achar \[~A] ~     A     a
+.dvi-achar \[:A] \[ad] A     a
+.dvi-achar \[oA] \[ao] A     a
+.dvi-achar \[`E] \`    E     e
+.dvi-achar \['E] \'    E     e
+.dvi-achar \[^E] ^     E     e
+.dvi-achar \[:E] \[ad] E     e
+.dvi-achar \[`I] \`    I     i
+.dvi-achar \['I] \'    I     i
+.dvi-achar \[^I] ^     I     i
+.dvi-achar \[:I] \[ad] I     i
+.dvi-achar \[~N] ~     N     n
+.dvi-achar \[`O] \`    O     o
+.dvi-achar \['O] \'    O     o
+.dvi-achar \[^O] ^     O     o
+.dvi-achar \[~O] ~     O     o
+.dvi-achar \[:O] \[ad] O     o
+.dvi-achar \[`U] \`    U     u
+.dvi-achar \['U] \'    U     u
+.dvi-achar \[^U] ^     U     u
+.dvi-achar \[:U] \[ad] U     u
+.dvi-achar \['Y] \'    Y     y
+.dvi-achar \[`a] \`    a     a
+.dvi-achar \['a] \'    a     a
+.dvi-achar \[^a] ^     a     a
+.dvi-achar \[~a] ~     a     a
+.dvi-achar \[:a] \[ad] a     a
+.dvi-achar \[oa] \[ao] a     a
+.dvi-achar \[`e] \`    e     e
+.dvi-achar \['e] \'    e     e
+.dvi-achar \[^e] ^     e     e
+.dvi-achar \[:e] \[ad] e     e
+.dvi-achar \[`i] \`    \[.i] i
+.dvi-achar \['i] \'    \[.i] i
+.dvi-achar \[^i] ^     \[.i] i
+.dvi-achar \[:i] \[ad] \[.i] i
+.dvi-achar \[~n] ~     n     n
+.dvi-achar \[`o] \`    o     o
+.dvi-achar \['o] \'    o     o
+.dvi-achar \[^o] ^     o     o
+.dvi-achar \[~o] ~     o     o
+.dvi-achar \[:o] \[ad] o     o
+.dvi-achar \[`u] \`    u     u
+.dvi-achar \['u] \'    u     u
+.dvi-achar \[^u] ^     u     u
+.dvi-achar \[:u] \[ad] u     u
+.dvi-achar \['y] \'    y     y
+.dvi-achar \[:y] \[ad] y     y
+.if !c\[,C] .char \[,C] \o'\[ac]C'
+.hcode \[,C]c
+.if !c\[,c] .char \[,c] \o'\[ac]c'
+.hcode \[,c]c
 .cp \n(_C
 .do mso latin1.tmac