Fix #8052 - fixing pdf

[pear] / XML / SvgToPdf / Text.php

diff --git a/XML/SvgToPdf/Text.php b/XML/SvgToPdf/Text.php
index 0131c24..d107f65 100644 (file)
--- a/XML/SvgToPdf/Text.php
+++ b/XML/SvgToPdf/Text.php
@@ -4,12 +4,21 @@
 class XML_SvgToPDF_Text  extends XML_SvgToPDF_Base { 
 
        var $linespacing;
-       
+       var $xx;
+       var $yy;        
 
     function fromXmlNode($node) {
         
         parent::fromXmlNode($node);
+               $this->parse();
+       }
+       function fromNode($node) {
         
+        parent::fromNode($node);
+               $this->parse();
+       }
+       function parse()
+       {
         // any text ???
         if (empty($this->children) || empty($this->children[0]->content)) {
             return;
@@ -56,8 +65,10 @@ class XML_SvgToPDF_Text  extends XML_SvgToPDF_Base {
         }
         $ffont = $font;
         if (preg_match('/big5/i',$this->style['font-family'])) {
-            $ffont = 'ARIALUNI';
-            $font = 'arial'; // default if not big4
+            $font = 'Big5';
+
+                       //$ffont = 'ARIALUNI';
+           // $font = 'arial'; // default if not bigg
         }
             
         
@@ -121,13 +132,16 @@ class XML_SvgToPDF_Text  extends XML_SvgToPDF_Base {
         
             $xx = $c->x !== false ? $c->x + @$this->xx : $x;
             $yy = $c->y !== false ? $c->y + @$this->yy : $y + ($lineno * $size * 1.3);
-            $lineno++;              
+            $lineno++;
+                       if (empty($c->content)) {
+                               //print_R($c);exit;
+                       }
             $val = $c->content;
-            if ($ffont == 'ARIALUNI') { //) && preg_match('/[\x7f-\xff]+/',$val)) {
-                $pdf->setFont('ARIALUNI' ,
-                            $weight,
-                            $size);
-            }
+            //if ($ffont == 'ARIALUNI') { //) && preg_match('/[\x7f-\xff]+/',$val)) {
+             //   $pdf->setFont('ARIALUNI' ,
+             //               $weight,
+             //               $size);
+            //}
             if (isset($c->args)) {
                 
                 $args = array();
@@ -148,24 +162,25 @@ class XML_SvgToPDF_Text  extends XML_SvgToPDF_Base {
                 
                 $has_template = preg_match('/%s/', $val);
                      
-                $val = trim(vsprintf($val,$args));
+                $val = empty($val) || empty($args) ? $val : trim(vsprintf($val,$args));
                 
-                if ($has_template && ($ffont == 'ARIALUNI') && preg_match('/[\x7f-\xff]+/',$val)) {
-                    //require_once  'Text/ZhDetect.php';
-                    //$detect = new Text_zhDetect;
-                    //$type = $detect->guess($val);
-                    //if ($v == 'S') {
-                       
-                    //    $val = @iconv('utf8', 'GB2312//IGNORE', $val);
-                    //    $pdf->setFont('GB' ,
-                    //        $weight,
-                    //        $size);
-                    //} else {
-//                        $val = @iconv('utf8', 'BIG5//IGNORE', $val);
-                        $pdf->setFont('ARIALUNI' ,
+                //if ($has_template && ($ffont == 'ARIALUNI') && preg_match('/[\x7f-\xff]+/',$val)) {
+                               if ($has_template && ($font == 'Big5') && preg_match('/[\x7f-\xff]+/',$val)) {
+                    require_once  'Text/ZhDetect.php';
+                    $detect = new Text_zhDetect;
+                    $type = $detect->guess($val);
+                    if ($v == 'S') {
+                     
+                        $val = @iconv('utf8', 'GB2312//IGNORE', $val);
+                        $pdf->setFont('GB' ,
+                            $weight,
+                            $size);
+                    } else {
+                        $val = @iconv('utf8', 'BIG5//IGNORE', $val);
+                        $pdf->setFont('Big5' ,
                             $weight,
                             $size);
-                   //}
+                   }
                 }  else {
                     $val = @iconv('utf8','ascii//ignore',$val);
                 }