Fix composite glyph

Prior to this change, instructions from the glyf table instructing the font program how to render composite glyphs were not read from the font file. The lack of instructions caused incorrect rendering of the composite.

Additionally, the cvt, fpgm, and prep tables were missing from the generated font.

Author: ren1244

src/FontLib/Glyph/OutlineComposite.php

@@ -129,6 +129,11 @@ function parseData() {
 
       $this->components[] = $component;
     } while ($flags & self::MORE_COMPONENTS);
+    if ($flags & self::WE_HAVE_INSTRUCTIONS) {
+      $numInstr = $font->readUInt16();
+      $instr = $font->read($numInstr);
+      $this->components[count($this->components) - 1]->instructions = pack('n', $numInstr) . $instr;
+    }
   }
 
   function encode() {
@@ -171,6 +176,8 @@ function encode() {
 
       if ($_i < count($this->components) - 1) {
         $flags |= self::MORE_COMPONENTS;
+      } elseif($_component->instructions !== null) {
+        $flags |= self::WE_HAVE_INSTRUCTIONS;
       }
 
       $size += $font->writeUInt16($flags);
@@ -214,6 +221,10 @@ function encode() {
       }
     }
 
+    if($_component->instructions !== null) {
+      $size += $font->write($_component->instructions, strlen($_component->instructions));
+    }
+
     return $size;
   }
 

src/FontLib/Table/Type/cvt.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package php-font-lib
+ * @link    https://github.com/PhenX/php-font-lib
+ * @author  Fabien Ménager <fabien.menager@gmail.com>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace FontLib\Table\Type;
+use FontLib\Table\Table;
+
+/**
+ * `cvt ` font table.
+ *
+ * @package php-font-lib
+ */
+class cvt extends Table {
+  private $rawData;
+  protected function _parse() {
+    $font = $this->getFont();
+    $font->seek($this->entry->offset);
+    $this->rawData = $font->read($this->entry->length);
+  }
+  function _encode() {
+    return $this->getFont()->write($this->rawData, $this->entry->length);
+  }
+}

src/FontLib/Table/Type/fpgm.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package php-font-lib
+ * @link    https://github.com/PhenX/php-font-lib
+ * @author  Fabien Ménager <fabien.menager@gmail.com>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace FontLib\Table\Type;
+use FontLib\Table\Table;
+
+/**
+ * `fpgm` font table.
+ *
+ * @package php-font-lib
+ */
+class fpgm extends Table {
+  private $rawData;
+  protected function _parse() {
+    $font = $this->getFont();
+    $font->seek($this->entry->offset);
+    $this->rawData = $font->read($this->entry->length);
+  }
+  function _encode() {
+    return $this->getFont()->write($this->rawData, $this->entry->length);
+  }
+}

src/FontLib/Table/Type/prep.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @package php-font-lib
+ * @link    https://github.com/PhenX/php-font-lib
+ * @author  Fabien Ménager <fabien.menager@gmail.com>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace FontLib\Table\Type;
+
+use FontLib\Table\Table;
+
+/**
+ * `prep` font table.
+ *
+ * @package php-font-lib
+ */
+class prep extends Table
+{
+  private $rawData;
+  protected function _parse() {
+    $font = $this->getFont();
+    $font->seek($this->entry->offset);
+    $this->rawData = $font->read($this->entry->length);
+  }
+  function _encode() {
+    return $this->getFont()->write($this->rawData, $this->entry->length);
+  }
+}

src/FontLib/TrueType/File.php

@@ -217,13 +217,12 @@ function getSubset() {
 
   function encode($tags = array()) {
     if (!self::$raw) {
-      $tags = array_merge(array("head", "hhea", "cmap", "hmtx", "maxp", "glyf", "loca", "name", "post"), $tags);
+      $tags = array_merge(array("head", "hhea", "cmap", "hmtx", "maxp", "glyf", "loca", "name", "post", "cvt ", "fpgm", "prep"), $tags);
     }
     else {
       $tags = array_keys($this->directory);
     }
 
-    $num_tables = count($tags);
     $n          = 16; // @todo
 
     Font::d("Tables : " . implode(", ", $tags));
@@ -239,6 +238,8 @@ function encode($tags = array()) {
       $entries[$tag] = $this->directory[$tag];
     }
 
+    $num_tables = count($entries);
+
     $this->header->data["numTables"] = $num_tables;
     $this->header->encode();