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

commit aa1e2c70eba3fe7adb6cbddbf74764abc21578d1
Author: Deri James <d...@chuzzlewit.myzen.co.uk>
AuthorDate: Fri Nov 24 16:02:00 2023 +0000

    Problem processing concatenated dit files (-Z)
    
    Normally it is safe to pass concatenated dit files to gropdf,
    typically this would be a separate source file which produces a
    custom cover and a different source for the body (different macro
    set?). Problem occurs if one of the dits uses the same fontno for
    a different font. Normally troff allocates TR to #5, but if one
    of the dits has been run with the flag "U-T" then U-TR is allocated
    to #5.
    
    * src/devices/gropdf/gropdf.pl: Check if "x font # name" has the
    same number AND name as a previously registered font, otherwise
    reload the font.
---
 src/devices/gropdf/gropdf.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 27a0964f0..45e35d931 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -3140,7 +3140,7 @@ sub LoadFont
     my $fontnm=shift;
     my $ofontnm=$fontnm;
 
-    return $fontlst{$fontno}->{OBJ} if (exists($fontlst{$fontno}));
+    return $fontlst{$fontno}->{OBJ} if (exists($fontlst{$fontno}) and $fontnm 
eq $fontlst{$fontno}->{FNT}->{name}) ;
 
     my $f;
     OpenFile(\$f,$fontdir,"$fontnm");

_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to