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

diff --git a/font/devlj4/GR b/font/devlj4/GR
index cc134478..67b035a8 100644
--- a/font/devlj4/GR
+++ b/font/devlj4/GR
@@ -417,19 +417,16 @@ K W -486
 K U -486
 L cq -3414
 L ' -3414
-T char173 -4389
 T hy -4389
 T - -4389
 T en -4389
 T em -4389
 A cq -2925
 A ' -2925
-char173 T -4389
 hy T -4389
 - T -4389
 en T -4389
 em T -4389
-Y char173 -3414
 Y hy -3414
 Y - -3414
 Y en -3414
@@ -442,7 +439,6 @@ b cq -1461
 b ' -1461
 a cq -486
 a ' -486
-V char173 -1950
 V hy -1950
 V - -1950
 V en -1950
@@ -455,45 +451,37 @@ m cq -975
 m ' -975
 R cq -1950
 R ' -1950
-W char173 -1950
 W hy -1950
 W - -1950
 W en -1950
 W em -1950
 cq d -1461
 ' d -1461
-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 -486
 ' s -486
-char173 X -1461
 hy X -1461
 - X -1461
-char173 A -1461
 hy A -1461
 - A -1461
 en X -1461
 en A -1461
 em X -1461
-R char173 -1950
 R hy -1950
 R - -1950
 R en -1950
@@ -504,24 +492,20 @@ G cq -486
 G ' -486
 E cq -486
 E ' -486
-E char173 -486
 E hy -486
 E - -486
 E en -486
 E em -486
-Z char173 -975
 Z hy -975
 Z - -975
 Z en -975
 Z em -975
 B cq -486
 B ' -486
-J char173 -486
 J hy -486
 J - -486
 J en -486
 J em -486
-U char173 -486
 U hy -486
 U - -486
 U en -486
@@ -543,8 +527,7 @@ cq	7317,18555	2	51751
 *	12684,18555	2	3626
 +	21468,13191,261	0	3627
 ,	6831,3096,4449	0	3628
-char173	6831,6960	0	3629
-hy	"
+hy	6831,6960	0	3629
 -	"
 .	6831,2847,390	0	3630
 sl	12684,20250,480	2	3631
@@ -636,199 +619,106 @@ ba	13173,19758,6588	3	3708
 rC	11709,19935,6210	3	3709
 }	"
 ti	26346,8952	0	51876
-char192	20004,24846,150	2	3776
-`A	"
-char194	20004,24600,150	2	3778
-^A	"
-char200	16587,24846,150	2	3784
-`E	"
-char202	16587,24600,150	2	3786
-^E	"
-char203	16587,23751,150	2	3787
-:E	"
-char206	8781,24600,150	2	3790
-^I	"
-char207	8781,23751,150	2	3791
-:I	"
-char180	12684,20460	2	3764
-aa	"
+`A	20004,24846,150	2	3776
+^A	20004,24600,150	2	3778
+`E	16587,24846,150	2	3784
+^E	16587,24600,150	2	3786
+:E	16587,23751,150	2	3787
+^I	8781,24600,150	2	3790
+:I	8781,23751,150	2	3791
+aa	12684,20460	2	3764
 ga	12684,20460	2	3680
 a^	12684,20460	2	3678
 ^	"
-char168	12684,17244	0	3752
-ad	"
+ad	12684,17244	0	3752
 a~	12684,18180	0	3710
 ~	"
