@@ -72,8 +72,9 @@ |
||
72 | 72 | // Small hack to prevent extra indenting of list text on list_style_position === "inside" |
73 | 73 | // and on suppressed bullet |
74 | 74 | if ( $style->list_style_position === "outside" || |
75 | - $style->list_style_type === "none" ) |
|
76 | - return 0; |
|
75 | + $style->list_style_type === "none" ) { |
|
76 | + return 0; |
|
77 | + } |
|
77 | 78 | return $style->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING; |
78 | 79 | } |
79 | 80 |
@@ -61,8 +61,9 @@ |
||
61 | 61 | $p->add_line(); |
62 | 62 | $y = $p->get_current_line("y"); |
63 | 63 | |
64 | - } else |
|
65 | - $y = $cb["y"]; |
|
64 | + } else { |
|
65 | + $y = $cb["y"]; |
|
66 | + } |
|
66 | 67 | |
67 | 68 | $x = $cb["x"]; |
68 | 69 |
@@ -125,8 +125,9 @@ discard block |
||
125 | 125 | |
126 | 126 | // pre_r($words); |
127 | 127 | |
128 | - if ( $frame_width <= $available_width ) |
|
129 | - return false; |
|
128 | + if ( $frame_width <= $available_width ) { |
|
129 | + return false; |
|
130 | + } |
|
130 | 131 | |
131 | 132 | // Determine the split point |
132 | 133 | $width = 0; |
@@ -136,8 +137,9 @@ discard block |
||
136 | 137 | for ($i = 0; $i < count($words); $i += 2) { |
137 | 138 | $word = $words[$i] . (isset($words[$i+1]) ? $words[$i+1] : ""); |
138 | 139 | $word_width = Font_Metrics::get_text_width($word, $font, $size, $word_spacing); |
139 | - if ( $width + $word_width + $mbp_width > $available_width ) |
|
140 | - break; |
|
140 | + if ( $width + $word_width + $mbp_width > $available_width ) { |
|
141 | + break; |
|
142 | + } |
|
141 | 143 | |
142 | 144 | $width += $word_width; |
143 | 145 | $str .= $word; |
@@ -165,8 +167,9 @@ discard block |
||
165 | 167 | |
166 | 168 | protected function _newline_break($text) { |
167 | 169 | |
168 | - if ( ($i = mb_strpos($text, "\n")) === false) |
|
169 | - return false; |
|
170 | + if ( ($i = mb_strpos($text, "\n")) === false) { |
|
171 | + return false; |
|
172 | + } |
|
170 | 173 | |
171 | 174 | return $i+1; |
172 | 175 | |
@@ -217,8 +220,9 @@ discard block |
||
217 | 220 | default: |
218 | 221 | case "normal": |
219 | 222 | $this->_frame->set_text( $text = $this->_collapse_white_space($text) ); |
220 | - if ( $text == "" ) |
|
221 | - break; |
|
223 | + if ( $text == "" ) { |
|
224 | + break; |
|
225 | + } |
|
222 | 226 | |
223 | 227 | $split = $this->_line_break($text); |
224 | 228 | break; |
@@ -238,8 +242,9 @@ discard block |
||
238 | 242 | if ( ($tmp = $this->_line_break($text)) !== false ) { |
239 | 243 | $add_line = $split < $tmp; |
240 | 244 | $split = min($tmp, $split); |
241 | - } else |
|
242 | - $add_line = true; |
|
245 | + } else { |
|
246 | + $add_line = true; |
|
247 | + } |
|
243 | 248 | |
244 | 249 | break; |
245 | 250 | |
@@ -247,24 +252,27 @@ discard block |
||
247 | 252 | // Collapse white-space except for \n |
248 | 253 | $this->_frame->set_text( $text = preg_replace( "/[ \t]+/u", " ", $text ) ); |
249 | 254 | |
250 | - if ( $text == "" ) |
|
251 | - break; |
|
255 | + if ( $text == "" ) { |
|
256 | + break; |
|
257 | + } |
|
252 | 258 | |
253 | 259 | $split = $this->_newline_break($text); |
254 | 260 | |
255 | 261 | if ( ($tmp = $this->_line_break($text)) !== false ) { |
256 | 262 | $add_line = $split < $tmp; |
257 | 263 | $split = min($tmp, $split); |
258 | - } else |
|
259 | - $add_line = true; |
|
264 | + } else { |
|
265 | + $add_line = true; |
|
266 | + } |
|
260 | 267 | |
261 | 268 | break; |
262 | 269 | |
263 | 270 | } |
264 | 271 | |
265 | 272 | // Handle degenerate case |
266 | - if ( $text === "" ) |
|
267 | - return; |
|
273 | + if ( $text === "" ) { |
|
274 | + return; |
|
275 | + } |
|
268 | 276 | |
269 | 277 | if ( $split !== false) { |
270 | 278 | |
@@ -293,8 +301,9 @@ discard block |
||
293 | 301 | // Remove any trailing newlines |
294 | 302 | $t = $this->_frame->get_text(); |
295 | 303 | |
296 | - if ( $split > 1 && $t[$split-1] === "\n" ) |
|
297 | - $this->_frame->set_text( mb_substr($t, 0, -1) ); |
|
304 | + if ( $split > 1 && $t[$split-1] === "\n" ) { |
|
305 | + $this->_frame->set_text( mb_substr($t, 0, -1) ); |
|
306 | + } |
|
298 | 307 | |
299 | 308 | } |
300 | 309 |
@@ -267,25 +267,30 @@ discard block |
||
267 | 267 | // Store parsing warnings as messages (this is to prevent output to the |
268 | 268 | // browser if the html is ugly and the dom extension complains, |
269 | 269 | // preventing the pdf from being streamed.) |
270 | - if ( !$this->_protocol && !$this->_base_host && !$this->_base_path ) |
|
271 | - list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($file); |
|
270 | + if ( !$this->_protocol && !$this->_base_host && !$this->_base_path ) { |
|
271 | + list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($file); |
|
272 | + } |
|
272 | 273 | |
273 | 274 | if ( !DOMPDF_ENABLE_REMOTE && |
274 | - ($this->_protocol != "" && $this->_protocol !== "file://" ) ) |
|
275 | - throw new DOMPDF_Exception("Remote file requested, but DOMPDF_ENABLE_REMOTE is false."); |
|
275 | + ($this->_protocol != "" && $this->_protocol !== "file://" ) ) { |
|
276 | + throw new DOMPDF_Exception("Remote file requested, but DOMPDF_ENABLE_REMOTE is false."); |
|
277 | + } |
|
276 | 278 | |
277 | 279 | if ($this->_protocol == "" || $this->_protocol === "file://") { |
278 | 280 | |
279 | 281 | $realfile = realpath($file); |
280 | - if ( !$file ) |
|
281 | - throw new DOMPDF_Exception("File '$file' not found."); |
|
282 | + if ( !$file ) { |
|
283 | + throw new DOMPDF_Exception("File '$file' not found."); |
|
284 | + } |
|
282 | 285 | |
283 | - if ( strpos($realfile, DOMPDF_CHROOT) !== 0 ) |
|
284 | - throw new DOMPDF_Exception("Permission denied on $file."); |
|
286 | + if ( strpos($realfile, DOMPDF_CHROOT) !== 0 ) { |
|
287 | + throw new DOMPDF_Exception("Permission denied on $file."); |
|
288 | + } |
|
285 | 289 | |
286 | 290 | // Exclude dot files (e.g. .htaccess) |
287 | - if ( substr(basename($realfile),0,1) === "." ) |
|
288 | - throw new DOMPDF_Exception("Permission denied on $file."); |
|
291 | + if ( substr(basename($realfile),0,1) === "." ) { |
|
292 | + throw new DOMPDF_Exception("Permission denied on $file."); |
|
293 | + } |
|
289 | 294 | |
290 | 295 | $file = $realfile; |
291 | 296 | } |
@@ -396,8 +401,9 @@ discard block |
||
396 | 401 | // which states that the default media type is 'screen' |
397 | 402 | if ( $style->hasAttributes() && |
398 | 403 | ($media = $style->getAttribute("media")) && |
399 | - !in_array($media, $acceptedmedia) ) |
|
400 | - continue; |
|
404 | + !in_array($media, $acceptedmedia) ) { |
|
405 | + continue; |
|
406 | + } |
|
401 | 407 | |
402 | 408 | $css = ""; |
403 | 409 | if ( $style->hasChildNodes() ) { |
@@ -408,8 +414,9 @@ discard block |
||
408 | 414 | $child = $child->nextSibling; |
409 | 415 | } |
410 | 416 | |
411 | - } else |
|
412 | - $css = $style->nodeValue; |
|
417 | + } else { |
|
418 | + $css = $style->nodeValue; |
|
419 | + } |
|
413 | 420 | |
414 | 421 | // Set the base path of the Stylesheet to that of the file being processed |
415 | 422 | $this->_css->set_protocol($this->_protocol); |
@@ -530,8 +537,9 @@ discard block |
||
530 | 537 | global $_dompdf_warnings, $_dompdf_show_warnings; |
531 | 538 | if ( $_dompdf_show_warnings ) { |
532 | 539 | echo '<b>DOMPDF Warnings</b><br><pre>'; |
533 | - foreach ($_dompdf_warnings as $msg) |
|
534 | - echo $msg . "\n"; |
|
540 | + foreach ($_dompdf_warnings as $msg) { |
|
541 | + echo $msg . "\n"; |
|
542 | + } |
|
535 | 543 | echo $this->get_canvas()->get_cpdf()->messages; |
536 | 544 | echo '</pre>'; |
537 | 545 | flush(); |
@@ -544,8 +552,9 @@ discard block |
||
544 | 552 | * Add meta information to the PDF after rendering |
545 | 553 | */ |
546 | 554 | function add_info($label, $value) { |
547 | - if (!is_null($this->_pdf)) |
|
548 | - $this->_pdf->add_info($label, $value); |
|
555 | + if (!is_null($this->_pdf)) { |
|
556 | + $this->_pdf->add_info($label, $value); |
|
557 | + } |
|
549 | 558 | } |
550 | 559 | |
551 | 560 | //........................................................................ |
@@ -571,8 +580,9 @@ discard block |
||
571 | 580 | * @param array $options header options (see above) |
572 | 581 | */ |
573 | 582 | function stream($filename, $options = null) { |
574 | - if (!is_null($this->_pdf)) |
|
575 | - $this->_pdf->stream($filename, $options); |
|
583 | + if (!is_null($this->_pdf)) { |
|
584 | + $this->_pdf->stream($filename, $options); |
|
585 | + } |
|
576 | 586 | } |
577 | 587 | |
578 | 588 | /** |
@@ -591,8 +601,9 @@ discard block |
||
591 | 601 | */ |
592 | 602 | function output($options = null) { |
593 | 603 | |
594 | - if ( is_null($this->_pdf) ) |
|
595 | - return null; |
|
604 | + if ( is_null($this->_pdf) ) { |
|
605 | + return null; |
|
606 | + } |
|
596 | 607 | |
597 | 608 | return $this->_pdf->output( $options ); |
598 | 609 | } |
@@ -68,13 +68,15 @@ |
||
68 | 68 | foreach ($this->get_children() as $child) { |
69 | 69 | $display = $child->get_style()->display; |
70 | 70 | |
71 | - if ( $display !== "table-cell" ) |
|
72 | - $erroneous_frames[] = $child; |
|
71 | + if ( $display !== "table-cell" ) { |
|
72 | + $erroneous_frames[] = $child; |
|
73 | + } |
|
73 | 74 | } |
74 | 75 | |
75 | 76 | // dump the extra nodes after the table. |
76 | - foreach ($erroneous_frames as $frame) |
|
77 | - $p->move_after($frame); |
|
77 | + foreach ($erroneous_frames as $frame) { |
|
78 | + $p->move_after($frame); |
|
79 | + } |
|
78 | 80 | } |
79 | 81 | |
80 | 82 |
@@ -98,10 +98,12 @@ discard block |
||
98 | 98 | |
99 | 99 | if ( $width === "auto" && $left === "auto" && $right === "auto" ) { |
100 | 100 | |
101 | - if ( $lm === "auto" ) |
|
102 | - $lm = 0; |
|
103 | - if ( $rm === "auto" ) |
|
104 | - $rm = 0; |
|
101 | + if ( $lm === "auto" ) { |
|
102 | + $lm = 0; |
|
103 | + } |
|
104 | + if ( $rm === "auto" ) { |
|
105 | + $rm = 0; |
|
106 | + } |
|
105 | 107 | |
106 | 108 | // Technically, the width should be "shrink-to-fit" i.e. based on the |
107 | 109 | // preferred width of the content... a little too costly here as a |
@@ -112,33 +114,42 @@ discard block |
||
112 | 114 | |
113 | 115 | } else if ( $width === "auto" ) { |
114 | 116 | |
115 | - if ( $lm === "auto" ) |
|
116 | - $lm = 0; |
|
117 | - if ( $rm === "auto" ) |
|
118 | - $rm = 0; |
|
119 | - if ( $left === "auto" ) |
|
120 | - $left = 0; |
|
121 | - if ( $right === "auto" ) |
|
122 | - $right = 0; |
|
117 | + if ( $lm === "auto" ) { |
|
118 | + $lm = 0; |
|
119 | + } |
|
120 | + if ( $rm === "auto" ) { |
|
121 | + $rm = 0; |
|
122 | + } |
|
123 | + if ( $left === "auto" ) { |
|
124 | + $left = 0; |
|
125 | + } |
|
126 | + if ( $right === "auto" ) { |
|
127 | + $right = 0; |
|
128 | + } |
|
123 | 129 | |
124 | 130 | $width = $diff; |
125 | 131 | |
126 | 132 | } else if ( $left === "auto" ) { |
127 | - if ( $lm === "auto" ) |
|
128 | - $lm = 0; |
|
129 | - if ( $rm === "auto" ) |
|
130 | - $rm = 0; |
|
131 | - if ( $right === "auto" ) |
|
132 | - $right = 0; |
|
133 | + if ( $lm === "auto" ) { |
|
134 | + $lm = 0; |
|
135 | + } |
|
136 | + if ( $rm === "auto" ) { |
|
137 | + $rm = 0; |
|
138 | + } |
|
139 | + if ( $right === "auto" ) { |
|
140 | + $right = 0; |
|
141 | + } |
|
133 | 142 | |
134 | 143 | $left = $diff; |
135 | 144 | |
136 | 145 | } else if ( $right === "auto" ) { |
137 | 146 | |
138 | - if ( $lm === "auto" ) |
|
139 | - $lm = 0; |
|
140 | - if ( $rm === "auto" ) |
|
141 | - $rm = 0; |
|
147 | + if ( $lm === "auto" ) { |
|
148 | + $lm = 0; |
|
149 | + } |
|
150 | + if ( $rm === "auto" ) { |
|
151 | + $rm = 0; |
|
152 | + } |
|
142 | 153 | |
143 | 154 | $right = $diff; |
144 | 155 | } |
@@ -146,17 +157,15 @@ discard block |
||
146 | 157 | } else { |
147 | 158 | |
148 | 159 | // Find auto properties and get them to take up the slack |
149 | - if ( $width === "auto" ) |
|
150 | - $width = $diff; |
|
151 | - |
|
152 | - else if ( $lm === "auto" && $rm === "auto" ) |
|
153 | - $lm = $rm = round($diff / 2); |
|
154 | - |
|
155 | - else if ( $lm === "auto" ) |
|
156 | - $lm = $diff; |
|
157 | - |
|
158 | - else if ( $rm === "auto" ) |
|
159 | - $rm = $diff; |
|
160 | + if ( $width === "auto" ) { |
|
161 | + $width = $diff; |
|
162 | + } else if ( $lm === "auto" && $rm === "auto" ) { |
|
163 | + $lm = $rm = round($diff / 2); |
|
164 | + } else if ( $lm === "auto" ) { |
|
165 | + $lm = $diff; |
|
166 | + } else if ( $rm === "auto" ) { |
|
167 | + $rm = $diff; |
|
168 | + } |
|
160 | 169 | } |
161 | 170 | |
162 | 171 | } else if ($diff < 0) { |
@@ -176,14 +185,16 @@ discard block |
||
176 | 185 | $style = $this->_frame->get_style(); |
177 | 186 | $cb = $this->_frame->get_containing_block(); |
178 | 187 | |
179 | - if ( !isset($cb["w"]) ) |
|
180 | - throw new DOMPDF_Exception("Box property calculation requires containing block width"); |
|
188 | + if ( !isset($cb["w"]) ) { |
|
189 | + throw new DOMPDF_Exception("Box property calculation requires containing block width"); |
|
190 | + } |
|
181 | 191 | |
182 | 192 | // Treat width 100% as auto |
183 | - if ( $style->width === "100%" ) |
|
184 | - $width = "auto"; |
|
185 | - else |
|
186 | - $width = $style->length_in_pt($style->width, $cb["w"]); |
|
193 | + if ( $style->width === "100%" ) { |
|
194 | + $width = "auto"; |
|
195 | + } else { |
|
196 | + $width = $style->length_in_pt($style->width, $cb["w"]); |
|
197 | + } |
|
187 | 198 | |
188 | 199 | extract($this->_calculate_width($width)); |
189 | 200 | |
@@ -191,15 +202,18 @@ discard block |
||
191 | 202 | $min_width = $style->length_in_pt($style->min_width, $cb["w"]); |
192 | 203 | $max_width = $style->length_in_pt($style->max_width, $cb["w"]); |
193 | 204 | |
194 | - if ( $max_width !== "none" && $min_width > $max_width) |
|
195 | - // Swap 'em |
|
205 | + if ( $max_width !== "none" && $min_width > $max_width) { |
|
206 | + // Swap 'em |
|
196 | 207 | list($max_width, $min_width) = array($min_width, $max_width); |
208 | + } |
|
197 | 209 | |
198 | - if ( $max_width !== "none" && $width > $max_width ) |
|
199 | - extract($this->_calculate_width($max_width)); |
|
210 | + if ( $max_width !== "none" && $width > $max_width ) { |
|
211 | + extract($this->_calculate_width($max_width)); |
|
212 | + } |
|
200 | 213 | |
201 | - if ( $width < $min_width ) |
|
202 | - extract($this->_calculate_width($min_width)); |
|
214 | + if ( $width < $min_width ) { |
|
215 | + extract($this->_calculate_width($min_width)); |
|
216 | + } |
|
203 | 217 | |
204 | 218 | return array($width, $margin_left, $margin_right, $left, $right); |
205 | 219 | |
@@ -214,8 +228,9 @@ discard block |
||
214 | 228 | $height = 0; |
215 | 229 | |
216 | 230 | // Add the height of all lines |
217 | - foreach ($this->_frame->get_lines() as $line) |
|
218 | - $height += $line["h"]; |
|
231 | + foreach ($this->_frame->get_lines() as $line) { |
|
232 | + $height += $line["h"]; |
|
233 | + } |
|
219 | 234 | |
220 | 235 | return $height; |
221 | 236 | |
@@ -257,66 +272,80 @@ discard block |
||
257 | 272 | |
258 | 273 | if ( $height === "auto" && $top === "auto" && $bottom === "auto" ) { |
259 | 274 | |
260 | - if ( $margin_top === "auto" ) |
|
261 | - $margin_top = 0; |
|
262 | - if ( $margin_bottom === "auto" ) |
|
263 | - $margin_bottom = 0; |
|
275 | + if ( $margin_top === "auto" ) { |
|
276 | + $margin_top = 0; |
|
277 | + } |
|
278 | + if ( $margin_bottom === "auto" ) { |
|
279 | + $margin_bottom = 0; |
|
280 | + } |
|
264 | 281 | |
265 | 282 | $height = $diff; |
266 | 283 | |
267 | 284 | } else if ( $height === "auto" && $top === "auto" ) { |
268 | 285 | |
269 | - if ( $margin_top === "auto" ) |
|
270 | - $margin_top = 0; |
|
271 | - if ( $margin_bottom === "auto" ) |
|
272 | - $margin_bottom = 0; |
|
286 | + if ( $margin_top === "auto" ) { |
|
287 | + $margin_top = 0; |
|
288 | + } |
|
289 | + if ( $margin_bottom === "auto" ) { |
|
290 | + $margin_bottom = 0; |
|
291 | + } |
|
273 | 292 | |
274 | 293 | $height = $content_height; |
275 | 294 | $top = $diff - $content_height; |
276 | 295 | |
277 | 296 | } else if ( $height === "auto" && $bottom === "auto" ) { |
278 | 297 | |
279 | - if ( $margin_top === "auto" ) |
|
280 | - $margin_top = 0; |
|
281 | - if ( $margin_bottom === "auto" ) |
|
282 | - $margin_bottom = 0; |
|
298 | + if ( $margin_top === "auto" ) { |
|
299 | + $margin_top = 0; |
|
300 | + } |
|
301 | + if ( $margin_bottom === "auto" ) { |
|
302 | + $margin_bottom = 0; |
|
303 | + } |
|
283 | 304 | |
284 | 305 | $height = $content_height; |
285 | 306 | $bottom = $diff - $content_height; |
286 | 307 | |
287 | 308 | } else if ( $top === "auto" && $bottom === "auto" ) { |
288 | 309 | |
289 | - if ( $margin_top === "auto" ) |
|
290 | - $margin_top = 0; |
|
291 | - if ( $margin_bottom === "auto" ) |
|
292 | - $margin_bottom = 0; |
|
310 | + if ( $margin_top === "auto" ) { |
|
311 | + $margin_top = 0; |
|
312 | + } |
|
313 | + if ( $margin_bottom === "auto" ) { |
|
314 | + $margin_bottom = 0; |
|
315 | + } |
|
293 | 316 | |
294 | 317 | $bottom = $diff; |
295 | 318 | |
296 | 319 | } else if ( $top === "auto" ) { |
297 | 320 | |
298 | - if ( $margin_top === "auto" ) |
|
299 | - $margin_top = 0; |
|
300 | - if ( $margin_bottom === "auto" ) |
|
301 | - $margin_bottom = 0; |
|
321 | + if ( $margin_top === "auto" ) { |
|
322 | + $margin_top = 0; |
|
323 | + } |
|
324 | + if ( $margin_bottom === "auto" ) { |
|
325 | + $margin_bottom = 0; |
|
326 | + } |
|
302 | 327 | |
303 | 328 | $top = $diff; |
304 | 329 | |
305 | 330 | } else if ( $height === "auto" ) { |
306 | 331 | |
307 | - if ( $margin_top === "auto" ) |
|
308 | - $margin_top = 0; |
|
309 | - if ( $margin_bottom === "auto" ) |
|
310 | - $margin_bottom = 0; |
|
332 | + if ( $margin_top === "auto" ) { |
|
333 | + $margin_top = 0; |
|
334 | + } |
|
335 | + if ( $margin_bottom === "auto" ) { |
|
336 | + $margin_bottom = 0; |
|
337 | + } |
|
311 | 338 | |
312 | 339 | $height = $diff; |
313 | 340 | |
314 | 341 | } else if ( $bottom === "auto" ) { |
315 | 342 | |
316 | - if ( $margin_top === "auto" ) |
|
317 | - $margin_top = 0; |
|
318 | - if ( $margin_bottom === "auto" ) |
|
319 | - $margin_bottom = 0; |
|
343 | + if ( $margin_top === "auto" ) { |
|
344 | + $margin_top = 0; |
|
345 | + } |
|
346 | + if ( $margin_bottom === "auto" ) { |
|
347 | + $margin_bottom = 0; |
|
348 | + } |
|
320 | 349 | |
321 | 350 | $bottom = $diff; |
322 | 351 | |
@@ -325,16 +354,21 @@ discard block |
||
325 | 354 | if ( $style->overflow === "visible" ) { |
326 | 355 | |
327 | 356 | // set all autos to zero |
328 | - if ( $margin_top === "auto" ) |
|
329 | - $margin_top = 0; |
|
330 | - if ( $margin_bottom === "auto" ) |
|
331 | - $margin_bottom = 0; |
|
332 | - if ( $top === "auto" ) |
|
333 | - $top = 0; |
|
334 | - if ( $bottom === "auto" ) |
|
335 | - $bottom = 0; |
|
336 | - if ( $height === "auto" ) |
|
337 | - $height = $content_height; |
|
357 | + if ( $margin_top === "auto" ) { |
|
358 | + $margin_top = 0; |
|
359 | + } |
|
360 | + if ( $margin_bottom === "auto" ) { |
|
361 | + $margin_bottom = 0; |
|
362 | + } |
|
363 | + if ( $top === "auto" ) { |
|
364 | + $top = 0; |
|
365 | + } |
|
366 | + if ( $bottom === "auto" ) { |
|
367 | + $bottom = 0; |
|
368 | + } |
|
369 | + if ( $height === "auto" ) { |
|
370 | + $height = $content_height; |
|
371 | + } |
|
338 | 372 | |
339 | 373 | } |
340 | 374 | |
@@ -346,8 +380,9 @@ discard block |
||
346 | 380 | } else { |
347 | 381 | |
348 | 382 | // Expand the height if overflow is visible |
349 | - if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" ) |
|
350 | - $height = $content_height; |
|
383 | + if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" ) { |
|
384 | + $height = $content_height; |
|
385 | + } |
|
351 | 386 | |
352 | 387 | // FIXME: this should probably be moved to a seperate function as per |
353 | 388 | // _calculate_restricted_width |
@@ -365,26 +400,31 @@ discard block |
||
365 | 400 | |
366 | 401 | } else if ( isset($cb["w"]) ) { |
367 | 402 | |
368 | - if ( mb_strpos($min_height, "%") !== false ) |
|
369 | - $min_height = 0; |
|
370 | - else |
|
371 | - $min_height = $style->length_in_pt($min_height, $cb["w"]); |
|
403 | + if ( mb_strpos($min_height, "%") !== false ) { |
|
404 | + $min_height = 0; |
|
405 | + } else { |
|
406 | + $min_height = $style->length_in_pt($min_height, $cb["w"]); |
|
407 | + } |
|
372 | 408 | |
373 | - if ( mb_strpos($max_height, "%") !== false ) |
|
374 | - $max_height = "none"; |
|
375 | - else |
|
376 | - $max_height = $style->length_in_pt($max_height, $cb["w"]); |
|
409 | + if ( mb_strpos($max_height, "%") !== false ) { |
|
410 | + $max_height = "none"; |
|
411 | + } else { |
|
412 | + $max_height = $style->length_in_pt($max_height, $cb["w"]); |
|
413 | + } |
|
377 | 414 | } |
378 | 415 | |
379 | - if ( $max_height !== "none" && $min_height > $max_height ) |
|
380 | - // Swap 'em |
|
416 | + if ( $max_height !== "none" && $min_height > $max_height ) { |
|
417 | + // Swap 'em |
|
381 | 418 | list($max_height, $min_height) = array($min_height, $max_height); |
419 | + } |
|
382 | 420 | |
383 | - if ( $max_height !== "none" && $height > $max_height ) |
|
384 | - $height = $max_height; |
|
421 | + if ( $max_height !== "none" && $height > $max_height ) { |
|
422 | + $height = $max_height; |
|
423 | + } |
|
385 | 424 | |
386 | - if ( $height < $min_height ) |
|
387 | - $height = $min_height; |
|
425 | + if ( $height < $min_height ) { |
|
426 | + $height = $min_height; |
|
427 | + } |
|
388 | 428 | } |
389 | 429 | |
390 | 430 | } |
@@ -413,8 +453,9 @@ discard block |
||
413 | 453 | |
414 | 454 | // Move each child over by $dx |
415 | 455 | $dx = $width - $line["w"]; |
416 | - foreach($line["frames"] as $frame) |
|
417 | - $frame->set_position( $frame->get_position("x") + $dx ); |
|
456 | + foreach($line["frames"] as $frame) { |
|
457 | + $frame->set_position( $frame->get_position("x") + $dx ); |
|
458 | + } |
|
418 | 459 | |
419 | 460 | } |
420 | 461 | break; |
@@ -427,15 +468,17 @@ discard block |
||
427 | 468 | // just an aesthetic choice ;) |
428 | 469 | if ( $line["w"] > self::MIN_JUSTIFY_WIDTH * $width ) { |
429 | 470 | // Set the spacing for each child |
430 | - if ( $line["wc"] > 1 ) |
|
431 | - $spacing = ($width - $line["w"]) / ($line["wc"] - 1); |
|
432 | - else |
|
433 | - $spacing = 0; |
|
471 | + if ( $line["wc"] > 1 ) { |
|
472 | + $spacing = ($width - $line["w"]) / ($line["wc"] - 1); |
|
473 | + } else { |
|
474 | + $spacing = 0; |
|
475 | + } |
|
434 | 476 | |
435 | 477 | $dx = 0; |
436 | 478 | foreach($line["frames"] as $frame) { |
437 | - if ( !$frame instanceof Text_Frame_Decorator ) |
|
438 | - continue; |
|
479 | + if ( !$frame instanceof Text_Frame_Decorator ) { |
|
480 | + continue; |
|
481 | + } |
|
439 | 482 | |
440 | 483 | $frame->set_position( $frame->get_position("x") + $dx ); |
441 | 484 | $frame->set_text_spacing($spacing); |
@@ -454,8 +497,9 @@ discard block |
||
454 | 497 | foreach ($this->_frame->get_lines() as $i => $line) { |
455 | 498 | // Centre each line by moving each frame in the line by: |
456 | 499 | $dx = ($width - $line["w"]) / 2; |
457 | - foreach ($line["frames"] as $frame) |
|
458 | - $frame->set_position( $frame->get_position("x") + $dx ); |
|
500 | + foreach ($line["frames"] as $frame) { |
|
501 | + $frame->set_position( $frame->get_position("x") + $dx ); |
|
502 | + } |
|
459 | 503 | } |
460 | 504 | break; |
461 | 505 | } |
@@ -471,8 +515,9 @@ discard block |
||
471 | 515 | foreach ( $line["frames"] as $frame ) { |
472 | 516 | $style = $frame->get_style(); |
473 | 517 | |
474 | - if ( $style->display !== "inline" && $style->display !== "text" ) |
|
475 | - continue; |
|
518 | + if ( $style->display !== "inline" && $style->display !== "text" ) { |
|
519 | + continue; |
|
520 | + } |
|
476 | 521 | |
477 | 522 | $align = $style->vertical_align; |
478 | 523 | |
@@ -523,8 +568,9 @@ discard block |
||
523 | 568 | $page->check_forced_page_break($this->_frame); |
524 | 569 | |
525 | 570 | // Bail if the page is full |
526 | - if ( $page->is_full() ) |
|
527 | - return; |
|
571 | + if ( $page->is_full() ) { |
|
572 | + return; |
|
573 | + } |
|
528 | 574 | |
529 | 575 | // Collapse margins if required |
530 | 576 | $this->_collapse_margins(); |
@@ -575,15 +621,17 @@ discard block |
||
575 | 621 | foreach ( $this->_frame->get_children() as $child ) { |
576 | 622 | |
577 | 623 | // Bail out if the page is full |
578 | - if ( $page->is_full() ) |
|
579 | - break; |
|
624 | + if ( $page->is_full() ) { |
|
625 | + break; |
|
626 | + } |
|
580 | 627 | |
581 | 628 | $child->set_containing_block($cb_x, $cb_y, $w, $cb_h); |
582 | 629 | $child->reflow(); |
583 | 630 | |
584 | 631 | // Don't add the child to the line if a page break has occurred |
585 | - if ( $page->check_page_break($child) ) |
|
586 | - break; |
|
632 | + if ( $page->check_page_break($child) ) { |
|
633 | + break; |
|
634 | + } |
|
587 | 635 | |
588 | 636 | // If the frame is not absolutely positioned, It's okay to add the frame |
589 | 637 | // to the line |
@@ -63,8 +63,9 @@ discard block |
||
63 | 63 | |
64 | 64 | foreach ( $this->_frame->get_children() as $child) { |
65 | 65 | // Bail if the page is full |
66 | - if ( $page->is_full() ) |
|
67 | - return; |
|
66 | + if ( $page->is_full() ) { |
|
67 | + return; |
|
68 | + } |
|
68 | 69 | |
69 | 70 | $child->set_containing_block($cb["x"], $cb["y"], $cb["w"], $cb["h"]); |
70 | 71 | $child->reflow(); |
@@ -74,8 +75,9 @@ discard block |
||
74 | 75 | |
75 | 76 | } |
76 | 77 | |
77 | - if ( $page->is_full() ) |
|
78 | - return; |
|
78 | + if ( $page->is_full() ) { |
|
79 | + return; |
|
80 | + } |
|
79 | 81 | |
80 | 82 | $cellmap = $table->get_cellmap(); |
81 | 83 | $style->width = $cellmap->get_frame_width($this->_frame); |
@@ -83,9 +85,10 @@ discard block |
||
83 | 85 | |
84 | 86 | $this->_frame->set_position($cellmap->get_frame_position($this->_frame)); |
85 | 87 | |
86 | - if ( $table->get_style()->border_collapse === "collapse" ) |
|
87 | - // Unset our borders because our cells are now using them |
|
88 | + if ( $table->get_style()->border_collapse === "collapse" ) { |
|
89 | + // Unset our borders because our cells are now using them |
|
88 | 90 | $style->border_style = "none"; |
91 | + } |
|
89 | 92 | |
90 | 93 | } |
91 | 94 |
@@ -85,8 +85,9 @@ discard block |
||
85 | 85 | if (in_array( $num_rows - 1, $cells["rows"])) { |
86 | 86 | $draw_bottom = true; |
87 | 87 | $bottom_row = $cellmap->get_row($num_rows - 1); |
88 | - } else |
|
89 | - $draw_bottom = false; |
|
88 | + } else { |
|
89 | + $draw_bottom = false; |
|
90 | + } |
|
90 | 91 | |
91 | 92 | |
92 | 93 | // Draw the horizontal borders |
@@ -110,8 +111,9 @@ discard block |
||
110 | 111 | |
111 | 112 | if ( $draw_bottom ) { |
112 | 113 | $bp = $cellmap->get_border_properties($num_rows - 1, $j); |
113 | - if ( $bp["bottom"]["style"] === "none" || $bp["bottom"]["width"] <= 0 ) |
|
114 | - continue; |
|
114 | + if ( $bp["bottom"]["style"] === "none" || $bp["bottom"]["width"] <= 0 ) { |
|
115 | + continue; |
|
116 | + } |
|
115 | 117 | |
116 | 118 | $y = $bottom_row["y"] + $bottom_row["height"] + $bp["bottom"]["width"] / 2; |
117 | 119 | |
@@ -132,8 +134,9 @@ discard block |
||
132 | 134 | if (in_array($num_cols - 1, $cells["columns"])) { |
133 | 135 | $draw_right = true; |
134 | 136 | $right_col = $cellmap->get_column($num_cols - 1); |
135 | - } else |
|
136 | - $draw_right = false; |
|
137 | + } else { |
|
138 | + $draw_right = false; |
|
139 | + } |
|
137 | 140 | |
138 | 141 | // Draw the vertical borders |
139 | 142 | foreach ( $cells["rows"] as $i ) { |
@@ -159,8 +162,9 @@ discard block |
||
159 | 162 | |
160 | 163 | if ( $draw_right ) { |
161 | 164 | $bp = $cellmap->get_border_properties($i, $num_cols - 1); |
162 | - if ( $bp["right"]["style"] === "none" || $bp["right"]["width"] <= 0 ) |
|
163 | - continue; |
|
165 | + if ( $bp["right"]["style"] === "none" || $bp["right"]["width"] <= 0 ) { |
|
166 | + continue; |
|
167 | + } |
|
164 | 168 | |
165 | 169 | $x = $right_col["x"] + $right_col["used-width"] + $bp["right"]["width"] / 2; |
166 | 170 |
@@ -54,8 +54,9 @@ |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | function evaluate($code, $vars = array()) { |
57 | - if ( !DOMPDF_ENABLE_PHP ) |
|
58 | - return; |
|
57 | + if ( !DOMPDF_ENABLE_PHP ) { |
|
58 | + return; |
|
59 | + } |
|
59 | 60 | |
60 | 61 | // Set up some variables for the inline code |
61 | 62 | $pdf = $this->_canvas; |