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

diff --git a/font/devlj4/ALBR b/font/devlj4/ALBR
index 6a7d0423..e2fb7325 100644
--- a/font/devlj4/ALBR
+++ b/font/devlj4/ALBR
@@ -363,19 +363,16 @@ 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
 - T -3903
 en T -3903
 em T -3903
-Y char173 -1950
 Y hy -1950
 Y - -1950
 Y en -1950
@@ -388,7 +385,6 @@ b cq -1950
 b ' -1950
 a cq -1461
 a ' -1461
-V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
@@ -401,43 +397,35 @@ 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
 L - -975
 L en -975
 L em -975
-X char173 -975
 X hy -975
 X - -975
 X en -975
 X em -975
-A char173 -1950
 A hy -1950
 A - -1950
 A en -1950
 A em -1950
-K char173 -975
 K hy -975
 K - -975
 K en -975
 K em -975
-char173 X -975
 hy X -975
 - X -975
-char173 A -1950
 hy A -1950
 - A -1950
 en X -975
 en A -1950
 em X -975
-R char173 -975
 R hy -975
 R - -975
 R en -975
@@ -449,12 +437,10 @@ k cq -486
 k ' -486
 O cq -486
 O ' -486
-Z char173 -486
 Z hy -486
 Z - -486
 Z en -486
 Z em -486
-k char173 -486
 k hy -486
 k - -486
 k en -486
@@ -476,8 +462,7 @@ cq	8295,20130	2	51751
 *	16587,20130	2	3626
 +	24882,15420,60	0	3627
 ,	8295,3945,5055	1	3628
-char173	8295,9795	0	3629
-hy	"
+hy	8295,9795	0	3629
 -	"
 .	8295,4080,300	0	3630
 sl	11709,20130	2	3631
@@ -569,199 +554,106 @@ ba	13173,19758,6588	3	3708
 rC	11709,20130,6075	3	3709
 }	"
 ti	26346,8952	0	51876
-char192	20979,24960	2	3776
-`A	"
-char194	20979,24960	2	3778
-^A	"
-char200	14637,24960	2	3784
-`E	"
-char202	14637,24960	2	3786
-^E	"
-char203	14637,25020	2	3787
-:E	"
-char206	8295,24960	2	3790
-^I	"
-char207	8295,25020	2	3791
-:I	"
-char180	16587,19785	2	3764
-aa	"
+`A	20979,24960	2	3776
+^A	20979,24960	2	3778
+`E	14637,24960	2	3784
+^E	14637,24960	2	3786
+:E	14637,25020	2	3787
+^I	8295,24960	2	3790
+:I	8295,25020	2	3791
+aa	16587,19785	2	3764
 ga	16587,19785	2	3680
 a^	16587,19785	2	3678
 ^	"
-char168	16587,19140	2	3752
-ad	"
+ad	16587,19140	2	3752
 a~	16587,18507	2	3710
 ~	"
-char217	20979,24960,300	2	3801
-`U	"
-char219	20979,24960,300	2	3803
-^U	"
-char221	17076,24960	2	3805
-'Y	"
-char253	13173,19785,4365	3	3837
-'y	"
-char176	13662,20430	2	3760
-de	"
-char199	18051,20430,6330	3	3783
-,C	"
-char231	12198,14310,6006	1	3815
-,c	"
-char209	21468,24783	2	3793
-~N	"
-char241	14148,18507	2	3825
-~n	"
-char161	8295,14346,6084	1	3745
-r!	"
-char191	12198,14496,6234	1	3775
-r?	"
-char164	16587,15684	0	3748
-Cs	"
-char163	16587,20430	2	3747
-Po	"
-char165	16587,20130	2	3749
-Ye	"
-char167	16587,20430,4365	3	3751
-sc	"
+`U	20979,24960,300	2	3801
+^U	20979,24960,300	2	3803
+'Y	17076,24960	2	3805
+'y	13173,19785,4365	3	3837
+de	13662,20430	2	3760
+,C	18051,20430,6330	3	3783
+,c	12198,14310,6006	1	3815
+~N	21468,24783	2	3793
+~n	14148,18507	2	3825
+r!	8295,14346,6084	1	3745
+r?	12198,14496,6234	1	3775
+Cs	16587,15684	0	3748
+Po	16587,20430	2	3747
+Ye	16587,20130	2	3749
+sc	16587,20430,4365	3	3751
 Fn	16587,20130	2	51871
