Improve EOT values

All composite glyphs were not drawn completely
Add a zoom on the glyphs view
Add $font->getWeight for OpenType and EOT

Author: PhenX

classes/Font_EOT.php

@@ -15,6 +15,14 @@
  * @package php-font-lib
  */
 class Font_EOT extends Font_TrueType {
+  const TTEMBED_SUBSET                   = 0x00000001;
+  const TTEMBED_TTCOMPRESSED             = 0x00000004;
+  const TTEMBED_FAILIFVARIATIONSIMULATED = 0x00000010;
+  const TTMBED_EMBEDEUDC                 = 0x00000020;
+  const TTEMBED_VALIDATIONTESTS          = 0x00000040; // Deprecated
+  const TTEMBED_WEBOBJECT                = 0x00000080;
+  const TTEMBED_XORENCRYPTDATA           = 0x10000000;
+
   /**
    * @var Font_EOT_Header
    */
@@ -32,7 +40,28 @@ function parseHeader(){
   function parse() {
     $this->parseHeader();
 
-    // TODO
+    $flags = $this->header->data["Flags"];
+
+    if ($flags & self::TTEMBED_TTCOMPRESSED) {
+      $mtx_version    = $this->readUInt8();
+      $mtx_copy_limit = $this->readUInt8() << 16 | $this->readUInt8() << 8 | $this->readUInt8();
+      $mtx_offset_1   = $this->readUInt8() << 16 | $this->readUInt8() << 8 | $this->readUInt8();
+      $mtx_offset_2   = $this->readUInt8() << 16 | $this->readUInt8() << 8 | $this->readUInt8();
+
+      /*
+      var_dump("$mtx_version $mtx_copy_limit $mtx_offset_1 $mtx_offset_2");
+
+      $pos = $this->pos();
+      $size = $mtx_offset_1 - $pos;
+      var_dump("pos: $pos");
+      var_dump("size: $size");*/
+    }
+
+    if ($flags & self::TTEMBED_XORENCRYPTDATA) {
+      // Process XOR
+    }
+
+    // TODO Read font data ...
   }
 
   /**
@@ -70,7 +99,7 @@ function getFontCopyright(){
    * @return string|null
    */
   function getFontName(){
-    return $this->header->data["FullName"];
+    return $this->header->data["FamilyName"];
   }
 
   /**
@@ -79,7 +108,7 @@ function getFontName(){
    * @return string|null
    */
   function getFontSubfamily(){
-    return $this->header->data["FamilyName"];
+    return $this->header->data["StyleName"];
   }
 
   /**
@@ -88,7 +117,7 @@ function getFontSubfamily(){
    * @return string|null
    */
   function getFontSubfamilyID(){
-    return $this->header->data["FamilyName"];
+    return $this->header->data["StyleName"];
   }
 
   /**
@@ -109,6 +138,15 @@ function getFontVersion(){
     return $this->header->data["VersionName"];
   }
 
+  /**
+   * Get font weight
+   *
+   * @return string|null
+   */
+  function getFontWeight(){
+    return $this->header->data["Weight"];
+  }
+
   /**
    * Get font Postscript name
    *

classes/Font_EOT_Header.php

@@ -16,14 +16,6 @@
  * @property Font_EOT $font
  */
 class Font_EOT_Header extends Font_Header {
-  const TTEMBED_SUBSET                   = 0x00000001;
-  const TTEMBED_TTCOMPRESSED             = 0x00000004;
-  const TTEMBED_FAILIFVARIATIONSIMULATED = 0x00000010;
-  const TTMBED_EMBEDEUDC                 = 0x00000020;
-  const TTEMBED_VALIDATIONTESTS          = 0x00000040; // Deprecated
-  const TTEMBED_WEBOBJECT                = 0x00000080;
-  const TTEMBED_XORENCRYPTDATA           = 0x10000000;
-
   protected $def = array(
     "format"        => self::uint32,
     "numTables"     => self::uint16,
@@ -102,21 +94,6 @@ public function parse(){
     if (!empty($this->data["RootString"])) {
       $this->data["RootString"] = explode("\0", $this->data["RootString"]);
     }
-
-    $flags = $this->data["Flags"];
-
-    if ($flags & self::TTEMBED_TTCOMPRESSED) {
-      $mtx_version    = $font->readUInt8();
-      $mtx_copy_limit = $font->readUInt8() << 16 | $font->readUInt8() << 8 | $font->readUInt8();
-      $mtx_offset_1   = $font->readUInt8() << 16 | $font->readUInt8() << 8 | $font->readUInt8();
-      $mtx_offset_2   = $font->readUInt8() << 16 | $font->readUInt8() << 8 | $font->readUInt8();
-    }
-
-    if ($flags & self::TTEMBED_XORENCRYPTDATA) {
-      // Process XOR
-    }
-
-    // TODO Read font data ...
   }
 
   private function readString($name) {

classes/Font_Glyph_Outline_Simple.php

@@ -255,6 +255,10 @@ public function getSVGContours($points = null){
     $path = "";
 
     if (!$points) {
+      if (empty($this->points)) {
+        $this->parseData();
+      }
+
       $points = $this->points;
     }
 

classes/Font_Table_glyf.php

@@ -76,12 +76,15 @@ public function toHTML(){
     $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>
+    Zoom: <input type='range' value='100' max='400' onchange='Glyph.resize(this.value)' />
     </h3>
     <script>
-      Glyph.ratio = $ratio; 
-      Glyph.head  = $head_json;
-      Glyph.os2   = $os2_json;
-      Glyph.hmtx  = $hmtx_json;
+      Glyph.ratio  = $ratio;
+      Glyph.head   = $head_json;
+      Glyph.os2    = $os2_json;
+      Glyph.hmtx   = $hmtx_json;
+      Glyph.width  = $width;
+      Glyph.height = $height;
     </script>";
 
     foreach($this->data as $g => $glyph) {
@@ -112,7 +115,7 @@ public function toHTML(){
               <br />
               <canvas width='$width' height='$height' id='glyph-$g'></canvas>
             </div>
-            <script>Glyph.draw(\$('#glyph-$g'), $shape_json, $g)</script>";
+            <script>Glyph.glyphs.push([$g,$shape_json]);</script>";
     }
 
     return $s;

classes/Font_TrueType.php

@@ -432,6 +432,15 @@ function getFontVersion(){
     return $this->getNameTableString(Font_Table_name::NAME_VERSION);
   }
 
+  /**
+   * Get font weight
+   *
+   * @return string|null
+   */
+  function getFontWeight(){
+    return $this->getTableObject("OS/2")->data["usWeightClass"];
+  }
+
   /**
    * Get font Postscript name
    *