joenilson / residentes

extras/fpdf183/font/courieri.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 $up = -100;
 $ut = 50;
 for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
+    $cw[chr($i)] = 600;
 $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 +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 $name = 'Courier-Oblique';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for ($i = 0; $i <= 255; $i++)
 	$cw[chr($i)] = 600;
 $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));
 ?>

Braces +2 added lines, -1 removed lines

@@ -3,8 +3,9 @@
 $name = 'Courier-Oblique';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 $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));
 ?>

extras/fpdf183/font/calligra.php

Indentation +12 added lines, -12 removed lines

@@ -5,18 +5,18 @@
 $up = -200;
 $ut = 20;
 $cw = array(
-	chr(0)=>800,chr(1)=>800,chr(2)=>800,chr(3)=>800,chr(4)=>800,chr(5)=>800,chr(6)=>800,chr(7)=>800,chr(8)=>800,chr(9)=>800,chr(10)=>800,chr(11)=>800,chr(12)=>800,chr(13)=>800,chr(14)=>800,chr(15)=>800,chr(16)=>800,chr(17)=>800,chr(18)=>800,chr(19)=>800,chr(20)=>800,chr(21)=>800,
-	chr(22)=>800,chr(23)=>800,chr(24)=>800,chr(25)=>800,chr(26)=>800,chr(27)=>800,chr(28)=>800,chr(29)=>800,chr(30)=>800,chr(31)=>800,' '=>282,'!'=>324,'"'=>405,'#'=>584,'$'=>632,'%'=>980,'&'=>776,'\''=>259,'('=>299,')'=>299,'*'=>377,'+'=>600,
-	','=>259,'-'=>432,'.'=>254,'/'=>597,'0'=>529,'1'=>298,'2'=>451,'3'=>359,'4'=>525,'5'=>423,'6'=>464,'7'=>417,'8'=>457,'9'=>479,':'=>275,';'=>282,'<'=>600,'='=>600,'>'=>600,'?'=>501,'@'=>800,'A'=>743,
-	'B'=>636,'C'=>598,'D'=>712,'E'=>608,'F'=>562,'G'=>680,'H'=>756,'I'=>308,'J'=>314,'K'=>676,'L'=>552,'M'=>1041,'N'=>817,'O'=>729,'P'=>569,'Q'=>698,'R'=>674,'S'=>618,'T'=>673,'U'=>805,'V'=>753,'W'=>1238,
-	'X'=>716,'Y'=>754,'Z'=>599,'['=>315,'\\'=>463,']'=>315,'^'=>600,'_'=>547,'`'=>278,'a'=>581,'b'=>564,'c'=>440,'d'=>571,'e'=>450,'f'=>347,'g'=>628,'h'=>611,'i'=>283,'j'=>283,'k'=>560,'l'=>252,'m'=>976,
-	'n'=>595,'o'=>508,'p'=>549,'q'=>540,'r'=>395,'s'=>441,'t'=>307,'u'=>614,'v'=>556,'w'=>915,'x'=>559,'y'=>597,'z'=>452,'{'=>315,'|'=>222,'}'=>315,'~'=>600,chr(127)=>800,chr(128)=>800,chr(129)=>800,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>780,chr(134)=>0,chr(135)=>0,chr(136)=>278,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>1064,chr(141)=>800,chr(142)=>0,chr(143)=>800,chr(144)=>800,chr(145)=>259,chr(146)=>259,chr(147)=>470,chr(148)=>470,chr(149)=>500,chr(150)=>300,chr(151)=>600,chr(152)=>278,chr(153)=>990,
-	chr(154)=>0,chr(155)=>0,chr(156)=>790,chr(157)=>800,chr(158)=>800,chr(159)=>754,chr(160)=>282,chr(161)=>324,chr(162)=>450,chr(163)=>640,chr(164)=>518,chr(165)=>603,chr(166)=>0,chr(167)=>519,chr(168)=>254,chr(169)=>800,chr(170)=>349,chr(171)=>0,chr(172)=>0,chr(173)=>432,chr(174)=>800,chr(175)=>278,
-	chr(176)=>0,chr(177)=>0,chr(178)=>0,chr(179)=>0,chr(180)=>278,chr(181)=>614,chr(182)=>0,chr(183)=>254,chr(184)=>278,chr(185)=>0,chr(186)=>305,chr(187)=>0,chr(188)=>0,chr(189)=>0,chr(190)=>0,chr(191)=>501,chr(192)=>743,chr(193)=>743,chr(194)=>743,chr(195)=>743,chr(196)=>743,chr(197)=>743,
-	chr(198)=>1060,chr(199)=>598,chr(200)=>608,chr(201)=>608,chr(202)=>608,chr(203)=>608,chr(204)=>308,chr(205)=>308,chr(206)=>308,chr(207)=>308,chr(208)=>0,chr(209)=>817,chr(210)=>729,chr(211)=>729,chr(212)=>729,chr(213)=>729,chr(214)=>729,chr(215)=>0,chr(216)=>729,chr(217)=>805,chr(218)=>805,chr(219)=>805,
-	chr(220)=>805,chr(221)=>0,chr(222)=>0,chr(223)=>688,chr(224)=>581,chr(225)=>581,chr(226)=>581,chr(227)=>581,chr(228)=>581,chr(229)=>581,chr(230)=>792,chr(231)=>440,chr(232)=>450,chr(233)=>450,chr(234)=>450,chr(235)=>450,chr(236)=>283,chr(237)=>283,chr(238)=>283,chr(239)=>283,chr(240)=>0,chr(241)=>595,
-	chr(242)=>508,chr(243)=>508,chr(244)=>508,chr(245)=>508,chr(246)=>508,chr(247)=>0,chr(248)=>508,chr(249)=>614,chr(250)=>614,chr(251)=>614,chr(252)=>614,chr(253)=>0,chr(254)=>0,chr(255)=>597);
+    chr(0)=>800,chr(1)=>800,chr(2)=>800,chr(3)=>800,chr(4)=>800,chr(5)=>800,chr(6)=>800,chr(7)=>800,chr(8)=>800,chr(9)=>800,chr(10)=>800,chr(11)=>800,chr(12)=>800,chr(13)=>800,chr(14)=>800,chr(15)=>800,chr(16)=>800,chr(17)=>800,chr(18)=>800,chr(19)=>800,chr(20)=>800,chr(21)=>800,
+    chr(22)=>800,chr(23)=>800,chr(24)=>800,chr(25)=>800,chr(26)=>800,chr(27)=>800,chr(28)=>800,chr(29)=>800,chr(30)=>800,chr(31)=>800,' '=>282,'!'=>324,'"'=>405,'#'=>584,'$'=>632,'%'=>980,'&'=>776,'\''=>259,'('=>299,')'=>299,'*'=>377,'+'=>600,
+    ','=>259,'-'=>432,'.'=>254,'/'=>597,'0'=>529,'1'=>298,'2'=>451,'3'=>359,'4'=>525,'5'=>423,'6'=>464,'7'=>417,'8'=>457,'9'=>479,':'=>275,';'=>282,'<'=>600,'='=>600,'>'=>600,'?'=>501,'@'=>800,'A'=>743,
+    'B'=>636,'C'=>598,'D'=>712,'E'=>608,'F'=>562,'G'=>680,'H'=>756,'I'=>308,'J'=>314,'K'=>676,'L'=>552,'M'=>1041,'N'=>817,'O'=>729,'P'=>569,'Q'=>698,'R'=>674,'S'=>618,'T'=>673,'U'=>805,'V'=>753,'W'=>1238,
+    'X'=>716,'Y'=>754,'Z'=>599,'['=>315,'\\'=>463,']'=>315,'^'=>600,'_'=>547,'`'=>278,'a'=>581,'b'=>564,'c'=>440,'d'=>571,'e'=>450,'f'=>347,'g'=>628,'h'=>611,'i'=>283,'j'=>283,'k'=>560,'l'=>252,'m'=>976,
+    'n'=>595,'o'=>508,'p'=>549,'q'=>540,'r'=>395,'s'=>441,'t'=>307,'u'=>614,'v'=>556,'w'=>915,'x'=>559,'y'=>597,'z'=>452,'{'=>315,'|'=>222,'}'=>315,'~'=>600,chr(127)=>800,chr(128)=>800,chr(129)=>800,chr(130)=>0,chr(131)=>0,
+    chr(132)=>0,chr(133)=>780,chr(134)=>0,chr(135)=>0,chr(136)=>278,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>1064,chr(141)=>800,chr(142)=>0,chr(143)=>800,chr(144)=>800,chr(145)=>259,chr(146)=>259,chr(147)=>470,chr(148)=>470,chr(149)=>500,chr(150)=>300,chr(151)=>600,chr(152)=>278,chr(153)=>990,
+    chr(154)=>0,chr(155)=>0,chr(156)=>790,chr(157)=>800,chr(158)=>800,chr(159)=>754,chr(160)=>282,chr(161)=>324,chr(162)=>450,chr(163)=>640,chr(164)=>518,chr(165)=>603,chr(166)=>0,chr(167)=>519,chr(168)=>254,chr(169)=>800,chr(170)=>349,chr(171)=>0,chr(172)=>0,chr(173)=>432,chr(174)=>800,chr(175)=>278,
+    chr(176)=>0,chr(177)=>0,chr(178)=>0,chr(179)=>0,chr(180)=>278,chr(181)=>614,chr(182)=>0,chr(183)=>254,chr(184)=>278,chr(185)=>0,chr(186)=>305,chr(187)=>0,chr(188)=>0,chr(189)=>0,chr(190)=>0,chr(191)=>501,chr(192)=>743,chr(193)=>743,chr(194)=>743,chr(195)=>743,chr(196)=>743,chr(197)=>743,
+    chr(198)=>1060,chr(199)=>598,chr(200)=>608,chr(201)=>608,chr(202)=>608,chr(203)=>608,chr(204)=>308,chr(205)=>308,chr(206)=>308,chr(207)=>308,chr(208)=>0,chr(209)=>817,chr(210)=>729,chr(211)=>729,chr(212)=>729,chr(213)=>729,chr(214)=>729,chr(215)=>0,chr(216)=>729,chr(217)=>805,chr(218)=>805,chr(219)=>805,
+    chr(220)=>805,chr(221)=>0,chr(222)=>0,chr(223)=>688,chr(224)=>581,chr(225)=>581,chr(226)=>581,chr(227)=>581,chr(228)=>581,chr(229)=>581,chr(230)=>792,chr(231)=>440,chr(232)=>450,chr(233)=>450,chr(234)=>450,chr(235)=>450,chr(236)=>283,chr(237)=>283,chr(238)=>283,chr(239)=>283,chr(240)=>0,chr(241)=>595,
+    chr(242)=>508,chr(243)=>508,chr(244)=>508,chr(245)=>508,chr(246)=>508,chr(247)=>0,chr(248)=>508,chr(249)=>614,chr(250)=>614,chr(251)=>614,chr(252)=>614,chr(253)=>0,chr(254)=>0,chr(255)=>597);
 $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));
 $file = 'calligra.z';

Spacing +14 added lines, -14 removed lines

@@ -1,24 +1,24 @@
 <?php
 $type = 'TrueType';
 $name = 'CalligrapherRegular';
-$desc = array('Ascent'=>899,'Descent'=>-234,'CapHeight'=>899,'Flags'=>32,'FontBBox'=>'[-173 -234 1328 899]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>800);
+$desc = array('Ascent'=>899, 'Descent'=>-234, 'CapHeight'=>899, 'Flags'=>32, 'FontBBox'=>'[-173 -234 1328 899]', 'ItalicAngle'=>0, 'StemV'=>70, 'MissingWidth'=>800);
 $up = -200;
 $ut = 20;
 $cw = array(
-	chr(0)=>800,chr(1)=>800,chr(2)=>800,chr(3)=>800,chr(4)=>800,chr(5)=>800,chr(6)=>800,chr(7)=>800,chr(8)=>800,chr(9)=>800,chr(10)=>800,chr(11)=>800,chr(12)=>800,chr(13)=>800,chr(14)=>800,chr(15)=>800,chr(16)=>800,chr(17)=>800,chr(18)=>800,chr(19)=>800,chr(20)=>800,chr(21)=>800,
-	chr(22)=>800,chr(23)=>800,chr(24)=>800,chr(25)=>800,chr(26)=>800,chr(27)=>800,chr(28)=>800,chr(29)=>800,chr(30)=>800,chr(31)=>800,' '=>282,'!'=>324,'"'=>405,'#'=>584,'$'=>632,'%'=>980,'&'=>776,'\''=>259,'('=>299,')'=>299,'*'=>377,'+'=>600,
-	','=>259,'-'=>432,'.'=>254,'/'=>597,'0'=>529,'1'=>298,'2'=>451,'3'=>359,'4'=>525,'5'=>423,'6'=>464,'7'=>417,'8'=>457,'9'=>479,':'=>275,';'=>282,'<'=>600,'='=>600,'>'=>600,'?'=>501,'@'=>800,'A'=>743,
-	'B'=>636,'C'=>598,'D'=>712,'E'=>608,'F'=>562,'G'=>680,'H'=>756,'I'=>308,'J'=>314,'K'=>676,'L'=>552,'M'=>1041,'N'=>817,'O'=>729,'P'=>569,'Q'=>698,'R'=>674,'S'=>618,'T'=>673,'U'=>805,'V'=>753,'W'=>1238,
-	'X'=>716,'Y'=>754,'Z'=>599,'['=>315,'\\'=>463,']'=>315,'^'=>600,'_'=>547,'`'=>278,'a'=>581,'b'=>564,'c'=>440,'d'=>571,'e'=>450,'f'=>347,'g'=>628,'h'=>611,'i'=>283,'j'=>283,'k'=>560,'l'=>252,'m'=>976,
-	'n'=>595,'o'=>508,'p'=>549,'q'=>540,'r'=>395,'s'=>441,'t'=>307,'u'=>614,'v'=>556,'w'=>915,'x'=>559,'y'=>597,'z'=>452,'{'=>315,'|'=>222,'}'=>315,'~'=>600,chr(127)=>800,chr(128)=>800,chr(129)=>800,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>780,chr(134)=>0,chr(135)=>0,chr(136)=>278,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>1064,chr(141)=>800,chr(142)=>0,chr(143)=>800,chr(144)=>800,chr(145)=>259,chr(146)=>259,chr(147)=>470,chr(148)=>470,chr(149)=>500,chr(150)=>300,chr(151)=>600,chr(152)=>278,chr(153)=>990,
-	chr(154)=>0,chr(155)=>0,chr(156)=>790,chr(157)=>800,chr(158)=>800,chr(159)=>754,chr(160)=>282,chr(161)=>324,chr(162)=>450,chr(163)=>640,chr(164)=>518,chr(165)=>603,chr(166)=>0,chr(167)=>519,chr(168)=>254,chr(169)=>800,chr(170)=>349,chr(171)=>0,chr(172)=>0,chr(173)=>432,chr(174)=>800,chr(175)=>278,
-	chr(176)=>0,chr(177)=>0,chr(178)=>0,chr(179)=>0,chr(180)=>278,chr(181)=>614,chr(182)=>0,chr(183)=>254,chr(184)=>278,chr(185)=>0,chr(186)=>305,chr(187)=>0,chr(188)=>0,chr(189)=>0,chr(190)=>0,chr(191)=>501,chr(192)=>743,chr(193)=>743,chr(194)=>743,chr(195)=>743,chr(196)=>743,chr(197)=>743,
-	chr(198)=>1060,chr(199)=>598,chr(200)=>608,chr(201)=>608,chr(202)=>608,chr(203)=>608,chr(204)=>308,chr(205)=>308,chr(206)=>308,chr(207)=>308,chr(208)=>0,chr(209)=>817,chr(210)=>729,chr(211)=>729,chr(212)=>729,chr(213)=>729,chr(214)=>729,chr(215)=>0,chr(216)=>729,chr(217)=>805,chr(218)=>805,chr(219)=>805,
-	chr(220)=>805,chr(221)=>0,chr(222)=>0,chr(223)=>688,chr(224)=>581,chr(225)=>581,chr(226)=>581,chr(227)=>581,chr(228)=>581,chr(229)=>581,chr(230)=>792,chr(231)=>440,chr(232)=>450,chr(233)=>450,chr(234)=>450,chr(235)=>450,chr(236)=>283,chr(237)=>283,chr(238)=>283,chr(239)=>283,chr(240)=>0,chr(241)=>595,
-	chr(242)=>508,chr(243)=>508,chr(244)=>508,chr(245)=>508,chr(246)=>508,chr(247)=>0,chr(248)=>508,chr(249)=>614,chr(250)=>614,chr(251)=>614,chr(252)=>614,chr(253)=>0,chr(254)=>0,chr(255)=>597);
+	chr(0)=>800, chr(1)=>800, chr(2)=>800, chr(3)=>800, chr(4)=>800, chr(5)=>800, chr(6)=>800, chr(7)=>800, chr(8)=>800, chr(9)=>800, chr(10)=>800, chr(11)=>800, chr(12)=>800, chr(13)=>800, chr(14)=>800, chr(15)=>800, chr(16)=>800, chr(17)=>800, chr(18)=>800, chr(19)=>800, chr(20)=>800, chr(21)=>800,
+	chr(22)=>800, chr(23)=>800, chr(24)=>800, chr(25)=>800, chr(26)=>800, chr(27)=>800, chr(28)=>800, chr(29)=>800, chr(30)=>800, chr(31)=>800, ' '=>282, '!'=>324, '"'=>405, '#'=>584, '$'=>632, '%'=>980, '&'=>776, '\''=>259, '('=>299, ')'=>299, '*'=>377, '+'=>600,
+	','=>259, '-'=>432, '.'=>254, '/'=>597, '0'=>529, '1'=>298, '2'=>451, '3'=>359, '4'=>525, '5'=>423, '6'=>464, '7'=>417, '8'=>457, '9'=>479, ':'=>275, ';'=>282, '<'=>600, '='=>600, '>'=>600, '?'=>501, '@'=>800, 'A'=>743,
+	'B'=>636, 'C'=>598, 'D'=>712, 'E'=>608, 'F'=>562, 'G'=>680, 'H'=>756, 'I'=>308, 'J'=>314, 'K'=>676, 'L'=>552, 'M'=>1041, 'N'=>817, 'O'=>729, 'P'=>569, 'Q'=>698, 'R'=>674, 'S'=>618, 'T'=>673, 'U'=>805, 'V'=>753, 'W'=>1238,
+	'X'=>716, 'Y'=>754, 'Z'=>599, '['=>315, '\\'=>463, ']'=>315, '^'=>600, '_'=>547, '`'=>278, 'a'=>581, 'b'=>564, 'c'=>440, 'd'=>571, 'e'=>450, 'f'=>347, 'g'=>628, 'h'=>611, 'i'=>283, 'j'=>283, 'k'=>560, 'l'=>252, 'm'=>976,
+	'n'=>595, 'o'=>508, 'p'=>549, 'q'=>540, 'r'=>395, 's'=>441, 't'=>307, 'u'=>614, 'v'=>556, 'w'=>915, 'x'=>559, 'y'=>597, 'z'=>452, '{'=>315, '|'=>222, '}'=>315, '~'=>600, chr(127)=>800, chr(128)=>800, chr(129)=>800, chr(130)=>0, chr(131)=>0,
+	chr(132)=>0, chr(133)=>780, chr(134)=>0, chr(135)=>0, chr(136)=>278, chr(137)=>0, chr(138)=>0, chr(139)=>0, chr(140)=>1064, chr(141)=>800, chr(142)=>0, chr(143)=>800, chr(144)=>800, chr(145)=>259, chr(146)=>259, chr(147)=>470, chr(148)=>470, chr(149)=>500, chr(150)=>300, chr(151)=>600, chr(152)=>278, chr(153)=>990,
+	chr(154)=>0, chr(155)=>0, chr(156)=>790, chr(157)=>800, chr(158)=>800, chr(159)=>754, chr(160)=>282, chr(161)=>324, chr(162)=>450, chr(163)=>640, chr(164)=>518, chr(165)=>603, chr(166)=>0, chr(167)=>519, chr(168)=>254, chr(169)=>800, chr(170)=>349, chr(171)=>0, chr(172)=>0, chr(173)=>432, chr(174)=>800, chr(175)=>278,
+	chr(176)=>0, chr(177)=>0, chr(178)=>0, chr(179)=>0, chr(180)=>278, chr(181)=>614, chr(182)=>0, chr(183)=>254, chr(184)=>278, chr(185)=>0, chr(186)=>305, chr(187)=>0, chr(188)=>0, chr(189)=>0, chr(190)=>0, chr(191)=>501, chr(192)=>743, chr(193)=>743, chr(194)=>743, chr(195)=>743, chr(196)=>743, chr(197)=>743,
+	chr(198)=>1060, chr(199)=>598, chr(200)=>608, chr(201)=>608, chr(202)=>608, chr(203)=>608, chr(204)=>308, chr(205)=>308, chr(206)=>308, chr(207)=>308, chr(208)=>0, chr(209)=>817, chr(210)=>729, chr(211)=>729, chr(212)=>729, chr(213)=>729, chr(214)=>729, chr(215)=>0, chr(216)=>729, chr(217)=>805, chr(218)=>805, chr(219)=>805,
+	chr(220)=>805, chr(221)=>0, chr(222)=>0, chr(223)=>688, chr(224)=>581, chr(225)=>581, chr(226)=>581, chr(227)=>581, chr(228)=>581, chr(229)=>581, chr(230)=>792, chr(231)=>440, chr(232)=>450, chr(233)=>450, chr(234)=>450, chr(235)=>450, chr(236)=>283, chr(237)=>283, chr(238)=>283, chr(239)=>283, chr(240)=>0, chr(241)=>595,
+	chr(242)=>508, chr(243)=>508, chr(244)=>508, chr(245)=>508, chr(246)=>508, chr(247)=>0, chr(248)=>508, chr(249)=>614, chr(250)=>614, chr(251)=>614, chr(252)=>614, chr(253)=>0, chr(254)=>0, chr(255)=>597);
 $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));
 $file = 'calligra.z';
 $originalsize = 33948;
 $subsetted = true;

extras/fpdf183/font/Arimo-Italic.php

Indentation +12 added lines, -12 removed lines

@@ -5,18 +5,18 @@
 $up = -106;
 $ut = 73;
 $cw = array(
-	chr(0)=>750,chr(1)=>750,chr(2)=>750,chr(3)=>750,chr(4)=>750,chr(5)=>750,chr(6)=>750,chr(7)=>750,chr(8)=>750,chr(9)=>750,chr(10)=>750,chr(11)=>750,chr(12)=>750,chr(13)=>750,chr(14)=>750,chr(15)=>750,chr(16)=>750,chr(17)=>750,chr(18)=>750,chr(19)=>750,chr(20)=>750,chr(21)=>750,
-	chr(22)=>750,chr(23)=>750,chr(24)=>750,chr(25)=>750,chr(26)=>750,chr(27)=>750,chr(28)=>750,chr(29)=>750,chr(30)=>750,chr(31)=>750,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>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,
-	'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,
-	'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,
-	'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)=>750,chr(128)=>708,chr(129)=>625,chr(130)=>708,chr(131)=>708,
-	chr(132)=>708,chr(133)=>708,chr(134)=>708,chr(135)=>708,chr(136)=>708,chr(137)=>708,chr(138)=>708,chr(139)=>708,chr(140)=>708,chr(141)=>708,chr(142)=>708,chr(143)=>708,chr(144)=>708,chr(145)=>708,chr(146)=>729,chr(147)=>604,chr(148)=>604,chr(149)=>278,chr(150)=>549,chr(151)=>549,chr(152)=>549,chr(153)=>549,
-	chr(154)=>278,chr(155)=>604,chr(156)=>400,chr(157)=>333,chr(158)=>333,chr(159)=>549,chr(160)=>708,chr(161)=>708,chr(162)=>708,chr(163)=>556,chr(164)=>708,chr(165)=>708,chr(166)=>708,chr(167)=>708,chr(168)=>708,chr(169)=>708,chr(170)=>708,chr(171)=>708,chr(172)=>708,chr(173)=>708,chr(174)=>708,chr(175)=>708,
-	chr(176)=>708,chr(177)=>708,chr(178)=>708,chr(179)=>667,chr(180)=>708,chr(181)=>708,chr(182)=>708,chr(183)=>708,chr(184)=>708,chr(185)=>708,chr(186)=>708,chr(187)=>708,chr(188)=>708,chr(189)=>708,chr(190)=>708,chr(191)=>737,chr(192)=>752,chr(193)=>556,chr(194)=>563,chr(195)=>572,chr(196)=>553,chr(197)=>556,
-	chr(198)=>835,chr(199)=>493,chr(200)=>500,chr(201)=>556,chr(202)=>556,chr(203)=>472,chr(204)=>564,chr(205)=>686,chr(206)=>550,chr(207)=>556,chr(208)=>550,chr(209)=>534,chr(210)=>556,chr(211)=>500,chr(212)=>833,chr(213)=>500,chr(214)=>688,chr(215)=>522,chr(216)=>526,chr(217)=>736,chr(218)=>465,chr(219)=>830,
-	chr(220)=>492,chr(221)=>851,chr(222)=>518,chr(223)=>621,chr(224)=>1022,chr(225)=>667,chr(226)=>651,chr(227)=>727,chr(228)=>704,chr(229)=>667,chr(230)=>795,chr(231)=>544,chr(232)=>667,chr(233)=>715,chr(234)=>715,chr(235)=>589,chr(236)=>686,chr(237)=>833,chr(238)=>722,chr(239)=>778,chr(240)=>725,chr(241)=>682,
-	chr(242)=>667,chr(243)=>722,chr(244)=>611,chr(245)=>639,chr(246)=>917,chr(247)=>667,chr(248)=>651,chr(249)=>886,chr(250)=>614,chr(251)=>920,chr(252)=>694,chr(253)=>923,chr(254)=>673,chr(255)=>805);
+    chr(0)=>750,chr(1)=>750,chr(2)=>750,chr(3)=>750,chr(4)=>750,chr(5)=>750,chr(6)=>750,chr(7)=>750,chr(8)=>750,chr(9)=>750,chr(10)=>750,chr(11)=>750,chr(12)=>750,chr(13)=>750,chr(14)=>750,chr(15)=>750,chr(16)=>750,chr(17)=>750,chr(18)=>750,chr(19)=>750,chr(20)=>750,chr(21)=>750,
+    chr(22)=>750,chr(23)=>750,chr(24)=>750,chr(25)=>750,chr(26)=>750,chr(27)=>750,chr(28)=>750,chr(29)=>750,chr(30)=>750,chr(31)=>750,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+    ','=>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,
+    '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,
+    '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,
+    '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)=>750,chr(128)=>708,chr(129)=>625,chr(130)=>708,chr(131)=>708,
+    chr(132)=>708,chr(133)=>708,chr(134)=>708,chr(135)=>708,chr(136)=>708,chr(137)=>708,chr(138)=>708,chr(139)=>708,chr(140)=>708,chr(141)=>708,chr(142)=>708,chr(143)=>708,chr(144)=>708,chr(145)=>708,chr(146)=>729,chr(147)=>604,chr(148)=>604,chr(149)=>278,chr(150)=>549,chr(151)=>549,chr(152)=>549,chr(153)=>549,
+    chr(154)=>278,chr(155)=>604,chr(156)=>400,chr(157)=>333,chr(158)=>333,chr(159)=>549,chr(160)=>708,chr(161)=>708,chr(162)=>708,chr(163)=>556,chr(164)=>708,chr(165)=>708,chr(166)=>708,chr(167)=>708,chr(168)=>708,chr(169)=>708,chr(170)=>708,chr(171)=>708,chr(172)=>708,chr(173)=>708,chr(174)=>708,chr(175)=>708,
+    chr(176)=>708,chr(177)=>708,chr(178)=>708,chr(179)=>667,chr(180)=>708,chr(181)=>708,chr(182)=>708,chr(183)=>708,chr(184)=>708,chr(185)=>708,chr(186)=>708,chr(187)=>708,chr(188)=>708,chr(189)=>708,chr(190)=>708,chr(191)=>737,chr(192)=>752,chr(193)=>556,chr(194)=>563,chr(195)=>572,chr(196)=>553,chr(197)=>556,
+    chr(198)=>835,chr(199)=>493,chr(200)=>500,chr(201)=>556,chr(202)=>556,chr(203)=>472,chr(204)=>564,chr(205)=>686,chr(206)=>550,chr(207)=>556,chr(208)=>550,chr(209)=>534,chr(210)=>556,chr(211)=>500,chr(212)=>833,chr(213)=>500,chr(214)=>688,chr(215)=>522,chr(216)=>526,chr(217)=>736,chr(218)=>465,chr(219)=>830,
+    chr(220)=>492,chr(221)=>851,chr(222)=>518,chr(223)=>621,chr(224)=>1022,chr(225)=>667,chr(226)=>651,chr(227)=>727,chr(228)=>704,chr(229)=>667,chr(230)=>795,chr(231)=>544,chr(232)=>667,chr(233)=>715,chr(234)=>715,chr(235)=>589,chr(236)=>686,chr(237)=>833,chr(238)=>722,chr(239)=>778,chr(240)=>725,chr(241)=>682,
+    chr(242)=>667,chr(243)=>722,chr(244)=>611,chr(245)=>639,chr(246)=>917,chr(247)=>667,chr(248)=>651,chr(249)=>886,chr(250)=>614,chr(251)=>920,chr(252)=>694,chr(253)=>923,chr(254)=>673,chr(255)=>805);
 $enc = 'KOI8-R';
 $diff = '128 /SF100000 /SF110000 /SF010000 /SF030000 /SF020000 /SF040000 /SF080000 /SF090000 /SF060000 /SF070000 /SF050000 /upblock /dnblock /block /lfblock /rtblock /ltshade /shade /dkshade /integraltp /filledbox /periodcentered /radical /approxequal /lessequal /greaterequal /space /integralbt /degree /twosuperior /periodcentered /divide /SF430000 /SF240000 /SF510000 /afii10071 /SF520000 /SF390000 /SF220000 /SF210000 /SF250000 /SF500000 /SF490000 /SF380000 /SF280000 /SF270000 /SF260000 /SF360000 /SF370000 /SF420000 /SF190000 /afii10023 /SF200000 /SF230000 /SF470000 /SF480000 /SF410000 /SF450000 /SF460000 /SF400000 /SF540000 /SF530000 /SF440000 /copyright /afii10096 /afii10065 /afii10066 /afii10088 /afii10069 /afii10070 /afii10086 /afii10068 /afii10087 /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 /afii10097 /afii10082 /afii10083 /afii10084 /afii10085 /afii10072 /afii10067 /afii10094 /afii10093 /afii10073 /afii10090 /afii10095 /afii10091 /afii10089 /afii10092 /afii10048 /afii10017 /afii10018 /afii10040 /afii10021 /afii10022 /afii10038 /afii10020 /afii10039 /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 /afii10049 /afii10034 /afii10035 /afii10036 /afii10037 /afii10024 /afii10019 /afii10046 /afii10045 /afii10025 /afii10042 /afii10047 /afii10043 /afii10041 /afii10044';
 $uv = array(0=>array(0,128),128=>9472,129=>9474,130=>9484,131=>9488,132=>9492,133=>9496,134=>9500,135=>9508,136=>9516,137=>9524,138=>9532,139=>9600,140=>9604,141=>9608,142=>9612,143=>array(9616,4),147=>8992,148=>9632,149=>array(8729,2),151=>8776,152=>array(8804,2),154=>160,155=>8993,156=>176,157=>178,158=>183,159=>247,160=>array(9552,3),163=>1105,164=>array(9555,15),179=>1025,180=>array(9570,11),191=>169,192=>1102,193=>array(1072,2),195=>1094,196=>array(1076,2),198=>1092,199=>1075,200=>1093,201=>array(1080,8),209=>1103,210=>array(1088,4),214=>1078,215=>1074,216=>1100,217=>1099,218=>1079,219=>1096,220=>1101,221=>1097,222=>1095,223=>1098,224=>1070,225=>array(1040,2),227=>1062,228=>array(1044,2),230=>1060,231=>1043,232=>1061,233=>array(1048,8),241=>1071,242=>array(1056,4),246=>1046,247=>1042,248=>1068,249=>1067,250=>1047,251=>1064,252=>1069,253=>1065,254=>1063,255=>1066);

Spacing +14 added lines, -14 removed lines

@@ -1,25 +1,25 @@
 <?php
 $type = 'TrueType';
 $name = 'Arimo-Italic';
