Completed
Push — development ( 6a24df...5afdf5 )
by Nils
07:52
created
includes/libraries/Pdf/Tfpdf/tfpdf.class.php 1 patch
Spacing   +130 added lines, -130 removed lines patch added patch discarded remove patch
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
174 174
  * @param double $left
175 175
  * @param double $top
176 176
  */
177
-function SetMargins($left, $top, $right=null)
177
+function SetMargins($left, $top, $right = null)
178 178
 {
179 179
     // Set left, top and right margins
180 180
     $this->lMargin = $left;
181 181
     $this->tMargin = $top;
182
-    if($right===null) {
182
+    if ($right === null) {
183 183
             $right = $left;
184 184
     }
185 185
     $this->rMargin = $right;
@@ -208,25 +208,25 @@  discard block
 block discarded – undo
208 208
 /**
209 209
  * @param boolean $auto
210 210
  */
211
-function SetAutoPageBreak($auto, $margin=0)
211
+function SetAutoPageBreak($auto, $margin = 0)
212 212
 {
213 213
     // Set auto page break mode and triggering margin
214 214
     $this->AutoPageBreak = $auto;
215 215
     $this->bMargin = $margin;
216
-    $this->PageBreakTrigger = $this->h-$margin;
216
+    $this->PageBreakTrigger = $this->h - $margin;
217 217
 }
218 218
 
219 219
 /**
220 220
  * @param string $zoom
221 221
  */
222
-function SetDisplayMode($zoom, $layout='default')
222
+function SetDisplayMode($zoom, $layout = 'default')
223 223
 {
224 224
     // Set display mode in viewer
225
-    if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
225
+    if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))
226 226
         $this->ZoomMode = $zoom;
227 227
     else
228 228
         $this->Error('Incorrect zoom display mode: '.$zoom);
229
-    if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
229
+    if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
230 230
         $this->LayoutMode = $layout;
231 231
     else
232 232
         $this->Error('Incorrect layout display mode: '.$layout);
@@ -404,133 +404,133 @@  discard block
 block discarded – undo
404 404
     return $this->page;
405 405
 }
406 406
 
407
-function SetDrawColor($r, $g=null, $b=null)
407
+function SetDrawColor($r, $g = null, $b = null)
408 408
 {
409 409
     // Set color for all stroking operations
410
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
411
-            $this->DrawColor = sprintf('%.3F G',$r/255);
410
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
411
+            $this->DrawColor = sprintf('%.3F G', $r / 255);
412 412
     } else {
413
-            $this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
413
+            $this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);
414 414
     }
415
-    if($this->page>0) {
415
+    if ($this->page > 0) {
416 416
             $this->_out($this->DrawColor);
417 417
     }
418 418
     }
419 419
 
420
-function SetFillColor($r, $g=null, $b=null)
420
+function SetFillColor($r, $g = null, $b = null)
421 421
 {
422 422
     // Set color for all filling operations
423
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
424
-            $this->FillColor = sprintf('%.3F g',$r/255);
423
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
424
+            $this->FillColor = sprintf('%.3F g', $r / 255);
425 425
     } else {
426
-            $this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
426
+            $this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
427 427
     }
428
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
429
-    if($this->page>0) {
428
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
429
+    if ($this->page > 0) {
430 430
             $this->_out($this->FillColor);
431 431
     }
432 432
     }
433 433
 
434
-function SetTextColor($r, $g=null, $b=null)
434
+function SetTextColor($r, $g = null, $b = null)
435 435
 {
436 436
     // Set color for text
437
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
438
-            $this->TextColor = sprintf('%.3F g',$r/255);
437
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
438
+            $this->TextColor = sprintf('%.3F g', $r / 255);
439 439
     } else {
440
-            $this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
440
+            $this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
441 441
     }
442
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
442
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
443 443
 }
444 444
 
445 445
 function GetStringWidth($s)
