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

diff --git a/font/devps/PBI b/font/devps/PBI
index 7c6918b5..0ff530ea 100644
--- a/font/devps/PBI
+++ b/font/devps/PBI
@@ -43,7 +43,6 @@ T o -111
 T i -74
 T - -92
 T hy -92
-T char173 -92
 T e -111
 T , -55
 T : -55
@@ -60,7 +59,6 @@ V o -74
 V i -50
 V - -37
 V hy -37
-V char173 -37
 V e -74
 V , -111
 V : -37
@@ -88,7 +86,6 @@ Y o -111
 Y i -54
 Y - -55
 Y hy -55
-Y char173 -55
 Y e -92
 Y , -55
 Y : -55
@@ -155,7 +152,6 @@ cq	"
 ,	250,147,164,8,83,8	0	0054	-- comma
 -	389,300,0,23,13,23	0	0055	-- hyphen
 hy	"
-char173	"
 .	250,135,17,0,2	0	0056	-- period
 /	315,720,17,50,49,50	2	0057	-- slash
 sl	"
@@ -250,9 +246,7 @@ a~	333,654,0,158,-32,66	2	0176	-- tilde
 ~	"
 bq	250,145,144,20,53,20	0	0200	-- quotesinglbase
 Fo	500,446,0,8,15,8	0	0201	-- guillemotleft
-char171	"
 Fc	500,443,0,8,15,8	0	0202	-- guillemotright
-char187	"
 bu	606,516,0,0,-81	0	0203	-- bullet
 Fn	500,690,242,29,42,29	2	0204	-- florin
 f/	167,683,0,221,220,66	2	0205	-- fraction
@@ -279,186 +273,97 @@ Bq	500,145,144,0,68	0	0235	-- quotedblbase
 OE	944,695,17,67,11,66	2	0236	-- OE
 /L	611,681,3,17,44,17	2	0237	-- Lslash
 r!	333,479,225,0,48	0	0241	-- exclamdown
-char161	"
 ct	500,547,105,6,-2,6	0	0242	-- cent
-char162	"
 Po	500,683,5,51,29,51	2	0243	-- sterling
-char163	"
 Cs	500,533,0,18,18,18	0	0244	-- currency
-char164	"
 Ye	500,695,3,88,39,66	2	0245	-- yen
-char165	"
 bb	606,720,0,0,-209	2	0246	-- brokenbar
-char166	"
 sc	556,695,151,0,3	2	0247	-- section
-char167	"
 ad	333,668,0,143,-40,66	2	0250	-- dieresis
-char168	"
 co	747,695,17,23,24,23	2	0251	-- copyright
-char169	"
 Of	333,684,0,72,3,66	2	0252	-- ordfeminine
-char170	"
 fo	333,446,0,9,-10,9	0	0253	-- guilsinglleft
 no	606,390,0,0,-1	0	0254	-- logicalnot
-char172	"
 \-	606,292,0,0,-1	0	0255	-- minus
 rg	747,695,17,23,24,23	2	0256	-- registered
-char174	"
 a-	333,608,0,135,-26,66	0	0257	-- macron
-char175	"
 de	400,683	2	0260	-- degree
-char176	"
-char177	606,501	0	0261	-- plusminus
+---	606,501	0	0261	-- plusminus
 S2	300,683,0,71,24,66	2	0262	-- twosuperior
-char178	"
 S3	300,683,0,60,27,60	2	0263	-- threesuperior
-char179	"
 aa	333,699,0,109,-103,66	2	0264	-- acute
-char180	"
 mc	556,469,232,15,65,15	0	0265	-- mu
-char181	"
 ps	556,681,204,123,36,66	2	0266	-- paragraph
-char182	"
 pc	250,324,0,6,-17,6	0	0267	-- periodcentered
-char183	"
 ac	333,5,218,0,38	0	0270	-- cedilla
-char184	"
 S1	300,680,0,48,9,48	2	0271	-- onesuperior
-char185	"
 Om	333,683,0,63,-1,63	2	0272	-- ordmasculine
-char186	"
 fc	333,443,0,0,15	0	0273	-- guilsinglright
 14	750,683,2,32,32,32	2	0274	-- onequarter
-char188	"
 12	750,683,2,36,36,36	2	0275	-- onehalf
-char189	"
 34	750,683,2,32,32,32	2	0276	-- threequarters
-char190	"
 r?	444,479,226,0,62	0	0277	-- questiondown
-char191	"
 `A	722,911,3,13,85,13	2	0300	-- Agrave
-char192	"
 'A	722,911,3,13,85,13	2	0301	-- Aacute
-char193	"
 ^A	722,896,3,13,85,13	2	0302	-- Acircumflex
-char194	"
 ~A	722,866,3,13,85,13	2	0303	-- Atilde
-char195	"
 :A	722,880,3,13,85,13	2	0304	-- Adieresis
-char196	"
 oA	722,926,3,13,85,13	2	0305	-- Aring
-char197	"
 AE	944,681,3,33,79,33	2	0306	-- AE
-char198	"
 ,C	685,695,218,60,-19,60	2	0307	-- Ccedilla
-char199	"
 `E	611,911,3,45,39,45	2	0310	-- Egrave