-$desc = array('Ascent'=>728,'Descent'=>-208,'CapHeight'=>688,'Flags'=>96,'FontBBox'=>'[-664 -303 1361 1014]','ItalicAngle'=>-12,'StemV'=>70,'MissingWidth'=>750);
+$desc = array('Ascent'=>728, 'Descent'=>-208, 'CapHeight'=>688, 'Flags'=>96, 'FontBBox'=>'[-664 -303 1361 1014]', 'ItalicAngle'=>-12, 'StemV'=>70, 'MissingWidth'=>750);
 $up = -106;
 $ut = 73;
 $cw = array(
-	chr(0)=>750,chr(1)=>750,chr(2)=>750,chr(3)=>750,chr(4)=>750,chr(5)=>750,chr(6)=>750,chr(7)=>750,chr(8)=>750,chr(9)=>750,chr(10)=>750,chr(11)=>750,chr(12)=>750,chr(13)=>750,chr(14)=>750,chr(15)=>750,chr(16)=>750,chr(17)=>750,chr(18)=>750,chr(19)=>750,chr(20)=>750,chr(21)=>750,
-	chr(22)=>750,chr(23)=>750,chr(24)=>750,chr(25)=>750,chr(26)=>750,chr(27)=>750,chr(28)=>750,chr(29)=>750,chr(30)=>750,chr(31)=>750,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>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,
-	'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,
-	'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,
-	'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)=>750,chr(128)=>708,chr(129)=>625,chr(130)=>708,chr(131)=>708,
-	chr(132)=>708,chr(133)=>708,chr(134)=>708,chr(135)=>708,chr(136)=>708,chr(137)=>708,chr(138)=>708,chr(139)=>708,chr(140)=>708,chr(141)=>708,chr(142)=>708,chr(143)=>708,chr(144)=>708,chr(145)=>708,chr(146)=>729,chr(147)=>604,chr(148)=>604,chr(149)=>278,chr(150)=>549,chr(151)=>549,chr(152)=>549,chr(153)=>549,
-	chr(154)=>278,chr(155)=>604,chr(156)=>400,chr(157)=>333,chr(158)=>333,chr(159)=>549,chr(160)=>708,chr(161)=>708,chr(162)=>708,chr(163)=>556,chr(164)=>708,chr(165)=>708,chr(166)=>708,chr(167)=>708,chr(168)=>708,chr(169)=>708,chr(170)=>708,chr(171)=>708,chr(172)=>708,chr(173)=>708,chr(174)=>708,chr(175)=>708,
-	chr(176)=>708,chr(177)=>708,chr(178)=>708,chr(179)=>667,chr(180)=>708,chr(181)=>708,chr(182)=>708,chr(183)=>708,chr(184)=>708,chr(185)=>708,chr(186)=>708,chr(187)=>708,chr(188)=>708,chr(189)=>708,chr(190)=>708,chr(191)=>737,chr(192)=>752,chr(193)=>556,chr(194)=>563,chr(195)=>572,chr(196)=>553,chr(197)=>556,
-	chr(198)=>835,chr(199)=>493,chr(200)=>500,chr(201)=>556,chr(202)=>556,chr(203)=>472,chr(204)=>564,chr(205)=>686,chr(206)=>550,chr(207)=>556,chr(208)=>550,chr(209)=>534,chr(210)=>556,chr(211)=>500,chr(212)=>833,chr(213)=>500,chr(214)=>688,chr(215)=>522,chr(216)=>526,chr(217)=>736,chr(218)=>465,chr(219)=>830,
-	chr(220)=>492,chr(221)=>851,chr(222)=>518,chr(223)=>621,chr(224)=>1022,chr(225)=>667,chr(226)=>651,chr(227)=>727,chr(228)=>704,chr(229)=>667,chr(230)=>795,chr(231)=>544,chr(232)=>667,chr(233)=>715,chr(234)=>715,chr(235)=>589,chr(236)=>686,chr(237)=>833,chr(238)=>722,chr(239)=>778,chr(240)=>725,chr(241)=>682,
-	chr(242)=>667,chr(243)=>722,chr(244)=>611,chr(245)=>639,chr(246)=>917,chr(247)=>667,chr(248)=>651,chr(249)=>886,chr(250)=>614,chr(251)=>920,chr(252)=>694,chr(253)=>923,chr(254)=>673,chr(255)=>805);
+	chr(0)=>750, chr(1)=>750, chr(2)=>750, chr(3)=>750, chr(4)=>750, chr(5)=>750, chr(6)=>750, chr(7)=>750, chr(8)=>750, chr(9)=>750, chr(10)=>750, chr(11)=>750, chr(12)=>750, chr(13)=>750, chr(14)=>750, chr(15)=>750, chr(16)=>750, chr(17)=>750, chr(18)=>750, chr(19)=>750, chr(20)=>750, chr(21)=>750,
+	chr(22)=>750, chr(23)=>750, chr(24)=>750, chr(25)=>750, chr(26)=>750, chr(27)=>750, chr(28)=>750, chr(29)=>750, chr(30)=>750, chr(31)=>750, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+	','=>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,
+	'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,
+	'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,
+	'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)=>750, chr(128)=>708, chr(129)=>625, chr(130)=>708, chr(131)=>708,
+	chr(132)=>708, chr(133)=>708, chr(134)=>708, chr(135)=>708, chr(136)=>708, chr(137)=>708, chr(138)=>708, chr(139)=>708, chr(140)=>708, chr(141)=>708, chr(142)=>708, chr(143)=>708, chr(144)=>708, chr(145)=>708, chr(146)=>729, chr(147)=>604, chr(148)=>604, chr(149)=>278, chr(150)=>549, chr(151)=>549, chr(152)=>549, chr(153)=>549,
+	chr(154)=>278, chr(155)=>604, chr(156)=>400, chr(157)=>333, chr(158)=>333, chr(159)=>549, chr(160)=>708, chr(161)=>708, chr(162)=>708, chr(163)=>556, chr(164)=>708, chr(165)=>708, chr(166)=>708, chr(167)=>708, chr(168)=>708, chr(169)=>708, chr(170)=>708, chr(171)=>708, chr(172)=>708, chr(173)=>708, chr(174)=>708, chr(175)=>708,
+	chr(176)=>708, chr(177)=>708, chr(178)=>708, chr(179)=>667, chr(180)=>708, chr(181)=>708, chr(182)=>708, chr(183)=>708, chr(184)=>708, chr(185)=>708, chr(186)=>708, chr(187)=>708, chr(188)=>708, chr(189)=>708, chr(190)=>708, chr(191)=>737, chr(192)=>752, chr(193)=>556, chr(194)=>563, chr(195)=>572, chr(196)=>553, chr(197)=>556,
+	chr(198)=>835, chr(199)=>493, chr(200)=>500, chr(201)=>556, chr(202)=>556, chr(203)=>472, chr(204)=>564, chr(205)=>686, chr(206)=>550, chr(207)=>556, chr(208)=>550, chr(209)=>534, chr(210)=>556, chr(211)=>500, chr(212)=>833, chr(213)=>500, chr(214)=>688, chr(215)=>522, chr(216)=>526, chr(217)=>736, chr(218)=>465, chr(219)=>830,
+	chr(220)=>492, chr(221)=>851, chr(222)=>518, chr(223)=>621, chr(224)=>1022, chr(225)=>667, chr(226)=>651, chr(227)=>727, chr(228)=>704, chr(229)=>667, chr(230)=>795, chr(231)=>544, chr(232)=>667, chr(233)=>715, chr(234)=>715, chr(235)=>589, chr(236)=>686, chr(237)=>833, chr(238)=>722, chr(239)=>778, chr(240)=>725, chr(241)=>682,
+	chr(242)=>667, chr(243)=>722, chr(244)=>611, chr(245)=>639, chr(246)=>917, chr(247)=>667, chr(248)=>651, chr(249)=>886, chr(250)=>614, chr(251)=>920, chr(252)=>694, chr(253)=>923, chr(254)=>673, chr(255)=>805);
 $enc = 'KOI8-R';
 $diff = '128 /SF100000 /SF110000 /SF010000 /SF030000 /SF020000 /SF040000 /SF080000 /SF090000 /SF060000 /SF070000 /SF050000 /upblock /dnblock /block /lfblock /rtblock /ltshade /shade /dkshade /integraltp /filledbox /periodcentered /radical /approxequal /lessequal /greaterequal /space /integralbt /degree /twosuperior /periodcentered /divide /SF430000 /SF240000 /SF510000 /afii10071 /SF520000 /SF390000 /SF220000 /SF210000 /SF250000 /SF500000 /SF490000 /SF380000 /SF280000 /SF270000 /SF260000 /SF360000 /SF370000 /SF420000 /SF190000 /afii10023 /SF200000 /SF230000 /SF470000 /SF480000 /SF410000 /SF450000 /SF460000 /SF400000 /SF540000 /SF530000 /SF440000 /copyright /afii10096 /afii10065 /afii10066 /afii10088 /afii10069 /afii10070 /afii10086 /afii10068 /afii10087 /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 /afii10097 /afii10082 /afii10083 /afii10084 /afii10085 /afii10072 /afii10067 /afii10094 /afii10093 /afii10073 /afii10090 /afii10095 /afii10091 /afii10089 /afii10092 /afii10048 /afii10017 /afii10018 /afii10040 /afii10021 /afii10022 /afii10038 /afii10020 /afii10039 /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 /afii10049 /afii10034 /afii10035 /afii10036 /afii10037 /afii10024 /afii10019 /afii10046 /afii10045 /afii10025 /afii10042 /afii10047 /afii10043 /afii10041 /afii10044';
-$uv = array(0=>array(0,128),128=>9472,129=>9474,130=>9484,131=>9488,132=>9492,133=>9496,134=>9500,135=>9508,136=>9516,137=>9524,138=>9532,139=>9600,140=>9604,141=>9608,142=>9612,143=>array(9616,4),147=>8992,148=>9632,149=>array(8729,2),151=>8776,152=>array(8804,2),154=>160,155=>8993,156=>176,157=>178,158=>183,159=>247,160=>array(9552,3),163=>1105,164=>array(9555,15),179=>1025,180=>array(9570,11),191=>169,192=>1102,193=>array(1072,2),195=>1094,196=>array(1076,2),198=>1092,199=>1075,200=>1093,201=>array(1080,8),209=>1103,210=>array(1088,4),214=>1078,215=>1074,216=>1100,217=>1099,218=>1079,219=>1096,220=>1101,221=>1097,222=>1095,223=>1098,224=>1070,225=>array(1040,2),227=>1062,228=>array(1044,2),230=>1060,231=>1043,232=>1061,233=>array(1048,8),241=>1071,242=>array(1056,4),246=>1046,247=>1042,248=>1068,249=>1067,250=>1047,251=>1064,252=>1069,253=>1065,254=>1063,255=>1066);
+$uv = array(0=>array(0, 128), 128=>9472, 129=>9474, 130=>9484, 131=>9488, 132=>9492, 133=>9496, 134=>9500, 135=>9508, 136=>9516, 137=>9524, 138=>9532, 139=>9600, 140=>9604, 141=>9608, 142=>9612, 143=>array(9616, 4), 147=>8992, 148=>9632, 149=>array(8729, 2), 151=>8776, 152=>array(8804, 2), 154=>160, 155=>8993, 156=>176, 157=>178, 158=>183, 159=>247, 160=>array(9552, 3), 163=>1105, 164=>array(9555, 15), 179=>1025, 180=>array(9570, 11), 191=>169, 192=>1102, 193=>array(1072, 2), 195=>1094, 196=>array(1076, 2), 198=>1092, 199=>1075, 200=>1093, 201=>array(1080, 8), 209=>1103, 210=>array(1088, 4), 214=>1078, 215=>1074, 216=>1100, 217=>1099, 218=>1079, 219=>1096, 220=>1101, 221=>1097, 222=>1095, 223=>1098, 224=>1070, 225=>array(1040, 2), 227=>1062, 228=>array(1044, 2), 230=>1060, 231=>1043, 232=>1061, 233=>array(1048, 8), 241=>1071, 242=>array(1056, 4), 246=>1046, 247=>1042, 248=>1068, 249=>1067, 250=>1047, 251=>1064, 252=>1069, 253=>1065, 254=>1063, 255=>1066);
 $file = 'Arimo-Italic.z';
 $originalsize = 44228;
 $subsetted = true;

extras/fpdf183/fpdf.php

Indentation +1488 added lines, -1488 removed lines