-char217	21468,24846,390	2	3801
-`U	"
-char219	21468,24600,390	2	3803
-^U	"
-char221	19029,24846,150	2	3805
-'Y	"
-char253	14148,20460,6705	3	3837
-'y	"
-char176	12684,17805	0	3760
-de	"
-char199	19515,18555,5964	2	3783
-,C	"
-char231	11220,11670,5553	0	3815
-,c	"
-char209	22443,24498,774	2	3793
-~N	"
-char241	14637,18180,150	0	3825
-~n	"
-char161	6831,12096,7131	1	3745
-r!	"
-char191	9759,12096,7131	1	3775
-r?	"
-char164	12684,15684	0	3748
-Cs	"
-char163	12684,17805,5424	0	3747
-Po	"
-char165	12684,18315,150	2	3749
-Ye	"
-char167	12684,18555,5250	2	3751
-sc	"
+`U	21468,24846,390	2	3801
+^U	21468,24600,390	2	3803
+'Y	19029,24846,150	2	3805
+'y	14148,20460,6705	3	3837
+de	12684,17805	0	3760
+,C	19515,18555,5964	2	3783
+,c	11220,11670,5553	0	3815
+~N	22443,24498,774	2	3793
+~n	14637,18180,150	0	3825
+r!	6831,12096,7131	1	3745
+r?	9759,12096,7131	1	3775
+Cs	12684,15684	0	3748
+Po	12684,17805,5424	0	3747
+Ye	12684,18315,150	2	3749
+sc	12684,18555,5250	2	3751
 Fn	12684,20250,6705	3	51871
-char162	12684,17556,126	0	3746
-ct	"
-char226	11220,20460,390	2	3810
-^a	"
-char234	11220,20460,390	2	3818
-^e	"
-char244	14148,20460,390	2	3828
-^o	"
-char251	14148,20460,390	2	3835
-^u	"
-char225	11220,20460,390	2	3809
-'a	"
-char233	11220,20460,390	2	3817
-'e	"
-char243	14148,20460,390	2	3827
-'o	"
-char250	14148,20460,390	2	3834
-'u	"
-char224	11220,20460,390	2	3808
-`a	"
-char232	11220,20460,390	2	3816
-`e	"
-char242	14148,20460,390	2	3826
-`o	"
-char249	14148,20460,390	2	3833
-`u	"
-char228	11220,17244,390	0	3812
-:a	"
-char235	11220,17244,390	0	3819
-:e	"
-char246	14148,17244,390	0	3830
-:o	"
-char252	14148,17244,390	0	3836
-:u	"
-char197	20004,24768,150	2	3781
-oA	"
-char238	7317,20460,150	2	3822
-^i	"
-char216	22443,18948,501	2	3800
-/O	"
-char198	28299,18315,150	2	3782
-AE	"
-char229	11220,19248,390	2	3813
-oa	"
-char237	7317,20460,150	2	3821
-'i	"
-char248	14148,11832,489	0	3832
-/o	"
-char230	17076,11670,390	0	3814
-ae	"
-char196	20004,23751,150	2	3780
-:A	"
-char236	7317,20460,150	2	3820
-`i	"
-char214	22443,23751,390	2	3798
-:O	"
-char220	21468,23751,390	2	3804
-:U	"
-char201	16587,24846,150	2	3785
-'E	"
-char239	7317,17244,150	0	3823
-:i	"
-char223	14637,20250,390	2	3807
-ss	"
-char212	22443,24600,390	2	3796
-^O	"
-char193	20004,24846,150	2	3777
-'A	"
-char195	20004,24498,150	2	3779
-~A	"
-char227	11220,18180,390	0	3811
-~a	"
-char208	20979,18555,150	2	3792
--D	"
-char240	14148,20250,390	2	3824
-Sd	"
-char205	8781,24846,150	2	3789
-'I	"
-char204	8781,24846,150	2	3788
-`I	"
-char211	22443,24846,390	2	3795
-'O	"
-char210	22443,24846,390	2	3794
-`O	"
-char213	22443,24498,390	2	3797
-~O	"
-char245	14148,18180,390	0	3829
-~o	"
+ct	12684,17556,126	0	3746
+^a	11220,20460,390	2	3810
+^e	11220,20460,390	2	3818
+^o	14148,20460,390	2	3828
+^u	14148,20460,390	2	3835
+'a	11220,20460,390	2	3809
+'e	11220,20460,390	2	3817
+'o	14148,20460,390	2	3827
+'u	14148,20460,390	2	3834
+`a	11220,20460,390	2	3808
+`e	11220,20460,390	2	3816
+`o	14148,20460,390	2	3826
+`u	14148,20460,390	2	3833
+:a	11220,17244,390	0	3812
+:e	11220,17244,390	0	3819
+:o	14148,17244,390	0	3830
+:u	14148,17244,390	0	3836
+oA	20004,24768,150	2	3781
+^i	7317,20460,150	2	3822
+/O	22443,18948,501	2	3800
+AE	28299,18315,150	2	3782
+oa	11220,19248,390	2	3813
+'i	7317,20460,150	2	3821
+/o	14148,11832,489	0	3832
+ae	17076,11670,390	0	3814
+:A	20004,23751,150	2	3780
+`i	7317,20460,150	2	3820
+:O	22443,23751,390	2	3798
+:U	21468,23751,390	2	3804
+'E	16587,24846,150	2	3785
+:i	7317,17244,150	0	3823
+ss	14637,20250,390	2	3807
+^O	22443,24600,390	2	3796
+'A	20004,24846,150	2	3777
+~A	20004,24498,150	2	3779
+~a	11220,18180,390	0	3811
+-D	20979,18555,150	2	3792
+Sd	14148,20250,390	2	3824
+'I	8781,24846,150	2	3789
+`I	8781,24846,150	2	3788
+'O	22443,24846,390	2	3795
+`O	22443,24846,390	2	3794
+~O	22443,24498,390	2	3797
+~o	14148,18180,390	0	3829
 vS	12684,24612,390	2	51795
 vs	9270,20499,390	2	51827
