* 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, 187 deletions

diff --git a/font/devlj4/CB b/font/devlj4/CB
index 8f0c3c29..7dfb6588 100644
--- a/font/devlj4/CB
+++ b/font/devlj4/CB
@@ -21,8 +21,7 @@ cq	15873,15060	0	51751
 *	15873,15060	0	3626
 +	15873,11535	0	3627
 ,	15873,4305,2655	0	3628
-char173	15873,7440	0	3629
-hy	"
+hy	15873,7440	0	3629
 -	"
 .	15873,4035,330	0	3630
 sl	15873,18300,3525	2	3631
@@ -114,199 +113,106 @@ ba	15873,19758,6588	3	3708
 rC	15873,20130,6075	3	3709
 }	"
 ti	15873,8160	0	51876
-char192	15873,21375	2	3776
-`A	"
-char194	15873,21375	2	3778
-^A	"
-char200	15873,21375	2	3784
-`E	"
-char202	15873,21375	2	3786
-^E	"
-char203	15873,20790	2	3787
-:E	"
-char206	15873,21375	2	3790
-^I	"
-char207	15873,20790	2	3791
-:I	"
-char180	15873,17880	2	3764
-aa	"
+`A	15873,21375	2	3776
+^A	15873,21375	2	3778
+`E	15873,21375	2	3784
+^E	15873,21375	2	3786
+:E	15873,20790	2	3787
+^I	15873,21375	2	3790
+:I	15873,20790	2	3791
+aa	15873,17880	2	3764
 ga	15873,17880	2	3680
 a^	15873,17880	2	3678
 ^	"
-char168	15873,16890	2	3752
-ad	"
+ad	15873,16890	2	3752
 a~	15873,16959	2	3710
 ~	"
-char217	15873,21375,330	2	3801
-`U	"
-char219	15873,21375,330	2	3803
-^U	"
-char221	15873,21375	2	3805
-'Y	"
-char253	15873,17880,4845	3	3837
-'y	"
-char176	15873,16155	2	3760
-de	"
-char199	15873,15390,5457	3	3783
-,C	"
-char231	15873,11775,5469	1	3815
-,c	"
-char209	15873,20490,330	2	3793
-~N	"
-char241	15873,16959	2	3825
-~n	"
-char161	15873,11784,3606	0	3745
-r!	"
-char191	15873,11751,3969	0	3775
-r?	"
-char164	15873,15834	2	3748
-Cs	"
-char163	15873,16155,741	2	3747
-Po	"
-char165	15873,15825	2	3749
-Ye	"
-char167	15873,15390,1692	2	3751
-sc	"
+`U	15873,21375,330	2	3801
+^U	15873,21375,330	2	3803
+'Y	15873,21375	2	3805
+'y	15873,17880,4845	3	3837
+de	15873,16155	2	3760
+,C	15873,15390,5457	3	3783
+,c	15873,11775,5469	1	3815
+~N	15873,20490,330	2	3793
+~n	15873,16959	2	3825
+r!	15873,11784,3606	0	3745
+r?	15873,11751,3969	0	3775
+Cs	15873,15834	2	3748
+Po	15873,16155,741	2	3747
+Ye	15873,15825	2	3749
+sc	15873,15390,1692	2	3751
 Fn	15873,16350,3114	2	51871