@@ -73,961 +73,961 @@ 
 
 function __construct($orientation='P', $unit='mm', $size='A4')
 {
-	// Some checks
-	$this->_dochecks();
-	// Initialization of properties
-	$this->state = 0;
-	$this->page = 0;
-	$this->n = 2;
-	$this->buffer = '';
-	$this->pages = array();
-	$this->PageInfo = array();
-	$this->fonts = array();
-	$this->FontFiles = array();
-	$this->encodings = array();
-	$this->cmaps = array();
-	$this->images = array();
-	$this->links = array();
-	$this->InHeader = false;
-	$this->InFooter = false;
-	$this->lasth = 0;
-	$this->FontFamily = '';
-	$this->FontStyle = '';
-	$this->FontSizePt = 12;
-	$this->underline = false;
-	$this->DrawColor = '0 G';
-	$this->FillColor = '0 g';
-	$this->TextColor = '0 g';
-	$this->ColorFlag = false;
-	$this->WithAlpha = false;
-	$this->ws = 0;
-	// Font path
-	if(defined('FPDF_FONTPATH'))
-	{
-		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
-			$this->fontpath .= '/';
-	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
-		$this->fontpath = dirname(__FILE__).'/font/';
-	else
-		$this->fontpath = '';
-	// Core fonts
-	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats','verdana','calligra','Arimo-Regular');
-	// Scale factor
-	if($unit=='pt')
-		$this->k = 1;
-	elseif($unit=='mm')
-		$this->k = 72/25.4;
-	elseif($unit=='cm')
-		$this->k = 72/2.54;
-	elseif($unit=='in')
-		$this->k = 72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
-	// Page sizes
-	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
-		'letter'=>array(612,792), 'legal'=>array(612,1008));
-	$size = $this->_getpagesize($size);
-	$this->DefPageSize = $size;
-	$this->CurPageSize = $size;
-	// Page orientation
-	$orientation = strtolower($orientation);
-	if($orientation=='p' || $orientation=='portrait')
-	{
-		$this->DefOrientation = 'P';
-		$this->w = $size[0];
-		$this->h = $size[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
-	{
-		$this->DefOrientation = 'L';
-		$this->w = $size[1];
-		$this->h = $size[0];
-	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
-	$this->CurOrientation = $this->DefOrientation;
-	$this->wPt = $this->w*$this->k;
-	$this->hPt = $this->h*$this->k;
-	// Page rotation
-	$this->CurRotation = 0;
-	// Page margins (1 cm)
-	$margin = 28.35/$this->k;
-	$this->SetMargins($margin,$margin);
-	// Interior cell margin (1 mm)
-	$this->cMargin = $margin/10;
-	// Line width (0.2 mm)
-	$this->LineWidth = .567/$this->k;
-	// Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
-	// Default display mode
-	$this->SetDisplayMode('default');
-	// Enable compression
-	$this->SetCompression(true);
-	// Set default PDF version number
-	$this->PDFVersion = '1.3';
+    // Some checks
+    $this->_dochecks();
+    // Initialization of properties
+    $this->state = 0;
+    $this->page = 0;
+    $this->n = 2;
+    $this->buffer = '';
+    $this->pages = array();
+    $this->PageInfo = array();
+    $this->fonts = array();
+    $this->FontFiles = array();
+    $this->encodings = array();
+    $this->cmaps = array();
+    $this->images = array();
+    $this->links = array();
+    $this->InHeader = false;
+    $this->InFooter = false;
+    $this->lasth = 0;
+    $this->FontFamily = '';
+    $this->FontStyle = '';
+    $this->FontSizePt = 12;
+    $this->underline = false;
+    $this->DrawColor = '0 G';
+    $this->FillColor = '0 g';
+    $this->TextColor = '0 g';
+    $this->ColorFlag = false;
+    $this->WithAlpha = false;
+    $this->ws = 0;
+    // Font path
+    if(defined('FPDF_FONTPATH'))
+    {
+        $this->fontpath = FPDF_FONTPATH;
+        if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
+            $this->fontpath .= '/';
+    }
+    elseif(is_dir(dirname(__FILE__).'/font'))
+        $this->fontpath = dirname(__FILE__).'/font/';
+    else
+        $this->fontpath = '';
+    // Core fonts
+    $this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats','verdana','calligra','Arimo-Regular');
+    // Scale factor
+    if($unit=='pt')
+        $this->k = 1;
+    elseif($unit=='mm')
+        $this->k = 72/25.4;
+    elseif($unit=='cm')
+        $this->k = 72/2.54;
+    elseif($unit=='in')
+        $this->k = 72;
+    else
+        $this->Error('Incorrect unit: '.$unit);
+    // Page sizes
+    $this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
+        'letter'=>array(612,792), 'legal'=>array(612,1008));
+    $size = $this->_getpagesize($size);
+    $this->DefPageSize = $size;
+    $this->CurPageSize = $size;
+    // Page orientation
+    $orientation = strtolower($orientation);
+    if($orientation=='p' || $orientation=='portrait')
+    {
+        $this->DefOrientation = 'P';
+        $this->w = $size[0];
+        $this->h = $size[1];
+    }
+    elseif($orientation=='l' || $orientation=='landscape')
+    {
+        $this->DefOrientation = 'L';
+        $this->w = $size[1];
+        $this->h = $size[0];
+    }
+    else
+        $this->Error('Incorrect orientation: '.$orientation);
+    $this->CurOrientation = $this->DefOrientation;
+    $this->wPt = $this->w*$this->k;
+    $this->hPt = $this->h*$this->k;
+    // Page rotation
+    $this->CurRotation = 0;
+    // Page margins (1 cm)
+    $margin = 28.35/$this->k;
+    $this->SetMargins($margin,$margin);
+    // Interior cell margin (1 mm)
+    $this->cMargin = $margin/10;
+    // Line width (0.2 mm)
+    $this->LineWidth = .567/$this->k;
+    // Automatic page break
+    $this->SetAutoPageBreak(true,2*$margin);
+    // Default display mode
+    $this->SetDisplayMode('default');
+    // Enable compression
+    $this->SetCompression(true);
+    // Set default PDF version number
+    $this->PDFVersion = '1.3';
 }
 
 function SetMargins($left, $top, $right=null)
 {
-	// Set left, top and right margins
-	$this->lMargin = $left;
-	$this->tMargin = $top;
-	if($right===null)
-		$right = $left;
-	$this->rMargin = $right;
+    // Set left, top and right margins
+    $this->lMargin = $left;
+    $this->tMargin = $top;
+    if($right===null)
+        $right = $left;
+    $this->rMargin = $right;
 }
 
 function SetLeftMargin($margin)
 {
-	// Set left margin
-	$this->lMargin = $margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x = $margin;
+    // Set left margin
+    $this->lMargin = $margin;
+    if($this->page>0 && $this->x<$margin)
+        $this->x = $margin;
 }
 
 function SetTopMargin($margin)
 {
-	// Set top margin
-	$this->tMargin = $margin;
+    // Set top margin
+    $this->tMargin = $margin;
 }
 
 function SetRightMargin($margin)
 {
-	// Set right margin
-	$this->rMargin = $margin;
+    // Set right margin
+    $this->rMargin = $margin;
 }
 
 function SetAutoPageBreak($auto, $margin=0)
 {
-	// Set auto page break mode and triggering margin
-	$this->AutoPageBreak = $auto;
-	$this->bMargin = $margin;
-	$this->PageBreakTrigger = $this->h-$margin;
+    // Set auto page break mode and triggering margin
+    $this->AutoPageBreak = $auto;
+    $this->bMargin = $margin;
+    $this->PageBreakTrigger = $this->h-$margin;
 }
 
 function SetDisplayMode($zoom, $layout='default')
 {
-	// Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode = $zoom;
-	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode = $layout;
-	else
-		$this->Error('Incorrect layout display mode: '.$layout);
+    // Set display mode in viewer
+    if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+        $this->ZoomMode = $zoom;
+    else
+        $this->Error('Incorrect zoom display mode: '.$zoom);
+    if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
+        $this->LayoutMode = $layout;
+    else
+        $this->Error('Incorrect layout display mode: '.$layout);
 }
 
 function SetCompression($compress)
 {
-	// Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress = $compress;
-	else
-		$this->compress = false;
+    // Set page compression
+    if(function_exists('gzcompress'))
+        $this->compress = $compress;
+    else
+        $this->compress = false;
 }
 
 function SetTitle($title, $isUTF8=false)
 {
-	// Title of document
-	$this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);
+    // Title of document
+    $this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);
 }
 
 function SetAuthor($author, $isUTF8=false)
 {
-	// Author of document
-	$this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);
+    // Author of document
+    $this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);
 }
 
 function SetSubject($subject, $isUTF8=false)
 {
-	// Subject of document
-	$this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);
+    // Subject of document
+    $this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);
 }
 
 function SetKeywords($keywords, $isUTF8=false)
 {
-	// Keywords of document
-	$this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);
+    // Keywords of document
+    $this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);
 }
 
 function SetCreator($creator, $isUTF8=false)
 {
-	// Creator of document
-	$this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);
+    // Creator of document
+    $this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);
 }
 
 function AliasNbPages($alias='{nb}')
 {
-	// Define an alias for total number of pages
-	$this->AliasNbPages = $alias;
+    // Define an alias for total number of pages
+    $this->AliasNbPages = $alias;
 }
 
 function Error($msg)
 {
-	// Fatal error
-	throw new Exception('FPDF error: '.$msg);
+    // Fatal error
+    throw new Exception('FPDF error: '.$msg);
 }
 
 function Close()
 {
-	// Terminate document
-	if($this->state==3)
-		return;
-	if($this->page==0)
-		$this->AddPage();
-	// Page footer
-	$this->InFooter = true;
-	$this->Footer();
-	$this->InFooter = false;
-	// Close page
-	$this->_endpage();
-	// Close document
-	$this->_enddoc();
+    // Terminate document
+    if($this->state==3)
+        return;
+    if($this->page==0)
+        $this->AddPage();
+    // Page footer
+    $this->InFooter = true;
+    $this->Footer();
+    $this->InFooter = false;
+    // Close page
+    $this->_endpage();
+    // Close document
+    $this->_enddoc();
 }
 
 function AddPage($orientation='', $size='', $rotation=0)
 {
-	// Start a new page
-	if($this->state==3)
-		$this->Error('The document is closed');
-	$family = $this->FontFamily;
-	$style = $this->FontStyle.($this->underline ? 'U' : '');
-	$fontsize = $this->FontSizePt;
-	$lw = $this->LineWidth;
-	$dc = $this->DrawColor;
-	$fc = $this->FillColor;
-	$tc = $this->TextColor;
-	$cf = $this->ColorFlag;
-	if($this->page>0)
-	{
-		// Page footer
-		$this->InFooter = true;
-		$this->Footer();
-		$this->InFooter = false;
-		// Close page
-		$this->_endpage();
-	}
-	// Start new page
-	$this->_beginpage($orientation,$size,$rotation);
-	// Set line cap style to square
-	$this->_out('2 J');
-	// Set line width
-	$this->LineWidth = $lw;
-	$this->_out(sprintf('%.2F w',$lw*$this->k));
-	// Set font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
-	// Set colors
-	$this->DrawColor = $dc;
-	if($dc!='0 G')
-		$this->_out($dc);
-	$this->FillColor = $fc;
-	if($fc!='0 g')
-		$this->_out($fc);
-	$this->TextColor = $tc;
-	$this->ColorFlag = $cf;
-	// Page header
-	$this->InHeader = true;
-	$this->Header();
-	$this->InHeader = false;
-	// Restore line width
-	if($this->LineWidth!=$lw)
-	{
-		$this->LineWidth = $lw;
-		$this->_out(sprintf('%.2F w',$lw*$this->k));
-	}
-	// Restore font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
-	// Restore colors
-	if($this->DrawColor!=$dc)
-	{
-		$this->DrawColor = $dc;
-		$this->_out($dc);
-	}
-	if($this->FillColor!=$fc)
-	{
-		$this->FillColor = $fc;
-		$this->_out($fc);
-	}
-	$this->TextColor = $tc;
-	$this->ColorFlag = $cf;
+    // Start a new page
+    if($this->state==3)
+        $this->Error('The document is closed');
+    $family = $this->FontFamily;
+    $style = $this->FontStyle.($this->underline ? 'U' : '');
+    $fontsize = $this->FontSizePt;
+    $lw = $this->LineWidth;
+    $dc = $this->DrawColor;
+    $fc = $this->FillColor;
+    $tc = $this->TextColor;
+    $cf = $this->ColorFlag;
+    if($this->page>0)
+    {
+        // Page footer
+        $this->InFooter = true;
+        $this->Footer();
+        $this->InFooter = false;
+        // Close page
+        $this->_endpage();
+    }
+    // Start new page
+    $this->_beginpage($orientation,$size,$rotation);
+    // Set line cap style to square
+    $this->_out('2 J');
+    // Set line width
+    $this->LineWidth = $lw;
+    $this->_out(sprintf('%.2F w',$lw*$this->k));
+    // Set font
+    if($family)
+        $this->SetFont($family,$style,$fontsize);
+    // Set colors
+    $this->DrawColor = $dc;
+    if($dc!='0 G')
+        $this->_out($dc);
+    $this->FillColor = $fc;
+    if($fc!='0 g')
+        $this->_out($fc);
+    $this->TextColor = $tc;
+    $this->ColorFlag = $cf;
+    // Page header
+    $this->InHeader = true;
+    $this->Header();
+    $this->InHeader = false;
+    // Restore line width
+    if($this->LineWidth!=$lw)
+    {
+        $this->LineWidth = $lw;
+        $this->_out(sprintf('%.2F w',$lw*$this->k));
+    }
+    // Restore font
+    if($family)
+        $this->SetFont($family,$style,$fontsize);
+    // Restore colors
+    if($this->DrawColor!=$dc)
+    {
+        $this->DrawColor = $dc;
+        $this->_out($dc);
+    }
+    if($this->FillColor!=$fc)
+    {
+        $this->FillColor = $fc;
+        $this->_out($fc);
+    }
+    $this->TextColor = $tc;
+    $this->ColorFlag = $cf;
 }
 
 function Header()
 {
-	// To be implemented in your own inherited class
+    // To be implemented in your own inherited class
 }
 
 function Footer()
 {
-	// To be implemented in your own inherited class
+    // To be implemented in your own inherited class
 }
 
 function PageNo()
 {
-	// Get current page number
-	return $this->page;
+    // Get current page number
+    return $this->page;
 }
 
 function SetDrawColor($r, $g=null, $b=null)
 {
-	// Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor = sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
+    // Set color for all stroking operations
+    if(($r==0 && $g==0 && $b==0) || $g===null)
+        $this->DrawColor = sprintf('%.3F G',$r/255);
+    else
+        $this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+    if($this->page>0)
+        $this->_out($this->DrawColor);
 }
 
 function SetFillColor($r, $g=null, $b=null)
 {
-	// Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor = sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
+    // Set color for all filling operations
+    if(($r==0 && $g==0 && $b==0) || $g===null)
+        $this->FillColor = sprintf('%.3F g',$r/255);
+    else
+        $this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
+    if($this->page>0)
+        $this->_out($this->FillColor);
 }
 
 function SetTextColor($r, $g=null, $b=null)
 {
-	// Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor = sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
+    // Set color for text
+    if(($r==0 && $g==0 && $b==0) || $g===null)
+        $this->TextColor = sprintf('%.3F g',$r/255);
+    else
+        $this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
 }
 
 function GetStringWidth($s)
 {
-	// Get width of a string in the current font
-	$s = (string)$s;
-	$cw = &$this->CurrentFont['cw'];
-	$w = 0;
-	$l = strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w += $cw[$s[$i]];
-	return $w*$this->FontSize/1000;
+    // Get width of a string in the current font
+    $s = (string)$s;
+    $cw = &$this->CurrentFont['cw'];
+    $w = 0;
+    $l = strlen($s);
+    for($i=0;$i<$l;$i++)
+        $w += $cw[$s[$i]];
+    return $w*$this->FontSize/1000;
 }
 
 function SetLineWidth($width)
 {
-	// Set line width
-	$this->LineWidth = $width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
+    // Set line width
+    $this->LineWidth = $width;
+    if($this->page>0)
+        $this->_out(sprintf('%.2F w',$width*$this->k));
 }
 
 function Line($x1, $y1, $x2, $y2)
 {
-	// Draw a line
-	$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));
+    // Draw a line
+    $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));
 }
 
 function Rect($x, $y, $w, $h, $style='')
 {
-	// Draw a rectangle
-	if($style=='F')
-		$op = 'f';
-	elseif($style=='FD' || $style=='DF')
-		$op = 'B';
-	else
-		$op = 'S';
-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+    // Draw a rectangle
+    if($style=='F')
+        $op = 'f';
+    elseif($style=='FD' || $style=='DF')
+        $op = 'B';
+    else
+        $op = 'S';
+    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
 }
 
 function AddFont($family, $style='', $file='')
 {
-	// Add a TrueType, OpenType or Type1 font
-	$family = strtolower($family);
-	if($file=='')
-		$file = str_replace(' ','',$family).strtolower($style).'.php';
-	$style = strtoupper($style);
-	if($style=='IB')
-		$style = 'BI';
-	$fontkey = $family.$style;
-	if(isset($this->fonts[$fontkey]))
-		return;
-	$info = $this->_loadfont($file);
-	$info['i'] = count($this->fonts)+1;
-	if(!empty($info['file']))
-	{
-		// Embedded font
-		if($info['type']=='TrueType')
-			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
-		else
-			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
-	}
-	$this->fonts[$fontkey] = $info;
+    // Add a TrueType, OpenType or Type1 font
+    $family = strtolower($family);
+    if($file=='')
+        $file = str_replace(' ','',$family).strtolower($style).'.php';
+    $style = strtoupper($style);
+    if($style=='IB')
+        $style = 'BI';
+    $fontkey = $family.$style;
+    if(isset($this->fonts[$fontkey]))
+        return;
+    $info = $this->_loadfont($file);
+    $info['i'] = count($this->fonts)+1;
+    if(!empty($info['file']))
+    {
+        // Embedded font
+        if($info['type']=='TrueType')
+            $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
+        else
+            $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
+    }
+    $this->fonts[$fontkey] = $info;
 }
 
 function SetFont($family, $style='', $size=0)
 {
-	// Select a font; size given in points
-	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);
-	}
-	else
-		$this->underline = false;
-	if($style=='IB')
-		$style = 'BI';
-	if($size==0)
-		$size = $this->FontSizePt;
-	// Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
-		return;
-	// Test if font is already loaded
-	$fontkey = $family.$style;
-	if(!isset($this->fonts[$fontkey]))
-	{
-		// Test if one of the core fonts
-		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);
-	}
-	// Select it
-	$this->FontFamily = $family;
-	$this->FontStyle = $style;
-	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
-	$this->CurrentFont = &$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+    // Select a font; size given in points
+    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);
+    }
+    else
+        $this->underline = false;
+    if($style=='IB')
+        $style = 'BI';
+    if($size==0)
+        $size = $this->FontSizePt;
+    // Test if font is already selected
+    if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
+        return;
+    // Test if font is already loaded
+    $fontkey = $family.$style;
+    if(!isset($this->fonts[$fontkey]))
+    {
+        // Test if one of the core fonts
+        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);
+    }
+    // Select it
+    $this->FontFamily = $family;
+    $this->FontStyle = $style;
+    $this->FontSizePt = $size;
+    $this->FontSize = $size/$this->k;
+    $this->CurrentFont = &$this->fonts[$fontkey];
+    if($this->page>0)
+        $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
 function SetFontSize($size)
 {
-	// Set font size in points
-	if($this->FontSizePt==$size)
-		return;
-	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+    // Set font size in points
+    if($this->FontSizePt==$size)
+        return;
+    $this->FontSizePt = $size;
+    $this->FontSize = $size/$this->k;
+    if($this->page>0)
+        $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
 function AddLink()
 {
-	// Create a new internal link
-	$n = count($this->links)+1;
-	$this->links[$n] = array(0, 0);
-	return $n;
+    // Create a new internal link
+    $n = count($this->links)+1;
+    $this->links[$n] = array(0, 0);
+    return $n;
 }
 
 function SetLink($link, $y=0, $page=-1)
 {
-	// Set destination of internal link
-	if($y==-1)
-		$y = $this->y;
-	if($page==-1)
-		$page = $this->page;
-	$this->links[$link] = array($page, $y);
+    // Set destination of internal link
+    if($y==-1)
+        $y = $this->y;
+    if($page==-1)
+        $page = $this->page;
+    $this->links[$link] = array($page, $y);
 }
 
 function Link($x, $y, $w, $h, $link)
 {
-	// Put a link on the page
-	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+    // Put a link on the page
+    $this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
 }
 
 function Text($x, $y, $txt)
 {
-	// Output a string
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s .= ' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s = 'q '.$this->TextColor.' '.$s.' Q';
-	$this->_out($s);
+    // Output a string
+    if(!isset($this->CurrentFont))
+        $this->Error('No font has been set');
+    $s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+    if($this->underline && $txt!='')
+        $s .= ' '.$this->_dounderline($x,$y,$txt);
+    if($this->ColorFlag)
+        $s = 'q '.$this->TextColor.' '.$s.' Q';
+    $this->_out($s);
 }
 
 function AcceptPageBreak()
 {
-	// Accept automatic page break or not
-	return $this->AutoPageBreak;
+    // Accept automatic page break or not
+    return $this->AutoPageBreak;
 }
 
 function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
 {
-	// Output a cell
-	$k = $this->k;
-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-	{
-		// Automatic page break
-		$x = $this->x;
-		$ws = $this->ws;
-		if($ws>0)
-		{
-			$this->ws = 0;
-			$this->_out('0 Tw');
-		}
-		$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
-		$this->x = $x;
-		if($ws>0)
-		{
-			$this->ws = $ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$k));
-		}
-	}
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
-	$s = '';
-	if($fill || $border==1)
-	{
-		if($fill)
-			$op = ($border==1) ? 'B' : 'f';
-		else
-			$op = 'S';
-		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
-	}
-	if(is_string($border))
-	{
-		$x = $this->x;
-		$y = $this->y;
-		if(strpos($border,'L')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-	}
-	if($txt!=='')
-	{
-		if(!isset($this->CurrentFont))
-			$this->Error('No font has been set');
-		if($align=='R')
-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx = ($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx = $this->cMargin;
-		if($this->ColorFlag)
-			$s .= 'q '.$this->TextColor.' ';
-		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
-		if($this->underline)
-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s .= ' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
-	$this->lasth = $h;
-	if($ln>0)
-	{
-		// Go to next line
-		$this->y += $h;
-		if($ln==1)
-			$this->x = $this->lMargin;
-	}
-	else
-		$this->x += $w;
+    // Output a cell
+    $k = $this->k;
+    if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+    {
+        // Automatic page break
+        $x = $this->x;
+        $ws = $this->ws;
+        if($ws>0)
+        {
+            $this->ws = 0;
+            $this->_out('0 Tw');
+        }
+        $this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
+        $this->x = $x;
+        if($ws>0)
+        {
+            $this->ws = $ws;
+            $this->_out(sprintf('%.3F Tw',$ws*$k));
+        }
+    }
+    if($w==0)
+        $w = $this->w-$this->rMargin-$this->x;
+    $s = '';
+    if($fill || $border==1)
+    {
+        if($fill)
+            $op = ($border==1) ? 'B' : 'f';
+        else
+            $op = 'S';
+        $s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+    }
+    if(is_string($border))
+    {
+        $x = $this->x;
+        $y = $this->y;
+        if(strpos($border,'L')!==false)
+            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+        if(strpos($border,'T')!==false)
+            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+        if(strpos($border,'R')!==false)
+            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+        if(strpos($border,'B')!==false)
+            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+    }
+    if($txt!=='')
+    {
+        if(!isset($this->CurrentFont))
+            $this->Error('No font has been set');
+        if($align=='R')
+            $dx = $w-$this->cMargin-$this->GetStringWidth($txt);
+        elseif($align=='C')
+            $dx = ($w-$this->GetStringWidth($txt))/2;
+        else
+            $dx = $this->cMargin;
+        if($this->ColorFlag)
+            $s .= 'q '.$this->TextColor.' ';
+        $s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
+        if($this->underline)
+            $s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+        if($this->ColorFlag)
+            $s .= ' Q';
+        if($link)
+            $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+    }
+    if($s)
+        $this->_out($s);
+    $this->lasth = $h;
+    if($ln>0)
+    {
+        // Go to next line
+        $this->y += $h;
+        if($ln==1)
+            $this->x = $this->lMargin;
+    }
+    else
+        $this->x += $w;
 }
 
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
-	// Output text with automatic or explicit line breaks
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$cw = &$this->CurrentFont['cw'];
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
-	$nb = strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
-		$nb--;
-	$b = 0;
-	if($border)
-	{
-		if($border==1)
-		{
-			$border = 'LTRB';
-			$b = 'LRT';
-			$b2 = 'LR';
-		}
-		else
-		{
-			$b2 = '';
-			if(strpos($border,'L')!==false)
-				$b2 .= 'L';
-			if(strpos($border,'R')!==false)
-				$b2 .= 'R';
-			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
-		}
-	}
-	$sep = -1;
-	$i = 0;
-	$j = 0;
-	$l = 0;
-	$ns = 0;
-	$nl = 1;
-	while($i<$nb)
-	{
-		// Get next character
-		$c = $s[$i];
-		if($c=="\n")
-		{
-			// Explicit line break
-			if($this->ws>0)
-			{
-				$this->ws = 0;
-				$this->_out('0 Tw');
-			}
-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			$i++;
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			$ns = 0;
-			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
-			continue;
-		}
-		if($c==' ')
-		{
-			$sep = $i;
-			$ls = $l;
-			$ns++;
-		}
-		$l += $cw[$c];
-		if($l>$wmax)
-		{
-			// Automatic line break
-			if($sep==-1)
-			{
-				if($i==$j)
-					$i++;
-				if($this->ws>0)
-				{
-					$this->ws = 0;
-					$this->_out('0 Tw');
-				}
-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			}
-			else
-			{
-				if($align=='J')
-				{
-					$this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
-				}
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
-				$i = $sep+1;
-			}
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			$ns = 0;
-			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
-		}
-		else
-			$i++;
-	}
-	// Last chunk
-	if($this->ws>0)
-	{
-		$this->ws = 0;
-		$this->_out('0 Tw');
-	}
-	if($border && strpos($border,'B')!==false)
-		$b .= 'B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-	$this->x = $this->lMargin;
+    // Output text with automatic or explicit line breaks
+    if(!isset($this->CurrentFont))
+        $this->Error('No font has been set');
+    $cw = &$this->CurrentFont['cw'];
+    if($w==0)
+        $w = $this->w-$this->rMargin-$this->x;
+    $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s = str_replace("\r",'',$txt);
+    $nb = strlen($s);
+    if($nb>0 && $s[$nb-1]=="\n")
+        $nb--;
+    $b = 0;
+    if($border)
+    {
+        if($border==1)
+        {
+            $border = 'LTRB';
+            $b = 'LRT';
+            $b2 = 'LR';
+        }
+        else
+        {
+            $b2 = '';
+            if(strpos($border,'L')!==false)
+                $b2 .= 'L';
+            if(strpos($border,'R')!==false)
+                $b2 .= 'R';
+            $b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
+        }
+    }
+    $sep = -1;
+    $i = 0;
+    $j = 0;
+    $l = 0;
+    $ns = 0;
+    $nl = 1;
+    while($i<$nb)
+    {
+        // Get next character
+        $c = $s[$i];
+        if($c=="\n")
+        {
+            // Explicit line break
+            if($this->ws>0)
+            {
+                $this->ws = 0;
+                $this->_out('0 Tw');
+            }
+            $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+            $i++;
+            $sep = -1;
+            $j = $i;
+            $l = 0;
+            $ns = 0;
+            $nl++;
+            if($border && $nl==2)
+                $b = $b2;
+            continue;
+        }
+        if($c==' ')
+        {
+            $sep = $i;
+            $ls = $l;
+            $ns++;
+        }
+        $l += $cw[$c];
+        if($l>$wmax)
+        {
+            // Automatic line break
+            if($sep==-1)
+            {
+                if($i==$j)
+                    $i++;
+                if($this->ws>0)
+                {
+                    $this->ws = 0;
+                    $this->_out('0 Tw');
+                }
+                $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+            }
+            else
+            {
+                if($align=='J')
+                {
+                    $this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
+                    $this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
+                }
+                $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+                $i = $sep+1;
+            }
+            $sep = -1;
+            $j = $i;
+            $l = 0;
+            $ns = 0;
+            $nl++;
+            if($border && $nl==2)
+                $b = $b2;
+        }
+        else
+            $i++;
+    }
+    // Last chunk
+    if($this->ws>0)
+    {
+        $this->ws = 0;
+        $this->_out('0 Tw');
+    }
+    if($border && strpos($border,'B')!==false)
+        $b .= 'B';
+    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+    $this->x = $this->lMargin;
 }
 
 function Write($h, $txt, $link='')
 {
-	// Output text in flowing mode
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
-	$cw = &$this->CurrentFont['cw'];
-	$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
-	$nb = strlen($s);
-	$sep = -1;
-	$i = 0;
-	$j = 0;
-	$l = 0;
-	$nl = 1;
-	while($i<$nb)
-	{
-		// Get next character
-		$c = $s[$i];
-		if($c=="\n")
-		{
-			// Explicit line break
-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
-			$i++;
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			if($nl==1)
-			{
-				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-			continue;
-		}
-		if($c==' ')
-			$sep = $i;
-		$l += $cw[$c];
-		if($l>$wmax)
-		{
-			// Automatic line break
-			if($sep==-1)
-			{
-				if($this->x>$this->lMargin)
-				{
-					// Move to next line
-					$this->x = $this->lMargin;
-					$this->y += $h;
-					$w = $this->w-$this->rMargin-$this->x;
-					$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-					$i++;
-					$nl++;
-					continue;
-				}
-				if($i==$j)
-					$i++;
-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
-			}
-			else
-			{
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
-				$i = $sep+1;
-			}
-			$sep = -1;
-			$j = $i;
-			$l = 0;
-			if($nl==1)
-			{
-				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-		}
-		else
-			$i++;
-	}
-	// Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
+    // Output text in flowing mode
+    if(!isset($this->CurrentFont))
+        $this->Error('No font has been set');
+    $cw = &$this->CurrentFont['cw'];
+    $w = $this->w-$this->rMargin-$this->x;
+    $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s = str_replace("\r",'',$txt);
+    $nb = strlen($s);
+    $sep = -1;
+    $i = 0;
+    $j = 0;
+    $l = 0;
+    $nl = 1;
+    while($i<$nb)
+    {
+        // Get next character
+        $c = $s[$i];
+        if($c=="\n")
+        {
+            // Explicit line break
+            $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
+            $i++;
+            $sep = -1;
+            $j = $i;
+            $l = 0;
+            if($nl==1)
+            {
+                $this->x = $this->lMargin;
+                $w = $this->w-$this->rMargin-$this->x;
+                $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+            }
+            $nl++;
+            continue;
+        }
+        if($c==' ')
+            $sep = $i;
+        $l += $cw[$c];
+        if($l>$wmax)
+        {
+            // Automatic line break
+            if($sep==-1)
+            {
+                if($this->x>$this->lMargin)
+                {
+                    // Move to next line
+                    $this->x = $this->lMargin;
+                    $this->y += $h;
+                    $w = $this->w-$this->rMargin-$this->x;
+                    $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+                    $i++;
+                    $nl++;
+                    continue;
+                }
+                if($i==$j)
+                    $i++;
+                $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
+            }
+            else
+            {
+                $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
+                $i = $sep+1;
+            }
+            $sep = -1;
+            $j = $i;
+            $l = 0;
+            if($nl==1)
+            {
+                $this->x = $this->lMargin;
+                $w = $this->w-$this->rMargin-$this->x;
+                $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+            }
+            $nl++;
+        }
+        else
+            $i++;
+    }
+    // Last chunk
+    if($i!=$j)
+        $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
 }
 
 function Ln($h=null)
 {
-	// Line feed; default value is the last cell height
-	$this->x = $this->lMargin;
-	if($h===null)
-		$this->y += $this->lasth;
-	else
-		$this->y += $h;
+    // Line feed; default value is the last cell height
+    $this->x = $this->lMargin;
+    if($h===null)
+        $this->y += $this->lasth;
+    else
+        $this->y += $h;
 }
 
 function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
-	// Put an image on the page
-	if($file=='')
-		$this->Error('Image file name is empty');
-	if(!isset($this->images[$file]))
-	{
-		// First use of this image, get info
-		if($type=='')
-		{
-			$pos = strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type = substr($file,$pos+1);
-		}
-		$type = strtolower($type);
-		if($type=='jpeg')
-			$type = 'jpg';
-		$mtd = '_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
-		$info = $this->$mtd($file);
-		$info['i'] = count($this->images)+1;
-		$this->images[$file] = $info;
-	}
-	else
-		$info = $this->images[$file];
-
-	// Automatic width and height calculation if needed
-	if($w==0 && $h==0)
-	{
-		// Put image at 96 dpi
-		$w = -96;
-		$h = -96;
-	}
-	if($w<0)
-		$w = -$info['w']*72/$w/$this->k;
-	if($h<0)
-		$h = -$info['h']*72/$h/$this->k;
-	if($w==0)
-		$w = $h*$info['w']/$info['h'];
-	if($h==0)
-		$h = $w*$info['h']/$info['w'];
-
-	// Flowing mode
-	if($y===null)
-	{
-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-		{
-			// Automatic page break
-			$x2 = $this->x;
-			$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
-			$this->x = $x2;
-		}
-		$y = $this->y;
-		$this->y += $h;
-	}
-
-	if($x===null)
-		$x = $this->x;
-	$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']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
+    // Put an image on the page
+    if($file=='')
+        $this->Error('Image file name is empty');
+    if(!isset($this->images[$file]))
+    {
+        // First use of this image, get info
+        if($type=='')
+        {
+            $pos = strrpos($file,'.');
+            if(!$pos)
+                $this->Error('Image file has no extension and no type was specified: '.$file);
+            $type = substr($file,$pos+1);
+        }
+        $type = strtolower($type);
+        if($type=='jpeg')
+            $type = 'jpg';
+        $mtd = '_parse'.$type;
+        if(!method_exists($this,$mtd))
+            $this->Error('Unsupported image type: '.$type);
+        $info = $this->$mtd($file);
+        $info['i'] = count($this->images)+1;
+        $this->images[$file] = $info;
+    }
+    else
+        $info = $this->images[$file];
+
+    // Automatic width and height calculation if needed
+    if($w==0 && $h==0)
+    {
+        // Put image at 96 dpi
+        $w = -96;
+        $h = -96;
+    }
+    if($w<0)
+        $w = -$info['w']*72/$w/$this->k;
+    if($h<0)
+        $h = -$info['h']*72/$h/$this->k;
+    if($w==0)
+        $w = $h*$info['w']/$info['h'];
+    if($h==0)
+        $h = $w*$info['h']/$info['w'];
+
+    // Flowing mode
+    if($y===null)
+    {
+        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+        {
+            // Automatic page break
+            $x2 = $this->x;
+            $this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
+            $this->x = $x2;
+        }
+        $y = $this->y;
+        $this->y += $h;
+    }
+
+    if($x===null)
+        $x = $this->x;
+    $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']));
+    if($link)
+        $this->Link($x,$y,$w,$h,$link);
 }
 
 function GetPageWidth()
 {
-	// Get current page width
-	return $this->w;
+    // Get current page width
+    return $this->w;
 }
 
 function GetPageHeight()
 {
-	// Get current page height
-	return $this->h;
+    // Get current page height
+    return $this->h;
 }
 
 function GetX()
 {
-	// Get x position
-	return $this->x;
+    // Get x position
+    return $this->x;
 }
 
 function SetX($x)
 {
-	// Set x position
-	if($x>=0)
-		$this->x = $x;
-	else
-		$this->x = $this->w+$x;
+    // Set x position
+    if($x>=0)
+        $this->x = $x;
+    else
+        $this->x = $this->w+$x;
 }
 
 function GetY()
 {
-	// Get y position
-	return $this->y;
+    // Get y position
+    return $this->y;
 }
 
 function SetY($y, $resetX=true)
 {
-	// Set y position and optionally reset x
-	if($y>=0)
-		$this->y = $y;
-	else
-		$this->y = $this->h+$y;
-	if($resetX)
-		$this->x = $this->lMargin;
+    // Set y position and optionally reset x
+    if($y>=0)
+        $this->y = $y;
+    else
+        $this->y = $this->h+$y;
+    if($resetX)
+        $this->x = $this->lMargin;
 }
 
 function SetXY($x, $y)
 {
-	// Set x and y positions
-	$this->SetX($x);
-	$this->SetY($y,false);
+    // Set x and y positions
+    $this->SetX($x);
+    $this->SetY($y,false);
 }
 
 function Output($dest='', $name='', $isUTF8=false)
 {
-	// Output PDF to some destination
-	$this->Close();
-	if(strlen($name)==1 && strlen($dest)!=1)
-	{
-		// Fix parameter order
-		$tmp = $dest;
-		$dest = $name;
-		$name = $tmp;
-	}
-	if($dest=='')
-		$dest = 'I';
-	if($name=='')
-		$name = 'doc.pdf';
-	switch(strtoupper($dest))
-	{
-		case 'I':
-			// Send to standard output
-			$this->_checkoutput();
-			if(PHP_SAPI!='cli')
-			{
-				// We send to a browser
-				header('Content-Type: application/pdf');
-				header('Content-Disposition: inline; '.$this->_httpencode('filename',$name,$isUTF8));
-				header('Cache-Control: private, max-age=0, must-revalidate');
-				header('Pragma: public');
-			}
-			echo $this->buffer;
-			break;
-		case 'D':
-			// Download file
-			$this->_checkoutput();
-			header('Content-Type: application/x-download');
-			header('Content-Disposition: attachment; '.$this->_httpencode('filename',$name,$isUTF8));
-			header('Cache-Control: private, max-age=0, must-revalidate');
-			header('Pragma: public');
-			echo $this->buffer;
-			break;
-		case 'F':
-			// Save to local file
-			if(!file_put_contents($name,$this->buffer))
-				$this->Error('Unable to create output file: '.$name);
-			break;
-		case 'S':
-			// Return as a string
-			return $this->buffer;
-		default:
-			$this->Error('Incorrect output destination: '.$dest);
-	}
-	return '';
+    // Output PDF to some destination
+    $this->Close();
+    if(strlen($name)==1 && strlen($dest)!=1)
+    {
+        // Fix parameter order
+        $tmp = $dest;
+        $dest = $name;
+        $name = $tmp;
+    }
+    if($dest=='')
+        $dest = 'I';
+    if($name=='')
+        $name = 'doc.pdf';
+    switch(strtoupper($dest))
+    {
+        case 'I':
+            // Send to standard output
+            $this->_checkoutput();
+            if(PHP_SAPI!='cli')
+            {
+                // We send to a browser
+                header('Content-Type: application/pdf');
+                header('Content-Disposition: inline; '.$this->_httpencode('filename',$name,$isUTF8));
+                header('Cache-Control: private, max-age=0, must-revalidate');
+                header('Pragma: public');
+            }
+            echo $this->buffer;
+            break;
+        case 'D':
+            // Download file
+            $this->_checkoutput();
+            header('Content-Type: application/x-download');
+            header('Content-Disposition: attachment; '.$this->_httpencode('filename',$name,$isUTF8));
+            header('Cache-Control: private, max-age=0, must-revalidate');
+            header('Pragma: public');
+            echo $this->buffer;
+            break;
+        case 'F':
+            // Save to local file
+            if(!file_put_contents($name,$this->buffer))
+                $this->Error('Unable to create output file: '.$name);
+            break;
+        case 'S':
+            // Return as a string
+            return $this->buffer;
+        default:
+            $this->Error('Incorrect output destination: '.$dest);
+    }
+    return '';
 }
 
 /*******************************************************************************
@@ -1036,875 +1036,875 @@ 
 
 protected function _dochecks()
 {
-	// Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
+    // Check mbstring overloading
+    if(ini_get('mbstring.func_overload') & 2)
+        $this->Error('mbstring overloading must be disabled');
 }
 
 protected function _checkoutput()
 {
-	if(PHP_SAPI!='cli')
-	{
-		if(headers_sent($file,$line))
-			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
-	}
-	if(ob_get_length())
-	{
-		// The output buffer is not empty
-		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
-		{
-			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
-			ob_clean();
-		}
-		else
-			$this->Error("Some data has already been output, can't send PDF file");
-	}
+    if(PHP_SAPI!='cli')
+    {
+        if(headers_sent($file,$line))
+            $this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+    }
+    if(ob_get_length())
+    {
+        // The output buffer is not empty
+        if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
+        {
+            // It contains only a UTF-8 BOM and/or whitespace, let's clean it
+            ob_clean();
+        }
+        else
+            $this->Error("Some data has already been output, can't send PDF file");
+    }
 }
 
 protected function _getpagesize($size)
 {
-	if(is_string($size))
-	{
-		$size = strtolower($size);
-		if(!isset($this->StdPageSizes[$size]))
-			$this->Error('Unknown page size: '.$size);
-		$a = $this->StdPageSizes[$size];
-		return array($a[0]/$this->k, $a[1]/$this->k);
-	}
-	else
-	{
-		if($size[0]>$size[1])
-			return array($size[1], $size[0]);
-		else
-			return $size;
-	}
+    if(is_string($size))
+    {
+        $size = strtolower($size);
+        if(!isset($this->StdPageSizes[$size]))
+            $this->Error('Unknown page size: '.$size);
+        $a = $this->StdPageSizes[$size];
+        return array($a[0]/$this->k, $a[1]/$this->k);
+    }
+    else
+    {
+        if($size[0]>$size[1])
+            return array($size[1], $size[0]);
+        else
+            return $size;
+    }
 }
 
 protected function _beginpage($orientation, $size, $rotation)
 {
-	$this->page++;
-	$this->pages[$this->page] = '';
-	$this->PageLinks[$this->page] = array();
-	$this->state = 2;
-	$this->x = $this->lMargin;
-	$this->y = $this->tMargin;
-	$this->FontFamily = '';
-	// Check page size and orientation
-	if($orientation=='')
-		$orientation = $this->DefOrientation;
-	else
-		$orientation = strtoupper($orientation[0]);
-	if($size=='')
-		$size = $this->DefPageSize;
-	else
-		$size = $this->_getpagesize($size);
-	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
-	{
-		// New size or orientation
-		if($orientation=='P')
-		{
-			$this->w = $size[0];
-			$this->h = $size[1];
-		}
-		else
-		{
-			$this->w = $size[1];
-			$this->h = $size[0];
-		}
-		$this->wPt = $this->w*$this->k;
-		$this->hPt = $this->h*$this->k;
-		$this->PageBreakTrigger = $this->h-$this->bMargin;
-		$this->CurOrientation = $orientation;
-		$this->CurPageSize = $size;
-	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
-		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
-	if($rotation!=0)
-	{
-		if($rotation%90!=0)
-			$this->Error('Incorrect rotation value: '.$rotation);
-		$this->CurRotation = $rotation;
-		$this->PageInfo[$this->page]['rotation'] = $rotation;
-	}
+    $this->page++;
+    $this->pages[$this->page] = '';
+    $this->PageLinks[$this->page] = array();
+    $this->state = 2;
+    $this->x = $this->lMargin;
+    $this->y = $this->tMargin;
+    $this->FontFamily = '';
+    // Check page size and orientation
+    if($orientation=='')
+        $orientation = $this->DefOrientation;
+    else
+        $orientation = strtoupper($orientation[0]);
+    if($size=='')
+        $size = $this->DefPageSize;
+    else
+        $size = $this->_getpagesize($size);
+    if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
+    {
+        // New size or orientation
+        if($orientation=='P')
+        {
+            $this->w = $size[0];
+            $this->h = $size[1];
+        }
+        else
+        {
+            $this->w = $size[1];
+            $this->h = $size[0];
+        }
+        $this->wPt = $this->w*$this->k;
+        $this->hPt = $this->h*$this->k;
+        $this->PageBreakTrigger = $this->h-$this->bMargin;
+        $this->CurOrientation = $orientation;
+        $this->CurPageSize = $size;
+    }
+    if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
+        $this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
+    if($rotation!=0)
+    {
+        if($rotation%90!=0)
+            $this->Error('Incorrect rotation value: '.$rotation);
+        $this->CurRotation = $rotation;
+        $this->PageInfo[$this->page]['rotation'] = $rotation;
+    }
 }
 
 protected function _endpage()
 {
-	$this->state = 1;
+    $this->state = 1;
 }
 
 protected function _loadfont($font)
 {
-	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
-		$this->Error('Incorrect font definition file name: '.$font);
-	include($this->fontpath.$font);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
-	if(isset($enc))
-		$enc = strtolower($enc);
-	if(!isset($subsetted))
-		$subsetted = false;
-	return get_defined_vars();
+    // Load a font definition file from the font directory
+    if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
+        $this->Error('Incorrect font definition file name: '.$font);
+    include($this->fontpath.$font);
+    if(!isset($name))
+        $this->Error('Could not include font definition file');
+    if(isset($enc))
+        $enc = strtolower($enc);
+    if(!isset($subsetted))
+        $subsetted = false;
+    return get_defined_vars();
 }
 
 protected function _isascii($s)
 {
-	// Test if string is ASCII
-	$nb = strlen($s);
-	for($i=0;$i<$nb;$i++)
-	{
-		if(ord($s[$i])>127)
-			return false;
-	}
-	return true;
+    // Test if string is ASCII
+    $nb = strlen($s);
+    for($i=0;$i<$nb;$i++)
+    {
+        if(ord($s[$i])>127)
+            return false;
+    }
+    return true;
 }
 
 protected function _httpencode($param, $value, $isUTF8)
 {
-	// Encode HTTP header field parameter
-	if($this->_isascii($value))
-		return $param.'="'.$value.'"';
-	if(!$isUTF8)
-		$value = utf8_encode($value);
-	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
-		return $param.'="'.rawurlencode($value).'"';
-	else
-		return $param."*=UTF-8''".rawurlencode($value);
+    // Encode HTTP header field parameter
+    if($this->_isascii($value))
+        return $param.'="'.$value.'"';
+    if(!$isUTF8)
+        $value = utf8_encode($value);
+    if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
+        return $param.'="'.rawurlencode($value).'"';
+    else
+        return $param."*=UTF-8''".rawurlencode($value);
 }
 
 protected function _UTF8toUTF16($s)
 {
-	// Convert UTF-8 to UTF-16BE with BOM
-	$res = "\xFE\xFF";
-	$nb = strlen($s);
-	$i = 0;
-	while($i<$nb)
-	{
-		$c1 = ord($s[$i++]);
-		if($c1>=224)
-		{
-			// 3-byte character
-			$c2 = ord($s[$i++]);
-			$c3 = ord($s[$i++]);
-			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
-			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
-		{
-			// 2-byte character
-			$c2 = ord($s[$i++]);
-			$res .= chr(($c1 & 0x1C)>>2);
-			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
-		{
-			// Single-byte character
-			$res .= "\0".chr($c1);
-		}
-	}
-	return $res;
+    // Convert UTF-8 to UTF-16BE with BOM
+    $res = "\xFE\xFF";
+    $nb = strlen($s);
+    $i = 0;
+    while($i<$nb)
+    {
+        $c1 = ord($s[$i++]);
+        if($c1>=224)
+        {
+            // 3-byte character
+            $c2 = ord($s[$i++]);
+            $c3 = ord($s[$i++]);
+            $res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
+            $res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+        }
+        elseif($c1>=192)
+        {
+            // 2-byte character
+            $c2 = ord($s[$i++]);
+            $res .= chr(($c1 & 0x1C)>>2);
+            $res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+        }
+        else
+        {
+            // Single-byte character
+            $res .= "\0".chr($c1);
+        }
+    }
+    return $res;
 }
 
 protected function _escape($s)
 {
-	// Escape special characters
-	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
-		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
-	else
-		return $s;
+    // Escape special characters
+    if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
+        return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
+    else
+        return $s;
 }
 
 protected function _textstring($s)
 {
-	// Format a text string
-	if(!$this->_isascii($s))
-		$s = $this->_UTF8toUTF16($s);
-	return '('.$this->_escape($s).')';
+    // Format a text string
+    if(!$this->_isascii($s))
+        $s = $this->_UTF8toUTF16($s);
+    return '('.$this->_escape($s).')';
 }
 
 protected function _dounderline($x, $y, $txt)
 {
-	// Underline text
-	$up = $this->CurrentFont['up'];
-	$ut = $this->CurrentFont['ut'];
-	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+    // Underline text
+    $up = $this->CurrentFont['up'];
+    $ut = $this->CurrentFont['ut'];
+    $w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
+    return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
 }
 
 protected function _parsejpg($file)
 {
-	// Extract info from a JPEG file
-	$a = getimagesize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace = 'DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace = 'DeviceCMYK';
-	else
-		$colspace = 'DeviceGray';
-	$bpc = isset($a['bits']) ? $a['bits'] : 8;
-	$data = file_get_contents($file);
-	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
+    // Extract info from a JPEG file
+    $a = getimagesize($file);
+    if(!$a)
+        $this->Error('Missing or incorrect image file: '.$file);
+    if($a[2]!=2)
+        $this->Error('Not a JPEG file: '.$file);
+    if(!isset($a['channels']) || $a['channels']==3)
+        $colspace = 'DeviceRGB';
+    elseif($a['channels']==4)
+        $colspace = 'DeviceCMYK';
+    else
+        $colspace = 'DeviceGray';
+    $bpc = isset($a['bits']) ? $a['bits'] : 8;
+    $data = file_get_contents($file);
+    return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
 }
 
 protected function _parsepng($file)
 {
-	// Extract info from a PNG file
-	$f = fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
-	$info = $this->_parsepngstream($f,$file);
-	fclose($f);
-	return $info;
+    // Extract info from a PNG file
+    $f = fopen($file,'rb');
+    if(!$f)
+        $this->Error('Can\'t open image file: '.$file);
+    $info = $this->_parsepngstream($f,$file);
+    fclose($f);
+    return $info;
 }
 
 protected function _parsepngstream($f, $file)
 {
-	// Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
-
-	// Read header chunk
-	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
-	$w = $this->_readint($f);
-	$h = $this->_readint($f);
-	$bpc = ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
-	$ct = ord($this->_readstream($f,1));
-	if($ct==0 || $ct==4)
-		$colspace = 'DeviceGray';
-	elseif($ct==2 || $ct==6)
-		$colspace = 'DeviceRGB';
-	elseif($ct==3)
-		$colspace = 'Indexed';
-	else
-		$this->Error('Unknown color type: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
-	$this->_readstream($f,4);
-	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
-
-	// Scan chunks looking for palette, transparency and image data
-	$pal = '';
-	$trns = '';
-	$data = '';
-	do
-	{
-		$n = $this->_readint($f);
-		$type = $this->_readstream($f,4);
-		if($type=='PLTE')
-		{
-			// Read palette
-			$pal = $this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
-		{
-			// Read transparency info
-			$t = $this->_readstream($f,$n);
-			if($ct==0)
-				$trns = array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
-			{
-				$pos = strpos($t,chr(0));
-				if($pos!==false)
-					$trns = array($pos);
-			}
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
-		{
-			// Read image data block
-			$data .= $this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
-	}
-	while($n);
-
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
-	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
-	if($ct>=4)
-	{
-		// Extract alpha channel
-		if(!function_exists('gzuncompress'))
-			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
-		$data = gzuncompress($data);
-		$color = '';
-		$alpha = '';
-		if($ct==4)
-		{
-			// Gray image
-			$len = 2*$w;
-			for($i=0;$i<$h;$i++)
-			{
-				$pos = (1+$len)*$i;
-				$color .= $data[$pos];
-				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.)./s','$1',$line);
-				$alpha .= preg_replace('/.(.)/s','$1',$line);
-			}
-		}
-		else
-		{
-			// RGB image
-			$len = 4*$w;
-			for($i=0;$i<$h;$i++)
-			{
-				$pos = (1+$len)*$i;
-				$color .= $data[$pos];
-				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.{3})./s','$1',$line);
-				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);
-			}
-		}
-		unset($data);
-		$data = gzcompress($color);
-		$info['smask'] = gzcompress($alpha);
-		$this->WithAlpha = true;
-		if($this->PDFVersion<'1.4')
-			$this->PDFVersion = '1.4';
-	}
-	$info['data'] = $data;
-	return $info;
+    // Check signature
+    if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+        $this->Error('Not a PNG file: '.$file);
+
+    // Read header chunk
+    $this->_readstream($f,4);
+    if($this->_readstream($f,4)!='IHDR')
+        $this->Error('Incorrect PNG file: '.$file);
+    $w = $this->_readint($f);
+    $h = $this->_readint($f);
+    $bpc = ord($this->_readstream($f,1));
+    if($bpc>8)
+        $this->Error('16-bit depth not supported: '.$file);
+    $ct = ord($this->_readstream($f,1));
+    if($ct==0 || $ct==4)
+        $colspace = 'DeviceGray';
+    elseif($ct==2 || $ct==6)
+        $colspace = 'DeviceRGB';
+    elseif($ct==3)
+        $colspace = 'Indexed';
+    else
+        $this->Error('Unknown color type: '.$file);
+    if(ord($this->_readstream($f,1))!=0)
+        $this->Error('Unknown compression method: '.$file);
+    if(ord($this->_readstream($f,1))!=0)
+        $this->Error('Unknown filter method: '.$file);
+    if(ord($this->_readstream($f,1))!=0)
+        $this->Error('Interlacing not supported: '.$file);
+    $this->_readstream($f,4);
+    $dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
+
+    // Scan chunks looking for palette, transparency and image data
+    $pal = '';
+    $trns = '';
+    $data = '';
+    do
+    {
+        $n = $this->_readint($f);
+        $type = $this->_readstream($f,4);
+        if($type=='PLTE')
+        {
+            // Read palette
+            $pal = $this->_readstream($f,$n);
+            $this->_readstream($f,4);
+        }
+        elseif($type=='tRNS')
+        {
+            // Read transparency info
+            $t = $this->_readstream($f,$n);
+            if($ct==0)
+                $trns = array(ord(substr($t,1,1)));
+            elseif($ct==2)
+                $trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+            else
+            {
+                $pos = strpos($t,chr(0));
+                if($pos!==false)
+                    $trns = array($pos);
+            }
+            $this->_readstream($f,4);
+        }
+        elseif($type=='IDAT')
+        {
+            // Read image data block
+            $data .= $this->_readstream($f,$n);
+            $this->_readstream($f,4);
+        }
+        elseif($type=='IEND')
+            break;
+        else
+            $this->_readstream($f,$n+4);
+    }
+    while($n);
+
+    if($colspace=='Indexed' && empty($pal))
+        $this->Error('Missing palette in '.$file);
+    $info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
+    if($ct>=4)
+    {
+        // Extract alpha channel
+        if(!function_exists('gzuncompress'))
+            $this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+        $data = gzuncompress($data);
+        $color = '';
+        $alpha = '';
+        if($ct==4)
+        {
+            // Gray image
+            $len = 2*$w;
+            for($i=0;$i<$h;$i++)
+            {
+                $pos = (1+$len)*$i;
+                $color .= $data[$pos];
+                $alpha .= $data[$pos];
+                $line = substr($data,$pos+1,$len);
+                $color .= preg_replace('/(.)./s','$1',$line);
+                $alpha .= preg_replace('/.(.)/s','$1',$line);
+            }
+        }
+        else
+        {
+            // RGB image
+            $len = 4*$w;
+            for($i=0;$i<$h;$i++)
+            {
+                $pos = (1+$len)*$i;
+                $color .= $data[$pos];
+                $alpha .= $data[$pos];
+                $line = substr($data,$pos+1,$len);
+                $color .= preg_replace('/(.{3})./s','$1',$line);
+                $alpha .= preg_replace('/.{3}(.)/s','$1',$line);
+            }
+        }
+        unset($data);
+        $data = gzcompress($color);
+        $info['smask'] = gzcompress($alpha);
+        $this->WithAlpha = true;
+        if($this->PDFVersion<'1.4')
+            $this->PDFVersion = '1.4';
+    }
+    $info['data'] = $data;
+    return $info;
 }
 
 protected function _readstream($f, $n)
 {
-	// Read n bytes from stream
-	$res = '';
-	while($n>0 && !feof($f))
-	{
-		$s = fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
-		$n -= strlen($s);
-		$res .= $s;
-	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
-	return $res;
+    // Read n bytes from stream
+    $res = '';
+    while($n>0 && !feof($f))
+    {
+        $s = fread($f,$n);
+        if($s===false)
+            $this->Error('Error while reading stream');
+        $n -= strlen($s);
+        $res .= $s;
+    }
+    if($n>0)
+        $this->Error('Unexpected end of stream');
+    return $res;
 }
 
 protected function _readint($f)
 {
-	// Read a 4-byte integer from stream
-	$a = unpack('Ni',$this->_readstream($f,4));
-	return $a['i'];
+    // Read a 4-byte integer from stream
+    $a = unpack('Ni',$this->_readstream($f,4));
+    return $a['i'];
 }
 
 protected function _parsegif($file)
 {
-	// Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
-	$im = imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
-	ob_start();
-	imagepng($im);
-	$data = ob_get_clean();
-	imagedestroy($im);
-	$f = fopen('php://temp','rb+');
-	if(!$f)
-		$this->Error('Unable to create memory stream');
-	fwrite($f,$data);
-	rewind($f);
-	$info = $this->_parsepngstream($f,$file);
-	fclose($f);
-	return $info;
+    // Extract info from a GIF file (via PNG conversion)
+    if(!function_exists('imagepng'))
+        $this->Error('GD extension is required for GIF support');
+    if(!function_exists('imagecreatefromgif'))
+        $this->Error('GD has no GIF read support');
+    $im = imagecreatefromgif($file);
+    if(!$im)
+        $this->Error('Missing or incorrect image file: '.$file);
+    imageinterlace($im,0);
+    ob_start();
+    imagepng($im);
+    $data = ob_get_clean();
+    imagedestroy($im);
+    $f = fopen('php://temp','rb+');
+    if(!$f)
+        $this->Error('Unable to create memory stream');
+    fwrite($f,$data);
+    rewind($f);
+    $info = $this->_parsepngstream($f,$file);
+    fclose($f);
+    return $info;
 }
 
 protected function _out($s)
 {
-	// Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page] .= $s."\n";
-	elseif($this->state==1)
-		$this->_put($s);
-	elseif($this->state==0)
-		$this->Error('No page has been added yet');
-	elseif($this->state==3)
-		$this->Error('The document is closed');
+    // Add a line to the document
+    if($this->state==2)
+        $this->pages[$this->page] .= $s."\n";
+    elseif($this->state==1)
+        $this->_put($s);
+    elseif($this->state==0)
+        $this->Error('No page has been added yet');
+    elseif($this->state==3)
+        $this->Error('The document is closed');
 }
 
 protected function _put($s)
 {
-	$this->buffer .= $s."\n";
+    $this->buffer .= $s."\n";
 }
 
 protected function _getoffset()
 {
-	return strlen($this->buffer);
+    return strlen($this->buffer);
 }
 
 protected function _newobj($n=null)
 {
-	// Begin a new object
-	if($n===null)
-		$n = ++$this->n;
-	$this->offsets[$n] = $this->_getoffset();
-	$this->_put($n.' 0 obj');
+    // Begin a new object
+    if($n===null)
+        $n = ++$this->n;
+    $this->offsets[$n] = $this->_getoffset();
+    $this->_put($n.' 0 obj');
 }
 
 protected function _putstream($data)
 {
-	$this->_put('stream');
-	$this->_put($data);
-	$this->_put('endstream');
+    $this->_put('stream');
+    $this->_put($data);
+    $this->_put('endstream');
 }
 
 protected function _putstreamobject($data)
 {
-	if($this->compress)
-	{
-		$entries = '/Filter /FlateDecode ';
-		$data = gzcompress($data);
-	}
-	else
-		$entries = '';
-	$entries .= '/Length '.strlen($data);
-	$this->_newobj();
-	$this->_put('<<'.$entries.'>>');
-	$this->_putstream($data);
-	$this->_put('endobj');
+    if($this->compress)
+    {
+        $entries = '/Filter /FlateDecode ';
+        $data = gzcompress($data);
+    }
+    else
+        $entries = '';
+    $entries .= '/Length '.strlen($data);
+    $this->_newobj();
+    $this->_put('<<'.$entries.'>>');
+    $this->_putstream($data);
+    $this->_put('endobj');
 }
 
 protected function _putpage($n)
 {
-	$this->_newobj();
-	$this->_put('<</Type /Page');
-	$this->_put('/Parent 1 0 R');
-	if(isset($this->PageInfo[$n]['size']))
-		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
-	if(isset($this->PageInfo[$n]['rotation']))
-		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
-	$this->_put('/Resources 2 0 R');
-	if(!empty($this->PageLinks[$n]))
-	{
-		$s = '/Annots [';
-		foreach($this->PageLinks[$n] as $pl)
-			$s .= $pl[5].' 0 R ';
-		$s .= ']';
-		$this->_put($s);
-	}
-	if($this->WithAlpha)
-		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
-	$this->_put('/Contents '.($this->n+1).' 0 R>>');
-	$this->_put('endobj');
-	// Page content
-	if(!empty($this->AliasNbPages))
-		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
-	$this->_putstreamobject($this->pages[$n]);
-	// Annotations
-	foreach($this->PageLinks[$n] as $pl)
-	{
-		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
-		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-		if(is_string($pl[4]))
-			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-		else
-		{
-			$l = $this->links[$pl[4]];
-			if(isset($this->PageInfo[$l[0]]['size']))
-				$h = $this->PageInfo[$l[0]]['size'][1];
-			else
-				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
-			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
-		}
-		$this->_newobj();
-		$this->_put($s);
-		$this->_put('endobj');
-	}
+    $this->_newobj();
+    $this->_put('<</Type /Page');
+    $this->_put('/Parent 1 0 R');
+    if(isset($this->PageInfo[$n]['size']))
+        $this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
+    if(isset($this->PageInfo[$n]['rotation']))
+        $this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
+    $this->_put('/Resources 2 0 R');
+    if(!empty($this->PageLinks[$n]))
+    {
+        $s = '/Annots [';
+        foreach($this->PageLinks[$n] as $pl)
+            $s .= $pl[5].' 0 R ';
+        $s .= ']';
+        $this->_put($s);
+    }
+    if($this->WithAlpha)
+        $this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+    $this->_put('/Contents '.($this->n+1).' 0 R>>');
+    $this->_put('endobj');
+    // Page content
+    if(!empty($this->AliasNbPages))
+        $this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+    $this->_putstreamobject($this->pages[$n]);
+    // Annotations
+    foreach($this->PageLinks[$n] as $pl)
+    {
+        $rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+        $s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
+        if(is_string($pl[4]))
+            $s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+        else
+        {
+            $l = $this->links[$pl[4]];
+            if(isset($this->PageInfo[$l[0]]['size']))
+                $h = $this->PageInfo[$l[0]]['size'][1];
+            else
+                $h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
+            $s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
+        }
+        $this->_newobj();
+        $this->_put($s);
+        $this->_put('endobj');
+    }
 }
 
 protected function _putpages()
 {
-	$nb = $this->page;
-	$n = $this->n;
-	for($i=1;$i<=$nb;$i++)
-	{
-		$this->PageInfo[$i]['n'] = ++$n;
-		$n++;
-		foreach($this->PageLinks[$i] as &$pl)
-			$pl[5] = ++$n;
-		unset($pl);
-	}
-	for($i=1;$i<=$nb;$i++)
-		$this->_putpage($i);
-	// Pages root
-	$this->_newobj(1);
-	$this->_put('<</Type /Pages');
-	$kids = '/Kids [';
-	for($i=1;$i<=$nb;$i++)
-		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
-	$kids .= ']';
-	$this->_put($kids);
-	$this->_put('/Count '.$nb);
-	if($this->DefOrientation=='P')
-	{
-		$w = $this->DefPageSize[0];
-		$h = $this->DefPageSize[1];
-	}
-	else
-	{
-		$w = $this->DefPageSize[1];
-		$h = $this->DefPageSize[0];
-	}
-	$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$w*$this->k,$h*$this->k));
-	$this->_put('>>');
-	$this->_put('endobj');
+    $nb = $this->page;
+    $n = $this->n;
+    for($i=1;$i<=$nb;$i++)
+    {
+        $this->PageInfo[$i]['n'] = ++$n;
+        $n++;
+        foreach($this->PageLinks[$i] as &$pl)
+            $pl[5] = ++$n;
+        unset($pl);
+    }
+    for($i=1;$i<=$nb;$i++)
+        $this->_putpage($i);
+    // Pages root
+    $this->_newobj(1);
+    $this->_put('<</Type /Pages');
+    $kids = '/Kids [';
+    for($i=1;$i<=$nb;$i++)
+        $kids .= $this->PageInfo[$i]['n'].' 0 R ';
+    $kids .= ']';
+    $this->_put($kids);
+    $this->_put('/Count '.$nb);
+    if($this->DefOrientation=='P')
+    {
+        $w = $this->DefPageSize[0];
+        $h = $this->DefPageSize[1];
+    }
+    else
+    {
+        $w = $this->DefPageSize[1];
+        $h = $this->DefPageSize[0];
+    }
+    $this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$w*$this->k,$h*$this->k));
+    $this->_put('>>');
+    $this->_put('endobj');
 }
 
 protected function _putfonts()
 {
-	foreach($this->FontFiles as $file=>$info)
-	{
-		// Font file embedding
-		$this->_newobj();
-		$this->FontFiles[$file]['n'] = $this->n;
-		$font = file_get_contents($this->fontpath.$file,true);
-		if(!$font)
-			$this->Error('Font file not found: '.$file);
-		$compressed = (substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
-		$this->_put('<</Length '.strlen($font));
-		if($compressed)
-			$this->_put('/Filter /FlateDecode');
-		$this->_put('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_put('/Length2 '.$info['length2'].' /Length3 0');
-		$this->_put('>>');
-		$this->_putstream($font);
-		$this->_put('endobj');
-	}
-	foreach($this->fonts as $k=>$font)
-	{
-		// Encoding
-		if(isset($font['diff']))
-		{
-			if(!isset($this->encodings[$font['enc']]))
-			{
-				$this->_newobj();
-				$this->_put('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$font['diff'].']>>');
-				$this->_put('endobj');
-				$this->encodings[$font['enc']] = $this->n;
-			}
-		}
-		// ToUnicode CMap
-		if(isset($font['uv']))
-		{
-			if(isset($font['enc']))
-				$cmapkey = $font['enc'];
-			else
-				$cmapkey = $font['name'];
-			if(!isset($this->cmaps[$cmapkey]))
-			{
-				$cmap = $this->_tounicodecmap($font['uv']);
-				$this->_putstreamobject($cmap);
-				$this->cmaps[$cmapkey] = $this->n;
-			}
-		}
-		// Font object
-		$this->fonts[$k]['n'] = $this->n+1;
-		$type = $font['type'];
-		$name = $font['name'];
-		if($font['subsetted'])
-			$name = 'AAAAAA+'.$name;
-		if($type=='Core')
-		{
-			// Core font
-			$this->_newobj();
-			$this->_put('<</Type /Font');
-			$this->_put('/BaseFont /'.$name);
-			$this->_put('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
-			$this->_put('>>');
-			$this->_put('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
-		{
-			// Additional Type1 or TrueType/OpenType font
-			$this->_newobj();
-			$this->_put('<</Type /Font');
-			$this->_put('/BaseFont /'.$name);
-			$this->_put('/Subtype /'.$type);
-			$this->_put('/FirstChar 32 /LastChar 255');
-			$this->_put('/Widths '.($this->n+1).' 0 R');
-			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
-			if(isset($font['diff']))
-				$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
-			else
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
-			$this->_put('>>');
-			$this->_put('endobj');
-			// Widths
-			$this->_newobj();
-			$cw = &$font['cw'];
-			$s = '[';
-			for($i=32;$i<=255;$i++)
-				$s .= $cw[chr($i)].' ';
-			$this->_put($s.']');
-			$this->_put('endobj');
-			// Descriptor
-			$this->_newobj();
-			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s .= ' /'.$k.' '.$v;
-			if(!empty($font['file']))
-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
-			$this->_put($s.'>>');
-			$this->_put('endobj');
-		}
-		else
-		{
-			// Allow for additional types
-			$mtd = '_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
-			$this->$mtd($font);
-		}
-	}
+    foreach($this->FontFiles as $file=>$info)
+    {
+        // Font file embedding
+        $this->_newobj();
+        $this->FontFiles[$file]['n'] = $this->n;
+        $font = file_get_contents($this->fontpath.$file,true);
+        if(!$font)
+            $this->Error('Font file not found: '.$file);
+        $compressed = (substr($file,-2)=='.z');
+        if(!$compressed && isset($info['length2']))
+            $font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+        $this->_put('<</Length '.strlen($font));
+        if($compressed)
+            $this->_put('/Filter /FlateDecode');
+        $this->_put('/Length1 '.$info['length1']);
+        if(isset($info['length2']))
+            $this->_put('/Length2 '.$info['length2'].' /Length3 0');
+        $this->_put('>>');
+        $this->_putstream($font);
+        $this->_put('endobj');
+    }
+    foreach($this->fonts as $k=>$font)
+    {
+        // Encoding
+        if(isset($font['diff']))
+        {
+            if(!isset($this->encodings[$font['enc']]))
+            {
+                $this->_newobj();
+                $this->_put('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$font['diff'].']>>');
+                $this->_put('endobj');
+                $this->encodings[$font['enc']] = $this->n;
+            }
+        }
+        // ToUnicode CMap
+        if(isset($font['uv']))
+        {
+            if(isset($font['enc']))
+                $cmapkey = $font['enc'];
+            else
+                $cmapkey = $font['name'];
+            if(!isset($this->cmaps[$cmapkey]))
+            {
+                $cmap = $this->_tounicodecmap($font['uv']);
+                $this->_putstreamobject($cmap);
+                $this->cmaps[$cmapkey] = $this->n;
+            }
+        }
+        // Font object
+        $this->fonts[$k]['n'] = $this->n+1;
+        $type = $font['type'];
+        $name = $font['name'];
+        if($font['subsetted'])
+            $name = 'AAAAAA+'.$name;
+        if($type=='Core')
+        {
+            // Core font
+            $this->_newobj();
+            $this->_put('<</Type /Font');
+            $this->_put('/BaseFont /'.$name);
+            $this->_put('/Subtype /Type1');
+            if($name!='Symbol' && $name!='ZapfDingbats')
+                $this->_put('/Encoding /WinAnsiEncoding');
+            if(isset($font['uv']))
+                $this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+            $this->_put('>>');
+            $this->_put('endobj');
+        }
+        elseif($type=='Type1' || $type=='TrueType')
+        {
+            // Additional Type1 or TrueType/OpenType font
+            $this->_newobj();
+            $this->_put('<</Type /Font');
+            $this->_put('/BaseFont /'.$name);
+            $this->_put('/Subtype /'.$type);
+            $this->_put('/FirstChar 32 /LastChar 255');
+            $this->_put('/Widths '.($this->n+1).' 0 R');
+            $this->_put('/FontDescriptor '.($this->n+2).' 0 R');
+            if(isset($font['diff']))
+                $this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
+            else
+                $this->_put('/Encoding /WinAnsiEncoding');
+            if(isset($font['uv']))
+                $this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+            $this->_put('>>');
+            $this->_put('endobj');
+            // Widths
+            $this->_newobj();
+            $cw = &$font['cw'];
+            $s = '[';
+            for($i=32;$i<=255;$i++)
+                $s .= $cw[chr($i)].' ';
+            $this->_put($s.']');
+            $this->_put('endobj');
+            // Descriptor
+            $this->_newobj();
+            $s = '<</Type /FontDescriptor /FontName /'.$name;
+            foreach($font['desc'] as $k=>$v)
+                $s .= ' /'.$k.' '.$v;
+            if(!empty($font['file']))
+                $s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+            $this->_put($s.'>>');
+            $this->_put('endobj');
+        }
+        else
+        {
+            // Allow for additional types
+            $mtd = '_put'.strtolower($type);
+            if(!method_exists($this,$mtd))
+                $this->Error('Unsupported font type: '.$type);
+            $this->$mtd($font);
+        }
+    }
 }
 
 protected function _tounicodecmap($uv)
 {
-	$ranges = '';
-	$nbr = 0;
-	$chars = '';
-	$nbc = 0;
-	foreach($uv as $c=>$v)
-	{
-		if(is_array($v))
-		{
-			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
-			$nbr++;
-		}
-		else
-		{
-			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
-			$nbc++;
-		}
-	}
-	$s = "/CIDInit /ProcSet findresource begin\n";
-	$s .= "12 dict begin\n";
-	$s .= "begincmap\n";
-	$s .= "/CIDSystemInfo\n";
-	$s .= "<</Registry (Adobe)\n";
-	$s .= "/Ordering (UCS)\n";
-	$s .= "/Supplement 0\n";
-	$s .= ">> def\n";
-	$s .= "/CMapName /Adobe-Identity-UCS def\n";
-	$s .= "/CMapType 2 def\n";
-	$s .= "1 begincodespacerange\n";
-	$s .= "<00> <FF>\n";
-	$s .= "endcodespacerange\n";
-	if($nbr>0)
-	{
-		$s .= "$nbr beginbfrange\n";
-		$s .= $ranges;
-		$s .= "endbfrange\n";
-	}
-	if($nbc>0)
-	{
-		$s .= "$nbc beginbfchar\n";
-		$s .= $chars;
-		$s .= "endbfchar\n";
-	}
-	$s .= "endcmap\n";
-	$s .= "CMapName currentdict /CMap defineresource pop\n";
-	$s .= "end\n";
-	$s .= "end";
-	return $s;
+    $ranges = '';
+    $nbr = 0;
+    $chars = '';
+    $nbc = 0;
+    foreach($uv as $c=>$v)
+    {
+        if(is_array($v))
+        {
+            $ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
+            $nbr++;
+        }
+        else
+        {
+            $chars .= sprintf("<%02X> <%04X>\n",$c,$v);
+            $nbc++;
+        }
+    }
+    $s = "/CIDInit /ProcSet findresource begin\n";
+    $s .= "12 dict begin\n";
+    $s .= "begincmap\n";
+    $s .= "/CIDSystemInfo\n";
+    $s .= "<</Registry (Adobe)\n";
+    $s .= "/Ordering (UCS)\n";
+    $s .= "/Supplement 0\n";
+    $s .= ">> def\n";
+    $s .= "/CMapName /Adobe-Identity-UCS def\n";
+    $s .= "/CMapType 2 def\n";
+    $s .= "1 begincodespacerange\n";
+    $s .= "<00> <FF>\n";
+    $s .= "endcodespacerange\n";
+    if($nbr>0)
+    {
+        $s .= "$nbr beginbfrange\n";
+        $s .= $ranges;
+        $s .= "endbfrange\n";
+    }
+    if($nbc>0)
+    {
+        $s .= "$nbc beginbfchar\n";
+        $s .= $chars;
+        $s .= "endbfchar\n";
+    }
+    $s .= "endcmap\n";
+    $s .= "CMapName currentdict /CMap defineresource pop\n";
+    $s .= "end\n";
+    $s .= "end";
+    return $s;
 }
 
 protected function _putimages()
 {
-	foreach(array_keys($this->images) as $file)
-	{
-		$this->_putimage($this->images[$file]);
-		unset($this->images[$file]['data']);
-		unset($this->images[$file]['smask']);
-	}
+    foreach(array_keys($this->images) as $file)
+    {
+        $this->_putimage($this->images[$file]);
+        unset($this->images[$file]['data']);
+        unset($this->images[$file]['smask']);
+    }
 }
 
 protected function _putimage(&$info)
 {
-	$this->_newobj();
-	$info['n'] = $this->n;
-	$this->_put('<</Type /XObject');
-	$this->_put('/Subtype /Image');
-	$this->_put('/Width '.$info['w']);
-	$this->_put('/Height '.$info['h']);
-	if($info['cs']=='Indexed')
-		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-	else
-	{
-		$this->_put('/ColorSpace /'.$info['cs']);
-		if($info['cs']=='DeviceCMYK')
-			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
-	}
-	$this->_put('/BitsPerComponent '.$info['bpc']);
-	if(isset($info['f']))
-		$this->_put('/Filter /'.$info['f']);
-	if(isset($info['dp']))
-		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
-	if(isset($info['trns']) && is_array($info['trns']))
-	{
-		$trns = '';
-		for($i=0;$i<count($info['trns']);$i++)
-			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
-		$this->_put('/Mask ['.$trns.']');
-	}
-	if(isset($info['smask']))
-		$this->_put('/SMask '.($this->n+1).' 0 R');
-	$this->_put('/Length '.strlen($info['data']).'>>');
-	$this->_putstream($info['data']);
-	$this->_put('endobj');
-	// Soft mask
-	if(isset($info['smask']))
-	{
-		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
-		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
-		$this->_putimage($smask);
-	}
-	// Palette
-	if($info['cs']=='Indexed')
-		$this->_putstreamobject($info['pal']);
+    $this->_newobj();
+    $info['n'] = $this->n;
+    $this->_put('<</Type /XObject');
+    $this->_put('/Subtype /Image');
+    $this->_put('/Width '.$info['w']);
+    $this->_put('/Height '.$info['h']);
+    if($info['cs']=='Indexed')
+        $this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+    else
+    {
+        $this->_put('/ColorSpace /'.$info['cs']);
+        if($info['cs']=='DeviceCMYK')
+            $this->_put('/Decode [1 0 1 0 1 0 1 0]');
+    }
+    $this->_put('/BitsPerComponent '.$info['bpc']);
+    if(isset($info['f']))
+        $this->_put('/Filter /'.$info['f']);
+    if(isset($info['dp']))
+        $this->_put('/DecodeParms <<'.$info['dp'].'>>');
+    if(isset($info['trns']) && is_array($info['trns']))
+    {
+        $trns = '';
+        for($i=0;$i<count($info['trns']);$i++)
+            $trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+        $this->_put('/Mask ['.$trns.']');
+    }
+    if(isset($info['smask']))
+        $this->_put('/SMask '.($this->n+1).' 0 R');
+    $this->_put('/Length '.strlen($info['data']).'>>');
+    $this->_putstream($info['data']);
+    $this->_put('endobj');
+    // Soft mask
+    if(isset($info['smask']))
+    {
+        $dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
+        $smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
+        $this->_putimage($smask);
+    }
+    // Palette
+    if($info['cs']=='Indexed')
+        $this->_putstreamobject($info['pal']);
 }
 
 protected function _putxobjectdict()
 {
-	foreach($this->images as $image)
-		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
+    foreach($this->images as $image)
+        $this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
 }
 
 protected function _putresourcedict()
 {
-	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-	$this->_put('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
-	$this->_put('>>');
-	$this->_put('/XObject <<');
-	$this->_putxobjectdict();
-	$this->_put('>>');
+    $this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+    $this->_put('/Font <<');
+    foreach($this->fonts as $font)
+        $this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
+    $this->_put('>>');
+    $this->_put('/XObject <<');
+    $this->_putxobjectdict();
+    $this->_put('>>');
 }
 
 protected function _putresources()
 {
-	$this->_putfonts();
-	$this->_putimages();
-	// Resource dictionary
-	$this->_newobj(2);
-	$this->_put('<<');
-	$this->_putresourcedict();
-	$this->_put('>>');
-	$this->_put('endobj');
+    $this->_putfonts();
+    $this->_putimages();
+    // Resource dictionary
+    $this->_newobj(2);
+    $this->_put('<<');
+    $this->_putresourcedict();
+    $this->_put('>>');
+    $this->_put('endobj');
 }
 
 protected function _putinfo()
 {
-	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
-	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
-	foreach($this->metadata as $key=>$value)
-		$this->_put('/'.$key.' '.$this->_textstring($value));
+    $this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
+    $this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
+    foreach($this->metadata as $key=>$value)
+        $this->_put('/'.$key.' '.$this->_textstring($value));
 }
 
 protected function _putcatalog()
 {
-	$n = $this->PageInfo[1]['n'];
-	$this->_put('/Type /Catalog');
-	$this->_put('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_put('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_put('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_put('/PageLayout /TwoColumnLeft');
+    $n = $this->PageInfo[1]['n'];
+    $this->_put('/Type /Catalog');
+    $this->_put('/Pages 1 0 R');
+    if($this->ZoomMode=='fullpage')
+        $this->_put('/OpenAction ['.$n.' 0 R /Fit]');
+    elseif($this->ZoomMode=='fullwidth')
+        $this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
+    elseif($this->ZoomMode=='real')
+        $this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
+    elseif(!is_string($this->ZoomMode))
+        $this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
+    if($this->LayoutMode=='single')
+        $this->_put('/PageLayout /SinglePage');
+    elseif($this->LayoutMode=='continuous')
+        $this->_put('/PageLayout /OneColumn');
+    elseif($this->LayoutMode=='two')
+        $this->_put('/PageLayout /TwoColumnLeft');
 }
 
 protected function _putheader()
 {
-	$this->_put('%PDF-'.$this->PDFVersion);
+    $this->_put('%PDF-'.$this->PDFVersion);
 }
 
 protected function _puttrailer()
 {
-	$this->_put('/Size '.($this->n+1));
-	$this->_put('/Root '.$this->n.' 0 R');
-	$this->_put('/Info '.($this->n-1).' 0 R');
+    $this->_put('/Size '.($this->n+1));
+    $this->_put('/Root '.$this->n.' 0 R');
+    $this->_put('/Info '.($this->n-1).' 0 R');
 }
 
 protected function _enddoc()
 {
-	$this->_putheader();
-	$this->_putpages();
-	$this->_putresources();
-	// Info
-	$this->_newobj();
-	$this->_put('<<');
-	$this->_putinfo();
-	$this->_put('>>');
-	$this->_put('endobj');
-	// Catalog
-	$this->_newobj();
-	$this->_put('<<');
-	$this->_putcatalog();
-	$this->_put('>>');
-	$this->_put('endobj');
-	// Cross-ref
-	$offset = $this->_getoffset();
-	$this->_put('xref');
-	$this->_put('0 '.($this->n+1));
-	$this->_put('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
-	// Trailer
-	$this->_put('trailer');
-	$this->_put('<<');
-	$this->_puttrailer();
-	$this->_put('>>');
-	$this->_put('startxref');
-	$this->_put($offset);
-	$this->_put('%%EOF');
-	$this->state = 3;
+    $this->_putheader();
+    $this->_putpages();
+    $this->_putresources();
+    // Info
+    $this->_newobj();
+    $this->_put('<<');
+    $this->_putinfo();
+    $this->_put('>>');
+    $this->_put('endobj');
+    // Catalog
+    $this->_newobj();
+    $this->_put('<<');
+    $this->_putcatalog();
+    $this->_put('>>');
+    $this->_put('endobj');
+    // Cross-ref
+    $offset = $this->_getoffset();
+    $this->_put('xref');
+    $this->_put('0 '.($this->n+1));
+    $this->_put('0000000000 65535 f ');
+    for($i=1;$i<=$this->n;$i++)
+        $this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+    // Trailer
+    $this->_put('trailer');
+    $this->_put('<<');
+    $this->_puttrailer();
+    $this->_put('>>');
+    $this->_put('startxref');
+    $this->_put($offset);
+    $this->_put('%%EOF');
+    $this->state = 3;
 }
 }
 ?>

Spacing +514 added lines, -514 removed lines

@@ -7,71 +7,71 @@ 
 * Author:  Olivier PLATHEY                                                     *
 *******************************************************************************/
 
-define('FPDF_VERSION','1.83');
+define('FPDF_VERSION', '1.83');
 
 class FPDF
 {
-protected $page;               // current page number
-protected $n;                  // current object number
-protected $offsets;            // array of object offsets
-protected $buffer;             // buffer holding in-memory PDF
-protected $pages;              // array containing pages
-protected $state;              // current document state
-protected $compress;           // compression flag
-protected $k;                  // scale factor (number of points in user unit)
-protected $DefOrientation;     // default orientation
-protected $CurOrientation;     // current orientation
-protected $StdPageSizes;       // standard page sizes
-protected $DefPageSize;        // default page size
-protected $CurPageSize;        // current page size
-protected $CurRotation;        // current page rotation
-protected $PageInfo;           // page-related data
-protected $wPt, $hPt;          // dimensions of current page in points
-protected $w, $h;              // dimensions of current page in user unit
-protected $lMargin;            // left margin
-protected $tMargin;            // top margin
-protected $rMargin;            // right margin
-protected $bMargin;            // page break margin
-protected $cMargin;            // cell margin
-protected $x, $y;              // current position in user unit
-protected $lasth;              // height of last printed cell
-protected $LineWidth;          // line width in user unit
-protected $fontpath;           // path containing fonts
-protected $CoreFonts;          // array of core font names
-protected $fonts;              // array of used fonts
-protected $FontFiles;          // array of font files
-protected $encodings;          // array of encodings
-protected $cmaps;              // array of ToUnicode CMaps
-protected $FontFamily;         // current font family
-protected $FontStyle;          // current font style
-protected $underline;          // underlining flag
-protected $CurrentFont;        // current font info
-protected $FontSizePt;         // current font size in points
-protected $FontSize;           // current font size in user unit
-protected $DrawColor;          // commands for drawing color
-protected $FillColor;          // commands for filling color
-protected $TextColor;          // commands for text color
-protected $ColorFlag;          // indicates whether fill and text colors are different
-protected $WithAlpha;          // indicates whether alpha channel is used
-protected $ws;                 // word spacing
-protected $images;             // array of used images
-protected $PageLinks;          // array of links in pages
-protected $links;              // array of internal links
-protected $AutoPageBreak;      // automatic page breaking
-protected $PageBreakTrigger;   // threshold used to trigger page breaks
-protected $InHeader;           // flag set when processing header
-protected $InFooter;           // flag set when processing footer
-protected $AliasNbPages;       // alias for total number of pages
-protected $ZoomMode;           // zoom display mode
-protected $LayoutMode;         // layout display mode
-protected $metadata;           // document properties
-protected $PDFVersion;         // PDF version number
+protected $page; // current page number
+protected $n; // current object number
+protected $offsets; // array of object offsets
+protected $buffer; // buffer holding in-memory PDF
+protected $pages; // array containing pages
+protected $state; // current document state
+protected $compress; // compression flag
+protected $k; // scale factor (number of points in user unit)
+protected $DefOrientation; // default orientation
+protected $CurOrientation; // current orientation
+protected $StdPageSizes; // standard page sizes
+protected $DefPageSize; // default page size
+protected $CurPageSize; // current page size
+protected $CurRotation; // current page rotation
+protected $PageInfo; // page-related data
+protected $wPt, $hPt; // dimensions of current page in points
+protected $w, $h; // dimensions of current page in user unit
+protected $lMargin; // left margin
+protected $tMargin; // top margin
+protected $rMargin; // right margin
+protected $bMargin; // page break margin
+protected $cMargin; // cell margin
+protected $x, $y; // current position in user unit
+protected $lasth; // height of last printed cell
+protected $LineWidth; // line width in user unit
+protected $fontpath; // path containing fonts
+protected $CoreFonts; // array of core font names
+protected $fonts; // array of used fonts
+protected $FontFiles; // array of font files
+protected $encodings; // array of encodings
+protected $cmaps; // array of ToUnicode CMaps
+protected $FontFamily; // current font family
+protected $FontStyle; // current font style
+protected $underline; // underlining flag
+protected $CurrentFont; // current font info
+protected $FontSizePt; // current font size in points
+protected $FontSize; // current font size in user unit
+protected $DrawColor; // commands for drawing color
+protected $FillColor; // commands for filling color
+protected $TextColor; // commands for text color
+protected $ColorFlag; // indicates whether fill and text colors are different
+protected $WithAlpha; // indicates whether alpha channel is used
+protected $ws; // word spacing
+protected $images; // array of used images
+protected $PageLinks; // array of links in pages
+protected $links; // array of internal links
+protected $AutoPageBreak; // automatic page breaking
+protected $PageBreakTrigger; // threshold used to trigger page breaks
+protected $InHeader; // flag set when processing header
+protected $InFooter; // flag set when processing footer
+protected $AliasNbPages; // alias for total number of pages
+protected $ZoomMode; // zoom display mode
+protected $LayoutMode; // layout display mode
+protected $metadata; // document properties
+protected $PDFVersion; // PDF version number
 
 /*******************************************************************************
 *                               Public methods                                 *
 *******************************************************************************/
 
-function __construct($orientation='P', $unit='mm', $size='A4')
+function __construct($orientation = 'P', $unit = 'mm', $size = 'A4')
 {
 	// Some checks
 	$this->_dochecks();
@@ -102,44 +102,44 @@ 
 	$this->WithAlpha = false;
 	$this->ws = 0;
 	// Font path
-	if(defined('FPDF_FONTPATH'))
+	if (defined('FPDF_FONTPATH'))
 	{
 		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
+		if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\')
 			$this->fontpath .= '/';
 	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
+	elseif (is_dir(dirname(__FILE__).'/font'))
 		$this->fontpath = dirname(__FILE__).'/font/';
 	else
 		$this->fontpath = '';
 	// Core fonts
-	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats','verdana','calligra','Arimo-Regular');
+	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats', 'verdana', 'calligra', 'Arimo-Regular');
 	// Scale factor
-	if($unit=='pt')
+	if ($unit == 'pt')
 		$this->k = 1;
-	elseif($unit=='mm')
-		$this->k = 72/25.4;
-	elseif($unit=='cm')
-		$this->k = 72/2.54;
-	elseif($unit=='in')
+	elseif ($unit == 'mm')
+		$this->k = 72 / 25.4;
+	elseif ($unit == 'cm')
+		$this->k = 72 / 2.54;
+	elseif ($unit == 'in')
 		$this->k = 72;
 	else
 		$this->Error('Incorrect unit: '.$unit);
 	// Page sizes
-	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
-		'letter'=>array(612,792), 'legal'=>array(612,1008));
+	$this->StdPageSizes = array('a3'=>array(841.89, 1190.55), 'a4'=>array(595.28, 841.89), 'a5'=>array(420.94, 595.28),
+		'letter'=>array(612, 792), 'legal'=>array(612, 1008));
 	$size = $this->_getpagesize($size);
 	$this->DefPageSize = $size;
 	$this->CurPageSize = $size;
 	// Page orientation
 	$orientation = strtolower($orientation);
-	if($orientation=='p' || $orientation=='portrait')
+	if ($orientation == 'p' || $orientation == 'portrait')
 	{
 		$this->DefOrientation = 'P';
 		$this->w = $size[0];
 		$this->h = $size[1];
 	}
-	elseif($orientation=='l' || $orientation=='landscape')
+	elseif ($orientation == 'l' || $orientation == 'landscape')
 	{
 		$this->DefOrientation = 'L';
 		$this->w = $size[1];
@@ -148,19 +148,19 @@ 
 	else
 		$this->Error('Incorrect orientation: '.$orientation);
 	$this->CurOrientation = $this->DefOrientation;
-	$this->wPt = $this->w*$this->k;
-	$this->hPt = $this->h*$this->k;
+	$this->wPt = $this->w * $this->k;
+	$this->hPt = $this->h * $this->k;
 	// Page rotation
 	$this->CurRotation = 0;
 	// Page margins (1 cm)
-	$margin = 28.35/$this->k;
-	$this->SetMargins($margin,$margin);
+	$margin = 28.35 / $this->k;
+	$this->SetMargins($margin, $margin);
 	// Interior cell margin (1 mm)
-	$this->cMargin = $margin/10;
+	$this->cMargin = $margin / 10;
 	// Line width (0.2 mm)
-	$this->LineWidth = .567/$this->k;
+	$this->LineWidth = .567 / $this->k;
 	// Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
+	$this->SetAutoPageBreak(true, 2 * $margin);
 	// Default display mode
 	$this->SetDisplayMode('default');
 	// Enable compression
@@ -169,12 +169,12 @@ 
 	$this->PDFVersion = '1.3';
 }
 
-function SetMargins($left, $top, $right=null)
+function SetMargins($left, $top, $right = null)
 {
 	// Set left, top and right margins
 	$this->lMargin = $left;
 	$this->tMargin = $top;
-	if($right===null)
+	if ($right === null)
 		$right = $left;
 	$this->rMargin = $right;
 }
@@ -183,7 +183,7 @@ 
 {
 	// Set left margin
 	$this->lMargin = $margin;
-	if($this->page>0 && $this->x<$margin)
+	if ($this->page > 0 && $this->x < $margin)
 		$this->x = $margin;
 }
 
@@ -199,22 +199,22 @@ 
 	$this->rMargin = $margin;
 }
 
-function SetAutoPageBreak($auto, $margin=0)
+function SetAutoPageBreak($auto, $margin = 0)
 {
 	// Set auto page break mode and triggering margin
 	$this->AutoPageBreak = $auto;
 	$this->bMargin = $margin;
-	$this->PageBreakTrigger = $this->h-$margin;
+	$this->PageBreakTrigger = $this->h - $margin;
 }
 
-function SetDisplayMode($zoom, $layout='default')
+function SetDisplayMode($zoom, $layout = 'default')
 {
 	// Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+	if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))
 		$this->ZoomMode = $zoom;
 	else
 		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
+	if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
 		$this->LayoutMode = $layout;
 	else
 		$this->Error('Incorrect layout display mode: '.$layout);
@@ -223,43 +223,43 @@ 
 function SetCompression($compress)
 {
 	// Set page compression
-	if(function_exists('gzcompress'))
+	if (function_exists('gzcompress'))
 		$this->compress = $compress;
 	else
 		$this->compress = false;
 }
 
-function SetTitle($title, $isUTF8=false)
+function SetTitle($title, $isUTF8 = false)
 {
 	// Title of document
 	$this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);
 }
 
-function SetAuthor($author, $isUTF8=false)
+function SetAuthor($author, $isUTF8 = false)
 {
 	// Author of document
 	$this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);
 }
 
-function SetSubject($subject, $isUTF8=false)
+function SetSubject($subject, $isUTF8 = false)
 {
 	// Subject of document
 	$this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);
 }
 
-function SetKeywords($keywords, $isUTF8=false)
+function SetKeywords($keywords, $isUTF8 = false)
 {
 	// Keywords of document
 	$this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);
 }
 
