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

diff --git a/font/devlj4/UR b/font/devlj4/UR
index 5543c1d0..73e674be 100644
--- a/font/devlj4/UR
+++ b/font/devlj4/UR
@@ -437,19 +437,16 @@ 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
 - T -4878
 en T -4878
 em T -4878
-Y char173 -2925
 Y hy -2925
 Y - -2925
 Y en -2925
@@ -464,7 +461,6 @@ b cq -1950
 b ' -1950
 a cq -1461
 a ' -1461
-V char173 -1461
 V hy -1461
 V - -1461
 V en -1461
@@ -475,7 +471,6 @@ n cq -1461
 n ' -1461
 m cq -1461
 m ' -1461
-W char173 -975
 W hy -975
 W - -975
 W en -975
@@ -484,32 +479,26 @@ cq d -3414
 ' d -3414
 s cq -486
 s ' -486
-L char173 -1950
 L hy -1950
 L - -1950
 L en -1950
 L em -1950
-X char173 -1461
 X hy -1461
 X - -1461
 X en -1461
 X em -1461
-A char173 -1461
 A hy -1461
 A - -1461
 A en -1461
 A em -1461
-K char173 -1461
 K hy -1461
 K - -1461
 K en -1461
 K em -1461
 cq s -1950
 ' s -1950
-char173 X -1461
 hy X -1461
 - X -1461
-char173 A -1461
 hy A -1461
 - A -1461
 en X -1461
@@ -519,7 +508,6 @@ K cq -486
 K ' -486
 t g -486
 b f -486
-Z char173 -486
 Z hy -486
 Z - -486
 Z en -486
@@ -551,8 +539,7 @@ cq	8781,18135	2	51751
 *	16587,18495	2	3626
 +	26346,14775,105	0	3627
 ,	8781,3030,3075	0	3628
-char173	8781,7755	0	3629
-hy	"
+hy	8781,7755	0	3629
 -	"
 .	8781,3030	0	3630
 sl	8781,18135,1380	2	3631
@@ -644,199 +631,106 @@ ba	13173,19758,6588	3	3708
 rC	11712,20130,6075	3	3709
 }	"
 ti	26346,8952	0	51876
-char192	19515,23085	2	3776
-`A	"
-char194	19515,23085	2	3778
-^A	"
-char200	15126,23085	2	3784
-`E	"
-char202	15126,23085	2	3786
-^E	"
-char203	15126,22755	2	3787
-:E	"
-char206	7317,23085	2	3790
-^I	"
-char207	7317,22755	2	3791
-:I	"
-char180	16587,18075	2	3764
-aa	"
+`A	19515,23085	2	3776
+^A	19515,23085	2	3778
+`E	15126,23085	2	3784
+^E	15126,23085	2	3786
+:E	15126,22755	2	3787
+^I	7317,23085	2	3790
+:I	7317,22755	2	3791
+aa	16587,18075	2	3764
 ga	16587,18075	2	3680
 a^	16587,17985	2	3678
 ^	"
-char168	16587,17775	2	3752
-ad	"
+ad	16587,17775	2	3752
 a~	16587,18294	2	3710
 ~	"
-char217	19029,23085,360	2	3801
-`U	"
-char219	19029,23085,360	2	3803
-^U	"
-char221	18051,23085	2	3805
-'Y	"
-char253	14637,18075,4680	3	3837
-'y	"
-char176	16587,18465	2	3760
-de	"
-char199	18540,18495,5025	3	3783
-,C	"
-char231	14148,12990,5025	1	3815
-,c	"
-char209	19029,22959	2	3793
-~N	"
-char241	15126,18294	2	3825
-~n	"
-char161	8781,12645,5520	1	3745
-r!	"
-char191	13662,12516,5799	1	3775
-r?	"
-char164	16587,15684	0	3748
-Cs	"
-char163	16587,18465	2	3747
-Po	"
-char165	16587,18105	2	3749
-Ye	"
-char167	16587,18495,360	2	3751
-sc	"
+`U	19029,23085,360	2	3801
+^U	19029,23085,360	2	3803
+'Y	18051,23085	2	3805
+'y	14637,18075,4680	3	3837
+de	16587,18465	2	3760
+,C	18540,18495,5025	3	3783
+,c	14148,12990,5025	1	3815
+~N	19029,22959	2	3793
+~n	15126,18294	2	3825
+r!	8781,12645,5520	1	3745
+r?	13662,12516,5799	1	3775
+Cs	16587,15684	0	3748
+Po	16587,18465	2	3747
+Ye	16587,18105	2	3749
+sc	16587,18495,360	2	3751
 Fn	16587,18315	2	51871
