[groff] 01/05: Fix regression in previous commit.

[Deri James]

deri pushed a commit to branch deri-gropdf-ng
in repository groff.

commit 4df253f1bf3e4aa3af978a4a65c1ac5ca0606d62
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
AuthorDate: Sun Aug 20 15:21:38 2023 +0100

    Fix regression in previous commit.
    
    * src/devices/gropdf/gropdf.pl: Revert change to line 2773.
    Fix for T1 fonts which use standard encoding.
    Accept '-' in glyph names in T1 fonts.
---
 src/devices/gropdf/gropdf.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index b0db086fd..37f13d20d 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -748,7 +748,7 @@ foreach my $fontno (sort keys %fontlst)
         ), $fobj=$objct if !($options & NOFILE);
 
         ($head,$body,$tail)=GetType1($fnt->{fontfile});
-        $head=~s/\/Encoding .*?readonly def\b/\/Encoding StandardEncoding 
def/s;
+        $head=~s/\/Encoding \d.*?readonly def\b/\/Encoding StandardEncoding 
def/s;
 
         if ($options & SUBSET)
         {
@@ -2770,7 +2770,7 @@ sub ParsePDFHash
             $wd=$w[0];
             unshift(@{$pdfwds},"<$w[1]") if defined($w[1]);
 
-            $rtn->{$wd}=(substr($pdfwds->[0],0,1) eq 
'/')?nextwd($pdfwds,1):ParsePDFValue($pdfwds);
+            $rtn->{$wd}=ParsePDFValue($pdfwds);
         }
     }
 
@@ -4599,7 +4599,7 @@ sub map_subrs
                 $sec{'#Pad'}=$j;
                 $stage=3;
             }
-            elsif ($lin=~m/^\s*\/([.\w]*)\s+(\d+)\s+RD (.*)/s)
+            elsif ($lin=~m/^\s*\/([-.\w]*)\s+(\d+)\s+RD (.*)/s)
             {
                 my $n=$1;
                 my $l=$2;