* fonts/devcp1047/R.proto, fonts/devlatin1/R.proto,

fonts/devhtml/R.proto: Remove `charXXX'entries.
* tmac/tty.tmac, tmac/html.tmac: Load latin1.tmac or cp1047.tmac
where appropriate.

* fonts/devlj4/generate/text.map: Remove `charXXX' entries.
* fonts/devlj4/*: Regenerated all font definition files.
* tmac/lj4.tmac: Load latin1.tmac.

* src/utils/hpftodit/hpftodit.cc (do_file): Partially undo change
from 2000-06-17: LJ4 metric files are *not* text files.

* tmac/troffrc, tmac/dvi.tmac, tmac/ps.tmac: Don't use .T string
register to test for EBCDIC.

1 files changed, 92 insertions, 208 deletions

diff --git a/font/devlj4/TI b/font/devlj4/TI
index 76a04d00..1e565e8c 100644
--- a/font/devlj4/TI
+++ b/font/devlj4/TI
@@ -637,19 +637,16 @@ 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
 - T -486
 en T -486
 em T -486
-Y char173 -1950
 Y hy -1950
 Y - -1950
 Y en -1950
@@ -662,7 +659,6 @@ e cq -1950
 e ' -1950
 b cq -1950
 b ' -1950
-V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
@@ -675,45 +671,37 @@ 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
 F - -1950
 F en -1950
 F em -1950
-X char173 -1950
 X hy -1950
 X - -1950
 X en -1950
 X em -1950
-A char173 -1461
 A hy -1461
 A - -1461
 A en -1461
 A em -1461
-K char173 -1950
 K hy -1950
 K - -1950
 K en -1950
 K em -1950
 cq s -486
 ' s -486
-char173 X -1461
 hy X -1461
 - X -1461
-char173 A -975
 hy A -975
 - A -975
 en X -1461
 en A -975
 em X -1461
-R char173 -975
 R hy -975
 R - -975
 R en -975
@@ -732,14 +720,12 @@ 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
@@ -748,39 +734,32 @@ 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
 v - -486
 v en -486
 v em -486
-y char173 -486
 y hy -486
 y - -486
 y en -486
 y em -486
-w char173 -486
 w hy -486
 w - -486
 w en -486
 w em -486
-B char173 -486
 B hy -486
 B - -486
 B en -486
 B em -486
-U char173 -486
 U hy -486
 U - -486
 U en -486
 U em -486
-char173 g -486
 hy g -486
 - g -486
 en g -486
@@ -802,8 +781,7 @@ cq	8781,18225,0,1434,-3582,899	2	51751
 *	13173,18225,0,927,-1581,899	2	3626
 +	23418,15750,0,0,-2994	0	3627
 ,	8781,2835,3360,0,648	0	3628
-char173	8781,7155,0,468,153,468	0	3629
-hy	"
+hy	8781,7155,0,468,153,468	0	3629
 -	"
 .	8781,2685,330,0,-633	0	3630
 sl	8781,18225,330,3183,801,899	2	3631
@@ -895,199 +873,106 @@ ba	13173,19758,6588,0,-4596	3	3708
 rC	11709,19935,6210,0,2232	3	3709
 }	"
 ti	26346,8952,0,0,-4029	0	51876
-char192	16101,23955,0,33,2700,33	2	3776
-`A	"
-char194	16101,23955,0,1314,2700,899	2	3778
-^A	"
-char200	16101,23955,0,2091,1800,899	2	3784
-`E	"
-char202	16101,23955,0,2091,1800,899	2	3786
-^E	"
-char203	16101,23085,0,2091,1800,899	2	3787
-:E	"
-char206	8781,23955,0,3984,1716,899	2	3790
-^I	"
-char207	8781,23085,0,4665,1716,899	2	3791
-:I	"
-char180	13173,18399,0,141,-5400,141	2	3764
-aa	"
+`A	16101,23955,0,33,2700,33	2	3776
+^A	16101,23955,0,1314,2700,899	2	3778
+`E	16101,23955,0,2091,1800,899	2	3784
+^E	16101,23955,0,2091,1800,899	2	3786
+:E	16101,23085,0,2091,1800,899	2	3787
+^I	8781,23955,0,3984,1716,899	2	3790
+:I	8781,23085,0,4665,1716,899	2	3791
+aa	13173,18399,0,141,-5400,141	2	3764
 ga	13173,18399,0,0,-4314	2	3680
 a^	13173,18399,0,0,-3453	2	3678
 ^	"
-char168	13173,17124,0,624,-4002,624	2	3752
-ad	"
+ad	13173,17124,0,624,-4002,624	2	3752
 a~	13173,17145,0,990,-3309,899	2	3710
 ~	"
-char217	19029,23955,330,3246,-1635,899	2	3801
-`U	"
-char219	19029,23955,330,3246,-1635,899	2	3803
-^U	"
-char221	14637,23955,0,4533,-1086,899	2	3805
-'Y	"
-char253	11709,18399,5655,561,2538,561	3	3837
-'y	"
-char176	13173,18225,0,543,-3522,543	2	3760
-de	"
-char199	17565,18225,5019,2700,-873,899	2	3783
-,C	"
-char231	11709,12669,4785,1275,636,899	0	3815
-,c	"
-char209	17565,23079,330,3843,1578,899	2	3793
-~N	"
-char241	13173,17145,330,990,1053,899	2	3825
-~n	"
-char161	8781,12231,6324,33,444,33	1	3745
-r!	"
-char191	13173,12312,6243,0,663	1	3775
-r?	"
-char164	13173,15684,0,1779,228,899	0	3748
-Cs	"
-char163	13173,17895,330,3153,1971,899	2	3747
-Po	"
-char165	13173,17895,0,4170,-15,899	2	3749
-Ye	"
-char167	13173,18225,4200,447,-1359,447	2	3751
-sc	"
+`U	19029,23955,330,3246,-1635,899	2	3801
+^U	19029,23955,330,3246,-1635,899	2	3803
+'Y	14637,23955,0,4533,-1086,899	2	3805
+'y	11709,18399,5655,561,2538,561	3	3837
+de	13173,18225,0,543,-3522,543	2	3760
+,C	17565,18225,5019,2700,-873,899	2	3783
+,c	11709,12669,4785,1275,636,899	0	3815
+~N	17565,23079,330,3843,1578,899	2	3793
+~n	13173,17145,330,990,1053,899	2	3825
+r!	8781,12231,6324,33,444,33	1	3745
+r?	13173,12312,6243,0,663	1	3775
+Cs	13173,15684,0,1779,228,899	0	3748
+Po	13173,17895,330,3153,1971,899	2	3747
+Ye	13173,17895,0,4170,-15,899	2	3749
+sc	13173,18225,4200,447,-1359,447	2	3751
 Fn	13173,18300,5655,2388,2691,899	3	51871
-char162	13173,17034,0,996,-777,899	2	3746
-ct	"
-char226	13173,18399,330,759,1044,759	2	3810
-^a	"
-char234	11709,18399,330,1761,444,899	2	3818
-^e	"
-char244	13173,18399,330,771,732,771	2	3828
-^o	"
-char251	13173,18399,330,747,468,747	2	3835
-^u	"
-char225	13173,18399,330,759,1044,759	2	3809
-'a	"
-char233	11709,18399,330,1011,444,899	2	3817
-'e	"
-char243	13173,18399,330,771,732,771	2	3827
-'o	"
-char250	13173,18399,330,747,468,747	2	3834
-'u	"
-char224	13173,18399,330,759,1044,759	2	3808
-`a	"
-char232	11709,18399,330,1011,444,899	2	3816
-`e	"
-char242	13173,18399,330,771,732,771	2	3826
-`o	"
-char249	13173,18399,330,747,468,747	2	3833
-`u	"
-char228	13173,17124,330,759,1044,759	2	3812
-:a	"
-char235	11709,17124,330,1356,444,899	2	3819
-:e	"
-char246	13173,17124,330,1074,732,899	2	3830
-:o	"
-char252	13173,17124,330,747,468,747	2	3836
-:u	"
-char197	16101,23865,0,525,2700,525	2	3781
-oA	"
-char238	7317,18399,330,2907,420,899	2	3822
-^i	"
-char216	19029,18255,330,2082,234,899	2	3800
-/O	"
-char198	23418,17895,0,2961,1959,899	2	3782
-AE	"
-char229	13173,18309,330,759,1044,759	2	3813
-oa	"
-char237	7317,18399,330,3069,420,899	2	3821
-'i	"
-char248	13173,12738,336,1491,1443,899	0	3832
-/o	"
-char230	17565,12669,330,933,771,899	0	3814
-ae	"
-char196	16101,23085,0,2055,2700,899	2	3780
-:A	"
-char236	7317,18399,330,1383,420,899	2	3820
-`i	"
-char214	19029,23085,330,1356,-492,899	2	3798
-:O	"
-char220	19029,23085,330,3246,-1635,899	2	3804
-:U	"
-char201	16101,23955,0,2091,1800,899	2	3785
-'E	"
-char239	7317,17124,330,3552,420,899	2	3823
-:i	"
-char223	13173,18300,5655,1131,5829,899	3	3807
-ss	"
-char212	19029,23955,330,1356,-492,899	2	3796
-^O	"
-char193	16101,23955,0,1914,2700,899	2	3777
-'A	"
-char195	16101,23079,0,2580,2700,899	2	3779
-~A	"
-char227	13173,17145,330,990,1044,899	2	3811
-~a	"
-char208	19029,17895,0,594,2298,594	2	3792
--D	"
-char240	13173,18300,330,2040,732,899	2	3824
-Sd	"
-char205	8781,23955,0,5124,1716,899	2	3789
-'I	"
-char204	8781,23955,0,3165,1716,899	2	3788
-`I	"
-char211	19029,23955,330,1356,-492,899	2	3795
-'O	"
-char210	19029,23955,330,1356,-492,899	2	3794
-`O	"
-char213	19029,23079,330,1356,-492,899	2	3797
-~O	"
-char245	13173,17145,330,1665,732,899	2	3829
-~o	"
+ct	13173,17034,0,996,-777,899	2	3746
+^a	13173,18399,330,759,1044,759	2	3810
+^e	11709,18399,330,1761,444,899	2	3818
+^o	13173,18399,330,771,732,771	2	3828
+^u	13173,18399,330,747,468,747	2	3835
+'a	13173,18399,330,759,1044,759	2	3809
+'e	11709,18399,330,1011,444,899	2	3817
+'o	13173,18399,330,771,732,771	2	3827
+'u	13173,18399,330,747,468,747	2	3834
+`a	13173,18399,330,759,1044,759	2	3808
+`e	11709,18399,330,1011,444,899	2	3816
+`o	13173,18399,330,771,732,771	2	3826
+`u	13173,18399,330,747,468,747	2	3833
+:a	13173,17124,330,759,1044,759	2	3812
+:e	11709,17124,330,1356,444,899	2	3819
+:o	13173,17124,330,1074,732,899	2	3830
+:u	13173,17124,330,747,468,747	2	3836
+oA	16101,23865,0,525,2700,525	2	3781
+^i	7317,18399,330,2907,420,899	2	3822
+/O	19029,18255,330,2082,234,899	2	3800
+AE	23418,17895,0,2961,1959,899	2	3782
+oa	13173,18309,330,759,1044,759	2	3813
+'i	7317,18399,330,3069,420,899	2	3821
+/o	13173,12738,336,1491,1443,899	0	3832
+ae	17565,12669,330,933,771,899	0	3814
+:A	16101,23085,0,2055,2700,899	2	3780
+`i	7317,18399,330,1383,420,899	2	3820
+:O	19029,23085,330,1356,-492,899	2	3798
+:U	19029,23085,330,3246,-1635,899	2	3804
+'E	16101,23955,0,2091,1800,899	2	3785
+:i	7317,17124,330,3552,420,899	2	3823
+ss	13173,18300,5655,1131,5829,899	3	3807
+^O	19029,23955,330,1356,-492,899	2	3796
+'A	16101,23955,0,1914,2700,899	2	3777
+~A	16101,23079,0,2580,2700,899	2	3779
+~a	13173,17145,330,990,1044,899	2	3811
+-D	19029,17895,0,594,2298,594	2	3792
+Sd	13173,18300,330,2040,732,899	2	3824
+'I	8781,23955,0,5124,1716,899	2	3789
+`I	8781,23955,0,3165,1716,899	2	3788
+'O	19029,23955,330,1356,-492,899	2	3795
+`O	19029,23955,330,1356,-492,899	2	3794
+~O	19029,23079,330,1356,-492,899	2	3797
+~o	13173,17145,330,1665,732,899	2	3829
 vS	13173,23955,330,2268,609,899	2	51795
 vs	10245,18399,330,2472,1116,899	2	51827
-char218	19029,23955,330,3246,-1635,899	2	3802
-'U	"
+'U	19029,23955,330,3246,-1635,899	2	3802
 :Y	14637,23085,0,4533,-1086,899	2	51801
-char255	11709,17124,5655,561,2538,561	3	3839
-:y	"
-char222	16101,17895,0,813,1107,813	2	3806
-TP	"
-char254	13173,18300,5655,471,3981,471	3	3838
-Tp	"
-char181	14637,10800,5595,612,585,612	1	3765
-mc	"
-char182	13173,19635,4200,1650,-1308,899	2	3766
-ps	"
-char190	23418,18225,330,0,-2985	2	3774
-34	"
+:y	11709,17124,5655,561,2538,561	3	3839
+TP	16101,17895,0,813,1107,813	2	3806
+Tp	13173,18300,5655,471,3981,471	3	3838
+mc	14637,10800,5595,612,585,612	1	3765
+ps	13173,19635,4200,1650,-1308,899	2	3766
+34	23418,18225,330,0,-2985	2	3774
 \-	23418,8610,0,0,-3027	0	51757
-char188	23418,18225,330,0,-2472	2	3772
-14	"
-char189	23418,18225,330,0,-1632	2	3773
-12	"
-char170	13173,18225,0,1119,-1827,899	2	3754
-Of	"
-char186	13173,18225,0,1503,-2640,899	2	3770
-Om	"
-char171	12198,10095,0,501,330,501	0	3755
-Fo	"
-char187	12198,10095,0,336,495,336	0	3771
-Fc	"
-char177	23418,15750,2625,0,-2949	0	3761
-char166	13173,19083,5916,0,-4596	3	3750
-bb	"
-char169	13173,19725,0,5355,-3531,899	2	3753
-co	"
-char172	23418,12165,0,0,-3045	0	3756
-no	"
-char174	13173,19725,0,5355,-3531,899	2	3758
-rg	"
-char178	9270,18060,0,1602,-555,899	2	3762
-S2	"
-char179	9270,18060,0,1980,-771,899	2	3763
-S3	"
-char184	13173,0,4785,0,-96	0	3768
-ac	"
-char185	9270,18060,0,1146,-1233,899	2	3769
-S1	"
-char215	23418,14658,0,0,-3630	0	3799
-char247	23418,14010,0,0,-2958	0	3831
-char183	8781,9945,0,0,-2400	0	3767
-pc	"
+14	23418,18225,330,0,-2472	2	3772
+12	23418,18225,330,0,-1632	2	3773
+Of	13173,18225,0,1119,-1827,899	2	3754
+Om	13173,18225,0,1503,-2640,899	2	3770
+Fo	12198,10095,0,501,330,501	0	3755
+Fc	12198,10095,0,336,495,336	0	3771
+bb	13173,19083,5916,0,-4596	3	3750
+co	13173,19725,0,5355,-3531,899	2	3753
+no	23418,12165,0,0,-3045	0	3756
+rg	13173,19725,0,5355,-3531,899	2	3758
+S2	9270,18060,0,1602,-555,899	2	3762
+S3	9270,18060,0,1980,-771,899	2	3763
+ac	13173,0,4785,0,-96	0	3768
+S1	9270,18060,0,1146,-1233,899	2	3769
+pc	8781,9945,0,0,-2400	0	3767
 fm	8781,18225,0,852,-3669,852	2	51873
 sd	13173,18225,0,612,-3669,612	2	51874
 dg	13173,18225,4200,1470,-1434,899	2	51755
@@ -1115,8 +1000,7 @@ Fl	20004,18300,5655,1851,5418,899	3	51885
 ij	13173,18369,5655,1212,435,899	3	51958
 bq	8781,3039,3156,0,-582	0	51756
 %0	32202,18894,1026,0,-3135	2	51901
-char175	13173,15819,0,867,-4257,867	0	3759
-a-	"
+a-	13173,15819,0,867,-4257,867	0	3759
 ab	13173,18339,0,1122,-4281,899	2	51926
 a.	13173,17124,0,0,-6222	2	51927
 oe	17565,12669,330,1107,711,899	0	51823