-char162	16587,18825,720	2	3746
-ct	"
-char226	14148,17985,360	2	3810
-^a	"
-char234	14148,17985,360	2	3818
-^e	"
-char244	15126,17985,360	2	3828
-^o	"
-char251	15126,17985,360	2	3835
-^u	"
-char225	14148,18075,360	2	3809
-'a	"
-char233	14148,18075,360	2	3817
-'e	"
-char243	15126,18075,360	2	3827
-'o	"
-char250	15126,18075,360	2	3834
-'u	"
-char224	14148,18075,360	2	3808
-`a	"
-char232	14148,18075,360	2	3816
-`e	"
-char242	15126,18075,360	2	3826
-`o	"
-char249	15126,18075,360	2	3833
-`u	"
-char228	14148,17775,360	2	3812
-:a	"
-char235	14148,17775,360	2	3819
-:e	"
-char246	15126,17775,360	2	3830
-:o	"
-char252	15126,17775,360	2	3836
-:u	"
-char197	19515,25923	2	3781
-oA	"
-char238	6342,17985	2	3822
-^i	"
-char216	20004,18495,375	2	3800
-/O	"
-char198	25857,18165	2	3782
-AE	"
-char229	14148,20412,360	2	3813
-oa	"
-char237	6342,18075	2	3821
-'i	"
-char248	15126,13008,408	0	3832
-/o	"
-char230	22443,12990,360	0	3814
-ae	"
-char196	19515,22755	2	3780
-:A	"
-char236	6342,18075	2	3820
-`i	"
-char214	20004,22755,360	2	3798
-:O	"
-char220	19029,22755,360	2	3804
-:U	"
-char201	15126,23085	2	3785
-'E	"
-char239	6342,17775	2	3823
-:i	"
-char223	16101,18165,360	2	3807
-ss	"
-char212	20004,23085,360	2	3796
-^O	"
-char193	19515,23085	2	3777
-'A	"
-char195	19515,22959	2	3779
-~A	"
-char227	14148,18294,360	2	3811
-~a	"
-char208	19029,18135	2	3792
--D	"
-char240	15126,18315,360	2	3824
-Sd	"
-char205	7317,23085	2	3789
-'I	"
-char204	7317,23085	2	3788
-`I	"
-char211	20004,23085,360	2	3795
-'O	"
-char210	20004,23085,360	2	3794
-`O	"
-char213	20004,22959,360	2	3797
-~O	"
-char245	15126,18294,360	2	3829
-~o	"
+ct	16587,18825,720	2	3746
+^a	14148,17985,360	2	3810
+^e	14148,17985,360	2	3818
+^o	15126,17985,360	2	3828
+^u	15126,17985,360	2	3835
+'a	14148,18075,360	2	3809
+'e	14148,18075,360	2	3817
+'o	15126,18075,360	2	3827
+'u	15126,18075,360	2	3834
+`a	14148,18075,360	2	3808
+`e	14148,18075,360	2	3816
+`o	15126,18075,360	2	3826
+`u	15126,18075,360	2	3833
+:a	14148,17775,360	2	3812
+:e	14148,17775,360	2	3819
+:o	15126,17775,360	2	3830
+:u	15126,17775,360	2	3836
+oA	19515,25923	2	3781
+^i	6342,17985	2	3822
+/O	20004,18495,375	2	3800
+AE	25857,18165	2	3782
+oa	14148,20412,360	2	3813
+'i	6342,18075	2	3821
+/o	15126,13008,408	0	3832
+ae	22443,12990,360	0	3814
+:A	19515,22755	2	3780
+`i	6342,18075	2	3820
+:O	20004,22755,360	2	3798
+:U	19029,22755,360	2	3804
+'E	15126,23085	2	3785
+:i	6342,17775	2	3823
+ss	16101,18165,360	2	3807
+^O	20004,23085,360	2	3796
+'A	19515,23085	2	3777
+~A	19515,22959	2	3779
+~a	14148,18294,360	2	3811
+-D	19029,18135	2	3792
+Sd	15126,18315,360	2	3824
+'I	7317,23085	2	3789
+`I	7317,23085	2	3788
+'O	20004,23085,360	2	3795
+`O	20004,23085,360	2	3794
+~O	20004,22959,360	2	3797
+~o	15126,18294,360	2	3829
 vS	17076,23085,360	2	51795
 vs	13173,17985,360	2	51827