-char200	"
 'E	611,911,3,45,39,45	2	0311	-- Eacute
-char201	"
 ^E	611,896,3,45,39,45	2	0312	-- Ecircumflex
-char202	"
 :E	611,880,3,45,39,45	2	0313	-- Edieresis
-char203	"
 `I	389,911,3,73,51,66	2	0314	-- Igrave
-char204	"
 'I	389,911,3,81,51,66	2	0315	-- Iacute
-char205	"
 ^I	389,896,3,104,51,66	2	0316	-- Icircumflex
-char206	"
 :I	389,880,3,115,51,66	2	0317	-- Idieresis
-char207	"
 -D	778,682,3,19,50,19	2	0320	-- Eth
-char208	"
 ~N	778,866,3,101,52,66	2	0321	-- Ntilde
-char209	"
 `O	833,911,17,11,-26,11	2	0322	-- Ograve
-char210	"
 'O	833,911,17,11,-26,11	2	0323	-- Oacute
-char211	"
 ^O	833,896,17,11,-26,11	2	0324	-- Ocircumflex
-char212	"
 ~O	833,866,17,11,-26,11	2	0325	-- Otilde
-char213	"
 :O	833,880,17,11,-26,11	2	0326	-- Odieresis
-char214	"
-char215	606,479,0,0,-22	0	0327	-- multiply
+---	606,479,0,0,-22	0	0327	-- multiply
 /O	833,730,54,14,-7,14	2	0330	-- Oslash
-char216	"
 `U	778,911,17,97,-33,66	2	0331	-- Ugrave
-char217	"
 'U	778,911,17,97,-33,66	2	0332	-- Uacute
-char218	"
 ^U	778,896,17,97,-33,66	2	0333	-- Ucircumflex
-char219	"
 :U	778,880,17,97,-33,66	2	0334	-- Udieresis
-char220	"
 'Y	611,911,3,114,-4,66	2	0335	-- Yacute
-char221	"
 TP	667,681,3,27,39,27	2	0336	-- Thorn
-char222	"
 ss	556,726,271,43,181,43	3	0337	-- germandbls
-char223	"
 `a	556,719,17,13,6,13	2	0340	-- agrave
-char224	"
 'a	556,719,17,13,6,13	2	0341	-- aacute
-char225	"
 ^a	556,704,17,21,6,21	2	0342	-- acircumflex
-char226	"
 ~a	556,666,17,47,6,47	2	0343	-- atilde
-char227	"
 :a	556,688,17,32,6,32	2	0344	-- adieresis
-char228	"
 oa	556,714,17,13,6,13	2	0345	-- aring
-char229	"
 ae	738,469,17,23,6,23	0	0346	-- ae
-char230	"
 ,c	444,469,218,42,18,42	0	0347	-- ccedilla
-char231	"
 `e	444,719,17,24,22,24	2	0350	-- egrave
-char232	"
 'e	444,719,17,54,22,54	2	0351	-- eacute
-char233	"
 ^e	444,704,17,77,22,66	2	0352	-- ecircumflex
-char234	"
 :e	444,688,17,88,22,66	2	0353	-- edieresis
-char235	"
 `i	333,719,17,39,24,39	2	0354	-- igrave
-char236	"
 'i	333,719,17,109,24,66	2	0355	-- iacute
-char237	"
 ^i	333,704,17,120,24,66	2	0356	-- icircumflex
-char238	"
 :i	333,688,17,143,24,66	2	0357	-- idieresis
-char239	"
 Sd	556,726,17,40,2,40	2	0360	-- eth
-char240	"
 ~n	556,666,17,47,33,47	2	0361	-- ntilde
-char241	"
 `o	556,719,17,0,2	2	0362	-- ograve
-char242	"
 'o	556,719,17,0,2	2	0363	-- oacute
-char243	"
 ^o	556,704,17,9,2,9	2	0364	-- ocircumflex
-char244	"
 ~o	556,666,17,47,2,47	2	0365	-- otilde
-char245	"
 :o	556,688,17,32,2,32	2	0366	-- odieresis
-char246	"
-char247	606,501,5	0	0367	-- divide
+---	606,501,5	0	0367	-- divide
 /o	556,506,50,16,36,16	0	0370	-- oslash
-char248	"
 `u	556,719,17,15,28,15	2	0371	-- ugrave
-char249	"
 'u	556,719,17,15,28,15	2	0372	-- uacute
-char250	"
 ^u	556,704,17,15,28,15	2	0373	-- ucircumflex
-char251	"
 :u	556,688,17,32,28,32	2	0374	-- udieresis
-char252	"
 'y	556,719,271,35,37,35	3	0375	-- yacute
-char253	"
 Tp	556,726,271,10,71,10	3	0376	-- thorn
-char254	"
 :y	556,688,271,35,37,35	3	0377	-- ydieresis
-char255	"