joenilson / residentes

extras/residentes_pdf.php

Spacing +21 added lines, -21 removed lines

@@ -62,81 +62,81 @@
                     if (imagepng(imagecreatefromstring(file_get_contents($this->logo)), FS_MYDOCS
                         . 'images/logo.png')) {
                         $this->pdf->addPngFromFile(
-                            FS_MYDOCS . 'images/logo.png',
+                            FS_MYDOCS.'images/logo.png',
                             self::LOGO_X,
                             self::LOGO_Y,
                             $tamanyo[0],
                             $tamanyo[1]
                         );
-                    } else {
+                    }else {
                         $this->pdf->addJpegFromFile($this->logo, self::LOGO_X, self::LOGO_Y, $tamanyo[0], $tamanyo[1]);
                     }
-                } else {
+                }else {
                     $this->pdf->addJpegFromFile($this->logo, self::LOGO_X, self::LOGO_Y, $tamanyo[0], $tamanyo[1]);
                 }
 
                 $this->pdf->ez['rightMargin'] = 40;
                 $this->pdf->ezText(
-                    "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                    "<b>".fs_fix_html($empresa->nombre)."</b>",
                     12,
                     array('justification' => 'right')
                 );
-                $this->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'right'));
+                $this->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'right'));
 
-                $direccion = $empresa->direccion . "\n";
+                $direccion = $empresa->direccion."\n";
                 if ($empresa->apartado) {
-                    $direccion .= ucfirst(FS_APARTADO) . ': ' . $empresa->apartado . ' - ';
+                    $direccion .= ucfirst(FS_APARTADO).': '.$empresa->apartado.' - ';
                 }
 
                 if ($empresa->codpostal) {
-                    $direccion .= 'CP: ' . $empresa->codpostal . ' - ';
+                    $direccion .= 'CP: '.$empresa->codpostal.' - ';
                 }
 
                 if ($empresa->ciudad) {
-                    $direccion .= $empresa->ciudad . ' - ';
+                    $direccion .= $empresa->ciudad.' - ';
                 }
 
                 if ($empresa->provincia) {
-                    $direccion .= '(' . $empresa->provincia . ')';
+                    $direccion .= '('.$empresa->provincia.')';
                 }
 
                 if ($empresa->telefono) {
-                    $direccion .= "\nTeléfono: " . $empresa->telefono;
+                    $direccion .= "\nTeléfono: ".$empresa->telefono;
                 }
 
-                $this->pdf->ezText(fs_fix_html($direccion) . "\n", 8, array('justification' => 'right'));
+                $this->pdf->ezText(fs_fix_html($direccion)."\n", 8, array('justification' => 'right'));
                 $this->set_y(self::LOGO_Y + 10);
-            } else {
+            }else {
                 die('ERROR: no se encuentra la función imagecreatefromstring(). '
                     . 'Y por tanto no se puede usar el logotipo en los documentos.');
             }
-        } else {
+        }else {
             $this->pdf->ezText(
-                "<b>" . fs_fix_html($empresa->nombre) . "</b>",
+                "<b>".fs_fix_html($empresa->nombre)."</b>",
                 12,
                 array('justification' => 'center')
             );
-            $this->pdf->ezText(FS_CIFNIF . ": " . $empresa->cifnif, 8, array('justification' => 'center'));
+            $this->pdf->ezText(FS_CIFNIF.": ".$empresa->cifnif, 8, array('justification' => 'center'));
 
             $direccion = $empresa->direccion;
             if ($empresa->apartado) {
-                $direccion .= ' - ' . ucfirst(FS_APARTADO) . ': ' . $empresa->apartado;
+                $direccion .= ' - '.ucfirst(FS_APARTADO).': '.$empresa->apartado;
             }
 
             if ($empresa->codpostal) {
-                $direccion .= ' - CP: ' . $empresa->codpostal;
+                $direccion .= ' - CP: '.$empresa->codpostal;
             }
 
             if ($empresa->ciudad) {
-                $direccion .= ' - ' . $empresa->ciudad;
+                $direccion .= ' - '.$empresa->ciudad;
             }
 
             if ($empresa->provincia) {
-                $direccion .= ' (' . $empresa->provincia . ')';
+                $direccion .= ' ('.$empresa->provincia.')';
             }
 
             if ($empresa->telefono) {
-                $direccion .= ' - Teléfono: ' . $empresa->telefono;
+                $direccion .= ' - Teléfono: '.$empresa->telefono;
             }
 
             $this->pdf->ezText(fs_fix_html($direccion), 8, array('justification' => 'center'));

extras/fpdf183/exfpdf.php

Indentation +289 added lines, -289 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*********************************************************************
+    /*********************************************************************
  * exFPDF  extend FPDF v1.81                                                    *
  *                                                                    *
  * Version: 2.2                                                       *
@@ -7,378 +7,378 @@ 
  * Author:  Dan Machado                                               *
  * Require  FPDF v1.81, formatedstring v1.0                                                *
  **********************************************************************/
- include 'formatedstring.php';
- class exFPDF extends FPDF
- {
+    include 'formatedstring.php';
+    class exFPDF extends FPDF
+    {
     public function PageBreak(){
-       return $this->PageBreakTrigger;
-   }
+        return $this->PageBreakTrigger;
+    }
 
-   public function current_font($c){
-      if($c=='family'){
-         return $this->FontFamily;
-      }
-      elseif($c=='style'){
-         return $this->FontStyle;
-      }
-      elseif($c=='size'){
-         return $this->FontSizePt;
-      }
-   }
+    public function current_font($c){
+        if($c=='family'){
+            return $this->FontFamily;
+        }
+        elseif($c=='style'){
+            return $this->FontStyle;
+        }
+        elseif($c=='size'){
+            return $this->FontSizePt;
+        }
+    }
 
-   public function get_color($c){
-      if($c=='fill'){
-         return $this->FillColor;
-      }
-      elseif($c=='text'){
-         return $this->TextColor;
-      }
-   }
+    public function get_color($c){
+        if($c=='fill'){
+            return $this->FillColor;
+        }
+        elseif($c=='text'){
+            return $this->TextColor;
+        }
+    }
 
-   public function get_page_width(){
-      return $this->w;
-   }
+    public function get_page_width(){
+        return $this->w;
+    }
 
-   public function get_margin($c){
-      if($c=='l'){
-         return $this->lMargin;
-      }
-      elseif($c=='r'){
-         return $this->rMargin;
-      }
-      elseif($c=='t'){
-         return $this->tMargin;
-      }
-   }
+    public function get_margin($c){
+        if($c=='l'){
+            return $this->lMargin;
+        }
+        elseif($c=='r'){
+            return $this->rMargin;
+        }
+        elseif($c=='t'){
+            return $this->tMargin;
+        }
+    }
 
-   public function get_linewidth(){
-      return $this->LineWidth;
-   }
+    public function get_linewidth(){
+        return $this->LineWidth;
+    }
 
-   public function get_orientation(){
-      return $this->CurOrientation;
-   }
-   static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
-   'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
+    public function get_orientation(){
+        return $this->CurOrientation;
+    }
+    static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
+    'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
 
-   public function is_rgb($str){
-      $a=true;
-      $tmp=explode(',', trim($str, ','));
-      foreach($tmp as $color){
-         if(!is_numeric($color) || $color<0 || $color>255){
+    public function is_rgb($str){
+        $a=true;
+        $tmp=explode(',', trim($str, ','));
+        foreach($tmp as $color){
+            if(!is_numeric($color) || $color<0 || $color>255){
             $a=false;
             break;
-         }
-      }
-      return $a;
-   }
+            }
+        }
+        return $a;
+    }
 
-   public function is_hex($str){
-      $a=true;
-      $str=strtoupper($str);
-      $n=strlen($str);
-      if(($n==7 || $n==4) && $str[0]=='#'){
-         for($i=1; $i<$n; $i++){
+    public function is_hex($str){
+        $a=true;
+        $str=strtoupper($str);
+        $n=strlen($str);
+        if(($n==7 || $n==4) && $str[0]=='#'){
+            for($i=1; $i<$n; $i++){
             if(!isset(self::$hex[$str[$i]])){
-               $a=false;
-               break;
+                $a=false;
+                break;
+            }
             }
-         }
-      }
-      else{
-         $a=false;
-      }
-      return $a;
-   }
+        }
+        else{
+            $a=false;
+        }
+        return $a;
+    }
 
-   public function hextodec($str){
-      $result=array();
-      $str=strtoupper(substr($str,1));
-      $n=strlen($str);
-      for($i=0; $i<3; $i++){
-         if($n==6){
+    public function hextodec($str){
+        $result=array();
+        $str=strtoupper(substr($str,1));
+        $n=strlen($str);
+        for($i=0; $i<3; $i++){
+            if($n==6){
             $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
-         }
-         else{
+            }
+            else{
             $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
-         }
-      }
-      return $result;
-   }
-   static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
+            }
+        }
+        return $result;
+    }
+    static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
 
-   public function resetColor($str, $p='F'){
-      if(isset(self::$options[$p]) && self::$options[$p]!=$str){
-         self::$options[$p]=$str;
-         $array=array();
-         if($this->is_hex($str)){
+    public function resetColor($str, $p='F'){
+        if(isset(self::$options[$p]) && self::$options[$p]!=$str){
+            self::$options[$p]=$str;
+            $array=array();
+            if($this->is_hex($str)){
             $array=$this->hextodec($str);
-         }
-         elseif($this->is_rgb($str)){
+            }
+            elseif($this->is_rgb($str)){
             $array=explode(',', trim($str, ','));
             for($i=0; $i<3; $i++){
-               if(!isset($array[$i])){
-                  $array[$i]=0;
-               }
+                if(!isset($array[$i])){
+                    $array[$i]=0;
+                }
+            }
             }
-         }
-         else{
+            else{
             $array=array(null, null, null);
             $i=0;
             $tmp=explode(' ', $str);
             foreach($tmp as $c){
-               if(is_numeric($c)){
-                  $array[$i]=$c*256;
-                  $i++;
-               }
+                if(is_numeric($c)){
+                    $array[$i]=$c*256;
+                    $i++;
+                }
             }
-         }
-         if($p=='T'){
+            }
+            if($p=='T'){
             $this->SetTextColor($array[0],$array[1],$array[2]);
-         }
-         elseif($p=='D'){
+            }
+            elseif($p=='D'){
             $this->SetDrawColor($array[0],$array[1], $array[2]);
-         }
-         elseif($p=='F'){
+            }
+            elseif($p=='F'){
             $this->SetFillColor($array[0],$array[1],$array[2]);
-         }
-      }
-   }
-   static private $font_def='';
+            }
+        }
+    }
+    static private $font_def='';
 
-   public function resetFont($font_family, $font_style, $font_size){
-      if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
-         self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
-         $this->SetFont($font_family, $font_style, $font_size);
-      }
-   }
+    public function resetFont($font_family, $font_style, $font_size){
+        if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
+            self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
+            $this->SetFont($font_family, $font_style, $font_size);
+        }
+    }
 
-   public function resetStaticData(){
-      self::$font_def='';
-      self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
-   }
-   /***********************************************************************
+    public function resetStaticData(){
+        self::$font_def='';
+        self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
+    }
+    /***********************************************************************
    *
    * Based on FPDF method SetFont
    *
    ************************************************************************/
 
-   private function &FontData($family, $style, $size){
-      if($family=='')
-      $family = $this->FontFamily;
-      else
-      $family = strtolower($family);
-      $style = strtoupper($style);
-      if(strpos($style,'U')!==false){
-         $this->underline = true;
-         $style = str_replace('U','',$style);
-      }
-      if($style=='IB')
-      $style = 'BI';
-      $fontkey = $family.$style;
-      if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
-         $family = 'helvetica';
-         if(in_array($family,$this->CoreFonts)){
+    private function &FontData($family, $style, $size){
+        if($family=='')
+        $family = $this->FontFamily;
+        else
+        $family = strtolower($family);
+        $style = strtoupper($style);
+        if(strpos($style,'U')!==false){
+            $this->underline = true;
+            $style = str_replace('U','',$style);
+        }
+        if($style=='IB')
+        $style = 'BI';
+        $fontkey = $family.$style;
+        if(!isset($this->fonts[$fontkey])){
+            if($family=='arial')
+            $family = 'helvetica';
+            if(in_array($family,$this->CoreFonts)){
             if($family=='symbol' || $family=='zapfdingbats')
             $style = '';
             $fontkey = $family.$style;
             if(!isset($this->fonts[$fontkey]))
             $this->AddFont($family,$style);
-         }
-         else
-         $this->Error('Undefined font: '.$family.' '.$style);
-      }
-      $result['FontSize'] = $size/$this->k;
-      $result['CurrentFont']=&$this->fonts[$fontkey];
-      return $result;
-   }
+            }
+            else
+            $this->Error('Undefined font: '.$family.' '.$style);
+        }
+        $result['FontSize'] = $size/$this->k;
+        $result['CurrentFont']=&$this->fonts[$fontkey];
+        return $result;
+    }
     
 
-   private function setLines(&$fstring, $p, $q){
-      $parced_str=& $fstring->parced_str;
-      $lines=& $fstring->lines;
-      $linesmap=& $fstring->linesmap;
-      $cfty=$fstring->get_current_style($p);
-      $ffs=$cfty['font-family'] . $cfty['style'];
-      if(!isset($fstring->used_fonts[$ffs])){
-         $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
-      }
-      $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-      $wmax = $fstring->width*1000*$this->k;
-      $j=count($lines)-1;
-      $k=strlen($lines[$j]);
-         if(!isset($linesmap[$j][0])) {
-         $linesmap[$j]=array($p,$p, 0);
-      }
-      $sl=$cw[' ']*$cfty['font-size'];
-      $x=$a=$linesmap[$j][2];
-      if($k>0){
-         $x+=$sl;
-         $lines[$j].=' ';
-         $linesmap[$j][2]+=$sl;
-      }
-      $u=$p;
-      $t='';
-      $l=$p+$q;
-      $ftmp='';
-      for($i=$p; $i<$l; $i++){
+    private function setLines(&$fstring, $p, $q){
+        $parced_str=& $fstring->parced_str;
+        $lines=& $fstring->lines;
+        $linesmap=& $fstring->linesmap;
+        $cfty=$fstring->get_current_style($p);
+        $ffs=$cfty['font-family'] . $cfty['style'];
+        if(!isset($fstring->used_fonts[$ffs])){
+            $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+        }
+        $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+        $wmax = $fstring->width*1000*$this->k;
+        $j=count($lines)-1;
+        $k=strlen($lines[$j]);
+            if(!isset($linesmap[$j][0])) {
+            $linesmap[$j]=array($p,$p, 0);
+        }
+        $sl=$cw[' ']*$cfty['font-size'];
+        $x=$a=$linesmap[$j][2];
+        if($k>0){
+            $x+=$sl;
+            $lines[$j].=' ';
+            $linesmap[$j][2]+=$sl;
+        }
+        $u=$p;
+        $t='';
+        $l=$p+$q;
+        $ftmp='';
+        for($i=$p; $i<$l; $i++){
             if($ftmp!=$ffs){
             $cfty=$fstring->get_current_style($i);
             $ffs=$cfty['font-family'] . $cfty['style'];
             if(!isset($fstring->used_fonts[$ffs])){
-               $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+                $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
             }
             $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
             $ftmp=$ffs;
-         }
-         $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
-         if($x>$wmax){
+            }
+            $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
+            if($x>$wmax){
             if($a>0){
-               $t=substr($parced_str,$p, $i-$p);
-               $lines[$j]=substr($lines[$j],0,$k);
-               $linesmap[$j][1]=$p-1;
-               $linesmap[$j][2]=$a;
-               $x-=($a+$sl);
-               $a=0;
-               $u=$p;
+                $t=substr($parced_str,$p, $i-$p);
+                $lines[$j]=substr($lines[$j],0,$k);
+                $linesmap[$j][1]=$p-1;
+                $linesmap[$j][2]=$a;
+                $x-=($a+$sl);
+                $a=0;
+                $u=$p;
             }
             else{
-               $x=$cw[$parced_str[$i]]*$cfty['font-size'];
-               $t='';
-               $u=$i;
+                $x=$cw[$parced_str[$i]]*$cfty['font-size'];
+                $t='';
+                $u=$i;
             }
             $j++;
             $lines[$j]=$t;
             $linesmap[$j]=array();
             $linesmap[$j][0]=$u;
             $linesmap[$j][2]=0;
-         }
-         $lines[$j].=$parced_str[$i];
-         $linesmap[$j][1]=$i;
-         $linesmap[$j][2]=$x;
-      }
-      return;
-   }
+            }
+            $lines[$j].=$parced_str[$i];
+            $linesmap[$j][1]=$i;
+            $linesmap[$j][2]=$x;
+        }
+        return;
+    }
 
-   public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
-      $result=array();
-      if($w==0){
-         return $result;
-      }
-      $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
-      $fstring=new formatedString($txt, $w, $this->current_font);
-      $word='';
-      $p=0;
-      $i=0;
-      $n=strlen($fstring->parced_str);
-      while($i<$n){
-         $word.=$fstring->parced_str[$i];
-         if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
+    public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
+        $result=array();
+        if($w==0){
+            return $result;
+        }
+        $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
+        $fstring=new formatedString($txt, $w, $this->current_font);
+        $word='';
+        $p=0;
+        $i=0;
+        $n=strlen($fstring->parced_str);
+        while($i<$n){
+            $word.=$fstring->parced_str[$i];
+            if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
             $word=trim($word);
             $this->setLines($fstring, $p, strlen($word));
             $p=$i+1;
             $word='';
             if($fstring->parced_str[$i]=="\n" && $i<$n-1){
-               $z=0;
-               $j=count($fstring->lines);
-               $fstring->lines[$j]='';
-               $fstring->linesmap[$j]=array();
+                $z=0;
+                $j=count($fstring->lines);
+                $fstring->lines[$j]='';
+                $fstring->linesmap[$j]=array();
             }
-         }
-         $i++;
-      }
-      if($n==0){
-         return $result;
-      }
-      $n=count($fstring->lines);
-         for($i=0; $i<$n; $i++){
-         $result[$i]=$fstring->break_by_style($i);
-      }
-      return $result;
-   }
+            }
+            $i++;
+        }
+        if($n==0){
+            return $result;
+        }
+        $n=count($fstring->lines);
+            for($i=0; $i<$n; $i++){
+            $result[$i]=$fstring->break_by_style($i);
+        }
+        return $result;
+    }
 
-   private function GetMixStringWidth($line){
-      $w = 0;
-      foreach($line['chunks'] as $i=>$chunk){
-         $t=0;
-         $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
-         $cw=& $cf['CurrentFont']['cw'];
-         $s=implode('', explode(' ',$chunk));
-         $l = strlen($s);
-         for($j=0;$j<$l;$j++){
+    private function GetMixStringWidth($line){
+        $w = 0;
+        foreach($line['chunks'] as $i=>$chunk){
+            $t=0;
+            $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
+            $cw=& $cf['CurrentFont']['cw'];
+            $s=implode('', explode(' ',$chunk));
+            $l = strlen($s);
+            for($j=0;$j<$l;$j++){
             $t+=$cw[$s[$j]];
-         }
-         $w+=$t*$line['style'][$i]['font-size'];
-      }
-      return $w;
-   }
+            }
+            $w+=$t*$line['style'][$i]['font-size'];
+        }
+        return $w;
+    }
 
-   public function CellBlock($w, $lh, &$lines, $align='J'){
-      if($w==0){
-         return;
-      }
-      $ctmp='';
-      $ftmp='';
-      foreach($lines as $i=>$line){
-         $k = $this->k;
-         if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
+    public function CellBlock($w, $lh, &$lines, $align='J'){
+        if($w==0){
+            return;
+        }
+        $ctmp='';
+        $ftmp='';
+        foreach($lines as $i=>$line){
+            $k = $this->k;
+            if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
             break;
-         }
-         $dx=0;
-         $dw=0;
-         if($line['width']!=0){
+            }
+            $dx=0;
+            $dw=0;
+            if($line['width']!=0){
             if($align=='R'){
-               $dx = $w-$line['width']/($this->k*1000);
+                $dx = $w-$line['width']/($this->k*1000);
             }
             elseif($align=='C'){
-               $dx = ($w-$line['width']/($this->k*1000))/2;
+                $dx = ($w-$line['width']/($this->k*1000))/2;
             }
             if($align=='J'){
-               $tmp=explode(' ', implode('',$line['chunks']));
-               $ns=count($tmp);
-               if($ns>1){
-                  $sx=implode('',$tmp);
-                  $delta=$this->GetMixStringWidth($line)/($this->k*1000);
-                  $dw=($w-$delta)*(1/($ns-1));
-               }
+                $tmp=explode(' ', implode('',$line['chunks']));
+                $ns=count($tmp);
+                if($ns>1){
+                    $sx=implode('',$tmp);
+                    $delta=$this->GetMixStringWidth($line)/($this->k*1000);
+                    $dw=($w-$delta)*(1/($ns-1));
+                }
             }
-         }
-         $xx=$this->x+$dx;
-         foreach($line['chunks'] as $tj=>$txt){
+            }
+            $xx=$this->x+$dx;
+            foreach($line['chunks'] as $tj=>$txt){
             $this->resetFont($line['style'][$tj]['font-family'], $line['style'][$tj]['style'], $line['style'][$tj]['font-size']);
             $this->resetColor($line['style'][$tj]['font-color'], 'T');
             $y=$this->y+0.5*$lh*$line['height'] +0.3*$line['height']/$this->k;
             if($dw){
-               $tmp=explode(' ', $txt);
-               foreach($tmp as $e=>$tt){
-                  if($e>0){
-                     $xx+=$dw;
-                     if($tt==''){
+                $tmp=explode(' ', $txt);
+                foreach($tmp as $e=>$tt){
+                    if($e>0){
+                        $xx+=$dw;
+                        if($tt==''){
                         continue;
-                     }
-                  }
-                  $this->Text($xx, $y, $tt);
-                     if($line['style'][$tj]['href']){
-                     $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                     $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
-                  }
-                  $xx+=$this->GetStringWidth($tt);
-               }
+                        }
+                    }
+                    $this->Text($xx, $y, $tt);
+                        if($line['style'][$tj]['href']){
+                        $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
+                        $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                    }
+                    $xx+=$this->GetStringWidth($tt);
+                }
             }
             else{
-               $this->Text($xx, $y, $txt);
-                  if($line['style'][$tj]['href']){
-                  $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                  $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
-               }
-               $xx+=$this->GetStringWidth($txt);
+                $this->Text($xx, $y, $txt);
+                    if($line['style'][$tj]['href']){
+                    $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
+                    $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                }
+                $xx+=$this->GetStringWidth($txt);
+            }
             }
-         }
-         unset($lines[$i]);
-         $this->y += $lh*$line['height'];
-      }
-   }
+            unset($lines[$i]);
+            $this->y += $lh*$line['height'];
+        }
+    }
    
 }
 ?>

Spacing +210 added lines, -210 removed lines

