Revert "Bundle with pre-built unicode fonts for performance improvemnt"

thinreports-php · Aug 27, 2015 · 911a7e7 · 911a7e7
1 parent 0f851a7
commit 911a7e7
Show file tree

Hide file tree

Showing 18 changed files with 90 additions and 69 deletions.
diff --git a/fonts/ipag.ctg.z b/fonts/ipag.ctg.z
diff --git a/fonts/ipag.php b/fonts/ipag.php
diff --git a/fonts/ipag.ttf b/fonts/ipag.ttf
diff --git a/fonts/ipag.z b/fonts/ipag.z
diff --git a/fonts/ipagp.ctg.z b/fonts/ipagp.ctg.z
diff --git a/fonts/ipagp.php b/fonts/ipagp.php
diff --git a/fonts/ipagp.ttf b/fonts/ipagp.ttf
diff --git a/fonts/ipagp.z b/fonts/ipagp.z
diff --git a/fonts/ipam.ctg.z b/fonts/ipam.ctg.z
diff --git a/fonts/ipam.php b/fonts/ipam.php
diff --git a/fonts/ipam.ttf b/fonts/ipam.ttf
diff --git a/fonts/ipam.z b/fonts/ipam.z
diff --git a/fonts/ipamp.ctg.z b/fonts/ipamp.ctg.z
diff --git a/fonts/ipamp.php b/fonts/ipamp.php
diff --git a/fonts/ipamp.ttf b/fonts/ipamp.ttf
diff --git a/fonts/ipamp.z b/fonts/ipamp.z
diff --git a/src/Thinreports/Generator/PDF/Font.php b/src/Thinreports/Generator/PDF/Font.php
@@ -14,11 +14,16 @@
  */
 class Font
 {
+    /**
+     * @var string[]
+     */
+    static public $installed_builtin_fonts = array();
+
     static public $builtin_unicode_fonts = array(
-        'IPAMincho'  => 'ipam',
-        'IPAPMincho' => 'ipamp',
-        'IPAGothic'  => 'ipag',
-        'IPAPGothic' => 'ipagp'
+        'IPAMincho'  => 'ipam.ttf',
+        'IPAPMincho' => 'ipamp.ttf',
+        'IPAGothic'  => 'ipag.ttf',
+        'IPAPGothic' => 'ipagp.ttf'
     );
 
     static public $builtin_font_aliases = array(
@@ -35,12 +40,51 @@ static public function getFontName($name)
         if (array_key_exists($name, self::$builtin_font_aliases)) {
             return self::$builtin_font_aliases[$name];
         }
-        if (self::isBuiltinUnicodeFont($name)) {
-            return self::$builtin_unicode_fonts[$name];
+
+        if (array_key_exists($name, self::$builtin_unicode_fonts)) {
+            if (self::isInstalledFont($name)) {
+                return static::$installed_builtin_fonts[$name];
+            } else {
+                return self::installBuiltinFont($name);
+            }
         }
         return $name;
     }
 
+    /**
+     * @param string $name
+     * @return string
+     * @see http://www.tcpdf.org/doc/code/classTCPDF__FONTS.html
+     */
+    static public function installBuiltinFont($name)
+    {
+        $filename = self::getBuiltinFontPath($name);
+
+        $font_name = \TCPDF_FONTS::addTTFFont($filename, 'TrueTypeUnicode', '', 32);
+        static::$installed_builtin_fonts[$name] = $font_name;
+
+        return $font_name;
+    }
+
+    /**
+     * @param string $name
+     * @return boolean
+     */
+    static public function isInstalledFont($name)
+    {
+        return array_key_exists($name, static::$installed_builtin_fonts);
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     */
+    static public function getBuiltinFontPath($name)
+    {
+        $font_directory = realpath(__DIR__ . '/../../../../fonts');
+        return $font_directory . '/' . self::$builtin_unicode_fonts[$name];
+    }
+
     /**
      * @param string $name
      * @return boolean

diff --git a/test/unit/Thinreports/Generator/PDF/FontTest.php b/test/unit/Thinreports/Generator/PDF/FontTest.php
@@ -5,17 +5,47 @@
 
 class FontTest extends TestCase
 {
+    function setup()
+    {
+        Font::$installed_builtin_fonts = array();
+    }
+
     function test_getFontName()
     {
         $this->assertEquals('Helvetica', Font::getFontName('Helvetica'));
 
         $this->assertEquals('Courier', Font::getFontName('Courier New'));
         $this->assertEquals('Times', Font::getFontName('Times New Roman'));
 
+        $this->assertFalse(Font::isInstalledFont('IPAMincho'));
+        $this->assertNotContains('ipam', Font::$installed_builtin_fonts);
+
         $this->assertEquals('ipam', Font::getFontName('IPAMincho'));
-        $this->assertEquals('ipamp', Font::getFontName('IPAPMincho'));
-        $this->assertEquals('ipag', Font::getFontName('IPAGothic'));
-        $this->assertEquals('ipagp', Font::getFontName('IPAPGothic'));
+
+        $this->assertTrue(Font::isInstalledFont('IPAMincho'));
+        $this->assertContains('ipam', Font::$installed_builtin_fonts);
+
+        $this->assertEquals('ipam', Font::getFontName('IPAMincho'));
+    }
+
+    /**
+     * @dataProvider unicodeFontProvider
+     */
+    function test_installBuiltinFont($expected_result, $font_name)
+    {
+        $actual = Font::installBuiltinFont($font_name);
+
+        $this->assertEquals($expected_result, $actual);
+        $this->assertContains($actual, Font::$installed_builtin_fonts);
+    }
+    function unicodeFontProvider()
+    {
+        return array(
+            array('ipam', 'IPAMincho'),
+            array('ipag', 'IPAGothic'),
+            array('ipamp', 'IPAPMincho'),
+            array('ipagp', 'IPAPGothic')
+        );
     }
 
     function test_isBuiltinUnicodeFont()
@@ -24,4 +54,11 @@ function test_isBuiltinUnicodeFont()
         $this->assertFalse(Font::isBuiltinUnicodeFont('Helvetica'));
         $this->assertTrue(Font::isBuiltinUnicodeFont('IPAGothic'));
     }
+
+    function test_isInstalledFont()
+    {
+        $this->assertFalse(Font::isInstalledFont('IPAMincho'));
+        Font::$installed_builtin_fonts['IPAMincho'] = 'ipam';
+        $this->assertTrue(Font::isInstalledFont('IPAMincho'));
+    }
 }