446 446
 {
447 447
     // Get width of a string in the current font
448
-    $s = (string)$s;
448
+    $s = (string) $s;
449 449
     $cw = &$this->CurrentFont['cw'];
450
-    $w=0;
450
+    $w = 0;
451 451
     if ($this->unifontSubset) {
452 452
         $unicode = $this->UTF8StringToArray($s);
453
-        foreach($unicode as $char) {
454
-            if (isset($cw[$char])) { $w += (ord($cw[2*$char])<<8) + ord($cw[2*$char+1]); } else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if(isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
453
+        foreach ($unicode as $char) {
454
+            if (isset($cw[$char])) { $w += (ord($cw[2 * $char]) << 8) + ord($cw[2 * $char + 1]); } else if ($char > 0 && $char < 128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if (isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if (isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
455 455
         }
456 456
     } else {
457 457
         $l = strlen($s);
458
-        for($i=0;$i<$l;$i++) {
458
+        for ($i = 0; $i < $l; $i++) {
459 459
                     $w += $cw[$s[$i]];
460 460
         }
461 461
     }
462
-    return $w*$this->FontSize/1000;
462
+    return $w * $this->FontSize / 1000;
463 463
 }
464 464
 
465 465
 function SetLineWidth($width)
466 466
 {
467 467
     // Set line width
468 468
     $this->LineWidth = $width;
469
-    if($this->page>0) {
470
-            $this->_out(sprintf('%.2F w',$width*$this->k));
469
+    if ($this->page > 0) {
470
+            $this->_out(sprintf('%.2F w', $width * $this->k));
471 471
     }
472 472
     }
473 473
 
474 474
 function Line($x1, $y1, $x2, $y2)
475 475
 {
476 476
     // Draw a line
477
-    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
477
+    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));
478 478
 }
479 479
 
480
-function Rect($x, $y, $w, $h, $style='')
480
+function Rect($x, $y, $w, $h, $style = '')
481 481
 {
482 482
     // Draw a rectangle
483
-    if($style=='F') {
483
+    if ($style == 'F') {
484 484
             $op = 'f';
485
-    } elseif($style=='FD' || $style=='DF') {
485
+    } elseif ($style == 'FD' || $style == 'DF') {
486 486
             $op = 'B';
487 487
     } else {
488 488
             $op = 'S';
489 489
     }
490
-    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
490
+    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
491 491
 }
492 492
 
493 493
 /**
494 494
  * @param string $family
495 495
  */
496
-function AddFont($family, $style='', $file='', $uni=false)
496
+function AddFont($family, $style = '', $file = '', $uni = false)
497 497
 {
498 498
     // Add a TrueType, OpenType or Type1 font
499 499
     $family = strtolower($family);
500 500
     $style = strtoupper($style);
501
-    if($style=='IB')
502
-        $style='BI';
503
-    if($file=='') {
501
+    if ($style == 'IB')
502
+        $style = 'BI';
503
+    if ($file == '') {
504 504
         if ($uni) {
505
-        $file = str_replace(' ','',$family).strtolower($style).'.ttf';
505
+        $file = str_replace(' ', '', $family).strtolower($style).'.ttf';
506 506
         }
507 507
         else {
508
-        $file = str_replace(' ','',$family).strtolower($style).'.php';
508
+        $file = str_replace(' ', '', $family).strtolower($style).'.php';
509 509
         }
510 510
     }
511 511
     $fontkey = $family.$style;
512
-    if(isset($this->fonts[$fontkey]))
512
+    if (isset($this->fonts[$fontkey]))
513 513
         return;
514 514
 
515 515
     if ($uni) {
516
-        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file )) { $ttffilename = _SYSTEM_TTFONTS.$file ; }
517
-        else { $ttffilename = $this->_getfontpath().'unifont/'.$file ; }
518
-        $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file ,0,(strpos($file ,'.'))));
516
+        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file)) { $ttffilename = _SYSTEM_TTFONTS.$file; }
517
+        else { $ttffilename = $this->_getfontpath().'unifont/'.$file; }
518
+        $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file, 0, (strpos($file, '.'))));
519 519
         $name = '';
520 520
         $originalsize = 0;
521 521
         $ttfstat = stat($ttffilename);
522 522
         if (file_exists($unifilename.'.mtx.php')) {
523 523
             include($unifilename.'.mtx.php');
524 524
         }
525
-        if (!isset($type) ||  !isset($name) || $originalsize != $ttfstat['size']) {
525
+        if (!isset($type) || !isset($name) || $originalsize != $ttfstat['size']) {
526 526
             $ttffile = $ttffilename;
527 527
             require_once($this->_getfontpath().'unifont/ttfonts.php');
528 528
             $ttf = new TTFontFile();
529 529
             $ttf->getMetrics($ttffile);
530 530
             $cw = $ttf->charWidths;
531
-            $name = preg_replace('/[ ()]/','',$ttf->fullName);
531
+            $name = preg_replace('/[ ()]/', '', $ttf->fullName);
532 532
 
533
-            $desc= array('Ascent'=>round($ttf->ascent),
533
+            $desc = array('Ascent'=>round($ttf->ascent),
534 534
             'Descent'=>round($ttf->descent),
535 535
             'CapHeight'=>round($ttf->capHeight),
536 536
             'Flags'=>$ttf->flags,
@@ -607,48 +607,48 @@  discard block
 block discarded – undo
607 607
 /**
608 608
  * @param string $family
609 609
  */
610
-function SetFont($family, $style='', $size=0)
610
+function SetFont($family, $style = '', $size = 0)
611 611
 {
612 612
     // Select a font; size given in points
613
-    if($family=='') {
613
+    if ($family == '') {
614 614
             $family = $this->FontFamily;
615 615
     } else {
616 616
             $family = strtolower($family);
617 617
     }
618 618
     $style = strtoupper($style);
619
-    if(strpos($style,'U')!==false)
619
+    if (strpos($style, 'U') !== false)
620 620
     {
621 621
         $this->underline = true;
622
-        $style = str_replace('U','',$style);
622
+        $style = str_replace('U', '', $style);
623 623
     } else {
624 624
             $this->underline = false;
625 625
     }
626
-    if($style=='IB') {
626
+    if ($style == 'IB') {
627 627
             $style = 'BI';
628 628
     }
629
-    if($size==0) {
629
+    if ($size == 0) {
630 630
             $size = $this->FontSizePt;
631 631
     }
632 632
     // Test if font is already selected
633
-    if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
633
+    if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size) {
634 634
             return;
635 635
     }
636 636
     // Test if font is already loaded
637 637
     $fontkey = $family.$style;
638
-    if(!isset($this->fonts[$fontkey]))
638
+    if (!isset($this->fonts[$fontkey]))
639 639
     {
640 640
         // Test if one of the core fonts
641
-        if($family=='arial') {
641
+        if ($family == 'arial') {
642 642
                     $family = 'helvetica';
643 643
         }
644
-        if(in_array($family,$this->CoreFonts))
644
+        if (in_array($family, $this->CoreFonts))
645 645
         {
646
-            if($family=='symbol' || $family=='zapfdingbats') {
646
+            if ($family == 'symbol' || $family == 'zapfdingbats') {
647 647
                             $style = '';
648 648
             }
649 649
             $fontkey = $family.$style;
650
-            if(!isset($this->fonts[$fontkey])) {
651
-                            $this->AddFont($family,$style);
650
+            if (!isset($this->fonts[$fontkey])) {
651
+                            $this->AddFont($family, $style);
652 652
             }
653 653
         } else {
654 654
                     $this->Error('Undefined font: '.$family.' '.$style);
@@ -1095,11 +1095,11 @@  discard block
 block discarded – undo
1095 1095
         }
1096 1096
     }
1097 1097
     // Last chunk
1098
-    if($i!=$j) {
1098
+    if ($i != $j) {
1099 1099
         if ($this->unifontSubset) {
1100
-            $this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',0,$link);
1100
+            $this->Cell($l, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), 0, 0, '', 0, $link);
1101 1101
         } else {
1102
-            $this->Cell($l,$h,substr($s,$j),0,0,'',0,$link);
1102
+            $this->Cell($l, $h, substr($s, $j), 0, 0, '', 0, $link);
1103 1103
         }
1104 1104
     }
1105 1105
 }
@@ -1107,86 +1107,86 @@  discard block
 block discarded – undo
1107 1107
 /**
1108 1108
  * @param integer $h
1109 1109
  */
1110
-function Ln($h=null)
1110
+function Ln($h = null)
1111 1111
 {
1112 1112
     // Line feed; default value is last cell height
1113 1113
     $this->x = $this->lMargin;
1114
-    if($h===null) {
1114
+    if ($h === null) {
1115 1115
             $this->y += $this->lasth;
1116 1116
     } else {
1117 1117
             $this->y += $h;
1118 1118
     }
1119 1119
     }
1120 1120
 
1121
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
1121
+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')
1122 1122
 {
1123 1123
     // Put an image on the page
1124
-    if(!isset($this->images[$file]))
1124
+    if (!isset($this->images[$file]))
1125 1125
     {
1126 1126
         // First use of this image, get info
1127
-        if($type=='')
1127
+        if ($type == '')
1128 1128
         {
1129
-            $pos = strrpos($file,'.');
1130
-            if(!$pos) {
1129
+            $pos = strrpos($file, '.');
1130
+            if (!$pos) {
1131 1131
                             $this->Error('Image file has no extension and no type was specified: '.$file);
1132 1132
             }
1133
-            $type = substr($file,$pos+1);
1133
+            $type = substr($file, $pos + 1);
1134 1134
         }
1135 1135
         $type = strtolower($type);
1136
-        if($type=='jpeg') {
1136
+        if ($type == 'jpeg') {
1137 1137
                     $type = 'jpg';
1138 1138
         }
1139 1139
         $mtd = '_parse'.$type;
1140
-        if(!method_exists($this,$mtd)) {
1140
+        if (!method_exists($this, $mtd)) {
1141 1141
                     $this->Error('Unsupported image type: '.$type);
1142 1142
         }
1143 1143
         $info = $this->$mtd($file);
1144
-        $info['i'] = count($this->images)+1;
1144
+        $info['i'] = count($this->images) + 1;
1145 1145
         $this->images[$file] = $info;
1146 1146
     } else {
1147 1147
             $info = $this->images[$file];
1148 1148
     }
1149 1149
 
1150 1150
     // Automatic width and height calculation if needed
1151
-    if($w==0 && $h==0)
1151
+    if ($w == 0 && $h == 0)
1152 1152
     {
1153 1153
         // Put image at 96 dpi
1154 1154
         $w = -96;
1155 1155
         $h = -96;
1156 1156
     }
1157
-    if($w<0) {
1158
-            $w = -$info['w']*72/$w/$this->k;
1157
+    if ($w < 0) {
1158
+            $w = -$info['w'] * 72 / $w / $this->k;
1159 1159
     }
1160
-    if($h<0) {
1161
-            $h = -$info['h']*72/$h/$this->k;
1160
+    if ($h < 0) {
1161
+            $h = -$info['h'] * 72 / $h / $this->k;
1162 1162
     }
1163
-    if($w==0) {
1164
-            $w = $h*$info['w']/$info['h'];
1163
+    if ($w == 0) {
1164
+            $w = $h * $info['w'] / $info['h'];
1165 1165
     }
1166
-    if($h==0) {
1167
-            $h = $w*$info['h']/$info['w'];
1166
+    if ($h == 0) {
1167
+            $h = $w * $info['h'] / $info['w'];
1168 1168
     }
1169 1169
 
1170 1170
     // Flowing mode
1171
-    if($y===null)
1171
+    if ($y === null)
1172 1172
     {
1173
-        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
1173
+        if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
1174 1174
         {
1175 1175
             // Automatic page break
1176 1176
             $x2 = $this->x;
1177
-            $this->AddPage($this->CurOrientation,$this->CurPageSize);
1177
+            $this->AddPage($this->CurOrientation, $this->CurPageSize);
1178 1178
             $this->x = $x2;
1179 1179
         }
1180 1180
         $y = $this->y;
1181 1181
         $this->y += $h;
1182 1182
     }
1183 1183
 
1184
-    if($x===null) {
1184
+    if ($x === null) {
1185 1185
             $x = $this->x;
1186 1186
     }
1187
-    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
1188
-    if($link) {
1189
-            $this->Link($x,$y,$w,$h,$link);
1187
+    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));
1188
+    if ($link) {
1189
+            $this->Link($x, $y, $w, $h, $link);
1190 1190
     }
1191 1191
     }
1192 1192
 
@@ -1782,62 +1782,62 @@  discard block
 block discarded – undo
1782 1782
     $this->_out('1 0 obj');
1783 1783
     $this->_out('<</Type /Pages');
1784 1784
     $kids = '/Kids [';
1785
-    for($i=0;$i<$nb;$i++) {
1786
-            $kids .= (3+2*$i).' 0 R ';
1785
+    for ($i = 0; $i < $nb; $i++) {
1786
+            $kids .= (3 + 2 * $i).' 0 R ';
1787 1787
     }
1788 1788
     $this->_out($kids.']');
1789 1789
     $this->_out('/Count '.$nb);
1790
-    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
1790
+    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));
1791 1791
     $this->_out('>>');
1792 1792
     $this->_out('endobj');
1793 1793
 }
1794 1794
 
1795 1795
 function _putfonts()
1796 1796
 {
1797
-    $nf=$this->n;
1798
-    foreach($this->diffs as $diff)
1797
+    $nf = $this->n;
1798
+    foreach ($this->diffs as $diff)
1799 1799
     {
1800 1800
         // Encodings
1801 1801
         $this->_newobj();
1802 1802
         $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
1803 1803
         $this->_out('endobj');
1804 1804
     }
1805
-    foreach($this->FontFiles as $file=>$info)
1805
+    foreach ($this->FontFiles as $file=>$info)
1806 1806
     {
1807
-        if (!isset($info['type']) || $info['type']!='TTF') {
1807
+        if (!isset($info['type']) || $info['type'] != 'TTF') {
1808 1808
         // Font file embedding
1809 1809
         $this->_newobj();
1810
-        $this->FontFiles[$file]['n']=$this->n;
1811
-        $font='';
1812
-        $f=fopen($this->_getfontpath().$file,'rb',1);
1813
-        if(!$f) {
1810
+        $this->FontFiles[$file]['n'] = $this->n;
1811
+        $font = '';
1812
+        $f = fopen($this->_getfontpath().$file, 'rb', 1);
1813
+        if (!$f) {
1814 1814
                     $this->Error('Font file not found');
1815 1815
         }
1816
-        while(!feof($f)) {
1817
-                    $font.=fread($f,8192);
1816
+        while (!feof($f)) {
1817
+                    $font .= fread($f, 8192);
1818 1818
         }
1819 1819
         fclose($f);
1820
-        $compressed=(substr($file,-2)=='.z');
1821
-        if(!$compressed && isset($info['length2']))
1820
+        $compressed = (substr($file, -2) == '.z');
1821
+        if (!$compressed && isset($info['length2']))
1822 1822
         {
1823
-            $header=(ord($font[0])==128);
1824
-            if($header)
1823
+            $header = (ord($font[0]) == 128);
1824
+            if ($header)
1825 1825
             {
1826 1826
                 // Strip first binary header
1827
-                $font=substr($font,6);
1827
+                $font = substr($font, 6);
1828 1828
             }
1829
-            if($header && ord($font[$info['length1']])==128)
1829
+            if ($header && ord($font[$info['length1']]) == 128)
1830 1830
             {
1831 1831
                 // Strip second binary header
1832
-                $font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
1832
+                $font = substr($font, 0, $info['length1']).substr($font, $info['length1'] + 6);
1833 1833
             }
1834 1834
         }
1835 1835
         $this->_out('<</Length '.strlen($font));
1836
-        if($compressed) {
1836
+        if ($compressed) {
1837 1837
                     $this->_out('/Filter /FlateDecode');
1838 1838
         }
1839 1839
         $this->_out('/Length1 '.$info['length1']);
1840
-        if(isset($info['length2'])) {
1840
+        if (isset($info['length2'])) {
1841 1841
                     $this->_out('/Length2 '.$info['length2'].' /Length3 0');
1842 1842
         }
1843 1843
         $this->_out('>>');
@@ -1845,40 +1845,40 @@  discard block
 block discarded – undo
1845 1845
         $this->_out('endobj');
1846 1846
         }
1847 1847
     }
1848
-    foreach($this->fonts as $k=>$font)
1848
+    foreach ($this->fonts as $k=>$font)
1849 1849
     {
1850 1850
         // Font objects
1851 1851
         //$this->fonts[$k]['n']=$this->n+1;
1852 1852
         $type = $font['type'];
1853 1853
         $name = $font['name'];
1854
-        if($type=='Core')
1854
+        if ($type == 'Core')
1855 1855
         {
1856 1856
             // Standard font
1857
-            $this->fonts[$k]['n']=$this->n+1;
1857
+            $this->fonts[$k]['n'] = $this->n + 1;
1858 1858
             $this->_newobj();
1859 1859
             $this->_out('<</Type /Font');
1860 1860
             $this->_out('/BaseFont /'.$name);
1861 1861
             $this->_out('/Subtype /Type1');
1862
-            if($name!='Symbol' && $name!='ZapfDingbats') {
1862
+            if ($name != 'Symbol' && $name != 'ZapfDingbats') {
1863 1863
                             $this->_out('/Encoding /WinAnsiEncoding');
1864 1864
             }
1865 1865
             $this->_out('>>');
1866 1866
             $this->_out('endobj');
1867
-        } elseif($type=='Type1' || $type=='TrueType')
1867
+        } elseif ($type == 'Type1' || $type == 'TrueType')
1868 1868
         {
1869 1869
             // Additional Type1 or TrueType font
1870
-            $this->fonts[$k]['n']=$this->n+1;
1870
+            $this->fonts[$k]['n'] = $this->n + 1;
1871 1871
             $this->_newobj();
1872 1872
             $this->_out('<</Type /Font');
1873 1873
             $this->_out('/BaseFont /'.$name);
1874 1874
             $this->_out('/Subtype /'.$type);
1875 1875
             $this->_out('/FirstChar 32 /LastChar 255');
1876
-            $this->_out('/Widths '.($this->n+1).' 0 R');
1877
-            $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
1878
-            if($font['enc'])
1876
+            $this->_out('/Widths '.($this->n + 1).' 0 R');
1877
+            $this->_out('/FontDescriptor '.($this->n + 2).' 0 R');
1878
+            if ($font['enc'])
1879 1879
             {
1880
-                if(isset($font['diff'])) {
1881
-                                    $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
1880
+                if (isset($font['diff'])) {
1881
+                                    $this->_out('/Encoding '.($nf + $font['diff']).' 0 R');
1882 1882
                 } else {
1883 1883
                                     $this->_out('/Encoding /WinAnsiEncoding');
1884 1884
                 }
@@ -2327,15 +2327,15 @@  discard block
 block discarded – undo
2327 2327
     for ($i = 0; $i < $len; $i++) {
2328 2328
     $uni = -1;
2329 2329
         $h = ord($str[$i]);
2330
-        if ( $h <= 0x7F )
2330
+        if ($h <= 0x7F)
2331 2331
             $uni = $h;
2332
-        elseif ( $h >= 0xC2 ) {
2333
-            if ( ($h <= 0xDF) && ($i < $len -1) )
2332
+        elseif ($h >= 0xC2) {
2333
+            if (($h <= 0xDF) && ($i < $len - 1))
2334 2334
             $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
2335
-            elseif ( ($h <= 0xEF) && ($i < $len -2) )
2335
+            elseif (($h <= 0xEF) && ($i < $len - 2))
2336 2336
             $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
2337 2337
                                         | (ord($str[++$i]) & 0x3F);
2338
-            elseif ( ($h <= 0xF4) && ($i < $len -3) )
2338
+            elseif (($h <= 0xF4) && ($i < $len - 3))
2339 2339
             $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
2340 2340
                                         | (ord($str[++$i]) & 0x3F) << 6
2341 2341
                                         | (ord($str[++$i]) & 0x3F);
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/timesi.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $up = -100;
5 5
 $ut = 50;
6 6
 $cw = array(
7
-    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,
8
-    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,
9
-    ','=>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,
10
-    '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,
11
-    '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,
12
-    '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,
13
-    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,
14
-    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,
15
-    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,
16
-    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,
17
-    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,
18
-    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);
7
+    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,
8
+    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,
9
+    ','=>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,
10
+    '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,
11
+    '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,
12
+    '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,
13
+    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,
14
+    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,
15
+    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,
16
+    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,
17
+    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,
18
+    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);
19 19
 ?>
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/zapfdingbats.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $up = -100;
5 5
 $ut = 50;
6 6
 $cw = array(
7
-    chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
8
-    chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
9
-    ','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
10
-    'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
11
-    'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
12
-    'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
13
-    chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,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,
14
-    chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
15
-    chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
16
-    chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
17
-    chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
18
-    chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
7
+    chr(0)=>0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
8
+    chr(22)=>0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
9
+    ','=>549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
10
+    'B'=>786, 'C'=>788, 'D'=>788, 'E'=>790, 'F'=>793, 'G'=>794, 'H'=>816, 'I'=>823, 'J'=>789, 'K'=>841, 'L'=>823, 'M'=>833, 'N'=>816, 'O'=>831, 'P'=>923, 'Q'=>744, 'R'=>723, 'S'=>749, 'T'=>790, 'U'=>792, 'V'=>695, 'W'=>776,
11
+    'X'=>768, 'Y'=>792, 'Z'=>759, '['=>707, '\\'=>708, ']'=>682, '^'=>701, '_'=>826, '`'=>815, 'a'=>789, 'b'=>789, 'c'=>707, 'd'=>687, 'e'=>696, 'f'=>689, 'g'=>786, 'h'=>787, 'i'=>713, 'j'=>791, 'k'=>785, 'l'=>791, 'm'=>873,
12
+    'n'=>761, 'o'=>762, 'p'=>762, 'q'=>759, 'r'=>759, 's'=>892, 't'=>892, 'u'=>788, 'v'=>784, 'w'=>438, 'x'=>138, 'y'=>277, 'z'=>415, '{'=>392, '|'=>392, '}'=>668, '~'=>668, chr(127)=>0, chr(128)=>390, chr(129)=>390, chr(130)=>317, chr(131)=>317,
13
+    chr(132)=>276, chr(133)=>276, chr(134)=>509, chr(135)=>509, chr(136)=>410, chr(137)=>410, chr(138)=>234, chr(139)=>234, chr(140)=>334, chr(141)=>334, 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,
14
+    chr(154)=>0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>0, chr(161)=>732, chr(162)=>544, chr(163)=>544, chr(164)=>910, chr(165)=>667, chr(166)=>760, chr(167)=>760, chr(168)=>776, chr(169)=>595, chr(170)=>694, chr(171)=>626, chr(172)=>788, chr(173)=>788, chr(174)=>788, chr(175)=>788,
15
+    chr(176)=>788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
16
+    chr(198)=>788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
17
+    chr(220)=>927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
18
+    chr(242)=>760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0);
19 19
 ?>
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/courier.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,6 +3,6 @@
 block discarded – undo
3 3
 $name = 'Courier';
4 4
 $up = -100;
5 5
 $ut = 50;
6
-for($i=0;$i<=255;$i++)
6
+for ($i = 0; $i <= 255; $i++)
7 7
     $cw[chr($i)] = 600;
8 8
 ?>
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/helvetica.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $up = -100;
5 5
 $ut = 50;
6 6
 $cw = array(
7
-    chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
8
-    chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
9
-    ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
10
-    'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
11
-    'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
12
-    'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
13
-    chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
14
-    chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
15
-    chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
16
-    chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
17
-    chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
18
-    chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
7
+    chr(0)=>278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
8
+    chr(22)=>278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
9
+    ','=>278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,
10
+    'B'=>667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>500, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
11
+    'X'=>667, 'Y'=>667, 'Z'=>611, '['=>278, '\\'=>278, ']'=>278, '^'=>469, '_'=>556, '`'=>333, 'a'=>556, 'b'=>556, 'c'=>500, 'd'=>556, 'e'=>556, 'f'=>278, 'g'=>556, 'h'=>556, 'i'=>222, 'j'=>222, 'k'=>500, 'l'=>222, 'm'=>833,
12
+    'n'=>556, 'o'=>556, 'p'=>556, 'q'=>556, 'r'=>333, 's'=>500, 't'=>278, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>500, '{'=>334, '|'=>260, '}'=>334, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>222, chr(131)=>556,
13
+    chr(132)=>333, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>222, chr(146)=>222, chr(147)=>333, chr(148)=>333, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
14
+    chr(154)=>500, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>260, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
15
+    chr(176)=>400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
16
+    chr(198)=>1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
17
+    chr(220)=>722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,
18
+    chr(242)=>556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500);
19 19
 ?>
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/unifont/dejavusanscondensed.mtx.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-$name='DejaVuSansCondensed';
3
-$type='TTF';
4
-$desc=array (
2
+$name = 'DejaVuSansCondensed';
3
+$type = 'TTF';
4
+$desc = array(
5 5
     'Ascent' => 928.0,
6 6
     'Descent' => -236.0,
7 7
     'CapHeight' => 928.0,
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/unifont/ttfonts.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 var $maxStrLenRead;
71 71
 
72 72
 	function __construct() {
73
-		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
73
+		$this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
74 74
 	}
75 75
 
76 76
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	function getMetrics($file) {
81 81
 		$this->filename = $file;
82
-		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
82
+		$this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
83 83
 		$this->_pos = 0;
84 84
 		$this->charWidths = '';
85 85
 		$this->glyphPos = array();
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
 	function seek($pos) {
160 160
 		$this->_pos = $pos;
161
-		fseek($this->fh,$this->_pos);
161
+		fseek($this->fh, $this->_pos);
162 162
 	}
163 163
 
164 164
 	/**
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 */
167 167
 	function skip($delta) {
168 168
 		$this->_pos = $this->_pos + $delta;
169
-		fseek($this->fh,$this->_pos);
169
+		fseek($this->fh, $this->_pos);
170 170
 	}
171 171
 
172 172
 	/**
@@ -202,44 +202,44 @@  discard block
 block discarded – undo
202 202
 
203 203
 	function read_ushort() {
204 204
 		$this->_pos += 2;
205
-		$s = fread($this->fh,2);
206
-		return (ord($s[0])<<8) + ord($s[1]);
205
+		$s = fread($this->fh, 2);
206
+		return (ord($s[0]) << 8) + ord($s[1]);
207 207
 	}
208 208
 
209 209
 	function read_ulong() {
210 210
 		$this->_pos += 4;
211
-		$s = fread($this->fh,4);
211
+		$s = fread($this->fh, 4);
212 212
 		// if large uInt32 as an integer, PHP converts it to -ve
213
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
213
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
214 214
 	}
215 215
 
216 216
 	function get_ushort($pos) {
217
-		fseek($this->fh,$pos);
218
-		$s = fread($this->fh,2);
219
-		return (ord($s[0])<<8) + ord($s[1]);
217
+		fseek($this->fh, $pos);
218
+		$s = fread($this->fh, 2);
219
+		return (ord($s[0]) << 8) + ord($s[1]);
220 220
 	}
221 221
 
222 222
 	function get_ulong($pos) {
223
-		fseek($this->fh,$pos);
224
-		$s = fread($this->fh,4);
223
+		fseek($this->fh, $pos);
224
+		$s = fread($this->fh, 4);
225 225
 		// iF large uInt32 as an integer, PHP converts it to -ve
226
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
226
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
227 227
 	}
228 228
 
229 229
 	function pack_short($val) {
230
-		if ($val<0) { 
230
+		if ($val < 0) { 
231 231
 			$val = abs($val);
232 232
 			$val = ~$val;
233 233
 			$val += 1;
234 234
 		}
235
-		return pack("n",$val); 
235
+		return pack("n", $val); 
236 236
 	}
237 237
 
238 238
 	/**
239 239
 	 * @param string $value
240 240
 	 */
241 241
 	function splice($stream, $offset, $value) {
242
-		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
242
+		return substr($stream, 0, $offset).$value.substr($stream, $offset + strlen($value));
243 243
 	}
244 244
 
245 245
 	/**
@@ -252,19 +252,19 @@  discard block
 block discarded – undo
252 252
 	}
253 253
 
254 254
 	function _set_short($stream, $offset, $val) {
255
-		if ($val<0) { 
255
+		if ($val < 0) { 
256 256
 			$val = abs($val);
257 257
 			$val = ~$val;
258 258
 			$val += 1;
259 259
 		}
260
-		$up = pack("n",$val); 
260
+		$up = pack("n", $val); 
261 261
 		return $this->splice($stream, $offset, $up);
262 262
 	}
263 263
 
264 264
 	function get_chunk($pos, $length) {
265
-		fseek($this->fh,$pos);
266
-		if ($length <1) { return ''; }
267
-		return (fread($this->fh,$length));
265
+		fseek($this->fh, $pos);
266
+		if ($length < 1) { return ''; }
267
+		return (fread($this->fh, $length));
268 268
 	}
269 269
 
270 270
 	/**
@@ -273,8 +273,8 @@  discard block
 block discarded – undo
273 273
 	function get_table($tag) {
274 274
 		list($pos, $length) = $this->get_table_pos($tag);
275 275
 		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
276
-		fseek($this->fh,$pos);
277
-		return (fread($this->fh,$length));
276
+		fseek($this->fh, $pos);
277
+		return (fread($this->fh, $length));
278 278
 	}
279 279
 
280 280
 	/**
@@ -1034,7 +1034,7 @@  discard block
 block discarded – undo
1034 1034
 	/**
1035 1035
 	 * @param integer $unicode_cmap_offset
1036 1036
 	 */
1037
-	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
1037
+	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph) {
1038 1038
 		$this->maxUniChar = 0;
1039 1039
 		$this->seek($unicode_cmap_offset + 2);
1040 1040
 		$length = $this->read_ushort();
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/times.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $up = -100;
5 5
 $ut = 50;
6 6
 $cw = array(
7
-    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,
8
-    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,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
9
-    ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
10
-    'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
11
-    'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
12
-    'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
13
-    chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
14
-    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)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
15
-    chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,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)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
16
-    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)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
17
-    chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,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,
18
-    chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
7
+    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,
8
+    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, '"'=>408, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>180, '('=>333, ')'=>333, '*'=>500, '+'=>564,
9
+    ','=>250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>564, '='=>564, '>'=>564, '?'=>444, '@'=>921, 'A'=>722,
10
+    'B'=>667, 'C'=>667, 'D'=>722, 'E'=>611, 'F'=>556, 'G'=>722, 'H'=>722, 'I'=>333, 'J'=>389, 'K'=>722, 'L'=>611, 'M'=>889, 'N'=>722, 'O'=>722, 'P'=>556, 'Q'=>722, 'R'=>667, 'S'=>556, 'T'=>611, 'U'=>722, 'V'=>722, 'W'=>944,
11
+    'X'=>722, 'Y'=>722, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>469, '_'=>500, '`'=>333, 'a'=>444, 'b'=>500, 'c'=>444, 'd'=>500, 'e'=>444, 'f'=>333, 'g'=>500, 'h'=>500, 'i'=>278, 'j'=>278, 'k'=>500, 'l'=>278, 'm'=>778,
12
+    'n'=>500, 'o'=>500, 'p'=>500, 'q'=>500, 'r'=>333, 's'=>389, 't'=>278, 'u'=>500, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>444, '{'=>480, '|'=>200, '}'=>480, '~'=>541, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
13
+    chr(132)=>444, chr(133)=>1000, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>556, chr(139)=>333, chr(140)=>889, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>444, chr(148)=>444, chr(149)=>350, chr(150)=>500, chr(151)=>1000, chr(152)=>333, chr(153)=>980,
14
+    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)=>200, chr(167)=>500, chr(168)=>333, chr(169)=>760, chr(170)=>276, chr(171)=>500, chr(172)=>564, chr(173)=>333, chr(174)=>760, chr(175)=>333,
15
+    chr(176)=>400, chr(177)=>564, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>453, 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)=>444, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
16
+    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)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>564, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
17
+    chr(220)=>722, chr(221)=>722, chr(222)=>556, chr(223)=>500, chr(224)=>444, chr(225)=>444, chr(226)=>444, chr(227)=>444, chr(228)=>444, chr(229)=>444, 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,
18
+    chr(242)=>500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>564, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>500, chr(254)=>500, chr(255)=>500);
19 19
 ?>
Please login to merge, or discard this patch.
includes/libraries/Pdf/Tfpdf/font/symbol.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $up = -100;
5 5
 $ut = 50;
6 6
 $cw = array(
7
-    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,
8
-    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,
9
-    ','=>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,
10
-    '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,
11
-    '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,
12
-    '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,
13
-    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,
14
-    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,
15
-    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,
16
-    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,
17
-    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,
18
-    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);
7
+    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,
8
+    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,
9
+    ','=>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,
10
+    '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,
11
+    '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,
12
+    '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,
13
+    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,
14
+    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,
15
+    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,
16
+    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,
17
+    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,
18
+    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);
19 19
 ?>
Please login to merge, or discard this patch.