@@ -31,11 +31,11 @@ |
||
31 | 31 | class Factory |
32 | 32 | { |
33 | 33 | |
34 | - /** |
|
35 | - * Array of positioners for specific frame types |
|
36 | - * |
|
37 | - * @var AbstractPositioner[] |
|
38 | - */ |
|
34 | + /** |
|
35 | + * Array of positioners for specific frame types |
|
36 | + * |
|
37 | + * @var AbstractPositioner[] |
|
38 | + */ |
|
39 | 39 | protected static $_positioners; |
40 | 40 | |
41 | 41 | /** |
@@ -276,7 +276,7 @@ |
||
276 | 276 | protected static function getPositionerInstance($type) |
277 | 277 | { |
278 | 278 | if (!isset(self::$_positioners[$type])) { |
279 | - $class = '\\Dompdf\\Positioner\\'.$type; |
|
279 | + $class = '\\Dompdf\\Positioner\\' . $type; |
|
280 | 280 | self::$_positioners[$type] = new $class(); |
281 | 281 | } |
282 | 282 | return self::$_positioners[$type]; |
@@ -3810,8 +3810,12 @@ |
||
3810 | 3810 | die("Unable to stream pdf: headers already sent"); |
3811 | 3811 | } |
3812 | 3812 | |
3813 | - if (!isset($options["compress"])) $options["compress"] = true; |
|
3814 | - if (!isset($options["Attachment"])) $options["Attachment"] = true; |
|
3813 | + if (!isset($options["compress"])) { |
|
3814 | + $options["compress"] = true; |
|
3815 | + } |
|
3816 | + if (!isset($options["Attachment"])) { |
|
3817 | + $options["Attachment"] = true; |
|
3818 | + } |
|
3815 | 3819 | |
3816 | 3820 | $debug = !$options['compress']; |
3817 | 3821 | $tmp = ltrim($this->output($debug)); |
@@ -2409,8 +2409,8 @@ discard block |
||
2409 | 2409 | |
2410 | 2410 | case 'font': |
2411 | 2411 | $this->objects[$id]['fonts'][$options['fontNum']] = [ |
2412 | - 'objNum' => $options['objNum'], |
|
2413 | - 'fontNum' => $options['fontNum'] |
|
2412 | + 'objNum' => $options['objNum'], |
|
2413 | + 'fontNum' => $options['fontNum'] |
|
2414 | 2414 | ]; |
2415 | 2415 | break; |
2416 | 2416 | |
@@ -2504,8 +2504,8 @@ discard block |
||
2504 | 2504 | |
2505 | 2505 | case 'font': |
2506 | 2506 | $this->objects[$id]['fonts'][$options['fontNum']] = [ |
2507 | - 'objNum' => $options['objNum'], |
|
2508 | - 'fontNum' => $options['fontNum'] |
|
2507 | + 'objNum' => $options['objNum'], |
|
2508 | + 'fontNum' => $options['fontNum'] |
|
2509 | 2509 | ]; |
2510 | 2510 | break; |
2511 | 2511 | |
@@ -2732,7 +2732,7 @@ discard block |
||
2732 | 2732 | case 'ContactInfo': |
2733 | 2733 | if ($v !== null && $v !== '') { |
2734 | 2734 | $res .= "/$k (" . |
2735 | - ($encrypted ? $this->filterText($this->ARC4($v), false, false) : $v) . ") \n"; |
|
2735 | + ($encrypted ? $this->filterText($this->ARC4($v), false, false) : $v) . ") \n"; |
|
2736 | 2736 | } |
2737 | 2737 | break; |
2738 | 2738 | } |
@@ -4299,13 +4299,13 @@ discard block |
||
4299 | 4299 | function addSignature($signcert, $privkey, $password = '', $name = null, $location = null, $reason = null, $contactinfo = null) { |
4300 | 4300 | $sigId = ++$this->numObj; |
4301 | 4301 | $this->o_sig($sigId, 'new', [ |
4302 | - 'SignCert' => $signcert, |
|
4303 | - 'PrivKey' => $privkey, |
|
4304 | - 'Password' => $password, |
|
4305 | - 'Name' => $name, |
|
4306 | - 'Location' => $location, |
|
4307 | - 'Reason' => $reason, |
|
4308 | - 'ContactInfo' => $contactinfo |
|
4302 | + 'SignCert' => $signcert, |
|
4303 | + 'PrivKey' => $privkey, |
|
4304 | + 'Password' => $password, |
|
4305 | + 'Name' => $name, |
|
4306 | + 'Location' => $location, |
|
4307 | + 'Reason' => $reason, |
|
4308 | + 'ContactInfo' => $contactinfo |
|
4309 | 4309 | ]); |
4310 | 4310 | |
4311 | 4311 | return $sigId; |
@@ -4340,17 +4340,17 @@ discard block |
||
4340 | 4340 | ); |
4341 | 4341 | |
4342 | 4342 | $this->o_acroform($this->acroFormId, 'font', |
4343 | - ['objNum' => $font[0]['objNum'], 'fontNum' => $font[0]['fontNum']]); |
|
4343 | + ['objNum' => $font[0]['objNum'], 'fontNum' => $font[0]['fontNum']]); |
|
4344 | 4344 | |
4345 | 4345 | $fieldId = ++$this->numObj; |
4346 | 4346 | $this->o_field($fieldId, 'new', [ |
4347 | - 'rect' => [$x0, $y0, $x1, $y1], |
|
4348 | - 'F' => 4, |
|
4349 | - 'FT' => "/$type", |
|
4350 | - 'T' => $name, |
|
4351 | - 'Ff' => $ff, |
|
4352 | - 'pageid' => $this->currentPage, |
|
4353 | - 'da' => "$color /F$this->currentFontNum " . sprintf('%.1F Tf ', $size) |
|
4347 | + 'rect' => [$x0, $y0, $x1, $y1], |
|
4348 | + 'F' => 4, |
|
4349 | + 'FT' => "/$type", |
|
4350 | + 'T' => $name, |
|
4351 | + 'Ff' => $ff, |
|
4352 | + 'pageid' => $this->currentPage, |
|
4353 | + 'da' => "$color /F$this->currentFontNum " . sprintf('%.1F Tf ', $size) |
|
4354 | 4354 | ]); |
4355 | 4355 | |
4356 | 4356 | return $fieldId; |
@@ -4422,8 +4422,8 @@ discard block |
||
4422 | 4422 | { |
4423 | 4423 | $this->acroFormId = ++$this->numObj; |
4424 | 4424 | $this->o_acroform($this->acroFormId, 'new', [ |
4425 | - 'NeedAppearances' => $needAppearances ? 'true' : 'false', |
|
4426 | - 'SigFlags' => $sigFlags |
|
4425 | + 'NeedAppearances' => $needAppearances ? 'true' : 'false', |
|
4426 | + 'SigFlags' => $sigFlags |
|
4427 | 4427 | ]); |
4428 | 4428 | } |
4429 | 4429 |
@@ -27,24 +27,24 @@ discard block |
||
27 | 27 | const PDF_VERSION = '1.7'; |
28 | 28 | |
29 | 29 | const ACROFORM_SIG_SIGNATURESEXISTS = 0x0001; |
30 | - const ACROFORM_SIG_APPENDONLY = 0x0002; |
|
30 | + const ACROFORM_SIG_APPENDONLY = 0x0002; |
|
31 | 31 | |
32 | - const ACROFORM_FIELD_BUTTON = 'Btn'; |
|
33 | - const ACROFORM_FIELD_TEXT = 'Tx'; |
|
34 | - const ACROFORM_FIELD_CHOICE = 'Ch'; |
|
35 | - const ACROFORM_FIELD_SIG = 'Sig'; |
|
32 | + const ACROFORM_FIELD_BUTTON = 'Btn'; |
|
33 | + const ACROFORM_FIELD_TEXT = 'Tx'; |
|
34 | + const ACROFORM_FIELD_CHOICE = 'Ch'; |
|
35 | + const ACROFORM_FIELD_SIG = 'Sig'; |
|
36 | 36 | |
37 | - const ACROFORM_FIELD_READONLY = 0x0001; |
|
38 | - const ACROFORM_FIELD_REQUIRED = 0x0002; |
|
37 | + const ACROFORM_FIELD_READONLY = 0x0001; |
|
38 | + const ACROFORM_FIELD_REQUIRED = 0x0002; |
|
39 | 39 | |
40 | - const ACROFORM_FIELD_TEXT_MULTILINE = 0x1000; |
|
41 | - const ACROFORM_FIELD_TEXT_PASSWORD = 0x2000; |
|
42 | - const ACROFORM_FIELD_TEXT_RICHTEXT = 0x10000; |
|
40 | + const ACROFORM_FIELD_TEXT_MULTILINE = 0x1000; |
|
41 | + const ACROFORM_FIELD_TEXT_PASSWORD = 0x2000; |
|
42 | + const ACROFORM_FIELD_TEXT_RICHTEXT = 0x10000; |
|
43 | 43 | |
44 | - const ACROFORM_FIELD_CHOICE_COMBO = 0x20000; |
|
45 | - const ACROFORM_FIELD_CHOICE_EDIT = 0x40000; |
|
46 | - const ACROFORM_FIELD_CHOICE_SORT = 0x80000; |
|
47 | - const ACROFORM_FIELD_CHOICE_MULTISELECT = 0x200000; |
|
44 | + const ACROFORM_FIELD_CHOICE_COMBO = 0x20000; |
|
45 | + const ACROFORM_FIELD_CHOICE_EDIT = 0x40000; |
|
46 | + const ACROFORM_FIELD_CHOICE_SORT = 0x80000; |
|
47 | + const ACROFORM_FIELD_CHOICE_MULTISELECT = 0x200000; |
|
48 | 48 | |
49 | 49 | const XOBJECT_SUBTYPE_FORM = 'Form'; |
50 | 50 | |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | function __construct($pageSize = [0, 0, 612, 792], $isUnicode = false, $fontcache = '', $tmp = '') |
408 | 408 | { |
409 | 409 | $this->isUnicode = $isUnicode; |
410 | - $this->fontcache = rtrim($fontcache, DIRECTORY_SEPARATOR."/\\"); |
|
410 | + $this->fontcache = rtrim($fontcache, DIRECTORY_SEPARATOR . "/\\"); |
|
411 | 411 | $this->tmp = ($tmp !== '' ? $tmp : sys_get_temp_dir()); |
412 | 412 | $this->newDocument($pageSize); |
413 | 413 | |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | if (is_string($v)) { |
584 | 584 | $v = '/' . $v; |
585 | 585 | } elseif (is_int($v)) { |
586 | - $v = (string) $v; |
|
586 | + $v = (string)$v; |
|
587 | 587 | } elseif (is_bool($v)) { |
588 | 588 | $v = ($v ? 'true' : 'false'); |
589 | 589 | } elseif (is_array($v)) { |
@@ -2196,7 +2196,7 @@ discard block |
||
2196 | 2196 | // make the new object |
2197 | 2197 | $this->objects[$id] = ['t' => 'image', 'data' => &$options['data'], 'info' => []]; |
2198 | 2198 | |
2199 | - $info =& $this->objects[$id]['info']; |
|
2199 | + $info = & $this->objects[$id]['info']; |
|
2200 | 2200 | |
2201 | 2201 | $info['Type'] = '/XObject'; |
2202 | 2202 | $info['Subtype'] = '/Image'; |
@@ -2656,7 +2656,7 @@ discard block |
||
2656 | 2656 | |
2657 | 2657 | case 'byterange': |
2658 | 2658 | $o = &$this->objects[$id]; |
2659 | - $content =& $options['content']; |
|
2659 | + $content = & $options['content']; |
|
2660 | 2660 | $content_len = strlen($content); |
2661 | 2661 | $pos = strpos($content, sprintf("/ByteRange [ %'.010d", $id)); |
2662 | 2662 | $len = strlen('/ByteRange [ ********** ********** ********** ********** ]'); |
@@ -2710,7 +2710,7 @@ discard block |
||
2710 | 2710 | $this->encryptInit($id); |
2711 | 2711 | } |
2712 | 2712 | |
2713 | - $res .= "/ByteRange " .sprintf("[ %'.010d ********** ********** ********** ]\n", $id); |
|
2713 | + $res .= "/ByteRange " . sprintf("[ %'.010d ********** ********** ********** ]\n", $id); |
|
2714 | 2714 | $res .= "/Contents <" . str_pad('', $sign_maxlen, '0') . ">\n"; |
2715 | 2715 | $res .= "/Filter/Adobe.PPKLite\n"; //PPKMS \n"; |
2716 | 2716 | $res .= "/Type/Sig/SubFilter/adbe.pkcs7.detached \n"; |
@@ -4336,7 +4336,7 @@ discard block |
||
4336 | 4336 | $currentFontNum = $this->currentFontNum; |
4337 | 4337 | $font = array_filter( |
4338 | 4338 | $this->objects[$this->currentNode]['info']['fonts'], |
4339 | - function ($item) use ($currentFontNum) { return $item['fontNum'] == $currentFontNum; } |
|
4339 | + function($item) use ($currentFontNum) { return $item['fontNum'] == $currentFontNum; } |
|
4340 | 4340 | ); |
4341 | 4341 | |
4342 | 4342 | $this->o_acroform($this->acroFormId, 'font', |
@@ -5508,7 +5508,7 @@ discard block |
||
5508 | 5508 | // else assume that they are both scalar, anything else will probably error |
5509 | 5509 | if (is_array($label)) { |
5510 | 5510 | foreach ($label as $l => $v) { |
5511 | - $this->o_info($this->infoObject, $l, (string) $v); |
|
5511 | + $this->o_info($this->infoObject, $l, (string)$v); |
|
5512 | 5512 | } |
5513 | 5513 | } else { |
5514 | 5514 | $this->o_info($this->infoObject, $label, $value); |
@@ -210,7 +210,7 @@ |
||
210 | 210 | if (isset($previousChild, $nextChild)) { |
211 | 211 | if ($previousChild->nodeName === "#text" && $nextChild->nodeName === "#text") { |
212 | 212 | $previousChild->nodeValue .= $nextChild->nodeValue; |
213 | - $this->_remove_node($node, $children, $index+1); |
|
213 | + $this->_remove_node($node, $children, $index + 1); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | array_splice($children, $index, 1); |
@@ -43,9 +43,7 @@ |
||
43 | 43 | class_exists("PDFLib", false) |
44 | 44 | ) { |
45 | 45 | $class = "Dompdf\\Adapter\\PDFLib"; |
46 | - } |
|
47 | - |
|
48 | - else { |
|
46 | + } else { |
|
49 | 47 | if ($backend === "gd" && extension_loaded('gd')) { |
50 | 48 | $class = "Dompdf\\Adapter\\GD"; |
51 | 49 | } else { |
@@ -195,18 +195,18 @@ |
||
195 | 195 | "h" => null, |
196 | 196 | ]; |
197 | 197 | |
198 | - $this->_containing_block[0] =& $this->_containing_block["x"]; |
|
199 | - $this->_containing_block[1] =& $this->_containing_block["y"]; |
|
200 | - $this->_containing_block[2] =& $this->_containing_block["w"]; |
|
201 | - $this->_containing_block[3] =& $this->_containing_block["h"]; |
|
198 | + $this->_containing_block[0] = & $this->_containing_block["x"]; |
|
199 | + $this->_containing_block[1] = & $this->_containing_block["y"]; |
|
200 | + $this->_containing_block[2] = & $this->_containing_block["w"]; |
|
201 | + $this->_containing_block[3] = & $this->_containing_block["h"]; |
|
202 | 202 | |
203 | 203 | $this->_position = [ |
204 | 204 | "x" => null, |
205 | 205 | "y" => null, |
206 | 206 | ]; |
207 | 207 | |
208 | - $this->_position[0] =& $this->_position["x"]; |
|
209 | - $this->_position[1] =& $this->_position["y"]; |
|
208 | + $this->_position[0] = & $this->_position["x"]; |
|
209 | + $this->_position[1] = & $this->_position["y"]; |
|
210 | 210 | |
211 | 211 | $this->_opacity = 1.0; |
212 | 212 | $this->_decorator = null; |
@@ -999,8 +999,12 @@ discard block |
||
999 | 999 | die("Unable to stream image: headers already sent"); |
1000 | 1000 | } |
1001 | 1001 | |
1002 | - if (!isset($options["type"])) $options["type"] = "png"; |
|
1003 | - if (!isset($options["Attachment"])) $options["Attachment"] = true; |
|
1002 | + if (!isset($options["type"])) { |
|
1003 | + $options["type"] = "png"; |
|
1004 | + } |
|
1005 | + if (!isset($options["Attachment"])) { |
|
1006 | + $options["Attachment"] = true; |
|
1007 | + } |
|
1004 | 1008 | $type = strtolower($options["type"]); |
1005 | 1009 | |
1006 | 1010 | switch ($type) { |
@@ -1051,8 +1055,12 @@ discard block |
||
1051 | 1055 | */ |
1052 | 1056 | protected function _output($options = []) |
1053 | 1057 | { |
1054 | - if (!isset($options["type"])) $options["type"] = "png"; |
|
1055 | - if (!isset($options["page"])) $options["page"] = 1; |
|
1058 | + if (!isset($options["type"])) { |
|
1059 | + $options["type"] = "png"; |
|
1060 | + } |
|
1061 | + if (!isset($options["page"])) { |
|
1062 | + $options["page"] = 1; |
|
1063 | + } |
|
1056 | 1064 | $type = strtolower($options["type"]); |
1057 | 1065 | |
1058 | 1066 | if (isset($this->_imgs[$options["page"] - 1])) { |
@@ -875,7 +875,7 @@ discard block |
||
875 | 875 | $text = mb_encode_numericentity($text, [0x0080, 0xffff, 0, 0xffff], 'UTF-8'); |
876 | 876 | |
877 | 877 | // FIXME: word spacing |
878 | - list($x1, , $x2) = imagettfbbox($size, 0, $font, $text); |
|
878 | + list($x1,, $x2) = imagettfbbox($size, 0, $font, $text); |
|
879 | 879 | |
880 | 880 | // Add additional 1pt to prevent text overflow issues |
881 | 881 | return $this->_downscale($x2 - $x1) + 1; |
@@ -891,7 +891,7 @@ discard block |
||
891 | 891 | $font = ""; |
892 | 892 | } |
893 | 893 | |
894 | - if ( stripos($font, ".ttf") === false ) { |
|
894 | + if (stripos($font, ".ttf") === false) { |
|
895 | 895 | $font .= ".ttf"; |
896 | 896 | } |
897 | 897 | |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | $ratio = $this->_dompdf->getOptions()->getFontHeightRatio(); |
937 | 937 | |
938 | 938 | // FIXME: word spacing |
939 | - list(, $y2, , , , $y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl"); // Test string with ascenders, descenders and caps |
|
939 | + list(, $y2,,,, $y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl"); // Test string with ascenders, descenders and caps |
|
940 | 940 | return ($y2 - $y1) * $ratio; |
941 | 941 | } |
942 | 942 |
@@ -665,8 +665,8 @@ discard block |
||
665 | 665 | case "nth-of-type": |
666 | 666 | //FIXME: this fix-up is pretty ugly, would parsing the selector in reverse work better generally? |
667 | 667 | $descendant_delimeter = strrpos($query, "::"); |
668 | - $isChild = substr($query, $descendant_delimeter-5, 5) == "child"; |
|
669 | - $el = substr($query, $descendant_delimeter+2); |
|
668 | + $isChild = substr($query, $descendant_delimeter - 5, 5) == "child"; |
|
669 | + $el = substr($query, $descendant_delimeter + 2); |
|
670 | 670 | $query = substr($query, 0, strrpos($query, "/")) . ($isChild ? "/" : "//") . $el; |
671 | 671 | |
672 | 672 | $pseudo_classes[$tok] = true; |
@@ -696,8 +696,8 @@ discard block |
||
696 | 696 | case "nth-child": |
697 | 697 | //FIXME: this fix-up is pretty ugly, would parsing the selector in reverse work better generally? |
698 | 698 | $descendant_delimeter = strrpos($query, "::"); |
699 | - $isChild = substr($query, $descendant_delimeter-5, 5) == "child"; |
|
700 | - $el = substr($query, $descendant_delimeter+2); |
|
699 | + $isChild = substr($query, $descendant_delimeter - 5, 5) == "child"; |
|
700 | + $el = substr($query, $descendant_delimeter + 2); |
|
701 | 701 | $query = substr($query, 0, strrpos($query, "/")) . ($isChild ? "/" : "//") . "*"; |
702 | 702 | |
703 | 703 | $pseudo_classes[$tok] = true; |
@@ -1591,7 +1591,9 @@ discard block |
||
1591 | 1591 | } |
1592 | 1592 | $prop = trim($prop); |
1593 | 1593 | */ |
1594 | - if ($DEBUGCSS) print '('; |
|
1594 | + if ($DEBUGCSS) { |
|
1595 | + print '('; |
|
1596 | + } |
|
1595 | 1597 | |
1596 | 1598 | $important = false; |
1597 | 1599 | $prop = trim($prop); |
@@ -1606,24 +1608,32 @@ discard block |
||
1606 | 1608 | } |
1607 | 1609 | |
1608 | 1610 | if ($prop === "") { |
1609 | - if ($DEBUGCSS) print 'empty)'; |
|
1611 | + if ($DEBUGCSS) { |
|
1612 | + print 'empty)'; |
|
1613 | + } |
|
1610 | 1614 | continue; |
1611 | 1615 | } |
1612 | 1616 | |
1613 | 1617 | $i = mb_strpos($prop, ":"); |
1614 | 1618 | if ($i === false) { |
1615 | - if ($DEBUGCSS) print 'novalue' . $prop . ')'; |
|
1619 | + if ($DEBUGCSS) { |
|
1620 | + print 'novalue' . $prop . ')'; |
|
1621 | + } |
|
1616 | 1622 | continue; |
1617 | 1623 | } |
1618 | 1624 | |
1619 | 1625 | $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i))); |
1620 | 1626 | $value = ltrim(mb_substr($prop, $i + 1)); |
1621 | 1627 | |
1622 | - if ($DEBUGCSS) print $prop_name . ':=' . $value . ($important ? '!IMPORTANT' : '') . ')'; |
|
1628 | + if ($DEBUGCSS) { |
|
1629 | + print $prop_name . ':=' . $value . ($important ? '!IMPORTANT' : '') . ')'; |
|
1630 | + } |
|
1623 | 1631 | |
1624 | 1632 | $style->set_prop($prop_name, $value, $important, false); |
1625 | 1633 | } |
1626 | - if ($DEBUGCSS) print '_parse_properties]'; |
|
1634 | + if ($DEBUGCSS) { |
|
1635 | + print '_parse_properties]'; |
|
1636 | + } |
|
1627 | 1637 | |
1628 | 1638 | return $style; |
1629 | 1639 | } |
@@ -1643,12 +1653,16 @@ discard block |
||
1643 | 1653 | $DEBUGCSS = $this->_dompdf->getOptions()->getDebugCss(); |
1644 | 1654 | |
1645 | 1655 | $sections = explode("}", $str); |
1646 | - if ($DEBUGCSS) print '[_parse_sections'; |
|
1656 | + if ($DEBUGCSS) { |
|
1657 | + print '[_parse_sections'; |
|
1658 | + } |
|
1647 | 1659 | foreach ($sections as $sect) { |
1648 | 1660 | $i = mb_strpos($sect, "{"); |
1649 | 1661 | if ($i === false) { continue; } |
1650 | 1662 | |
1651 | - if ($DEBUGCSS) print '[section'; |
|
1663 | + if ($DEBUGCSS) { |
|
1664 | + print '[section'; |
|
1665 | + } |
|
1652 | 1666 | |
1653 | 1667 | $selector_str = preg_replace($patterns, $replacements, mb_substr($sect, 0, $i)); |
1654 | 1668 | $selectors = preg_split("/,(?![^\(]*\))/", $selector_str, 0, PREG_SPLIT_NO_EMPTY); |
@@ -1659,10 +1673,14 @@ discard block |
||
1659 | 1673 | $selector = trim($selector); |
1660 | 1674 | |
1661 | 1675 | if ($selector == "") { |
1662 | - if ($DEBUGCSS) print '#empty#'; |
|
1676 | + if ($DEBUGCSS) { |
|
1677 | + print '#empty#'; |
|
1678 | + } |
|
1663 | 1679 | continue; |
1664 | 1680 | } |
1665 | - if ($DEBUGCSS) print '#' . $selector . '#'; |
|
1681 | + if ($DEBUGCSS) { |
|
1682 | + print '#' . $selector . '#'; |
|
1683 | + } |
|
1666 | 1684 | //if ($DEBUGCSS) { if (strpos($selector,'p') !== false) print '!!!p!!!#'; } |
1667 | 1685 | |
1668 | 1686 | //FIXME: tag the selector with a hash of the media query to separate it from non-conditional styles (?), xpath comments are probably not what we want to do here |
@@ -28,8 +28,8 @@ |
||
28 | 28 | |
29 | 29 | // If the `top` value is `auto`, the frame will be repositioned |
30 | 30 | // after its height has been resolved |
31 | - $left = (float) $style->length_in_pt($style->left, $cbw); |
|
32 | - $top = (float) $style->length_in_pt($style->top, $cbh); |
|
31 | + $left = (float)$style->length_in_pt($style->left, $cbw); |
|
32 | + $top = (float)$style->length_in_pt($style->top, $cbh); |
|
33 | 33 | |
34 | 34 | $frame->set_position($cbx + $left, $cby + $top); |
35 | 35 | } else { |
@@ -111,7 +111,7 @@ |
||
111 | 111 | { |
112 | 112 | $style = $this->_frame->get_style(); |
113 | 113 | $pb = $this->_frame->get_padding_box(); |
114 | - $pb[3] = $pb["h"] = (float) $style->length_in_pt($style->height); |
|
114 | + $pb[3] = $pb["h"] = (float)$style->length_in_pt($style->height); |
|
115 | 115 | return $pb; |
116 | 116 | } |
117 | 117 |