* 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.

2 files changed, 57 insertions, 3 deletions

diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.man
index e5b02682..2d4c8661 100644
--- a/src/utils/afmtodit/afmtodit.man
+++ b/src/utils/afmtodit/afmtodit.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,15 +16,23 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
+.
+.
 .TH AFMTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 afmtodit \- create font files for use with groff \-Tps
+.
+.
 .SH SYNOPSIS
 .nr a \n(.j
 .ad l
@@ -36,6 +44,7 @@ afmtodit \- create font files for use with groff \-Tps
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
+.
 .OP \-nsv
 .OP \-d desc_file
 .OP \-e enc_file
@@ -46,16 +55,21 @@ afmtodit \- create font files for use with groff \-Tps
 .I font
 .br
 .ad \na
+.
+.
 .SH DESCRIPTION
 .B afmtodit
 creates a font file for use with groff and
 .BR grops .
+.
 .B afmtodit
 is written in perl;
 you must have perl version 3 or newer installed in order to run
 .BR afmtodit .
+.
 .I afm_file
 is the AFM (Adobe Font Metric) file for the font.
+.
 .I map_file
 is a file that says which groff character names map onto
 each PostScript character name;
@@ -69,15 +83,22 @@ where
 is the PostScript name of the character
 and
 .I groff_char
-is the groff name of the character (as used in the groff font file.)
+is the groff name of the character (as used in the groff font file).
+.
 The same
 .I ps_char
 can occur multiple times in the file;
 each
 .I groff_char
 must occur at most once.
+.
+Lines starting with
+.B #
+and blank lines are ignored.
+.
 .I font
 is the groff name of the font.
+.
 If a PostScript character is in the encoding to be used for the font
 but is not mentioned in
 .I map_file
@@ -88,14 +109,17 @@ which can be accessed by the
 .B \eN
 escape sequence in
 .BR troff .
+.
 The groff font file will be output to a file called
 .IR font .
+.
 .LP
 If there is a downloadable font file for the font, it may be listed in
 the file
 .BR @FONTDIR@/devps/download ;
 see
 .BR grops (@MAN1EXT@).
+.
 .LP
 If the
 .B \-i
@@ -123,53 +147,67 @@ is the PostScript name of the character,
 and
 .I n
 is the desired value of the corresponding parameter in thousandths of an em.
+.
 These parameters are normally needed only for italic (or oblique) fonts.
+.
+.
 .SH OPTIONS
 .TP
 .B \-v
 Print version.
+.
 .TP
 .B \-n
 Don't output a
 .B ligatures
 command for this font.
+.
 Use this with constant-width fonts.
+.
 .TP
 .B \-s
 The font is special.
+.
 The effect of this option is to add the
 .B special
 command to the font file.
+.
 .TP
 .BI \-d desc_file
 The device description file is
 .I desc_file
 rather than the default
 .BR DESC .
+.
 .TP
 .BI \-e enc_file
 The PostScript font should be reencoded to use the encoding described
 in enc_file.
+.
 The format of
 .I enc_file
 is described in
 .BR grops (@MAN1EXT@).
+.
 .TP
 .BI \-a n
 Use
 .I n
 as the slant parameter in the font file;
 this is used by groff in the positioning of accents.
+.
 By default
 .B afmtodit
 uses the negative of the ItalicAngle specified in the afm file;
 with true italic fonts it is sometimes desirable to use
 a slant that is less than this.
+.
 If you find that characters from an italic font have accents
 placed too far to the right over them,
 then use the
 .B \-a
 option to give the font a smaller slant.
+.
 .TP
 .BI \-i n
 Generate an italic correction for each character so that 
@@ -179,15 +217,19 @@ is equal to
 thousandths of an em
 plus the amount by which the right edge of the character's bounding
 is to the right of the character's origin.
+.
 If this would result in a negative italic correction, use a zero
 italic correction instead.
+.
 .IP
 Also generate a subscript correction equal to the 
 product of the tangent of the slant of the font and
 four fifths of the x-height of the font.
+.
 If this would result in a subscript correction greater than the italic
 correction, use a subscript correction equal to the italic correction
 instead.
+.
 .IP
 Also generate a left italic correction for each character
 equal to
@@ -195,29 +237,40 @@ equal to
 thousandths of an em
 plus the amount by which the left edge of the character's bounding box
 is to the left of the character's origin.
+.
 The left italic correction may be negative.
+.
 .IP
 This option is normally needed only with italic (or oblique) fonts.
+.
 The font files distributed with groff were created using an option of
 .B \-i50
 for italic fonts.
+.
+.
 .SH FILES
 .Tp \w'\fB@FONTDIR@/devps/download'u+2n
 .B @FONTDIR@/devps/DESC
 Device description file.
+.
 .TP
 .BI @FONTDIR@/devps/ F
 Font description file for font
 .IR F .
+.
 .TP
 .B @FONTDIR@/devps/download
 List of downloadable fonts.
+.
 .TP
 .B @FONTDIR@/devps/text.enc
 Encoding used for text fonts.
+.
 .TP
 .B @FONTDIR@/devps/generate/textmap
 Standard mapping.
+.
+.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR grops (@MAN1EXT@),
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
index 04bfe78e..eed6979a 100644
--- a/src/utils/afmtodit/afmtodit.pl
+++ b/src/utils/afmtodit/afmtodit.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -P-
 # -*- Perl -*-
-# Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
 # This file is part of groff.
@@ -145,6 +145,7 @@ if ($opt_e) {
     
     open(ENCODING, $opt_e) || die "$prog: can't open \`$opt_e': $!\n";
     while (<ENCODING>) {
+	next if /^#/;
 	chop;
 	@field = split(' ');
 	if ($#field == 1) {