Composite of composite glyphs were not included in subsetted fonts

Author: PhenX

classes/Font_Glyph_Outline.php

@@ -12,25 +12,25 @@
 
 /**
  * `glyf` font table.
- * 
+ *
  * @package php-font-lib
  */
 class Font_Glyph_Outline extends Font_Binary_Stream {
   /**
    * @var Font_Table_glyf
    */
   protected $table;
-  
+
   protected $offset;
   protected $size;
-  
+
   // Data
   public $numberOfContours;
   public $xMin;
   public $yMin;
   public $xMax;
   public $yMax;
-  
+
   public $raw;
 
   /**
@@ -43,7 +43,7 @@ class Font_Glyph_Outline extends Font_Binary_Stream {
   static function init(Font_Table_glyf $table, $offset, $size) {
     $font = $table->getFont();
     $font->seek($offset);
-    
+
     if ($font->readInt16() > -1) {
       /** @var Font_Glyph_Outline_Simple $glyph */
       $glyph = new Font_Glyph_Outline_Simple($table, $offset, $size);
@@ -52,35 +52,35 @@ static function init(Font_Table_glyf $table, $offset, $size) {
       /** @var Font_Glyph_Outline_Composite $glyph */
       $glyph = new Font_Glyph_Outline_Composite($table, $offset, $size);
     }
-    
+
     $glyph->parse();
     return $glyph;
   }
-  
+
   /**
    * @return Font_TrueType
    */
   function getFont() {
     return $this->table->getFont();
   }
-  
+
   function __construct(Font_Table_glyf $table, $offset = null, $size = null) {
     $this->table  = $table;
     $this->offset = $offset;
     $this->size   = $size;
   }
-  
+
   function parse() {
     $font = $this->getFont();
     $font->seek($this->offset);
-  
+
     if (!$this->size) {
       return;
     }
-    
+
     $this->raw = $font->read($this->size);
   }
-  
+
   function parseData(){
     $font = $this->getFont();
     $font->seek($this->offset);
@@ -102,6 +102,6 @@ function getSVGContours() {
   }
 
   function getGlyphIDs(){
-    // Inherit
+    return array();
   }
 }

classes/Font_Glyph_Outline_Composite.php

@@ -11,7 +11,7 @@
 
 /**
  * Composite glyph outline
- * 
+ *
  * @package php-font-lib
  */
 class Font_Glyph_Outline_Composite extends Font_Glyph_Outline {
@@ -39,6 +39,11 @@ function getGlyphIDs(){
     $glyphIDs = array();
     foreach ($this->components as $_component) {
       $glyphIDs[] = $_component->glyphIndex;
+
+      $_glyph = $this->table->data[$_component->glyphIndex];
+      if ($_glyph instanceof Font_Glyph_Outline_Composite) {
+        $glyphIDs = array_merge($glyphIDs, $_glyph->getGlyphIDs());
+      }
     }
 
     return $glyphIDs;
@@ -47,7 +52,7 @@ function getGlyphIDs(){
   /*function parse() {
     //$this->parseData();
   }*/
-  
+
   function parseData(){
     parent::parseData();
 

classes/Font_Table_glyf.php

@@ -10,69 +10,68 @@
 
 /**
  * `glyf` font table.
- * 
+ *
  * @package php-font-lib
  * @property Font_Glyph_Outline[] $data
  */
 class Font_Table_glyf extends Font_Table {
   protected function _parse(){
     $font = $this->getFont();
     $offset = $font->pos();
-    
+
     $loca = $font->getData("loca");
     $real_loca = array_slice($loca, 0, -1); // Not the last dummy loca entry
-    
+
     $data = array();
-    
+
     foreach($real_loca as $gid => $location) {
       $_offset = $offset + $loca[$gid];
       $_size   = $loca[$gid+1] - $loca[$gid];
       $data[$gid] = Font_Glyph_Outline::init($this, $_offset, $_size);
     }
-    
+
     $this->data = $data;
   }
 
   public function getGlyphIDs($gids = array()){
     $glyphIDs = array();
 
-    foreach ($this->data as $_gid => $_glyph) {
-      if (in_array($_gid, $gids) && $_glyph instanceof Font_Glyph_Outline_Composite) {
-        $glyphIDs = array_merge($glyphIDs, $_glyph->getGlyphIDs());
-      }
+    foreach ($gids as $_gid) {
+      $_glyph = $this->data[$_gid];
+      $glyphIDs = array_merge($glyphIDs, $_glyph->getGlyphIDs());
     }
 
     return array_unique(array_merge($gids, $glyphIDs));
   }
-    
+
   public function toHTML(){
     $max = 160;
     $font = $this->getFont();
-    
+
     $head = $font->getData("head");
     $head_json = json_encode($head);
-    
+
     $os2 = $font->getData("OS/2");
     $os2_json  = json_encode($os2);
-    
+
     $hmtx = $font->getData("hmtx");
     $hmtx_json = json_encode($hmtx);
-      
+
     $names = $font->getData("post", "names");
     $glyphIndexArray = array_flip($font->getUnicodeCharMap());
-    
+
     $width  = (abs($head["xMin"]) + $head["xMax"]);
     $height = (abs($head["yMin"]) + $head["yMax"]);
-    
+
     $ratio = 1;
     if ($width > $max || $height > $max) {
       $ratio = max($width, $height) / $max;
       $width  = round($width/$ratio);
       $height = round($height/$ratio);
     }
-    
+
     $n = 500;
-    
+
     $s = "<h3>"."Only the first $n simple glyphs are shown (".count($this->data)." total)
     <div class='glyph-view simple'>Simple glyph</div>
     <div class='glyph-view composite'>Composite glyph</div>
@@ -86,14 +85,14 @@ public function toHTML(){
       Glyph.width  = $width;
       Glyph.height = $height;
     </script>";
-    
+
     foreach($this->data as $g => $glyph) {
       if ($n-- <= 0) {
         break;
       }
 
       $glyph->parseData();
-      
+
       $shape = array(
         "SVGContours" => $glyph->getSVGContours(),
         "xMin" => $glyph->xMin,
@@ -107,7 +106,7 @@ public function toHTML(){
       $char = isset($glyphIndexArray[$g]) ? $glyphIndexArray[$g] : 0;
       $name = isset($names[$g]) ? $names[$g] : sprintf("uni%04x", $char);
       $char = $char ? "&#{$glyphIndexArray[$g]};" : "";
-      
+
       $s .= "<div class='glyph-view $type' id='glyph-$g'>
               <span class='glyph-id'>$g</span> 
               <span class='char'>$char</span>
@@ -125,27 +124,27 @@ public function toHTML(){
             </div>
             <script>Glyph.glyphs.push([$g,$shape_json]);</script>";
     }
-    
+
     return $s;
   }
-  
-  
+
+
   protected function _encode() {
     $font = $this->getFont();
     $subset = $font->getSubset();
     $data = $this->data;
-    
+
     $loca = array();
-    
+
     $length = 0;
     foreach($subset as $gid) {
       $loca[] = $length;
       $length += $data[$gid]->encode();
     }
-    
+
     $loca[] = $length; // dummy loca
     $font->getTableObject("loca")->data = $loca;
-    
+
     return $length;
   }
 }