-function SetCreator($creator, $isUTF8=false)
+function SetCreator($creator, $isUTF8 = false)
 {
 	// Creator of document
 	$this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);
 }
 
-function AliasNbPages($alias='{nb}')
+function AliasNbPages($alias = '{nb}')
 {
 	// Define an alias for total number of pages
 	$this->AliasNbPages = $alias;
@@ -274,9 +274,9 @@ 
 function Close()
 {
 	// Terminate document
-	if($this->state==3)
+	if ($this->state == 3)
 		return;
-	if($this->page==0)
+	if ($this->page == 0)
 		$this->AddPage();
 	// Page footer
 	$this->InFooter = true;
@@ -288,10 +288,10 @@ 
 	$this->_enddoc();
 }
 
-function AddPage($orientation='', $size='', $rotation=0)
+function AddPage($orientation = '', $size = '', $rotation = 0)
 {
 	// Start a new page
-	if($this->state==3)
+	if ($this->state == 3)
 		$this->Error('The document is closed');
 	$family = $this->FontFamily;
 	$style = $this->FontStyle.($this->underline ? 'U' : '');
@@ -301,7 +301,7 @@ 
 	$fc = $this->FillColor;
 	$tc = $this->TextColor;
 	$cf = $this->ColorFlag;
-	if($this->page>0)
+	if ($this->page > 0)
 	{
 		// Page footer
 		$this->InFooter = true;
@@ -311,21 +311,21 @@ 
 		$this->_endpage();
 	}
 	// Start new page
-	$this->_beginpage($orientation,$size,$rotation);
+	$this->_beginpage($orientation, $size, $rotation);
 	// Set line cap style to square
 	$this->_out('2 J');
 	// Set line width
 	$this->LineWidth = $lw;
-	$this->_out(sprintf('%.2F w',$lw*$this->k));
+	$this->_out(sprintf('%.2F w', $lw * $this->k));
 	// Set font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if ($family)
+		$this->SetFont($family, $style, $fontsize);
 	// Set colors
 	$this->DrawColor = $dc;
-	if($dc!='0 G')
+	if ($dc != '0 G')
 		$this->_out($dc);
 	$this->FillColor = $fc;
-	if($fc!='0 g')
+	if ($fc != '0 g')
 		$this->_out($fc);
 	$this->TextColor = $tc;
 	$this->ColorFlag = $cf;
@@ -334,21 +334,21 @@ 
 	$this->Header();
 	$this->InHeader = false;
 	// Restore line width
-	if($this->LineWidth!=$lw)
+	if ($this->LineWidth != $lw)
 	{
 		$this->LineWidth = $lw;
-		$this->_out(sprintf('%.2F w',$lw*$this->k));
+		$this->_out(sprintf('%.2F w', $lw * $this->k));
 	}
 	// Restore font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if ($family)
+		$this->SetFont($family, $style, $fontsize);
 	// Restore colors
-	if($this->DrawColor!=$dc)
+	if ($this->DrawColor != $dc)
 	{
 		$this->DrawColor = $dc;
 		$this->_out($dc);
 	}
-	if($this->FillColor!=$fc)
+	if ($this->FillColor != $fc)
 	{
 		$this->FillColor = $fc;
 		$this->_out($fc);
@@ -373,95 +373,95 @@ 
 	return $this->page;
 }
 
-function SetDrawColor($r, $g=null, $b=null)
+function SetDrawColor($r, $g = null, $b = null)
 {
 	// Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor = sprintf('%.3F G',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->DrawColor = sprintf('%.3F G', $r / 255);
 	else
-		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
+		$this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);
+	if ($this->page > 0)
 		$this->_out($this->DrawColor);
 }
 
-function SetFillColor($r, $g=null, $b=null)
+function SetFillColor($r, $g = null, $b = null)
 {
 	// Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor = sprintf('%.3F g',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->FillColor = sprintf('%.3F g', $r / 255);
 	else
-		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-	if($this->page>0)
+		$this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
+	$this->ColorFlag = ($this->FillColor != $this->TextColor);
+	if ($this->page > 0)
 		$this->_out($this->FillColor);
 }
 
-function SetTextColor($r, $g=null, $b=null)
+function SetTextColor($r, $g = null, $b = null)
 {
 	// Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor = sprintf('%.3F g',$r/255);
+	if (($r == 0 && $g == 0 && $b == 0) || $g === null)
+		$this->TextColor = sprintf('%.3F g', $r / 255);
 	else
-		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
+		$this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
+	$this->ColorFlag = ($this->FillColor != $this->TextColor);
 }
 
 function GetStringWidth($s)
 {
 	// Get width of a string in the current font
-	$s = (string)$s;
+	$s = (string) $s;
 	$cw = &$this->CurrentFont['cw'];
 	$w = 0;
 	$l = strlen($s);
-	for($i=0;$i<$l;$i++)
+	for ($i = 0; $i < $l; $i++)
 		$w += $cw[$s[$i]];
-	return $w*$this->FontSize/1000;
+	return $w * $this->FontSize / 1000;
 }
 
 function SetLineWidth($width)
 {
 	// Set line width
 	$this->LineWidth = $width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
+	if ($this->page > 0)
+		$this->_out(sprintf('%.2F w', $width * $this->k));
 }
 
 function Line($x1, $y1, $x2, $y2)
 {
 	// Draw a line
-	$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));
+	$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));
 }
 