-char162	15873,15966,1419	2	3746
-ct	"
-char226	15873,17880,330	2	3810
-^a	"
-char234	15873,17880,330	2	3818
-^e	"
-char244	15873,17880,330	2	3828
-^o	"
-char251	15873,17880,330	2	3835
-^u	"
-char225	15873,17880,330	2	3809
-'a	"
-char233	15873,17880,330	2	3817
-'e	"
-char243	15873,17880,330	2	3827
-'o	"
-char250	15873,17880,330	2	3834
-'u	"
-char224	15873,17880,330	2	3808
-`a	"
-char232	15873,17880,330	2	3816
-`e	"
-char242	15873,17880,330	2	3826
-`o	"
-char249	15873,17880,330	2	3833
-`u	"
-char228	15873,16890,330	2	3812
-:a	"
-char235	15873,16890,330	2	3819
-:e	"
-char246	15873,16890,330	2	3830
-:o	"
-char252	15873,16890,330	2	3836
-:u	"
-char197	15873,21780	2	3781
-oA	"
-char238	15873,17880	2	3822
-^i	"
-char216	15873,15432,492	2	3800
-/O	"
-char198	15873,15060	0	3782
-AE	"
-char229	15873,18900,330	2	3813
-oa	"
-char237	15873,17880	2	3821
-'i	"
-char248	15873,11913,600	0	3832
-/o	"
-char230	15873,11775,330	0	3814
-ae	"
-char196	15873,20790	2	3780
-:A	"
-char236	15873,17880	2	3820
-`i	"
-char214	15873,20790,330	2	3798
-:O	"
-char220	15873,20790,330	2	3804
-:U	"
-char201	15873,21375	2	3785
-'E	"
-char239	15873,16890	2	3823
-:i	"
-char223	15873,16350,330	2	3807
-ss	"
-char212	15873,21375,330	2	3796
-^O	"
-char193	15873,21375	2	3777
-'A	"
-char195	15873,20490	2	3779
-~A	"
-char227	15873,16959,330	2	3811
-~a	"
-char208	15873,15060	0	3792
--D	"
-char240	15873,18249,330	2	3824
-Sd	"
-char205	15873,21375	2	3789
-'I	"
-char204	15873,21375	2	3788
-`I	"
-char211	15873,21375,330	2	3795
-'O	"
-char210	15873,21375,330	2	3794
-`O	"
-char213	15873,20490,330	2	3797
-~O	"
-char245	15873,16959,330	2	3829
-~o	"
+ct	15873,15966,1419	2	3746
+^a	15873,17880,330	2	3810
+^e	15873,17880,330	2	3818
+^o	15873,17880,330	2	3828
+^u	15873,17880,330	2	3835
+'a	15873,17880,330	2	3809
+'e	15873,17880,330	2	3817
+'o	15873,17880,330	2	3827
+'u	15873,17880,330	2	3834
+`a	15873,17880,330	2	3808
+`e	15873,17880,330	2	3816
+`o	15873,17880,330	2	3826
+`u	15873,17880,330	2	3833
+:a	15873,16890,330	2	3812
+:e	15873,16890,330	2	3819
+:o	15873,16890,330	2	3830
+:u	15873,16890,330	2	3836
+oA	15873,21780	2	3781
+^i	15873,17880	2	3822
+/O	15873,15432,492	2	3800
+AE	15873,15060	0	3782
+oa	15873,18900,330	2	3813
+'i	15873,17880	2	3821
+/o	15873,11913,600	0	3832
+ae	15873,11775,330	0	3814
+:A	15873,20790	2	3780
+`i	15873,17880	2	3820
+:O	15873,20790,330	2	3798
+:U	15873,20790,330	2	3804
+'E	15873,21375	2	3785
+:i	15873,16890	2	3823
+ss	15873,16350,330	2	3807
+^O	15873,21375,330	2	3796
+'A	15873,21375	2	3777
+~A	15873,20490	2	3779
+~a	15873,16959,330	2	3811
+-D	15873,15060	0	3792
+Sd	15873,18249,330	2	3824
+'I	15873,21375	2	3789
+`I	15873,21375	2	3788
+'O	15873,21375,330	2	3795
+`O	15873,21375,330	2	3794
+~O	15873,20490,330	2	3797
+~o	15873,16959,330	2	3829
 vS	15873,21375,330	2	51795
 vs	15873,17880,330	2	51827
-char218	15873,21375,330	2	3802
-'U	"
+'U	15873,21375,330	2	3802
 :Y	15873,20790	2	51801
-char255	15873,16890,4845	3	3839
-:y	"
-char222	15873,15060	0	3806
-TP	"
-char254	15873,16350,4845	3	3838
-Tp	"
-char181	15873,11445,5580	1	3765
-mc	"
-char182	15873,19635,4080	2	3766
-ps	"
-char190	15873,16545,2415	2	3774
-34	"
+:y	15873,16890,4845	3	3839
+TP	15873,15060	0	3806
+Tp	15873,16350,4845	3	3838
+mc	15873,11445,5580	1	3765
+ps	15873,19635,4080	2	3766
+34	15873,16545,2415	2	3774
 \-	15873,7020	0	51757
-char188	15873,16545,2415	2	3772
-14	"
-char189	15873,16545,2415	2	3773
-12	"
-char170	15873,16155	2	3754
-Of	"
-char186	15873,16155	2	3770
-Om	"
-char171	15873,11595	0	3755
-Fo	"
-char187	15873,11595	0	3771
-Fc	"
-char177	15873,11535,3360	0	3761
-char166	15873,19083,5916	3	3750
-bb	"
-char169	15873,19635	2	3753
-co	"
-char172	15873,9420	0	3756
-no	"
-char174	15873,19635	2	3758
-rg	"
-char178	15873,16035	2	3762
-S2	"
-char179	15873,16035	2	3763
-S3	"
-char184	15873,0,5469	1	3768
-ac	"
-char185	15873,16035	2	3769
-S1	"
-char215	15873,11340	0	3799
-char247	15873,11190	0	3831
-char183	15873,10176	0	3767
-pc	"
+14	15873,16545,2415	2	3772
+12	15873,16545,2415	2	3773
+Of	15873,16155	2	3754
+Om	15873,16155	2	3770
+Fo	15873,11595	0	3755
+Fc	15873,11595	0	3771
+bb	15873,19083,5916	3	3750
+co	15873,19635	2	3753
+no	15873,9420	0	3756
+rg	15873,19635	2	3758
+S2	15873,16035	2	3762
+S3	15873,16035	2	3763
+ac	15873,0,5469	1	3768
+S1	15873,16035	2	3769
+pc	15873,10176	0	3767
 fm	15873,15825	2	51873
 sd	15873,15825	2	51874
 dg	15873,15060,1185	0	51755
@@ -334,8 +240,7 @@ Fl	15873,16350	2	51885
 ij	15873,16920,4845	3	51958
 bq	15873,4605,2355	0	51756
 %0	15873,16275,900	2	51901
-char175	15873,15567	2	3759
-a-	"
+a-	15873,15567	2	3759
 ab	15873,17310	2	51926
 a.	15873,16890	2	51927
 oe	15873,11775,330	0	51823