Merge pull request #38 from Setasign/development

Prohibited the creation of subsets of unused font instances

Author: JanSlabon

src/Modules/Font.php

@@ -46,6 +46,13 @@ class Font
      */
     protected $fonts = [];
 
+    /**
+     * All font objects that were ever used by a `setFont()` call.
+     *
+     * @var array
+     */
+    protected $usedFonts = [];
+
 
     /**
      * The document module, to get the document instance.
@@ -147,6 +154,8 @@ public function set($family, $style, $size)
             }
             $this->fontState->fontSize = $size;
         }
+
+        $this->usedFonts[$fontKey] = $this->fonts[$fontKey];
     }
 
     /**
@@ -235,4 +244,12 @@ public function getFonts()
     {
         return $this->fonts;
     }
+
+    /**
+     * @return array
+     */
+    public function getUsedFonts()
+    {
+        return $this->usedFonts;
+    }
 }

src/SetaFpdf.php

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

tests/functional/SetaFpdf/OutputTest.php

@@ -56,6 +56,8 @@ public function testCompressedObjectStreams()
         $pdf->SetFont('DejaVuSans', 'B', 20);
         $pdf->Cell(0, 10, 'TESTING FONT SUBSETTING');
 
+        $pdf->AddFont('DejaVuSans', '', __DIR__ . '/../../../assets/fonts/DejaVu/DejaVuSans.ttf');
+
         $document = $pdf->getManager()->getDocument()->get();
         $compressor = new ObjectStreamCompressor($document);
         $compressor->register();