Improve font handling

Author: PhenX

src/Svg/Style.php

@@ -63,7 +63,7 @@ protected function getStyleMap()
 
             'font-family'       => array('fontFamily', self::TYPE_NAME),
             'font-size'         => array('fontSize', self::TYPE_NUMBER),
-            'font-weight'       => array('fontWeight', self::TYPE_NUMBER),
+            'font-weight'       => array('fontWeight', self::TYPE_NAME),
             'font-style'        => array('fontStyle', self::TYPE_NAME),
             'text-anchor'       => array('textAnchor', self::TYPE_NAME),
         );

src/Svg/Surface/SurfaceCpdf.php

@@ -35,7 +35,7 @@ public function __construct(Document $doc, $canvas = null)
         if (!$canvas) {
             $canvas = new \CPdf\CPdf(array(0, 0, $w, $h));
             $refl = new \ReflectionClass($canvas);
-            $canvas->fontcache = dirname($refl->getFileName())."/../../fonts/";
+            $canvas->fontcache = realpath(dirname($refl->getFileName()) . "/../../fonts/")."/";
         }
 
         // Flip PDF coordinate system so that the origin is in
@@ -143,7 +143,7 @@ public function fillText($text, $x, $y, $maxWidth = null)
     public function strokeText($text, $x, $y, $maxWidth = null)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
-        // TODO: Implement drawImage() method.
+        $this->canvas->addText($x, $y, $this->style->fontSize, $text);
     }
 
     public function drawImage($image, $sx, $sy, $sw = null, $sh = null, $dx = null, $dy = null, $dw = null, $dh = null)
@@ -358,7 +358,7 @@ public function measureText($text)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
         $style = $this->getStyle();
-        $this->getFont($style->fontFamily, $style->fontStyle, $style->fontWeight);
+        $this->setFont($style->fontFamily, $style->fontStyle, $style->fontWeight);
 
         return $this->canvas->getTextWidth($this->getStyle()->fontSize, $text);
     }
@@ -422,11 +422,12 @@ public function setStyle(Style $style)
             $dashArray
         );
 
-        $this->getFont($style->fontFamily, $style->fontStyle, $style->fontWeight);
+        $this->setFont($style->fontFamily, $style->fontStyle, $style->fontWeight);
     }
 
-    private function getFont($family, $style, $weight)
+    public function setFont($family, $style, $weight)
     {
+        var_dump("$family.$style.$weight");
         $map = array(
             "serif"      => "Times",
             "sans-serif" => "Helvetica",
@@ -443,19 +444,17 @@ private function getFont($family, $style, $weight)
                 'b'  => 'Helvetica-Bold',
                 'i'  => 'Helvetica-Oblique',
                 'bi' => 'Helvetica-BoldOblique',
-                'ib' => 'Helvetica-BoldOblique'
             ),
             'Courier' => array(
                 'b'  => 'Courier-Bold',
                 'i'  => 'Courier-Oblique',
                 'bi' => 'Courier-BoldOblique',
-                'ib' => 'Courier-BoldOblique'
             ),
             'Times' => array(
+                ''   => 'Times-Roman',
                 'b'  => 'Times-Bold',
                 'i'  => 'Times-Italic',
                 'bi' => 'Times-BoldItalic',
-                'ib' => 'Times-BoldItalic'
             ),
         );
 
@@ -468,7 +467,7 @@ private function getFont($family, $style, $weight)
         }
 
         if (isset($styleMap[$family])) {
-            $key = "";
+            $key = "b";
 
             if ($weight === "bold" || $weight === "bolder" || (is_numeric($weight) && $weight >= 600)) {
                 $key .= "b";
@@ -478,7 +477,7 @@ private function getFont($family, $style, $weight)
                 $key .= "i";
             }
 
-            if ($key && isset($styleMap[$family][$key])) {
+            if (isset($styleMap[$family][$key])) {
                 $family = $styleMap[$family][$key];
             }
         }

src/Svg/Surface/SurfaceGmagick.php

@@ -2,7 +2,7 @@
 /**
  * @package php-svg-lib
  * @link    http://github.com/PhenX/php-svg-lib
- * @author  Fabien Ménager <[email protected]>
+ * @author  Fabien M�nager <[email protected]>
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
@@ -300,4 +300,9 @@ private function getFont($family, $style)
 
         return $this->canvas->load_font($family, "unicode", "fontstyle=$style");
     }
+
+    public function setFont($family, $style, $weight)
+    {
+        // TODO: Implement setFont() method.
+    }
 }

src/Svg/Surface/SurfaceInterface.php

@@ -2,7 +2,7 @@
 /**
  * @package php-svg-lib
  * @link    http://github.com/PhenX/php-svg-lib
- * @author  Fabien Ménager <[email protected]>
+ * @author  Fabien M�nager <[email protected]>
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
@@ -85,4 +85,6 @@ public function setStyle(Style $style);
      * @return Style
      */
     public function getStyle();
+
+    public function setFont($family, $style, $weight);
 }

src/Svg/Surface/SurfacePDFLib.php

@@ -2,7 +2,7 @@
 /**
  * @package php-svg-lib
  * @link    http://github.com/PhenX/php-svg-lib
- * @author  Fabien Ménager <[email protected]>
+ * @author  Fabien M�nager <[email protected]>
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
@@ -414,4 +414,9 @@ private function getFont($family, $style)
 
         return $this->canvas->load_font($family, "unicode", "fontstyle=$style");
     }
+
+    public function setFont($family, $style, $weight)
+    {
+        // TODO: Implement setFont() method.
+    }
 }

src/Svg/Tag/Text.php

@@ -35,8 +35,10 @@ public function end()
         $surface = $this->document->getSurface();
         $x = $this->x;
         $y = $this->y;
+        $style = $surface->getStyle();
+        $surface->setFont($style->fontFamily, $style->fontStyle, $style->fontWeight);
 
-        switch ($surface->getStyle()->textAnchor) {
+        switch ($style->textAnchor) {
             case "middle":
                 $width = $surface->measureText($this->text);
                 $x -= $width / 2;