-char218	21468,24846,390	2	3802
-'U	"
+'U	21468,24846,390	2	3802
 :Y	19029,23751,150	2	51801
-char255	14148,17244,6705	1	3839
-:y	"
-char222	15612,18315,150	2	3806
-TP	"
-char254	14148,20250,6855	3	3838
-Tp	"
-char181	14637,10800,5595	0	3765
-mc	"
-char182	12684,19635,4200	2	3766
-ps	"
-char190	21468,17805,288	0	3774
-34	"
+:y	14148,17244,6705	1	3839
+TP	15612,18315,150	2	3806
+Tp	14148,20250,6855	3	3838
+mc	14637,10800,5595	0	3765
+ps	12684,19635,4200	2	3766
+34	21468,17805,288	0	3774
 \-	21468,7305	0	51757
-char188	21468,17805,288	0	3772
-14	"
-char189	21468,17805,288	0	3773
-12	"
-char170	12684,17805	0	3754
-Of	"
-char186	12684,17805	0	3770
-Om	"
-char171	11220,9945	0	3755
-Fo	"
-char187	11220,9945	0	3771
-Fc	"
-char177	21468,13191,3105	0	3761
-char166	13173,19083,5916	2	3750
-bb	"
-char169	13173,19725	2	3753
-co	"
-char172	21468,10029	0	3756
-no	"
-char174	13173,19725	2	3758
-rg	"
-char178	8781,17805	0	3762
-S2	"
-char179	8781,17805	0	3763
-S3	"
-char184	12684,255,5553	0	3768
-ac	"
-char185	8781,17805	0	3769
-S1	"
-char215	21468,12969,189	0	3799
-char247	21468,12966,36	0	3831
-char183	6831,10326	0	3767
-pc	"
+14	21468,17805,288	0	3772
+12	21468,17805,288	0	3773
+Of	12684,17805	0	3754
+Om	12684,17805	0	3770
+Fo	11220,9945	0	3755
+Fc	11220,9945	0	3771
+bb	13173,19083,5916	2	3750
+co	13173,19725	2	3753
+no	21468,10029	0	3756
+rg	13173,19725	2	3758
+S2	8781,17805	0	3762
+S3	8781,17805	0	3763
+ac	12684,255,5553	0	3768
+S1	8781,17805	0	3769
+pc	6831,10326	0	3767
 fm	12684,17805	0	51873
 sd	12684,17805	0	51874
 dg	12684,18555,5250	2	51755
@@ -856,8 +746,7 @@ Fl	21954,20250,150	2	51885
 ij	14148,19356,6705	3	51958
 bq	7317,2811,3939	0	51756
 %0	30738,17805,180	0	51901
-char175	12684,17367	0	3759
-a-	"
+a-	12684,17367	0	3759
 ab	12684,17796	0	51926
 a.	12684,17244	0	51927
 oe	20004,11670,390	0	51823