[groff] 05/05: Fixup and start on text decorations.

[Deri James]

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

commit a2b5541142a1571e9f9f5a8321c1e21c721469aa
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
AuthorDate: Wed Sep 6 22:48:27 2023 +0100

    Fixup and start on text decorations.
---
 src/devices/gropdf/gropdf.1.man | 7 ++++---
 src/devices/gropdf/gropdf.pl    | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.1.man
index 23a9dd7dd..cc80367bc 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -393,8 +393,9 @@ is the foundry name or blank for the default foundry.
 is the PostScript name of the font,
 and
 .I filename
-is the name of the file containing the font;
-lines beginning with
+is the name of the file containing the font.
+It can also contain a pathname to the font.
+Any lines beginning with
 .B #
 and blank lines are ignored;
 fields must be separated by tabs
@@ -405,7 +406,7 @@ allowed);
 is searched for using the same mechanism that is used
 for
 .I groff
-font metric files.
+font metric files, unless a path is also present.
 .
 The
 .I download
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 2d7b6feda..27a0964f0 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -35,6 +35,8 @@ use constant
     MINOR               => 3,
     MAJOR               => 4,
     UNICODE             => 5,
+    RST                 => 6,
+    RSB                 => 7,
 
     CHR                 => 0,
     XPOS                => 1,
@@ -3204,7 +3206,7 @@ sub LoadFont
             $r[0]='u0020' if $r[3] == 32;
             $r[0]="u00".hex($r[3]) if $r[0] eq '---';
             $r[4]=$r[0] if !defined($r[4]);
-            $fnt{NAM}->{$r[0]}=[$p[0],$r[3],'/'.$r[4],undef,undef,$r[5]];
+            
$fnt{NAM}->{$r[0]}=[$p[0],$r[3],'/'.$r[4],undef,undef,$r[5],$p[1]||0,$p[2]||0];
             $fnt{NO}->[$r[3]]=$r[0];
             $lastnm=$r[0];
             $lastchr=$r[3] if $r[3] > $lastchr;
@@ -3232,7 +3234,7 @@ sub LoadFont
     $fnt{ascent}=$ascent;
     $fnt{capheight}=$capheight;
     $fnt{lastchr}=$lastchr;
-    $fnt{NAM}->{''}=[0,-1,'/.notdef',-1,0];
+    $fnt{NAM}->{''}=[0,-1,'/.notdef',-1,0,0,0];
     $slant=-$fnt{'slant'} if exists($fnt{'slant'});
     $fnt{slant}=$slant;
     $fnt{nospace}=(!defined($fnt{NAM}->{u0020}->[PSNAME]) or 
$fnt{NAM}->{u0020}->[PSNAME] ne '/space' or !exists($fnt{'spacewidth'}))?1:0;