-function Rect($x, $y, $w, $h, $style='')
+function Rect($x, $y, $w, $h, $style = '')
 {
 	// Draw a rectangle
-	if($style=='F')
+	if ($style == 'F')
 		$op = 'f';
-	elseif($style=='FD' || $style=='DF')
+	elseif ($style == 'FD' || $style == 'DF')
 		$op = 'B';
 	else
 		$op = 'S';
-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
 }
 
-function AddFont($family, $style='', $file='')
+function AddFont($family, $style = '', $file = '')
 {
 	// Add a TrueType, OpenType or Type1 font
 	$family = strtolower($family);
-	if($file=='')
-		$file = str_replace(' ','',$family).strtolower($style).'.php';
+	if ($file == '')
+		$file = str_replace(' ', '', $family).strtolower($style).'.php';
 	$style = strtoupper($style);
-	if($style=='IB')
+	if ($style == 'IB')
 		$style = 'BI';
 	$fontkey = $family.$style;
-	if(isset($this->fonts[$fontkey]))
+	if (isset($this->fonts[$fontkey]))
 		return;
 	$info = $this->_loadfont($file);
-	$info['i'] = count($this->fonts)+1;
-	if(!empty($info['file']))
+	$info['i'] = count($this->fonts) + 1;
+	if (!empty($info['file']))
 	{
 		// Embedded font
-		if($info['type']=='TrueType')
+		if ($info['type'] == 'TrueType')
 			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
 		else
 			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
@@ -469,42 +469,42 @@ 
 	$this->fonts[$fontkey] = $info;
 }
 
-function SetFont($family, $style='', $size=0)
+function SetFont($family, $style = '', $size = 0)
 {
 	// Select a font; size given in points
-	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);
 	}
 	else
 		$this->underline = false;
-	if($style=='IB')
+	if ($style == 'IB')
 		$style = 'BI';
-	if($size==0)
+	if ($size == 0)
 		$size = $this->FontSizePt;
 	// Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
+	if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size)
 		return;
 	// Test if font is already loaded
 	$fontkey = $family.$style;
-	if(!isset($this->fonts[$fontkey]))
+	if (!isset($this->fonts[$fontkey]))
 	{
 		// Test if one of the core fonts
-		if($family=='arial')
+		if ($family == 'arial')
 			$family = 'helvetica';
-		if(in_array($family,$this->CoreFonts))
+		if (in_array($family, $this->CoreFonts))
 		{
-			if($family=='symbol' || $family=='zapfdingbats')
+			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);
@@ -513,37 +513,37 @@ 
 	$this->FontFamily = $family;
 	$this->FontStyle = $style;
 	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
+	$this->FontSize = $size / $this->k;
 	$this->CurrentFont = &$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	if ($this->page > 0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 }
 
 function SetFontSize($size)
 {
 	// Set font size in points
-	if($this->FontSizePt==$size)
+	if ($this->FontSizePt == $size)
 		return;
 	$this->FontSizePt = $size;
-	$this->FontSize = $size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	$this->FontSize = $size / $this->k;
+	if ($this->page > 0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
 }
 
 function AddLink()
 {
 	// Create a new internal link
-	$n = count($this->links)+1;
+	$n = count($this->links) + 1;
 	$this->links[$n] = array(0, 0);
 	return $n;
 }
 
-function SetLink($link, $y=0, $page=-1)
+function SetLink($link, $y = 0, $page = -1)
 {
 	// Set destination of internal link
-	if($y==-1)
+	if ($y == -1)
 		$y = $this->y;
-	if($page==-1)
+	if ($page == -1)
 		$page = $this->page;
 	$this->links[$link] = array($page, $y);
 }
@@ -551,18 +551,18 @@ 
 function Link($x, $y, $w, $h, $link)
 {
 	// Put a link on the page
-	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+	$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);
 }
 
 function Text($x, $y, $txt)
 {
 	// Output a string
-	if(!isset($this->CurrentFont))
+	if (!isset($this->CurrentFont))
 		$this->Error('No font has been set');
-	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s .= ' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
+	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->_escape($txt));
+	if ($this->underline && $txt != '')
+		$s .= ' '.$this->_dounderline($x, $y, $txt);
+	if ($this->ColorFlag)
 		$s = 'q '.$this->TextColor.' '.$s.' Q';
 	$this->_out($s);
 }
@@ -573,103 +573,103 @@ 
 	return $this->AutoPageBreak;
 }
 
-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
+function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '')
 {
 	// Output a cell
 	$k = $this->k;
-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+	if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
 	{
 		// Automatic page break
 		$x = $this->x;
 		$ws = $this->ws;
-		if($ws>0)
+		if ($ws > 0)
 		{
 			$this->ws = 0;
 			$this->_out('0 Tw');
 		}
-		$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
+		$this->AddPage($this->CurOrientation, $this->CurPageSize, $this->CurRotation);
 		$this->x = $x;
-		if($ws>0)
+		if ($ws > 0)
 		{
 			$this->ws = $ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$k));
+			$this->_out(sprintf('%.3F Tw', $ws * $k));
 		}
 	}
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
+	if ($w == 0)
+		$w = $this->w - $this->rMargin - $this->x;
 	$s = '';
-	if($fill || $border==1)
+	if ($fill || $border == 1)
 	{
-		if($fill)
-			$op = ($border==1) ? 'B' : 'f';
+		if ($fill)
+			$op = ($border == 1) ? 'B' : 'f';
 		else
 			$op = 'S';
-		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+		$s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);
 	}
-	if(is_string($border))
+	if (is_string($border))
 	{
 		$x = $this->x;
 		$y = $this->y;
-		if(strpos($border,'L')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		if (strpos($border, 'L') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);
+		if (strpos($border, 'T') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);
+		if (strpos($border, 'R') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
+		if (strpos($border, 'B') !== false)
+			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
 	}
-	if($txt!=='')
+	if ($txt !== '')
 	{
-		if(!isset($this->CurrentFont))
+		if (!isset($this->CurrentFont))
 			$this->Error('No font has been set');
-		if($align=='R')
-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx = ($w-$this->GetStringWidth($txt))/2;
+		if ($align == 'R')
+			$dx = $w - $this->cMargin - $this->GetStringWidth($txt);
+		elseif ($align == 'C')
+			$dx = ($w - $this->GetStringWidth($txt)) / 2;
 		else
 			$dx = $this->cMargin;
-		if($this->ColorFlag)
+		if ($this->ColorFlag)
 			$s .= 'q '.$this->TextColor.' ';
-		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
-		if($this->underline)
-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
+		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $this->_escape($txt));
+		if ($this->underline)
+			$s .= ' '.$this->_dounderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);
+		if ($this->ColorFlag)
 			$s .= ' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+		if ($link)
+			$this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);
 	}
-	if($s)
+	if ($s)
 		$this->_out($s);
 	$this->lasth = $h;
-	if($ln>0)
+	if ($ln > 0)
 	{
 		// Go to next line
 		$this->y += $h;
-		if($ln==1)
+		if ($ln == 1)
 			$this->x = $this->lMargin;
 	}
 	else
 		$this->x += $w;
 }
 
-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
+function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false)
 {
 	// Output text with automatic or explicit line breaks
-	if(!isset($this->CurrentFont))
+	if (!isset($this->CurrentFont))
 		$this->Error('No font has been set');
 	$cw = &$this->CurrentFont['cw'];
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
+	if ($w == 0)
+		$w = $this->w - $this->rMargin - $this->x;
+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+	$s = str_replace("\r", '', $txt);
 	$nb = strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
+	if ($nb > 0 && $s[$nb - 1] == "\n")
 		$nb--;
 	$b = 0;
-	if($border)
+	if ($border)
 	{
-		if($border==1)
+		if ($border == 1)
 		{
 			$border = 'LTRB';
 			$b = 'LRT';
@@ -678,11 +678,11 @@ 
 		else
 		{
 			$b2 = '';
-			if(strpos($border,'L')!==false)
+			if (strpos($border, 'L') !== false)
 				$b2 .= 'L';
-			if(strpos($border,'R')!==false)
+			if (strpos($border, 'R') !== false)
 				$b2 .= 'R';
-			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
+			$b = (strpos($border, 'T') !== false) ? $b2.'T' : $b2;
 		}
 	}
 	$sep = -1;
@@ -691,155 +691,155 @@ 
 	$l = 0;
 	$ns = 0;
 	$nl = 1;
-	while($i<$nb)
+	while ($i < $nb)
 	{
 		// Get next character
 		$c = $s[$i];
-		if($c=="\n")
+		if ($c == "\n")
 		{
 			// Explicit line break
-			if($this->ws>0)
+			if ($this->ws > 0)
 			{
 				$this->ws = 0;
 				$this->_out('0 Tw');
 			}
-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+			$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 			$i++;
 			$sep = -1;
 			$j = $i;
 			$l = 0;
 			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
+			if ($border && $nl == 2)
 				$b = $b2;
 			continue;
 		}
-		if($c==' ')
+		if ($c == ' ')
 		{
 			$sep = $i;
 			$ls = $l;
 			$ns++;
 		}
 		$l += $cw[$c];
-		if($l>$wmax)
+		if ($l > $wmax)
 		{
 			// Automatic line break
-			if($sep==-1)
+			if ($sep == -1)
 			{
-				if($i==$j)
+				if ($i == $j)
 					$i++;
-				if($this->ws>0)
+				if ($this->ws > 0)
 				{
 					$this->ws = 0;
 					$this->_out('0 Tw');
 				}
-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+				$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 			}
 			else
 			{
-				if($align=='J')
+				if ($align == 'J')
 				{
-					$this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
+					$this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0;
+					$this->_out(sprintf('%.3F Tw', $this->ws * $this->k));
 				}
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
-				$i = $sep+1;
+				$this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
+				$i = $sep + 1;
 			}
 			$sep = -1;
 			$j = $i;
 			$l = 0;
 			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
+			if ($border && $nl == 2)
 				$b = $b2;
 		}
 		else
 			$i++;
 	}
 	// Last chunk
-	if($this->ws>0)
+	if ($this->ws > 0)
 	{
 		$this->ws = 0;
 		$this->_out('0 Tw');
 	}
-	if($border && strpos($border,'B')!==false)
+	if ($border && strpos($border, 'B') !== false)
 		$b .= 'B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+	$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
 	$this->x = $this->lMargin;
 }
 
-function Write($h, $txt, $link='')
+function Write($h, $txt, $link = '')
 {
 	// Output text in flowing mode
-	if(!isset($this->CurrentFont))
+	if (!isset($this->CurrentFont))
 		$this->Error('No font has been set');
 	$cw = &$this->CurrentFont['cw'];
-	$w = $this->w-$this->rMargin-$this->x;
-	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s = str_replace("\r",'',$txt);
+	$w = $this->w - $this->rMargin - $this->x;
+	$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+	$s = str_replace("\r", '', $txt);
 	$nb = strlen($s);
 	$sep = -1;
 	$i = 0;
 	$j = 0;
 	$l = 0;
 	$nl = 1;
-	while($i<$nb)
+	while ($i < $nb)
 	{
 		// Get next character
 		$c = $s[$i];
-		if($c=="\n")
+		if ($c == "\n")
 		{
 			// Explicit line break
-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
+			$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', false, $link);
 			$i++;
 			$sep = -1;
 			$j = $i;
 			$l = 0;
-			if($nl==1)
+			if ($nl == 1)
 			{
 				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+				$w = $this->w - $this->rMargin - $this->x;
+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 			}
 			$nl++;
 			continue;
 		}
-		if($c==' ')
+		if ($c == ' ')
 			$sep = $i;
 		$l += $cw[$c];
-		if($l>$wmax)
+		if ($l > $wmax)
 		{
 			// Automatic line break
-			if($sep==-1)
+			if ($sep == -1)
 			{
-				if($this->x>$this->lMargin)
+				if ($this->x > $this->lMargin)
 				{
 					// Move to next line
 					$this->x = $this->lMargin;
 					$this->y += $h;
-					$w = $this->w-$this->rMargin-$this->x;
-					$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+					$w = $this->w - $this->rMargin - $this->x;
+					$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 					$i++;
 					$nl++;
 					continue;
 				}
-				if($i==$j)
+				if ($i == $j)
 					$i++;
-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
+				$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', false, $link);
 			}
 			else
 			{
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
-				$i = $sep+1;
+				$this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', false, $link);
+				$i = $sep + 1;
 			}
 			$sep = -1;
 			$j = $i;
 			$l = 0;
-			if($nl==1)
+			if ($nl == 1)
 			{
 				$this->x = $this->lMargin;
-				$w = $this->w-$this->rMargin-$this->x;
-				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
+				$w = $this->w - $this->rMargin - $this->x;
+				$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
 			}
 			$nl++;
 		}
@@ -847,83 +847,83 @@ 
 			$i++;
 	}
 	// Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
+	if ($i != $j)
+		$this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', false, $link);
 }
 
-function Ln($h=null)
+function Ln($h = null)
 {
 	// Line feed; default value is the last cell height
 	$this->x = $this->lMargin;
-	if($h===null)
+	if ($h === null)
 		$this->y += $this->lasth;
 	else
 		$this->y += $h;
 }
 
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')
 {
 	// Put an image on the page
-	if($file=='')
+	if ($file == '')
 		$this->Error('Image file name is empty');
-	if(!isset($this->images[$file]))
+	if (!isset($this->images[$file]))
 	{
 		// First use of this image, get info
-		if($type=='')
+		if ($type == '')
 		{
-			$pos = strrpos($file,'.');
-			if(!$pos)
+			$pos = strrpos($file, '.');
+			if (!$pos)
 				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type = substr($file,$pos+1);
+			$type = substr($file, $pos + 1);
 		}
 		$type = strtolower($type);
-		if($type=='jpeg')
+		if ($type == 'jpeg')
 			$type = 'jpg';
 		$mtd = '_parse'.$type;
-		if(!method_exists($this,$mtd))
+		if (!method_exists($this, $mtd))
 			$this->Error('Unsupported image type: '.$type);
 		$info = $this->$mtd($file);
-		$info['i'] = count($this->images)+1;
+		$info['i'] = count($this->images) + 1;
 		$this->images[$file] = $info;
 	}
 	else
 		$info = $this->images[$file];
 
 	// Automatic width and height calculation if needed
-	if($w==0 && $h==0)
+	if ($w == 0 && $h == 0)
 	{
 		// Put image at 96 dpi
 		$w = -96;
 		$h = -96;
 	}
-	if($w<0)
-		$w = -$info['w']*72/$w/$this->k;
-	if($h<0)
-		$h = -$info['h']*72/$h/$this->k;
-	if($w==0)
-		$w = $h*$info['w']/$info['h'];
-	if($h==0)
-		$h = $w*$info['h']/$info['w'];
+	if ($w < 0)
+		$w = -$info['w'] * 72 / $w / $this->k;
+	if ($h < 0)
+		$h = -$info['h'] * 72 / $h / $this->k;
+	if ($w == 0)
+		$w = $h * $info['w'] / $info['h'];
+	if ($h == 0)
+		$h = $w * $info['h'] / $info['w'];
 
 	// Flowing mode
-	if($y===null)
+	if ($y === null)
 	{
-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+		if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
 		{
 			// Automatic page break
 			$x2 = $this->x;
-			$this->AddPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);
+			$this->AddPage($this->CurOrientation, $this->CurPageSize, $this->CurRotation);
 			$this->x = $x2;
 		}
 		$y = $this->y;
 		$this->y += $h;
 	}
 
-	if($x===null)
+	if ($x === null)
 		$x = $this->x;
-	$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']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
+	$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']));
+	if ($link)
+		$this->Link($x, $y, $w, $h, $link);
 }
 
 function GetPageWidth()
@@ -947,10 +947,10 @@ 
 function SetX($x)
 {
 	// Set x position
-	if($x>=0)
+	if ($x >= 0)
 		$this->x = $x;
 	else
-		$this->x = $this->w+$x;
+		$this->x = $this->w + $x;
 }
 
 function GetY()
@@ -959,14 +959,14 @@ 
 	return $this->y;
 }
 
-function SetY($y, $resetX=true)
+function SetY($y, $resetX = true)
 {
 	// Set y position and optionally reset x
-	if($y>=0)
+	if ($y >= 0)
 		$this->y = $y;
 	else
-		$this->y = $this->h+$y;
-	if($resetX)
+		$this->y = $this->h + $y;
+	if ($resetX)
 		$this->x = $this->lMargin;
 }
 
@@ -974,34 +974,34 @@ 
 {
 	// Set x and y positions
 	$this->SetX($x);
-	$this->SetY($y,false);
+	$this->SetY($y, false);
 }
 
