Merge pull request #40 from Setasign/development

Fixed #39 usage of subset fonts in footer

Author: MaximilianKresse

src/Modules/Document.php

@@ -13,6 +13,7 @@
 use setasign\SetaFpdf\Position\Converter;
 use setasign\SetaFpdf\SetaFpdf;
 use setasign\SetaFpdf\StateBuffer\StateBufferInterface;
+use setasign\SetaPDF2\Core\Font\TrueType\Subset;
 
 class Document implements StateBufferInterface
 {
@@ -489,6 +490,12 @@ public function output($destination, $name, ?array $displayMode = null)
             \call_user_func($this->footerCallable);
             $this->pageBreakDisabled = false;
 
+            foreach ($this->manager->getFont()->getUsedFonts() as $font) {
+                if ($font instanceof Subset) {
+                    $font->createSubset();
+                }
+            }
+
             self::applyDisplayMode($this->document, $displayMode);
             $info = $this->document->getInfo();
             $info->setProducer('SetaFPDF ' . SetaFpdf::VERSION);

src/SetaFpdf.php

@@ -460,12 +460,6 @@ public function Output($dest = '', $name = '')
             $name = 'doc.pdf';
         }
 
-        foreach ($this->manager->getFont()->getUsedFonts() as $font) {
-            if ($font instanceof Subset) {
-                $font->createSubset();
-            }
-        }
-
         return $this->manager->getDocument()->output($dest, $name, $this->displayMode);
     }
 

tests/visual/SetaFpdf/Special/FooterTest.php

@@ -2,6 +2,7 @@
 
 namespace setasign\tests\visual\SetaFpdf\Special;
 
+use setasign\SetaFpdf\SetaFpdf;
 use setasign\tests\TestProxy;
 use setasign\tests\visual\SetaFpdf\Special\Footer\FPDFCustom;
 use setasign\tests\visual\SetaFpdf\Special\Footer\SetaFpdfCustom;
@@ -38,4 +39,28 @@ public function testSpecialFooter()
 
         $this->assertProxySame($proxy, 0.4, self::DPI);
     }
+
+    public function testFooterWithCustomFont()
+    {
+        $setaFpdf = new class extends SetaFpdf {
+            public function Footer()
+            {
+                $this->SetY(-15);
+                $this->Cell(0, 10, 'This is a footer');
+            }
+        };
+
+        $setaFpdf->AddPage();
+        $setaFpdf->AddFont('DejaVuSans','', __DIR__ . '/../../../../assets/fonts/DejaVu/DejaVuSans.ttf');
+        $setaFpdf->SetFont('DejaVuSans', '', 12);
+        $setaFpdf->Cell(0, 10, 'Hello World');
+
+        $testFile = __DIR__ . '/FooterWithCustomFontActualResult.pdf';
+        $setaFpdf->Output('F', $testFile);
+        $this->assertPdfsEqual([
+            __DIR__ . '/FooterWithCustomFontExpectedResult.pdf',
+            $testFile
+        ], self::DPI, 1, false);
+        \unlink($testFile);
+    }
 }