* src/utils/afmtodit/afmtodit.pl: Skip comment lines in encoding

files (as grops already does).
* src/utils/afmtodit/afmtodit.man: Document comment lines in map
files.
* src/devices/grops/grops.man: Document comment lines in encoding
files.

* tmac/cp1047.tmac: New file.
* tmac/dvi.tmac, tmac/tty-char.tmac: Use it.
* tmac/ps.tmac: Load latin1.tmac or cp1047.tmac.
* tmac/Makefile.sub (NORMALFILES): Updated.

* tmac/ec.tmac: Don't load latin1.tmac again.

* fonts/devps/generate/lgreekmap, fonts/devps/generate/symbolchars,
fonts/devps/generate/dingbats.map,
fonts/devps/generate/dingbats.rmap, fonts/devps/text.enc,
fonts/devps/generate/Makefile (symbolmap): Add header comment.
* fonts/devps/generate/textmap: Ditto.
Remove `charXXX' entries.
* fonts/devps/symbolmap: Regenerated.
* fonts/devps/*: Regenerated all font definition files.

1 files changed, 3 insertions, 99 deletions

diff --git a/font/devps/PI b/font/devps/PI
index fc8d0a4d..56a82449 100644
--- a/font/devps/PI
+++ b/font/devps/PI
@@ -43,7 +43,6 @@ T o -111
 T i -55
 T - -55
 T hy -55
-T char173 -55
 T e -111
 T , -74
 T : -74
@@ -60,7 +59,6 @@ V o -74
 V i -74
 V - -55
 V hy -55
-V char173 -55
 V e -92
 V , -129
 V : -37
@@ -75,7 +73,6 @@ W o -20
 W i -20
 W - -18
 W hy -18
-W char173 -18
 W e -20
 W , -55
 W : -18
@@ -91,7 +88,6 @@ Y o -111
 Y i -55
 Y - -74
 Y hy -74
-Y char173 -74
 Y e -111
 Y , -92
 Y : -74
@@ -157,7 +153,6 @@ cq	"
 ,	250,123,143,3,42,3	0	0054	-- comma
 -	333,281,0,21,31,21	0	0055	-- hyphen
 hy	"
-char173	"
 .	250,112,5,0,-3	0	0056	-- period
 /	296,733,119,146,90,68	2	0057	-- slash
 sl	"
@@ -252,9 +247,7 @@ a~	333,638,0,107,-13,68	0	0176	-- tilde
 ~	"
 bq	278,120,122,0,23	0	0200	-- quotesinglbase
 Fo	500,440,0,0,-7	0	0201	-- guillemotleft
-char171	"
 Fc	500,440,0,0,-13	0	0202	-- guillemotright
-char187	"
 bu	500,526,0,0,-36	0	0203	-- bullet
 Fn	500,708,276,20,45,20	3	0204	-- florin
 f/	167,699,0,220,220,68	2	0205	-- fraction
@@ -281,186 +274,97 @@ Bq	500,120,122,0,7	0	0235	-- quotedblbase
 OE	1028,706,18,11,-6,11	2	0236	-- OE
 /L	556,692,3,17,66,17	2	0237	-- Lslash
 r!	333,467,276,0,35	1	0241	-- exclamdown
-char161	"
 ct	500,551,96,0,-6	0	0242	-- cent
-char162	"
 Po	500,708,18,29,48,29	2	0243	-- sterling
-char163	"
 Cs	500,577,0,36,36,36	0	0244	-- currency
-char164	"
 Ye	500,699,3,62,15,62	2	0245	-- yen
-char165	"
 bb	606,733,0,0,-225	2	0246	-- brokenbar
-char166	"
 sc	500,706,220,13,36,13	2	0247	-- section
-char167	"
 ad	333,637,0,95,-28,68	0	0250	-- dieresis
-char168	"
 co	747,706,18,39,39,39	2	0251	-- copyright
-char169	"
 Of	333,699,0,38,-10,38	2	0252	-- ordfeminine
-char170	"
 fo	333,440,0,0,-7	0	0253	-- guilsinglleft
 no	606,378,0,0,-1	0	0254	-- logicalnot
-char172	"
 \-	606,280,0,0,-1	0	0255	-- minus
 rg	747,706,18,39,39,39	2	0256	-- registered
-char174	"
 a-	333,589,0,103,-24,68	0	0257	-- macron
-char175	"
 de	400,689,0,40,-40,40	2	0260	-- degree
-char176	"
-char177	606,504,0,0,-1	0	0261	-- plusminus
+---	606,504,0,0,-1	0	0261	-- plusminus
 S2	300,699,0,40,37,40	2	0262	-- twosuperior
-char178	"
 S3	300,699,0,54,22,54	2	0263	-- threesuperior
-char179	"
 aa	333,687,0,63,-72,63	2	0264	-- acute
-char180	"
 mc	556,482,226,6,35,6	0	0265	-- mu
-char181	"
 ps	500,692,224,161,17,68	2	0266	-- paragraph
-char182	"
 pc	250,312,0,0,-3	0	0267	-- periodcentered
-char183	"
 ac	333,0,216,0,59	0	0270	-- cedilla
-char184	"
 S1	300,699,0,35,-11,35	2	0271	-- onesuperior
-char185	"
 Om	333,699,0,39,-16,39	2	0272	-- ordmasculine
-char186	"
 fc	333,440,0,0,-13	0	0273	-- guilsinglright
 14	750,699,2,15,19,15	2	0274	-- onequarter
-char188	"
 12	750,699,2,21,19,21	2	0275	-- onehalf
-char189	"
 34	750,699,2,15,15,15	2	0276	-- threequarters
-char190	"
 r?	500,467,246,0,-7	0	0277	-- questiondown
-char191	"
 `A	722,897,3,5,69,5	2	0300	-- Agrave