-char162	16587,19968	2	3746
-ct	"
-char226	12198,19785,300	2	3810
-^a	"
-char234	12684,19785,300	2	3818
-^e	"
-char244	14637,19785,300	2	3828
-^o	"
-char251	14148,19785,300	2	3835
-^u	"
-char225	12198,19785,300	2	3809
-'a	"
-char233	12684,19785,300	2	3817
-'e	"
-char243	14637,19785,300	2	3827
-'o	"
-char250	14148,19785,300	2	3834
-'u	"
-char224	12198,19785,300	2	3808
-`a	"
-char232	12684,19785,300	2	3816
-`e	"
-char242	14637,19785,300	2	3826
-`o	"
-char249	14148,19785,300	2	3833
-`u	"
-char228	12198,19140,300	2	3812
-:a	"
-char235	12684,19140,300	2	3819
-:e	"
-char246	14637,19140,300	2	3830
-:o	"
-char252	14148,19140,300	2	3836
-:u	"
-char197	20979,26154	2	3781
-oA	"
-char238	6342,19785	2	3822
-^i	"
-char216	22932,20454,300	2	3800
-/O	"
-char198	25857,20130	2	3782
-AE	"
-char229	12198,20160,300	2	3813
-oa	"
-char237	6342,19785	2	3821
-'i	"
-char248	14637,14316,300	0	3832
-/o	"
-char230	19515,14310,300	0	3814
-ae	"
-char196	20979,25020	2	3780
-:A	"
-char236	6342,19785	2	3820
-`i	"
-char214	22932,25020,300	2	3798
-:O	"
-char220	20979,25020,300	2	3804
-:U	"
-char201	14637,24960	2	3785
-'E	"
-char239	6342,19140	2	3823
-:i	"
-char223	15612,20130,300	2	3807
-ss	"
-char212	22932,24960,300	2	3796
-^O	"
-char193	20979,24960	2	3777
-'A	"
-char195	20979,24783	2	3779
-~A	"
-char227	12198,18507,300	2	3811
-~a	"
-char208	20004,20130	2	3792
--D	"
-char240	14637,20025,300	2	3824
-Sd	"
-char205	8295,24960	2	3789
-'I	"
-char204	8295,24960	2	3788
-`I	"
-char211	22932,24960,300	2	3795
-'O	"
-char210	22932,24960,300	2	3794
-`O	"
-char213	22932,24783,300	2	3797
-~O	"
-char245	14637,18507,300	2	3829
-~o	"
+ct	16587,19968	2	3746
+^a	12198,19785,300	2	3810
+^e	12684,19785,300	2	3818
+^o	14637,19785,300	2	3828
+^u	14148,19785,300	2	3835
+'a	12198,19785,300	2	3809
+'e	12684,19785,300	2	3817
+'o	14637,19785,300	2	3827
+'u	14148,19785,300	2	3834
+`a	12198,19785,300	2	3808
+`e	12684,19785,300	2	3816
+`o	14637,19785,300	2	3826
+`u	14148,19785,300	2	3833
+:a	12198,19140,300	2	3812
+:e	12684,19140,300	2	3819
+:o	14637,19140,300	2	3830
+:u	14148,19140,300	2	3836
+oA	20979,26154	2	3781
+^i	6342,19785	2	3822
+/O	22932,20454,300	2	3800
+AE	25857,20130	2	3782
+oa	12198,20160,300	2	3813
+'i	6342,19785	2	3821
+/o	14637,14316,300	0	3832
+ae	19515,14310,300	0	3814
+:A	20979,25020	2	3780
+`i	6342,19785	2	3820
+:O	22932,25020,300	2	3798
+:U	20979,25020,300	2	3804
+'E	14637,24960	2	3785
+:i	6342,19140	2	3823
+ss	15612,20130,300	2	3807
+^O	22932,24960,300	2	3796
+'A	20979,24960	2	3777
+~A	20979,24783	2	3779
+~a	12198,18507,300	2	3811
+-D	20004,20130	2	3792
+Sd	14637,20025,300	2	3824
+'I	8295,24960	2	3789
+`I	8295,24960	2	3788
+'O	22932,24960,300	2	3795
+`O	22932,24960,300	2	3794
+~O	22932,24783,300	2	3797
+~o	14637,18507,300	2	3829
 vS	13662,24960,300	2	51795
 vs	9270,19785,300	2	51827