-function Output($dest='', $name='', $isUTF8=false)
+function Output($dest = '', $name = '', $isUTF8 = false)
 {
 	// Output PDF to some destination
 	$this->Close();
-	if(strlen($name)==1 && strlen($dest)!=1)
+	if (strlen($name) == 1 && strlen($dest) != 1)
 	{
 		// Fix parameter order
 		$tmp = $dest;
 		$dest = $name;
 		$name = $tmp;
 	}
-	if($dest=='')
+	if ($dest == '')
 		$dest = 'I';
-	if($name=='')
+	if ($name == '')
 		$name = 'doc.pdf';
-	switch(strtoupper($dest))
+	switch (strtoupper($dest))
 	{
 		case 'I':
 			// Send to standard output
 			$this->_checkoutput();
-			if(PHP_SAPI!='cli')
+			if (PHP_SAPI != 'cli')
 			{
 				// We send to a browser
 				header('Content-Type: application/pdf');
-				header('Content-Disposition: inline; '.$this->_httpencode('filename',$name,$isUTF8));
+				header('Content-Disposition: inline; '.$this->_httpencode('filename', $name, $isUTF8));
 				header('Cache-Control: private, max-age=0, must-revalidate');
 				header('Pragma: public');
 			}
@@ -1011,14 +1011,14 @@ 
 			// Download file
 			$this->_checkoutput();
 			header('Content-Type: application/x-download');
-			header('Content-Disposition: attachment; '.$this->_httpencode('filename',$name,$isUTF8));
+			header('Content-Disposition: attachment; '.$this->_httpencode('filename', $name, $isUTF8));
 			header('Cache-Control: private, max-age=0, must-revalidate');
 			header('Pragma: public');
 			echo $this->buffer;
 			break;
 		case 'F':
 			// Save to local file
-			if(!file_put_contents($name,$this->buffer))
+			if (!file_put_contents($name, $this->buffer))
 				$this->Error('Unable to create output file: '.$name);
 			break;
 		case 'S':
@@ -1037,21 +1037,21 @@ 
 protected function _dochecks()
 {
 	// Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
+	if (ini_get('mbstring.func_overload') & 2)
 		$this->Error('mbstring overloading must be disabled');
 }
 
 protected function _checkoutput()
 {
-	if(PHP_SAPI!='cli')
+	if (PHP_SAPI != 'cli')
 	{
-		if(headers_sent($file,$line))
+		if (headers_sent($file, $line))
 			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
 	}
-	if(ob_get_length())
+	if (ob_get_length())
 	{
 		// The output buffer is not empty
-		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))
+		if (preg_match('/^(\xEF\xBB\xBF)?\s*$/', ob_get_contents()))
 		{
 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
 			ob_clean();
@@ -1063,17 +1063,17 @@ 
 
 protected function _getpagesize($size)
 {
-	if(is_string($size))
+	if (is_string($size))
 	{
 		$size = strtolower($size);
-		if(!isset($this->StdPageSizes[$size]))
+		if (!isset($this->StdPageSizes[$size]))
 			$this->Error('Unknown page size: '.$size);
 		$a = $this->StdPageSizes[$size];
-		return array($a[0]/$this->k, $a[1]/$this->k);
+		return array($a[0] / $this->k, $a[1] / $this->k);
 	}
 	else
 	{
-		if($size[0]>$size[1])
+		if ($size[0] > $size[1])
 			return array($size[1], $size[0]);
 		else
 			return $size;
@@ -1090,18 +1090,18 @@ 
 	$this->y = $this->tMargin;
 	$this->FontFamily = '';
 	// Check page size and orientation
-	if($orientation=='')
+	if ($orientation == '')
 		$orientation = $this->DefOrientation;
 	else
 		$orientation = strtoupper($orientation[0]);
-	if($size=='')
+	if ($size == '')
 		$size = $this->DefPageSize;
 	else
 		$size = $this->_getpagesize($size);
-	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
+	if ($orientation != $this->CurOrientation || $size[0] != $this->CurPageSize[0] || $size[1] != $this->CurPageSize[1])
 	{
 		// New size or orientation
-		if($orientation=='P')
+		if ($orientation == 'P')
 		{
 			$this->w = $size[0];
 			$this->h = $size[1];
@@ -1111,17 +1111,17 @@ 
 			$this->w = $size[1];
 			$this->h = $size[0];
 		}
-		$this->wPt = $this->w*$this->k;
-		$this->hPt = $this->h*$this->k;
-		$this->PageBreakTrigger = $this->h-$this->bMargin;
+		$this->wPt = $this->w * $this->k;
+		$this->hPt = $this->h * $this->k;
+		$this->PageBreakTrigger = $this->h - $this->bMargin;
 		$this->CurOrientation = $orientation;
 		$this->CurPageSize = $size;
 	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
+	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1])
 		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
-	if($rotation!=0)
+	if ($rotation != 0)
 	{
-		if($rotation%90!=0)
+		if ($rotation % 90 != 0)
 			$this->Error('Incorrect rotation value: '.$rotation);
 		$this->CurRotation = $rotation;
 		$this->PageInfo[$this->page]['rotation'] = $rotation;
@@ -1136,14 +1136,14 @@ 
 protected function _loadfont($font)
 {
 	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
+	if (strpos($font, '/') !== false || strpos($font, "\\") !== false)
 		$this->Error('Incorrect font definition file name: '.$font);
 	include($this->fontpath.$font);
-	if(!isset($name))
+	if (!isset($name))
 		$this->Error('Could not include font definition file');
-	if(isset($enc))
+	if (isset($enc))
 		$enc = strtolower($enc);
-	if(!isset($subsetted))
+	if (!isset($subsetted))
 		$subsetted = false;
 	return get_defined_vars();
 }
@@ -1152,9 +1152,9 @@ 
 {
 	// Test if string is ASCII
 	$nb = strlen($s);
-	for($i=0;$i<$nb;$i++)
+	for ($i = 0; $i < $nb; $i++)
 	{
-		if(ord($s[$i])>127)
+		if (ord($s[$i]) > 127)
 			return false;
 	}
 	return true;
@@ -1163,11 +1163,11 @@ 
 protected function _httpencode($param, $value, $isUTF8)
 {
 	// Encode HTTP header field parameter
-	if($this->_isascii($value))
+	if ($this->_isascii($value))
 		return $param.'="'.$value.'"';
-	if(!$isUTF8)
+	if (!$isUTF8)
 		$value = utf8_encode($value);
-	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
 		return $param.'="'.rawurlencode($value).'"';
 	else
 		return $param."*=UTF-8''".rawurlencode($value);
@@ -1179,23 +1179,23 @@ 
 	$res = "\xFE\xFF";
 	$nb = strlen($s);
 	$i = 0;
-	while($i<$nb)
+	while ($i < $nb)
 	{
 		$c1 = ord($s[$i++]);
-		if($c1>=224)
+		if ($c1 >= 224)
 		{
 			// 3-byte character
 			$c2 = ord($s[$i++]);
 			$c3 = ord($s[$i++]);
-			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
-			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+			$res .= chr((($c1 & 0x0F) << 4) + (($c2 & 0x3C) >> 2));
+			$res .= chr((($c2 & 0x03) << 6) + ($c3 & 0x3F));
 		}
-		elseif($c1>=192)
+		elseif ($c1 >= 192)
 		{
 			// 2-byte character
 			$c2 = ord($s[$i++]);
-			$res .= chr(($c1 & 0x1C)>>2);
-			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+			$res .= chr(($c1 & 0x1C) >> 2);
+			$res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F));
 		}
 		else
 		{
@@ -1209,8 +1209,8 @@ 
 protected function _escape($s)
 {
 	// Escape special characters
-	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
-		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
+	if (strpos($s, '(') !== false || strpos($s, ')') !== false || strpos($s, '\\') !== false || strpos($s, "\r") !== false)
+		return str_replace(array('\\', '(', ')', "\r"), array('\\\\', '\\(', '\\)', '\\r'), $s);
 	else
 		return $s;
 }
@@ -1218,7 +1218,7 @@ 
 protected function _textstring($s)
 {
 	// Format a text string
-	if(!$this->_isascii($s))
+	if (!$this->_isascii($s))
 		$s = $this->_UTF8toUTF16($s);
 	return '('.$this->_escape($s).')';
 }
@@ -1228,21 +1228,21 @@ 
 	// Underline text
 	$up = $this->CurrentFont['up'];
 	$ut = $this->CurrentFont['ut'];
-	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+	$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt, ' ');
+	return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);
 }
 
 protected function _parsejpg($file)
 {
 	// Extract info from a JPEG file
 	$a = getimagesize($file);
-	if(!$a)
+	if (!$a)
 		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
+	if ($a[2] != 2)
 		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
+	if (!isset($a['channels']) || $a['channels'] == 3)
 		$colspace = 'DeviceRGB';
-	elseif($a['channels']==4)
+	elseif ($a['channels'] == 4)
 		$colspace = 'DeviceCMYK';
 	else
 		$colspace = 'DeviceGray';
@@ -1254,10 +1254,10 @@ 
 protected function _parsepng($file)
 {
 	// Extract info from a PNG file
-	$f = fopen($file,'rb');
-	if(!$f)
+	$f = fopen($file, 'rb');
+	if (!$f)
 		$this->Error('Can\'t open image file: '.$file);
-	$info = $this->_parsepngstream($f,$file);
+	$info = $this->_parsepngstream($f, $file);
 	fclose($f);
 	return $info;
 }
@@ -1265,35 +1265,35 @@ 
 protected function _parsepngstream($f, $file)
 {
 	// Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+	if ($this->_readstream($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
 		$this->Error('Not a PNG file: '.$file);
 
 	// Read header chunk
-	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
+	$this->_readstream($f, 4);
+	if ($this->_readstream($f, 4) != 'IHDR')
 		$this->Error('Incorrect PNG file: '.$file);
 	$w = $this->_readint($f);
 	$h = $this->_readint($f);
-	$bpc = ord($this->_readstream($f,1));
-	if($bpc>8)
+	$bpc = ord($this->_readstream($f, 1));
+	if ($bpc > 8)
 		$this->Error('16-bit depth not supported: '.$file);
-	$ct = ord($this->_readstream($f,1));
-	if($ct==0 || $ct==4)
+	$ct = ord($this->_readstream($f, 1));
+	if ($ct == 0 || $ct == 4)
 		$colspace = 'DeviceGray';
-	elseif($ct==2 || $ct==6)
+	elseif ($ct == 2 || $ct == 6)
 		$colspace = 'DeviceRGB';
-	elseif($ct==3)
+	elseif ($ct == 3)
 		$colspace = 'Indexed';
 	else
 		$this->Error('Unknown color type: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
+	if (ord($this->_readstream($f, 1)) != 0)
 		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
+	if (ord($this->_readstream($f, 1)) != 0)
 		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
+	if (ord($this->_readstream($f, 1)) != 0)
 		$this->Error('Interlacing not supported: '.$file);
-	$this->_readstream($f,4);
-	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
+	$this->_readstream($f, 4);
+	$dp = '/Predictor 15 /Colors '.($colspace == 'DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
 
 	// Scan chunks looking for palette, transparency and image data
 	$pal = '';
@@ -1302,86 +1302,86 @@ 
 	do
 	{
 		$n = $this->_readint($f);
-		$type = $this->_readstream($f,4);
-		if($type=='PLTE')
+		$type = $this->_readstream($f, 4);
+		if ($type == 'PLTE')
 		{
 			// Read palette
-			$pal = $this->_readstream($f,$n);
-			$this->_readstream($f,4);
+			$pal = $this->_readstream($f, $n);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='tRNS')
+		elseif ($type == 'tRNS')
 		{
 			// Read transparency info
-			$t = $this->_readstream($f,$n);
-			if($ct==0)
-				$trns = array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			$t = $this->_readstream($f, $n);
+			if ($ct == 0)
+				$trns = array(ord(substr($t, 1, 1)));
+			elseif ($ct == 2)
+				$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
 			else
 			{
-				$pos = strpos($t,chr(0));
-				if($pos!==false)
+				$pos = strpos($t, chr(0));
+				if ($pos !== false)
 					$trns = array($pos);
 			}
-			$this->_readstream($f,4);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='IDAT')
+		elseif ($type == 'IDAT')
 		{
 			// Read image data block
-			$data .= $this->_readstream($f,$n);
-			$this->_readstream($f,4);
+			$data .= $this->_readstream($f, $n);
+			$this->_readstream($f, 4);
 		}
-		elseif($type=='IEND')
+		elseif ($type == 'IEND')
 			break;
 		else
-			$this->_readstream($f,$n+4);
+			$this->_readstream($f, $n + 4);
 	}
-	while($n);
+	while ($n);
 
-	if($colspace=='Indexed' && empty($pal))
+	if ($colspace == 'Indexed' && empty($pal))
 		$this->Error('Missing palette in '.$file);
 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
-	if($ct>=4)
+	if ($ct >= 4)
 	{
 		// Extract alpha channel
-		if(!function_exists('gzuncompress'))
+		if (!function_exists('gzuncompress'))
 			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
 		$data = gzuncompress($data);
 		$color = '';
 		$alpha = '';
-		if($ct==4)
+		if ($ct == 4)
 		{
 			// Gray image
-			$len = 2*$w;
-			for($i=0;$i<$h;$i++)
+			$len = 2 * $w;
+			for ($i = 0; $i < $h; $i++)
 			{
-				$pos = (1+$len)*$i;
+				$pos = (1 + $len) * $i;
 				$color .= $data[$pos];
 				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.)./s','$1',$line);
-				$alpha .= preg_replace('/.(.)/s','$1',$line);
+				$line = substr($data, $pos + 1, $len);
+				$color .= preg_replace('/(.)./s', '$1', $line);
+				$alpha .= preg_replace('/.(.)/s', '$1', $line);
 			}
 		}
 		else
 		{
 			// RGB image
-			$len = 4*$w;
-			for($i=0;$i<$h;$i++)
+			$len = 4 * $w;
+			for ($i = 0; $i < $h; $i++)
 			{
-				$pos = (1+$len)*$i;
+				$pos = (1 + $len) * $i;
 				$color .= $data[$pos];
 				$alpha .= $data[$pos];
-				$line = substr($data,$pos+1,$len);
-				$color .= preg_replace('/(.{3})./s','$1',$line);
-				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);
+				$line = substr($data, $pos + 1, $len);
+				$color .= preg_replace('/(.{3})./s', '$1', $line);
+				$alpha .= preg_replace('/.{3}(.)/s', '$1', $line);
 			}
 		}
 		unset($data);
 		$data = gzcompress($color);
 		$info['smask'] = gzcompress($alpha);
 		$this->WithAlpha = true;
-		if($this->PDFVersion<'1.4')
+		if ($this->PDFVersion < '1.4')
 			$this->PDFVersion = '1.4';
 	}
 	$info['data'] = $data;
@@ -1392,15 +1392,15 @@ 
 {
 	// Read n bytes from stream
 	$res = '';
-	while($n>0 && !feof($f))
+	while ($n > 0 && !feof($f))
 	{
-		$s = fread($f,$n);
-		if($s===false)
+		$s = fread($f, $n);
+		if ($s === false)
 			$this->Error('Error while reading stream');
 		$n -= strlen($s);
 		$res .= $s;
 	}
-	if($n>0)
+	if ($n > 0)
 		$this->Error('Unexpected end of stream');
 	return $res;
 }
@@ -1408,31 +1408,31 @@ 
 protected function _readint($f)
 {
 	// Read a 4-byte integer from stream
-	$a = unpack('Ni',$this->_readstream($f,4));
+	$a = unpack('Ni', $this->_readstream($f, 4));
 	return $a['i'];
 }
 
 protected function _parsegif($file)
 {
 	// Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
+	if (!function_exists('imagepng'))
 		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
+	if (!function_exists('imagecreatefromgif'))
 		$this->Error('GD has no GIF read support');
 	$im = imagecreatefromgif($file);
-	if(!$im)
+	if (!$im)
 		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
+	imageinterlace($im, 0);
 	ob_start();
 	imagepng($im);
 	$data = ob_get_clean();
 	imagedestroy($im);
-	$f = fopen('php://temp','rb+');
-	if(!$f)
+	$f = fopen('php://temp', 'rb+');
+	if (!$f)
 		$this->Error('Unable to create memory stream');
-	fwrite($f,$data);
+	fwrite($f, $data);
 	rewind($f);
-	$info = $this->_parsepngstream($f,$file);
+	$info = $this->_parsepngstream($f, $file);
 	fclose($f);
 	return $info;
 }
@@ -1440,13 +1440,13 @@ 
 protected function _out($s)
 {
 	// Add a line to the document
-	if($this->state==2)
+	if ($this->state == 2)
 		$this->pages[$this->page] .= $s."\n";
-	elseif($this->state==1)
+	elseif ($this->state == 1)
 		$this->_put($s);
-	elseif($this->state==0)
+	elseif ($this->state == 0)
 		$this->Error('No page has been added yet');
-	elseif($this->state==3)
+	elseif ($this->state == 3)
 		$this->Error('The document is closed');
 }
 
@@ -1460,10 +1460,10 @@ 
 	return strlen($this->buffer);
 }
 
-protected function _newobj($n=null)
+protected function _newobj($n = null)
 {
 	// Begin a new object
-	if($n===null)
+	if ($n === null)
 		$n = ++$this->n;
 	$this->offsets[$n] = $this->_getoffset();
 	$this->_put($n.' 0 obj');
@@ -1478,7 +1478,7 @@ 
 
 protected function _putstreamobject($data)
 {
-	if($this->compress)
+	if ($this->compress)
 	{
 		$entries = '/Filter /FlateDecode ';
 		$data = gzcompress($data);
@@ -1497,42 +1497,42 @@ 
 	$this->_newobj();
 	$this->_put('<</Type /Page');
 	$this->_put('/Parent 1 0 R');
-	if(isset($this->PageInfo[$n]['size']))
-		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
-	if(isset($this->PageInfo[$n]['rotation']))
+	if (isset($this->PageInfo[$n]['size']))
+		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageInfo[$n]['size'][0], $this->PageInfo[$n]['size'][1]));
+	if (isset($this->PageInfo[$n]['rotation']))
 		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
 	$this->_put('/Resources 2 0 R');
-	if(!empty($this->PageLinks[$n]))
+	if (!empty($this->PageLinks[$n]))
 	{
 		$s = '/Annots [';
-		foreach($this->PageLinks[$n] as $pl)
+		foreach ($this->PageLinks[$n] as $pl)
 			$s .= $pl[5].' 0 R ';
 		$s .= ']';
 		$this->_put($s);
 	}
-	if($this->WithAlpha)
+	if ($this->WithAlpha)
 		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
-	$this->_put('/Contents '.($this->n+1).' 0 R>>');
+	$this->_put('/Contents '.($this->n + 1).' 0 R>>');
 	$this->_put('endobj');
 	// Page content
-	if(!empty($this->AliasNbPages))
-		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+	if (!empty($this->AliasNbPages))
+		$this->pages[$n] = str_replace($this->AliasNbPages, $this->page, $this->pages[$n]);
 	$this->_putstreamobject($this->pages[$n]);
 	// Annotations
-	foreach($this->PageLinks[$n] as $pl)
+	foreach ($this->PageLinks[$n] as $pl)
 	{
-		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+		$rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
 		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-		if(is_string($pl[4]))
+		if (is_string($pl[4]))
 			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
 		else
 		{
 			$l = $this->links[$pl[4]];
-			if(isset($this->PageInfo[$l[0]]['size']))
+			if (isset($this->PageInfo[$l[0]]['size']))
 				$h = $this->PageInfo[$l[0]]['size'][1];
 			else
-				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
-			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
+				$h = ($this->DefOrientation == 'P') ? $this->DefPageSize[1] * $this->k : $this->DefPageSize[0] * $this->k;
+			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', $this->PageInfo[$l[0]]['n'], $h - $l[1] * $this->k);
 		}
 		$this->_newobj();
 		$this->_put($s);
@@ -1544,26 +1544,26 @@ 
 {
 	$nb = $this->page;
 	$n = $this->n;
-	for($i=1;$i<=$nb;$i++)
+	for ($i = 1; $i <= $nb; $i++)
 	{
 		$this->PageInfo[$i]['n'] = ++$n;
 		$n++;
-		foreach($this->PageLinks[$i] as &$pl)
+		foreach ($this->PageLinks[$i] as &$pl)
 			$pl[5] = ++$n;
 		unset($pl);
 	}
-	for($i=1;$i<=$nb;$i++)
+	for ($i = 1; $i <= $nb; $i++)
 		$this->_putpage($i);
 	// Pages root
 	$this->_newobj(1);
 	$this->_put('<</Type /Pages');
 	$kids = '/Kids [';
-	for($i=1;$i<=$nb;$i++)
+	for ($i = 1; $i <= $nb; $i++)
 		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
 	$kids .= ']';
 	$this->_put($kids);
 	$this->_put('/Count '.$nb);
-	if($this->DefOrientation=='P')
+	if ($this->DefOrientation == 'P')
 	{
 		$w = $this->DefPageSize[0];
 		$h = $this->DefPageSize[1];
@@ -1573,40 +1573,40 @@ 
 		$w = $this->DefPageSize[1];
 		$h = $this->DefPageSize[0];
 	}
-	$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$w*$this->k,$h*$this->k));
+	$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]', $w * $this->k, $h * $this->k));
 	$this->_put('>>');
 	$this->_put('endobj');
 }
 
 protected function _putfonts()
 {
-	foreach($this->FontFiles as $file=>$info)
+	foreach ($this->FontFiles as $file=>$info)
 	{
 		// Font file embedding
 		$this->_newobj();
 		$this->FontFiles[$file]['n'] = $this->n;
-		$font = file_get_contents($this->fontpath.$file,true);
-		if(!$font)
+		$font = file_get_contents($this->fontpath.$file, true);
+		if (!$font)
 			$this->Error('Font file not found: '.$file);
-		$compressed = (substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+		$compressed = (substr($file, -2) == '.z');
+		if (!$compressed && isset($info['length2']))
+			$font = substr($font, 6, $info['length1']).substr($font, 6 + $info['length1'] + 6, $info['length2']);
 		$this->_put('<</Length '.strlen($font));
-		if($compressed)
+		if ($compressed)
 			$this->_put('/Filter /FlateDecode');
 		$this->_put('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
+		if (isset($info['length2']))
 			$this->_put('/Length2 '.$info['length2'].' /Length3 0');
 		$this->_put('>>');
 		$this->_putstream($font);
 		$this->_put('endobj');
 	}
-	foreach($this->fonts as $k=>$font)
+	foreach ($this->fonts as $k=>$font)
 	{
 		// Encoding
-		if(isset($font['diff']))
+		if (isset($font['diff']))
 		{
-			if(!isset($this->encodings[$font['enc']]))
+			if (!isset($this->encodings[$font['enc']]))
 			{
 				$this->_newobj();
 				$this->_put('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$font['diff'].']>>');
@@ -1615,13 +1615,13 @@ 
 			}
 		}
 		// ToUnicode CMap
-		if(isset($font['uv']))
+		if (isset($font['uv']))
 		{
-			if(isset($font['enc']))
+			if (isset($font['enc']))
 				$cmapkey = $font['enc'];
 			else
 				$cmapkey = $font['name'];
-			if(!isset($this->cmaps[$cmapkey]))
+			if (!isset($this->cmaps[$cmapkey]))
 			{
 				$cmap = $this->_tounicodecmap($font['uv']);
 				$this->_putstreamobject($cmap);
@@ -1629,26 +1629,26 @@ 
 			}
 		}
 		// Font object
-		$this->fonts[$k]['n'] = $this->n+1;
+		$this->fonts[$k]['n'] = $this->n + 1;
 		$type = $font['type'];
 		$name = $font['name'];
-		if($font['subsetted'])
+		if ($font['subsetted'])
 			$name = 'AAAAAA+'.$name;
-		if($type=='Core')
+		if ($type == 'Core')
 		{
 			// Core font
 			$this->_newobj();
 			$this->_put('<</Type /Font');
 			$this->_put('/BaseFont /'.$name);
 			$this->_put('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
+			if ($name != 'Symbol' && $name != 'ZapfDingbats')
 				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
+			if (isset($font['uv']))
 				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
 			$this->_put('>>');
 			$this->_put('endobj');
 		}
-		elseif($type=='Type1' || $type=='TrueType')
+		elseif ($type == 'Type1' || $type == 'TrueType')
 		{
 			// Additional Type1 or TrueType/OpenType font
 			$this->_newobj();
@@ -1656,13 +1656,13 @@ 
 			$this->_put('/BaseFont /'.$name);
 			$this->_put('/Subtype /'.$type);
 			$this->_put('/FirstChar 32 /LastChar 255');
-			$this->_put('/Widths '.($this->n+1).' 0 R');
-			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
-			if(isset($font['diff']))
+			$this->_put('/Widths '.($this->n + 1).' 0 R');
+			$this->_put('/FontDescriptor '.($this->n + 2).' 0 R');
+			if (isset($font['diff']))
 				$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
 			else
 				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
+			if (isset($font['uv']))
 				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
 			$this->_put('>>');
 			$this->_put('endobj');
@@ -1670,17 +1670,17 @@ 
 			$this->_newobj();
 			$cw = &$font['cw'];
 			$s = '[';
-			for($i=32;$i<=255;$i++)
+			for ($i = 32; $i <= 255; $i++)
 				$s .= $cw[chr($i)].' ';
 			$this->_put($s.']');
 			$this->_put('endobj');
 			// Descriptor
 			$this->_newobj();
 			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
+			foreach ($font['desc'] as $k=>$v)
 				$s .= ' /'.$k.' '.$v;
-			if(!empty($font['file']))
-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+			if (!empty($font['file']))
+				$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
 			$this->_put($s.'>>');
 			$this->_put('endobj');
 		}
@@ -1688,7 +1688,7 @@ 
 		{
 			// Allow for additional types
 			$mtd = '_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
+			if (!method_exists($this, $mtd))
 				$this->Error('Unsupported font type: '.$type);
 			$this->$mtd($font);
 		}
@@ -1701,16 +1701,16 @@ 
 	$nbr = 0;
 	$chars = '';
 	$nbc = 0;
-	foreach($uv as $c=>$v)
+	foreach ($uv as $c=>$v)
 	{
-		if(is_array($v))
+		if (is_array($v))
 		{
-			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
+			$ranges .= sprintf("<%02X> <%02X> <%04X>\n", $c, $c + $v[1] - 1, $v[0]);
 			$nbr++;
 		}
 		else
 		{
-			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
+			$chars .= sprintf("<%02X> <%04X>\n", $c, $v);
 			$nbc++;
 		}
 	}
@@ -1727,13 +1727,13 @@ 
 	$s .= "1 begincodespacerange\n";
 	$s .= "<00> <FF>\n";
 	$s .= "endcodespacerange\n";
-	if($nbr>0)
+	if ($nbr > 0)
 	{
 		$s .= "$nbr beginbfrange\n";
 		$s .= $ranges;
 		$s .= "endbfrange\n";
 	}
-	if($nbc>0)
+	if ($nbc > 0)
 	{
 		$s .= "$nbc beginbfchar\n";
 		$s .= $chars;
@@ -1748,7 +1748,7 @@ 
 
 protected function _putimages()
 {
-	foreach(array_keys($this->images) as $file)
+	foreach (array_keys($this->images) as $file)
 	{
 		$this->_putimage($this->images[$file]);
 		unset($this->images[$file]['data']);
@@ -1764,46 +1764,46 @@ 
 	$this->_put('/Subtype /Image');
 	$this->_put('/Width '.$info['w']);
 	$this->_put('/Height '.$info['h']);
-	if($info['cs']=='Indexed')
-		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+	if ($info['cs'] == 'Indexed')
+		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');
 	else
 	{
 		$this->_put('/ColorSpace /'.$info['cs']);
-		if($info['cs']=='DeviceCMYK')
+		if ($info['cs'] == 'DeviceCMYK')
 			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
 	}
 	$this->_put('/BitsPerComponent '.$info['bpc']);
-	if(isset($info['f']))
+	if (isset($info['f']))
 		$this->_put('/Filter /'.$info['f']);
-	if(isset($info['dp']))
+	if (isset($info['dp']))
 		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
-	if(isset($info['trns']) && is_array($info['trns']))
+	if (isset($info['trns']) && is_array($info['trns']))
 	{
 		$trns = '';
-		for($i=0;$i<count($info['trns']);$i++)
+		for ($i = 0; $i < count($info['trns']); $i++)
 			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
 		$this->_put('/Mask ['.$trns.']');
 	}
-	if(isset($info['smask']))
-		$this->_put('/SMask '.($this->n+1).' 0 R');
+	if (isset($info['smask']))
+		$this->_put('/SMask '.($this->n + 1).' 0 R');
 	$this->_put('/Length '.strlen($info['data']).'>>');
 	$this->_putstream($info['data']);
 	$this->_put('endobj');
 	// Soft mask
-	if(isset($info['smask']))
+	if (isset($info['smask']))
 	{
 		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];
 		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);
 		$this->_putimage($smask);
 	}
 	// Palette
-	if($info['cs']=='Indexed')
+	if ($info['cs'] == 'Indexed')
 		$this->_putstreamobject($info['pal']);
 }
 
 protected function _putxobjectdict()
 {
-	foreach($this->images as $image)
+	foreach ($this->images as $image)
 		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
 }
 
@@ -1811,7 +1811,7 @@ 
 {
 	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 	$this->_put('/Font <<');
-	foreach($this->fonts as $font)
+	foreach ($this->fonts as $font)
 		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
 	$this->_put('>>');
 	$this->_put('/XObject <<');
@@ -1835,7 +1835,7 @@ 
 {
 	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
 	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
-	foreach($this->metadata as $key=>$value)
+	foreach ($this->metadata as $key=>$value)
 		$this->_put('/'.$key.' '.$this->_textstring($value));
 }
 
@@ -1844,19 +1844,19 @@ 
 	$n = $this->PageInfo[1]['n'];
 	$this->_put('/Type /Catalog');
 	$this->_put('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
+	if ($this->ZoomMode == 'fullpage')
 		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
+	elseif ($this->ZoomMode == 'fullwidth')
 		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
+	elseif ($this->ZoomMode == 'real')
 		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
+	elseif (!is_string($this->ZoomMode))
+		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F', $this->ZoomMode / 100).']');
+	if ($this->LayoutMode == 'single')
 		$this->_put('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
+	elseif ($this->LayoutMode == 'continuous')
 		$this->_put('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
+	elseif ($this->LayoutMode == 'two')
 		$this->_put('/PageLayout /TwoColumnLeft');
 }
 
@@ -1867,9 +1867,9 @@ 
 
 protected function _puttrailer()
 {
-	$this->_put('/Size '.($this->n+1));
+	$this->_put('/Size '.($this->n + 1));
 	$this->_put('/Root '.$this->n.' 0 R');
-	$this->_put('/Info '.($this->n-1).' 0 R');
+	$this->_put('/Info '.($this->n - 1).' 0 R');
 }
 
 protected function _enddoc()
@@ -1892,10 +1892,10 @@ 
 	// Cross-ref
 	$offset = $this->_getoffset();
 	$this->_put('xref');
-	$this->_put('0 '.($this->n+1));
+	$this->_put('0 '.($this->n + 1));
 	$this->_put('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	for ($i = 1; $i <= $this->n; $i++)
+		$this->_put(sprintf('%010d 00000 n ', $this->offsets[$i]));
 	// Trailer
 	$this->_put('trailer');
 	$this->_put('<<');

Braces +640 added lines, -494 removed lines

@@ -105,26 +105,28 @@ 
 	if(defined('FPDF_FONTPATH'))
 	{
 		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
-			$this->fontpath .= '/';
+		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\') {
+					$this->fontpath .= '/';
+		}
+	} elseif(is_dir(dirname(__FILE__).'/font')) {
+			$this->fontpath = dirname(__FILE__).'/font/';
+	} else {
+			$this->fontpath = '';
 	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
-		$this->fontpath = dirname(__FILE__).'/font/';
-	else
-		$this->fontpath = '';
 	// Core fonts
 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats','verdana','calligra','Arimo-Regular');
 	// Scale factor
-	if($unit=='pt')
-		$this->k = 1;
-	elseif($unit=='mm')
-		$this->k = 72/25.4;
-	elseif($unit=='cm')
-		$this->k = 72/2.54;
-	elseif($unit=='in')
-		$this->k = 72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
+	if($unit=='pt') {
+			$this->k = 1;
+	} elseif($unit=='mm') {
+			$this->k = 72/25.4;
+	} elseif($unit=='cm') {
+			$this->k = 72/2.54;
+	} elseif($unit=='in') {
+			$this->k = 72;
+	} else {
+			$this->Error('Incorrect unit: '.$unit);
+	}
 	// Page sizes
 	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
 		'letter'=>array(612,792), 'legal'=>array(612,1008));
@@ -138,15 +140,14 @@ 
 		$this->DefOrientation = 'P';
 		$this->w = $size[0];
 		$this->h = $size[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
+	} elseif($orientation=='l' || $orientation=='landscape')
 	{
 		$this->DefOrientation = 'L';
 		$this->w = $size[1];
 		$this->h = $size[0];
+	} else {
+			$this->Error('Incorrect orientation: '.$orientation);
 	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
 	$this->CurOrientation = $this->DefOrientation;
 	$this->wPt = $this->w*$this->k;
 	$this->hPt = $this->h*$this->k;
@@ -174,8 +175,9 @@ 
 	// Set left, top and right margins
 	$this->lMargin = $left;
 	$this->tMargin = $top;
-	if($right===null)
-		$right = $left;
+	if($right===null) {
+			$right = $left;
+	}
 	$this->rMargin = $right;
 }
 
@@ -183,9 +185,10 @@ 
 {
 	// Set left margin
 	$this->lMargin = $margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x = $margin;
-}
+	if($this->page>0 && $this->x<$margin) {
+			$this->x = $margin;
+	}
+	}
 
 function SetTopMargin($margin)
 {
@@ -210,24 +213,27 @@ 
 function SetDisplayMode($zoom, $layout='default')
 {
 	// Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode = $zoom;
-	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode = $layout;
-	else
-		$this->Error('Incorrect layout display mode: '.$layout);
-}
+	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {
+			$this->ZoomMode = $zoom;
+	} else {
+			$this->Error('Incorrect zoom display mode: '.$zoom);
+	}
+	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {
+			$this->LayoutMode = $layout;
+	} else {
+			$this->Error('Incorrect layout display mode: '.$layout);
+	}
+	}
 
 function SetCompression($compress)
 {
 	// Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress = $compress;
-	else
-		$this->compress = false;
-}
+	if(function_exists('gzcompress')) {
+			$this->compress = $compress;
+	} else {
+			$this->compress = false;
+	}
+	}
 
 function SetTitle($title, $isUTF8=false)
 {
@@ -274,10 +280,12 @@ 
 function Close()
 {
 	// Terminate document
-	if($this->state==3)
-		return;
-	if($this->page==0)
-		$this->AddPage();
+	if($this->state==3) {
+			return;
+	}
+	if($this->page==0) {
+			$this->AddPage();
+	}
 	// Page footer
 	$this->InFooter = true;
 	$this->Footer();
@@ -291,8 +299,9 @@ 
 function AddPage($orientation='', $size='', $rotation=0)
 {
 	// Start a new page
-	if($this->state==3)
-		$this->Error('The document is closed');
+	if($this->state==3) {
+			$this->Error('The document is closed');
+	}
 	$family = $this->FontFamily;
 	$style = $this->FontStyle.($this->underline ? 'U' : '');
 	$fontsize = $this->FontSizePt;
@@ -318,15 +327,18 @@ 
 	$this->LineWidth = $lw;
 	$this->_out(sprintf('%.2F w',$lw*$this->k));
 	// Set font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if($family) {
+			$this->SetFont($family,$style,$fontsize);
+	}
 	// Set colors
 	$this->DrawColor = $dc;
-	if($dc!='0 G')
-		$this->_out($dc);
+	if($dc!='0 G') {
+			$this->_out($dc);
+	}
 	$this->FillColor = $fc;
-	if($fc!='0 g')
-		$this->_out($fc);
+	if($fc!='0 g') {
+			$this->_out($fc);
+	}
 	$this->TextColor = $tc;
 	$this->ColorFlag = $cf;
 	// Page header
@@ -340,8 +352,9 @@ 
 		$this->_out(sprintf('%.2F w',$lw*$this->k));
 	}
 	// Restore font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if($family) {
+			$this->SetFont($family,$style,$fontsize);
+	}
 	// Restore colors
 	if($this->DrawColor!=$dc)
 	{
@@ -376,33 +389,38 @@ 
 function SetDrawColor($r, $g=null, $b=null)
 {
 	// Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor = sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
-}
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->DrawColor = sprintf('%.3F G',$r/255);
+	} else {
+			$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+	}
+	if($this->page>0) {
+			$this->_out($this->DrawColor);
+	}
+	}
 
 function SetFillColor($r, $g=null, $b=null)
 {
 	// Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor = sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->FillColor = sprintf('%.3F g',$r/255);
+	} else {
+			$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
-}
+	if($this->page>0) {
+			$this->_out($this->FillColor);
+	}
+	}
 
 function SetTextColor($r, $g=null, $b=null)
 {
 	// Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor = sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->TextColor = sprintf('%.3F g',$r/255);
+	} else {
+			$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
 }
 
@@ -413,8 +431,9 @@ 
 	$cw = &$this->CurrentFont['cw'];
 	$w = 0;
 	$l = strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w += $cw[$s[$i]];
+	for($i=0;$i<$l;$i++) {
+			$w += $cw[$s[$i]];
+	}
 	return $w*$this->FontSize/1000;
 }
 
@@ -422,9 +441,10 @@ 
 {
 	// Set line width
 	$this->LineWidth = $width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('%.2F w',$width*$this->k));
+	}
+	}
 
 function Line($x1, $y1, $x2, $y2)
 {
@@ -435,12 +455,13 @@ 
 function Rect($x, $y, $w, $h, $style='')
 {
 	// Draw a rectangle
-	if($style=='F')
-		$op = 'f';
-	elseif($style=='FD' || $style=='DF')
-		$op = 'B';
-	else
-		$op = 'S';
+	if($style=='F') {
+			$op = 'f';
+	} elseif($style=='FD' || $style=='DF') {
+			$op = 'B';
+	} else {
+			$op = 'S';
+	}
 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
 }
 
@@ -448,23 +469,27 @@ 
 {
 	// Add a TrueType, OpenType or Type1 font
 	$family = strtolower($family);
-	if($file=='')
-		$file = str_replace(' ','',$family).strtolower($style).'.php';
+	if($file=='') {
+			$file = str_replace(' ','',$family).strtolower($style).'.php';
+	}
 	$style = strtoupper($style);
-	if($style=='IB')
-		$style = 'BI';
+	if($style=='IB') {
+			$style = 'BI';
+	}
 	$fontkey = $family.$style;
-	if(isset($this->fonts[$fontkey]))
-		return;
+	if(isset($this->fonts[$fontkey])) {
+			return;
+	}
 	$info = $this->_loadfont($file);
 	$info['i'] = count($this->fonts)+1;
 	if(!empty($info['file']))
 	{
 		// Embedded font
-		if($info['type']=='TrueType')
-			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
-		else
-			$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
+		if($info['type']=='TrueType') {
+					$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
+		} else {
+					$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
+		}
 	}
 	$this->fonts[$fontkey] = $info;
 }
@@ -472,42 +497,49 @@ 
 function SetFont($family, $style='', $size=0)
 {
 	// Select a font; size given in points
-	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);
+	} else {
+			$this->underline = false;
+	}
+	if($style=='IB') {
+			$style = 'BI';
+	}
+	if($size==0) {
+			$size = $this->FontSizePt;
 	}
-	else
-		$this->underline = false;
-	if($style=='IB')
-		$style = 'BI';
-	if($size==0)
-		$size = $this->FontSizePt;
 	// Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
-		return;
+	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
+			return;
+	}
 	// Test if font is already loaded
 	$fontkey = $family.$style;
 	if(!isset($this->fonts[$fontkey]))
 	{
 		// Test if one of the core fonts
-		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);
 	}
 	// Select it
 	$this->FontFamily = $family;
@@ -515,20 +547,23 @@ 
 	$this->FontSizePt = $size;
 	$this->FontSize = $size/$this->k;
 	$this->CurrentFont = &$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	}
+	}
 
 function SetFontSize($size)
 {
 	// Set font size in points
-	if($this->FontSizePt==$size)
-		return;
+	if($this->FontSizePt==$size) {
+			return;
+	}
 	$this->FontSizePt = $size;
 	$this->FontSize = $size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
+	if($this->page>0) {
+			$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+	}
+	}
 
 function AddLink()
 {
@@ -541,10 +576,12 @@ 
 function SetLink($link, $y=0, $page=-1)
 {
 	// Set destination of internal link
-	if($y==-1)
-		$y = $this->y;
-	if($page==-1)
-		$page = $this->page;
+	if($y==-1) {
+			$y = $this->y;
+	}
+	if($page==-1) {
+			$page = $this->page;
+	}
 	$this->links[$link] = array($page, $y);
 }
 
@@ -557,13 +594,16 @@ 
 function Text($x, $y, $txt)
 {
 	// Output a string
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
+	if(!isset($this->CurrentFont)) {
+			$this->Error('No font has been set');
+	}
 	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s .= ' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s = 'q '.$this->TextColor.' '.$s.' Q';
+	if($this->underline && $txt!='') {
+			$s .= ' '.$this->_dounderline($x,$y,$txt);
+	}
+	if($this->ColorFlag) {
+			$s = 'q '.$this->TextColor.' '.$s.' Q';
+	}
 	$this->_out($s);
 }
 
@@ -595,77 +635,94 @@ 
 			$this->_out(sprintf('%.3F Tw',$ws*$k));
 		}
 	}
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
+	if($w==0) {
+			$w = $this->w-$this->rMargin-$this->x;
+	}
 	$s = '';
 	if($fill || $border==1)
 	{
-		if($fill)
-			$op = ($border==1) ? 'B' : 'f';
-		else
-			$op = 'S';
+		if($fill) {
+					$op = ($border==1) ? 'B' : 'f';
+		} else {
+					$op = 'S';
+		}
 		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
 	}
 	if(is_string($border))
 	{
 		$x = $this->x;
 		$y = $this->y;
-		if(strpos($border,'L')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		if(strpos($border,'L')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'T')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+		}
+		if(strpos($border,'R')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'B')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
 	}
 	if($txt!=='')
 	{
-		if(!isset($this->CurrentFont))
-			$this->Error('No font has been set');
-		if($align=='R')
-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx = ($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx = $this->cMargin;
-		if($this->ColorFlag)
-			$s .= 'q '.$this->TextColor.' ';
+		if(!isset($this->CurrentFont)) {
+					$this->Error('No font has been set');
+		}
+		if($align=='R') {
+					$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
+		} elseif($align=='C') {
+					$dx = ($w-$this->GetStringWidth($txt))/2;
+		} else {
+					$dx = $this->cMargin;
+		}
+		if($this->ColorFlag) {
+					$s .= 'q '.$this->TextColor.' ';
+		}
 		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
-		if($this->underline)
-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s .= ' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
+		if($this->underline) {
+					$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+		}
+		if($this->ColorFlag) {
+					$s .= ' Q';
+		}
+		if($link) {
+					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+		}
+	}
+	if($s) {
+			$this->_out($s);
+	}
 	$this->lasth = $h;
 	if($ln>0)
 	{
 		// Go to next line
 		$this->y += $h;
-		if($ln==1)
-			$this->x = $this->lMargin;
+		if($ln==1) {
+					$this->x = $this->lMargin;
+		}
+	} else {
+			$this->x += $w;
+	}
 	}
