diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/groff.texinfo | 8 | ||||
| -rw-r--r-- | src/utils/afmtodit/afmtodit.pl | 9 |
3 files changed, 18 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2004-02-14 Werner LEMBERG <wl@gnu.org> + + * src/utils/afmtodit/afmtodit.pl: Remove an incorrect `my' from + $psname and $italic_angle. + Immediately restart file input loops if `split' returns an empty + array. + 2004-02-13 Michail Vidiassov <master@iaas.msu.ru> Werner LEMBERG <wl@gnu.org> diff --git a/doc/groff.texinfo b/doc/groff.texinfo index 066b9f08..fb1984c1 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -24,9 +24,9 @@ @copying -This manual documents GNU @code{troff} version 1.19. +This manual documents GNU @code{troff} version 1.19.2. -Copyright @copyright{} 1994-2000, 2001, 2002, 2003, 2004 +Copyright @copyright{} 1994-2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation @@ -454,8 +454,8 @@ Software Foundation raise funds for GNU development.'' @titlepage @title groff @subtitle The GNU implementation of @code{troff} -@subtitle Edition 1.19.1 -@subtitle Spring 2004 +@subtitle Edition 1.19.2 +@subtitle Spring 2005 @author by Trent A.@tie{}Fisher @author and Werner Lemberg (@email{bug-groff@@gnu.org}) diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl index 1bc85d5e..dce31137 100644 --- a/src/utils/afmtodit/afmtodit.pl +++ b/src/utils/afmtodit/afmtodit.pl @@ -6089,11 +6089,12 @@ open(AFM, $afm) || die "$prog: can't open \`$ARGV[0]': $!\n"; while (<AFM>) { chop; my @field = split(' '); + next if $#field < 0; if ($field[0] eq "FontName") { - my $psname = $field[1]; + $psname = $field[1]; } elsif($field[0] eq "ItalicAngle") { - my $italic_angle = -$field[1]; + $italic_angle = -$field[1]; } elsif ($field[0] eq "KPX") { if ($#field == 3) { @@ -6114,6 +6115,7 @@ while (<AFM>) { elsif ($field[0] eq "StartCharMetrics") { while (<AFM>) { @field = split(' '); + next if $#field < 0; last if ($field[0] eq "EndCharMetrics"); if ($field[0] eq "C") { my $w; @@ -6182,6 +6184,7 @@ while (<DESC>) { next if /^#/; chop; my @field = split(' '); + next if $#field < 0; last if $field[0] eq "charset"; if ($field[0] eq "res") { $resolution = $field[1]; @@ -6205,6 +6208,7 @@ if ($opt_e) { next if /^#/; chop; my @field = split(' '); + next if $#field < 0; if ($#field == 1) { if ($field[1] >= 0 && defined $width{$field[0]}) { $encoding[$field[1]] = $field[0]; @@ -6225,6 +6229,7 @@ while (<MAP>) { next if /^#/; chop; my @field = split(' '); + next if $#field < 0; if ($#field == 1) { if ($field[1] eq "space") { # The PostScript character "space" is automatically mapped |