-char218	19029,23085,360	2	3802
-'U	"
+'U	19029,23085,360	2	3802
 :Y	18051,22755	2	51801
-char255	14637,17775,4680	3	3839
-:y	"
-char222	15612,18135	2	3806
-TP	"
-char254	15126,18165,4680	3	3838
-Tp	"
-char181	14637,12630,4350	0	3765
-mc	"
-char182	16587,19635,4200	2	3766
-ps	"
-char190	26346,18465,1020	2	3774
-34	"
+:y	14637,17775,4680	3	3839
+TP	15612,18135	2	3806
+Tp	15126,18165,4680	3	3838
+mc	14637,12630,4350	0	3765
+ps	16587,19635,4200	2	3766
+34	26346,18465,1020	2	3774
 \-	26346,8100	0	51757
-char188	26346,18465,1020	2	3772
-14	"
-char189	26346,18465,1020	2	3773
-12	"
-char170	10734,18465	2	3754
-Of	"
-char186	10734,18465	2	3770
-Om	"
-char171	14637,11085	0	3755
-Fo	"
-char187	14637,11085	0	3771
-Fc	"
-char177	26346,14985	0	3761
-char166	13173,19083,5916	3	3750
-bb	"
-char169	13173,19635	2	3753
-co	"
-char172	26346,11607	0	3756
-no	"
-char174	13173,19635	2	3758
-rg	"
-char178	10245,18465	2	3762
-S2	"
-char179	10245,18465	2	3763
-S3	"
-char184	16587,194958,5025	3	3768
-ac	"
-char185	10245,18345	2	3769
-S1	"
-char215	26346,14010	0	3799
-char247	26346,12315	0	3831
-char183	8781,10509	0	3767
-pc	"
+14	26346,18465,1020	2	3772
+12	26346,18465,1020	2	3773
+Of	10734,18465	2	3754
+Om	10734,18465	2	3770
+Fo	14637,11085	0	3755
+Fc	14637,11085	0	3771
+bb	13173,19083,5916	3	3750
+co	13173,19635	2	3753
+no	26346,11607	0	3756
+rg	13173,19635	2	3758
+S2	10245,18465	2	3762
+S3	10245,18465	2	3763
+ac	16587,194958,5025	3	3768
+S1	10245,18345	2	3769
+pc	8781,10509	0	3767
 fm	8781,18105	2	51873
 sd	16587,18105	2	51874
 dg	16587,18135	2	51755
@@ -864,8 +758,7 @@ Fl	24396,18315	2	51885
 ij	12684,18165,4995	3	51958
 bq	8781,3015,3060	0	51756
 %0	26346,18720,840	2	51901
-char175	16587,16845	2	3759
-a-	"
+a-	16587,16845	2	3759
 ab	16587,17985	2	51926
 a.	16587,17775	2	51927
 oe	23907,12990,360	0	51823