-	else
-		$this->x += $w;
-}
 
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
 	// Output text with automatic or explicit line breaks
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
+	if(!isset($this->CurrentFont)) {
+			$this->Error('No font has been set');
+	}
 	$cw = &$this->CurrentFont['cw'];
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
+	if($w==0) {
+			$w = $this->w-$this->rMargin-$this->x;
+	}
 	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
 	$s = str_replace("\r",'',$txt);
 	$nb = strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
-		$nb--;
+	if($nb>0 && $s[$nb-1]=="\n") {
+			$nb--;
+	}
 	$b = 0;
 	if($border)
 	{
@@ -674,14 +731,15 @@ 
 			$border = 'LTRB';
 			$b = 'LRT';
 			$b2 = 'LR';
-		}
-		else
+		} else
 		{
 			$b2 = '';
-			if(strpos($border,'L')!==false)
-				$b2 .= 'L';
-			if(strpos($border,'R')!==false)
-				$b2 .= 'R';
+			if(strpos($border,'L')!==false) {
+							$b2 .= 'L';
+			}
+			if(strpos($border,'R')!==false) {
+							$b2 .= 'R';
+			}
 			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;
 		}
 	}
@@ -710,8 +768,9 @@ 
 			$l = 0;
 			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
+			if($border && $nl==2) {
+							$b = $b2;
+			}
 			continue;
 		}
 		if($c==' ')
@@ -726,16 +785,16 @@ 
 			// Automatic line break
 			if($sep==-1)
 			{
-				if($i==$j)
-					$i++;
+				if($i==$j) {
+									$i++;
+				}
 				if($this->ws>0)
 				{
 					$this->ws = 0;
 					$this->_out('0 Tw');
 				}
 				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			}
-			else
+			} else
 			{
 				if($align=='J')
 				{
@@ -750,11 +809,12 @@ 
 			$l = 0;
 			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
+			if($border && $nl==2) {
+							$b = $b2;
+			}
+		} else {
+					$i++;
 		}
-		else
-			$i++;
 	}
 	// Last chunk
 	if($this->ws>0)
@@ -762,8 +822,9 @@ 
 		$this->ws = 0;
 		$this->_out('0 Tw');
 	}
-	if($border && strpos($border,'B')!==false)
-		$b .= 'B';
+	if($border && strpos($border,'B')!==false) {
+			$b .= 'B';
+	}
 	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
 	$this->x = $this->lMargin;
 }
@@ -771,8 +832,9 @@ 
 function Write($h, $txt, $link='')
 {
 	// Output text in flowing mode
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
+	if(!isset($this->CurrentFont)) {
+			$this->Error('No font has been set');
+	}
 	$cw = &$this->CurrentFont['cw'];
 	$w = $this->w-$this->rMargin-$this->x;
 	$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
@@ -804,8 +866,9 @@ 
 			$nl++;
 			continue;
 		}
-		if($c==' ')
-			$sep = $i;
+		if($c==' ') {
+					$sep = $i;
+		}
 		$l += $cw[$c];
 		if($l>$wmax)
 		{
@@ -823,11 +886,11 @@ 
 					$nl++;
 					continue;
 				}
-				if($i==$j)
-					$i++;
+				if($i==$j) {
+									$i++;
+				}
 				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);
-			}
-			else
+			} else
 			{
 				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);
 				$i = $sep+1;
@@ -842,52 +905,58 @@ 
 				$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;
 			}
 			$nl++;
+		} else {
+					$i++;
 		}
-		else
-			$i++;
 	}
 	// Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
-}
+	if($i!=$j) {
+			$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);
+	}
+	}
 
 function Ln($h=null)
 {
 	// Line feed; default value is the last cell height
 	$this->x = $this->lMargin;
-	if($h===null)
-		$this->y += $this->lasth;
-	else
-		$this->y += $h;
-}
+	if($h===null) {
+			$this->y += $this->lasth;
+	} else {
+			$this->y += $h;
+	}
+	}
 
 function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
 	// Put an image on the page
-	if($file=='')
-		$this->Error('Image file name is empty');
+	if($file=='') {
+			$this->Error('Image file name is empty');
+	}
 	if(!isset($this->images[$file]))
 	{
 		// First use of this image, get info
 		if($type=='')
 		{
 			$pos = strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
+			if(!$pos) {
+							$this->Error('Image file has no extension and no type was specified: '.$file);
+			}
 			$type = substr($file,$pos+1);
 		}
 		$type = strtolower($type);
-		if($type=='jpeg')
-			$type = 'jpg';
+		if($type=='jpeg') {
+					$type = 'jpg';
+		}
 		$mtd = '_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
+		if(!method_exists($this,$mtd)) {
+					$this->Error('Unsupported image type: '.$type);
+		}
 		$info = $this->$mtd($file);
 		$info['i'] = count($this->images)+1;
 		$this->images[$file] = $info;
+	} else {
+			$info = $this->images[$file];
 	}
-	else
-		$info = $this->images[$file];
 
 	// Automatic width and height calculation if needed
 	if($w==0 && $h==0)
@@ -896,14 +965,18 @@ 
 		$w = -96;
 		$h = -96;
 	}
-	if($w<0)
-		$w = -$info['w']*72/$w/$this->k;
-	if($h<0)
-		$h = -$info['h']*72/$h/$this->k;
-	if($w==0)
-		$w = $h*$info['w']/$info['h'];
-	if($h==0)
-		$h = $w*$info['h']/$info['w'];
+	if($w<0) {
+			$w = -$info['w']*72/$w/$this->k;
+	}
+	if($h<0) {
+			$h = -$info['h']*72/$h/$this->k;
+	}
+	if($w==0) {
+			$w = $h*$info['w']/$info['h'];
+	}
+	if($h==0) {
+			$h = $w*$info['h']/$info['w'];
+	}
 
 	// Flowing mode
 	if($y===null)
@@ -919,12 +992,14 @@ 
 		$this->y += $h;
 	}
 
-	if($x===null)
-		$x = $this->x;
+	if($x===null) {
+			$x = $this->x;
+	}
 	$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']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
-}
+	if($link) {
+			$this->Link($x,$y,$w,$h,$link);
+	}
+	}
 
 function GetPageWidth()
 {
@@ -947,11 +1022,12 @@ 
 function SetX($x)
 {
 	// Set x position
-	if($x>=0)
-		$this->x = $x;
-	else
-		$this->x = $this->w+$x;
-}
+	if($x>=0) {
+			$this->x = $x;
+	} else {
+			$this->x = $this->w+$x;
+	}
+	}
 
 function GetY()
 {
@@ -962,13 +1038,15 @@ 
 function SetY($y, $resetX=true)
 {
 	// Set y position and optionally reset x
-	if($y>=0)
-		$this->y = $y;
-	else
-		$this->y = $this->h+$y;
-	if($resetX)
-		$this->x = $this->lMargin;
-}
+	if($y>=0) {
+			$this->y = $y;
+	} else {
+			$this->y = $this->h+$y;
+	}
+	if($resetX) {
+			$this->x = $this->lMargin;
+	}
+	}
 
 function SetXY($x, $y)
 {
@@ -988,10 +1066,12 @@ 
 		$dest = $name;
 		$name = $tmp;
 	}
-	if($dest=='')
-		$dest = 'I';
-	if($name=='')
-		$name = 'doc.pdf';
+	if($dest=='') {
+			$dest = 'I';
+	}
+	if($name=='') {
+			$name = 'doc.pdf';
+	}
 	switch(strtoupper($dest))
 	{
 		case 'I':
@@ -1018,8 +1098,9 @@ 
 			break;
 		case 'F':
 			// Save to local file
-			if(!file_put_contents($name,$this->buffer))
-				$this->Error('Unable to create output file: '.$name);
+			if(!file_put_contents($name,$this->buffer)) {
+							$this->Error('Unable to create output file: '.$name);
+			}
 			break;
 		case 'S':
 			// Return as a string
@@ -1037,16 +1118,18 @@ 
 protected function _dochecks()
 {
 	// Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
-}
+	if(ini_get('mbstring.func_overload') & 2) {
+			$this->Error('mbstring overloading must be disabled');
+	}
+	}
 
 protected function _checkoutput()
 {
 	if(PHP_SAPI!='cli')
 	{
-		if(headers_sent($file,$line))
-			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+		if(headers_sent($file,$line)) {
+					$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+		}
 	}
 	if(ob_get_length())
 	{
@@ -1055,9 +1138,9 @@ 
 		{
 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
 			ob_clean();
+		} else {
+					$this->Error("Some data has already been output, can't send PDF file");
 		}
-		else
-			$this->Error("Some data has already been output, can't send PDF file");
 	}
 }
 
@@ -1066,17 +1149,18 @@ 
 	if(is_string($size))
 	{
 		$size = strtolower($size);
-		if(!isset($this->StdPageSizes[$size]))
-			$this->Error('Unknown page size: '.$size);
+		if(!isset($this->StdPageSizes[$size])) {
+					$this->Error('Unknown page size: '.$size);
+		}
 		$a = $this->StdPageSizes[$size];
 		return array($a[0]/$this->k, $a[1]/$this->k);
-	}
-	else
+	} else
 	{
-		if($size[0]>$size[1])
-			return array($size[1], $size[0]);
-		else
-			return $size;
+		if($size[0]>$size[1]) {
+					return array($size[1], $size[0]);
+		} else {
+					return $size;
+		}
 	}
 }
 
@@ -1090,14 +1174,16 @@ 
 	$this->y = $this->tMargin;
 	$this->FontFamily = '';
 	// Check page size and orientation
-	if($orientation=='')
-		$orientation = $this->DefOrientation;
-	else
-		$orientation = strtoupper($orientation[0]);
-	if($size=='')
-		$size = $this->DefPageSize;
-	else
-		$size = $this->_getpagesize($size);
+	if($orientation=='') {
+			$orientation = $this->DefOrientation;
+	} else {
+			$orientation = strtoupper($orientation[0]);
+	}
+	if($size=='') {
+			$size = $this->DefPageSize;
+	} else {
+			$size = $this->_getpagesize($size);
+	}
 	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
 	{
 		// New size or orientation
@@ -1105,8 +1191,7 @@ 
 		{
 			$this->w = $size[0];
 			$this->h = $size[1];
-		}
-		else
+		} else
 		{
 			$this->w = $size[1];
 			$this->h = $size[0];
@@ -1117,12 +1202,14 @@ 
 		$this->CurOrientation = $orientation;
 		$this->CurPageSize = $size;
 	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
-		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
+	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1]) {
+			$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
+	}
 	if($rotation!=0)
 	{
-		if($rotation%90!=0)
-			$this->Error('Incorrect rotation value: '.$rotation);
+		if($rotation%90!=0) {
+					$this->Error('Incorrect rotation value: '.$rotation);
+		}
 		$this->CurRotation = $rotation;
 		$this->PageInfo[$this->page]['rotation'] = $rotation;
 	}
@@ -1136,15 +1223,19 @@ 
 protected function _loadfont($font)
 {
 	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
-		$this->Error('Incorrect font definition file name: '.$font);
+	if(strpos($font,'/')!==false || strpos($font,"\\")!==false) {
+			$this->Error('Incorrect font definition file name: '.$font);
+	}
 	include($this->fontpath.$font);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
-	if(isset($enc))
-		$enc = strtolower($enc);
-	if(!isset($subsetted))
-		$subsetted = false;
+	if(!isset($name)) {
+			$this->Error('Could not include font definition file');
+	}
+	if(isset($enc)) {
+			$enc = strtolower($enc);
+	}
+	if(!isset($subsetted)) {
+			$subsetted = false;
+	}
 	return get_defined_vars();
 }
 
@@ -1154,8 +1245,9 @@ 
 	$nb = strlen($s);
 	for($i=0;$i<$nb;$i++)
 	{
-		if(ord($s[$i])>127)
-			return false;
+		if(ord($s[$i])>127) {
+					return false;
+		}
 	}
 	return true;
 }
@@ -1163,15 +1255,18 @@ 
 protected function _httpencode($param, $value, $isUTF8)
 {
 	// Encode HTTP header field parameter
-	if($this->_isascii($value))
-		return $param.'="'.$value.'"';
-	if(!$isUTF8)
-		$value = utf8_encode($value);
-	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
-		return $param.'="'.rawurlencode($value).'"';
-	else
-		return $param."*=UTF-8''".rawurlencode($value);
-}
+	if($this->_isascii($value)) {
+			return $param.'="'.$value.'"';
+	}
+	if(!$isUTF8) {
+			$value = utf8_encode($value);
+	}
+	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false) {
+			return $param.'="'.rawurlencode($value).'"';
+	} else {
+			return $param."*=UTF-8''".rawurlencode($value);
+	}
+	}
 
 protected function _UTF8toUTF16($s)
 {
@@ -1189,15 +1284,13 @@ 
 			$c3 = ord($s[$i++]);
 			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
 			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
+		} elseif($c1>=192)
 		{
 			// 2-byte character
 			$c2 = ord($s[$i++]);
 			$res .= chr(($c1 & 0x1C)>>2);
 			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
+		} else
 		{
 			// Single-byte character
 			$res .= "\0".chr($c1);
@@ -1209,17 +1302,19 @@ 
 protected function _escape($s)
 {
 	// Escape special characters
-	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
-		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
-	else
-		return $s;
-}
+	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false) {
+			return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
+	} else {
+			return $s;
+	}
+	}
 
 protected function _textstring($s)
 {
 	// Format a text string
-	if(!$this->_isascii($s))
-		$s = $this->_UTF8toUTF16($s);
+	if(!$this->_isascii($s)) {
+			$s = $this->_UTF8toUTF16($s);
+	}
 	return '('.$this->_escape($s).')';
 }
 
@@ -1236,16 +1331,19 @@ 
 {
 	// Extract info from a JPEG file
 	$a = getimagesize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace = 'DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace = 'DeviceCMYK';
-	else
-		$colspace = 'DeviceGray';
+	if(!$a) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
+	if($a[2]!=2) {
+			$this->Error('Not a JPEG file: '.$file);
+	}
+	if(!isset($a['channels']) || $a['channels']==3) {
+			$colspace = 'DeviceRGB';
+	} elseif($a['channels']==4) {
+			$colspace = 'DeviceCMYK';
+	} else {
+			$colspace = 'DeviceGray';
+	}
 	$bpc = isset($a['bits']) ? $a['bits'] : 8;
 	$data = file_get_contents($file);
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
@@ -1255,8 +1353,9 @@ 
 {
 	// Extract info from a PNG file
 	$f = fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
+	if(!$f) {
+			$this->Error('Can\'t open image file: '.$file);
+	}
 	$info = $this->_parsepngstream($f,$file);
 	fclose($f);
 	return $info;
@@ -1265,33 +1364,40 @@ 
 protected function _parsepngstream($f, $file)
 {
 	// Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
+	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
+			$this->Error('Not a PNG file: '.$file);
+	}
 
 	// Read header chunk
 	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
+	if($this->_readstream($f,4)!='IHDR') {
+			$this->Error('Incorrect PNG file: '.$file);
+	}
 	$w = $this->_readint($f);
 	$h = $this->_readint($f);
 	$bpc = ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
+	if($bpc>8) {
+			$this->Error('16-bit depth not supported: '.$file);
+	}
 	$ct = ord($this->_readstream($f,1));
-	if($ct==0 || $ct==4)
-		$colspace = 'DeviceGray';
-	elseif($ct==2 || $ct==6)
-		$colspace = 'DeviceRGB';
-	elseif($ct==3)
-		$colspace = 'Indexed';
-	else
-		$this->Error('Unknown color type: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
+	if($ct==0 || $ct==4) {
+			$colspace = 'DeviceGray';
+	} elseif($ct==2 || $ct==6) {
+			$colspace = 'DeviceRGB';
+	} elseif($ct==3) {
+			$colspace = 'Indexed';
+	} else {
+			$this->Error('Unknown color type: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown compression method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown filter method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Interlacing not supported: '.$file);
+	}
 	$this->_readstream($f,4);
 	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
 
@@ -1308,44 +1414,45 @@ 
 			// Read palette
 			$pal = $this->_readstream($f,$n);
 			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
+		} elseif($type=='tRNS')
 		{
 			// Read transparency info
 			$t = $this->_readstream($f,$n);
-			if($ct==0)
-				$trns = array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
+			if($ct==0) {
+							$trns = array(ord(substr($t,1,1)));
+			} elseif($ct==2) {
+							$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			} else
 			{
 				$pos = strpos($t,chr(0));
-				if($pos!==false)
-					$trns = array($pos);
+				if($pos!==false) {
+									$trns = array($pos);
+				}
 			}
 			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
+		} elseif($type=='IDAT')
 		{
 			// Read image data block
 			$data .= $this->_readstream($f,$n);
 			$this->_readstream($f,4);
+		} elseif($type=='IEND') {
+					break;
+		} else {
+					$this->_readstream($f,$n+4);
 		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
 	}
 	while($n);
 
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
+	if($colspace=='Indexed' && empty($pal)) {
+			$this->Error('Missing palette in '.$file);
+	}
 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
 	if($ct>=4)
 	{
 		// Extract alpha channel
-		if(!function_exists('gzuncompress'))
-			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+		if(!function_exists('gzuncompress')) {
+					$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+		}
 		$data = gzuncompress($data);
 		$color = '';
 		$alpha = '';
@@ -1362,8 +1469,7 @@ 
 				$color .= preg_replace('/(.)./s','$1',$line);
 				$alpha .= preg_replace('/.(.)/s','$1',$line);
 			}
-		}
-		else
+		} else
 		{
 			// RGB image
 			$len = 4*$w;
@@ -1381,8 +1487,9 @@ 
 		$data = gzcompress($color);
 		$info['smask'] = gzcompress($alpha);
 		$this->WithAlpha = true;
-		if($this->PDFVersion<'1.4')
-			$this->PDFVersion = '1.4';
+		if($this->PDFVersion<'1.4') {
+					$this->PDFVersion = '1.4';
+		}
 	}
 	$info['data'] = $data;
 	return $info;
@@ -1395,13 +1502,15 @@ 
 	while($n>0 && !feof($f))
 	{
 		$s = fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
+		if($s===false) {
+					$this->Error('Error while reading stream');
+		}
 		$n -= strlen($s);
 		$res .= $s;
 	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
+	if($n>0) {
+			$this->Error('Unexpected end of stream');
+	}
 	return $res;
 }
 