-char192	"
 'A	722,897,3,5,69,5	2	0301	-- Aacute
-char193	"
 ^A	722,889,3,5,69,5	2	0302	-- Acircumflex
-char194	"
 ~A	722,866,3,5,69,5	2	0303	-- Atilde
-char195	"
 :A	722,847,3,5,69,5	2	0304	-- Adieresis
-char196	"
 oA	722,918,3,5,69,5	2	0305	-- Aring
-char197	"
 AE	941,692,3,11,54,11	2	0306	-- AE
-char198	"
 ,C	667,706,216,34,5,34	2	0307	-- Ccedilla
-char199	"
 `E	611,897,3,9,20,9	2	0310	-- Egrave
-char200	"
 'E	611,897,3,9,20,9	2	0311	-- Eacute
-char201	"
 ^E	611,889,3,9,20,9	2	0312	-- Ecircumflex
-char202	"
 :E	611,847,3,9,20,9	2	0313	-- Edieresis
-char203	"
 `I	333,897,3,71,43,68	2	0314	-- Igrave
-char204	"
 'I	333,897,3,123,43,68	2	0315	-- Iacute
-char205	"
 ^I	333,889,3,107,43,68	2	0316	-- Icircumflex
-char206	"
 :I	333,847,3,135,43,68	2	0317	-- Idieresis
-char207	"
 -D	778,692,3,13,31,13	2	0320	-- Eth
-char208	"
 ~N	778,866,11,76,48,68	2	0321	-- Ntilde
-char209	"
 `O	778,897,18,20,-3,20	2	0322	-- Ograve
-char210	"
 'O	778,897,18,20,-3,20	2	0323	-- Oacute
-char211	"
 ^O	778,889,18,20,-3,20	2	0324	-- Ocircumflex
-char212	"
 ~O	778,866,18,20,-3,20	2	0325	-- Otilde
-char213	"
 :O	778,847,18,20,-3,20	2	0326	-- Odieresis
-char214	"
-char215	606,474,0,0,-33	0	0327	-- multiply
+---	606,474,0,0,-33	0	0327	-- multiply
 /O	778,721,39,34,18,34	2	0330	-- Oslash
-char216	"
 `U	778,897,18,70,-38,68	2	0331	-- Ugrave
-char217	"
 'U	778,897,18,70,-38,68	2	0332	-- Uacute
-char218	"
 ^U	778,889,18,70,-38,68	2	0333	-- Ucircumflex
-char219	"
 :U	778,847,18,70,-38,68	2	0334	-- Udieresis
-char220	"
 'Y	667,897,3,58,-2,58	2	0335	-- Yacute
-char221	"
 TP	611,692,3,9,41,9	2	0336	-- Thorn
-char222	"
 ss	500,733,276,38,210,38	3	0337	-- germandbls
-char223	"
 `a	444,707,11,12,46,12	2	0340	-- agrave
-char224	"
 'a	444,707,11,20,46,20	2	0341	-- aacute
-char225	"
 ^a	444,699,11,12,46,12	2	0342	-- acircumflex
-char226	"
 ~a	444,650,11,52,46,52	2	0343	-- atilde
-char227	"
 :a	444,657,11,40,46,40	2	0344	-- adieresis
-char228	"
 oa	444,728,11,12,46,12	2	0345	-- aring
-char229	"
 ae	638,482,11,35,49,35	0	0346	-- ae
-char230	"
 ,c	407,482,216,32,25,32	0	0347	-- ccedilla
-char231	"
 `e	389,707,11,35,35,35	2	0350	-- egrave
-char232	"
 'e	389,707,11,55,35,55	2	0351	-- eacute
-char233	"
 ^e	389,699,11,59,35,59	2	0352	-- ecircumflex
-char234	"
 :e	389,657,11,67,35,67	2	0353	-- edieresis
-char235	"
 `i	278,707,9,43,16,43	2	0354	-- igrave
-char236	"
 'i	278,707,9,103,16,68	2	0355	-- iacute
-char237	"
 ^i	278,699,9,95,21,68	2	0356	-- icircumflex
-char238	"
 :i	278,657,9,123,16,68	2	0357	-- idieresis
-char239	"
 Sd	444,733,11,84,33,68	2	0360	-- eth
-char240	"
 ~n	556,650,9,8,26,8	2	0361	-- ntilde
-char241	"
 `o	444,707,11,17,33,17	2	0362	-- ograve
-char242	"
 'o	444,707,11,20,33,20	2	0363	-- oacute
-char243	"
 ^o	444,699,11,17,33,17	2	0364	-- ocircumflex
-char244	"
 ~o	444,650,11,52,33,52	2	0365	-- otilde
-char245	"
 :o	444,657,11,40,33,40	2	0366	-- odieresis
-char246	"
-char247	606,504,0,0,-1	0	0367	-- divide
+---	606,504,0,0,-1	0	0367	-- divide
 /o	444,510,24,66,68,66	0	0370	-- oslash
-char248	"
 `u	556,707,11,6,18,6	2	0371	-- ugrave
-char249	"
 'u	556,707,11,6,18,6	2	0372	-- uacute
-char250	"
 ^u	556,699,11,6,18,6	2	0373	-- ucircumflex
-char251	"
 :u	556,657,11,6,18,6	2	0374	-- udieresis
-char252	"
 'y	500,707,276,40,58,40	3	0375	-- yacute
-char253	"
 Tp	500,733,276,0,89	3	0376	-- thorn
-char254	"
 :y	500,657,276,40,58,40	3	0377	-- ydieresis
-char255	"