-char218	20979,24960,300	2	3802
-'U	"
+'U	20979,24960,300	2	3802
 :Y	17076,25020	2	51801
-char255	13173,19140,4365	3	3839
-:y	"
-char222	13662,20130	2	3806
-TP	"
-char254	14637,20025,4365	3	3838
-Tp	"
-char181	14637,12630,4350	1	3765
-mc	"
-char182	16587,19635,4200	3	3766
-ps	"
-char190	24882,20430,300	2	3774
-34	"
+:y	13173,19140,4365	3	3839
+TP	13662,20130	2	3806
+Tp	14637,20025,4365	3	3838
+mc	14637,12630,4350	1	3765
+ps	16587,19635,4200	3	3766
+34	24882,20430,300	2	3774
 \-	24882,9405	0	51757
-char188	24882,20430,300	2	3772
-14	"
-char189	24882,20430,300	2	3773
-12	"
-char170	10245,20430	2	3754
-Of	"
-char186	10245,20430	2	3770
-Om	"
-char171	12198,12450	0	3755
-Fo	"
-char187	12198,12450	0	3771
-Fc	"
-char177	24882,15420,5175	1	3761
-char166	13173,19083,5916	3	3750
-bb	"
-char169	13173,19635	2	3753
-co	"
-char172	24882,12135	0	3756
-no	"
-char174	13173,19635	2	3758
-rg	"
-char178	10245,20340	2	3762
-S2	"
-char179	10245,20130	2	3763
-S3	"
-char184	16587,309,6006	1	3768
-ac	"
-char185	10245,20340	2	3769
-S1	"
-char215	24882,15990,279	0	3799
-char247	24882,15090	0	3831
-char183	8295,12330	0	3767
-pc	"
+14	24882,20430,300	2	3772
+12	24882,20430,300	2	3773
+Of	10245,20430	2	3754
+Om	10245,20430	2	3770
+Fo	12198,12450	0	3755
+Fc	12198,12450	0	3771
+bb	13173,19083,5916	3	3750
+co	13173,19635	2	3753
+no	24882,12135	0	3756
+rg	13173,19635	2	3758
+S2	10245,20340	2	3762
+S3	10245,20130	2	3763
+ac	16587,309,6006	1	3768
+S1	10245,20340	2	3769
+pc	8295,12330	0	3767
 fm	8295,20130	2	51873
 sd	14148,20130	2	51874
 dg	16587,20130,4365	3	51755
@@ -789,8 +681,7 @@ Fl	21468,20130	2	51885
 ij	12684,19815,4365	3	51958
 bq	8295,3900,5100	1	51756
 %0	33177,20430,300	2	51901
-char175	16587,18603	2	3759
-a-	"
+a-	16587,18603	2	3759
 ab	16587,19110	2	51926
 a.	16587,19140	2	51927
 oe	22443,14310,300	0	51823