@@ -1415,21 +1524,25 @@ 
 protected function _parsegif($file)
 {
 	// Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
+	if(!function_exists('imagepng')) {
+			$this->Error('GD extension is required for GIF support');
+	}
+	if(!function_exists('imagecreatefromgif')) {
+			$this->Error('GD has no GIF read support');
+	}
 	$im = imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
+	if(!$im) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
 	imageinterlace($im,0);
 	ob_start();
 	imagepng($im);
 	$data = ob_get_clean();
 	imagedestroy($im);
 	$f = fopen('php://temp','rb+');
-	if(!$f)
-		$this->Error('Unable to create memory stream');
+	if(!$f) {
+			$this->Error('Unable to create memory stream');
+	}
 	fwrite($f,$data);
 	rewind($f);
 	$info = $this->_parsepngstream($f,$file);
@@ -1440,15 +1553,16 @@ 
 protected function _out($s)
 {
 	// Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page] .= $s."\n";
-	elseif($this->state==1)
-		$this->_put($s);
-	elseif($this->state==0)
-		$this->Error('No page has been added yet');
-	elseif($this->state==3)
-		$this->Error('The document is closed');
-}
+	if($this->state==2) {
+			$this->pages[$this->page] .= $s."\n";
+	} elseif($this->state==1) {
+			$this->_put($s);
+	} elseif($this->state==0) {
+			$this->Error('No page has been added yet');
+	} elseif($this->state==3) {
+			$this->Error('The document is closed');
+	}
+	}
 
 protected function _put($s)
 {
@@ -1463,8 +1577,9 @@ 
 protected function _newobj($n=null)
 {
 	// Begin a new object
-	if($n===null)
-		$n = ++$this->n;
+	if($n===null) {
+			$n = ++$this->n;
+	}
 	$this->offsets[$n] = $this->_getoffset();
 	$this->_put($n.' 0 obj');
 }
@@ -1482,9 +1597,9 @@ 
 	{
 		$entries = '/Filter /FlateDecode ';
 		$data = gzcompress($data);
+	} else {
+			$entries = '';
 	}
-	else
-		$entries = '';
 	$entries .= '/Length '.strlen($data);
 	$this->_newobj();
 	$this->_put('<<'.$entries.'>>');
@@ -1497,41 +1612,47 @@ 
 	$this->_newobj();
 	$this->_put('<</Type /Page');
 	$this->_put('/Parent 1 0 R');
-	if(isset($this->PageInfo[$n]['size']))
-		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
-	if(isset($this->PageInfo[$n]['rotation']))
-		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
+	if(isset($this->PageInfo[$n]['size'])) {
+			$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
+	}
+	if(isset($this->PageInfo[$n]['rotation'])) {
+			$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
+	}
 	$this->_put('/Resources 2 0 R');
 	if(!empty($this->PageLinks[$n]))
 	{
 		$s = '/Annots [';
-		foreach($this->PageLinks[$n] as $pl)
-			$s .= $pl[5].' 0 R ';
+		foreach($this->PageLinks[$n] as $pl) {
+					$s .= $pl[5].' 0 R ';
+		}
 		$s .= ']';
 		$this->_put($s);
 	}
-	if($this->WithAlpha)
-		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+	if($this->WithAlpha) {
+			$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+	}
 	$this->_put('/Contents '.($this->n+1).' 0 R>>');
 	$this->_put('endobj');
 	// Page content
-	if(!empty($this->AliasNbPages))
-		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+	if(!empty($this->AliasNbPages)) {
+			$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+	}
 	$this->_putstreamobject($this->pages[$n]);
 	// Annotations
 	foreach($this->PageLinks[$n] as $pl)
 	{
 		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
 		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-		if(is_string($pl[4]))
-			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-		else
+		if(is_string($pl[4])) {
+					$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+		} else
 		{
 			$l = $this->links[$pl[4]];
-			if(isset($this->PageInfo[$l[0]]['size']))
-				$h = $this->PageInfo[$l[0]]['size'][1];
-			else
-				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
+			if(isset($this->PageInfo[$l[0]]['size'])) {
+							$h = $this->PageInfo[$l[0]]['size'][1];
+			} else {
+							$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
+			}
 			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
 		}
 		$this->_newobj();
@@ -1548,18 +1669,21 @@ 
 	{
 		$this->PageInfo[$i]['n'] = ++$n;
 		$n++;
-		foreach($this->PageLinks[$i] as &$pl)
-			$pl[5] = ++$n;
+		foreach($this->PageLinks[$i] as &$pl) {
+					$pl[5] = ++$n;
+		}
 		unset($pl);
 	}
-	for($i=1;$i<=$nb;$i++)
-		$this->_putpage($i);
+	for($i=1;$i<=$nb;$i++) {
+			$this->_putpage($i);
+	}
 	// Pages root
 	$this->_newobj(1);
 	$this->_put('<</Type /Pages');
 	$kids = '/Kids [';
-	for($i=1;$i<=$nb;$i++)
-		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
+	for($i=1;$i<=$nb;$i++) {
+			$kids .= $this->PageInfo[$i]['n'].' 0 R ';
+	}
 	$kids .= ']';
 	$this->_put($kids);
 	$this->_put('/Count '.$nb);
@@ -1567,8 +1691,7 @@ 
 	{
 		$w = $this->DefPageSize[0];
 		$h = $this->DefPageSize[1];
-	}
-	else
+	} else
 	{
 		$w = $this->DefPageSize[1];
 		$h = $this->DefPageSize[0];
@@ -1586,17 +1709,21 @@ 
 		$this->_newobj();
 		$this->FontFiles[$file]['n'] = $this->n;
 		$font = file_get_contents($this->fontpath.$file,true);
-		if(!$font)
-			$this->Error('Font file not found: '.$file);
+		if(!$font) {
+					$this->Error('Font file not found: '.$file);
+		}
 		$compressed = (substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+		if(!$compressed && isset($info['length2'])) {
+					$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+		}
 		$this->_put('<</Length '.strlen($font));
-		if($compressed)
-			$this->_put('/Filter /FlateDecode');
+		if($compressed) {
+					$this->_put('/Filter /FlateDecode');
+		}
 		$this->_put('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_put('/Length2 '.$info['length2'].' /Length3 0');
+		if(isset($info['length2'])) {
+					$this->_put('/Length2 '.$info['length2'].' /Length3 0');
+		}
 		$this->_put('>>');
 		$this->_putstream($font);
 		$this->_put('endobj');
@@ -1617,10 +1744,11 @@ 
 		// ToUnicode CMap
 		if(isset($font['uv']))
 		{
-			if(isset($font['enc']))
-				$cmapkey = $font['enc'];
-			else
-				$cmapkey = $font['name'];
+			if(isset($font['enc'])) {
+							$cmapkey = $font['enc'];
+			} else {
+							$cmapkey = $font['name'];
+			}
 			if(!isset($this->cmaps[$cmapkey]))
 			{
 				$cmap = $this->_tounicodecmap($font['uv']);
@@ -1632,8 +1760,9 @@ 
 		$this->fonts[$k]['n'] = $this->n+1;
 		$type = $font['type'];
 		$name = $font['name'];
-		if($font['subsetted'])
-			$name = 'AAAAAA+'.$name;
+		if($font['subsetted']) {
+					$name = 'AAAAAA+'.$name;
+		}
 		if($type=='Core')
 		{
 			// Core font
@@ -1641,14 +1770,15 @@ 
 			$this->_put('<</Type /Font');
 			$this->_put('/BaseFont /'.$name);
 			$this->_put('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			if($name!='Symbol' && $name!='ZapfDingbats') {
+							$this->_put('/Encoding /WinAnsiEncoding');
+			}
+			if(isset($font['uv'])) {
+							$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			}
 			$this->_put('>>');
 			$this->_put('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
+		} elseif($type=='Type1' || $type=='TrueType')
 		{
 			// Additional Type1 or TrueType/OpenType font
 			$this->_newobj();
@@ -1658,38 +1788,43 @@ 
 			$this->_put('/FirstChar 32 /LastChar 255');
 			$this->_put('/Widths '.($this->n+1).' 0 R');
 			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
-			if(isset($font['diff']))
-				$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
-			else
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			if(isset($font['diff'])) {
+							$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
+			} else {
+							$this->_put('/Encoding /WinAnsiEncoding');
+			}
+			if(isset($font['uv'])) {
+							$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			}
 			$this->_put('>>');
 			$this->_put('endobj');
 			// Widths
 			$this->_newobj();
 			$cw = &$font['cw'];
 			$s = '[';
-			for($i=32;$i<=255;$i++)
-				$s .= $cw[chr($i)].' ';
+			for($i=32;$i<=255;$i++) {
+							$s .= $cw[chr($i)].' ';
+			}
 			$this->_put($s.']');
 			$this->_put('endobj');
 			// Descriptor
 			$this->_newobj();
 			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s .= ' /'.$k.' '.$v;
-			if(!empty($font['file']))
-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+			foreach($font['desc'] as $k=>$v) {
+							$s .= ' /'.$k.' '.$v;
+			}
+			if(!empty($font['file'])) {
+							$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+			}
 			$this->_put($s.'>>');
 			$this->_put('endobj');
-		}
-		else
+		} else
 		{
 			// Allow for additional types
 			$mtd = '_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
+			if(!method_exists($this,$mtd)) {
+							$this->Error('Unsupported font type: '.$type);
+			}
 			$this->$mtd($font);
 		}
 	}
@@ -1707,8 +1842,7 @@ 
 		{
 			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
 			$nbr++;
-		}
-		else
+		} else
 		{
 			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
 			$nbc++;
@@ -1764,28 +1898,33 @@ 
 	$this->_put('/Subtype /Image');
 	$this->_put('/Width '.$info['w']);
 	$this->_put('/Height '.$info['h']);
-	if($info['cs']=='Indexed')
-		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-	else
+	if($info['cs']=='Indexed') {
+			$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+	} else
 	{
 		$this->_put('/ColorSpace /'.$info['cs']);
-		if($info['cs']=='DeviceCMYK')
-			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
+		if($info['cs']=='DeviceCMYK') {
+					$this->_put('/Decode [1 0 1 0 1 0 1 0]');
+		}
 	}
 	$this->_put('/BitsPerComponent '.$info['bpc']);
-	if(isset($info['f']))
-		$this->_put('/Filter /'.$info['f']);
-	if(isset($info['dp']))
-		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
+	if(isset($info['f'])) {
+			$this->_put('/Filter /'.$info['f']);
+	}
+	if(isset($info['dp'])) {
+			$this->_put('/DecodeParms <<'.$info['dp'].'>>');
+	}
 	if(isset($info['trns']) && is_array($info['trns']))
 	{
 		$trns = '';
-		for($i=0;$i<count($info['trns']);$i++)
-			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+		for($i=0;$i<count($info['trns']);$i++) {
+					$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+		}
 		$this->_put('/Mask ['.$trns.']');
 	}
-	if(isset($info['smask']))
-		$this->_put('/SMask '.($this->n+1).' 0 R');
+	if(isset($info['smask'])) {
+			$this->_put('/SMask '.($this->n+1).' 0 R');
+	}
 	$this->_put('/Length '.strlen($info['data']).'>>');
 	$this->_putstream($info['data']);
 	$this->_put('endobj');
@@ -1797,22 +1936,25 @@ 
 		$this->_putimage($smask);
 	}
 	// Palette
-	if($info['cs']=='Indexed')
-		$this->_putstreamobject($info['pal']);
-}
+	if($info['cs']=='Indexed') {
+			$this->_putstreamobject($info['pal']);
+	}
+	}
 
 protected function _putxobjectdict()
 {
-	foreach($this->images as $image)
-		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
+	foreach($this->images as $image) {
+			$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
+	}
+	}
 
 protected function _putresourcedict()
 {
 	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 	$this->_put('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
+	foreach($this->fonts as $font) {
+			$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
+	}
 	$this->_put('>>');
 	$this->_put('/XObject <<');
 	$this->_putxobjectdict();
@@ -1835,30 +1977,33 @@ 
 {
 	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
 	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
-	foreach($this->metadata as $key=>$value)
-		$this->_put('/'.$key.' '.$this->_textstring($value));
-}
+	foreach($this->metadata as $key=>$value) {
+			$this->_put('/'.$key.' '.$this->_textstring($value));
+	}
+	}
 
 protected function _putcatalog()
 {
 	$n = $this->PageInfo[1]['n'];
 	$this->_put('/Type /Catalog');
 	$this->_put('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_put('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_put('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_put('/PageLayout /TwoColumnLeft');
-}
+	if($this->ZoomMode=='fullpage') {
+			$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
+	} elseif($this->ZoomMode=='fullwidth') {
+			$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
+	} elseif($this->ZoomMode=='real') {
+			$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
+	} elseif(!is_string($this->ZoomMode)) {
+			$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
+	}
+	if($this->LayoutMode=='single') {
+			$this->_put('/PageLayout /SinglePage');
+	} elseif($this->LayoutMode=='continuous') {
+			$this->_put('/PageLayout /OneColumn');
+	} elseif($this->LayoutMode=='two') {
+			$this->_put('/PageLayout /TwoColumnLeft');
+	}
+	}
 
 protected function _putheader()
 {
@@ -1894,8 +2039,9 @@ 
 	$this->_put('xref');
 	$this->_put('0 '.($this->n+1));
 	$this->_put('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	for($i=1;$i<=$this->n;$i++) {
+			$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	}
 	// Trailer
 	$this->_put('trailer');
 	$this->_put('<<');

extras/residentes_controller.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
             " AND ".
             $this->empresa->var2str(\date('Y-m-d', strtotime($this->hasta)));
         }
-        $tipo_pagada = ($pagada)?'TRUE':'FALSE';
+        $tipo_pagada = ($pagada) ? 'TRUE' : 'FALSE';
         $sql = "SELECT f.idfactura, f.numero2, f.vencimiento, lf.referencia, lf.descripcion, f.fecha, lf.pvpsindto, ".
             "lf.dtopor, lf.pvptotal".
             " FROM facturascli as f left join lineasfacturascli as lf ON (f.idfactura = lf.idfactura)".
@@ -152,7 +152,7 @@ 
         foreach ($data as $l) {
             $linea = (object) $l;
             $linea->f_pago = $linea->fecha;
-            $linea->dias_atraso = ($pagada)?0:$this->diasAtraso($linea->vencimiento, \date('d-m-Y'));
+            $linea->dias_atraso = ($pagada) ? 0 : $this->diasAtraso($linea->vencimiento, \date('d-m-Y'));
             if (in_array('tesoreria', $GLOBALS['plugins'], true)) {
                 //TO-DO
             }
@@ -179,14 +179,14 @@ 
         $cliente = $cli->get($codcliente);
         if ($iddireccion !== '') {
             foreach ($cliente->get_direcciones() as $dir) {
-                if ($dir->id === (int)$iddireccion) {
+                if ($dir->id === (int) $iddireccion) {
                     $dir->direccion = $nueva_direccion;
                     $dir->save();
                     break;
                 }
             }
             return $iddireccion;
-        } else {
+        }else {
             $dir = new direccion_cliente();
             $dir->direccion = $nueva_direccion;
             $dir->codcliente = $codcliente;

model/core/residentes_facturacion_programada_edificaciones.php

Spacing +21 added lines, -21 removed lines

@@ -36,15 +36,15 @@ 
     public $procesado;
     
     public function __construct($t = FALSE) {
-        parent::__construct('residentes_fact_prog_edificaciones','plugins/residentes');
-        if($t){
+        parent::__construct('residentes_fact_prog_edificaciones', 'plugins/residentes');
+        if ($t) {
             $this->id = $t['id'];
             $this->idprogramacion = $t['idprogramacion'];
             $this->id_edificacion = $t['id_edificacion'];
             $this->codcliente = $t['codcliente'];
             $this->idfactura = $t['idfactura'];
             $this->procesado = $this->str2bool($t['procesado']);
-        }else{
+        }else {
             $this->id = null;
             $this->idprogramacion = null;
             $this->id_edificacion = null;
@@ -54,13 +54,13 @@ 
         }
     }
 
-    public function install(){
+    public function install() {
         return "";
     }
     
     public function exists()
     {
-        if(is_null($this->id)) {
+        if (is_null($this->id)) {
             return false;
         }
         return true;
@@ -68,7 +68,7 @@ 
     
     public function save()
     {
-        if($this->exists()){
+        if ($this->exists()) {
             $sql = "UPDATE ".$this->table_name." SET ".
             "idfactura = ".$this->intval($this->idfactura).", ".
             "codcliente = ".$this->var2str($this->codcliente).", ".
@@ -78,16 +78,16 @@ 
             "WHERE id = ".$this->intval($this->id).";";
             $data = $this->db->exec($sql);
             return $data;
-        } else {
+        }else {
             $sql = "INSERT INTO ".$this->table_name.
             " (idprogramacion, id_edificacion, codcliente, procesado) VALUES (".
             $this->intval($this->idprogramacion).", ".
             $this->intval($this->id_edificacion).", ".
             $this->var2str($this->codcliente).", ".
             $this->var2str($this->procesado).");";
-            if($this->db->exec($sql)){
+            if ($this->db->exec($sql)) {
                 return true;
-            }else{
+            }else {
                 return false;
             }
         }
@@ -99,7 +99,7 @@ 
         $sql = "select * from ".$this->table_name." WHERE id = ".$this->intval($id);
         $this->new_advice($sql);
         $data = $this->db->select($sql);
-        if($data) {
+        if ($data) {
             return new residentes_facturacion_programada_edificaciones($data[0]);
         }
         return false;
@@ -110,8 +110,8 @@ 
         $sql = "select * from ".$this->table_name." WHERE idprogramacion = ".$this->intval($idProg)." ORDER BY id";
         $data = $this->db->select($sql);
         $lista = array();
-        if($data) {
-            foreach($data as $d) {
+        if ($data) {
+            foreach ($data as $d) {
                 $lista[] = new residentes_facturacion_programada_edificaciones($d);
             }
             return $lista;
@@ -125,8 +125,8 @@ 
                 " AND procesado = FALSE ORDER BY id";
         $data = $this->db->select($sql);
         $lista = array();
-        if($data) {
-            foreach($data as $d) {
+        if ($data) {
+            foreach ($data as $d) {
                 $lista[] = new residentes_facturacion_programada_edificaciones($d);
             }
             return $lista;
@@ -138,8 +138,8 @@ 
         $sql = "select * from ".$this->table_name." WHERE idprogramacion = ".$this->intval($idProg)." ORDER BY id";
         $data = $this->db->select($sql);
         $lista = array();
-        if($data) {
-            foreach($data as $d) {
+        if ($data) {
+            foreach ($data as $d) {
                  $item = new residentes_facturacion_programada_edificaciones($d);
                  $this->infoAdicional($item);
                  $lista[] = $item;
@@ -185,8 +185,8 @@ 
                 ." AND "."estado = ".$this->var2str($status)." ORDER BY idprogramacion, id";
         $data = $this->db->select($sql);
         $lista = array();
-        if($data) {
-            foreach($data as $d) {
+        if ($data) {
+            foreach ($data as $d) {
                 $lista[] = new residentes_facturacion_programada_edificaciones($d);
             }
             return $lista;
@@ -199,8 +199,8 @@ 
         $sql = "select * from ".$this->table_name." ORDER BY idprogramacion, id";
         $data = $this->db->select($sql);
         $lista = array();
-        if($data) {
-            foreach($data as $d) {
+        if ($data) {
+            foreach ($data as $d) {
                 $lista[] = new residentes_facturacion_programada_edificaciones($d);
             }
             return $lista;
@@ -212,7 +212,7 @@ 
     {
         $sql = "DELETE from ".$this->table_name." WHERE id = ".$this->intval($this->id);
         $data = $this->db->exec($sql);
-        if($data) {
+        if ($data) {
             return true;
         }
         return false;   

model/core/residentes_ayudas.php

Spacing +23 added lines, -23 removed lines

@@ -22,7 +22,7 @@ 
  *
  * @author Joe Nilson <joenilson at gmail.com>
  */
-class residentes_ayudas extends \fs_model{
+class residentes_ayudas extends \fs_model {
     /**
      * El codigo de la ayuda ya sea para parentesco u ocupacion
      * @var string
@@ -39,19 +39,19 @@ 
      */
     public $descripcion;
     public function __construct($t = FALSE) {
-        parent::__construct('residentes_ayudas','plugins/residentes');
-        if($t){
+        parent::__construct('residentes_ayudas', 'plugins/residentes');
+        if ($t) {
             $this->codigo = $t['codigo'];
             $this->tipo = $t['tipo'];
             $this->descripcion = $t['descripcion'];
-        }else{
+        }else {
             $this->codigo = null;
             $this->tipo = null;
             $this->descripcion = null;
         }
     }
 
-    public function install(){
+    public function install() {
         return "insert into residentes_ayudas (codigo,tipo, descripcion) VALUES ".
             "('EMPPUB','OCUPACION','Empleado Publico'),".
             "('EMPRI','OCUPACION','Empleado Privado'),".
@@ -65,66 +65,66 @@ 
             "('HIJO','PARENTESCO','HermanHijo (a)');";
     }
 
-    public function all(){
+    public function all() {
         $sql = "SELECT * FROM ".$this->table_name." ORDER BY tipo,codigo";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             $lista = array();
-            foreach($data as $d){
+            foreach ($data as $d) {
                 $lista[] = new residentes_ayudas($d);
             }
             return $lista;
-        }else{
+        }else {
             return false;
         }
     }
 
-    public function all_tipo($tipo){
+    public function all_tipo($tipo) {
         $sql = "SELECT * FROM ".$this->table_name." WHERE tipo = ".$this->var2str($tipo)." ORDER BY codigo";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             $lista = array();
-            foreach($data as $d){
+            foreach ($data as $d) {
                 $lista[] = new residentes_ayudas($d);
             }
             return $lista;
-        }else{
+        }else {
             return false;
         }
     }
 
-    public function get($codigo,$tipo){
+    public function get($codigo, $tipo) {
         $sql = "SELECT * FROM ".$this->table_name." WHERE codigo = ".$this->var2str($codigo)." AND tipo = ".$this->var2str($tipo).";";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             return new residentes_ayudas($data[0]);
-        }else{
+        }else {
             return false;
         }
     }
 
     public function exists() {
-        if(is_null($this->codigo)){
+        if (is_null($this->codigo)) {
             return false;
-        }else{
-            return $this->get($this->codigo,$this->tipo);
+        }else {
+            return $this->get($this->codigo, $this->tipo);
         }
     }
 
     public function save() {
-        if($this->exists()){
+        if ($this->exists()) {
             $sql = "UPDATE ".$this->table_name." SET ".
                     "descripcion = ".$this->var2str($this->descripcion)." ".
                     "WHERE codigo = ".$this->var2str($this->codigo)." AND tipo = ".$this->var2str($this->tipo).";";
             return $this->db->exec($sql);
-        }else{
+        }else {
             $sql = "INSERT INTO ".$this->table_name." (codigo, tipo, descripcion) VALUES (".
                     $this->var2str($this->codigo).", ".
                     $this->var2str($this->tipo).", ".
                     $this->var2str($this->descripcion).");";
-            if($this->db->exec($sql)){
+            if ($this->db->exec($sql)) {
                 return $this->db->lastval();
-            }else{
+            }else {
                 return false;
             }
         }

model/core/residentes_vehiculos.php

Spacing +18 added lines, -18 removed lines

@@ -24,7 +24,7 @@ 
  *
  * @author Joe Nilson <joenilson at gmail.com>
  */
-class residentes_vehiculos extends \fs_model{
+class residentes_vehiculos extends \fs_model {
     /**
      * El Id del vehiculo
      * @var integer serial
@@ -80,7 +80,7 @@ 
             $this->vehiculo_placa = $t['vehiculo_placa'];
             $this->vehiculo_tipo = $t['vehiculo_tipo'];
             $this->codigo_tarjeta = $t['codigo_tarjeta'];
-        } else {
+        }else {
             $this->idvehiculo = null;
             $this->codcliente = null;
             $this->vehiculo_marca = null;
@@ -120,7 +120,7 @@ 
                 $lista[] = $item;
             }
             return $lista;
-        } else {
+        }else {
             return false;
         }
     }
@@ -132,7 +132,7 @@ 
         $data = $this->db->select($sql);
         if ($data) {
             return new residentes_vehiculos($data[0]);
-        } else {
+        }else {
             return false;
         }
     }
@@ -145,7 +145,7 @@ 
      */
     public function get_by_field($field, $value)
     {
-        $query = (is_string($value))?$this->var2str($value):$this->intval($value);
+        $query = (is_string($value)) ? $this->var2str($value) : $this->intval($value);
         $sql = "SELECT * FROM ".$this->table_name." WHERE ".strtoupper(trim($field))." = ".$query.";";
         $data = $this->db->select($sql);
         if ($data) {
@@ -155,7 +155,7 @@ 
                 $lista[] = $item;
             }
             return $lista;
-        } else {
+        }else {
             return false;
         }
     }
@@ -164,7 +164,7 @@ 
     {
         if (is_null($this->idvehiculo)) {
             return false;
-        } else {
+        }else {
             return $this->get($this->codcliente, $this->idvehiculo);
         }
     }
@@ -182,7 +182,7 @@ 
                     "WHERE idvehiculo = ".$this->intval($this->idvehiculo)." AND ".
                     "codcliente = ".$this->var2str($this->codcliente).";";
             return $this->db->exec($sql);
-        } else {
+        }else {
             $sql = "INSERT INTO ".$this->table_name." (codcliente, vehiculo_marca, vehiculo_modelo, vehiculo_color, ".
                 "vehiculo_placa, vehiculo_tipo, codigo_tarjeta) VALUES (".
                     $this->var2str($this->codcliente).", ".
@@ -194,7 +194,7 @@ 
                     $this->var2str($this->codigo_tarjeta).");";
             if ($this->db->exec($sql)) {
                 return $this->db->lastval();
-            } else {
+            }else {
                 return false;
             }
         }
@@ -209,17 +209,17 @@ 
         $clilist = array();
         $query = mb_strtolower($this->no_html($busqueda), 'UTF8');
 
-        $consulta = "SELECT * FROM " . $this->table_name . " WHERE ";
+        $consulta = "SELECT * FROM ".$this->table_name." WHERE ";
         if (is_numeric($query)) {
-            $consulta .= "(codigo_tarjeta LIKE '%" . $query . "%' OR CAST(idvehiculo as CHAR) = '%" . $query . "%')";
-        } else {
+            $consulta .= "(codigo_tarjeta LIKE '%".$query."%' OR CAST(idvehiculo as CHAR) = '%".$query."%')";
+        }else {
             $buscar = str_replace(' ', '%', $query);
-            $consulta .= "(lower(codigo_tarjeta) LIKE '%" . $buscar .
-                "%' OR lower(vehiculo_color) LIKE '%" . $buscar . "%'" .
-                " OR lower(vehiculo_marca) LIKE '%" . $buscar .
-                "%' OR lower(vehiculo_modelo) LIKE '%" . $buscar . "%'" .
-                " OR lower(vehiculo_placa) LIKE '%" . $buscar .
-                "%' OR lower(vehiculo_tipo) LIKE '%" . $buscar . "%')";
+            $consulta .= "(lower(codigo_tarjeta) LIKE '%".$buscar.
+                "%' OR lower(vehiculo_color) LIKE '%".$buscar."%'".
+                " OR lower(vehiculo_marca) LIKE '%".$buscar.
+                "%' OR lower(vehiculo_modelo) LIKE '%".$buscar."%'".
+                " OR lower(vehiculo_placa) LIKE '%".$buscar.
+                "%' OR lower(vehiculo_tipo) LIKE '%".$buscar."%')";
         }
         $consulta .= " ORDER BY codcliente ASC";
 

model/core/residentes_informacion.php

Spacing +72 added lines, -72 removed lines

@@ -25,7 +25,7 @@ 
  * @author Joe Nilson <joenilson at gmail.com>
  * @version 1
  */
-class residentes_informacion extends \fs_model{
+class residentes_informacion extends \fs_model {
     /**
      * Codigo del cliente
      * @var string
@@ -143,60 +143,60 @@ 
     {
         parent::__construct('residentes_informacion', 'plugins/residentes');
         if ($t) {
-            $this->codcliente=$t['codcliente'];
-            $this->codigo=$t['codigo'];
-            $this->ocupantes=$t['ocupantes'];
-            $this->ocupantes5anos=$t['ocupantes5anos'];
-            $this->ocupantes12anos=$t['ocupantes12anos'];
-            $this->ocupantes18anos=$t['ocupantes18anos'];
-            $this->ocupantes30anos=$t['ocupantes30anos'];
-            $this->ocupantes50anos=$t['ocupantes50anos'];
-            $this->ocupantes70anos=$t['ocupantes70anos'];
-            $this->ocupantes71anos=$t['ocupantes71anos'];
-            $this->informacion_discapacidad=$t['informacion_discapacidad'];
-            $this->propietario=$this->str2bool($t['propietario']);
-            $this->profesion=$t['profesion'];
-            $this->ocupacion=$t['ocupacion'];
-            $this->ca_nombres=$t['ca_nombres'];
-            $this->ca_apellidos=$t['ca_apellidos'];
-            $this->ca_telefono=$t['ca_telefono'];
-            $this->ca_email=$t['ca_email'];
-            $this->ca_propietario=$this->str2bool($t['ca_propietario']);
-            $this->ca_parentesco=$t['ca_parentesco'];
-            $this->ca_parentesco_obs=$t['ca_parentesco_obs'];
-            $this->vehiculos=$t['vehiculos'];
-        } else {
-            $this->codcliente=NULL;
-            $this->codigo=NULL;
-            $this->ocupantes=NULL;
-            $this->ocupantes5anos=NULL;
-            $this->ocupantes12anos=NULL;
-            $this->ocupantes18anos=NULL;
-            $this->ocupantes30anos=NULL;
-            $this->ocupantes50anos=NULL;
-            $this->ocupantes70anos=NULL;
-            $this->ocupantes71anos=NULL;
-            $this->informacion_discapacidad=NULL;
-            $this->propietario='FALSE';
-            $this->profesion=NULL;
-            $this->ocupacion=NULL;
-            $this->ca_nombres=NULL;
-            $this->ca_apellidos=NULL;
-            $this->ca_telefono=NULL;
-            $this->ca_email=NULL;
-            $this->ca_propietario='FALSE';
-            $this->ca_parentesco=NULL;
-            $this->ca_parentesco_obs='';
-            $this->vehiculos=0;
+            $this->codcliente = $t['codcliente'];
+            $this->codigo = $t['codigo'];
+            $this->ocupantes = $t['ocupantes'];
+            $this->ocupantes5anos = $t['ocupantes5anos'];
+            $this->ocupantes12anos = $t['ocupantes12anos'];
+            $this->ocupantes18anos = $t['ocupantes18anos'];
+            $this->ocupantes30anos = $t['ocupantes30anos'];
+            $this->ocupantes50anos = $t['ocupantes50anos'];
+            $this->ocupantes70anos = $t['ocupantes70anos'];
+            $this->ocupantes71anos = $t['ocupantes71anos'];
+            $this->informacion_discapacidad = $t['informacion_discapacidad'];
+            $this->propietario = $this->str2bool($t['propietario']);
+            $this->profesion = $t['profesion'];
+            $this->ocupacion = $t['ocupacion'];
+            $this->ca_nombres = $t['ca_nombres'];
+            $this->ca_apellidos = $t['ca_apellidos'];
+            $this->ca_telefono = $t['ca_telefono'];
+            $this->ca_email = $t['ca_email'];
+            $this->ca_propietario = $this->str2bool($t['ca_propietario']);
+            $this->ca_parentesco = $t['ca_parentesco'];
+            $this->ca_parentesco_obs = $t['ca_parentesco_obs'];
+            $this->vehiculos = $t['vehiculos'];
+        }else {
+            $this->codcliente = NULL;
+            $this->codigo = NULL;
+            $this->ocupantes = NULL;
+            $this->ocupantes5anos = NULL;
+            $this->ocupantes12anos = NULL;
+            $this->ocupantes18anos = NULL;
+            $this->ocupantes30anos = NULL;
+            $this->ocupantes50anos = NULL;
+            $this->ocupantes70anos = NULL;
+            $this->ocupantes71anos = NULL;
+            $this->informacion_discapacidad = NULL;
+            $this->propietario = 'FALSE';
+            $this->profesion = NULL;
+            $this->ocupacion = NULL;
+            $this->ca_nombres = NULL;
+            $this->ca_apellidos = NULL;
+            $this->ca_telefono = NULL;
+            $this->ca_email = NULL;
+            $this->ca_propietario = 'FALSE';
+            $this->ca_parentesco = NULL;
+            $this->ca_parentesco_obs = '';
+            $this->vehiculos = 0;
         }
         $this->cliente = new cliente();
     }
 
-    public function install(){
+    public function install() {
         return "";
     }
 
-    public function info_adicional($i){
+    public function info_adicional($i) {
         $data = $this->cliente->get($i->codcliente);
         $i->nombre = $data->nombre;
         $i->telefono1 = $data->telefono1;
@@ -206,17 +206,17 @@ 
         return $i;
     }
 
-    public function all(){
+    public function all() {
         $sql = "SELECT * FROM ".$this->table_name." ORDER BY codcliente";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             $lista = array();
-            foreach($data as $d){
+            foreach ($data as $d) {
                 $item = new residentes_informacion($d);
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        }else {
             return false;
         }
     }
@@ -228,14 +228,14 @@ 
      * @param type $padre_tipo integer
      * @return \FacturaScripts\model\residentes_informacion|boolean
      */
-    public function get($codcliente){
+    public function get($codcliente) {
         $sql = "SELECT * FROM ".$this->table_name.
                 " WHERE codcliente = ".$this->var2str($codcliente).";";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             $item = new residentes_informacion($data[0]);
             return $item->info_adicional($item);
-        }else{
+        }else {
             return false;
         }
     }
@@ -246,32 +246,32 @@ 
      * @param type $value string
      * @return boolean|\FacturaScripts\model\residentes_informacion
      */
-    public function get_by_field($field,$value){
-        $query = (is_string($value))?$this->var2str($value):$this->intval($value);
+    public function get_by_field($field, $value) {
+        $query = (is_string($value)) ? $this->var2str($value) : $this->intval($value);
         $sql = "SELECT * FROM ".$this->table_name." WHERE ".strtoupper(trim($field))." = ".$query.";";
         $data = $this->db->select($sql);
-        if($data){
+        if ($data) {
             $lista = array();
-            foreach($data as $d){
+            foreach ($data as $d) {
                 $item = new residentes_informacion($d);
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        }else {
             return false;
         }
     }
 
     public function exists() {
-        if(!$this->get($this->codcliente)){
+        if (!$this->get($this->codcliente)) {
             return false;
-        }else{
+        }else {
             return $this->get($this->codcliente);
         }
     }
 
     public function save() {
-        if($this->exists()){
+        if ($this->exists()) {
             $sql = "UPDATE ".$this->table_name." SET ".
             "codigo = ".$this->var2str($this->codigo).", ".
             "ocupantes = ".$this->intval($this->ocupantes).", ".
@@ -296,7 +296,7 @@ 
             "vehiculos = ".$this->intval($this->vehiculos)." ".
             "WHERE codcliente = ".$this->var2str($this->codcliente).";";
             return $this->db->exec($sql);
-        }else{
+        }else {
             $sql = "INSERT INTO ".$this->table_name." (codcliente, codigo, ocupantes, ocupantes5anos, ocupantes12anos, ocupantes18anos, ocupantes30anos, ocupantes50anos, ocupantes70anos, ocupantes71anos, informacion_discapacidad, propietario, profesion, ocupacion, ca_nombres, ca_apellidos, ca_telefono, ca_email, ca_propietario, ca_parentesco, ca_parentesco_obs, vehiculos) VALUES (".
             $this->var2str($this->codcliente).", ".
             $this->var2str($this->codigo).", ".
@@ -320,9 +320,9 @@ 
             $this->var2str($this->ca_parentesco).", ".
             $this->var2str($this->ca_parentesco_obs).", ".
             $this->intval($this->vehiculos).");";
-            if($this->db->exec($sql)){
+            if ($this->db->exec($sql)) {
                 return true;
-            }else{
+            }else {
                 return false;
             }
         }
@@ -336,14 +336,14 @@ 
         $clilist = array();
         $query = mb_strtolower($this->no_html($busqueda), 'UTF8');
 
-        $consulta = "SELECT * FROM " . $this->table_name . " WHERE ";
+        $consulta = "SELECT * FROM ".$this->table_name." WHERE ";
         if (is_numeric($query)) {
-            $consulta .= "(ca_telefono LIKE '%" . $query . "%' OR codigo LIKE '%" . $query . "%')";
-        } else {
+            $consulta .= "(ca_telefono LIKE '%".$query."%' OR codigo LIKE '%".$query."%')";
+        }else {
             $buscar = str_replace(' ', '%', $query);
-            $consulta .= "(lower(ca_nombres) LIKE '%" . $buscar . "%' OR lower(ca_apellidos) LIKE '%" . $buscar . "%'"
-                    . " OR lower(ocupacion) LIKE '%" . $buscar . "%' OR lower(profesion) LIKE '%" . $buscar . "%'"
-                    . " OR lower(ca_email) LIKE '%" . $buscar . "%')";
+            $consulta .= "(lower(ca_nombres) LIKE '%".$buscar."%' OR lower(ca_apellidos) LIKE '%".$buscar."%'"
+                    . " OR lower(ocupacion) LIKE '%".$buscar."%' OR lower(profesion) LIKE '%".$buscar."%'"
+                    . " OR lower(ca_email) LIKE '%".$buscar."%')";
         }
         $consulta .= " ORDER BY codcliente ASC";
 

Braces +6 added lines, -6 removed lines

@@ -216,7 +216,7 @@ 
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        } else{
             return false;
         }
     }
@@ -235,7 +235,7 @@ 
         if($data){
             $item = new residentes_informacion($data[0]);
             return $item->info_adicional($item);
-        }else{
+        } else{
             return false;
         }
     }
@@ -257,7 +257,7 @@ 
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        } else{
             return false;
         }
     }
@@ -265,7 +265,7 @@ 
     public function exists() {
         if(!$this->get($this->codcliente)){
             return false;
-        }else{
+        } else{
             return $this->get($this->codcliente);
         }
     }
@@ -296,7 +296,7 @@ 
             "vehiculos = ".$this->intval($this->vehiculos)." ".
             "WHERE codcliente = ".$this->var2str($this->codcliente).";";
             return $this->db->exec($sql);
-        }else{
+        } else{
             $sql = "INSERT INTO ".$this->table_name." (codcliente, codigo, ocupantes, ocupantes5anos, ocupantes12anos, ocupantes18anos, ocupantes30anos, ocupantes50anos, ocupantes70anos, ocupantes71anos, informacion_discapacidad, propietario, profesion, ocupacion, ca_nombres, ca_apellidos, ca_telefono, ca_email, ca_propietario, ca_parentesco, ca_parentesco_obs, vehiculos) VALUES (".
             $this->var2str($this->codcliente).", ".
             $this->var2str($this->codigo).", ".
@@ -322,7 +322,7 @@ 
             $this->intval($this->vehiculos).");";
             if($this->db->exec($sql)){
                 return true;
-            }else{
+            } else{
                 return false;
             }
         }