[groff] 01/01: * src/devices/gropdf/gropdf.pl: Was not handling the final glyph correctly in the "standard" fonts which are not embedded. They actually have 257 glyphs (0-256) not 256 as I'd assumed, so the remappiing code needs to be applied for them as well as the embedded downloadable fonts.

[Deri James]

deri pushed a commit to branch master
in repository groff.

commit 96b1a1b0c9840f5922baf3e6e9f28f1dea6e3dc6
Author: Deri James <address@hidden>
Date:   Wed Mar 11 17:09:55 2015 +0000

    * src/devices/gropdf/gropdf.pl: Was not handling the final glyph
    correctly in the "standard" fonts which are not embedded. They
    actually have 257 glyphs (0-256) not 256 as I'd assumed, so the
    remappiing code needs to be applied for them as well as the
    embedded downloadable fonts.
---
 ChangeLog                    |    8 ++++++++
 src/devices/gropdf/gropdf.pl |   21 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc10c5e..a12dbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2015-03-11  Deri James <address@hidden>
 
+       * src/devices/gropdf/gropdf.pl: Was not handling the final glyph
+       correctly in the "standard" fonts which are not embedded. They
+       actually have 257 glyphs (0-256) not 256 as I'd assumed, so the 
+       remappiing code needs to be applied for them as well as the 
+       embedded downloadable fonts.
+
+2015-03-11  Deri James <address@hidden>
+
        * src/devices/gropdf/gropdf.pl: Fix problem remappiing 
        ellipsis (affects all glyphs > 255).
 
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 5725e57..8103914 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -2124,14 +2124,31 @@ sub LoadFont
                        {'Type' => '/Font',
                        'Subtype' => '/Type1',
                        'BaseFont' => '/'.$fnt{internalname},
+                       'Widths' => $fnt{WID},
+                       'FirstChar' => 0,
+                       'LastChar' => $lastchr,
                        'Encoding' => BuildObj($objct+1,
                                    {'Type' => '/Encoding',
                                    'Differences' => $fnt{GNO}
                                    }
-                                   )
+                                   ),
+                       'FontDescriptor' => BuildObj($objct+2,
+                                       {'Type' => '/FontDescriptor',
+                                       'FontName' => '/'.$fnt{internalname},
+                                       'Flags' => $t1flags,
+                                       'FontBBox' => address@hidden,
+                                       'ItalicAngle' => $slant,
+                                       'Ascent' => $ascent,
+                                       'Descent' => $fntbbox[1],
+                                       'CapHeight' => $capheight,
+                                       'StemV' => 0,
+                                       'CharSet' => "($charset)",
+                                       }
+                                       )
                        }
                        );
-       $objct+=1;
+
+       $objct+=2;
        $fontlst{$fontno}->{NM}='/F'.$fontno;
        $pages->{'Resources'}->{'Font'}->{'F'.$fontno}=$fontlst{$fontno}->{OBJ};
        $fontlst{$fontno}->{FNT}=\%fnt;