@@ -10,152 +10,152 @@ 
  include 'formatedstring.php';
  class exFPDF extends FPDF
  {
-    public function PageBreak(){
+    public function PageBreak() {
        return $this->PageBreakTrigger;
    }
 
-   public function current_font($c){
-      if($c=='family'){
+   public function current_font($c) {
+      if ($c == 'family') {
          return $this->FontFamily;
       }
-      elseif($c=='style'){
+      elseif ($c == 'style') {
          return $this->FontStyle;
       }
-      elseif($c=='size'){
+      elseif ($c == 'size') {
          return $this->FontSizePt;
       }
    }
 
-   public function get_color($c){
-      if($c=='fill'){
+   public function get_color($c) {
+      if ($c == 'fill') {
          return $this->FillColor;
       }
-      elseif($c=='text'){
+      elseif ($c == 'text') {
          return $this->TextColor;
       }
    }
 
-   public function get_page_width(){
+   public function get_page_width() {
       return $this->w;
    }
 
-   public function get_margin($c){
-      if($c=='l'){
+   public function get_margin($c) {
+      if ($c == 'l') {
          return $this->lMargin;
       }
-      elseif($c=='r'){
+      elseif ($c == 'r') {
          return $this->rMargin;
       }
-      elseif($c=='t'){
+      elseif ($c == 't') {
          return $this->tMargin;
       }
    }
 
-   public function get_linewidth(){
+   public function get_linewidth() {
       return $this->LineWidth;
    }
 
-   public function get_orientation(){
+   public function get_orientation() {
       return $this->CurOrientation;
    }
-   static private $hex=array('0'=>0,'1'=>1,'2'=>2,'3'=>3,'4'=>4,'5'=>5,'6'=>6,'7'=>7,'8'=>8,'9'=>9,
-   'A'=>10,'B'=>11,'C'=>12,'D'=>13,'E'=>14,'F'=>15);
+   static private $hex = array('0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4, '5'=>5, '6'=>6, '7'=>7, '8'=>8, '9'=>9,
+   'A'=>10, 'B'=>11, 'C'=>12, 'D'=>13, 'E'=>14, 'F'=>15);
 
-   public function is_rgb($str){
-      $a=true;
-      $tmp=explode(',', trim($str, ','));
-      foreach($tmp as $color){
-         if(!is_numeric($color) || $color<0 || $color>255){
-            $a=false;
+   public function is_rgb($str) {
+      $a = true;
+      $tmp = explode(',', trim($str, ','));
+      foreach ($tmp as $color) {
+         if (!is_numeric($color) || $color < 0 || $color > 255) {
+            $a = false;
             break;
          }
       }
       return $a;
    }
 
-   public function is_hex($str){
-      $a=true;
-      $str=strtoupper($str);
-      $n=strlen($str);
-      if(($n==7 || $n==4) && $str[0]=='#'){
-         for($i=1; $i<$n; $i++){
-            if(!isset(self::$hex[$str[$i]])){
-               $a=false;
+   public function is_hex($str) {
+      $a = true;
+      $str = strtoupper($str);
+      $n = strlen($str);
+      if (($n == 7 || $n == 4) && $str[0] == '#') {
+         for ($i = 1; $i < $n; $i++) {
+            if (!isset(self::$hex[$str[$i]])) {
+               $a = false;
                break;
             }
          }
       }
-      else{
-         $a=false;
+      else {
+         $a = false;
       }
       return $a;
    }
 
-   public function hextodec($str){
-      $result=array();
-      $str=strtoupper(substr($str,1));
-      $n=strlen($str);
-      for($i=0; $i<3; $i++){
-         if($n==6){
-            $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
+   public function hextodec($str) {
+      $result = array();
+      $str = strtoupper(substr($str, 1));
+      $n = strlen($str);
+      for ($i = 0; $i < 3; $i++) {
+         if ($n == 6) {
+            $result[$i] = self::$hex[$str[2 * $i]] * 16 + self::$hex[$str[2 * $i + 1]];
          }
-         else{
-            $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
+         else {
+            $result[$i] = self::$hex[$str[$i]] * 16 + self::$hex[$str[$i]];
          }
       }
       return $result;
    }
-   static private $options=array('F'=>'', 'T'=>'', 'D'=>'');
+   static private $options = array('F'=>'', 'T'=>'', 'D'=>'');
 
-   public function resetColor($str, $p='F'){
-      if(isset(self::$options[$p]) && self::$options[$p]!=$str){
-         self::$options[$p]=$str;
-         $array=array();
-         if($this->is_hex($str)){
-            $array=$this->hextodec($str);
+   public function resetColor($str, $p = 'F') {
+      if (isset(self::$options[$p]) && self::$options[$p] != $str) {
+         self::$options[$p] = $str;
+         $array = array();
+         if ($this->is_hex($str)) {
+            $array = $this->hextodec($str);
          }
-         elseif($this->is_rgb($str)){
-            $array=explode(',', trim($str, ','));
-            for($i=0; $i<3; $i++){
-               if(!isset($array[$i])){
-                  $array[$i]=0;
+         elseif ($this->is_rgb($str)) {
+            $array = explode(',', trim($str, ','));
+            for ($i = 0; $i < 3; $i++) {
+               if (!isset($array[$i])) {
+                  $array[$i] = 0;
                }
             }
          }
-         else{
-            $array=array(null, null, null);
-            $i=0;
-            $tmp=explode(' ', $str);
-            foreach($tmp as $c){
-               if(is_numeric($c)){
-                  $array[$i]=$c*256;
+         else {
+            $array = array(null, null, null);
+            $i = 0;
+            $tmp = explode(' ', $str);
+            foreach ($tmp as $c) {
+               if (is_numeric($c)) {
+                  $array[$i] = $c * 256;
                   $i++;
                }
             }
          }
-         if($p=='T'){
-            $this->SetTextColor($array[0],$array[1],$array[2]);
+         if ($p == 'T') {
+            $this->SetTextColor($array[0], $array[1], $array[2]);
          }
-         elseif($p=='D'){
-            $this->SetDrawColor($array[0],$array[1], $array[2]);
+         elseif ($p == 'D') {
+            $this->SetDrawColor($array[0], $array[1], $array[2]);
          }
-         elseif($p=='F'){
-            $this->SetFillColor($array[0],$array[1],$array[2]);
+         elseif ($p == 'F') {
+            $this->SetFillColor($array[0], $array[1], $array[2]);
          }
       }
    }
-   static private $font_def='';
+   static private $font_def = '';
 
-   public function resetFont($font_family, $font_style, $font_size){
-      if(self::$font_def!=$font_family .'-' . $font_style . '-' .$font_size){
-         self::$font_def=$font_family .'-' . $font_style . '-' .$font_size;
+   public function resetFont($font_family, $font_style, $font_size) {
+      if (self::$font_def != $font_family.'-'.$font_style.'-'.$font_size) {
+         self::$font_def = $font_family.'-'.$font_style.'-'.$font_size;
          $this->SetFont($font_family, $font_style, $font_size);
       }
    }
 
-   public function resetStaticData(){
-      self::$font_def='';
-      self::$options=array('F'=>'', 'T'=>'', 'D'=>'');
+   public function resetStaticData() {
+      self::$font_def = '';
+      self::$options = array('F'=>'', 'T'=>'', 'D'=>'');
    }
    /***********************************************************************
    *
@@ -164,219 +164,219 @@ 
    ************************************************************************/
 
    private function &FontData($family, $style, $size){
-      if($family=='')
+      if ($family == '')
       $family = $this->FontFamily;
       else
       $family = strtolower($family);
       $style = strtoupper($style);
-      if(strpos($style,'U')!==false){
+      if (strpos($style, 'U') !== false) {
          $this->underline = true;
-         $style = str_replace('U','',$style);
+         $style = str_replace('U', '', $style);
       }
-      if($style=='IB')
+      if ($style == 'IB')
       $style = 'BI';
       $fontkey = $family.$style;
-      if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
+      if (!isset($this->fonts[$fontkey])) {
+         if ($family == 'arial')
          $family = 'helvetica';
-         if(in_array($family,$this->CoreFonts)){
-            if($family=='symbol' || $family=='zapfdingbats')
+         if (in_array($family, $this->CoreFonts)) {
+            if ($family == 'symbol' || $family == 'zapfdingbats')
             $style = '';
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey]))
-            $this->AddFont($family,$style);
+            if (!isset($this->fonts[$fontkey]))
+            $this->AddFont($family, $style);
          }
          else
          $this->Error('Undefined font: '.$family.' '.$style);
       }
-      $result['FontSize'] = $size/$this->k;
-      $result['CurrentFont']=&$this->fonts[$fontkey];
+      $result['FontSize'] = $size / $this->k;
+      $result['CurrentFont'] = &$this->fonts[$fontkey];
       return $result;
    }
     
 
-   private function setLines(&$fstring, $p, $q){
-      $parced_str=& $fstring->parced_str;
-      $lines=& $fstring->lines;
-      $linesmap=& $fstring->linesmap;
-      $cfty=$fstring->get_current_style($p);
-      $ffs=$cfty['font-family'] . $cfty['style'];
-      if(!isset($fstring->used_fonts[$ffs])){
-         $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+   private function setLines(&$fstring, $p, $q) {
+      $parced_str = & $fstring->parced_str;
+      $lines = & $fstring->lines;
+      $linesmap = & $fstring->linesmap;
+      $cfty = $fstring->get_current_style($p);
+      $ffs = $cfty['font-family'].$cfty['style'];
+      if (!isset($fstring->used_fonts[$ffs])) {
+         $fstring->used_fonts[$ffs] = & $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
       }
-      $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-      $wmax = $fstring->width*1000*$this->k;
-      $j=count($lines)-1;
-      $k=strlen($lines[$j]);
-         if(!isset($linesmap[$j][0])) {
-         $linesmap[$j]=array($p,$p, 0);
+      $cw = & $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+      $wmax = $fstring->width * 1000 * $this->k;
+      $j = count($lines) - 1;
+      $k = strlen($lines[$j]);
+         if (!isset($linesmap[$j][0])) {
+         $linesmap[$j] = array($p, $p, 0);
       }
-      $sl=$cw[' ']*$cfty['font-size'];
-      $x=$a=$linesmap[$j][2];
-      if($k>0){
-         $x+=$sl;
-         $lines[$j].=' ';
-         $linesmap[$j][2]+=$sl;
+      $sl = $cw[' '] * $cfty['font-size'];
+      $x = $a = $linesmap[$j][2];
+      if ($k > 0) {
+         $x += $sl;
+         $lines[$j] .= ' ';
+         $linesmap[$j][2] += $sl;
       }
-      $u=$p;
-      $t='';
-      $l=$p+$q;
-      $ftmp='';
-      for($i=$p; $i<$l; $i++){
-            if($ftmp!=$ffs){
-            $cfty=$fstring->get_current_style($i);
-            $ffs=$cfty['font-family'] . $cfty['style'];
-            if(!isset($fstring->used_fonts[$ffs])){
-               $fstring->used_fonts[$ffs]=& $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
+      $u = $p;
+      $t = '';
+      $l = $p + $q;
+      $ftmp = '';
+      for ($i = $p; $i < $l; $i++) {
+            if ($ftmp != $ffs) {
+            $cfty = $fstring->get_current_style($i);
+            $ffs = $cfty['font-family'].$cfty['style'];
+            if (!isset($fstring->used_fonts[$ffs])) {
+               $fstring->used_fonts[$ffs] = & $this->FontData($cfty['font-family'], $cfty['style'], $cfty['font-size']);
             }
-            $cw=& $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
-            $ftmp=$ffs;
+            $cw = & $fstring->used_fonts[$ffs]['CurrentFont']['cw'];
+            $ftmp = $ffs;
          }
-         $x+=$cw[$parced_str[$i]]*$cfty['font-size'];
-         if($x>$wmax){
-            if($a>0){
-               $t=substr($parced_str,$p, $i-$p);
-               $lines[$j]=substr($lines[$j],0,$k);
-               $linesmap[$j][1]=$p-1;
-               $linesmap[$j][2]=$a;
-               $x-=($a+$sl);
-               $a=0;
-               $u=$p;
+         $x += $cw[$parced_str[$i]] * $cfty['font-size'];
+         if ($x > $wmax) {
+            if ($a > 0) {
+               $t = substr($parced_str, $p, $i - $p);
+               $lines[$j] = substr($lines[$j], 0, $k);
+               $linesmap[$j][1] = $p - 1;
+               $linesmap[$j][2] = $a;
+               $x -= ($a + $sl);
+               $a = 0;
+               $u = $p;
             }
-            else{
-               $x=$cw[$parced_str[$i]]*$cfty['font-size'];
-               $t='';
-               $u=$i;
+            else {
+               $x = $cw[$parced_str[$i]] * $cfty['font-size'];
+               $t = '';
+               $u = $i;
             }
             $j++;
-            $lines[$j]=$t;
-            $linesmap[$j]=array();
-            $linesmap[$j][0]=$u;
-            $linesmap[$j][2]=0;
+            $lines[$j] = $t;
+            $linesmap[$j] = array();
+            $linesmap[$j][0] = $u;
+            $linesmap[$j][2] = 0;
          }
-         $lines[$j].=$parced_str[$i];
-         $linesmap[$j][1]=$i;
-         $linesmap[$j][2]=$x;
+         $lines[$j] .= $parced_str[$i];
+         $linesmap[$j][1] = $i;
+         $linesmap[$j][2] = $x;
       }
       return;
    }
 
    public function &extMultiCell($font_family, $font_style, $font_size, $font_color, $w, $txt){
-      $result=array();
-      if($w==0){
+      $result = array();
+      if ($w == 0) {
          return $result;
       }
-      $this->current_font=array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
-      $fstring=new formatedString($txt, $w, $this->current_font);
-      $word='';
-      $p=0;
-      $i=0;
-      $n=strlen($fstring->parced_str);
-      while($i<$n){
-         $word.=$fstring->parced_str[$i];
-         if($fstring->parced_str[$i]=="\n" || $fstring->parced_str[$i]==' ' || $i==$n-1){
-            $word=trim($word);
+      $this->current_font = array('font-family'=>$font_family, 'style'=>$font_style, 'font-size'=>$font_size, 'font-color'=>$font_color);
+      $fstring = new formatedString($txt, $w, $this->current_font);
+      $word = '';
+      $p = 0;
+      $i = 0;
+      $n = strlen($fstring->parced_str);
+      while ($i < $n) {
+         $word .= $fstring->parced_str[$i];
+         if ($fstring->parced_str[$i] == "\n" || $fstring->parced_str[$i] == ' ' || $i == $n - 1) {
+            $word = trim($word);
             $this->setLines($fstring, $p, strlen($word));
-            $p=$i+1;
-            $word='';
-            if($fstring->parced_str[$i]=="\n" && $i<$n-1){
-               $z=0;
-               $j=count($fstring->lines);
-               $fstring->lines[$j]='';
-               $fstring->linesmap[$j]=array();
+            $p = $i + 1;
+            $word = '';
+            if ($fstring->parced_str[$i] == "\n" && $i < $n - 1) {
+               $z = 0;
+               $j = count($fstring->lines);
+               $fstring->lines[$j] = '';
+               $fstring->linesmap[$j] = array();
             }
          }
          $i++;
       }
-      if($n==0){
+      if ($n == 0) {
          return $result;
       }
-      $n=count($fstring->lines);
-         for($i=0; $i<$n; $i++){
-         $result[$i]=$fstring->break_by_style($i);
+      $n = count($fstring->lines);
+         for ($i = 0; $i < $n; $i++) {
+         $result[$i] = $fstring->break_by_style($i);
       }
       return $result;
    }
 
-   private function GetMixStringWidth($line){
+   private function GetMixStringWidth($line) {
       $w = 0;
-      foreach($line['chunks'] as $i=>$chunk){
-         $t=0;
-         $cf=& $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
-         $cw=& $cf['CurrentFont']['cw'];
-         $s=implode('', explode(' ',$chunk));
+      foreach ($line['chunks'] as $i=>$chunk) {
+         $t = 0;
+         $cf = & $this->FontData($line['style'][$i]['font-family'], $line['style'][$i]['style'], $line['style'][$i]['font-size']);
+         $cw = & $cf['CurrentFont']['cw'];
+         $s = implode('', explode(' ', $chunk));
          $l = strlen($s);
-         for($j=0;$j<$l;$j++){
-            $t+=$cw[$s[$j]];
+         for ($j = 0; $j < $l; $j++) {
+            $t += $cw[$s[$j]];
          }
-         $w+=$t*$line['style'][$i]['font-size'];
+         $w += $t * $line['style'][$i]['font-size'];
       }
       return $w;
    }
 
-   public function CellBlock($w, $lh, &$lines, $align='J'){
-      if($w==0){
+   public function CellBlock($w, $lh, &$lines, $align = 'J') {
+      if ($w == 0) {
          return;
       }
-      $ctmp='';
-      $ftmp='';
-      foreach($lines as $i=>$line){
+      $ctmp = '';
+      $ftmp = '';
+      foreach ($lines as $i=>$line) {
          $k = $this->k;
-         if($this->y+$lh*$line['height']>$this->PageBreakTrigger){
+         if ($this->y + $lh * $line['height'] > $this->PageBreakTrigger) {
             break;
          }
-         $dx=0;
-         $dw=0;
-         if($line['width']!=0){
-            if($align=='R'){
-               $dx = $w-$line['width']/($this->k*1000);
+         $dx = 0;
+         $dw = 0;
+         if ($line['width'] != 0) {
+            if ($align == 'R') {
+               $dx = $w - $line['width'] / ($this->k * 1000);
             }
-            elseif($align=='C'){
-               $dx = ($w-$line['width']/($this->k*1000))/2;
+            elseif ($align == 'C') {
+               $dx = ($w - $line['width'] / ($this->k * 1000)) / 2;
             }
-            if($align=='J'){
-               $tmp=explode(' ', implode('',$line['chunks']));
-               $ns=count($tmp);
-               if($ns>1){
-                  $sx=implode('',$tmp);
-                  $delta=$this->GetMixStringWidth($line)/($this->k*1000);
-                  $dw=($w-$delta)*(1/($ns-1));
+            if ($align == 'J') {
+               $tmp = explode(' ', implode('', $line['chunks']));
+               $ns = count($tmp);
+               if ($ns > 1) {
+                  $sx = implode('', $tmp);
+                  $delta = $this->GetMixStringWidth($line) / ($this->k * 1000);
+                  $dw = ($w - $delta) * (1 / ($ns - 1));
                }
             }
          }
-         $xx=$this->x+$dx;
-         foreach($line['chunks'] as $tj=>$txt){
+         $xx = $this->x + $dx;
+         foreach ($line['chunks'] as $tj=>$txt) {
             $this->resetFont($line['style'][$tj]['font-family'], $line['style'][$tj]['style'], $line['style'][$tj]['font-size']);
             $this->resetColor($line['style'][$tj]['font-color'], 'T');
-            $y=$this->y+0.5*$lh*$line['height'] +0.3*$line['height']/$this->k;
-            if($dw){
-               $tmp=explode(' ', $txt);
-               foreach($tmp as $e=>$tt){
-                  if($e>0){
-                     $xx+=$dw;
-                     if($tt==''){
+            $y = $this->y + 0.5 * $lh * $line['height'] + 0.3 * $line['height'] / $this->k;
+            if ($dw) {
+               $tmp = explode(' ', $txt);
+               foreach ($tmp as $e=>$tt) {
+                  if ($e > 0) {
+                     $xx += $dw;
+                     if ($tt == '') {
                         continue;
                      }
                   }
                   $this->Text($xx, $y, $tt);
-                     if($line['style'][$tj]['href']){
-                     $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                     $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                     if ($line['style'][$tj]['href']) {
+                     $yr = $this->y + 0.5 * ($lh * $line['height'] - $line['height'] / $this->k);
+                     $this->Link($xx, $yr, $this->GetStringWidth($txt), $line['height'] / $this->k, $line['style'][$tj]['href']);
                   }
-                  $xx+=$this->GetStringWidth($tt);
+                  $xx += $this->GetStringWidth($tt);
                }
             }
-            else{
+            else {
                $this->Text($xx, $y, $txt);
-                  if($line['style'][$tj]['href']){
-                  $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);
-                  $this->Link($xx, $yr, $this->GetStringWidth($txt),$line['height']/$this->k, $line['style'][$tj]['href']);
+                  if ($line['style'][$tj]['href']) {
+                  $yr = $this->y + 0.5 * ($lh * $line['height'] - $line['height'] / $this->k);
+                  $this->Link($xx, $yr, $this->GetStringWidth($txt), $line['height'] / $this->k, $line['style'][$tj]['href']);
                }
-               $xx+=$this->GetStringWidth($txt);
+               $xx += $this->GetStringWidth($txt);
             }
          }
          unset($lines[$i]);
-         $this->y += $lh*$line['height'];
+         $this->y += $lh * $line['height'];
       }
    }
    

Braces +33 added lines, -42 removed lines

@@ -17,11 +17,9 @@ 
    public function current_font($c){
       if($c=='family'){
          return $this->FontFamily;
-      }
-      elseif($c=='style'){
+      } elseif($c=='style'){
          return $this->FontStyle;
-      }
-      elseif($c=='size'){
+      } elseif($c=='size'){
          return $this->FontSizePt;
       }
    }
@@ -29,8 +27,7 @@ 
    public function get_color($c){
       if($c=='fill'){
          return $this->FillColor;
-      }
-      elseif($c=='text'){
+      } elseif($c=='text'){
          return $this->TextColor;
       }
    }
@@ -42,11 +39,9 @@ 
    public function get_margin($c){
       if($c=='l'){
          return $this->lMargin;
-      }
-      elseif($c=='r'){
+      } elseif($c=='r'){
          return $this->rMargin;
-      }
-      elseif($c=='t'){
+      } elseif($c=='t'){
          return $this->tMargin;
       }
    }
@@ -84,8 +79,7 @@ 
                break;
             }
          }
-      }
-      else{
+      } else{
          $a=false;
       }
       return $a;
@@ -98,8 +92,7 @@ 
       for($i=0; $i<3; $i++){
          if($n==6){
             $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
-         }
-         else{
+         } else{
             $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
          }
       }
@@ -113,16 +106,14 @@ 
          $array=array();
          if($this->is_hex($str)){
             $array=$this->hextodec($str);
-         }
-         elseif($this->is_rgb($str)){
+         } elseif($this->is_rgb($str)){
             $array=explode(',', trim($str, ','));
             for($i=0; $i<3; $i++){
                if(!isset($array[$i])){
                   $array[$i]=0;
                }
             }
-         }
-         else{
+         } else{
             $array=array(null, null, null);
             $i=0;
             $tmp=explode(' ', $str);
@@ -135,11 +126,9 @@ 
          }
          if($p=='T'){
             $this->SetTextColor($array[0],$array[1],$array[2]);
-         }
-         elseif($p=='D'){
+         } elseif($p=='D'){
             $this->SetDrawColor($array[0],$array[1], $array[2]);
-         }
-         elseif($p=='F'){
+         } elseif($p=='F'){
             $this->SetFillColor($array[0],$array[1],$array[2]);
          }
       }
@@ -164,30 +153,35 @@ 
    ************************************************************************/
 
    private function &FontData($family, $style, $size){
-      if($family=='')
-      $family = $this->FontFamily;
-      else
-      $family = strtolower($family);
+      if($family=='') {
+            $family = $this->FontFamily;
+      } else {
+            $family = strtolower($family);
+      }
       $style = strtoupper($style);
       if(strpos($style,'U')!==false){
          $this->underline = true;
          $style = str_replace('U','',$style);
       }
-      if($style=='IB')
-      $style = 'BI';
+      if($style=='IB') {
+            $style = 'BI';
+      }
       $fontkey = $family.$style;
       if(!isset($this->fonts[$fontkey])){
-         if($family=='arial')
-         $family = 'helvetica';
+         if($family=='arial') {
+                  $family = 'helvetica';
+         }
          if(in_array($family,$this->CoreFonts)){
-            if($family=='symbol' || $family=='zapfdingbats')
-            $style = '';
+            if($family=='symbol' || $family=='zapfdingbats') {
+                        $style = '';
+            }
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey]))
-            $this->AddFont($family,$style);
+            if(!isset($this->fonts[$fontkey])) {
+                        $this->AddFont($family,$style);
+            }
+         } else {
+                  $this->Error('Undefined font: '.$family.' '.$style);
          }
-         else
-         $this->Error('Undefined font: '.$family.' '.$style);
       }
       $result['FontSize'] = $size/$this->k;
       $result['CurrentFont']=&$this->fonts[$fontkey];
@@ -242,8 +236,7 @@ 
                $x-=($a+$sl);
                $a=0;
                $u=$p;
-            }
-            else{
+            } else{
                $x=$cw[$parced_str[$i]]*$cfty['font-size'];
                $t='';
                $u=$i;
@@ -330,8 +323,7 @@ 
          if($line['width']!=0){
             if($align=='R'){
                $dx = $w-$line['width']/($this->k*1000);
-            }
-            elseif($align=='C'){
+            } elseif($align=='C'){
                $dx = ($w-$line['width']/($this->k*1000))/2;
             }
             if($align=='J'){
@@ -365,8 +357,7 @@ 
                   }
                   $xx+=$this->GetStringWidth($tt);
                }
-            }
-            else{
+            } else{
                $this->Text($xx, $y, $txt);
                   if($line['style'][$tj]['href']){
                   $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);

extras/fpdf183/ResidentesFpdf.php

Spacing +51 added lines, -51 removed lines

@@ -55,7 +55,7 @@ 
 
     public function setPdfLogo()
     {
-        if (!file_exists(FS_MYDOCS . 'images') && !mkdir($concurrentDirectory = FS_MYDOCS . 'images', 0777, true) && !is_dir($concurrentDirectory)) {
+        if (!file_exists(FS_MYDOCS.'images') && !mkdir($concurrentDirectory = FS_MYDOCS.'images', 0777, true) && !is_dir($concurrentDirectory)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
         }
 
@@ -63,17 +63,17 @@ 
          * Antes se guardaba el logo en el temporal.
          * Mala decisión, lo movemos.
          */
-        if (file_exists('tmp/' . FS_TMP_NAME . 'logo.png')) {
-            rename('tmp/' . FS_TMP_NAME . 'logo.png', FS_MYDOCS . 'images/logo.png');
-        } elseif (file_exists('tmp/' . FS_TMP_NAME . 'logo.jpg')) {
-            rename('tmp/' . FS_TMP_NAME . 'logo.jpg', FS_MYDOCS . 'images/logo.jpg');
+        if (file_exists('tmp/'.FS_TMP_NAME.'logo.png')) {
+            rename('tmp/'.FS_TMP_NAME.'logo.png', FS_MYDOCS.'images/logo.png');
+        } elseif (file_exists('tmp/'.FS_TMP_NAME.'logo.jpg')) {
+            rename('tmp/'.FS_TMP_NAME.'logo.jpg', FS_MYDOCS.'images/logo.jpg');
         }
 
         $this->logo = false;
-        if (file_exists(FS_MYDOCS . 'images/logo.png')) {
-            $this->logo = FS_MYDOCS . 'images/logo.png';
-        } elseif (file_exists(FS_MYDOCS . 'images/logo.jpg')) {
-            $this->logo = FS_MYDOCS . 'images/logo.jpg';
+        if (file_exists(FS_MYDOCS.'images/logo.png')) {
+            $this->logo = FS_MYDOCS.'images/logo.png';
+        } elseif (file_exists(FS_MYDOCS.'images/logo.jpg')) {
+            $this->logo = FS_MYDOCS.'images/logo.jpg';
         }
         if ($this->logo) {
             $this->Image($this->logo, 5, 5, 30);
@@ -91,24 +91,24 @@ 
         $this->SetXY(140, $localTopLine);
         $this->Cell(60, 8, $documentHeader['codigo'], 0, 0, 'C');
         $localHeight += 4;
-        $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+        $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
         $this->Cell(60, 8, $documentHeader['numero2'], 0, 0, 'C');
         $localHeight += 4;
         $localLine++;
-        $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+        $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
         if (isset($documentHeader['tiponcf'])) {
             $this->Cell(60, 8, $documentHeader['tiponcf'], 0, 0, 'C');
             $localHeight += 4;
             $localLine++;
-            $this->SetXY(140, $localTopLine+($localSpaceBetweenLine*$localLine));
+            $this->SetXY(140, $localTopLine + ($localSpaceBetweenLine * $localLine));
             if (substr($documentHeader['numero2'], -10, 2) !== '02') {
                 $this->Cell(60, 8, "Valido hasta el: ".$documentHeader['vencimientoncf'], 0, 0, 'C');
                 $localHeight += 4;
                 $localLine++;
-                $this->SetXY(140, $localTopLine*$localSpaceBetweenLine*$localLine);
+                $this->SetXY(140, $localTopLine * $localSpaceBetweenLine * $localLine);
             }
         }
-        $this->Cell(60, 8, "Fecha: " . $documentHeader['fecha'], 0, 0, 'C');
+        $this->Cell(60, 8, "Fecha: ".$documentHeader['fecha'], 0, 0, 'C');
         $localHeight += 4;
         $this->Rect(140, $localTopLine, 60, $localHeight, "D");
     }
@@ -122,7 +122,7 @@ 
         // Subtotal, Impuestos y Total
         $number_to_words = new NumberToLetterConverter();
         $words = $number_to_words->to_word($documentFooter['neto'], 'DOP');
-        $subtotal = "Son: " . $words;
+        $subtotal = "Son: ".$words;
         $this->SetFont($this->font, '', 8);
         $this->SetXY($x, $y);
         $this->Cell(95, 8, $subtotal, 0, 0, 'L');
@@ -133,24 +133,24 @@ 
 
         // trait vertical cadre totaux, 8 de hauteur -> 213 + 8 = 221
         $this->SetFont($this->font, 'B', 8);
-        $this->Rect($x, $y+6, 95, 6, "D");
+        $this->Rect($x, $y + 6, 95, 6, "D");
         // Forma de Pago
-        $this->SetXY($x, $y+6);
+        $this->SetXY($x, $y + 6);
         $this->Cell(38, 5, "Forma de Pago:", 0, 0, 'L');
         $this->Cell(55, 5, utf8_decode($documentFooter['codpago']), 0, 0, 'L');
         // Fecha de Vencimiento
         //$date_ech = date_format($documentFooter['vencimiento'], 'd/m/Y');
 
-        $this->Rect($x, $y+12, 95, 6, "D");
-        $this->SetXY($x, $y+12);
+        $this->Rect($x, $y + 12, 95, 6, "D");
+        $this->SetXY($x, $y + 12);
         $this->Cell(38, 5, "Fecha de Vencimiento:", 0, 0, 'R');
         $this->Cell(38, 5, $documentFooter['vencimiento'], 0, 0, 'L');
 
         $this->SetFont($this->font, "BU", 8);
-        $this->SetXY($x, $y+30);
+        $this->SetXY($x, $y + 30);
         $this->Cell($this->GetStringWidth("Observaciones"), 0, "Observaciones", 0, "L");
         $this->SetFont($this->font, "", 8);
-        $this->SetXY($x, $y+35);
+        $this->SetXY($x, $y + 35);
         $this->MultiCell(190, 4, utf8_decode($documentFooter['observaciones']), 0, "L");
         //$y += 5;
         $this->setDocumentFooterTotalsBase($x, $y);
@@ -170,7 +170,7 @@ 
     {
         $x += 130;
         $this->SetLineWidth(0.1);
-        $this->Rect($x, $y, 60, (5*5), "D");
+        $this->Rect($x, $y, 60, (5 * 5), "D");
 //        // Lineas Verticales
 //        $this->Line(147, 221, 147, 245);
 //        $this->Line(164, 221, 164, 245);
@@ -183,13 +183,13 @@ 
         $this->SetFont($this->font, 'B', 8);
         $this->SetXY($x, $y);
         $this->Cell(30, 6, "Importe", 0, 0, 'R');
-        $this->SetXY($x, $y+5);
+        $this->SetXY($x, $y + 5);
         $this->Cell(30, 6, "Descuento", 0, 0, 'R');
-        $this->SetXY($x, $y+10);
+        $this->SetXY($x, $y + 10);
         $this->Cell(30, 6, "Subtotal", 0, 0, 'R');
-        $this->SetXY($x, $y+15);
+        $this->SetXY($x, $y + 15);
         $this->Cell(30, 6, FS_IVA, 0, 0, 'R');
-        $this->SetXY($x, $y+20);
+        $this->SetXY($x, $y + 20);
         $this->Cell(30, 6, "Total", 0, 0, 'R');
     }
 
@@ -202,21 +202,21 @@ 
         $taux = $documentFooter['neto'];
 
         $totalDescuento = number_format($documentFooter['total_descuento'], FS_NF0, FS_NF1, FS_NF2);
-        $this->SetXY($x, $y+5);
+        $this->SetXY($x, $y + 5);
         $this->Cell(30, 6, $totalDescuento, 0, 0, 'R');
 
         $col_ht = $documentFooter['totaliva'];
-        $col_tva = $col_ht - ($col_ht * (1-($taux/100)));
+        $col_tva = $col_ht - ($col_ht * (1 - ($taux / 100)));
         $totalImpuesto = number_format($col_tva, FS_NF0, FS_NF1, FS_NF2);
         $totalNeto = number_format($documentFooter['neto'], FS_NF0, FS_NF1, FS_NF2);
-        $this->SetXY($x, $y+10);
+        $this->SetXY($x, $y + 10);
         $this->Cell(30, 6, $totalNeto, 0, 0, 'R');
-        $this->SetXY($x, $y+15);
+        $this->SetXY($x, $y + 15);
         $this->Cell(30, 6, $totalImpuesto, 0, 0, 'R');
 
         $col_ttc = $documentFooter['total'];
         $totalGeneral = number_format($col_ttc, 2, ',', ' ');
-        $this->SetXY($x, $y+20);
+        $this->SetXY($x, $y + 20);
         $this->Cell(30, 6, $totalGeneral, 0, 0, 'R');
     }
 
@@ -226,12 +226,12 @@ 
         $this->SetFont($this->font, 'B', 8);
         $this->SetXY($x, $y);
         $this->Cell(25, 8, utf8_decode("Residente:"), 0, 0, 'R');
-        $this->SetXY($x+100, $y);
+        $this->SetXY($x + 100, $y);
         $this->Cell(25, 8, utf8_decode($tipoDocumentoFiscal.":"), 0, 0, 'R');
         $y += 4;
         $this->SetXY($x, $y);
         $this->Cell(25, 8, utf8_decode("Dirección:"), 0, 0, 'R');
-        $this->SetXY($x+100, $y);
+        $this->SetXY($x + 100, $y);
         $this->Cell(25, 8, utf8_decode("Teléfono:"), 0, 0, 'R');
         $y += 4;
         $this->SetXY($x, $y);
@@ -268,12 +268,12 @@ 
     public function setDocumentLinesHeader($x, $y)
     {
         $this->SetLineWidth(0.1);
-        $this->Rect(10, $y, 190, ($this->max_lines*7), "D");
-        $this->Line(10, $y+5, 200, $y+5);
+        $this->Rect(10, $y, 190, ($this->max_lines * 7), "D");
+        $this->Line(10, $y + 5, 200, $y + 5);
         //Lineas Verticales
         $arrayLineas = [105, 120, 140, 160, 180];
         foreach ($arrayLineas as $lineaX) {
-                $this->Line($lineaX, $y, $lineaX, $y+($this->max_lines*7));
+                $this->Line($lineaX, $y, $lineaX, $y + ($this->max_lines * 7));
         }
         $arrayDatosLineas = ["Descripción", "Cantidad", "Precio", "Descuento", FS_IVA, "Importe"];
         $arrayAnchoLineas = [95, 15, 20, 20, 20, 20];
@@ -300,34 +300,34 @@ 
         $linesSubtotal = 0;
         for ($i; $i < ($pageNumber * $this->max_lines); $i++) {
             if (isset($documentLines[$i])) {
-                $this->SetXY($x, $y+5);
+                $this->SetXY($x, $y + 5);
                 $line = $documentLines[$i];
                 $linesSubtotal += $line['pvptotal'];
                 $this->Cell(95, 5, utf8_decode($line['descripcion']), 0, 0, 'L');
                 // qte
-                $this->SetXY(105, $y+6);
+                $this->SetXY(105, $y + 6);
                 $this->Cell(15, 5, strrev(wordwrap(strrev($line['cantidad']), 3, ' ', true)), 0, 0, 'R');
                 // PU
                 $numero_formateado = number_format($line['pvpunitario'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(120, $y+6);
+                $this->SetXY(120, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 //Descuento
                 $numero_formateado = number_format(($line['pvpsindto'] - $line['pvptotal']), FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(140, $y+6);
+                $this->SetXY(140, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 // Impuesto
                 $numero_formateado = number_format($line['iva'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(160, $y+6);
+                $this->SetXY(160, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 // total
                 $numero_formateado = number_format($line['pvptotal'], FS_NF0, FS_NF1, FS_NF2);
-                $this->SetXY(180, $y+6);
+                $this->SetXY(180, $y + 6);
                 $this->Cell(20, 5, $numero_formateado, 0, 0, 'R');
                 //$this->Line($x, $y+13, 200, $y+13);
                 $y += 6;
             }
         }
-        $this->setDocumentLinesSubtotal($linesSubtotal, $pageNumber, $numberOfPages, $x, ($y+($this->max_lines)));
+        $this->setDocumentLinesSubtotal($linesSubtotal, $pageNumber, $numberOfPages, $x, ($y + ($this->max_lines)));
         $this->setDocumentPageNumber($pageNumber, $numberOfPages);
     }
 
@@ -340,7 +340,7 @@ 
             $this->SetFont($this->font, '', 8);
             $this->SetXY($x, $y);
             $this->Cell(30, 6, utf8_decode("Subtotal página: "), 0, 0, 'R');
-            $this->SetXY($x+30, $y);
+            $this->SetXY($x + 30, $y);
             $this->Cell(30, 6, number_format($linesSubtotal, FS_NF0, FS_NF1, FS_NF2), 0, 0, 'R');
         }
     }
@@ -348,11 +348,11 @@ 
     public function setDocumentPageNumber($pageNumber, $numberOfPages)
     {
         $x = $this->GetPageHeight();
-        $y = $this->GetPageWidth()-70;
+        $y = $this->GetPageWidth() - 70;
         //print_r($x);
         $this->SetXY($x, $y);
         $this->SetFont($this->font, 'B', 7);
-        $this->Cell(52, 5, utf8_decode("Página " . $pageNumber . " de " . $numberOfPages), 0, 0, 'R');
+        $this->Cell(52, 5, utf8_decode("Página ".$pageNumber." de ".$numberOfPages), 0, 0, 'R');
     }
 
     public function setCompanyInfo($companyInfo)
@@ -375,24 +375,24 @@ 
         $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['telefono']), 0, 0, 'L');
         $localLineHeight += 4;
         $this->SetXY($x1, $y1 + $localLineHeight);
-        $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['web']) . ' - ' .
+        $this->Cell($this->GetPageWidth(), 5, utf8_decode($companyInfo['web']).' - '.
                         utf8_decode($companyInfo['email']), 0, 0, 'L');
     }
 
     public function createDocument($companyInformation, $documentHeader, $documentLines, $customerInfo)
     {
-        $numberOfPages = (int) ceil(count($documentLines)/$this->max_lines);
+        $numberOfPages = (int) ceil(count($documentLines) / $this->max_lines);
 //        var_dump($this->max_lines);
 //        var_dump(count($documentLines));
 //        var_dump($numberOfPages);
-        for ($pageNumber=0; $pageNumber < $numberOfPages; $pageNumber++) {
+        for ($pageNumber = 0; $pageNumber < $numberOfPages; $pageNumber++) {
             $this->AddPage();
             $this->setPdfLogo();
             $this->setCompanyInfo($companyInformation);
             $this->setPdfCustomerInfo($customerInfo);
             $this->setDocumentHeaderInfo($documentHeader);
-            $this->setDocumentLinesInfo($documentLines, $pageNumber+1, $numberOfPages);
-            if ($pageNumber === ($numberOfPages-1)) {
+            $this->setDocumentLinesInfo($documentLines, $pageNumber + 1, $numberOfPages);
+            if ($pageNumber === ($numberOfPages - 1)) {
                 $this->setDocumentFooterInfo($documentHeader);
                 $this->setDocumentFooterCompanyText($companyInformation['pie_factura']);
             }

extras/fpdf183/formatedstring.php

Indentation +154 added lines, -154 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /**********************************************************************
+    /**********************************************************************
  * formateString                                                       *
  *                                                                     *
  * Version: 1.2                                                        *
@@ -7,8 +7,8 @@ 
  * Author:  Dan Machado                                                *
  * Use within exfpdf class                                             *
  **********************************************************************/
- class formatedString
- {
+    class formatedString
+    {
     public $parced_str;
     public $style_map;
     public $positions;
@@ -20,191 +20,191 @@ 
     public $used_fonts;
 
     private function get_style($str){
-       $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
-       'font-size'=>false, 'font-color'=>false, 'href'=>'');
-       $tmp=explode(';', trim($str, '",\', '));
-       foreach($tmp as $x){
-          if($x && strpos($x,':')>0){
-             $r=explode(':',$x);
-             $r[0]=trim($r[0]);
-             $r[1]=trim($r[1]);
-             if(isset($style[$r[0]]) || $r[0]=='style'){
+        $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
+        'font-size'=>false, 'font-color'=>false, 'href'=>'');
+        $tmp=explode(';', trim($str, '",\', '));
+        foreach($tmp as $x){
+            if($x && strpos($x,':')>0){
+                $r=explode(':',$x);
+                $r[0]=trim($r[0]);
+                $r[1]=trim($r[1]);
+                if(isset($style[$r[0]]) || $r[0]=='style'){
                 if($r[0]=='style' || $r[0]=='font-style'){
-                   $r[1]=strtoupper($r[1]);
-                   if(strpos($r[1], 'B')!==false){
-                      $style['font-weight']='B';
-                  }
-                  if(strpos($r[1], 'I')!==false){
-                     $style['font-style']='I';
-                  }
-                  if(strpos($r[1], 'U')!==false){
-                     $style['font-style'].='U';
-                  }
-               }
-               elseif($r[1]){
-                  if($r[0]=='href'){
-                     $style[$r[0]]=implode(':', array_slice($r,1));
-                  }
-                  else{
-                     $style[$r[0]]=$r[1];
-                  }
-               }
+                    $r[1]=strtoupper($r[1]);
+                    if(strpos($r[1], 'B')!==false){
+                        $style['font-weight']='B';
+                    }
+                    if(strpos($r[1], 'I')!==false){
+                        $style['font-style']='I';
+                    }
+                    if(strpos($r[1], 'U')!==false){
+                        $style['font-style'].='U';
+                    }
+                }
+                elseif($r[1]){
+                    if($r[0]=='href'){
+                        $style[$r[0]]=implode(':', array_slice($r,1));
+                    }
+                    else{
+                        $style[$r[0]]=$r[1];
+                    }
+                }
             }
-         }
-      }
-      return $style;
-   }
+            }
+        }
+        return $style;
+    }
     
 
-   private function style_merge($style1, $style2){
-      $result=$style1;
-      foreach($style2 as $k=>$v){
-         if($v){
+    private function style_merge($style1, $style2){
+        $result=$style1;
+        foreach($style2 as $k=>$v){
+            if($v){
             $result[$k]=$v;
-         }
-      }
-      return $result;
-   }
+            }
+        }
+        return $result;
+    }
 
-   private function style_parcer($text, &$font_data){
-      $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
-      $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
-      foreach($rep as $a=>$v){
-         $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
-         $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
-      }
-      $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
-      $str=preg_replace('/<\/BI>/', "</s>", $str);
-      $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
-      $str=preg_replace('/<\/B>/', "</s>", $str);
-      $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
-      $str=preg_replace('/<\/I>/', "</s>", $str);
-      $open=array();
-      $total=array();
-      $lt="<s";
-      $rt="</s>";
-      $j=strpos($str, $lt, 0);
-      while($j!==false){
+    private function style_parcer($text, &$font_data){
+        $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
+        $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
+        foreach($rep as $a=>$v){
+            $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
+            $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
+        }
+        $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
+        $str=preg_replace('/<\/BI>/', "</s>", $str);
+        $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
+        $str=preg_replace('/<\/B>/', "</s>", $str);
+        $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
+        $str=preg_replace('/<\/I>/', "</s>", $str);
+        $open=array();
+        $total=array();
+        $lt="<s";
+        $rt="</s>";
+        $j=strpos($str, $lt, 0);
+        while($j!==false){
             if($j>0 && ord($str[$j-1])==92){
             $j=strpos($str, $lt, $j+1);
             continue;
-         }
-         $k=strpos($str, '>',$j+1);
-         $open[$j]=substr($str, $j+2, $k-($j+2));
-         $total[]=$j;
-         $j=strpos($str, $lt, $j+1);
-      }
-      $j=strpos($str, $rt, 0);
-      while($j!==false){
-         $total[]=$j;
-         $j=strpos($str, $rt, $j+1);
-      }
-      sort($total);
+            }
+            $k=strpos($str, '>',$j+1);
+            $open[$j]=substr($str, $j+2, $k-($j+2));
+            $total[]=$j;
+            $j=strpos($str, $lt, $j+1);
+        }
+        $j=strpos($str, $rt, 0);
+        while($j!==false){
+            $total[]=$j;
+            $j=strpos($str, $rt, $j+1);
+        }
+        sort($total);
       
-      $cs='';
-      foreach($font_data as $k=>$v){
-         $cs.=$k . ':'. $v . '; ';
-      }
-      $cs=$this->get_style($cs);
-      $tmp=array($cs);
-      $blocks=array();
-      $blockstyle=array();
-      $n=count($total);
-      $k=0;
-      for($i=0; $i<$n; $i++){
-         $blocks[]=substr($str, $k, $total[$i]-$k);
-         $blockstyle[]=$cs;
-         if(isset($open[$total[$i]])){
+        $cs='';
+        foreach($font_data as $k=>$v){
+            $cs.=$k . ':'. $v . '; ';
+        }
+        $cs=$this->get_style($cs);
+        $tmp=array($cs);
+        $blocks=array();
+        $blockstyle=array();
+        $n=count($total);
+        $k=0;
+        for($i=0; $i<$n; $i++){
+            $blocks[]=substr($str, $k, $total[$i]-$k);
+            $blockstyle[]=$cs;
+            if(isset($open[$total[$i]])){
             $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
             $k=strpos($str, '>',$total[$i]+1)+1;
-         }
-         else{
+            }
+            else{
             $k=$total[$i]+4;
             array_pop($tmp);
             $l=count($tmp)-1;
             $cs=$tmp[$l];
-         }
-      }
-      if($k<strlen($str)){
-         $blocks[]=substr($str, $k);
-         $blockstyle[]=$cs;
-      }
-      $n=count($blocks);
-      for($i=0; $i<$n; $i++){
-         $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
-         if(strlen($blocks[$i])>0){
+            }
+        }
+        if($k<strlen($str)){
+            $blocks[]=substr($str, $k);
+            $blockstyle[]=$cs;
+        }
+        $n=count($blocks);
+        for($i=0; $i<$n; $i++){
+            $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
+            if(strlen($blocks[$i])>0){
             $blockstyle[$i]['style']=$blockstyle[$i]['font-weight'] . $blockstyle[$i]['font-style'];
             unset($blockstyle[$i]['font-weight']);
             unset($blockstyle[$i]['font-style']);
             $this->style_map[strlen($this->parced_str)-1]=$blockstyle[$i];
-         }
-      }
-   }
+            }
+        }
+    }
 
-   public function __construct($text, $width, &$font_data){
-      $this->iterator=0;
-      $this->parced_str='';
-      $this->style_map=array();
-      $this->style_parcer($text, $font_data);
-      $this->positions=array_keys($this->style_map);
-      $this->np=(bool)count($this->positions);
-      $this->width=$width;
-      $this->lines=array('');
-      $this->linesmap[0]=array(0, 0, 0);
-      $this->used_fonts=array();
-   }
+    public function __construct($text, $width, &$font_data){
+        $this->iterator=0;
+        $this->parced_str='';
+        $this->style_map=array();
+        $this->style_parcer($text, $font_data);
+        $this->positions=array_keys($this->style_map);
+        $this->np=(bool)count($this->positions);
+        $this->width=$width;
+        $this->lines=array('');
+        $this->linesmap[0]=array(0, 0, 0);
+        $this->used_fonts=array();
+    }
 
-   public function get_str(){
-      return $this->parced_str;
-   }
+    public function get_str(){
+        return $this->parced_str;
+    }
 
-   public function get_current_style($i){
-      if(!$this->np){
-         return '';
-      }
-      while($this->positions[$this->iterator]<$i){
-         $this->iterator++;
-      }
-      return $this->style_map[$this->positions[$this->iterator]];
-   }
+    public function get_current_style($i){
+        if(!$this->np){
+            return '';
+        }
+        while($this->positions[$this->iterator]<$i){
+            $this->iterator++;
+        }
+        return $this->style_map[$this->positions[$this->iterator]];
+    }
    
 
-      public function break_by_style($t){
-      $i=$this->linesmap[$t][0];
-      $j=$this->linesmap[$t][1];
-      $this->iterator=0;
-      $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
-      if(strlen($this->parced_str)==0){
-         return $result;
-      }
-      $cs=$this->get_current_style($i);
-      $result['height']=$cs['font-size'];
-      $r=0;
-      $result['chunks'][$r]='';
-      $result['style'][$r]=$cs;
-      while($this->parced_str[$j]==' '){
-         $j--;
-      }
-      $tmp=$i;
-         for($k=$i; $k<=$j; $k++){
-         if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
+        public function break_by_style($t){
+        $i=$this->linesmap[$t][0];
+        $j=$this->linesmap[$t][1];
+        $this->iterator=0;
+        $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
+        if(strlen($this->parced_str)==0){
+            return $result;
+        }
+        $cs=$this->get_current_style($i);
+        $result['height']=$cs['font-size'];
+        $r=0;
+        $result['chunks'][$r]='';
+        $result['style'][$r]=$cs;
+        while($this->parced_str[$j]==' '){
+            $j--;
+        }
+        $tmp=$i;
+            for($k=$i; $k<=$j; $k++){
+            if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
             $tmp=$k;
             continue;
-         }
+            }
             if($cs!=$this->get_current_style($k)) {
             $r++;
             $cs=$this->get_current_style($k);
             $result['chunks'][$r]='';
             $result['style'][$r]=$cs;
             if($result['height']<$cs['font-size']){
-               $result['height']=$cs['font-size'];
+                $result['height']=$cs['font-size'];
             }
-         }
-         $result['chunks'][$r].=$this->parced_str[$k];
-         $tmp=$k;
-      }
-      return $result;
-   }
+            }
+            $result['chunks'][$r].=$this->parced_str[$k];
+            $tmp=$k;
+        }
+        return $result;
+    }
 }
 ?>

Spacing +121 added lines, -121 removed lines

@@ -19,34 +19,34 @@ 
     public $linesmap;
     public $used_fonts;
 
-    private function get_style($str){
-       $style=array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
+    private function get_style($str) {
+       $style = array('font-family'=>false, 'font-weight'=>false, 'font-style'=>false,
        'font-size'=>false, 'font-color'=>false, 'href'=>'');
-       $tmp=explode(';', trim($str, '",\', '));
-       foreach($tmp as $x){
-          if($x && strpos($x,':')>0){
-             $r=explode(':',$x);
-             $r[0]=trim($r[0]);
-             $r[1]=trim($r[1]);
-             if(isset($style[$r[0]]) || $r[0]=='style'){
-                if($r[0]=='style' || $r[0]=='font-style'){
-                   $r[1]=strtoupper($r[1]);
-                   if(strpos($r[1], 'B')!==false){
-                      $style['font-weight']='B';
+       $tmp = explode(';', trim($str, '",\', '));
+       foreach ($tmp as $x) {
+          if ($x && strpos($x, ':') > 0) {
+             $r = explode(':', $x);
+             $r[0] = trim($r[0]);
+             $r[1] = trim($r[1]);
+             if (isset($style[$r[0]]) || $r[0] == 'style') {
+                if ($r[0] == 'style' || $r[0] == 'font-style') {
+                   $r[1] = strtoupper($r[1]);
+                   if (strpos($r[1], 'B') !== false) {
+                      $style['font-weight'] = 'B';
                   }
-                  if(strpos($r[1], 'I')!==false){
-                     $style['font-style']='I';
+                  if (strpos($r[1], 'I') !== false) {
+                     $style['font-style'] = 'I';
                   }
-                  if(strpos($r[1], 'U')!==false){
-                     $style['font-style'].='U';
+                  if (strpos($r[1], 'U') !== false) {
+                     $style['font-style'] .= 'U';
                   }
                }
-               elseif($r[1]){
-                  if($r[0]=='href'){
-                     $style[$r[0]]=implode(':', array_slice($r,1));
+               elseif ($r[1]) {
+                  if ($r[0] == 'href') {
+                     $style[$r[0]] = implode(':', array_slice($r, 1));
                   }
-                  else{
-                     $style[$r[0]]=$r[1];
+                  else {
+                     $style[$r[0]] = $r[1];
                   }
                }
             }
@@ -56,153 +56,153 @@ 
    }
     
 
-   private function style_merge($style1, $style2){
-      $result=$style1;
-      foreach($style2 as $k=>$v){
-         if($v){
-            $result[$k]=$v;
+   private function style_merge($style1, $style2) {
+      $result = $style1;
+      foreach ($style2 as $k=>$v) {
+         if ($v) {
+            $result[$k] = $v;
          }
       }
       return $result;
    }
 
-   private function style_parcer($text, &$font_data){
-      $str=trim(strtr($text, array("\r"=>'', "\t"=>'')));
-      $rep=array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI' );
-      foreach($rep as $a=>$v){
-         $str=preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
-         $str=preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
+   private function style_parcer($text, &$font_data) {
+      $str = trim(strtr($text, array("\r"=>'', "\t"=>'')));
+      $rep = array('[bB]{1}'=>'B', '[iI]{1}'=>'I', '[iI]{1}[ ]*[bB]{1}'=>'BI', '[bB]{1}[ ]*[iI]{1}'=>'BI');
+      foreach ($rep as $a=>$v) {
+         $str = preg_replace('/<[ ]*'.$a.'[ ]*>/', "<$v>", $str);
+         $str = preg_replace('/<[ ]*\/+[ ]*'.$a.'[ ]*>/', "</$v>", $str);
       }
-      $str=preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
-      $str=preg_replace('/<\/BI>/', "</s>", $str);
-      $str=preg_replace('/<B>/', '<s "font-weight:B;">', $str);
-      $str=preg_replace('/<\/B>/', "</s>", $str);
-      $str=preg_replace('/<I>/', '<s "font-style:I;">', $str);
-      $str=preg_replace('/<\/I>/', "</s>", $str);
-      $open=array();
-      $total=array();
-      $lt="<s";
-      $rt="</s>";
-      $j=strpos($str, $lt, 0);
-      while($j!==false){
-            if($j>0 && ord($str[$j-1])==92){
-            $j=strpos($str, $lt, $j+1);
+      $str = preg_replace('/<BI>/', '<s "font-weight:B;font-style:I">', $str);
+      $str = preg_replace('/<\/BI>/', "</s>", $str);
+      $str = preg_replace('/<B>/', '<s "font-weight:B;">', $str);
+      $str = preg_replace('/<\/B>/', "</s>", $str);
+      $str = preg_replace('/<I>/', '<s "font-style:I;">', $str);
+      $str = preg_replace('/<\/I>/', "</s>", $str);
+      $open = array();
+      $total = array();
+      $lt = "<s";
+      $rt = "</s>";
+      $j = strpos($str, $lt, 0);
+      while ($j !== false) {
+            if ($j > 0 && ord($str[$j - 1]) == 92) {
+            $j = strpos($str, $lt, $j + 1);
             continue;
          }
-         $k=strpos($str, '>',$j+1);
-         $open[$j]=substr($str, $j+2, $k-($j+2));
-         $total[]=$j;
-         $j=strpos($str, $lt, $j+1);
+         $k = strpos($str, '>', $j + 1);
+         $open[$j] = substr($str, $j + 2, $k - ($j + 2));
+         $total[] = $j;
+         $j = strpos($str, $lt, $j + 1);
       }
-      $j=strpos($str, $rt, 0);
-      while($j!==false){
-         $total[]=$j;
-         $j=strpos($str, $rt, $j+1);
+      $j = strpos($str, $rt, 0);
+      while ($j !== false) {
+         $total[] = $j;
+         $j = strpos($str, $rt, $j + 1);
       }
       sort($total);
       
-      $cs='';
-      foreach($font_data as $k=>$v){
-         $cs.=$k . ':'. $v . '; ';
+      $cs = '';
+      foreach ($font_data as $k=>$v) {
+         $cs .= $k.':'.$v.'; ';
       }
-      $cs=$this->get_style($cs);
-      $tmp=array($cs);
-      $blocks=array();
-      $blockstyle=array();
-      $n=count($total);
-      $k=0;
-      for($i=0; $i<$n; $i++){
-         $blocks[]=substr($str, $k, $total[$i]-$k);
-         $blockstyle[]=$cs;
-         if(isset($open[$total[$i]])){
-            $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
+      $cs = $this->get_style($cs);
+      $tmp = array($cs);
+      $blocks = array();
+      $blockstyle = array();
+      $n = count($total);
+      $k = 0;
+      for ($i = 0; $i < $n; $i++) {
+         $blocks[] = substr($str, $k, $total[$i] - $k);
+         $blockstyle[] = $cs;
+         if (isset($open[$total[$i]])) {
+            $cs = $this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
-            $k=strpos($str, '>',$total[$i]+1)+1;
+            $k = strpos($str, '>', $total[$i] + 1) + 1;
          }
-         else{
-            $k=$total[$i]+4;
+         else {
+            $k = $total[$i] + 4;
             array_pop($tmp);
-            $l=count($tmp)-1;
-            $cs=$tmp[$l];
+            $l = count($tmp) - 1;
+            $cs = $tmp[$l];
          }
       }
-      if($k<strlen($str)){
-         $blocks[]=substr($str, $k);
-         $blockstyle[]=$cs;
+      if ($k < strlen($str)) {
+         $blocks[] = substr($str, $k);
+         $blockstyle[] = $cs;
       }
-      $n=count($blocks);
-      for($i=0; $i<$n; $i++){
-         $this->parced_str.=strtr($blocks[$i], array('\<s'=>'<s'));
-         if(strlen($blocks[$i])>0){
-            $blockstyle[$i]['style']=$blockstyle[$i]['font-weight'] . $blockstyle[$i]['font-style'];
+      $n = count($blocks);
+      for ($i = 0; $i < $n; $i++) {
+         $this->parced_str .= strtr($blocks[$i], array('\<s'=>'<s'));
+         if (strlen($blocks[$i]) > 0) {
+            $blockstyle[$i]['style'] = $blockstyle[$i]['font-weight'].$blockstyle[$i]['font-style'];
             unset($blockstyle[$i]['font-weight']);
             unset($blockstyle[$i]['font-style']);
-            $this->style_map[strlen($this->parced_str)-1]=$blockstyle[$i];
+            $this->style_map[strlen($this->parced_str) - 1] = $blockstyle[$i];
          }
       }
    }
 
-   public function __construct($text, $width, &$font_data){
-      $this->iterator=0;
-      $this->parced_str='';
-      $this->style_map=array();
+   public function __construct($text, $width, &$font_data) {
+      $this->iterator = 0;
+      $this->parced_str = '';
+      $this->style_map = array();
       $this->style_parcer($text, $font_data);
-      $this->positions=array_keys($this->style_map);
-      $this->np=(bool)count($this->positions);
-      $this->width=$width;
-      $this->lines=array('');
-      $this->linesmap[0]=array(0, 0, 0);
-      $this->used_fonts=array();
+      $this->positions = array_keys($this->style_map);
+      $this->np = (bool) count($this->positions);
+      $this->width = $width;
+      $this->lines = array('');
+      $this->linesmap[0] = array(0, 0, 0);
+      $this->used_fonts = array();
    }
 
-   public function get_str(){
+   public function get_str() {
       return $this->parced_str;
    }
 
-   public function get_current_style($i){
-      if(!$this->np){
+   public function get_current_style($i) {
+      if (!$this->np) {
          return '';
       }
-      while($this->positions[$this->iterator]<$i){
+      while ($this->positions[$this->iterator] < $i) {
          $this->iterator++;
       }
       return $this->style_map[$this->positions[$this->iterator]];
    }
    
 
-      public function break_by_style($t){
-      $i=$this->linesmap[$t][0];
-      $j=$this->linesmap[$t][1];
-      $this->iterator=0;
-      $result=array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
-      if(strlen($this->parced_str)==0){
+      public function break_by_style($t) {
+      $i = $this->linesmap[$t][0];
+      $j = $this->linesmap[$t][1];
+      $this->iterator = 0;
+      $result = array('chunks'=>array(), 'style'=>array(), 'height'=>0, 'width'=>$this->linesmap[$t][2]);
+      if (strlen($this->parced_str) == 0) {
          return $result;
       }
-      $cs=$this->get_current_style($i);
-      $result['height']=$cs['font-size'];
-      $r=0;
-      $result['chunks'][$r]='';
-      $result['style'][$r]=$cs;
-      while($this->parced_str[$j]==' '){
+      $cs = $this->get_current_style($i);
+      $result['height'] = $cs['font-size'];
+      $r = 0;
+      $result['chunks'][$r] = '';
+      $result['style'][$r] = $cs;
+      while ($this->parced_str[$j] == ' ') {
          $j--;
       }
-      $tmp=$i;
-         for($k=$i; $k<=$j; $k++){
-         if($this->parced_str[$tmp]==' ' && $this->parced_str[$k]==' '){
-            $tmp=$k;
+      $tmp = $i;
+         for ($k = $i; $k <= $j; $k++) {
+         if ($this->parced_str[$tmp] == ' ' && $this->parced_str[$k] == ' ') {
+            $tmp = $k;
             continue;
          }
-            if($cs!=$this->get_current_style($k)) {
+            if ($cs != $this->get_current_style($k)) {
             $r++;
-            $cs=$this->get_current_style($k);
-            $result['chunks'][$r]='';
-            $result['style'][$r]=$cs;
-            if($result['height']<$cs['font-size']){
-               $result['height']=$cs['font-size'];
+            $cs = $this->get_current_style($k);
+            $result['chunks'][$r] = '';
+            $result['style'][$r] = $cs;
+            if ($result['height'] < $cs['font-size']) {
+               $result['height'] = $cs['font-size'];
             }
          }
-         $result['chunks'][$r].=$this->parced_str[$k];
-         $tmp=$k;
+         $result['chunks'][$r] .= $this->parced_str[$k];
+         $tmp = $k;
       }
       return $result;
    }

Braces +3 added lines, -6 removed lines

@@ -40,12 +40,10 @@ 
                   if(strpos($r[1], 'U')!==false){
                      $style['font-style'].='U';
                   }
-               }
-               elseif($r[1]){
+               } elseif($r[1]){
                   if($r[0]=='href'){
                      $style[$r[0]]=implode(':', array_slice($r,1));
-                  }
-                  else{
+                  } else{
                      $style[$r[0]]=$r[1];
                   }
                }
@@ -118,8 +116,7 @@ 
             $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
             $k=strpos($str, '>',$total[$i]+1)+1;
-         }
-         else{
+         } else{
             $k=$total[$i]+4;
             array_pop($tmp);
             $l=count($tmp)-1;

extras/fpdf183/NumberToLetterConverter.php

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
             $convertedNumber = array(
                 $this->convertNumber($number, $miMoneda, 'entero')
             );
-        } else {
+        }else {
             $number = explode($this->decimal_mark, str_replace($this->separator, '', trim($number)));
 
             $convertedNumber = array(
@@ -124,7 +124,7 @@ 
         $moneda = '';
         if ($miMoneda !== null) {
             try {
-                $moneda = array_filter($this->MONEDAS, static function ($m) use ($miMoneda) {
+                $moneda = array_filter($this->MONEDAS, static function($m) use ($miMoneda) {
                     return ($m['currency'] === $miMoneda);
                 });
 
@@ -142,13 +142,13 @@ 
         }
 
         if (($number < 0) || ($number > 999999999)) {
-            return ($type === 'decimal')?' 00/100' : '';
+            return ($type === 'decimal') ? ' 00/100' : '';
         }
 
         $numberStr = (string) $number;
         $numberStrFill = str_pad($numberStr, 9, '0', STR_PAD_LEFT);
         $millones = substr($numberStrFill, 0, 3);
-        $miles =  substr($numberStrFill, 3, 3);
+        $miles = substr($numberStrFill, 3, 3);
         $cientos = substr($numberStrFill, 6);
 
         if ($millones > 0) {
@@ -200,9 +200,9 @@ 
         if ($k <= 20) {
             $output .= $this->UNIDADES[$k];
         } elseif (($k > 30) && ($n[2] !== '0')) {
-            $output .= sprintf('%sY %s', $this->DECENAS[(int)$n[1] - 2], $this->UNIDADES[(int)$n[2]]);
-        } else {
-            $output .= sprintf('%s%s', $this->DECENAS[(int)$n[1] - 2], $this->UNIDADES[(int)$n[2]]);
+            $output .= sprintf('%sY %s', $this->DECENAS[(int) $n[1] - 2], $this->UNIDADES[(int) $n[2]]);
+        }else {
+            $output .= sprintf('%s%s', $this->DECENAS[(int) $n[1] - 2], $this->UNIDADES[(int) $n[2]]);
         }
         return $output;
     }

extras/fpdf183/EasyTable.php

Indentation +692 added lines, -692 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*********************************************************************
+    /*********************************************************************
  * FPDF easyTable                                                     *
  *                                                                    *
  * Version: 2.0                                                       *
@@ -10,584 +10,584 @@ 
   
 class EasyTable
 {
-   const LP=0.4;
-   const XPadding=1;
-   const YPadding=1;
-   const IMGPadding=0.5;
-   const PBThreshold=30;
-   static private $table_counter=false;
-   static private $style=array('width'=>false, 'border'=>false, 'border-color'=>false,
-   'border-width'=>false, 'line-height'=>false,
-   'align'=>'', 'valign'=>'', 'bgcolor'=>false, 'split-row'=>false, 'l-margin'=>false,
-   'font-family'=>false, 'font-style'=>false,'font-size'=>false, 'font-color'=>false,
-   'paddingX'=>false, 'paddingY'=>false);
-   private $pdf_obj;
-   private $document_style;
-   private $table_style;
-   private $col_num;
-   private $col_width;
-   private $baseX;
-   private $row_style_def;
-   private $row_style;
-   private $row_heights;
-   private $row_data;
-   private $rows;
-   private $total_rowspan;
-   private $col_counter;
-   private $grid;
-   private $blocks;
-   private $overflow;
-   private $header_row;
-   private $new_table;
+    const LP=0.4;
+    const XPadding=1;
+    const YPadding=1;
+    const IMGPadding=0.5;
+    const PBThreshold=30;
+    static private $table_counter=false;
+    static private $style=array('width'=>false, 'border'=>false, 'border-color'=>false,
+    'border-width'=>false, 'line-height'=>false,
+    'align'=>'', 'valign'=>'', 'bgcolor'=>false, 'split-row'=>false, 'l-margin'=>false,
+    'font-family'=>false, 'font-style'=>false,'font-size'=>false, 'font-color'=>false,
+    'paddingX'=>false, 'paddingY'=>false);
+    private $pdf_obj;
+    private $document_style;
+    private $table_style;
+    private $col_num;
+    private $col_width;
+    private $baseX;
+    private $row_style_def;
+    private $row_style;
+    private $row_heights;
+    private $row_data;
+    private $rows;
+    private $total_rowspan;
+    private $col_counter;
+    private $grid;
+    private $blocks;
+    private $overflow;
+    private $header_row;
+    private $new_table;
 
-   private function get_available($colspan, $rowspan){
-      static $k=0;
-      if(count($this->grid)==0){
-         $k=0;
-      }
-      while(isset($this->grid[$k])){
-         $k++;
-      }
-      for($i=0; $i<=$colspan; $i++){
-         for($j=0; $j<=$rowspan; $j++){
+    private function get_available($colspan, $rowspan){
+        static $k=0;
+        if(count($this->grid)==0){
+            $k=0;
+        }
+        while(isset($this->grid[$k])){
+            $k++;
+        }
+        for($i=0; $i<=$colspan; $i++){
+            for($j=0; $j<=$rowspan; $j++){
             $this->grid[$k+$i+$j*$this->col_num]=true;
-         }
-      }
-      return $k;
-   }
+            }
+        }
+        return $k;
+    }
 
-   private function get_style($str, $c){
-      $result=self::$style;
-      if($c=='C'){
-         $result['colspan']=0;
-         $result['rowspan']=0;
-         $result['img']=false;
-      }
-      if($c=='C' || $c=='R'){
-         unset($result['width']);
-         unset($result['border-width']);
-         unset($result['split-row']);
-         unset($result['l-margin']);
-      }
-      if($c=='R' || $c=='T'){
-         if($c=='R'){
+    private function get_style($str, $c){
+        $result=self::$style;
+        if($c=='C'){
+            $result['colspan']=0;
+            $result['rowspan']=0;
+            $result['img']=false;
+        }
+        if($c=='C' || $c=='R'){
+            unset($result['width']);
+            unset($result['border-width']);
+            unset($result['split-row']);
+            unset($result['l-margin']);
+        }
+        if($c=='R' || $c=='T'){
+            if($c=='R'){
             $result['c-align']=array_pad(array(), $this->col_num, 'L');
-         }
-         else{
+            }
+            else{
             $result['c-align']=array();
-         }
-      }
-      if($c=='R'){
-         $result['min-height']=false;
-      }
-      $tmp=explode(';', $str);
-      foreach($tmp as $x){
-         if($x && strpos($x,':')>0){
+            }
+        }
+        if($c=='R'){
+            $result['min-height']=false;
+        }
+        $tmp=explode(';', $str);
+        foreach($tmp as $x){
+            if($x && strpos($x,':')>0){
             $r=explode(':',$x);
             $r[0]=trim($r[0]);
             $r[1]=trim($r[1]);
             if(isset($result[$r[0]])){
-               $result[$r[0]]=$r[1];
+                $result[$r[0]]=$r[1];
+            }
             }
-         }
-      }
-      return $result;
-   }
+        }
+        return $result;
+    }
 
-   private function inherating(&$sty, $setting, $c){
-      if($c=='C'){
-         $sty[$setting]=$this->row_style[$setting];
-      }
-      elseif($c=='R'){
-         $sty[$setting]=$this->table_style[$setting];
-      }
-      else{
-         $sty[$setting]=$this->document_style[$setting];
-      }
-   }
+    private function inherating(&$sty, $setting, $c){
+        if($c=='C'){
+            $sty[$setting]=$this->row_style[$setting];
+        }
+        elseif($c=='R'){
+            $sty[$setting]=$this->table_style[$setting];
+        }
+        else{
+            $sty[$setting]=$this->document_style[$setting];
+        }
+    }
    
 
-   private function set_style($str, $c, $pos=''){
-      $sty=$this->get_style($str, $c);
-      if($c=='T'){
-         if(is_numeric($sty['width'])){
+    private function set_style($str, $c, $pos=''){
+        $sty=$this->get_style($str, $c);
+        if($c=='T'){
+            if(is_numeric($sty['width'])){
             $sty['width']=min(abs($sty['width']),$this->document_style['document_width']);
             if($sty['width']==0){
-               $sty['width']=$this->document_style['document_width'];
+                $sty['width']=$this->document_style['document_width'];
+            }
             }
-         }
-         else{
+            else{
             $x=strpos($sty['width'], '%');
             if($x!=false){
-               $x=min(abs(substr($sty['width'], 0, $x)), 100);
-               if($x){
-                  $sty['width']=$x*$this->document_style['document_width']/100.0;
-               }
-               else{
-                  $sty['width']=$this->document_style['document_width'];
-               }
+                $x=min(abs(substr($sty['width'], 0, $x)), 100);
+                if($x){
+                    $sty['width']=$x*$this->document_style['document_width']/100.0;
+                }
+                else{
+                    $sty['width']=$this->document_style['document_width'];
+                }
             }
             else{
-               $sty['width']=$this->document_style['document_width'];
+                $sty['width']=$this->document_style['document_width'];
+            }
             }
-         }
-         if(!is_numeric($sty['l-margin'])){
+            if(!is_numeric($sty['l-margin'])){
             $sty['l-margin']=0;
-         }
-         else{
+            }
+            else{
             $sty['l-margin']=abs($sty['l-margin']);
-         }
-         if(is_numeric($sty['border-width'])){
+            }
+            if(is_numeric($sty['border-width'])){
             $sty['border-width']=abs($sty['border-width']);
-         }
-         else{
+            }
+            else{
             $sty['border-width']=false;
-         }
-         if($sty['split-row']=='false'){
+            }
+            if($sty['split-row']=='false'){
             $sty['split-row']=false;
-         }
-         elseif($sty['split-row']!==false){
+            }
+            elseif($sty['split-row']!==false){
             $sty['split-row']=true;
-         }
-      }
-      if($c=='R'){
-         if(!is_numeric($sty['min-height']) || $sty['min-height']<0){
+            }
+        }
+        if($c=='R'){
+            if(!is_numeric($sty['min-height']) || $sty['min-height']<0){
             $sty['min-height']=0;
-         }
-      }
-      if(!is_numeric($sty['paddingX'])){
-         if($c=='C' || $c=='R'){
+            }
+        }
+        if(!is_numeric($sty['paddingX'])){
+            if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingX', $c);
-         }
-         else{
+            }
+            else{
             $sty['paddingX']=self::XPadding;
-         }
-      }
-      $sty['paddingX']=abs($sty['paddingX']);
-      if(!is_numeric($sty['paddingY'])){
-         if($c=='C' || $c=='R'){
+            }
+        }
+        $sty['paddingX']=abs($sty['paddingX']);
+        if(!is_numeric($sty['paddingY'])){
+            if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingY', $c);
-         }
-         else{
+            }
+            else{
             $sty['paddingY']=self::YPadding;
-         }
-      }
-      $sty['paddingY']=abs($sty['paddingY']);
-      if($sty['border']===false && ($c=='C' || $c=='R')){
-         $this->inherating($sty, 'border', $c);
-      }
-      else{
-         $border=array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
-         if(!(is_numeric($sty['border']) && $sty['border']==1)){
+            }
+        }
+        $sty['paddingY']=abs($sty['paddingY']);
+        if($sty['border']===false && ($c=='C' || $c=='R')){
+            $this->inherating($sty, 'border', $c);
+        }
+        else{
+            $border=array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
+            if(!(is_numeric($sty['border']) && $sty['border']==1)){
             foreach($border as $k=>$v){
-               $border[$k]=0;
-               if(strpos($sty['border'], $k)!==false){
-                  $border[$k]=1;
-               }
-            }
-         }
-         $sty['border']=$border;
-      }
-      $color_settings=array('bgcolor', 'font-color', 'border-color');
-      foreach($color_settings as $setting){
-         if($sty[$setting]===false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))){
+                $border[$k]=0;
+                if(strpos($sty['border'], $k)!==false){
+                    $border[$k]=1;
+                }
+            }
+            }
+            $sty['border']=$border;
+        }
+        $color_settings=array('bgcolor', 'font-color', 'border-color');
+        foreach($color_settings as $setting){
+            if($sty[$setting]===false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))){
             if($c=='C' || $c=='R'){
-               $this->inherating($sty, $setting, $c);
+                $this->inherating($sty, $setting, $c);
             }
             elseif($setting=='font-color'){
-               $sty[$setting]=$this->document_style[$setting];
+                $sty[$setting]=$this->document_style[$setting];
+            }
             }
-         }
-         else{
+            else{
             $sty[$setting]=$sty[$setting];
-         }
-      }
-      $font_settings=array('font-family', 'font-style', 'font-size');
-      foreach($font_settings as $setting){
-         if($sty[$setting]===false){
+            }
+        }
+        $font_settings=array('font-family', 'font-style', 'font-size');
+        foreach($font_settings as $setting){
+            if($sty[$setting]===false){
             $this->inherating($sty, $setting, $c);
-         }
-      }
-      if(is_numeric($sty['line-height'])){
-         $sty['line-height']=self::LP*abs($sty['line-height']);
-      }
-      else{
-         if($c=='C' || $c=='R'){
+            }
+        }
+        if(is_numeric($sty['line-height'])){
+            $sty['line-height']=self::LP*abs($sty['line-height']);
+        }
+        else{
+            if($c=='C' || $c=='R'){
             $this->inherating($sty,'line-height', $c);
-         }
-         else{
+            }
+            else{
             $sty['line-height']=self::LP;
-         }
-      }
-      if($c=='C'){
-         if($sty['img']){
+            }
+        }
+        if($c=='C'){
+            if($sty['img']){
             $tmp=explode(',', $sty['img']);
             if(file_exists($tmp[0])){
-               $sty['img']=array('path'=>'', 'h'=>0, 'w'=>0);
-               $img=@ getimagesize($tmp[0]);
-               $sty['img']['path']=$tmp[0];
-               for($i=1; $i<3; $i++){
-                  if(isset($tmp[$i])){
-                     $tmp[$i]=trim(strtolower($tmp[$i]));
-                     if($tmp[$i][0]=='w' || $tmp[$i][0]=='h'){
+                $sty['img']=array('path'=>'', 'h'=>0, 'w'=>0);
+                $img=@ getimagesize($tmp[0]);
+                $sty['img']['path']=$tmp[0];
+                for($i=1; $i<3; $i++){
+                    if(isset($tmp[$i])){
+                        $tmp[$i]=trim(strtolower($tmp[$i]));
+                        if($tmp[$i][0]=='w' || $tmp[$i][0]=='h'){
                         $t=substr($tmp[$i],1);
                         if(is_numeric($t)){
-                           $sty['img'][$tmp[$i][0]]=abs($t);
+                            $sty['img'][$tmp[$i][0]]=abs($t);
+                        }
                         }
-                     }
-                  }
-               }
-               $ration=$img[0]/$img[1];
-               if($sty['img']['w']+$sty['img']['h']==0){
-                  $sty['img']['w']=$img[0];
-                  $sty['img']['h']=$img[1];
-               }
-               elseif($sty['img']['w']==0){
-                  $sty['img']['w']=$sty['img']['h']*$ration;
-               }
-               elseif($sty['img']['h']==0){
-                  $sty['img']['h']=$sty['img']['w']/$ration;
-               }
+                    }
+                }
+                $ration=$img[0]/$img[1];
+                if($sty['img']['w']+$sty['img']['h']==0){
+                    $sty['img']['w']=$img[0];
+                    $sty['img']['h']=$img[1];
+                }
+                elseif($sty['img']['w']==0){
+                    $sty['img']['w']=$sty['img']['h']*$ration;
+                }
+                elseif($sty['img']['h']==0){
+                    $sty['img']['h']=$sty['img']['w']/$ration;
+                }
             }
             else{
-               $sty['img']='failed to open stream: file ' . $tmp[0] .' does not exist';
+                $sty['img']='failed to open stream: file ' . $tmp[0] .' does not exist';
+            }
             }
-         }
-         if(is_numeric($sty['colspan']) && $sty['colspan']>0){
+            if(is_numeric($sty['colspan']) && $sty['colspan']>0){
             $sty['colspan']--;
-         }
-         else{
+            }
+            else{
             $sty['colspan']=0;
-         }
-         if(is_numeric($sty['rowspan']) && $sty['rowspan']>0){
+            }
+            if(is_numeric($sty['rowspan']) && $sty['rowspan']>0){
             $sty['rowspan']--;
-         }
-         else{
+            }
+            else{
             $sty['rowspan']=0;
-         }
-         if($sty['valign']==false && ($sty['rowspan']>0 || $sty['img']!==false)){
+            }
+            if($sty['valign']==false && ($sty['rowspan']>0 || $sty['img']!==false)){
             $sty['valign']='M';
-         }
-         if($sty['align']==false && $sty['img']!==false){
+            }
+            if($sty['align']==false && $sty['img']!==false){
             $sty['align']='C';
-         }
-      }
-      if($c=='T' || $c=='R'){
-         $tmp=explode('{',$sty['align']);
-         if($c=='T'){
+            }
+        }
+        if($c=='T' || $c=='R'){
+            $tmp=explode('{',$sty['align']);
+            if($c=='T'){
             $sty['align']=trim($tmp[0]);
-         }
-         if(isset($tmp[1])){
+            }
+            if(isset($tmp[1])){
             $tmp[1]=trim($tmp[1], '}');
             if(strlen($tmp[1])){
-               for($i=0; $i<strlen($tmp[1]); $i++){
-                  if(preg_match("/[LCRJ]/", $tmp[1][$i])!=0){
-                     $sty['c-align'][$i]=$tmp[1][$i];
-                  }
-                  else{
-                     $sty['c-align'][$i]='L';
-                  }
-               }
+                for($i=0; $i<strlen($tmp[1]); $i++){
+                    if(preg_match("/[LCRJ]/", $tmp[1][$i])!=0){
+                        $sty['c-align'][$i]=$tmp[1][$i];
+                    }
+                    else{
+                        $sty['c-align'][$i]='L';
+                    }
+                }
             }
             if($c=='R'){
-               $sty['align']='L';
-               $sty['c-align']=array_slice($sty['c-align'],0,$this->col_num);
+                $sty['align']='L';
+                $sty['c-align']=array_slice($sty['c-align'],0,$this->col_num);
             }
-         }
-      }
-      if($sty['align']!='L' && $sty['align']!='C' && $sty['align']!='R' && $sty['align']!='J'){
-         if($c=='C'){
+            }
+        }
+        if($sty['align']!='L' && $sty['align']!='C' && $sty['align']!='R' && $sty['align']!='J'){
+            if($c=='C'){
             $sty['align']=$this->row_style['c-align'][$pos];
-         }
-         elseif($c=='R'){
+            }
+            elseif($c=='R'){
             $sty['align']='L';
             $sty['c-align']=$this->table_style['c-align'];
-         }
-         else{
+            }
+            else{
+            $sty['align']='C';
+            }
+        }
+        elseif($c=='T' && $sty['align']=='J'){
             $sty['align']='C';
-         }
-      }
-      elseif($c=='T' && $sty['align']=='J'){
-         $sty['align']='C';
-      }
-      if($sty['valign']!='T' && $sty['valign']!='M' && $sty['valign']!='B'){
-         if($c=='C' || $c=='R'){
+        }
+        if($sty['valign']!='T' && $sty['valign']!='M' && $sty['valign']!='B'){
+            if($c=='C' || $c=='R'){
             $this->inherating($sty, 'valign', $c);
-         }
-         else{
+            }
+            else{
             $sty['valign']='T';
-         }
-      }
-      return $sty;
-   }
+            }
+        }
+        return $sty;
+    }
 
-   private function row_content_loop($counter, $f){
-      $t=0;
-      if($counter>0){
-         $t=$this->rows[$counter-1];
-      }
-      for($index=$t; $index<$this->rows[$counter]; $index++){
-         $f($index);
-      }
-   }
+    private function row_content_loop($counter, $f){
+        $t=0;
+        if($counter>0){
+            $t=$this->rows[$counter-1];
+        }
+        for($index=$t; $index<$this->rows[$counter]; $index++){
+            $f($index);
+        }
+    }
 
-   private function mk_border($i, $y, $split){
-      $w=$this->row_data[$i][2];
-      $h=$this->row_data[$i][5];
-      if($split){
-         $h=$this->pdf_obj->PageBreak()-$y;
-      }
-      if($this->row_data[$i][1]['border-color']!=false){
-         $this->pdf_obj->resetColor($this->row_data[$i][1]['border-color'], 'D');
-      }
-      $a=array(1, 1, 1, 0);
-      $borders=array('L'=>3, 'T'=>0, 'R'=>1, 'B'=>2);
-      foreach($borders as $border=>$j){
-         if($this->row_data[$i][1]['border'][$border]){
+    private function mk_border($i, $y, $split){
+        $w=$this->row_data[$i][2];
+        $h=$this->row_data[$i][5];
+        if($split){
+            $h=$this->pdf_obj->PageBreak()-$y;
+        }
+        if($this->row_data[$i][1]['border-color']!=false){
+            $this->pdf_obj->resetColor($this->row_data[$i][1]['border-color'], 'D');
+        }
+        $a=array(1, 1, 1, 0);
+        $borders=array('L'=>3, 'T'=>0, 'R'=>1, 'B'=>2);
+        foreach($borders as $border=>$j){
+            if($this->row_data[$i][1]['border'][$border]){
             if($border=='B'){
-               if($split==0){
-                  $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
-               }
+                if($split==0){
+                    $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
+                }
             }
             else{
-               $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
+                $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
             }
-         }
-      }
+            }
+        }
       
-      if($this->row_data[$i][1]['border-color']!=false){
-         $this->pdf_obj->resetColor($this->document_style['bgcolor'], 'D');
-      }
-      if($split){
-         $this->pdf_obj->row_data[$i][1]['border']['T']=0;
-      }
-   }
+        if($this->row_data[$i][1]['border-color']!=false){
+            $this->pdf_obj->resetColor($this->document_style['bgcolor'], 'D');
+        }
+        if($split){
+            $this->pdf_obj->row_data[$i][1]['border']['T']=0;
+        }
+    }
 
-   private function print_text($i, $y, $split){
-      $padding=$this->row_data[$i][1]['padding-y'];
-      $k=$padding;
-      if($this->row_data[$i][1]['img']!==false){
-         if($this->row_data[$i][1]['valign']=='B'){
+    private function print_text($i, $y, $split){
+        $padding=$this->row_data[$i][1]['padding-y'];
+        $k=$padding;
+        if($this->row_data[$i][1]['img']!==false){
+            if($this->row_data[$i][1]['valign']=='B'){
             $k+=$this->row_data[$i][1]['img']['h']+self::IMGPadding;
-         }
-      }
-      $l=0;
-      if(count($this->row_data[$i][0])){
-         $x=$this->row_data[$i][6]+$this->row_data[$i][1]['paddingX'];
-         $xpadding=2*$this->row_data[$i][1]['paddingX'];
-         $l=count($this->row_data[$i][0])* $this->row_data[$i][1]['line-height']*$this->row_data[$i][1]['font-size'];
-         $this->pdf_obj->SetXY($x, $y+$k);
-         $this->pdf_obj->CellBlock($this->row_data[$i][2]-$xpadding, $this->row_data[$i][1]['line-height'], $this->row_data[$i][0], $this->row_data[$i][1]['align']);
-         $this->pdf_obj->resetFont($this->document_style['font-family'], $this->document_style['font-style'], $this->document_style['font-size']);
-         $this->pdf_obj->resetColor($this->document_style['font-color'], 'T');
-      }
-      if($this->row_data[$i][1]['img']!==false ){
-         $x=$this->row_data[$i][6];
-         $k=$padding;
-         if($this->row_data[$i][1]['valign']!='B'){
+            }
+        }
+        $l=0;
+        if(count($this->row_data[$i][0])){
+            $x=$this->row_data[$i][6]+$this->row_data[$i][1]['paddingX'];
+            $xpadding=2*$this->row_data[$i][1]['paddingX'];
+            $l=count($this->row_data[$i][0])* $this->row_data[$i][1]['line-height']*$this->row_data[$i][1]['font-size'];
+            $this->pdf_obj->SetXY($x, $y+$k);
+            $this->pdf_obj->CellBlock($this->row_data[$i][2]-$xpadding, $this->row_data[$i][1]['line-height'], $this->row_data[$i][0], $this->row_data[$i][1]['align']);
+            $this->pdf_obj->resetFont($this->document_style['font-family'], $this->document_style['font-style'], $this->document_style['font-size']);
+            $this->pdf_obj->resetColor($this->document_style['font-color'], 'T');
+        }
+        if($this->row_data[$i][1]['img']!==false ){
+            $x=$this->row_data[$i][6];
+            $k=$padding;
+            if($this->row_data[$i][1]['valign']!='B'){
             $k+=$l+self::IMGPadding;
-         }
-         if($this->imgbreak($i, $y)==0 && $y+$k+$this->row_data[$i][1]['img']['h']<$this->pdf_obj->PageBreak()){
+            }
+            if($this->imgbreak($i, $y)==0 && $y+$k+$this->row_data[$i][1]['img']['h']<$this->pdf_obj->PageBreak()){
             $x+=$this->row_data[$i][1]['paddingX'];
             if($this->row_data[$i][2]>$this->row_data[$i][1]['img']['w']){
-               if($this->row_data[$i][1]['align']=='C'){
-                  $x-=$this->row_data[$i][1]['paddingX'];
-                  $x+=($this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'])/2;
-               }
-               elseif($this->row_data[$i][1]['align']=='R'){
-                  $x+=$this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'];
-                  $x-=2*$this->row_data[$i][1]['paddingX'];
-               }
+                if($this->row_data[$i][1]['align']=='C'){
+                    $x-=$this->row_data[$i][1]['paddingX'];
+                    $x+=($this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'])/2;
+                }
+                elseif($this->row_data[$i][1]['align']=='R'){
+                    $x+=$this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'];
+                    $x-=2*$this->row_data[$i][1]['paddingX'];
+                }
             }
             $this->pdf_obj->Image($this->row_data[$i][1]['img']['path'], $x, $y+$k, $this->row_data[$i][1]['img']['w'], $this->row_data[$i][1]['img']['h']);
-         }
-      }
-   }
+            }
+        }
+    }
    
 
-   private function mk_bg($i, $T, $split){
-      $h=$this->row_data[$i][5];
-      if($split){
-         $h=$this->pdf_obj->PageBreak()-$T;
-      }
-      if($this->row_data[$i][1]['bgcolor']!=false){
-         $this->pdf_obj->resetColor($this->row_data[$i][1]['bgcolor']);
-         $this->pdf_obj->Rect($this->row_data[$i][6], $T, $this->row_data[$i][2], $h, 'F');
-         $this->pdf_obj->resetColor($this->document_style['bgcolor']);
-      }
-   }
+    private function mk_bg($i, $T, $split){
+        $h=$this->row_data[$i][5];
+        if($split){
+            $h=$this->pdf_obj->PageBreak()-$T;
+        }
+        if($this->row_data[$i][1]['bgcolor']!=false){
+            $this->pdf_obj->resetColor($this->row_data[$i][1]['bgcolor']);
+            $this->pdf_obj->Rect($this->row_data[$i][6], $T, $this->row_data[$i][2], $h, 'F');
+            $this->pdf_obj->resetColor($this->document_style['bgcolor']);
+        }
+    }
 
-   private function printing_loop($swap=false){
-      $this->swap_data($swap);
-      $y=$this->pdf_obj->GetY();
-      $tmp=array();
-      $rw=array();
-      $ztmp=array();
-      $total_cells=count($this->row_data);
-      while(count($tmp)!=$total_cells){
-         $a=count($this->rows);
-         $h=0;
-         $y=$this->pdf_obj->GetY();
-         for($j=0; $j<count($this->rows); $j++){
+    private function printing_loop($swap=false){
+        $this->swap_data($swap);
+        $y=$this->pdf_obj->GetY();
+        $tmp=array();
+        $rw=array();
+        $ztmp=array();
+        $total_cells=count($this->row_data);
+        while(count($tmp)!=$total_cells){
+            $a=count($this->rows);
+            $h=0;
+            $y=$this->pdf_obj->GetY();
+            for($j=0; $j<count($this->rows); $j++){
             $T=$y+$h;
             if($T<$this->pdf_obj->PageBreak()){
 
-                  $this->row_content_loop($j, function($index)use($T, $tmp){
-                  if(!isset($tmp[$index])){
-                     $split_cell=$this->scan_for_breaks($index,$T, false);
-                     $this->mk_bg($index, $T, $split_cell);
-                  }
-               });
-               if(!isset($rw[$j])){
-                  if($this->pdf_obj->PageBreak()-($T+$this->row_heights[$j])>=0){
-                     $h+=$this->row_heights[$j];
-                  }
-                  else{
-                     $a=$j+1;
-                     break;
-                  }
-               }
+                    $this->row_content_loop($j, function($index)use($T, $tmp){
+                    if(!isset($tmp[$index])){
+                        $split_cell=$this->scan_for_breaks($index,$T, false);
+                        $this->mk_bg($index, $T, $split_cell);
+                    }
+                });
+                if(!isset($rw[$j])){
+                    if($this->pdf_obj->PageBreak()-($T+$this->row_heights[$j])>=0){
+                        $h+=$this->row_heights[$j];
+                    }
+                    else{
+                        $a=$j+1;
+                        break;
+                    }
+                }
             }
             else{
-               $a=$j+1;
-               break;
+                $a=$j+1;
+                break;
+            }
             }
-         }
-         $h=0;
-         for($j=0; $j<$a; $j++){
+            $h=0;
+            for($j=0; $j<$a; $j++){
             $T=$y+$h;
             if($T<$this->pdf_obj->PageBreak()){
 
-                  $this->row_content_loop($j, function($index)use($T, &$tmp, &$ztmp){
-                  if(!isset($tmp[$index])){
-                     $split_cell=$this->scan_for_breaks($index,$T);
-                     $this->mk_border($index, $T, $split_cell);
-                     $this->print_text($index, $T, $split_cell);
-                     if($split_cell==0){
+                    $this->row_content_loop($j, function($index)use($T, &$tmp, &$ztmp){
+                    if(!isset($tmp[$index])){
+                        $split_cell=$this->scan_for_breaks($index,$T);
+                        $this->mk_border($index, $T, $split_cell);
+                        $this->print_text($index, $T, $split_cell);
+                        if($split_cell==0){
                         $tmp[$index]=$index;
-                     }
-                     else{
+                        }
+                        else{
                         $ztmp[]=$index;
-                     }
-                  }
-               });
-               if(!isset($rw[$j])){
-                  $tw=$this->pdf_obj->PageBreak()-($T+$this->row_heights[$j]);
-                  if($tw>=0){
-                     $h+=$this->row_heights[$j];
-                     $rw[$j]=$j;
-                  }
-                  else{
-                     $this->row_heights[$j]=$this->overflow-$tw;
-                  }
-               }
-            }
-         }
-         if(count($tmp)!=$total_cells){
+                        }
+                    }
+                });
+                if(!isset($rw[$j])){
+                    $tw=$this->pdf_obj->PageBreak()-($T+$this->row_heights[$j]);
+                    if($tw>=0){
+                        $h+=$this->row_heights[$j];
+                        $rw[$j]=$j;
+                    }
+                    else{
+                        $this->row_heights[$j]=$this->overflow-$tw;
+                    }
+                }
+            }
+            }
+            if(count($tmp)!=$total_cells){
             foreach($ztmp as $index){
-               $this->row_data[$index][5]=$this->row_data[$index][7]+$this->overflow;
-               if(isset($this->row_data[$index][8])){
-                  $this->row_data[$index][1]['padding-y']=$this->row_data[$index][8];
-                  unset($this->row_data[$index][8]);
-               }
+                $this->row_data[$index][5]=$this->row_data[$index][7]+$this->overflow;
+                if(isset($this->row_data[$index][8])){
+                    $this->row_data[$index][1]['padding-y']=$this->row_data[$index][8];
+                    unset($this->row_data[$index][8]);
+                }
             }
             $this->overflow=0;
             $ztmp=array();
             $this->pdf_obj->addPage($this->document_style['orientation']);
-         }
-         else{
+            }
+            else{
             $y+=$h;
-         }
-      }
-      $this->pdf_obj->SetXY($this->baseX, $y);
-      $this->swap_data($swap);
-   }
+            }
+        }
+        $this->pdf_obj->SetXY($this->baseX, $y);
+        $this->swap_data($swap);
+    }
 
-   private function imgbreak($i, $y){
-      $li=$y+$this->row_data[$i][1]['padding-y'];
-      $ls=$this->row_data[$i][1]['img']['h'];
-      if($this->row_data[$i][1]['valign']=='B'){
-         $ls+=$li;
-      }
-      else{
-         $li+=$this->row_data[$i][3]-$this->row_data[$i][1]['img']['h'];
-         $ls+=$li;
-      }
-      $result=0;
-      if($li<$this->pdf_obj->PageBreak() && $this->pdf_obj->PageBreak()<$ls){
-         $result=$this->pdf_obj->PageBreak()-$li;
-      }
-      return $result;
-   }
+    private function imgbreak($i, $y){
+        $li=$y+$this->row_data[$i][1]['padding-y'];
+        $ls=$this->row_data[$i][1]['img']['h'];
+        if($this->row_data[$i][1]['valign']=='B'){
+            $ls+=$li;
+        }
+        else{
+            $li+=$this->row_data[$i][3]-$this->row_data[$i][1]['img']['h'];
+            $ls+=$li;
+        }
+        $result=0;
+        if($li<$this->pdf_obj->PageBreak() && $this->pdf_obj->PageBreak()<$ls){
+            $result=$this->pdf_obj->PageBreak()-$li;
+        }
+        return $result;
+    }
 
-   private function scan_for_breaks($index, $H, $l=true){
-      $print_cell=0;
-      $h=($H+$this->row_data[$index][5])-$this->pdf_obj->PageBreak();
-      if($h>0){
-         if($l){
+    private function scan_for_breaks($index, $H, $l=true){
+        $print_cell=0;
+        $h=($H+$this->row_data[$index][5])-$this->pdf_obj->PageBreak();
+        if($h>0){
+            if($l){
             $rr=$this->pdf_obj->PageBreak()-($H+$this->row_data[$index][1]['padding-y']);
             if($rr>0){
-               $mx=0;
-               if(count($this->row_data[$index][0]) && $this->row_data[$index][1]['img']!==false){
-                  $mx=$this->imgbreak($index, $H);
-                  if($mx==0){
-                     if($this->row_data[$index][1]['valign']=='B'){
+                $mx=0;
+                if(count($this->row_data[$index][0]) && $this->row_data[$index][1]['img']!==false){
+                    $mx=$this->imgbreak($index, $H);
+                    if($mx==0){
+                        if($this->row_data[$index][1]['valign']=='B'){
                         $rr-=$this->row_data[$index][1]['img']['h'];
-                     }
-                  }
-               }
-               $nh=0;
-               $keys=array_keys($this->row_data[$index][0]);
-               foreach($keys as $i){
-                  $nh+=$this->row_data[$index][0][$i]['height'];
-               }
-               $nh*=$this->row_data[$index][1]['line-height'];
-               if($mx==0 && $rr<$nh){
-                  $nw=0;
-                  foreach($keys as $i){
-                     $nw+=$this->row_data[$index][0][$i]['height']*$this->row_data[$index][1]['line-height'];
-                     if($nw>$rr){
+                        }
+                    }
+                }
+                $nh=0;
+                $keys=array_keys($this->row_data[$index][0]);
+                foreach($keys as $i){
+                    $nh+=$this->row_data[$index][0][$i]['height'];
+                }
+                $nh*=$this->row_data[$index][1]['line-height'];
+                if($mx==0 && $rr<$nh){
+                    $nw=0;
+                    foreach($keys as $i){
+                        $nw+=$this->row_data[$index][0][$i]['height']*$this->row_data[$index][1]['line-height'];
+                        if($nw>$rr){
                         $nw-=$this->row_data[$index][0][$i]['height']*$this->row_data[$index][1]['line-height'];
                         $mx=$rr-$nw;
                         break;
-                     }
-                  }
-               }
-               $this->overflow=max($this->overflow, $mx);
-               $this->row_data[$index][8]=1;
+                        }
+                    }
+                }
+                $this->overflow=max($this->overflow, $mx);
+                $this->row_data[$index][8]=1;
             }
             else{
-               $this->row_data[$index][8]=-1*$rr;
+                $this->row_data[$index][8]=-1*$rr;
             }
             $this->row_data[$index][7]=$h;
-         }
-         $print_cell=1;
-      }
-      return $print_cell;
-   }
+            }
+            $print_cell=1;
+        }
+        return $print_cell;
+    }
 
-   private function swap_data($swap){
-      if($swap==false){
-         return;
-      }
-      static $data=array();
-      if(count($data)==0){
-         $data=array('header_data'=>$this->header_row['row_data'], 'row_heights'=>&$this->row_heights, 'row_data'=>&$this->row_data, 'rows'=>&$this->rows);
-         unset($this->row_heights, $this->row_data, $this->rows);
-         $this->row_heights=&$this->header_row['row_heights'];
-         $this->row_data=&$this->header_row['row_data'];
-         $this->rows=&$this->header_row['rows'];
-      }
-      else{
-         $this->header_row['row_data']=$data['header_data'];
-         unset($this->row_heights, $this->row_data, $this->rows);
-         $this->row_heights=$data['row_heights'];
-         $this->row_data=$data['row_data'];
-         $this->rows=$data['rows'];
-         $data=array();
-      }
-   }
-   /********************************************************************
+    private function swap_data($swap){
+        if($swap==false){
+            return;
+        }
+        static $data=array();
+        if(count($data)==0){
+            $data=array('header_data'=>$this->header_row['row_data'], 'row_heights'=>&$this->row_heights, 'row_data'=>&$this->row_data, 'rows'=>&$this->rows);
+            unset($this->row_heights, $this->row_data, $this->rows);
+            $this->row_heights=&$this->header_row['row_heights'];
+            $this->row_data=&$this->header_row['row_data'];
+            $this->rows=&$this->header_row['rows'];
+        }
+        else{
+            $this->header_row['row_data']=$data['header_data'];
+            unset($this->row_heights, $this->row_data, $this->rows);
+            $this->row_heights=$data['row_heights'];
+            $this->row_data=$data['row_data'];
+            $this->rows=$data['rows'];
+            $data=array();
+        }
+    }
+    /********************************************************************
 
    function __construct( FPDF-object $fpdf_obj, Mix $num_cols[, string $style = '' ])
    -----------------------------------------------------
@@ -628,110 +628,110 @@ 
    An easyTable object
    ***********************************************************************/
 
-   public function __construct($fpdf_obj, $num_cols, $style=''){
-      if(self::$table_counter){
-         error_log('Please use the end_table method to terminate the last table');
-         exit();
-      }
-      self::$table_counter=true;
-      $this->pdf_obj=&$fpdf_obj;
-      $this->document_style['bgcolor']=$this->pdf_obj->get_color('fill');
-      $this->document_style['font-family']=$this->pdf_obj->current_font('family');
-      $this->document_style['font-style']=$this->pdf_obj->current_font('style');
-      $this->document_style['font-size']=$this->pdf_obj->current_font('size');
-      $this->document_style['font-color']=$this->pdf_obj->get_color('text');
-      $this->document_style['document_width']=$this->pdf_obj->GetPageWidth()-$this->pdf_obj->get_margin('l')-$this->pdf_obj->get_margin('r');
-      $this->document_style['orientation']=$this->pdf_obj->get_orientation();
-      $this->document_style['line-width']=$this->pdf_obj->get_linewidth();
-      $this->table_style=$this->set_style($style, 'T');
-      $this->col_num=false;
-      $this->col_width=array();
-      if(is_int($num_cols) && $num_cols!=0){
-         $this->col_num=abs($num_cols);
-         $this->col_width=array_pad(array(), abs($num_cols), $this->table_style['width']/abs($num_cols));
-      }
-      elseif(is_string($num_cols)){
-         $num_cols=trim($num_cols, '}, ');
-         if($num_cols[0]!='{' && $num_cols[0]!='%'){
+    public function __construct($fpdf_obj, $num_cols, $style=''){
+        if(self::$table_counter){
+            error_log('Please use the end_table method to terminate the last table');
+            exit();
+        }
+        self::$table_counter=true;
+        $this->pdf_obj=&$fpdf_obj;
+        $this->document_style['bgcolor']=$this->pdf_obj->get_color('fill');
+        $this->document_style['font-family']=$this->pdf_obj->current_font('family');
+        $this->document_style['font-style']=$this->pdf_obj->current_font('style');
+        $this->document_style['font-size']=$this->pdf_obj->current_font('size');
+        $this->document_style['font-color']=$this->pdf_obj->get_color('text');
+        $this->document_style['document_width']=$this->pdf_obj->GetPageWidth()-$this->pdf_obj->get_margin('l')-$this->pdf_obj->get_margin('r');
+        $this->document_style['orientation']=$this->pdf_obj->get_orientation();
+        $this->document_style['line-width']=$this->pdf_obj->get_linewidth();
+        $this->table_style=$this->set_style($style, 'T');
+        $this->col_num=false;
+        $this->col_width=array();
+        if(is_int($num_cols) && $num_cols!=0){
+            $this->col_num=abs($num_cols);
+            $this->col_width=array_pad(array(), abs($num_cols), $this->table_style['width']/abs($num_cols));
+        }
+        elseif(is_string($num_cols)){
+            $num_cols=trim($num_cols, '}, ');
+            if($num_cols[0]!='{' && $num_cols[0]!='%'){
             error_log('Bad format for columns in Table constructor');
             exit();
-         }
-         $tmp=explode('{', $num_cols);
-         $tp=trim($tmp[0]);
-         $num_cols=explode(',', $tmp[1]);
-         $w=0;
-         foreach($num_cols as $c){
+            }
+            $tmp=explode('{', $num_cols);
+            $tp=trim($tmp[0]);
+            $num_cols=explode(',', $tmp[1]);
+            $w=0;
+            foreach($num_cols as $c){
             if(!is_numeric($c)){
-               error_log('Bad parameter format for columns in Table constructor');
-               exit();
+                error_log('Bad parameter format for columns in Table constructor');
+                exit();
             }
             if(abs($c)){
-               $w+=abs($c);
-               $this->col_width[]=abs($c);
+                $w+=abs($c);
+                $this->col_width[]=abs($c);
             }
             else{
-               error_log('Column width can not be zero');
+                error_log('Column width can not be zero');
+            }
             }
-         }
-         $this->col_num=count($this->col_width);
-         if($tp=='%'){
+            $this->col_num=count($this->col_width);
+            if($tp=='%'){
             if($w!=100){
-               error_log('The sum of the percentages of the columns is not 100');
-               exit();
+                error_log('The sum of the percentages of the columns is not 100');
+                exit();
             }
             foreach($this->col_width as $i=>$c){
-               $this->col_width[$i]=$c*$this->table_style['width']/100;
+                $this->col_width[$i]=$c*$this->table_style['width']/100;
+            }
             }
-         }
-         elseif($w!=$this->table_style['width'] && $w){
+            elseif($w!=$this->table_style['width'] && $w){
             if($w<$this->document_style['document_width']){
-               $this->table_style['width']=$w;
+                $this->table_style['width']=$w;
             }
             else{
-               $this->table_style['width']=$this->document_style['document_width'];
-               $d=$this->table_style['width']/$w;
-               for($i=0; $i<count($num_cols); $i++){
-                  $this->col_width[$i]*=$d;
-               }
-            }
-         }
-      }
-      if($this->col_num==false){
-         error_log('Unspecified number of columns in Table constructor');
-         exit();
-      }
-      $this->table_style['c-align']=array_pad($this->table_style['c-align'], $this->col_num, 'L');
-      if($this->table_style['l-margin']){
-         $this->baseX=$this->pdf_obj->get_margin('l')+min($this->table_style['l-margin'],$this->document_style['document_width']-$this->table_style['width']);
-      }
-      else{
-         if($this->table_style['align']=='L'){
+                $this->table_style['width']=$this->document_style['document_width'];
+                $d=$this->table_style['width']/$w;
+                for($i=0; $i<count($num_cols); $i++){
+                    $this->col_width[$i]*=$d;
+                }
+            }
+            }
+        }
+        if($this->col_num==false){
+            error_log('Unspecified number of columns in Table constructor');
+            exit();
+        }
+        $this->table_style['c-align']=array_pad($this->table_style['c-align'], $this->col_num, 'L');
+        if($this->table_style['l-margin']){
+            $this->baseX=$this->pdf_obj->get_margin('l')+min($this->table_style['l-margin'],$this->document_style['document_width']-$this->table_style['width']);
+        }
+        else{
+            if($this->table_style['align']=='L'){
             $this->baseX=$this->pdf_obj->get_margin('l');
-         }
-         elseif($this->table_style['align']=='R'){
+            }
+            elseif($this->table_style['align']=='R'){
             $this->baseX=$this->pdf_obj->get_margin('l')+$this->document_style['document_width']-$this->table_style['width'];
-         }
-         else{
+            }
+            else{
             $this->baseX=$this->pdf_obj->get_margin('l')+($this->document_style['document_width']-$this->table_style['width'])/2;
-         }
-      }
-      $this->row_style_def=$this->set_style('', 'R');
-      $this->row_style=$this->row_style_def;
-      $this->row_heights=array();
-      $this->row_data=array();
-      $this->rows=array();
-      $this->total_rowspan=0;
-      $this->col_counter=0;
-      $this->grid=array();
-      $this->blocks=array();
-      $this->overflow=0;
-      if($this->table_style['border-width']!=false){
-         $this->pdf_obj->SetLineWidth($this->table_style['border-width']);
-      }
-      $this->header_row=array();
-      $this->new_table=true;
-   }
-   /***********************************************************************
+            }
+        }
+        $this->row_style_def=$this->set_style('', 'R');
+        $this->row_style=$this->row_style_def;
+        $this->row_heights=array();
+        $this->row_data=array();
+        $this->rows=array();
+        $this->total_rowspan=0;
+        $this->col_counter=0;
+        $this->grid=array();
+        $this->blocks=array();
+        $this->overflow=0;
+        if($this->table_style['border-width']!=false){
+            $this->pdf_obj->SetLineWidth($this->table_style['border-width']);
+        }
+        $this->header_row=array();
+        $this->new_table=true;
+    }
+    /***********************************************************************
 
    function rowStyle( string $style )
    -------------------------------------------------------------
@@ -749,10 +749,10 @@ 
    This function should be called before the first cell of the current row
    ***********************************************************************/
 
-   public function rowStyle($style){
-      $this->row_style=$this->set_style($style, 'R');
-   }
-   /***********************************************************************
+    public function rowStyle($style){
+        $this->row_style=$this->set_style($style, 'R');
+    }
+    /***********************************************************************
 
    function easyCell( string $data [, string $style = '' ])
    ------------------------------------------------------------------------
@@ -768,62 +768,62 @@ 
    void
    ***********************************************************************/
 
-   public function easyCell($data, $style=''){
-      if($this->col_counter<$this->col_num){
-         $sty=$this->set_style($style, 'C', $this->col_counter);
-         $this->col_counter++;
-         $row_number=count($this->rows);
-         $cell_index=count($this->row_data);
-         $cell_pos=$this->get_available($sty['colspan'], $sty['rowspan']);
-         $colm=$cell_pos %$this->col_num;
-         if($sty['img']!=false && $data!='' && $sty['valign']=='M'){
+    public function easyCell($data, $style=''){
+        if($this->col_counter<$this->col_num){
+            $sty=$this->set_style($style, 'C', $this->col_counter);
+            $this->col_counter++;
+            $row_number=count($this->rows);
+            $cell_index=count($this->row_data);
+            $cell_pos=$this->get_available($sty['colspan'], $sty['rowspan']);
+            $colm=$cell_pos %$this->col_num;
+            if($sty['img']!=false && $data!='' && $sty['valign']=='M'){
             $sty['valign']=$this->row_style['valign'];
-         }
-         if($sty['rowspan']){
+            }
+            if($sty['rowspan']){
             $this->total_rowspan=max($this->total_rowspan, $sty['rowspan']);
             $this->blocks[$cell_index]=array($cell_index, $row_number, $sty['rowspan']);
-         }
-         $w=$this->col_width[$colm];
-         $r=0;
-         while($r<$sty['colspan'] && $this->col_counter<$this->col_num){
+            }
+            $w=$this->col_width[$colm];
+            $r=0;
+            while($r<$sty['colspan'] && $this->col_counter<$this->col_num){
             $this->col_counter++;
             $colm++;
             $w+=$this->col_width[$colm];
             $r++;
-         }
-         $w-=2*$sty['paddingX'];
-         if($sty['img']!==false && is_string($sty['img'])){
+            }
+            $w-=2*$sty['paddingX'];
+            if($sty['img']!==false && is_string($sty['img'])){
             $data=$sty['img'];
             $sty['img']=false;
-         }
-         $data=& $this->pdf_obj->extMultiCell($sty['font-family'], $sty['font-style'], $sty['font-size'], $sty['font-color'], $w, $data);
-         $h=0;
-         $rn=count($data);
-         for($ri=0; $ri<$rn; $ri++){
+            }
+            $data=& $this->pdf_obj->extMultiCell($sty['font-family'], $sty['font-style'], $sty['font-size'], $sty['font-color'], $w, $data);
+            $h=0;
+            $rn=count($data);
+            for($ri=0; $ri<$rn; $ri++){
             $h+=$data[$ri]['height']*$sty['line-height'];
-         }
-         if($sty['img']){
+            }
+            if($sty['img']){
             if($sty['img']['w']>$w){
-               $sty['img']['h']=$w*$sty['img']['h']/$sty['img']['w'];
-               $sty['img']['w']=$w;
+                $sty['img']['h']=$w*$sty['img']['h']/$sty['img']['w'];
+                $sty['img']['w']=$w;
             }
             if($h){
-               $h+=self::IMGPadding;
+                $h+=self::IMGPadding;
             }
             $h+=$sty['img']['h'];
-         }
-         $w+=2*$sty['paddingX'];
+            }
+            $w+=2*$sty['paddingX'];
          
-         $posx=$this->baseX;
-         $d=$cell_pos %$this->col_num;
-         for($k=0; $k<$d; $k++){
+            $posx=$this->baseX;
+            $d=$cell_pos %$this->col_num;
+            for($k=0; $k<$d; $k++){
             $posx+=$this->col_width[$k];
-         }
-         $this->row_data[$cell_index]=array($data, $sty, $w, $h, $cell_pos, 0, $posx, 0);
+            }
+            $this->row_data[$cell_index]=array($data, $sty, $w, $h, $cell_pos, 0, $posx, 0);
          
-      }
-   }
-   /***********************************************************************
+        }
+    }
+    /***********************************************************************
 
    function printRow ( [ bool $setAsHeader = false ] )
    ------------------------------------------------------------------------
@@ -848,98 +848,98 @@ 
    total_rowspan=max(total_rowspan, max(rowspan of cell in the current row))-1;
    ***********************************************************************/
 
-   public function printRow($setAsHeader=false){
-      $this->col_counter=0;
-      $row_number=count($this->rows);
-      $this->rows[$row_number]=count($this->row_data);
-      $mx=$this->row_style['min-height'];
+    public function printRow($setAsHeader=false){
+        $this->col_counter=0;
+        $row_number=count($this->rows);
+        $this->rows[$row_number]=count($this->row_data);
+        $mx=$this->row_style['min-height'];
 
-         $this->row_content_loop($row_number, function($index)use(&$mx){
-         if($this->row_data[$index][1]['rowspan']==0){
+            $this->row_content_loop($row_number, function($index)use(&$mx){
+            if($this->row_data[$index][1]['rowspan']==0){
             $mx=max($mx, $this->row_data[$index][3]+2*$this->row_data[$index][1]['paddingY']);
-         }
-      });
-      $this->row_heights[$row_number]=$mx;
+            }
+        });
+        $this->row_heights[$row_number]=$mx;
       
-      if($this->total_rowspan>0){
-         $this->total_rowspan--;
-      }
-      else{
-         $row_number=count($this->rows);
-         if(count($this->blocks)>0){
+        if($this->total_rowspan>0){
+            $this->total_rowspan--;
+        }
+        else{
+            $row_number=count($this->rows);
+            if(count($this->blocks)>0){
             
             foreach($this->blocks as $bk_id=>$block){
-               $h=0;
-               for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                  $h+=$this->row_heights[$i];
-               }
-               $t=$this->row_data[$block[0]][3]+2*$this->row_data[$block[0]][1]['paddingY'];
-               if($h>0 && $h<$t){
-                  for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                     $this->row_heights[$i]*=$t/$h;
-                  }
-               }
+                $h=0;
+                for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
+                    $h+=$this->row_heights[$i];
+                }
+                $t=$this->row_data[$block[0]][3]+2*$this->row_data[$block[0]][1]['paddingY'];
+                if($h>0 && $h<$t){
+                    for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
+                        $this->row_heights[$i]*=$t/$h;
+                    }
+                }
             }
             foreach($this->blocks as $j=>$block){
-               $h=0;
-               for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                  $h+=$this->row_heights[$i];
-               }
-               $this->row_data[$j][5]=$h;
-            }
-         }
-         $block_height=0;
-         for($j=0; $j<$row_number; $j++){
+                $h=0;
+                for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
+                    $h+=$this->row_heights[$i];
+                }
+                $this->row_data[$j][5]=$h;
+            }
+            }
+            $block_height=0;
+            for($j=0; $j<$row_number; $j++){
 
-               $this->row_content_loop($j, function($index)use($j, $block_height){
-               if($this->row_data[$index][1]['rowspan']==0){
-                  $this->row_data[$index][5]=$this->row_heights[$j];
-               }
-               $this->row_data[$index][1]['padding-y']=$this->row_data[$index][1]['paddingY'];
-               if($this->row_data[$index][1]['valign']=='M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))){
-                  $this->row_data[$index][1]['padding-y']=($this->row_data[$index][5]-$this->row_data[$index][3])/2;
-               }
-               elseif($this->row_data[$index][1]['valign']=='B'){
-                  $this->row_data[$index][1]['padding-y']=$this->row_data[$index][5]-($this->row_data[$index][3]+$this->row_data[$index][1]['paddingY']);
-               }
+                $this->row_content_loop($j, function($index)use($j, $block_height){
+                if($this->row_data[$index][1]['rowspan']==0){
+                    $this->row_data[$index][5]=$this->row_heights[$j];
+                }
+                $this->row_data[$index][1]['padding-y']=$this->row_data[$index][1]['paddingY'];
+                if($this->row_data[$index][1]['valign']=='M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))){
+                    $this->row_data[$index][1]['padding-y']=($this->row_data[$index][5]-$this->row_data[$index][3])/2;
+                }
+                elseif($this->row_data[$index][1]['valign']=='B'){
+                    $this->row_data[$index][1]['padding-y']=$this->row_data[$index][5]-($this->row_data[$index][3]+$this->row_data[$index][1]['paddingY']);
+                }
             });
             $block_height+=$this->row_heights[$j];
-         }
-         if($setAsHeader===true){
+            }
+            if($setAsHeader===true){
             if(count($this->header_row)==0){
-               $this->header_row['row_heights']=$this->row_heights;
-               $this->header_row['row_data']=$this->row_data;
-               $this->header_row['rows']=$this->rows;
+                $this->header_row['row_heights']=$this->row_heights;
+                $this->header_row['row_data']=$this->row_data;
+                $this->header_row['rows']=$this->rows;
+            }
             }
-         }
-         if($this->table_style['split-row']==false && $this->pdf_obj->PageBreak()<$this->pdf_obj->GetY()+max($block_height,$this->row_heights[0])){
+            if($this->table_style['split-row']==false && $this->pdf_obj->PageBreak()<$this->pdf_obj->GetY()+max($block_height,$this->row_heights[0])){
             $this->pdf_obj->addPage($this->document_style['orientation']);
             if(count($this->header_row)>0){
-               $this->printing_loop(true);
+                $this->printing_loop(true);
+            }
             }
-         }
          
-         if($this->new_table){
+            if($this->new_table){
             if(count($this->header_row)>0){
-               $r=$this->pdf_obj->PageBreak()-($this->pdf_obj->GetY()+$block_height);
-               if($r<0 || $r<self::PBThreshold){
-                  $this->pdf_obj->addPage($this->document_style['orientation']);
-               }
+                $r=$this->pdf_obj->PageBreak()-($this->pdf_obj->GetY()+$block_height);
+                if($r<0 || $r<self::PBThreshold){
+                    $this->pdf_obj->addPage($this->document_style['orientation']);
+                }
             }
             $this->new_table=false;
-         }
-         $this->printing_loop();
-         $this->grid=array();
-         $this->row_data=array();
-         $this->rows=array();
-         $this->row_heights=array();
-         $this->blocks=array();
-         $this->overflow=0;
-         $this->new_table=false;
-      }
-      $this->row_style=$this->row_style_def;
-   }
-   /***********************************************************************
+            }
+            $this->printing_loop();
+            $this->grid=array();
+            $this->row_data=array();
+            $this->rows=array();
+            $this->row_heights=array();
+            $this->blocks=array();
+            $this->overflow=0;
+            $this->new_table=false;
+        }
+        $this->row_style=$this->row_style_def;
+    }
+    /***********************************************************************
 
    function endTable( [int $bottomMargin=2])
    ------------------------------------------
@@ -955,32 +955,32 @@ 
    Void
    ***********************************************************************/
 
-   public function endTable($bottomMargin=2){
-      self::$table_counter=false;
-      if($this->table_style['border-width']!=false){
-         $this->pdf_obj->SetLineWidth($this->document_style['line-width']);
-      }
-      $this->pdf_obj->SetX($this->pdf_obj->get_margin('l'));
-      $this->pdf_obj->Ln($bottomMargin);
-      $this->pdf_obj->resetStaticData();
-      unset($this->pdf_obj);
-      unset($this->document_style);
-      unset($this->table_style);
-      unset($this->col_num);
-      unset($this->col_width);
-      unset($this->baseX);
-      unset($this->row_style_def);
-      unset($this->row_style);
-      unset($this->row_heights);
-      unset($this->row_data);
-      unset($this->rows);
-      unset($this->total_rowspan);
-      unset($this->col_counter);
-      unset($this->grid);
-      unset($this->blocks);
-      unset($this->overflow);
-      unset($this->header_row);
-   }
+    public function endTable($bottomMargin=2){
+        self::$table_counter=false;
+        if($this->table_style['border-width']!=false){
+            $this->pdf_obj->SetLineWidth($this->document_style['line-width']);
+        }
+        $this->pdf_obj->SetX($this->pdf_obj->get_margin('l'));
+        $this->pdf_obj->Ln($bottomMargin);
+        $this->pdf_obj->resetStaticData();
+        unset($this->pdf_obj);
+        unset($this->document_style);
+        unset($this->table_style);
+        unset($this->col_num);
+        unset($this->col_width);
+        unset($this->baseX);
+        unset($this->row_style_def);
+        unset($this->row_style);
+        unset($this->row_heights);
+        unset($this->row_data);
+        unset($this->rows);
+        unset($this->total_rowspan);
+        unset($this->col_counter);
+        unset($this->grid);
+        unset($this->blocks);
+        unset($this->overflow);
+        unset($this->header_row);
+    }
    
 }
 ?>

Spacing +513 added lines, -513 removed lines

@@ -10,16 +10,16 @@ 
   
 class EasyTable
 {
-   const LP=0.4;
-   const XPadding=1;
-   const YPadding=1;
-   const IMGPadding=0.5;
-   const PBThreshold=30;
-   static private $table_counter=false;
-   static private $style=array('width'=>false, 'border'=>false, 'border-color'=>false,
+   const LP = 0.4;
+   const XPadding = 1;
+   const YPadding = 1;
+   const IMGPadding = 0.5;
+   const PBThreshold = 30;
+   static private $table_counter = false;
+   static private $style = array('width'=>false, 'border'=>false, 'border-color'=>false,
    'border-width'=>false, 'line-height'=>false,
    'align'=>'', 'valign'=>'', 'bgcolor'=>false, 'split-row'=>false, 'l-margin'=>false,
-   'font-family'=>false, 'font-style'=>false,'font-size'=>false, 'font-color'=>false,
+   'font-family'=>false, 'font-style'=>false, 'font-size'=>false, 'font-color'=>false,
    'paddingX'=>false, 'paddingY'=>false);
    private $pdf_obj;
    private $document_style;
@@ -40,551 +40,551 @@ 
    private $header_row;
    private $new_table;
 
-   private function get_available($colspan, $rowspan){
-      static $k=0;
-      if(count($this->grid)==0){
-         $k=0;
+   private function get_available($colspan, $rowspan) {
+      static $k = 0;
+      if (count($this->grid) == 0) {
+         $k = 0;
       }
-      while(isset($this->grid[$k])){
+      while (isset($this->grid[$k])) {
          $k++;
       }
-      for($i=0; $i<=$colspan; $i++){
-         for($j=0; $j<=$rowspan; $j++){
-            $this->grid[$k+$i+$j*$this->col_num]=true;
+      for ($i = 0; $i <= $colspan; $i++) {
+         for ($j = 0; $j <= $rowspan; $j++) {
+            $this->grid[$k + $i + $j * $this->col_num] = true;
          }
       }
       return $k;
    }
 
-   private function get_style($str, $c){
-      $result=self::$style;
-      if($c=='C'){
-         $result['colspan']=0;
-         $result['rowspan']=0;
-         $result['img']=false;
-      }
-      if($c=='C' || $c=='R'){
+   private function get_style($str, $c) {
+      $result = self::$style;
+      if ($c == 'C') {
+         $result['colspan'] = 0;
+         $result['rowspan'] = 0;
+         $result['img'] = false;
+      }
+      if ($c == 'C' || $c == 'R') {
          unset($result['width']);
          unset($result['border-width']);
          unset($result['split-row']);
          unset($result['l-margin']);
       }
-      if($c=='R' || $c=='T'){
-         if($c=='R'){
-            $result['c-align']=array_pad(array(), $this->col_num, 'L');
+      if ($c == 'R' || $c == 'T') {
+         if ($c == 'R') {
+            $result['c-align'] = array_pad(array(), $this->col_num, 'L');
          }
-         else{
-            $result['c-align']=array();
+         else {
+            $result['c-align'] = array();
          }
       }
-      if($c=='R'){
-         $result['min-height']=false;
+      if ($c == 'R') {
+         $result['min-height'] = false;
       }
-      $tmp=explode(';', $str);
-      foreach($tmp as $x){
-         if($x && strpos($x,':')>0){
-            $r=explode(':',$x);
-            $r[0]=trim($r[0]);
-            $r[1]=trim($r[1]);
-            if(isset($result[$r[0]])){
-               $result[$r[0]]=$r[1];
+      $tmp = explode(';', $str);
+      foreach ($tmp as $x) {
+         if ($x && strpos($x, ':') > 0) {
+            $r = explode(':', $x);
+            $r[0] = trim($r[0]);
+            $r[1] = trim($r[1]);
+            if (isset($result[$r[0]])) {
+               $result[$r[0]] = $r[1];
             }
          }
       }
       return $result;
    }
 
-   private function inherating(&$sty, $setting, $c){
-      if($c=='C'){
-         $sty[$setting]=$this->row_style[$setting];
+   private function inherating(&$sty, $setting, $c) {
+      if ($c == 'C') {
+         $sty[$setting] = $this->row_style[$setting];
       }
-      elseif($c=='R'){
-         $sty[$setting]=$this->table_style[$setting];
+      elseif ($c == 'R') {
+         $sty[$setting] = $this->table_style[$setting];
       }
-      else{
-         $sty[$setting]=$this->document_style[$setting];
+      else {
+         $sty[$setting] = $this->document_style[$setting];
       }
    }
    
 
-   private function set_style($str, $c, $pos=''){
-      $sty=$this->get_style($str, $c);
-      if($c=='T'){
-         if(is_numeric($sty['width'])){
-            $sty['width']=min(abs($sty['width']),$this->document_style['document_width']);
-            if($sty['width']==0){
-               $sty['width']=$this->document_style['document_width'];
-            }
-         }
-         else{
-            $x=strpos($sty['width'], '%');
-            if($x!=false){
-               $x=min(abs(substr($sty['width'], 0, $x)), 100);
-               if($x){
-                  $sty['width']=$x*$this->document_style['document_width']/100.0;
+   private function set_style($str, $c, $pos = '') {
+      $sty = $this->get_style($str, $c);
+      if ($c == 'T') {
+         if (is_numeric($sty['width'])) {
+            $sty['width'] = min(abs($sty['width']), $this->document_style['document_width']);
+            if ($sty['width'] == 0) {
+               $sty['width'] = $this->document_style['document_width'];
+            }
+         }
+         else {
+            $x = strpos($sty['width'], '%');
+            if ($x != false) {
+               $x = min(abs(substr($sty['width'], 0, $x)), 100);
+               if ($x) {
+                  $sty['width'] = $x * $this->document_style['document_width'] / 100.0;
                }
-               else{
-                  $sty['width']=$this->document_style['document_width'];
+               else {
+                  $sty['width'] = $this->document_style['document_width'];
                }
             }
-            else{
-               $sty['width']=$this->document_style['document_width'];
+            else {
+               $sty['width'] = $this->document_style['document_width'];
             }
          }
-         if(!is_numeric($sty['l-margin'])){
-            $sty['l-margin']=0;
+         if (!is_numeric($sty['l-margin'])) {
+            $sty['l-margin'] = 0;
          }
-         else{
-            $sty['l-margin']=abs($sty['l-margin']);
+         else {
+            $sty['l-margin'] = abs($sty['l-margin']);
          }
-         if(is_numeric($sty['border-width'])){
-            $sty['border-width']=abs($sty['border-width']);
+         if (is_numeric($sty['border-width'])) {
+            $sty['border-width'] = abs($sty['border-width']);
          }
-         else{
-            $sty['border-width']=false;
+         else {
+            $sty['border-width'] = false;
          }
-         if($sty['split-row']=='false'){
-            $sty['split-row']=false;
+         if ($sty['split-row'] == 'false') {
+            $sty['split-row'] = false;
          }
-         elseif($sty['split-row']!==false){
-            $sty['split-row']=true;
+         elseif ($sty['split-row'] !== false) {
+            $sty['split-row'] = true;
          }
       }
-      if($c=='R'){
-         if(!is_numeric($sty['min-height']) || $sty['min-height']<0){
-            $sty['min-height']=0;
+      if ($c == 'R') {
+         if (!is_numeric($sty['min-height']) || $sty['min-height'] < 0) {
+            $sty['min-height'] = 0;
          }
       }
-      if(!is_numeric($sty['paddingX'])){
-         if($c=='C' || $c=='R'){
+      if (!is_numeric($sty['paddingX'])) {
+         if ($c == 'C' || $c == 'R') {
             $this->inherating($sty, 'paddingX', $c);
          }
-         else{
-            $sty['paddingX']=self::XPadding;
+         else {
+            $sty['paddingX'] = self::XPadding;
          }
       }
-      $sty['paddingX']=abs($sty['paddingX']);
-      if(!is_numeric($sty['paddingY'])){
-         if($c=='C' || $c=='R'){
+      $sty['paddingX'] = abs($sty['paddingX']);
+      if (!is_numeric($sty['paddingY'])) {
+         if ($c == 'C' || $c == 'R') {
             $this->inherating($sty, 'paddingY', $c);
          }
-         else{
-            $sty['paddingY']=self::YPadding;
+         else {
+            $sty['paddingY'] = self::YPadding;
          }
       }
-      $sty['paddingY']=abs($sty['paddingY']);
-      if($sty['border']===false && ($c=='C' || $c=='R')){
+      $sty['paddingY'] = abs($sty['paddingY']);
+      if ($sty['border'] === false && ($c == 'C' || $c == 'R')) {
          $this->inherating($sty, 'border', $c);
       }
-      else{
-         $border=array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
-         if(!(is_numeric($sty['border']) && $sty['border']==1)){
-            foreach($border as $k=>$v){
-               $border[$k]=0;
-               if(strpos($sty['border'], $k)!==false){
-                  $border[$k]=1;
+      else {
+         $border = array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
+         if (!(is_numeric($sty['border']) && $sty['border'] == 1)) {
+            foreach ($border as $k=>$v) {
+               $border[$k] = 0;
+               if (strpos($sty['border'], $k) !== false) {
+                  $border[$k] = 1;
                }
             }
          }
-         $sty['border']=$border;
+         $sty['border'] = $border;
       }
-      $color_settings=array('bgcolor', 'font-color', 'border-color');
-      foreach($color_settings as $setting){
-         if($sty[$setting]===false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))){
-            if($c=='C' || $c=='R'){
+      $color_settings = array('bgcolor', 'font-color', 'border-color');
+      foreach ($color_settings as $setting) {
+         if ($sty[$setting] === false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))) {
+            if ($c == 'C' || $c == 'R') {
                $this->inherating($sty, $setting, $c);
             }
-            elseif($setting=='font-color'){
-               $sty[$setting]=$this->document_style[$setting];
+            elseif ($setting == 'font-color') {
+               $sty[$setting] = $this->document_style[$setting];
             }
          }
-         else{
-            $sty[$setting]=$sty[$setting];
+         else {
+            $sty[$setting] = $sty[$setting];
          }
       }
-      $font_settings=array('font-family', 'font-style', 'font-size');
-      foreach($font_settings as $setting){
-         if($sty[$setting]===false){
+      $font_settings = array('font-family', 'font-style', 'font-size');
+      foreach ($font_settings as $setting) {
+         if ($sty[$setting] === false) {
             $this->inherating($sty, $setting, $c);
          }
       }
-      if(is_numeric($sty['line-height'])){
-         $sty['line-height']=self::LP*abs($sty['line-height']);
+      if (is_numeric($sty['line-height'])) {
+         $sty['line-height'] = self::LP * abs($sty['line-height']);
       }
-      else{
-         if($c=='C' || $c=='R'){
-            $this->inherating($sty,'line-height', $c);
+      else {
+         if ($c == 'C' || $c == 'R') {
+            $this->inherating($sty, 'line-height', $c);
          }
-         else{
-            $sty['line-height']=self::LP;
+         else {
+            $sty['line-height'] = self::LP;
          }
       }
-      if($c=='C'){
-         if($sty['img']){
-            $tmp=explode(',', $sty['img']);
-            if(file_exists($tmp[0])){
-               $sty['img']=array('path'=>'', 'h'=>0, 'w'=>0);
-               $img=@ getimagesize($tmp[0]);
-               $sty['img']['path']=$tmp[0];
-               for($i=1; $i<3; $i++){
-                  if(isset($tmp[$i])){
-                     $tmp[$i]=trim(strtolower($tmp[$i]));
-                     if($tmp[$i][0]=='w' || $tmp[$i][0]=='h'){
-                        $t=substr($tmp[$i],1);
-                        if(is_numeric($t)){
-                           $sty['img'][$tmp[$i][0]]=abs($t);
+      if ($c == 'C') {
+         if ($sty['img']) {
+            $tmp = explode(',', $sty['img']);
+            if (file_exists($tmp[0])) {
+               $sty['img'] = array('path'=>'', 'h'=>0, 'w'=>0);
+               $img = @ getimagesize($tmp[0]);
+               $sty['img']['path'] = $tmp[0];
+               for ($i = 1; $i < 3; $i++) {
+                  if (isset($tmp[$i])) {
+                     $tmp[$i] = trim(strtolower($tmp[$i]));
+                     if ($tmp[$i][0] == 'w' || $tmp[$i][0] == 'h') {
+                        $t = substr($tmp[$i], 1);
+                        if (is_numeric($t)) {
+                           $sty['img'][$tmp[$i][0]] = abs($t);
                         }
                      }
                   }
                }
-               $ration=$img[0]/$img[1];
-               if($sty['img']['w']+$sty['img']['h']==0){
-                  $sty['img']['w']=$img[0];
-                  $sty['img']['h']=$img[1];
+               $ration = $img[0] / $img[1];
+               if ($sty['img']['w'] + $sty['img']['h'] == 0) {
+                  $sty['img']['w'] = $img[0];
+                  $sty['img']['h'] = $img[1];
                }
-               elseif($sty['img']['w']==0){
-                  $sty['img']['w']=$sty['img']['h']*$ration;
+               elseif ($sty['img']['w'] == 0) {
+                  $sty['img']['w'] = $sty['img']['h'] * $ration;
                }
-               elseif($sty['img']['h']==0){
-                  $sty['img']['h']=$sty['img']['w']/$ration;
+               elseif ($sty['img']['h'] == 0) {
+                  $sty['img']['h'] = $sty['img']['w'] / $ration;
                }
             }
-            else{
-               $sty['img']='failed to open stream: file ' . $tmp[0] .' does not exist';
+            else {
+               $sty['img'] = 'failed to open stream: file '.$tmp[0].' does not exist';
             }
          }
-         if(is_numeric($sty['colspan']) && $sty['colspan']>0){
+         if (is_numeric($sty['colspan']) && $sty['colspan'] > 0) {
             $sty['colspan']--;
          }
-         else{
-            $sty['colspan']=0;
+         else {
+            $sty['colspan'] = 0;
          }
-         if(is_numeric($sty['rowspan']) && $sty['rowspan']>0){
+         if (is_numeric($sty['rowspan']) && $sty['rowspan'] > 0) {
             $sty['rowspan']--;
          }
-         else{
-            $sty['rowspan']=0;
+         else {
+            $sty['rowspan'] = 0;
          }
-         if($sty['valign']==false && ($sty['rowspan']>0 || $sty['img']!==false)){
-            $sty['valign']='M';
+         if ($sty['valign'] == false && ($sty['rowspan'] > 0 || $sty['img'] !== false)) {
+            $sty['valign'] = 'M';
          }
-         if($sty['align']==false && $sty['img']!==false){
-            $sty['align']='C';
+         if ($sty['align'] == false && $sty['img'] !== false) {
+            $sty['align'] = 'C';
          }
       }
-      if($c=='T' || $c=='R'){
-         $tmp=explode('{',$sty['align']);
-         if($c=='T'){
-            $sty['align']=trim($tmp[0]);
+      if ($c == 'T' || $c == 'R') {
+         $tmp = explode('{', $sty['align']);
+         if ($c == 'T') {
+            $sty['align'] = trim($tmp[0]);
          }
-         if(isset($tmp[1])){
-            $tmp[1]=trim($tmp[1], '}');
-            if(strlen($tmp[1])){
-               for($i=0; $i<strlen($tmp[1]); $i++){
-                  if(preg_match("/[LCRJ]/", $tmp[1][$i])!=0){
-                     $sty['c-align'][$i]=$tmp[1][$i];
+         if (isset($tmp[1])) {
+            $tmp[1] = trim($tmp[1], '}');
+            if (strlen($tmp[1])) {
+               for ($i = 0; $i < strlen($tmp[1]); $i++) {
+                  if (preg_match("/[LCRJ]/", $tmp[1][$i]) != 0) {
+                     $sty['c-align'][$i] = $tmp[1][$i];
                   }
-                  else{
-                     $sty['c-align'][$i]='L';
+                  else {
+                     $sty['c-align'][$i] = 'L';
                   }
                }
             }
-            if($c=='R'){
-               $sty['align']='L';
-               $sty['c-align']=array_slice($sty['c-align'],0,$this->col_num);
+            if ($c == 'R') {
+               $sty['align'] = 'L';
+               $sty['c-align'] = array_slice($sty['c-align'], 0, $this->col_num);
             }
          }
       }
-      if($sty['align']!='L' && $sty['align']!='C' && $sty['align']!='R' && $sty['align']!='J'){
-         if($c=='C'){
-            $sty['align']=$this->row_style['c-align'][$pos];
+      if ($sty['align'] != 'L' && $sty['align'] != 'C' && $sty['align'] != 'R' && $sty['align'] != 'J') {
+         if ($c == 'C') {
+            $sty['align'] = $this->row_style['c-align'][$pos];
          }
-         elseif($c=='R'){
-            $sty['align']='L';
-            $sty['c-align']=$this->table_style['c-align'];
+         elseif ($c == 'R') {
+            $sty['align'] = 'L';
+            $sty['c-align'] = $this->table_style['c-align'];
          }
-         else{
-            $sty['align']='C';
+         else {
+            $sty['align'] = 'C';
          }
       }
-      elseif($c=='T' && $sty['align']=='J'){
-         $sty['align']='C';
+      elseif ($c == 'T' && $sty['align'] == 'J') {
+         $sty['align'] = 'C';
       }
-      if($sty['valign']!='T' && $sty['valign']!='M' && $sty['valign']!='B'){
-         if($c=='C' || $c=='R'){
+      if ($sty['valign'] != 'T' && $sty['valign'] != 'M' && $sty['valign'] != 'B') {
+         if ($c == 'C' || $c == 'R') {
             $this->inherating($sty, 'valign', $c);
          }
-         else{
-            $sty['valign']='T';
+         else {
+            $sty['valign'] = 'T';
          }
       }
       return $sty;
    }
 
-   private function row_content_loop($counter, $f){
-      $t=0;
-      if($counter>0){
-         $t=$this->rows[$counter-1];
+   private function row_content_loop($counter, $f) {
+      $t = 0;
+      if ($counter > 0) {
+         $t = $this->rows[$counter - 1];
       }
-      for($index=$t; $index<$this->rows[$counter]; $index++){
+      for ($index = $t; $index < $this->rows[$counter]; $index++) {
          $f($index);
       }
    }
 
-   private function mk_border($i, $y, $split){
-      $w=$this->row_data[$i][2];
-      $h=$this->row_data[$i][5];
-      if($split){
-         $h=$this->pdf_obj->PageBreak()-$y;
+   private function mk_border($i, $y, $split) {
+      $w = $this->row_data[$i][2];
+      $h = $this->row_data[$i][5];
+      if ($split) {
+         $h = $this->pdf_obj->PageBreak() - $y;
       }
-      if($this->row_data[$i][1]['border-color']!=false){
+      if ($this->row_data[$i][1]['border-color'] != false) {
          $this->pdf_obj->resetColor($this->row_data[$i][1]['border-color'], 'D');
       }
-      $a=array(1, 1, 1, 0);
-      $borders=array('L'=>3, 'T'=>0, 'R'=>1, 'B'=>2);
-      foreach($borders as $border=>$j){
-         if($this->row_data[$i][1]['border'][$border]){
-            if($border=='B'){
-               if($split==0){
-                  $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
+      $a = array(1, 1, 1, 0);
+      $borders = array('L'=>3, 'T'=>0, 'R'=>1, 'B'=>2);
+      foreach ($borders as $border=>$j) {
+         if ($this->row_data[$i][1]['border'][$border]) {
+            if ($border == 'B') {
+               if ($split == 0) {
+                  $this->pdf_obj->Line($this->row_data[$i][6] + (1 + $a[($j + 2) % 4]) % 2 * $w, $y + (1 + $a[($j + 1) % 4]) % 2 * $h, $this->row_data[$i][6] + $a[$j % 4] * $w, $y + ($a[($j + 3) % 4]) % 2 * $h);
                }
             }
-            else{
-               $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
+            else {
+               $this->pdf_obj->Line($this->row_data[$i][6] + (1 + $a[($j + 2) % 4]) % 2 * $w, $y + (1 + $a[($j + 1) % 4]) % 2 * $h, $this->row_data[$i][6] + $a[$j % 4] * $w, $y + ($a[($j + 3) % 4]) % 2 * $h);
             }
          }
       }
       
-      if($this->row_data[$i][1]['border-color']!=false){
+      if ($this->row_data[$i][1]['border-color'] != false) {
          $this->pdf_obj->resetColor($this->document_style['bgcolor'], 'D');
       }
-      if($split){
-         $this->pdf_obj->row_data[$i][1]['border']['T']=0;
+      if ($split) {
+         $this->pdf_obj->row_data[$i][1]['border']['T'] = 0;
       }
    }
 
-   private function print_text($i, $y, $split){
-      $padding=$this->row_data[$i][1]['padding-y'];
-      $k=$padding;
-      if($this->row_data[$i][1]['img']!==false){
-         if($this->row_data[$i][1]['valign']=='B'){
-            $k+=$this->row_data[$i][1]['img']['h']+self::IMGPadding;
-         }
-      }
-      $l=0;
-      if(count($this->row_data[$i][0])){
-         $x=$this->row_data[$i][6]+$this->row_data[$i][1]['paddingX'];
-         $xpadding=2*$this->row_data[$i][1]['paddingX'];
-         $l=count($this->row_data[$i][0])* $this->row_data[$i][1]['line-height']*$this->row_data[$i][1]['font-size'];
-         $this->pdf_obj->SetXY($x, $y+$k);
-         $this->pdf_obj->CellBlock($this->row_data[$i][2]-$xpadding, $this->row_data[$i][1]['line-height'], $this->row_data[$i][0], $this->row_data[$i][1]['align']);
+   private function print_text($i, $y, $split) {
+      $padding = $this->row_data[$i][1]['padding-y'];
+      $k = $padding;
+      if ($this->row_data[$i][1]['img'] !== false) {
+         if ($this->row_data[$i][1]['valign'] == 'B') {
+            $k += $this->row_data[$i][1]['img']['h'] + self::IMGPadding;
+         }
+      }
+      $l = 0;
+      if (count($this->row_data[$i][0])) {
+         $x = $this->row_data[$i][6] + $this->row_data[$i][1]['paddingX'];
+         $xpadding = 2 * $this->row_data[$i][1]['paddingX'];
+         $l = count($this->row_data[$i][0]) * $this->row_data[$i][1]['line-height'] * $this->row_data[$i][1]['font-size'];
+         $this->pdf_obj->SetXY($x, $y + $k);
+         $this->pdf_obj->CellBlock($this->row_data[$i][2] - $xpadding, $this->row_data[$i][1]['line-height'], $this->row_data[$i][0], $this->row_data[$i][1]['align']);
          $this->pdf_obj->resetFont($this->document_style['font-family'], $this->document_style['font-style'], $this->document_style['font-size']);
          $this->pdf_obj->resetColor($this->document_style['font-color'], 'T');
       }
-      if($this->row_data[$i][1]['img']!==false ){
-         $x=$this->row_data[$i][6];
-         $k=$padding;
-         if($this->row_data[$i][1]['valign']!='B'){
-            $k+=$l+self::IMGPadding;
-         }
-         if($this->imgbreak($i, $y)==0 && $y+$k+$this->row_data[$i][1]['img']['h']<$this->pdf_obj->PageBreak()){
-            $x+=$this->row_data[$i][1]['paddingX'];
-            if($this->row_data[$i][2]>$this->row_data[$i][1]['img']['w']){
-               if($this->row_data[$i][1]['align']=='C'){
-                  $x-=$this->row_data[$i][1]['paddingX'];
-                  $x+=($this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'])/2;
+      if ($this->row_data[$i][1]['img'] !== false) {
+         $x = $this->row_data[$i][6];
+         $k = $padding;
+         if ($this->row_data[$i][1]['valign'] != 'B') {
+            $k += $l + self::IMGPadding;
+         }
+         if ($this->imgbreak($i, $y) == 0 && $y + $k + $this->row_data[$i][1]['img']['h'] < $this->pdf_obj->PageBreak()) {
+            $x += $this->row_data[$i][1]['paddingX'];
+            if ($this->row_data[$i][2] > $this->row_data[$i][1]['img']['w']) {
+               if ($this->row_data[$i][1]['align'] == 'C') {
+                  $x -= $this->row_data[$i][1]['paddingX'];
+                  $x += ($this->row_data[$i][2] - $this->row_data[$i][1]['img']['w']) / 2;
                }
-               elseif($this->row_data[$i][1]['align']=='R'){
-                  $x+=$this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'];
-                  $x-=2*$this->row_data[$i][1]['paddingX'];
+               elseif ($this->row_data[$i][1]['align'] == 'R') {
+                  $x += $this->row_data[$i][2] - $this->row_data[$i][1]['img']['w'];
+                  $x -= 2 * $this->row_data[$i][1]['paddingX'];
                }
             }
-            $this->pdf_obj->Image($this->row_data[$i][1]['img']['path'], $x, $y+$k, $this->row_data[$i][1]['img']['w'], $this->row_data[$i][1]['img']['h']);
+            $this->pdf_obj->Image($this->row_data[$i][1]['img']['path'], $x, $y + $k, $this->row_data[$i][1]['img']['w'], $this->row_data[$i][1]['img']['h']);
          }
       }
    }
    
 
-   private function mk_bg($i, $T, $split){
-      $h=$this->row_data[$i][5];
-      if($split){
-         $h=$this->pdf_obj->PageBreak()-$T;
+   private function mk_bg($i, $T, $split) {
+      $h = $this->row_data[$i][5];
+      if ($split) {
+         $h = $this->pdf_obj->PageBreak() - $T;
       }
-      if($this->row_data[$i][1]['bgcolor']!=false){
+      if ($this->row_data[$i][1]['bgcolor'] != false) {
          $this->pdf_obj->resetColor($this->row_data[$i][1]['bgcolor']);
          $this->pdf_obj->Rect($this->row_data[$i][6], $T, $this->row_data[$i][2], $h, 'F');
          $this->pdf_obj->resetColor($this->document_style['bgcolor']);
       }
    }
 
-   private function printing_loop($swap=false){
+   private function printing_loop($swap = false) {
       $this->swap_data($swap);
-      $y=$this->pdf_obj->GetY();
-      $tmp=array();
-      $rw=array();
-      $ztmp=array();
-      $total_cells=count($this->row_data);
-      while(count($tmp)!=$total_cells){
-         $a=count($this->rows);
-         $h=0;
-         $y=$this->pdf_obj->GetY();
-         for($j=0; $j<count($this->rows); $j++){
-            $T=$y+$h;
-            if($T<$this->pdf_obj->PageBreak()){
+      $y = $this->pdf_obj->GetY();
+      $tmp = array();
+      $rw = array();
+      $ztmp = array();
+      $total_cells = count($this->row_data);
+      while (count($tmp) != $total_cells) {
+         $a = count($this->rows);
+         $h = 0;
+         $y = $this->pdf_obj->GetY();
+         for ($j = 0; $j < count($this->rows); $j++) {
+            $T = $y + $h;
+            if ($T < $this->pdf_obj->PageBreak()) {
 
                   $this->row_content_loop($j, function($index)use($T, $tmp){
-                  if(!isset($tmp[$index])){
-                     $split_cell=$this->scan_for_breaks($index,$T, false);
+                  if (!isset($tmp[$index])) {
+                     $split_cell = $this->scan_for_breaks($index, $T, false);
                      $this->mk_bg($index, $T, $split_cell);
                   }
                });
-               if(!isset($rw[$j])){
-                  if($this->pdf_obj->PageBreak()-($T+$this->row_heights[$j])>=0){
-                     $h+=$this->row_heights[$j];
+               if (!isset($rw[$j])) {
+                  if ($this->pdf_obj->PageBreak() - ($T + $this->row_heights[$j]) >= 0) {
+                     $h += $this->row_heights[$j];
                   }
-                  else{
-                     $a=$j+1;
+                  else {
+                     $a = $j + 1;
                      break;
                   }
                }
             }
-            else{
-               $a=$j+1;
+            else {
+               $a = $j + 1;
                break;
             }
          }
-         $h=0;
-         for($j=0; $j<$a; $j++){
-            $T=$y+$h;
-            if($T<$this->pdf_obj->PageBreak()){
+         $h = 0;
+         for ($j = 0; $j < $a; $j++) {
+            $T = $y + $h;
+            if ($T < $this->pdf_obj->PageBreak()) {
 
                   $this->row_content_loop($j, function($index)use($T, &$tmp, &$ztmp){
-                  if(!isset($tmp[$index])){
-                     $split_cell=$this->scan_for_breaks($index,$T);
+                  if (!isset($tmp[$index])) {
+                     $split_cell = $this->scan_for_breaks($index, $T);
                      $this->mk_border($index, $T, $split_cell);
                      $this->print_text($index, $T, $split_cell);
-                     if($split_cell==0){
-                        $tmp[$index]=$index;
+                     if ($split_cell == 0) {
+                        $tmp[$index] = $index;
                      }
-                     else{
-                        $ztmp[]=$index;
+                     else {
+                        $ztmp[] = $index;
                      }
                   }
                });
-               if(!isset($rw[$j])){
-                  $tw=$this->pdf_obj->PageBreak()-($T+$this->row_heights[$j]);
-                  if($tw>=0){
-                     $h+=$this->row_heights[$j];
-                     $rw[$j]=$j;
+               if (!isset($rw[$j])) {
+                  $tw = $this->pdf_obj->PageBreak() - ($T + $this->row_heights[$j]);
+                  if ($tw >= 0) {
+                     $h += $this->row_heights[$j];
+                     $rw[$j] = $j;
                   }
-                  else{
-                     $this->row_heights[$j]=$this->overflow-$tw;
+                  else {
+                     $this->row_heights[$j] = $this->overflow - $tw;
                   }
                }
             }
          }
-         if(count($tmp)!=$total_cells){
-            foreach($ztmp as $index){
-               $this->row_data[$index][5]=$this->row_data[$index][7]+$this->overflow;
-               if(isset($this->row_data[$index][8])){
-                  $this->row_data[$index][1]['padding-y']=$this->row_data[$index][8];
+         if (count($tmp) != $total_cells) {
+            foreach ($ztmp as $index) {
+               $this->row_data[$index][5] = $this->row_data[$index][7] + $this->overflow;
+               if (isset($this->row_data[$index][8])) {
+                  $this->row_data[$index][1]['padding-y'] = $this->row_data[$index][8];
                   unset($this->row_data[$index][8]);
                }
             }
-            $this->overflow=0;
-            $ztmp=array();
+            $this->overflow = 0;
+            $ztmp = array();
             $this->pdf_obj->addPage($this->document_style['orientation']);
          }
-         else{
-            $y+=$h;
+         else {
+            $y += $h;
          }
       }
       $this->pdf_obj->SetXY($this->baseX, $y);
       $this->swap_data($swap);
    }
 
-   private function imgbreak($i, $y){
-      $li=$y+$this->row_data[$i][1]['padding-y'];
-      $ls=$this->row_data[$i][1]['img']['h'];
-      if($this->row_data[$i][1]['valign']=='B'){
-         $ls+=$li;
+   private function imgbreak($i, $y) {
+      $li = $y + $this->row_data[$i][1]['padding-y'];
+      $ls = $this->row_data[$i][1]['img']['h'];
+      if ($this->row_data[$i][1]['valign'] == 'B') {
+         $ls += $li;
       }
-      else{
-         $li+=$this->row_data[$i][3]-$this->row_data[$i][1]['img']['h'];
-         $ls+=$li;
+      else {
+         $li += $this->row_data[$i][3] - $this->row_data[$i][1]['img']['h'];
+         $ls += $li;
       }
-      $result=0;
-      if($li<$this->pdf_obj->PageBreak() && $this->pdf_obj->PageBreak()<$ls){
-         $result=$this->pdf_obj->PageBreak()-$li;
+      $result = 0;
+      if ($li < $this->pdf_obj->PageBreak() && $this->pdf_obj->PageBreak() < $ls) {
+         $result = $this->pdf_obj->PageBreak() - $li;
       }
       return $result;
    }
 
-   private function scan_for_breaks($index, $H, $l=true){
-      $print_cell=0;
-      $h=($H+$this->row_data[$index][5])-$this->pdf_obj->PageBreak();
-      if($h>0){
-         if($l){
-            $rr=$this->pdf_obj->PageBreak()-($H+$this->row_data[$index][1]['padding-y']);
-            if($rr>0){
-               $mx=0;
-               if(count($this->row_data[$index][0]) && $this->row_data[$index][1]['img']!==false){
-                  $mx=$this->imgbreak($index, $H);
-                  if($mx==0){
-                     if($this->row_data[$index][1]['valign']=='B'){
-                        $rr-=$this->row_data[$index][1]['img']['h'];
+   private function scan_for_breaks($index, $H, $l = true) {
+      $print_cell = 0;
+      $h = ($H + $this->row_data[$index][5]) - $this->pdf_obj->PageBreak();
+      if ($h > 0) {
+         if ($l) {
+            $rr = $this->pdf_obj->PageBreak() - ($H + $this->row_data[$index][1]['padding-y']);
+            if ($rr > 0) {
+               $mx = 0;
+               if (count($this->row_data[$index][0]) && $this->row_data[$index][1]['img'] !== false) {
+                  $mx = $this->imgbreak($index, $H);
+                  if ($mx == 0) {
+                     if ($this->row_data[$index][1]['valign'] == 'B') {
+                        $rr -= $this->row_data[$index][1]['img']['h'];
                      }
                   }
                }
-               $nh=0;
-               $keys=array_keys($this->row_data[$index][0]);
-               foreach($keys as $i){
-                  $nh+=$this->row_data[$index][0][$i]['height'];
+               $nh = 0;
+               $keys = array_keys($this->row_data[$index][0]);
+               foreach ($keys as $i) {
+                  $nh += $this->row_data[$index][0][$i]['height'];
                }
-               $nh*=$this->row_data[$index][1]['line-height'];
-               if($mx==0 && $rr<$nh){
-                  $nw=0;
-                  foreach($keys as $i){
-                     $nw+=$this->row_data[$index][0][$i]['height']*$this->row_data[$index][1]['line-height'];
-                     if($nw>$rr){
-                        $nw-=$this->row_data[$index][0][$i]['height']*$this->row_data[$index][1]['line-height'];
-                        $mx=$rr-$nw;
+               $nh *= $this->row_data[$index][1]['line-height'];
+               if ($mx == 0 && $rr < $nh) {
+                  $nw = 0;
+                  foreach ($keys as $i) {
+                     $nw += $this->row_data[$index][0][$i]['height'] * $this->row_data[$index][1]['line-height'];
+                     if ($nw > $rr) {
+                        $nw -= $this->row_data[$index][0][$i]['height'] * $this->row_data[$index][1]['line-height'];
+                        $mx = $rr - $nw;
                         break;
                      }
                   }
                }
-               $this->overflow=max($this->overflow, $mx);
-               $this->row_data[$index][8]=1;
+               $this->overflow = max($this->overflow, $mx);
+               $this->row_data[$index][8] = 1;
             }
-            else{
-               $this->row_data[$index][8]=-1*$rr;
+            else {
+               $this->row_data[$index][8] = -1 * $rr;
             }
-            $this->row_data[$index][7]=$h;
+            $this->row_data[$index][7] = $h;
          }
-         $print_cell=1;
+         $print_cell = 1;
       }
       return $print_cell;
    }
 
-   private function swap_data($swap){
-      if($swap==false){
+   private function swap_data($swap) {
+      if ($swap == false) {
          return;
       }
-      static $data=array();
-      if(count($data)==0){
-         $data=array('header_data'=>$this->header_row['row_data'], 'row_heights'=>&$this->row_heights, 'row_data'=>&$this->row_data, 'rows'=>&$this->rows);
+      static $data = array();
+      if (count($data) == 0) {
+         $data = array('header_data'=>$this->header_row['row_data'], 'row_heights'=>&$this->row_heights, 'row_data'=>&$this->row_data, 'rows'=>&$this->rows);
          unset($this->row_heights, $this->row_data, $this->rows);
-         $this->row_heights=&$this->header_row['row_heights'];
-         $this->row_data=&$this->header_row['row_data'];
-         $this->rows=&$this->header_row['rows'];
+         $this->row_heights = &$this->header_row['row_heights'];
+         $this->row_data = &$this->header_row['row_data'];
+         $this->rows = &$this->header_row['rows'];
       }
-      else{
-         $this->header_row['row_data']=$data['header_data'];
+      else {
+         $this->header_row['row_data'] = $data['header_data'];
          unset($this->row_heights, $this->row_data, $this->rows);
-         $this->row_heights=$data['row_heights'];
-         $this->row_data=$data['row_data'];
-         $this->rows=$data['rows'];
-         $data=array();
+         $this->row_heights = $data['row_heights'];
+         $this->row_data = $data['row_data'];
+         $this->rows = $data['rows'];
+         $data = array();
       }
    }
    /********************************************************************
@@ -628,108 +628,108 @@ 
    An easyTable object
    ***********************************************************************/
 
-   public function __construct($fpdf_obj, $num_cols, $style=''){
-      if(self::$table_counter){
+   public function __construct($fpdf_obj, $num_cols, $style = '') {
+      if (self::$table_counter) {
          error_log('Please use the end_table method to terminate the last table');
          exit();
       }
-      self::$table_counter=true;
-      $this->pdf_obj=&$fpdf_obj;
-      $this->document_style['bgcolor']=$this->pdf_obj->get_color('fill');
-      $this->document_style['font-family']=$this->pdf_obj->current_font('family');
-      $this->document_style['font-style']=$this->pdf_obj->current_font('style');
-      $this->document_style['font-size']=$this->pdf_obj->current_font('size');
-      $this->document_style['font-color']=$this->pdf_obj->get_color('text');
-      $this->document_style['document_width']=$this->pdf_obj->GetPageWidth()-$this->pdf_obj->get_margin('l')-$this->pdf_obj->get_margin('r');
-      $this->document_style['orientation']=$this->pdf_obj->get_orientation();
-      $this->document_style['line-width']=$this->pdf_obj->get_linewidth();
-      $this->table_style=$this->set_style($style, 'T');
-      $this->col_num=false;
-      $this->col_width=array();
-      if(is_int($num_cols) && $num_cols!=0){
-         $this->col_num=abs($num_cols);
-         $this->col_width=array_pad(array(), abs($num_cols), $this->table_style['width']/abs($num_cols));
-      }
-      elseif(is_string($num_cols)){
-         $num_cols=trim($num_cols, '}, ');
-         if($num_cols[0]!='{' && $num_cols[0]!='%'){
+      self::$table_counter = true;
+      $this->pdf_obj = &$fpdf_obj;
+      $this->document_style['bgcolor'] = $this->pdf_obj->get_color('fill');
+      $this->document_style['font-family'] = $this->pdf_obj->current_font('family');
+      $this->document_style['font-style'] = $this->pdf_obj->current_font('style');
+      $this->document_style['font-size'] = $this->pdf_obj->current_font('size');
+      $this->document_style['font-color'] = $this->pdf_obj->get_color('text');
+      $this->document_style['document_width'] = $this->pdf_obj->GetPageWidth() - $this->pdf_obj->get_margin('l') - $this->pdf_obj->get_margin('r');
+      $this->document_style['orientation'] = $this->pdf_obj->get_orientation();
+      $this->document_style['line-width'] = $this->pdf_obj->get_linewidth();
+      $this->table_style = $this->set_style($style, 'T');
+      $this->col_num = false;
+      $this->col_width = array();
+      if (is_int($num_cols) && $num_cols != 0) {
+         $this->col_num = abs($num_cols);
+         $this->col_width = array_pad(array(), abs($num_cols), $this->table_style['width'] / abs($num_cols));
+      }
+      elseif (is_string($num_cols)) {
+         $num_cols = trim($num_cols, '}, ');
+         if ($num_cols[0] != '{' && $num_cols[0] != '%') {
             error_log('Bad format for columns in Table constructor');
             exit();
          }
-         $tmp=explode('{', $num_cols);
-         $tp=trim($tmp[0]);
-         $num_cols=explode(',', $tmp[1]);
-         $w=0;
-         foreach($num_cols as $c){
-            if(!is_numeric($c)){
+         $tmp = explode('{', $num_cols);
+         $tp = trim($tmp[0]);
+         $num_cols = explode(',', $tmp[1]);
+         $w = 0;
+         foreach ($num_cols as $c) {
+            if (!is_numeric($c)) {
                error_log('Bad parameter format for columns in Table constructor');
                exit();
             }
-            if(abs($c)){
-               $w+=abs($c);
-               $this->col_width[]=abs($c);
+            if (abs($c)) {
+               $w += abs($c);
+               $this->col_width[] = abs($c);
             }
-            else{
+            else {
                error_log('Column width can not be zero');
             }
          }
-         $this->col_num=count($this->col_width);
-         if($tp=='%'){
-            if($w!=100){
+         $this->col_num = count($this->col_width);
+         if ($tp == '%') {
+            if ($w != 100) {
                error_log('The sum of the percentages of the columns is not 100');
                exit();
             }
-            foreach($this->col_width as $i=>$c){
-               $this->col_width[$i]=$c*$this->table_style['width']/100;
+            foreach ($this->col_width as $i=>$c) {
+               $this->col_width[$i] = $c * $this->table_style['width'] / 100;
             }
          }
-         elseif($w!=$this->table_style['width'] && $w){
-            if($w<$this->document_style['document_width']){
-               $this->table_style['width']=$w;
+         elseif ($w != $this->table_style['width'] && $w) {
+            if ($w < $this->document_style['document_width']) {
+               $this->table_style['width'] = $w;
             }
-            else{
-               $this->table_style['width']=$this->document_style['document_width'];
-               $d=$this->table_style['width']/$w;
-               for($i=0; $i<count($num_cols); $i++){
-                  $this->col_width[$i]*=$d;
+            else {
+               $this->table_style['width'] = $this->document_style['document_width'];
+               $d = $this->table_style['width'] / $w;
+               for ($i = 0; $i < count($num_cols); $i++) {
+                  $this->col_width[$i] *= $d;
                }
             }
          }
       }
-      if($this->col_num==false){
+      if ($this->col_num == false) {
          error_log('Unspecified number of columns in Table constructor');
          exit();
       }
-      $this->table_style['c-align']=array_pad($this->table_style['c-align'], $this->col_num, 'L');
-      if($this->table_style['l-margin']){
-         $this->baseX=$this->pdf_obj->get_margin('l')+min($this->table_style['l-margin'],$this->document_style['document_width']-$this->table_style['width']);
+      $this->table_style['c-align'] = array_pad($this->table_style['c-align'], $this->col_num, 'L');
+      if ($this->table_style['l-margin']) {
+         $this->baseX = $this->pdf_obj->get_margin('l') + min($this->table_style['l-margin'], $this->document_style['document_width'] - $this->table_style['width']);
       }
-      else{
-         if($this->table_style['align']=='L'){
-            $this->baseX=$this->pdf_obj->get_margin('l');
+      else {
+         if ($this->table_style['align'] == 'L') {
+            $this->baseX = $this->pdf_obj->get_margin('l');
          }
-         elseif($this->table_style['align']=='R'){
-            $this->baseX=$this->pdf_obj->get_margin('l')+$this->document_style['document_width']-$this->table_style['width'];
+         elseif ($this->table_style['align'] == 'R') {
+            $this->baseX = $this->pdf_obj->get_margin('l') + $this->document_style['document_width'] - $this->table_style['width'];
          }
-         else{
-            $this->baseX=$this->pdf_obj->get_margin('l')+($this->document_style['document_width']-$this->table_style['width'])/2;
+         else {
+            $this->baseX = $this->pdf_obj->get_margin('l') + ($this->document_style['document_width'] - $this->table_style['width']) / 2;
          }
       }
-      $this->row_style_def=$this->set_style('', 'R');
-      $this->row_style=$this->row_style_def;
-      $this->row_heights=array();
-      $this->row_data=array();
-      $this->rows=array();
-      $this->total_rowspan=0;
-      $this->col_counter=0;
-      $this->grid=array();
-      $this->blocks=array();
-      $this->overflow=0;
-      if($this->table_style['border-width']!=false){
+      $this->row_style_def = $this->set_style('', 'R');
+      $this->row_style = $this->row_style_def;
+      $this->row_heights = array();
+      $this->row_data = array();
+      $this->rows = array();
+      $this->total_rowspan = 0;
+      $this->col_counter = 0;
+      $this->grid = array();
+      $this->blocks = array();
+      $this->overflow = 0;
+      if ($this->table_style['border-width'] != false) {
          $this->pdf_obj->SetLineWidth($this->table_style['border-width']);
       }
-      $this->header_row=array();
-      $this->new_table=true;
+      $this->header_row = array();
+      $this->new_table = true;
    }
    /***********************************************************************
 
@@ -749,8 +749,8 @@ 
    This function should be called before the first cell of the current row
    ***********************************************************************/
 
-   public function rowStyle($style){
-      $this->row_style=$this->set_style($style, 'R');
+   public function rowStyle($style) {
+      $this->row_style = $this->set_style($style, 'R');
    }
    /***********************************************************************
 
@@ -768,58 +768,58 @@ 
    void
    ***********************************************************************/
 
-   public function easyCell($data, $style=''){
-      if($this->col_counter<$this->col_num){
-         $sty=$this->set_style($style, 'C', $this->col_counter);
+   public function easyCell($data, $style = '') {
+      if ($this->col_counter < $this->col_num) {
+         $sty = $this->set_style($style, 'C', $this->col_counter);
          $this->col_counter++;
-         $row_number=count($this->rows);
-         $cell_index=count($this->row_data);
-         $cell_pos=$this->get_available($sty['colspan'], $sty['rowspan']);
-         $colm=$cell_pos %$this->col_num;
-         if($sty['img']!=false && $data!='' && $sty['valign']=='M'){
-            $sty['valign']=$this->row_style['valign'];
-         }
-         if($sty['rowspan']){
-            $this->total_rowspan=max($this->total_rowspan, $sty['rowspan']);
-            $this->blocks[$cell_index]=array($cell_index, $row_number, $sty['rowspan']);
-         }
-         $w=$this->col_width[$colm];
-         $r=0;
-         while($r<$sty['colspan'] && $this->col_counter<$this->col_num){
+         $row_number = count($this->rows);
+         $cell_index = count($this->row_data);
+         $cell_pos = $this->get_available($sty['colspan'], $sty['rowspan']);
+         $colm = $cell_pos % $this->col_num;
+         if ($sty['img'] != false && $data != '' && $sty['valign'] == 'M') {
+            $sty['valign'] = $this->row_style['valign'];
+         }
+         if ($sty['rowspan']) {
+            $this->total_rowspan = max($this->total_rowspan, $sty['rowspan']);
+            $this->blocks[$cell_index] = array($cell_index, $row_number, $sty['rowspan']);
+         }
+         $w = $this->col_width[$colm];
+         $r = 0;
+         while ($r < $sty['colspan'] && $this->col_counter < $this->col_num) {
             $this->col_counter++;
             $colm++;
-            $w+=$this->col_width[$colm];
+            $w += $this->col_width[$colm];
             $r++;
          }
-         $w-=2*$sty['paddingX'];
-         if($sty['img']!==false && is_string($sty['img'])){
-            $data=$sty['img'];
-            $sty['img']=false;
+         $w -= 2 * $sty['paddingX'];
+         if ($sty['img'] !== false && is_string($sty['img'])) {
+            $data = $sty['img'];
+            $sty['img'] = false;
          }
-         $data=& $this->pdf_obj->extMultiCell($sty['font-family'], $sty['font-style'], $sty['font-size'], $sty['font-color'], $w, $data);
-         $h=0;
-         $rn=count($data);
-         for($ri=0; $ri<$rn; $ri++){
-            $h+=$data[$ri]['height']*$sty['line-height'];
+         $data = & $this->pdf_obj->extMultiCell($sty['font-family'], $sty['font-style'], $sty['font-size'], $sty['font-color'], $w, $data);
+         $h = 0;
+         $rn = count($data);
+         for ($ri = 0; $ri < $rn; $ri++) {
+            $h += $data[$ri]['height'] * $sty['line-height'];
          }
-         if($sty['img']){
-            if($sty['img']['w']>$w){
-               $sty['img']['h']=$w*$sty['img']['h']/$sty['img']['w'];
-               $sty['img']['w']=$w;
+         if ($sty['img']) {
+            if ($sty['img']['w'] > $w) {
+               $sty['img']['h'] = $w * $sty['img']['h'] / $sty['img']['w'];
+               $sty['img']['w'] = $w;
             }
-            if($h){
-               $h+=self::IMGPadding;
+            if ($h) {
+               $h += self::IMGPadding;
             }
-            $h+=$sty['img']['h'];
+            $h += $sty['img']['h'];
          }
-         $w+=2*$sty['paddingX'];
+         $w += 2 * $sty['paddingX'];
          
-         $posx=$this->baseX;
-         $d=$cell_pos %$this->col_num;
-         for($k=0; $k<$d; $k++){
-            $posx+=$this->col_width[$k];
+         $posx = $this->baseX;
+         $d = $cell_pos % $this->col_num;
+         for ($k = 0; $k < $d; $k++) {
+            $posx += $this->col_width[$k];
          }
-         $this->row_data[$cell_index]=array($data, $sty, $w, $h, $cell_pos, 0, $posx, 0);
+         $this->row_data[$cell_index] = array($data, $sty, $w, $h, $cell_pos, 0, $posx, 0);
          
       }
    }
@@ -848,96 +848,96 @@ 
    total_rowspan=max(total_rowspan, max(rowspan of cell in the current row))-1;
    ***********************************************************************/
 
-   public function printRow($setAsHeader=false){
-      $this->col_counter=0;
-      $row_number=count($this->rows);
-      $this->rows[$row_number]=count($this->row_data);
-      $mx=$this->row_style['min-height'];
+   public function printRow($setAsHeader = false) {
+      $this->col_counter = 0;
+      $row_number = count($this->rows);
+      $this->rows[$row_number] = count($this->row_data);
+      $mx = $this->row_style['min-height'];
 
          $this->row_content_loop($row_number, function($index)use(&$mx){
-         if($this->row_data[$index][1]['rowspan']==0){
-            $mx=max($mx, $this->row_data[$index][3]+2*$this->row_data[$index][1]['paddingY']);
+         if ($this->row_data[$index][1]['rowspan'] == 0) {
+            $mx = max($mx, $this->row_data[$index][3] + 2 * $this->row_data[$index][1]['paddingY']);
          }
       });
-      $this->row_heights[$row_number]=$mx;
+      $this->row_heights[$row_number] = $mx;
       
-      if($this->total_rowspan>0){
+      if ($this->total_rowspan > 0) {
          $this->total_rowspan--;
       }
-      else{
-         $row_number=count($this->rows);
-         if(count($this->blocks)>0){
+      else {
+         $row_number = count($this->rows);
+         if (count($this->blocks) > 0) {
             
-            foreach($this->blocks as $bk_id=>$block){
-               $h=0;
-               for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                  $h+=$this->row_heights[$i];
+            foreach ($this->blocks as $bk_id=>$block) {
+               $h = 0;
+               for ($i = $block[1]; $i <= $block[1] + $block[2]; $i++) {
+                  $h += $this->row_heights[$i];
                }
-               $t=$this->row_data[$block[0]][3]+2*$this->row_data[$block[0]][1]['paddingY'];
-               if($h>0 && $h<$t){
-                  for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                     $this->row_heights[$i]*=$t/$h;
+               $t = $this->row_data[$block[0]][3] + 2 * $this->row_data[$block[0]][1]['paddingY'];
+               if ($h > 0 && $h < $t) {
+                  for ($i = $block[1]; $i <= $block[1] + $block[2]; $i++) {
+                     $this->row_heights[$i] *= $t / $h;
                   }
                }
             }
-            foreach($this->blocks as $j=>$block){
-               $h=0;
-               for($i=$block[1]; $i<=$block[1]+$block[2]; $i++){
-                  $h+=$this->row_heights[$i];
+            foreach ($this->blocks as $j=>$block) {
+               $h = 0;
+               for ($i = $block[1]; $i <= $block[1] + $block[2]; $i++) {
+                  $h += $this->row_heights[$i];
                }
-               $this->row_data[$j][5]=$h;
+               $this->row_data[$j][5] = $h;
             }
          }
-         $block_height=0;
-         for($j=0; $j<$row_number; $j++){
+         $block_height = 0;
+         for ($j = 0; $j < $row_number; $j++) {
 
                $this->row_content_loop($j, function($index)use($j, $block_height){
-               if($this->row_data[$index][1]['rowspan']==0){
-                  $this->row_data[$index][5]=$this->row_heights[$j];
+               if ($this->row_data[$index][1]['rowspan'] == 0) {
+                  $this->row_data[$index][5] = $this->row_heights[$j];
                }
-               $this->row_data[$index][1]['padding-y']=$this->row_data[$index][1]['paddingY'];
-               if($this->row_data[$index][1]['valign']=='M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))){
-                  $this->row_data[$index][1]['padding-y']=($this->row_data[$index][5]-$this->row_data[$index][3])/2;
+               $this->row_data[$index][1]['padding-y'] = $this->row_data[$index][1]['paddingY'];
+               if ($this->row_data[$index][1]['valign'] == 'M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))) {
+                  $this->row_data[$index][1]['padding-y'] = ($this->row_data[$index][5] - $this->row_data[$index][3]) / 2;
                }
-               elseif($this->row_data[$index][1]['valign']=='B'){
-                  $this->row_data[$index][1]['padding-y']=$this->row_data[$index][5]-($this->row_data[$index][3]+$this->row_data[$index][1]['paddingY']);
+               elseif ($this->row_data[$index][1]['valign'] == 'B') {
+                  $this->row_data[$index][1]['padding-y'] = $this->row_data[$index][5] - ($this->row_data[$index][3] + $this->row_data[$index][1]['paddingY']);
                }
             });
-            $block_height+=$this->row_heights[$j];
+            $block_height += $this->row_heights[$j];
          }
-         if($setAsHeader===true){
-            if(count($this->header_row)==0){
-               $this->header_row['row_heights']=$this->row_heights;
-               $this->header_row['row_data']=$this->row_data;
-               $this->header_row['rows']=$this->rows;
+         if ($setAsHeader === true) {
+            if (count($this->header_row) == 0) {
+               $this->header_row['row_heights'] = $this->row_heights;
+               $this->header_row['row_data'] = $this->row_data;
+               $this->header_row['rows'] = $this->rows;
             }
          }
-         if($this->table_style['split-row']==false && $this->pdf_obj->PageBreak()<$this->pdf_obj->GetY()+max($block_height,$this->row_heights[0])){
+         if ($this->table_style['split-row'] == false && $this->pdf_obj->PageBreak() < $this->pdf_obj->GetY() + max($block_height, $this->row_heights[0])) {
             $this->pdf_obj->addPage($this->document_style['orientation']);
-            if(count($this->header_row)>0){
+            if (count($this->header_row) > 0) {
                $this->printing_loop(true);
             }
          }
          
-         if($this->new_table){
-            if(count($this->header_row)>0){
-               $r=$this->pdf_obj->PageBreak()-($this->pdf_obj->GetY()+$block_height);
-               if($r<0 || $r<self::PBThreshold){
+         if ($this->new_table) {
+            if (count($this->header_row) > 0) {
+               $r = $this->pdf_obj->PageBreak() - ($this->pdf_obj->GetY() + $block_height);
+               if ($r < 0 || $r < self::PBThreshold) {
                   $this->pdf_obj->addPage($this->document_style['orientation']);
                }
             }
-            $this->new_table=false;
+            $this->new_table = false;
          }
          $this->printing_loop();
-         $this->grid=array();
-         $this->row_data=array();
-         $this->rows=array();
-         $this->row_heights=array();
-         $this->blocks=array();
-         $this->overflow=0;
-         $this->new_table=false;
-      }
-      $this->row_style=$this->row_style_def;
+         $this->grid = array();
+         $this->row_data = array();
+         $this->rows = array();
+         $this->row_heights = array();
+         $this->blocks = array();
+         $this->overflow = 0;
+         $this->new_table = false;
+      }
+      $this->row_style = $this->row_style_def;
    }
    /***********************************************************************
 
@@ -955,9 +955,9 @@ 
    Void
    ***********************************************************************/
 
-   public function endTable($bottomMargin=2){
-      self::$table_counter=false;
-      if($this->table_style['border-width']!=false){
+   public function endTable($bottomMargin = 2) {
+      self::$table_counter = false;
+      if ($this->table_style['border-width'] != false) {
          $this->pdf_obj->SetLineWidth($this->document_style['line-width']);
       }
       $this->pdf_obj->SetX($this->pdf_obj->get_margin('l'));

Braces +45 added lines, -90 removed lines

@@ -72,8 +72,7 @@ 
       if($c=='R' || $c=='T'){
          if($c=='R'){
             $result['c-align']=array_pad(array(), $this->col_num, 'L');
-         }
-         else{
+         } else{
             $result['c-align']=array();
          }
       }
@@ -97,11 +96,9 @@ 
    private function inherating(&$sty, $setting, $c){
       if($c=='C'){
          $sty[$setting]=$this->row_style[$setting];
-      }
-      elseif($c=='R'){
+      } elseif($c=='R'){
          $sty[$setting]=$this->table_style[$setting];
-      }
-      else{
+      } else{
          $sty[$setting]=$this->document_style[$setting];
       }
    }
@@ -115,38 +112,32 @@ 
             if($sty['width']==0){
                $sty['width']=$this->document_style['document_width'];
             }
-         }
-         else{
+         } else{
             $x=strpos($sty['width'], '%');
             if($x!=false){
                $x=min(abs(substr($sty['width'], 0, $x)), 100);
                if($x){
                   $sty['width']=$x*$this->document_style['document_width']/100.0;
-               }
-               else{
+               } else{
                   $sty['width']=$this->document_style['document_width'];
                }
-            }
-            else{
+            } else{
                $sty['width']=$this->document_style['document_width'];
             }
          }
          if(!is_numeric($sty['l-margin'])){
             $sty['l-margin']=0;
-         }
-         else{
+         } else{
             $sty['l-margin']=abs($sty['l-margin']);
          }
          if(is_numeric($sty['border-width'])){
             $sty['border-width']=abs($sty['border-width']);
-         }
-         else{
+         } else{
             $sty['border-width']=false;
          }
          if($sty['split-row']=='false'){
             $sty['split-row']=false;
-         }
-         elseif($sty['split-row']!==false){
+         } elseif($sty['split-row']!==false){
             $sty['split-row']=true;
          }
       }
@@ -158,8 +149,7 @@ 
       if(!is_numeric($sty['paddingX'])){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingX', $c);
-         }
-         else{
+         } else{
             $sty['paddingX']=self::XPadding;
          }
       }
@@ -167,16 +157,14 @@ 
       if(!is_numeric($sty['paddingY'])){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingY', $c);
-         }
-         else{
+         } else{
             $sty['paddingY']=self::YPadding;
          }
       }
       $sty['paddingY']=abs($sty['paddingY']);
       if($sty['border']===false && ($c=='C' || $c=='R')){
          $this->inherating($sty, 'border', $c);
-      }
-      else{
+      } else{
          $border=array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
          if(!(is_numeric($sty['border']) && $sty['border']==1)){
             foreach($border as $k=>$v){
@@ -193,12 +181,10 @@ 
          if($sty[$setting]===false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))){
             if($c=='C' || $c=='R'){
                $this->inherating($sty, $setting, $c);
-            }
-            elseif($setting=='font-color'){
+            } elseif($setting=='font-color'){
                $sty[$setting]=$this->document_style[$setting];
             }
-         }
-         else{
+         } else{
             $sty[$setting]=$sty[$setting];
          }
       }
@@ -210,12 +196,10 @@ 
       }
       if(is_numeric($sty['line-height'])){
          $sty['line-height']=self::LP*abs($sty['line-height']);
-      }
-      else{
+      } else{
          if($c=='C' || $c=='R'){
             $this->inherating($sty,'line-height', $c);
-         }
-         else{
+         } else{
             $sty['line-height']=self::LP;
          }
       }
@@ -241,28 +225,23 @@ 
                if($sty['img']['w']+$sty['img']['h']==0){
                   $sty['img']['w']=$img[0];
                   $sty['img']['h']=$img[1];
-               }
-               elseif($sty['img']['w']==0){
+               } elseif($sty['img']['w']==0){
                   $sty['img']['w']=$sty['img']['h']*$ration;
-               }
-               elseif($sty['img']['h']==0){
+               } elseif($sty['img']['h']==0){
                   $sty['img']['h']=$sty['img']['w']/$ration;
                }
-            }
-            else{
+            } else{
                $sty['img']='failed to open stream: file ' . $tmp[0] .' does not exist';
             }
          }
          if(is_numeric($sty['colspan']) && $sty['colspan']>0){
             $sty['colspan']--;
-         }
-         else{
+         } else{
             $sty['colspan']=0;
          }
          if(is_numeric($sty['rowspan']) && $sty['rowspan']>0){
             $sty['rowspan']--;
-         }
-         else{
+         } else{
             $sty['rowspan']=0;
          }
          if($sty['valign']==false && ($sty['rowspan']>0 || $sty['img']!==false)){
@@ -283,8 +262,7 @@ 
                for($i=0; $i<strlen($tmp[1]); $i++){
                   if(preg_match("/[LCRJ]/", $tmp[1][$i])!=0){
                      $sty['c-align'][$i]=$tmp[1][$i];
-                  }
-                  else{
+                  } else{
                      $sty['c-align'][$i]='L';
                   }
                }
@@ -298,23 +276,19 @@ 
       if($sty['align']!='L' && $sty['align']!='C' && $sty['align']!='R' && $sty['align']!='J'){
          if($c=='C'){
             $sty['align']=$this->row_style['c-align'][$pos];
-         }
-         elseif($c=='R'){
+         } elseif($c=='R'){
             $sty['align']='L';
             $sty['c-align']=$this->table_style['c-align'];
-         }
-         else{
+         } else{
             $sty['align']='C';
          }
-      }
-      elseif($c=='T' && $sty['align']=='J'){
+      } elseif($c=='T' && $sty['align']=='J'){
          $sty['align']='C';
       }
       if($sty['valign']!='T' && $sty['valign']!='M' && $sty['valign']!='B'){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'valign', $c);
-         }
-         else{
+         } else{
             $sty['valign']='T';
          }
       }
@@ -348,8 +322,7 @@ 
                if($split==0){
                   $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
                }
-            }
-            else{
+            } else{
                $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
             }
          }
@@ -393,8 +366,7 @@ 
                if($this->row_data[$i][1]['align']=='C'){
                   $x-=$this->row_data[$i][1]['paddingX'];
                   $x+=($this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'])/2;
-               }
-               elseif($this->row_data[$i][1]['align']=='R'){
+               } elseif($this->row_data[$i][1]['align']=='R'){
                   $x+=$this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'];
                   $x-=2*$this->row_data[$i][1]['paddingX'];
                }
@@ -441,14 +413,12 @@ 
                if(!isset($rw[$j])){
                   if($this->pdf_obj->PageBreak()-($T+$this->row_heights[$j])>=0){
                      $h+=$this->row_heights[$j];
-                  }
-                  else{
+                  } else{
                      $a=$j+1;
                      break;
                   }
                }
-            }
-            else{
+            } else{
                $a=$j+1;
                break;
             }
@@ -465,8 +435,7 @@ 
                      $this->print_text($index, $T, $split_cell);
                      if($split_cell==0){
                         $tmp[$index]=$index;
-                     }
-                     else{
+                     } else{
                         $ztmp[]=$index;
                      }
                   }
@@ -476,8 +445,7 @@ 
                   if($tw>=0){
                      $h+=$this->row_heights[$j];
                      $rw[$j]=$j;
-                  }
-                  else{
+                  } else{
                      $this->row_heights[$j]=$this->overflow-$tw;
                   }
                }
@@ -494,8 +462,7 @@ 
             $this->overflow=0;
             $ztmp=array();
             $this->pdf_obj->addPage($this->document_style['orientation']);
-         }
-         else{
+         } else{
             $y+=$h;
          }
       }
@@ -508,8 +475,7 @@ 
       $ls=$this->row_data[$i][1]['img']['h'];
       if($this->row_data[$i][1]['valign']=='B'){
          $ls+=$li;
-      }
-      else{
+      } else{
          $li+=$this->row_data[$i][3]-$this->row_data[$i][1]['img']['h'];
          $ls+=$li;
       }
@@ -555,8 +521,7 @@ 
                }
                $this->overflow=max($this->overflow, $mx);
                $this->row_data[$index][8]=1;
-            }
-            else{
+            } else{
                $this->row_data[$index][8]=-1*$rr;
             }
             $this->row_data[$index][7]=$h;
@@ -577,8 +542,7 @@ 
          $this->row_heights=&$this->header_row['row_heights'];
          $this->row_data=&$this->header_row['row_data'];
          $this->rows=&$this->header_row['rows'];
-      }
-      else{
+      } else{
          $this->header_row['row_data']=$data['header_data'];
          unset($this->row_heights, $this->row_data, $this->rows);
          $this->row_heights=$data['row_heights'];
@@ -649,8 +613,7 @@ 
       if(is_int($num_cols) && $num_cols!=0){
          $this->col_num=abs($num_cols);
          $this->col_width=array_pad(array(), abs($num_cols), $this->table_style['width']/abs($num_cols));
-      }
-      elseif(is_string($num_cols)){
+      } elseif(is_string($num_cols)){
          $num_cols=trim($num_cols, '}, ');
          if($num_cols[0]!='{' && $num_cols[0]!='%'){
             error_log('Bad format for columns in Table constructor');
@@ -668,8 +631,7 @@ 
             if(abs($c)){
                $w+=abs($c);
                $this->col_width[]=abs($c);
-            }
-            else{
+            } else{
                error_log('Column width can not be zero');
             }
          }
@@ -682,12 +644,10 @@ 
             foreach($this->col_width as $i=>$c){
                $this->col_width[$i]=$c*$this->table_style['width']/100;
             }
-         }
-         elseif($w!=$this->table_style['width'] && $w){
+         } elseif($w!=$this->table_style['width'] && $w){
             if($w<$this->document_style['document_width']){
                $this->table_style['width']=$w;
-            }
-            else{
+            } else{
                $this->table_style['width']=$this->document_style['document_width'];
                $d=$this->table_style['width']/$w;
                for($i=0; $i<count($num_cols); $i++){
@@ -703,15 +663,12 @@ 
       $this->table_style['c-align']=array_pad($this->table_style['c-align'], $this->col_num, 'L');
       if($this->table_style['l-margin']){
          $this->baseX=$this->pdf_obj->get_margin('l')+min($this->table_style['l-margin'],$this->document_style['document_width']-$this->table_style['width']);
-      }
-      else{
+      } else{
          if($this->table_style['align']=='L'){
             $this->baseX=$this->pdf_obj->get_margin('l');
-         }
-         elseif($this->table_style['align']=='R'){
+         } elseif($this->table_style['align']=='R'){
             $this->baseX=$this->pdf_obj->get_margin('l')+$this->document_style['document_width']-$this->table_style['width'];
-         }
-         else{
+         } else{
             $this->baseX=$this->pdf_obj->get_margin('l')+($this->document_style['document_width']-$this->table_style['width'])/2;
          }
       }
@@ -863,8 +820,7 @@ 
       
       if($this->total_rowspan>0){
          $this->total_rowspan--;
-      }
-      else{
+      } else{
          $row_number=count($this->rows);
          if(count($this->blocks)>0){
             
@@ -898,8 +854,7 @@ 
                $this->row_data[$index][1]['padding-y']=$this->row_data[$index][1]['paddingY'];
                if($this->row_data[$index][1]['valign']=='M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))){
                   $this->row_data[$index][1]['padding-y']=($this->row_data[$index][5]-$this->row_data[$index][3])/2;
-               }
-               elseif($this->row_data[$index][1]['valign']=='B'){
+               } elseif($this->row_data[$index][1]['valign']=='B'){
                   $this->row_data[$index][1]['padding-y']=$this->row_data[$index][5]-($this->row_data[$index][3]+$this->row_data[$index][1]['paddingY']);
                }
             });

extras/fpdf183/font/timesb.php

Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
-	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
-	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+    chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+    chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+    ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+    'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+    'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+    'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+    chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+    chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+    chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+    chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+    chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+    chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

Spacing +13 added lines, -13 removed lines

@@ -4,18 +4,18 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
-	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
-	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+	chr(0)=>250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+	chr(22)=>250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>555, '#'=>500, '$'=>500, '%'=>1000, '&'=>833, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570,
+	','=>250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>930, 'A'=>722,
+	'B'=>667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>778, 'I'=>389, 'J'=>500, 'K'=>778, 'L'=>667, 'M'=>944, 'N'=>722, 'O'=>778, 'P'=>611, 'Q'=>778, 'R'=>722, 'S'=>556, 'T'=>667, 'U'=>722, 'V'=>722, 'W'=>1000,
+	'X'=>722, 'Y'=>722, 'Z'=>667, '['=>333, '\\'=>278, ']'=>333, '^'=>581, '_'=>500, '`'=>333, 'a'=>500, 'b'=>556, 'c'=>444, 'd'=>556, 'e'=>444, 'f'=>333, 'g'=>500, 'h'=>556, 'i'=>278, 'j'=>333, 'k'=>556, 'l'=>278, 'm'=>833,
+	'n'=>556, 'o'=>500, 'p'=>556, 'q'=>556, 'r'=>444, 's'=>389, 't'=>333, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>444, '{'=>394, '|'=>220, '}'=>394, '~'=>520, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+	chr(132)=>500, chr(133)=>1000, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>556, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>667, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>500, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+	chr(154)=>389, chr(155)=>333, chr(156)=>722, chr(157)=>350, chr(158)=>444, chr(159)=>722, chr(160)=>250, chr(161)=>333, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>220, chr(167)=>500, chr(168)=>333, chr(169)=>747, chr(170)=>300, chr(171)=>500, chr(172)=>570, chr(173)=>333, chr(174)=>747, chr(175)=>333,
+	chr(176)=>400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>556, chr(182)=>540, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>330, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+	chr(198)=>1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>570, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+	chr(220)=>722, chr(221)=>722, chr(222)=>611, chr(223)=>556, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556,
+	chr(242)=>500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>570, chr(248)=>500, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500);
 $enc = 'cp1252';
-$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$uv = array(0=>array(0, 128), 128=>8364, 130=>8218, 131=>402, 132=>8222, 133=>8230, 134=>array(8224, 2), 136=>710, 137=>8240, 138=>352, 139=>8249, 140=>338, 142=>381, 145=>array(8216, 2), 147=>array(8220, 2), 149=>8226, 150=>array(8211, 2), 152=>732, 153=>8482, 154=>353, 155=>8250, 156=>339, 158=>382, 159=>376, 160=>array(160, 96));
 ?>

extras/fpdf183/font/timesi.php

Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
-	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
-	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+    chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+    chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+    ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+    'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+    'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+    'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+    chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+    chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+    chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+    chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+    chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+    chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

Spacing +13 added lines, -13 removed lines

@@ -4,18 +4,18 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
-	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
-	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+	chr(0)=>250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+	chr(22)=>250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>420, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>214, '('=>333, ')'=>333, '*'=>500, '+'=>675,
+	','=>250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>675, '='=>675, '>'=>675, '?'=>500, '@'=>920, 'A'=>611,
+	'B'=>611, 'C'=>667, 'D'=>722, 'E'=>611, 'F'=>611, 'G'=>722, 'H'=>722, 'I'=>333, 'J'=>444, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>667, 'O'=>722, 'P'=>611, 'Q'=>722, 'R'=>611, 'S'=>500, 'T'=>556, 'U'=>722, 'V'=>611, 'W'=>833,
+	'X'=>611, 'Y'=>556, 'Z'=>556, '['=>389, '\\'=>278, ']'=>389, '^'=>422, '_'=>500, '`'=>333, 'a'=>500, 'b'=>500, 'c'=>444, 'd'=>500, 'e'=>444, 'f'=>278, 'g'=>500, 'h'=>500, 'i'=>278, 'j'=>278, 'k'=>444, 'l'=>278, 'm'=>722,
+	'n'=>500, 'o'=>500, 'p'=>500, 'q'=>500, 'r'=>389, 's'=>389, 't'=>278, 'u'=>500, 'v'=>444, 'w'=>667, 'x'=>444, 'y'=>444, 'z'=>389, '{'=>400, '|'=>275, '}'=>400, '~'=>541, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+	chr(132)=>556, chr(133)=>889, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>500, chr(139)=>333, chr(140)=>944, chr(141)=>350, chr(142)=>556, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>556, chr(148)=>556, chr(149)=>350, chr(150)=>500, chr(151)=>889, chr(152)=>333, chr(153)=>980,
+	chr(154)=>389, chr(155)=>333, chr(156)=>667, chr(157)=>350, chr(158)=>389, chr(159)=>556, chr(160)=>250, chr(161)=>389, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>275, chr(167)=>500, chr(168)=>333, chr(169)=>760, chr(170)=>276, chr(171)=>500, chr(172)=>675, chr(173)=>333, chr(174)=>760, chr(175)=>333,
+	chr(176)=>400, chr(177)=>675, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>523, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>611, chr(193)=>611, chr(194)=>611, chr(195)=>611, chr(196)=>611, chr(197)=>611,
+	chr(198)=>889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>667, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>675, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+	chr(220)=>722, chr(221)=>556, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500,
+	chr(242)=>500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>675, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>444, chr(254)=>500, chr(255)=>444);
 $enc = 'cp1252';
-$uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
+$uv = array(0=>array(0, 128), 128=>8364, 130=>8218, 131=>402, 132=>8222, 133=>8230, 134=>array(8224, 2), 136=>710, 137=>8240, 138=>352, 139=>8249, 140=>338, 142=>381, 145=>array(8216, 2), 147=>array(8220, 2), 149=>8226, 150=>array(8211, 2), 152=>732, 153=>8482, 154=>353, 155=>8250, 156=>339, 158=>382, 159=>376, 160=>array(160, 96));
 ?>

extras/fpdf183/font/symbol.php

Indentation +12 added lines, -12 removed lines

@@ -4,17 +4,17 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
-	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
-	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
-	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
-	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
-	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
-	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
-	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
+    chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+    chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
+    ','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
+    'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+    'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+    'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+    chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+    chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+    chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
+    chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
+    chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
+    chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
 $uv = array(32=>160,33=>33,34=>8704,35=>35,36=>8707,37=>array(37,2),39=>8715,40=>array(40,2),42=>8727,43=>array(43,2),45=>8722,46=>array(46,18),64=>8773,65=>array(913,2),67=>935,68=>array(916,2),70=>934,71=>915,72=>919,73=>921,74=>977,75=>array(922,4),79=>array(927,2),81=>920,82=>929,83=>array(931,3),86=>962,87=>937,88=>926,89=>936,90=>918,91=>91,92=>8756,93=>93,94=>8869,95=>95,96=>63717,97=>array(945,2),99=>967,100=>array(948,2),102=>966,103=>947,104=>951,105=>953,106=>981,107=>array(954,4),111=>array(959,2),113=>952,114=>961,115=>array(963,3),118=>982,119=>969,120=>958,121=>968,122=>950,123=>array(123,3),126=>8764,160=>8364,161=>978,162=>8242,163=>8804,164=>8725,165=>8734,166=>402,167=>9827,168=>9830,169=>9829,170=>9824,171=>8596,172=>array(8592,4),176=>array(176,2),178=>8243,179=>8805,180=>215,181=>8733,182=>8706,183=>8226,184=>247,185=>array(8800,2),187=>8776,188=>8230,189=>array(63718,2),191=>8629,192=>8501,193=>8465,194=>8476,195=>8472,196=>8855,197=>8853,198=>8709,199=>array(8745,2),201=>8835,202=>8839,203=>8836,204=>8834,205=>8838,206=>array(8712,2),208=>8736,209=>8711,210=>63194,211=>63193,212=>63195,213=>8719,214=>8730,215=>8901,216=>172,217=>array(8743,2),219=>8660,220=>array(8656,4),224=>9674,225=>9001,226=>array(63720,3),229=>8721,230=>array(63723,10),241=>9002,242=>8747,243=>8992,244=>63733,245=>8993,246=>array(63734,9));
 ?>

Spacing +13 added lines, -13 removed lines

@@ -4,17 +4,17 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
-	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
-	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
-	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
-	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
-	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
-	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
-	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
-$uv = array(32=>160,33=>33,34=>8704,35=>35,36=>8707,37=>array(37,2),39=>8715,40=>array(40,2),42=>8727,43=>array(43,2),45=>8722,46=>array(46,18),64=>8773,65=>array(913,2),67=>935,68=>array(916,2),70=>934,71=>915,72=>919,73=>921,74=>977,75=>array(922,4),79=>array(927,2),81=>920,82=>929,83=>array(931,3),86=>962,87=>937,88=>926,89=>936,90=>918,91=>91,92=>8756,93=>93,94=>8869,95=>95,96=>63717,97=>array(945,2),99=>967,100=>array(948,2),102=>966,103=>947,104=>951,105=>953,106=>981,107=>array(954,4),111=>array(959,2),113=>952,114=>961,115=>array(963,3),118=>982,119=>969,120=>958,121=>968,122=>950,123=>array(123,3),126=>8764,160=>8364,161=>978,162=>8242,163=>8804,164=>8725,165=>8734,166=>402,167=>9827,168=>9830,169=>9829,170=>9824,171=>8596,172=>array(8592,4),176=>array(176,2),178=>8243,179=>8805,180=>215,181=>8733,182=>8706,183=>8226,184=>247,185=>array(8800,2),187=>8776,188=>8230,189=>array(63718,2),191=>8629,192=>8501,193=>8465,194=>8476,195=>8472,196=>8855,197=>8853,198=>8709,199=>array(8745,2),201=>8835,202=>8839,203=>8836,204=>8834,205=>8838,206=>array(8712,2),208=>8736,209=>8711,210=>63194,211=>63193,212=>63195,213=>8719,214=>8730,215=>8901,216=>172,217=>array(8743,2),219=>8660,220=>array(8656,4),224=>9674,225=>9001,226=>array(63720,3),229=>8721,230=>array(63723,10),241=>9002,242=>8747,243=>8992,244=>63733,245=>8993,246=>array(63734,9));
+	chr(0)=>250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+	chr(22)=>250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>713, '#'=>500, '$'=>549, '%'=>833, '&'=>778, '\''=>439, '('=>333, ')'=>333, '*'=>500, '+'=>549,
+	','=>250, '-'=>549, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>549, '='=>549, '>'=>549, '?'=>444, '@'=>549, 'A'=>722,
+	'B'=>667, 'C'=>722, 'D'=>612, 'E'=>611, 'F'=>763, 'G'=>603, 'H'=>722, 'I'=>333, 'J'=>631, 'K'=>722, 'L'=>686, 'M'=>889, 'N'=>722, 'O'=>722, 'P'=>768, 'Q'=>741, 'R'=>556, 'S'=>592, 'T'=>611, 'U'=>690, 'V'=>439, 'W'=>768,
+	'X'=>645, 'Y'=>795, 'Z'=>611, '['=>333, '\\'=>863, ']'=>333, '^'=>658, '_'=>500, '`'=>500, 'a'=>631, 'b'=>549, 'c'=>549, 'd'=>494, 'e'=>439, 'f'=>521, 'g'=>411, 'h'=>603, 'i'=>329, 'j'=>603, 'k'=>549, 'l'=>549, 'm'=>576,
+	'n'=>521, 'o'=>549, 'p'=>549, 'q'=>521, 'r'=>549, 's'=>603, 't'=>439, 'u'=>576, 'v'=>713, 'w'=>686, 'x'=>493, 'y'=>686, 'z'=>494, '{'=>480, '|'=>200, '}'=>480, '~'=>549, chr(127)=>0, chr(128)=>0, chr(129)=>0, chr(130)=>0, chr(131)=>0,
+	chr(132)=>0, chr(133)=>0, chr(134)=>0, chr(135)=>0, chr(136)=>0, chr(137)=>0, chr(138)=>0, chr(139)=>0, chr(140)=>0, chr(141)=>0, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+	chr(154)=>0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>750, chr(161)=>620, chr(162)=>247, chr(163)=>549, chr(164)=>167, chr(165)=>713, chr(166)=>500, chr(167)=>753, chr(168)=>753, chr(169)=>753, chr(170)=>753, chr(171)=>1042, chr(172)=>987, chr(173)=>603, chr(174)=>987, chr(175)=>603,
+	chr(176)=>400, chr(177)=>549, chr(178)=>411, chr(179)=>549, chr(180)=>549, chr(181)=>713, chr(182)=>494, chr(183)=>460, chr(184)=>549, chr(185)=>549, chr(186)=>549, chr(187)=>549, chr(188)=>1000, chr(189)=>603, chr(190)=>1000, chr(191)=>658, chr(192)=>823, chr(193)=>686, chr(194)=>795, chr(195)=>987, chr(196)=>768, chr(197)=>768,
+	chr(198)=>823, chr(199)=>768, chr(200)=>768, chr(201)=>713, chr(202)=>713, chr(203)=>713, chr(204)=>713, chr(205)=>713, chr(206)=>713, chr(207)=>713, chr(208)=>768, chr(209)=>713, chr(210)=>790, chr(211)=>790, chr(212)=>890, chr(213)=>823, chr(214)=>549, chr(215)=>250, chr(216)=>713, chr(217)=>603, chr(218)=>603, chr(219)=>1042,
+	chr(220)=>987, chr(221)=>603, chr(222)=>987, chr(223)=>603, chr(224)=>494, chr(225)=>329, chr(226)=>790, chr(227)=>790, chr(228)=>786, chr(229)=>713, chr(230)=>384, chr(231)=>384, chr(232)=>384, chr(233)=>384, chr(234)=>384, chr(235)=>384, chr(236)=>494, chr(237)=>494, chr(238)=>494, chr(239)=>494, chr(240)=>0, chr(241)=>329,
+	chr(242)=>274, chr(243)=>686, chr(244)=>686, chr(245)=>686, chr(246)=>384, chr(247)=>384, chr(248)=>384, chr(249)=>384, chr(250)=>384, chr(251)=>384, chr(252)=>494, chr(253)=>494, chr(254)=>494, chr(255)=>0);
+$uv = array(32=>160, 33=>33, 34=>8704, 35=>35, 36=>8707, 37=>array(37, 2), 39=>8715, 40=>array(40, 2), 42=>8727, 43=>array(43, 2), 45=>8722, 46=>array(46, 18), 64=>8773, 65=>array(913, 2), 67=>935, 68=>array(916, 2), 70=>934, 71=>915, 72=>919, 73=>921, 74=>977, 75=>array(922, 4), 79=>array(927, 2), 81=>920, 82=>929, 83=>array(931, 3), 86=>962, 87=>937, 88=>926, 89=>936, 90=>918, 91=>91, 92=>8756, 93=>93, 94=>8869, 95=>95, 96=>63717, 97=>array(945, 2), 99=>967, 100=>array(948, 2), 102=>966, 103=>947, 104=>951, 105=>953, 106=>981, 107=>array(954, 4), 111=>array(959, 2), 113=>952, 114=>961, 115=>array(963, 3), 118=>982, 119=>969, 120=>958, 121=>968, 122=>950, 123=>array(123, 3), 126=>8764, 160=>8364, 161=>978, 162=>8242, 163=>8804, 164=>8725, 165=>8734, 166=>402, 167=>9827, 168=>9830, 169=>9829, 170=>9824, 171=>8596, 172=>array(8592, 4), 176=>array(176, 2), 178=>8243, 179=>8805, 180=>215, 181=>8733, 182=>8706, 183=>8226, 184=>247, 185=>array(8800, 2), 187=>8776, 188=>8230, 189=>array(63718, 2), 191=>8629, 192=>8501, 193=>8465, 194=>8476, 195=>8472, 196=>8855, 197=>8853, 198=>8709, 199=>array(8745, 2), 201=>8835, 202=>8839, 203=>8836, 204=>8834, 205=>8838, 206=>array(8712, 2), 208=>8736, 209=>8711, 210=>63194, 211=>63193, 212=>63195, 213=>8719, 214=>8730, 215=>8901, 216=>172, 217=>array(8743, 2), 219=>8660, 220=>array(8656, 4), 224=>9674, 225=>9001, 226=>array(63720, 3), 229=>8721, 230=>array(63723, 10), 241=>9002, 242=>8747, 243=>8992, 244=>63733, 245=>8993, 246=>array(63734, 9));
 ?>