eventespresso / event-espresso-core

vendor/phenx/php-svg-lib/src/Svg/Tag/Polyline.php

Indentation +23 added lines, -23 removed lines

@@ -10,31 +10,31 @@
 
 class Polyline extends Shape
 {
-    public function start($attributes)
-    {
-        $tmp = array();
-        preg_match_all('/([\-]*[0-9\.]+)/', $attributes['points'], $tmp, PREG_PATTERN_ORDER);
+	public function start($attributes)
+	{
+		$tmp = array();
+		preg_match_all('/([\-]*[0-9\.]+)/', $attributes['points'], $tmp, PREG_PATTERN_ORDER);
 
-        $points = $tmp[0];
-        $count = count($points);
+		$points = $tmp[0];
+		$count = count($points);
 
-        if ($count < 4) {
-            // nothing to draw
-            return;
-        }
+		if ($count < 4) {
+			// nothing to draw
+			return;
+		}
 
-        $surface = $this->document->getSurface();
-        list($x, $y) = $points;
-        $surface->moveTo($x, $y);
+		$surface = $this->document->getSurface();
+		list($x, $y) = $points;
+		$surface->moveTo($x, $y);
 
-        for ($i = 2; $i < $count; $i += 2) {
-            if ($i + 1 === $count) {
-                // invalid trailing point
-                continue;
-            }
-            $x = $points[$i];
-            $y = $points[$i + 1];
-            $surface->lineTo($x, $y);
-        }
-    }
+		for ($i = 2; $i < $count; $i += 2) {
+			if ($i + 1 === $count) {
+				// invalid trailing point
+				continue;
+			}
+			$x = $points[$i];
+			$y = $points[$i + 1];
+			$surface->lineTo($x, $y);
+		}
+	}
 } 

vendor/phenx/php-svg-lib/src/Svg/Tag/Image.php

Indentation +42 added lines, -42 removed lines

@@ -12,57 +12,57 @@
 
 class Image extends AbstractTag
 {
-    protected $x = 0;
-    protected $y = 0;
-    protected $width = 0;
-    protected $height = 0;
-    protected $href = null;
+	protected $x = 0;
+	protected $y = 0;
+	protected $width = 0;
+	protected $height = 0;
+	protected $href = null;
 
-    protected function before($attributes)
-    {
-        parent::before($attributes);
+	protected function before($attributes)
+	{
+		parent::before($attributes);
 
-        $surface = $this->document->getSurface();
-        $surface->save();
+		$surface = $this->document->getSurface();
+		$surface->save();
 
-        $this->applyTransform($attributes);
-    }
+		$this->applyTransform($attributes);
+	}
 
-    public function start($attributes)
-    {
-        $height = $this->document->getHeight();
-        $width = $this->document->getWidth();
-        $this->y = $height;
+	public function start($attributes)
+	{
+		$height = $this->document->getHeight();
+		$width = $this->document->getWidth();
+		$this->y = $height;
 
-        if (isset($attributes['x'])) {
-            $this->x = $this->convertSize($attributes['x'], $width);
-        }
-        if (isset($attributes['y'])) {
-            $this->y = $height - $this->convertSize($attributes['y'], $height);
-        }
+		if (isset($attributes['x'])) {
+			$this->x = $this->convertSize($attributes['x'], $width);
+		}
+		if (isset($attributes['y'])) {
+			$this->y = $height - $this->convertSize($attributes['y'], $height);
+		}
 
-        if (isset($attributes['width'])) {
-            $this->width = $this->convertSize($attributes['width'], $width);
-        }
-        if (isset($attributes['height'])) {
-            $this->height = $this->convertSize($attributes['height'], $height);
-        }
+		if (isset($attributes['width'])) {
+			$this->width = $this->convertSize($attributes['width'], $width);
+		}
+		if (isset($attributes['height'])) {
+			$this->height = $this->convertSize($attributes['height'], $height);
+		}
 
-        if (isset($attributes['xlink:href'])) {
-            $this->href = $attributes['xlink:href'];
-        }
+		if (isset($attributes['xlink:href'])) {
+			$this->href = $attributes['xlink:href'];
+		}
 
-        if (isset($attributes['href'])) {
-            $this->href = $attributes['href'];
-        }
+		if (isset($attributes['href'])) {
+			$this->href = $attributes['href'];
+		}
 
-        $this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
+		$this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
 
-        $this->document->getSurface()->drawImage($this->href, $this->x, $this->y, $this->width, $this->height);
-    }
+		$this->document->getSurface()->drawImage($this->href, $this->x, $this->y, $this->width, $this->height);
+	}
 
-    protected function after()
-    {
-        $this->document->getSurface()->restore();
-    }
+	protected function after()
+	{
+		$this->document->getSurface()->restore();
+	}
 } 

vendor/phenx/php-svg-lib/src/Svg/Tag/Shape.php

Indentation +33 added lines, -33 removed lines

@@ -12,34 +12,34 @@ 
 
 class Shape extends AbstractTag
 {
-    protected function before($attributes)
-    {
-        $surface = $this->document->getSurface();
+	protected function before($attributes)
+	{
+		$surface = $this->document->getSurface();
 
-        $surface->save();
+		$surface->save();
 
-        $style = $this->makeStyle($attributes);
+		$style = $this->makeStyle($attributes);
 
-        $this->setStyle($style);
-        $surface->setStyle($style);
+		$this->setStyle($style);
+		$surface->setStyle($style);
 
-        $this->applyTransform($attributes);
-    }
+		$this->applyTransform($attributes);
+	}
 
-    protected function after()
-    {
-        $surface = $this->document->getSurface();
+	protected function after()
+	{
+		$surface = $this->document->getSurface();
 
-        if ($this->hasShape) {
-            $style = $surface->getStyle();
+		if ($this->hasShape) {
+			$style = $surface->getStyle();
 
-            $fill   = $style->fill   && is_array($style->fill);
-            $stroke = $style->stroke && is_array($style->stroke);
+			$fill   = $style->fill   && is_array($style->fill);
+			$stroke = $style->stroke && is_array($style->stroke);
 
-            if ($fill) {
-                if ($stroke) {
-                    $surface->fillStroke(false);
-                } else {
+			if ($fill) {
+				if ($stroke) {
+					$surface->fillStroke(false);
+				} else {
 //                    if (is_string($style->fill)) {
 //                        /** @var LinearGradient|RadialGradient $gradient */
 //                        $gradient = $this->getDocument()->getDef($style->fill);
@@ -47,17 +47,17 @@ 
 //                        var_dump($gradient->getStops());
 //                    }
 
-                    $surface->fill();
-                }
-            }
-            elseif ($stroke) {
-                $surface->stroke(false);
-            }
-            else {
-                $surface->endPath();
-            }
-        }
-
-        $surface->restore();
-    }
+					$surface->fill();
+				}
+			}
+			elseif ($stroke) {
+				$surface->stroke(false);
+			}
+			else {
+				$surface->endPath();
+			}
+		}
+
+		$surface->restore();
+	}
 } 
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -49,11 +49,9 @@
 
                     $surface->fill();
                 }
-            }
-            elseif ($stroke) {
+            } elseif ($stroke) {
                 $surface->stroke(false);
-            }
-            else {
+            } else {
                 $surface->endPath();
             }
         }

vendor/phenx/php-svg-lib/src/Svg/Tag/Path.php

Indentation +560 added lines, -560 removed lines

@@ -12,565 +12,565 @@
 
 class Path extends Shape
 {
-    // kindly borrowed from fabric.util.parsePath.
-    /* @see https://github.com/fabricjs/fabric.js/blob/master/src/util/path.js#L664 */
-    const NUMBER_PATTERN = '([-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?)\s*';
-    const COMMA_PATTERN = '(?:\s+,?\s*|,\s*)?';
-    const FLAG_PATTERN = '([01])';
-    const ARC_REGEXP = '/'
-        . self::NUMBER_PATTERN
-        . self::COMMA_PATTERN
-        . self::NUMBER_PATTERN
-        . self::COMMA_PATTERN
-        . self::NUMBER_PATTERN
-        . self::COMMA_PATTERN
-        . self::FLAG_PATTERN
-        . self::COMMA_PATTERN
-        . self::FLAG_PATTERN
-        . self::COMMA_PATTERN
-        . self::NUMBER_PATTERN
-        . self::COMMA_PATTERN
-        . self::NUMBER_PATTERN
-        . '/';
-
-    static $commandLengths = array(
-        'm' => 2,
-        'l' => 2,
-        'h' => 1,
-        'v' => 1,
-        'c' => 6,
-        's' => 4,
-        'q' => 4,
-        't' => 2,
-        'a' => 7,
-    );
-
-    static $repeatedCommands = array(
-        'm' => 'l',
-        'M' => 'L',
-    );
-
-    public static function parse(string $commandSequence): array
-    {
-        $commands = array();
-        preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $commandSequence, $commands, PREG_SET_ORDER);
+	// kindly borrowed from fabric.util.parsePath.
+	/* @see https://github.com/fabricjs/fabric.js/blob/master/src/util/path.js#L664 */
+	const NUMBER_PATTERN = '([-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?)\s*';
+	const COMMA_PATTERN = '(?:\s+,?\s*|,\s*)?';
+	const FLAG_PATTERN = '([01])';
+	const ARC_REGEXP = '/'
+		. self::NUMBER_PATTERN
+		. self::COMMA_PATTERN
+		. self::NUMBER_PATTERN
+		. self::COMMA_PATTERN
+		. self::NUMBER_PATTERN
+		. self::COMMA_PATTERN
+		. self::FLAG_PATTERN
+		. self::COMMA_PATTERN
+		. self::FLAG_PATTERN
+		. self::COMMA_PATTERN
+		. self::NUMBER_PATTERN
+		. self::COMMA_PATTERN
+		. self::NUMBER_PATTERN
+		. '/';
+
+	static $commandLengths = array(
+		'm' => 2,
+		'l' => 2,
+		'h' => 1,
+		'v' => 1,
+		'c' => 6,
+		's' => 4,
+		'q' => 4,
+		't' => 2,
+		'a' => 7,
+	);
+
+	static $repeatedCommands = array(
+		'm' => 'l',
+		'M' => 'L',
+	);
+
+	public static function parse(string $commandSequence): array
+	{
+		$commands = array();
+		preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $commandSequence, $commands, PREG_SET_ORDER);
         
-        $path = array();
-        foreach ($commands as $c) {
-            if (count($c) == 3) {
-                $commandLower = strtolower($c[1]);
-
-                // arcs have special flags that apparently don't require spaces.
-                if ($commandLower === 'a' && preg_match_all(static::ARC_REGEXP, $c[2], $matches, PREG_PATTERN_ORDER)) {
-                    $numberOfMatches = count($matches[0]);
-                    for ($k = 0; $k < $numberOfMatches; ++$k) {
-                        $path[] = [
-                            $c[1],
-                            $matches[1][$k],
-                            $matches[2][$k],
-                            $matches[3][$k],
-                            $matches[4][$k],
-                            $matches[5][$k],
-                            $matches[6][$k],
-                            $matches[7][$k],
-                        ];
-                    }
-                    continue;
-                }
-
-                $arguments = array();
-                preg_match_all('/([-+]?((\d+\.\d+)|((\d+)|(\.\d+)))(?:e[-+]?\d+)?)/i', $c[2], $arguments, PREG_PATTERN_ORDER);
-                $item = $arguments[0];
-
-                if (
-                    isset(self::$commandLengths[$commandLower]) &&
-                    ($commandLength = self::$commandLengths[$commandLower]) &&
-                    count($item) > $commandLength
-                ) {
-                    $repeatedCommand = isset(self::$repeatedCommands[$c[1]]) ? self::$repeatedCommands[$c[1]] : $c[1];
-                    $command = $c[1];
-
-                    for ($k = 0, $klen = count($item); $k < $klen; $k += $commandLength) {
-                        $_item = array_slice($item, $k, $k + $commandLength);
-                        array_unshift($_item, $command);
-                        $path[] = $_item;
-
-                        $command = $repeatedCommand;
-                    }
-                } else {
-                    array_unshift($item, $c[1]);
-                    $path[] = $item;
-                }
-
-            } else {
-                $item = array($c[1]);
-
-                $path[] = $item;
-            }
-        }
-
-        return $path;
-    }
-
-    public function start($attributes)
-    {
-        if (!isset($attributes['d'])) {
-            $this->hasShape = false;
-
-            return;
-        }
-
-        $path = static::parse($attributes['d']);
-        $surface = $this->document->getSurface();
-
-        // From https://github.com/kangax/fabric.js/blob/master/src/shapes/path.class.js
-        $current = null; // current instruction
-        $previous = null;
-        $subpathStartX = 0;
-        $subpathStartY = 0;
-        $x = 0; // current x
-        $y = 0; // current y
-        $controlX = 0; // current control point x
-        $controlY = 0; // current control point y
-        $tempX = null;
-        $tempY = null;
-        $tempControlX = null;
-        $tempControlY = null;
-        $l = 0; //-((this.width / 2) + $this.pathOffset.x),
-        $t = 0; //-((this.height / 2) + $this.pathOffset.y),
-
-        foreach ($path as $current) {
-            switch ($current[0]) { // first letter
-                case 'l': // lineto, relative
-                    $x += $current[1];
-                    $y += $current[2];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'L': // lineto, absolute
-                    $x = $current[1];
-                    $y = $current[2];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'h': // horizontal lineto, relative
-                    $x += $current[1];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'H': // horizontal lineto, absolute
-                    $x = $current[1];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'v': // vertical lineto, relative
-                    $y += $current[1];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'V': // verical lineto, absolute
-                    $y = $current[1];
-                    $surface->lineTo($x + $l, $y + $t);
-                    break;
-
-                case 'm': // moveTo, relative
-                    $x += $current[1];
-                    $y += $current[2];
-                    $subpathStartX = $x;
-                    $subpathStartY = $y;
-                    $surface->moveTo($x + $l, $y + $t);
-                    break;
-
-                case 'M': // moveTo, absolute
-                    $x = $current[1];
-                    $y = $current[2];
-                    $subpathStartX = $x;
-                    $subpathStartY = $y;
-                    $surface->moveTo($x + $l, $y + $t);
-                    break;
-
-                case 'c': // bezierCurveTo, relative
-                    $tempX = $x + $current[5];
-                    $tempY = $y + $current[6];
-                    $controlX = $x + $current[3];
-                    $controlY = $y + $current[4];
-                    $surface->bezierCurveTo(
-                        $x + $current[1] + $l, // x1
-                        $y + $current[2] + $t, // y1
-                        $controlX + $l, // x2
-                        $controlY + $t, // y2
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-                    break;
-
-                case 'C': // bezierCurveTo, absolute
-                    $x = $current[5];
-                    $y = $current[6];
-                    $controlX = $current[3];
-                    $controlY = $current[4];
-                    $surface->bezierCurveTo(
-                        $current[1] + $l,
-                        $current[2] + $t,
-                        $controlX + $l,
-                        $controlY + $t,
-                        $x + $l,
-                        $y + $t
-                    );
-                    break;
-
-                case 's': // shorthand cubic bezierCurveTo, relative
-
-                    // transform to absolute x,y
-                    $tempX = $x + $current[3];
-                    $tempY = $y + $current[4];
-
-                    if (!preg_match('/[CcSs]/', $previous[0])) {
-                        // If there is no previous command or if the previous command was not a C, c, S, or s,
-                        // the control point is coincident with the current point
-                        $controlX = $x;
-                        $controlY = $y;
-                    } else {
-                        // calculate reflection of previous control points
-                        $controlX = 2 * $x - $controlX;
-                        $controlY = 2 * $y - $controlY;
-                    }
-
-                    $surface->bezierCurveTo(
-                        $controlX + $l,
-                        $controlY + $t,
-                        $x + $current[1] + $l,
-                        $y + $current[2] + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    // set control point to 2nd one of this command
-                    // "... the first control point is assumed to be
-                    // the reflection of the second control point on
-                    // the previous command relative to the current point."
-                    $controlX = $x + $current[1];
-                    $controlY = $y + $current[2];
-
-                    $x = $tempX;
-                    $y = $tempY;
-                    break;
-
-                case 'S': // shorthand cubic bezierCurveTo, absolute
-                    $tempX = $current[3];
-                    $tempY = $current[4];
-
-                    if (!preg_match('/[CcSs]/', $previous[0])) {
-                        // If there is no previous command or if the previous command was not a C, c, S, or s,
-                        // the control point is coincident with the current point
-                        $controlX = $x;
-                        $controlY = $y;
-                    } else {
-                        // calculate reflection of previous control points
-                        $controlX = 2 * $x - $controlX;
-                        $controlY = 2 * $y - $controlY;
-                    }
-
-                    $surface->bezierCurveTo(
-                        $controlX + $l,
-                        $controlY + $t,
-                        $current[1] + $l,
-                        $current[2] + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-
-                    // set control point to 2nd one of this command
-                    // "... the first control point is assumed to be
-                    // the reflection of the second control point on
-                    // the previous command relative to the current point."
-                    $controlX = $current[1];
-                    $controlY = $current[2];
-
-                    break;
-
-                case 'q': // quadraticCurveTo, relative
-                    // transform to absolute x,y
-                    $tempX = $x + $current[3];
-                    $tempY = $y + $current[4];
-
-                    $controlX = $x + $current[1];
-                    $controlY = $y + $current[2];
-
-                    $surface->quadraticCurveTo(
-                        $controlX + $l,
-                        $controlY + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-                    break;
-
-                case 'Q': // quadraticCurveTo, absolute
-                    $tempX = $current[3];
-                    $tempY = $current[4];
-
-                    $surface->quadraticCurveTo(
-                        $current[1] + $l,
-                        $current[2] + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-                    $controlX = $current[1];
-                    $controlY = $current[2];
-                    break;
-
-                case 't': // shorthand quadraticCurveTo, relative
-
-                    // transform to absolute x,y
-                    $tempX = $x + $current[1];
-                    $tempY = $y + $current[2];
-
-                    // calculate reflection of previous control points
-                    if (preg_match('/[QqT]/', $previous[0])) {
-                        $controlX = 2 * $x - $controlX;
-                        $controlY = 2 * $y - $controlY;
-                    } elseif ($previous[0] === 't') {
-                        $controlX = 2 * $x - $tempControlX;
-                        $controlY = 2 * $y - $tempControlY;
-                    } else {
-                        $controlX = $x;
-                        $controlY = $y;
-                    }
-
-                    $tempControlX = $controlX;
-                    $tempControlY = $controlY;
-
-                    $surface->quadraticCurveTo(
-                        $controlX + $l,
-                        $controlY + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-                    break;
-
-                case 'T':
-                    $tempX = $current[1];
-                    $tempY = $current[2];
-
-                    // calculate reflection of previous control points
-                    if (preg_match('/[QqTt]/', $previous[0])) {
-                        $controlX = 2 * $x - $controlX;
-                        $controlY = 2 * $y - $controlY;
-                    } else {
-                        $controlX = $x;
-                        $controlY = $y;
-                    }
-
-                    $surface->quadraticCurveTo(
-                        $controlX + $l,
-                        $controlY + $t,
-                        $tempX + $l,
-                        $tempY + $t
-                    );
-                    $x = $tempX;
-                    $y = $tempY;
-                    break;
-
-                case 'a':
-                    $this->drawArc(
-                        $surface,
-                        $x + $l,
-                        $y + $t,
-                        array(
-                            $current[1],
-                            $current[2],
-                            $current[3],
-                            $current[4],
-                            $current[5],
-                            $current[6] + $x + $l,
-                            $current[7] + $y + $t
-                        )
-                    );
-                    $x += $current[6];
-                    $y += $current[7];
-                    break;
-
-                case 'A':
-                    // TODO: optimize this
-                    $this->drawArc(
-                        $surface,
-                        $x + $l,
-                        $y + $t,
-                        array(
-                            $current[1],
-                            $current[2],
-                            $current[3],
-                            $current[4],
-                            $current[5],
-                            $current[6] + $l,
-                            $current[7] + $t
-                        )
-                    );
-                    $x = $current[6];
-                    $y = $current[7];
-                    break;
-
-                case 'z':
-                case 'Z':
-                    $x = $subpathStartX;
-                    $y = $subpathStartY;
-                    $surface->closePath();
-                    break;
-            }
-            $previous = $current;
-        }
-    }
-
-    function drawArc(SurfaceInterface $surface, $fx, $fy, $coords)
-    {
-        $rx = $coords[0];
-        $ry = $coords[1];
-        $rot = $coords[2];
-        $large = $coords[3];
-        $sweep = $coords[4];
-        $tx = $coords[5];
-        $ty = $coords[6];
-        $segs = array(
-            array(),
-            array(),
-            array(),
-            array(),
-        );
-
-        $toX = $tx - $fx;
-        $toY = $ty - $fy;
-
-        if ($toX + $toY === 0) {
-            return;
-        }
-
-        $segsNorm = $this->arcToSegments($toX, $toY, $rx, $ry, $large, $sweep, $rot);
-
-        for ($i = 0, $len = count($segsNorm); $i < $len; $i++) {
-            $segs[$i][0] = $segsNorm[$i][0] + $fx;
-            $segs[$i][1] = $segsNorm[$i][1] + $fy;
-            $segs[$i][2] = $segsNorm[$i][2] + $fx;
-            $segs[$i][3] = $segsNorm[$i][3] + $fy;
-            $segs[$i][4] = $segsNorm[$i][4] + $fx;
-            $segs[$i][5] = $segsNorm[$i][5] + $fy;
-
-            call_user_func_array(array($surface, "bezierCurveTo"), $segs[$i]);
-        }
-    }
-
-    function arcToSegments($toX, $toY, $rx, $ry, $large, $sweep, $rotateX)
-    {
-        $th = $rotateX * M_PI / 180;
-        $sinTh = sin($th);
-        $cosTh = cos($th);
-        $fromX = 0;
-        $fromY = 0;
-
-        $rx = abs($rx);
-        $ry = abs($ry);
-
-        $px = -$cosTh * $toX * 0.5 - $sinTh * $toY * 0.5;
-        $py = -$cosTh * $toY * 0.5 + $sinTh * $toX * 0.5;
-        $rx2 = $rx * $rx;
-        $ry2 = $ry * $ry;
-        $py2 = $py * $py;
-        $px2 = $px * $px;
-        $pl = $rx2 * $ry2 - $rx2 * $py2 - $ry2 * $px2;
-        $root = 0;
-
-        if ($pl < 0) {
-            $s = sqrt(1 - $pl / ($rx2 * $ry2));
-            $rx *= $s;
-            $ry *= $s;
-        } else {
-            $root = ($large == $sweep ? -1.0 : 1.0) * sqrt($pl / ($rx2 * $py2 + $ry2 * $px2));
-        }
-
-        $cx = $root * $rx * $py / $ry;
-        $cy = -$root * $ry * $px / $rx;
-        $cx1 = $cosTh * $cx - $sinTh * $cy + $toX * 0.5;
-        $cy1 = $sinTh * $cx + $cosTh * $cy + $toY * 0.5;
-        $mTheta = $this->calcVectorAngle(1, 0, ($px - $cx) / $rx, ($py - $cy) / $ry);
-        $dtheta = $this->calcVectorAngle(($px - $cx) / $rx, ($py - $cy) / $ry, (-$px - $cx) / $rx, (-$py - $cy) / $ry);
-
-        if ($sweep == 0 && $dtheta > 0) {
-            $dtheta -= 2 * M_PI;
-        } else {
-            if ($sweep == 1 && $dtheta < 0) {
-                $dtheta += 2 * M_PI;
-            }
-        }
-
-        // $Convert $into $cubic $bezier $segments <= 90deg
-        $segments = ceil(abs($dtheta / M_PI * 2));
-        $result = array();
-        $mDelta = $dtheta / $segments;
-        $mT = 8 / 3 * sin($mDelta / 4) * sin($mDelta / 4) / sin($mDelta / 2);
-        $th3 = $mTheta + $mDelta;
-
-        for ($i = 0; $i < $segments; $i++) {
-            $result[$i] = $this->segmentToBezier(
-                $mTheta,
-                $th3,
-                $cosTh,
-                $sinTh,
-                $rx,
-                $ry,
-                $cx1,
-                $cy1,
-                $mT,
-                $fromX,
-                $fromY
-            );
-            $fromX = $result[$i][4];
-            $fromY = $result[$i][5];
-            $mTheta = $th3;
-            $th3 += $mDelta;
-        }
-
-        return $result;
-    }
-
-    function segmentToBezier($th2, $th3, $cosTh, $sinTh, $rx, $ry, $cx1, $cy1, $mT, $fromX, $fromY)
-    {
-        $costh2 = cos($th2);
-        $sinth2 = sin($th2);
-        $costh3 = cos($th3);
-        $sinth3 = sin($th3);
-        $toX = $cosTh * $rx * $costh3 - $sinTh * $ry * $sinth3 + $cx1;
-        $toY = $sinTh * $rx * $costh3 + $cosTh * $ry * $sinth3 + $cy1;
-        $cp1X = $fromX + $mT * (-$cosTh * $rx * $sinth2 - $sinTh * $ry * $costh2);
-        $cp1Y = $fromY + $mT * (-$sinTh * $rx * $sinth2 + $cosTh * $ry * $costh2);
-        $cp2X = $toX + $mT * ($cosTh * $rx * $sinth3 + $sinTh * $ry * $costh3);
-        $cp2Y = $toY + $mT * ($sinTh * $rx * $sinth3 - $cosTh * $ry * $costh3);
-
-        return array(
-            $cp1X,
-            $cp1Y,
-            $cp2X,
-            $cp2Y,
-            $toX,
-            $toY
-        );
-    }
-
-    function calcVectorAngle($ux, $uy, $vx, $vy)
-    {
-        $ta = atan2($uy, $ux);
-        $tb = atan2($vy, $vx);
-        if ($tb >= $ta) {
-            return $tb - $ta;
-        } else {
-            return 2 * M_PI - ($ta - $tb);
-        }
-    }
+		$path = array();
+		foreach ($commands as $c) {
+			if (count($c) == 3) {
+				$commandLower = strtolower($c[1]);
+
+				// arcs have special flags that apparently don't require spaces.
+				if ($commandLower === 'a' && preg_match_all(static::ARC_REGEXP, $c[2], $matches, PREG_PATTERN_ORDER)) {
+					$numberOfMatches = count($matches[0]);
+					for ($k = 0; $k < $numberOfMatches; ++$k) {
+						$path[] = [
+							$c[1],
+							$matches[1][$k],
+							$matches[2][$k],
+							$matches[3][$k],
+							$matches[4][$k],
+							$matches[5][$k],
+							$matches[6][$k],
+							$matches[7][$k],
+						];
+					}
+					continue;
+				}
+
+				$arguments = array();
+				preg_match_all('/([-+]?((\d+\.\d+)|((\d+)|(\.\d+)))(?:e[-+]?\d+)?)/i', $c[2], $arguments, PREG_PATTERN_ORDER);
+				$item = $arguments[0];
+
+				if (
+					isset(self::$commandLengths[$commandLower]) &&
+					($commandLength = self::$commandLengths[$commandLower]) &&
+					count($item) > $commandLength
+				) {
+					$repeatedCommand = isset(self::$repeatedCommands[$c[1]]) ? self::$repeatedCommands[$c[1]] : $c[1];
+					$command = $c[1];
+
+					for ($k = 0, $klen = count($item); $k < $klen; $k += $commandLength) {
+						$_item = array_slice($item, $k, $k + $commandLength);
+						array_unshift($_item, $command);
+						$path[] = $_item;
+
+						$command = $repeatedCommand;
+					}
+				} else {
+					array_unshift($item, $c[1]);
+					$path[] = $item;
+				}
+
+			} else {
+				$item = array($c[1]);
+
+				$path[] = $item;
+			}
+		}
+
+		return $path;
+	}
+
+	public function start($attributes)
+	{
+		if (!isset($attributes['d'])) {
+			$this->hasShape = false;
+
+			return;
+		}
+
+		$path = static::parse($attributes['d']);
+		$surface = $this->document->getSurface();
+
+		// From https://github.com/kangax/fabric.js/blob/master/src/shapes/path.class.js
+		$current = null; // current instruction
+		$previous = null;
+		$subpathStartX = 0;
+		$subpathStartY = 0;
+		$x = 0; // current x
+		$y = 0; // current y
+		$controlX = 0; // current control point x
+		$controlY = 0; // current control point y
+		$tempX = null;
+		$tempY = null;
+		$tempControlX = null;
+		$tempControlY = null;
+		$l = 0; //-((this.width / 2) + $this.pathOffset.x),
+		$t = 0; //-((this.height / 2) + $this.pathOffset.y),
+
+		foreach ($path as $current) {
+			switch ($current[0]) { // first letter
+				case 'l': // lineto, relative
+					$x += $current[1];
+					$y += $current[2];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'L': // lineto, absolute
+					$x = $current[1];
+					$y = $current[2];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'h': // horizontal lineto, relative
+					$x += $current[1];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'H': // horizontal lineto, absolute
+					$x = $current[1];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'v': // vertical lineto, relative
+					$y += $current[1];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'V': // verical lineto, absolute
+					$y = $current[1];
+					$surface->lineTo($x + $l, $y + $t);
+					break;
+
+				case 'm': // moveTo, relative
+					$x += $current[1];
+					$y += $current[2];
+					$subpathStartX = $x;
+					$subpathStartY = $y;
+					$surface->moveTo($x + $l, $y + $t);
+					break;
+
+				case 'M': // moveTo, absolute
+					$x = $current[1];
+					$y = $current[2];
+					$subpathStartX = $x;
+					$subpathStartY = $y;
+					$surface->moveTo($x + $l, $y + $t);
+					break;
+
+				case 'c': // bezierCurveTo, relative
+					$tempX = $x + $current[5];
+					$tempY = $y + $current[6];
+					$controlX = $x + $current[3];
+					$controlY = $y + $current[4];
+					$surface->bezierCurveTo(
+						$x + $current[1] + $l, // x1
+						$y + $current[2] + $t, // y1
+						$controlX + $l, // x2
+						$controlY + $t, // y2
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+					break;
+
+				case 'C': // bezierCurveTo, absolute
+					$x = $current[5];
+					$y = $current[6];
+					$controlX = $current[3];
+					$controlY = $current[4];
+					$surface->bezierCurveTo(
+						$current[1] + $l,
+						$current[2] + $t,
+						$controlX + $l,
+						$controlY + $t,
+						$x + $l,
+						$y + $t
+					);
+					break;
+
+				case 's': // shorthand cubic bezierCurveTo, relative
+
+					// transform to absolute x,y
+					$tempX = $x + $current[3];
+					$tempY = $y + $current[4];
+
+					if (!preg_match('/[CcSs]/', $previous[0])) {
+						// If there is no previous command or if the previous command was not a C, c, S, or s,
+						// the control point is coincident with the current point
+						$controlX = $x;
+						$controlY = $y;
+					} else {
+						// calculate reflection of previous control points
+						$controlX = 2 * $x - $controlX;
+						$controlY = 2 * $y - $controlY;
+					}
+
+					$surface->bezierCurveTo(
+						$controlX + $l,
+						$controlY + $t,
+						$x + $current[1] + $l,
+						$y + $current[2] + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					// set control point to 2nd one of this command
+					// "... the first control point is assumed to be
+					// the reflection of the second control point on
+					// the previous command relative to the current point."
+					$controlX = $x + $current[1];
+					$controlY = $y + $current[2];
+
+					$x = $tempX;
+					$y = $tempY;
+					break;
+
+				case 'S': // shorthand cubic bezierCurveTo, absolute
+					$tempX = $current[3];
+					$tempY = $current[4];
+
+					if (!preg_match('/[CcSs]/', $previous[0])) {
+						// If there is no previous command or if the previous command was not a C, c, S, or s,
+						// the control point is coincident with the current point
+						$controlX = $x;
+						$controlY = $y;
+					} else {
+						// calculate reflection of previous control points
+						$controlX = 2 * $x - $controlX;
+						$controlY = 2 * $y - $controlY;
+					}
+
+					$surface->bezierCurveTo(
+						$controlX + $l,
+						$controlY + $t,
+						$current[1] + $l,
+						$current[2] + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+
+					// set control point to 2nd one of this command
+					// "... the first control point is assumed to be
+					// the reflection of the second control point on
+					// the previous command relative to the current point."
+					$controlX = $current[1];
+					$controlY = $current[2];
+
+					break;
+
+				case 'q': // quadraticCurveTo, relative
+					// transform to absolute x,y
+					$tempX = $x + $current[3];
+					$tempY = $y + $current[4];
+
+					$controlX = $x + $current[1];
+					$controlY = $y + $current[2];
+
+					$surface->quadraticCurveTo(
+						$controlX + $l,
+						$controlY + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+					break;
+
+				case 'Q': // quadraticCurveTo, absolute
+					$tempX = $current[3];
+					$tempY = $current[4];
+
+					$surface->quadraticCurveTo(
+						$current[1] + $l,
+						$current[2] + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+					$controlX = $current[1];
+					$controlY = $current[2];
+					break;
+
+				case 't': // shorthand quadraticCurveTo, relative
+
+					// transform to absolute x,y
+					$tempX = $x + $current[1];
+					$tempY = $y + $current[2];
+
+					// calculate reflection of previous control points
+					if (preg_match('/[QqT]/', $previous[0])) {
+						$controlX = 2 * $x - $controlX;
+						$controlY = 2 * $y - $controlY;
+					} elseif ($previous[0] === 't') {
+						$controlX = 2 * $x - $tempControlX;
+						$controlY = 2 * $y - $tempControlY;
+					} else {
+						$controlX = $x;
+						$controlY = $y;
+					}
+
+					$tempControlX = $controlX;
+					$tempControlY = $controlY;
+
+					$surface->quadraticCurveTo(
+						$controlX + $l,
+						$controlY + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+					break;
+
+				case 'T':
+					$tempX = $current[1];
+					$tempY = $current[2];
+
+					// calculate reflection of previous control points
+					if (preg_match('/[QqTt]/', $previous[0])) {
+						$controlX = 2 * $x - $controlX;
+						$controlY = 2 * $y - $controlY;
+					} else {
+						$controlX = $x;
+						$controlY = $y;
+					}
+
+					$surface->quadraticCurveTo(
+						$controlX + $l,
+						$controlY + $t,
+						$tempX + $l,
+						$tempY + $t
+					);
+					$x = $tempX;
+					$y = $tempY;
+					break;
+
+				case 'a':
+					$this->drawArc(
+						$surface,
+						$x + $l,
+						$y + $t,
+						array(
+							$current[1],
+							$current[2],
+							$current[3],
+							$current[4],
+							$current[5],
+							$current[6] + $x + $l,
+							$current[7] + $y + $t
+						)
+					);
+					$x += $current[6];
+					$y += $current[7];
+					break;
+
+				case 'A':
+					// TODO: optimize this
+					$this->drawArc(
+						$surface,
+						$x + $l,
+						$y + $t,
+						array(
+							$current[1],
+							$current[2],
+							$current[3],
+							$current[4],
+							$current[5],
+							$current[6] + $l,
+							$current[7] + $t
+						)
+					);
+					$x = $current[6];
+					$y = $current[7];
+					break;
+
+				case 'z':
+				case 'Z':
+					$x = $subpathStartX;
+					$y = $subpathStartY;
+					$surface->closePath();
+					break;
+			}
+			$previous = $current;
+		}
+	}
+
+	function drawArc(SurfaceInterface $surface, $fx, $fy, $coords)
+	{
+		$rx = $coords[0];
+		$ry = $coords[1];
+		$rot = $coords[2];
+		$large = $coords[3];
+		$sweep = $coords[4];
+		$tx = $coords[5];
+		$ty = $coords[6];
+		$segs = array(
+			array(),
+			array(),
+			array(),
+			array(),
+		);
+
+		$toX = $tx - $fx;
+		$toY = $ty - $fy;
+
+		if ($toX + $toY === 0) {
+			return;
+		}
+
+		$segsNorm = $this->arcToSegments($toX, $toY, $rx, $ry, $large, $sweep, $rot);
+
+		for ($i = 0, $len = count($segsNorm); $i < $len; $i++) {
+			$segs[$i][0] = $segsNorm[$i][0] + $fx;
+			$segs[$i][1] = $segsNorm[$i][1] + $fy;
+			$segs[$i][2] = $segsNorm[$i][2] + $fx;
+			$segs[$i][3] = $segsNorm[$i][3] + $fy;
+			$segs[$i][4] = $segsNorm[$i][4] + $fx;
+			$segs[$i][5] = $segsNorm[$i][5] + $fy;
+
+			call_user_func_array(array($surface, "bezierCurveTo"), $segs[$i]);
+		}
+	}
+
+	function arcToSegments($toX, $toY, $rx, $ry, $large, $sweep, $rotateX)
+	{
+		$th = $rotateX * M_PI / 180;
+		$sinTh = sin($th);
+		$cosTh = cos($th);
+		$fromX = 0;
+		$fromY = 0;
+
+		$rx = abs($rx);
+		$ry = abs($ry);
+
+		$px = -$cosTh * $toX * 0.5 - $sinTh * $toY * 0.5;
+		$py = -$cosTh * $toY * 0.5 + $sinTh * $toX * 0.5;
+		$rx2 = $rx * $rx;
+		$ry2 = $ry * $ry;
+		$py2 = $py * $py;
+		$px2 = $px * $px;
+		$pl = $rx2 * $ry2 - $rx2 * $py2 - $ry2 * $px2;
+		$root = 0;
+
+		if ($pl < 0) {
+			$s = sqrt(1 - $pl / ($rx2 * $ry2));
+			$rx *= $s;
+			$ry *= $s;
+		} else {
+			$root = ($large == $sweep ? -1.0 : 1.0) * sqrt($pl / ($rx2 * $py2 + $ry2 * $px2));
+		}
+
+		$cx = $root * $rx * $py / $ry;
+		$cy = -$root * $ry * $px / $rx;
+		$cx1 = $cosTh * $cx - $sinTh * $cy + $toX * 0.5;
+		$cy1 = $sinTh * $cx + $cosTh * $cy + $toY * 0.5;
+		$mTheta = $this->calcVectorAngle(1, 0, ($px - $cx) / $rx, ($py - $cy) / $ry);
+		$dtheta = $this->calcVectorAngle(($px - $cx) / $rx, ($py - $cy) / $ry, (-$px - $cx) / $rx, (-$py - $cy) / $ry);
+
+		if ($sweep == 0 && $dtheta > 0) {
+			$dtheta -= 2 * M_PI;
+		} else {
+			if ($sweep == 1 && $dtheta < 0) {
+				$dtheta += 2 * M_PI;
+			}
+		}
+
+		// $Convert $into $cubic $bezier $segments <= 90deg
+		$segments = ceil(abs($dtheta / M_PI * 2));
+		$result = array();
+		$mDelta = $dtheta / $segments;
+		$mT = 8 / 3 * sin($mDelta / 4) * sin($mDelta / 4) / sin($mDelta / 2);
+		$th3 = $mTheta + $mDelta;
+
+		for ($i = 0; $i < $segments; $i++) {
+			$result[$i] = $this->segmentToBezier(
+				$mTheta,
+				$th3,
+				$cosTh,
+				$sinTh,
+				$rx,
+				$ry,
+				$cx1,
+				$cy1,
+				$mT,
+				$fromX,
+				$fromY
+			);
+			$fromX = $result[$i][4];
+			$fromY = $result[$i][5];
+			$mTheta = $th3;
+			$th3 += $mDelta;
+		}
+
+		return $result;
+	}
+
+	function segmentToBezier($th2, $th3, $cosTh, $sinTh, $rx, $ry, $cx1, $cy1, $mT, $fromX, $fromY)
+	{
+		$costh2 = cos($th2);
+		$sinth2 = sin($th2);
+		$costh3 = cos($th3);
+		$sinth3 = sin($th3);
+		$toX = $cosTh * $rx * $costh3 - $sinTh * $ry * $sinth3 + $cx1;
+		$toY = $sinTh * $rx * $costh3 + $cosTh * $ry * $sinth3 + $cy1;
+		$cp1X = $fromX + $mT * (-$cosTh * $rx * $sinth2 - $sinTh * $ry * $costh2);
+		$cp1Y = $fromY + $mT * (-$sinTh * $rx * $sinth2 + $cosTh * $ry * $costh2);
+		$cp2X = $toX + $mT * ($cosTh * $rx * $sinth3 + $sinTh * $ry * $costh3);
+		$cp2Y = $toY + $mT * ($sinTh * $rx * $sinth3 - $cosTh * $ry * $costh3);
+
+		return array(
+			$cp1X,
+			$cp1Y,
+			$cp2X,
+			$cp2Y,
+			$toX,
+			$toY
+		);
+	}
+
+	function calcVectorAngle($ux, $uy, $vx, $vy)
+	{
+		$ta = atan2($uy, $ux);
+		$tb = atan2($vy, $vx);
+		if ($tb >= $ta) {
+			return $tb - $ta;
+		} else {
+			return 2 * M_PI - ($ta - $tb);
+		}
+	}
 }

vendor/phenx/php-svg-lib/src/Svg/Tag/Rect.php

Indentation +35 added lines, -35 removed lines

@@ -12,39 +12,39 @@
 
 class Rect extends Shape
 {
-    protected $x = 0;
-    protected $y = 0;
-    protected $width = 0;
-    protected $height = 0;
-    protected $rx = 0;
-    protected $ry = 0;
-
-    public function start($attributes)
-    {
-        $width = $this->document->getWidth();
-        $height = $this->document->getHeight();
-
-        if (isset($attributes['x'])) {
-            $this->x = $this->convertSize($attributes['x'], $width);
-        }
-        if (isset($attributes['y'])) {
-            $this->y = $this->convertSize($attributes['y'], $height);
-        }
-
-        if (isset($attributes['width'])) {
-            $this->width = $this->convertSize($attributes['width'], $width);
-        }
-        if (isset($attributes['height'])) {
-            $this->height = $this->convertSize($attributes['height'], $height);
-        }
-
-        if (isset($attributes['rx'])) {
-            $this->rx = $attributes['rx'];
-        }
-        if (isset($attributes['ry'])) {
-            $this->ry = $attributes['ry'];
-        }
-
-        $this->document->getSurface()->rect($this->x, $this->y, $this->width, $this->height, $this->rx, $this->ry);
-    }
+	protected $x = 0;
+	protected $y = 0;
+	protected $width = 0;
+	protected $height = 0;
+	protected $rx = 0;
+	protected $ry = 0;
+
+	public function start($attributes)
+	{
+		$width = $this->document->getWidth();
+		$height = $this->document->getHeight();
+
+		if (isset($attributes['x'])) {
+			$this->x = $this->convertSize($attributes['x'], $width);
+		}
+		if (isset($attributes['y'])) {
+			$this->y = $this->convertSize($attributes['y'], $height);
+		}
+
+		if (isset($attributes['width'])) {
+			$this->width = $this->convertSize($attributes['width'], $width);
+		}
+		if (isset($attributes['height'])) {
+			$this->height = $this->convertSize($attributes['height'], $height);
+		}
+
+		if (isset($attributes['rx'])) {
+			$this->rx = $attributes['rx'];
+		}
+		if (isset($attributes['ry'])) {
+			$this->ry = $attributes['ry'];
+		}
+
+		$this->document->getSurface()->rect($this->x, $this->y, $this->width, $this->height, $this->rx, $this->ry);
+	}
 } 

vendor/phenx/php-svg-lib/src/Svg/Tag/Line.php

Indentation +24 added lines, -24 removed lines

@@ -12,32 +12,32 @@
 
 class Line extends Shape
 {
-    protected $x1 = 0;
-    protected $y1 = 0;
+	protected $x1 = 0;
+	protected $y1 = 0;
 
-    protected $x2 = 0;
-    protected $y2 = 0;
+	protected $x2 = 0;
+	protected $y2 = 0;
 
-    public function start($attributes)
-    {
-        $height = $this->document->getHeight();
-        $width = $this->document->getWidth();
+	public function start($attributes)
+	{
+		$height = $this->document->getHeight();
+		$width = $this->document->getWidth();
 
-        if (isset($attributes['x1'])) {
-            $this->x1 = $this->convertSize($attributes['x1'], $width);
-        }
-        if (isset($attributes['y1'])) {
-            $this->y1 = $this->convertSize($attributes['y1'], $height);
-        }
-        if (isset($attributes['x2'])) {
-            $this->x2 = $this->convertSize($attributes['x2'], $width);
-        }
-        if (isset($attributes['y2'])) {
-            $this->y2 = $this->convertSize($attributes['y2'], $height);
-        }
+		if (isset($attributes['x1'])) {
+			$this->x1 = $this->convertSize($attributes['x1'], $width);
+		}
+		if (isset($attributes['y1'])) {
+			$this->y1 = $this->convertSize($attributes['y1'], $height);
+		}
+		if (isset($attributes['x2'])) {
+			$this->x2 = $this->convertSize($attributes['x2'], $width);
+		}
+		if (isset($attributes['y2'])) {
+			$this->y2 = $this->convertSize($attributes['y2'], $height);
+		}
 
-        $surface = $this->document->getSurface();
-        $surface->moveTo($this->x1, $this->y1);
-        $surface->lineTo($this->x2, $this->y2);
-    }
+		$surface = $this->document->getSurface();
+		$surface->moveTo($this->x1, $this->y1);
+		$surface->lineTo($this->x2, $this->y2);
+	}
 } 

vendor/phenx/php-svg-lib/src/Svg/CssLength.php

Indentation +115 added lines, -115 removed lines

@@ -4,132 +4,132 @@
 
 class CssLength
 {
-    /**
-     * Array of valid css length units.
-     * Should be pre-sorted by unit text length so no earlier length can be
-     * contained within a latter (eg. 'in' within 'vmin').
-     *
-     * @var string[]
-     */
-    protected static $units = [
-        'vmax',
-        'vmin',
-        'rem',
-        'px',
-        'pt',
-        'cm',
-        'mm',
-        'in',
-        'pc',
-        'em',
-        'ex',
-        'ch',
-        'vw',
-        'vh',
-        '%',
-        'q',
-    ];
+	/**
+	 * Array of valid css length units.
+	 * Should be pre-sorted by unit text length so no earlier length can be
+	 * contained within a latter (eg. 'in' within 'vmin').
+	 *
+	 * @var string[]
+	 */
+	protected static $units = [
+		'vmax',
+		'vmin',
+		'rem',
+		'px',
+		'pt',
+		'cm',
+		'mm',
+		'in',
+		'pc',
+		'em',
+		'ex',
+		'ch',
+		'vw',
+		'vh',
+		'%',
+		'q',
+	];
 
-    /**
-     * A list of units that are inch-relative, and their unit division within an inch.
-     *
-     * @var array<string, float>
-     */
-    protected static $inchDivisions = [
-        'in' => 1,
-        'cm' => 2.54,
-        'mm' => 25.4,
-        'q' => 101.6,
-        'pc' => 6,
-        'pt' => 72,
-    ];
+	/**
+	 * A list of units that are inch-relative, and their unit division within an inch.
+	 *
+	 * @var array<string, float>
+	 */
+	protected static $inchDivisions = [
+		'in' => 1,
+		'cm' => 2.54,
+		'mm' => 25.4,
+		'q' => 101.6,
+		'pc' => 6,
+		'pt' => 72,
+	];
 
-    /**
-     * The CSS length unit indicator.
-     * Will be lower-case and one of the units listed in the '$units' array or empty.
-     *
-     * @var string
-     */
-    protected $unit = '';
+	/**
+	 * The CSS length unit indicator.
+	 * Will be lower-case and one of the units listed in the '$units' array or empty.
+	 *
+	 * @var string
+	 */
+	protected $unit = '';
 
-    /**
-     * The numeric value of the given length.
-     *
-     * @var float
-     */
-    protected $value = 0;
+	/**
+	 * The numeric value of the given length.
+	 *
+	 * @var float
+	 */
+	protected $value = 0;
 
-    /**
-     * The original unparsed length provided.
-     *
-     * @var string
-     */
-    protected $unparsed;
+	/**
+	 * The original unparsed length provided.
+	 *
+	 * @var string
+	 */
+	protected $unparsed;
 
-    public function __construct(string $length)
-    {
-        $this->unparsed = $length;
-        $this->parseLengthComponents($length);
-    }
+	public function __construct(string $length)
+	{
+		$this->unparsed = $length;
+		$this->parseLengthComponents($length);
+	}
 
-    /**
-     * Parse out the unit and value components from the given string length.
-     */
-    protected function parseLengthComponents(string $length): void
-    {
-        $length = strtolower($length);
+	/**
+	 * Parse out the unit and value components from the given string length.
+	 */
+	protected function parseLengthComponents(string $length): void
+	{
+		$length = strtolower($length);
 
-        foreach (self::$units as $unit) {
-            $pos = strpos($length, $unit);
-            if ($pos) {
-                $this->value = floatval(substr($length, 0, $pos));
-                $this->unit = $unit;
-                return;
-            }
-        }
+		foreach (self::$units as $unit) {
+			$pos = strpos($length, $unit);
+			if ($pos) {
+				$this->value = floatval(substr($length, 0, $pos));
+				$this->unit = $unit;
+				return;
+			}
+		}
 
-        $this->unit = '';
-        $this->value = floatval($length);
-    }
+		$this->unit = '';
+		$this->value = floatval($length);
+	}
 
-    /**
-     * Get the unit type of this css length.
-     * Units are standardised to be lower-cased.
-     *
-     * @return string
-     */
-    public function getUnit(): string
-    {
-        return $this->unit;
-    }
+	/**
+	 * Get the unit type of this css length.
+	 * Units are standardised to be lower-cased.
+	 *
+	 * @return string
+	 */
+	public function getUnit(): string
+	{
+		return $this->unit;
+	}
 
-    /**
-     * Get this CSS length in the equivalent pixel count size.
-     *
-     * @param float $referenceSize
-     * @param float $dpi
-     *
-     * @return float
-     */
-    public function toPixels(float $referenceSize = 11.0, float $dpi = 96.0): float
-    {
-        // Standard relative units
-        if (in_array($this->unit, ['em', 'rem', 'ex', 'ch'])) {
-            return $this->value * $referenceSize;
-        }
+	/**
+	 * Get this CSS length in the equivalent pixel count size.
+	 *
+	 * @param float $referenceSize
+	 * @param float $dpi
+	 *
+	 * @return float
+	 */
+	public function toPixels(float $referenceSize = 11.0, float $dpi = 96.0): float
+	{
+		// Standard relative units
+		if (in_array($this->unit, ['em', 'rem', 'ex', 'ch'])) {
+			return $this->value * $referenceSize;
+		}
 
-        // Percentage relative units
-        if (in_array($this->unit, ['%', 'vw', 'vh', 'vmin', 'vmax'])) {
-            return $this->value * ($referenceSize / 100);
-        }
+		// Percentage relative units
+		if (in_array($this->unit, ['%', 'vw', 'vh', 'vmin', 'vmax'])) {
+			return $this->value * ($referenceSize / 100);
+		}
 
-        // Inch relative units
-        if (in_array($this->unit, array_keys(static::$inchDivisions))) {
-            $inchValue = $this->value * $dpi;
-            $division = static::$inchDivisions[$this->unit];
-            return $inchValue / $division;
-        }
+		// Inch relative units
+		if (in_array($this->unit, array_keys(static::$inchDivisions))) {
+			$inchValue = $this->value * $dpi;
+			$division = static::$inchDivisions[$this->unit];
+			return $inchValue / $division;
+		}
 
-        return $this->value;
-    }
+		return $this->value;
+	}
 }
\ No newline at end of file

vendor/phenx/php-svg-lib/src/Svg/DefaultStyle.php

Indentation +14 added lines, -14 removed lines

@@ -10,20 +10,20 @@
 
 class DefaultStyle extends Style
 {
-    public $color = [0, 0, 0, 1];
-    public $opacity = 1.0;
-    public $display = 'inline';
+	public $color = [0, 0, 0, 1];
+	public $opacity = 1.0;
+	public $display = 'inline';
 
-    public $fill = [0, 0, 0, 1];
-    public $fillOpacity = 1.0;
-    public $fillRule = 'nonzero';
+	public $fill = [0, 0, 0, 1];
+	public $fillOpacity = 1.0;
+	public $fillRule = 'nonzero';
 
-    public $stroke = 'none';
-    public $strokeOpacity = 1.0;
-    public $strokeLinecap = 'butt';
-    public $strokeLinejoin = 'miter';
-    public $strokeMiterlimit = 4;
-    public $strokeWidth = 1.0;
-    public $strokeDasharray = 0;
-    public $strokeDashoffset = 0;
+	public $stroke = 'none';
+	public $strokeOpacity = 1.0;
+	public $strokeLinecap = 'butt';
+	public $strokeLinejoin = 'miter';
+	public $strokeMiterlimit = 4;
+	public $strokeWidth = 1.0;
+	public $strokeDasharray = 0;
+	public $strokeDashoffset = 0;
 }

vendor/phenx/php-svg-lib/src/Svg/Surface/SurfacePDFLib.php

Indentation +412 added lines, -412 removed lines

@@ -13,418 +13,418 @@
 
 class SurfacePDFLib implements SurfaceInterface
 {
-    const DEBUG = false;
-
-    private $canvas;
-
-    private $width;
-    private $height;
-
-    /** @var Style */
-    private $style;
-
-    public function __construct(Document $doc, $canvas = null)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        $dimensions = $doc->getDimensions();
-        $w = $dimensions["width"];
-        $h = $dimensions["height"];
-
-        if (!$canvas) {
-            $canvas = new \PDFlib();
-
-            /* all strings are expected as utf8 */
-            $canvas->set_option("stringformat=utf8");
-            $canvas->set_option("errorpolicy=return");
-
-            /*  open new PDF file; insert a file name to create the PDF on disk */
-            if ($canvas->begin_document("", "") == 0) {
-                die("Error: " . $canvas->get_errmsg());
-            }
-            $canvas->set_info("Creator", "PDFlib starter sample");
-            $canvas->set_info("Title", "starter_graphics");
-
-            $canvas->begin_page_ext($w, $h, "");
-        }
-
-        // Flip PDF coordinate system so that the origin is in
-        // the top left rather than the bottom left
-        $canvas->setmatrix(
-            1, 0,
-            0, -1,
-            0, $h
-        );
-
-        $this->width  = $w;
-        $this->height = $h;
-
-        $this->canvas = $canvas;
-    }
-
-    function out()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        $this->canvas->end_page_ext("");
-        $this->canvas->end_document("");
-
-        return $this->canvas->get_buffer();
-    }
-
-    public function save()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->save();
-    }
-
-    public function restore()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->restore();
-    }
-
-    public function scale($x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->scale($x, $y);
-    }
-
-    public function rotate($angle)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->rotate($angle);
-    }
-
-    public function translate($x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->translate($x, $y);
-    }
-
-    public function transform($a, $b, $c, $d, $e, $f)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->concat($a, $b, $c, $d, $e, $f);
-    }
-
-    public function beginPath()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        // TODO: Implement beginPath() method.
-    }
-
-    public function closePath()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->closepath();
-    }
-
-    public function fillStroke(bool $close = false)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        if ($close) {
-            $this->canvas->closepath_fill_stroke();
-        } else {
-            $this->canvas->fill_stroke();
-        }
-    }
-
-    public function clip()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->clip();
-    }
-
-    public function fillText($text, $x, $y, $maxWidth = null)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->set_text_pos($x, $y);
-        $this->canvas->show($text);
-    }
-
-    public function strokeText($text, $x, $y, $maxWidth = null)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        // TODO: Implement drawImage() method.
-    }
-
-    public function drawImage($image, $sx, $sy, $sw = null, $sh = null, $dx = null, $dy = null, $dw = null, $dh = null)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        if (strpos($image, "data:") === 0) {
-            $data = substr($image, strpos($image, ";") + 1);
-            if (strpos($data, "base64") === 0) {
-                $data = base64_decode(substr($data, 7));
-            }
-        }
-        else {
-            $data = file_get_contents($image);
-        }
-
-        $image = tempnam(sys_get_temp_dir(), "svg");
-        file_put_contents($image, $data);
-
-        $img = $this->canvas->load_image("auto", $image, "");
-
-        $sy = $sy - $sh;
-        $this->canvas->fit_image($img, $sx, $sy, 'boxsize={' . "$sw $sh" . '} fitmethod=entire');
-
-        unlink($image);
-    }
-
-    public function lineTo($x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->lineto($x, $y);
-    }
-
-    public function moveTo($x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->moveto($x, $y);
-    }
-
-    public function quadraticCurveTo($cpx, $cpy, $x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        // FIXME not accurate
-        $this->canvas->curveTo($cpx, $cpy, $cpx, $cpy, $x, $y);
-    }
-
-    public function bezierCurveTo($cp1x, $cp1y, $cp2x, $cp2y, $x, $y)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->curveto($cp1x, $cp1y, $cp2x, $cp2y, $x, $y);
-    }
-
-    public function arcTo($x1, $y1, $x2, $y2, $radius)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-    }
-
-    public function arc($x, $y, $radius, $startAngle, $endAngle, $anticlockwise = false)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->arc($x, $y, $radius, $startAngle, $endAngle);
-    }
-
-    public function circle($x, $y, $radius)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->circle($x, $y, $radius);
-    }
-
-    public function ellipse($x, $y, $radiusX, $radiusY, $rotation, $startAngle, $endAngle, $anticlockwise)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->ellipse($x, $y, $radiusX, $radiusY);
-    }
-
-    public function fillRect($x, $y, $w, $h)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->rect($x, $y, $w, $h);
-        $this->fill();
-    }
-
-    public function rect($x, $y, $w, $h, $rx = 0, $ry = 0)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        $canvas = $this->canvas;
-
-        if ($rx <= 0.000001/* && $ry <= 0.000001*/) {
-            $canvas->rect($x, $y, $w, $h);
-
-            return;
-        }
-
-        /* Define a path for a rectangle with corners rounded by a given radius.
+	const DEBUG = false;
+
+	private $canvas;
+
+	private $width;
+	private $height;
+
+	/** @var Style */
+	private $style;
+
+	public function __construct(Document $doc, $canvas = null)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		$dimensions = $doc->getDimensions();
+		$w = $dimensions["width"];
+		$h = $dimensions["height"];
+
+		if (!$canvas) {
+			$canvas = new \PDFlib();
+
+			/* all strings are expected as utf8 */
+			$canvas->set_option("stringformat=utf8");
+			$canvas->set_option("errorpolicy=return");
+
+			/*  open new PDF file; insert a file name to create the PDF on disk */
+			if ($canvas->begin_document("", "") == 0) {
+				die("Error: " . $canvas->get_errmsg());
+			}
+			$canvas->set_info("Creator", "PDFlib starter sample");
+			$canvas->set_info("Title", "starter_graphics");
+
+			$canvas->begin_page_ext($w, $h, "");
+		}
+
+		// Flip PDF coordinate system so that the origin is in
+		// the top left rather than the bottom left
+		$canvas->setmatrix(
+			1, 0,
+			0, -1,
+			0, $h
+		);
+
+		$this->width  = $w;
+		$this->height = $h;
+
+		$this->canvas = $canvas;
+	}
+
+	function out()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		$this->canvas->end_page_ext("");
+		$this->canvas->end_document("");
+
+		return $this->canvas->get_buffer();
+	}
+
+	public function save()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->save();
+	}
+
+	public function restore()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->restore();
+	}
+
+	public function scale($x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->scale($x, $y);
+	}
+
+	public function rotate($angle)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->rotate($angle);
+	}
+
+	public function translate($x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->translate($x, $y);
+	}
+
+	public function transform($a, $b, $c, $d, $e, $f)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->concat($a, $b, $c, $d, $e, $f);
+	}
+
+	public function beginPath()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		// TODO: Implement beginPath() method.
+	}
+
+	public function closePath()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->closepath();
+	}
+
+	public function fillStroke(bool $close = false)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		if ($close) {
+			$this->canvas->closepath_fill_stroke();
+		} else {
+			$this->canvas->fill_stroke();
+		}
+	}
+
+	public function clip()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->clip();
+	}
+
+	public function fillText($text, $x, $y, $maxWidth = null)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->set_text_pos($x, $y);
+		$this->canvas->show($text);
+	}
+
+	public function strokeText($text, $x, $y, $maxWidth = null)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		// TODO: Implement drawImage() method.
+	}
+
+	public function drawImage($image, $sx, $sy, $sw = null, $sh = null, $dx = null, $dy = null, $dw = null, $dh = null)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		if (strpos($image, "data:") === 0) {
+			$data = substr($image, strpos($image, ";") + 1);
+			if (strpos($data, "base64") === 0) {
+				$data = base64_decode(substr($data, 7));
+			}
+		}
+		else {
+			$data = file_get_contents($image);
+		}
+
+		$image = tempnam(sys_get_temp_dir(), "svg");
+		file_put_contents($image, $data);
+
+		$img = $this->canvas->load_image("auto", $image, "");
+
+		$sy = $sy - $sh;
+		$this->canvas->fit_image($img, $sx, $sy, 'boxsize={' . "$sw $sh" . '} fitmethod=entire');
+
+		unlink($image);
+	}
+
+	public function lineTo($x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->lineto($x, $y);
+	}
+
+	public function moveTo($x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->moveto($x, $y);
+	}
+
+	public function quadraticCurveTo($cpx, $cpy, $x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		// FIXME not accurate
+		$this->canvas->curveTo($cpx, $cpy, $cpx, $cpy, $x, $y);
+	}
+
+	public function bezierCurveTo($cp1x, $cp1y, $cp2x, $cp2y, $x, $y)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->curveto($cp1x, $cp1y, $cp2x, $cp2y, $x, $y);
+	}
+
+	public function arcTo($x1, $y1, $x2, $y2, $radius)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+	}
+
+	public function arc($x, $y, $radius, $startAngle, $endAngle, $anticlockwise = false)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->arc($x, $y, $radius, $startAngle, $endAngle);
+	}
+
+	public function circle($x, $y, $radius)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->circle($x, $y, $radius);
+	}
+
+	public function ellipse($x, $y, $radiusX, $radiusY, $rotation, $startAngle, $endAngle, $anticlockwise)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->ellipse($x, $y, $radiusX, $radiusY);
+	}
+
+	public function fillRect($x, $y, $w, $h)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->rect($x, $y, $w, $h);
+		$this->fill();
+	}
+
+	public function rect($x, $y, $w, $h, $rx = 0, $ry = 0)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		$canvas = $this->canvas;
+
+		if ($rx <= 0.000001/* && $ry <= 0.000001*/) {
+			$canvas->rect($x, $y, $w, $h);
+
+			return;
+		}
+
+		/* Define a path for a rectangle with corners rounded by a given radius.
          * Start from the lower left corner and proceed counterclockwise.
          */
-        $canvas->moveto($x + $rx, $y);
-
-        /* Start of the arc segment in the lower right corner */
-        $canvas->lineto($x + $w - $rx, $y);
-
-        /* Arc segment in the lower right corner */
-        $canvas->arc($x + $w - $rx, $y + $rx, $rx, 270, 360);
-
-        /* Start of the arc segment in the upper right corner */
-        $canvas->lineto($x + $w, $y + $h - $rx );
-
-        /* Arc segment in the upper right corner */
-        $canvas->arc($x + $w - $rx, $y + $h - $rx, $rx, 0, 90);
-
-        /* Start of the arc segment in the upper left corner */
-        $canvas->lineto($x + $rx, $y + $h);
-
-        /* Arc segment in the upper left corner */
-        $canvas->arc($x + $rx, $y + $h - $rx, $rx, 90, 180);
-
-        /* Start of the arc segment in the lower left corner */
-        $canvas->lineto($x , $y + $rx);
-
-        /* Arc segment in the lower left corner */
-        $canvas->arc($x + $rx, $y + $rx, $rx, 180, 270);
-    }
-
-    public function fill()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->fill();
-    }
-
-    public function strokeRect($x, $y, $w, $h)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->rect($x, $y, $w, $h);
-        $this->stroke();
-    }
-
-    public function stroke(bool $close = false)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        if ($close) {
-            $this->canvas->closepath_stroke();
-        } else {
-            $this->canvas->stroke();
-        }
-    }
-
-    public function endPath()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->endPath();
-    }
-
-    public function measureText($text)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $style = $this->getStyle();
-        $font = $this->getFont($style->fontFamily, $style->fontStyle);
-
-        return $this->canvas->stringwidth($text, $font, $this->getStyle()->fontSize);
-    }
-
-    public function getStyle()
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-        return $this->style;
-    }
-
-    public function setStyle(Style $style)
-    {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
-
-        $this->style = $style;
-        $canvas = $this->canvas;
-
-        if (is_array($style->stroke) && $stroke = $style->stroke) {
-            $canvas->setcolor(
-                "stroke",
-                "rgb",
-                $stroke[0] / 255,
-                $stroke[1] / 255,
-                $stroke[2] / 255,
-                null
-            );
-        }
-
-        if (is_array($style->fill) && $fill = $style->fill) {
-            $canvas->setcolor(
-                "fill",
-                "rgb",
-                $fill[0] / 255,
-                $fill[1] / 255,
-                $fill[2] / 255,
-                null
-            );
-        }
-
-        if ($fillRule = strtolower($style->fillRule)) {
-            $map = array(
-                "nonzero" => "winding",
-                "evenodd" => "evenodd",
-            );
-
-            if (isset($map[$fillRule])) {
-                $fillRule = $map[$fillRule];
-
-                $canvas->set_parameter("fillrule", $fillRule);
-            }
-        }
-
-        $opts = array();
-        if ($style->strokeWidth > 0.000001) {
-            $opts[] = "linewidth=$style->strokeWidth";
-        }
-
-        if (in_array($style->strokeLinecap, array("butt", "round", "projecting"))) {
-            $opts[] = "linecap=$style->strokeLinecap";
-        }
-
-        if (in_array($style->strokeLinejoin, array("miter", "round", "bevel"))) {
-            $opts[] = "linejoin=$style->strokeLinejoin";
-        }
-
-        $canvas->set_graphics_option(implode(" ", $opts));
-
-        $opts = array();
-        $opacity = $style->opacity;
-        if ($opacity !== null && $opacity < 1.0) {
-            $opts[] = "opacityfill=$opacity";
-            $opts[] = "opacitystroke=$opacity";
-        }
-        else {
-            $fillOpacity = $style->fillOpacity;
-            if ($fillOpacity !== null && $fillOpacity < 1.0) {
-                $opts[] = "opacityfill=$fillOpacity";
-            }
-
-            $strokeOpacity = $style->strokeOpacity;
-            if ($strokeOpacity !== null && $strokeOpacity < 1.0) {
-                $opts[] = "opacitystroke=$strokeOpacity";
-            }
-        }
-
-        if (count($opts)) {
-            $gs = $canvas->create_gstate(implode(" ", $opts));
-            $canvas->set_gstate($gs);
-        }
-
-        $font = $this->getFont($style->fontFamily, $style->fontStyle);
-        if ($font) {
-            $canvas->setfont($font, $style->fontSize);
-        }
-    }
-
-    private function getFont($family, $style)
-    {
-        $map = array(
-            "serif"      => "Times",
-            "sans-serif" => "Helvetica",
-            "fantasy"    => "Symbol",
-            "cursive"    => "Times",
-            "monospace"  => "Courier",
-
-            "arial"      => "Helvetica",
-            "verdana"    => "Helvetica",
-        );
-
-        $family = strtolower($family);
-        if (isset($map[$family])) {
-            $family = $map[$family];
-        }
-
-        return $this->canvas->load_font($family, "unicode", "fontstyle=$style");
-    }
-
-    public function setFont($family, $style, $weight)
-    {
-        // TODO: Implement setFont() method.
-    }
+		$canvas->moveto($x + $rx, $y);
+
+		/* Start of the arc segment in the lower right corner */
+		$canvas->lineto($x + $w - $rx, $y);
+
+		/* Arc segment in the lower right corner */
+		$canvas->arc($x + $w - $rx, $y + $rx, $rx, 270, 360);
+
+		/* Start of the arc segment in the upper right corner */
+		$canvas->lineto($x + $w, $y + $h - $rx );
+
+		/* Arc segment in the upper right corner */
+		$canvas->arc($x + $w - $rx, $y + $h - $rx, $rx, 0, 90);
+
+		/* Start of the arc segment in the upper left corner */
+		$canvas->lineto($x + $rx, $y + $h);
+
+		/* Arc segment in the upper left corner */
+		$canvas->arc($x + $rx, $y + $h - $rx, $rx, 90, 180);
+
+		/* Start of the arc segment in the lower left corner */
+		$canvas->lineto($x , $y + $rx);
+
+		/* Arc segment in the lower left corner */
+		$canvas->arc($x + $rx, $y + $rx, $rx, 180, 270);
+	}
+
+	public function fill()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->fill();
+	}
+
+	public function strokeRect($x, $y, $w, $h)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->rect($x, $y, $w, $h);
+		$this->stroke();
+	}
+
+	public function stroke(bool $close = false)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		if ($close) {
+			$this->canvas->closepath_stroke();
+		} else {
+			$this->canvas->stroke();
+		}
+	}
+
+	public function endPath()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$this->canvas->endPath();
+	}
+
+	public function measureText($text)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		$style = $this->getStyle();
+		$font = $this->getFont($style->fontFamily, $style->fontStyle);
+
+		return $this->canvas->stringwidth($text, $font, $this->getStyle()->fontSize);
+	}
+
+	public function getStyle()
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+		return $this->style;
+	}
+
+	public function setStyle(Style $style)
+	{
+		if (self::DEBUG) echo __FUNCTION__ . "\n";
+
+		$this->style = $style;
+		$canvas = $this->canvas;
+
+		if (is_array($style->stroke) && $stroke = $style->stroke) {
+			$canvas->setcolor(
+				"stroke",
+				"rgb",
+				$stroke[0] / 255,
+				$stroke[1] / 255,
+				$stroke[2] / 255,
+				null
+			);
+		}
+
+		if (is_array($style->fill) && $fill = $style->fill) {
+			$canvas->setcolor(
+				"fill",
+				"rgb",
+				$fill[0] / 255,
+				$fill[1] / 255,
+				$fill[2] / 255,
+				null
+			);
+		}
+
+		if ($fillRule = strtolower($style->fillRule)) {
+			$map = array(
+				"nonzero" => "winding",
+				"evenodd" => "evenodd",
+			);
+
+			if (isset($map[$fillRule])) {
+				$fillRule = $map[$fillRule];
+
+				$canvas->set_parameter("fillrule", $fillRule);
+			}
+		}
+
+		$opts = array();
+		if ($style->strokeWidth > 0.000001) {
+			$opts[] = "linewidth=$style->strokeWidth";
+		}
+
+		if (in_array($style->strokeLinecap, array("butt", "round", "projecting"))) {
+			$opts[] = "linecap=$style->strokeLinecap";
+		}
+
+		if (in_array($style->strokeLinejoin, array("miter", "round", "bevel"))) {
+			$opts[] = "linejoin=$style->strokeLinejoin";
+		}
+
+		$canvas->set_graphics_option(implode(" ", $opts));
+
+		$opts = array();
+		$opacity = $style->opacity;
+		if ($opacity !== null && $opacity < 1.0) {
+			$opts[] = "opacityfill=$opacity";
+			$opts[] = "opacitystroke=$opacity";
+		}
+		else {
+			$fillOpacity = $style->fillOpacity;
+			if ($fillOpacity !== null && $fillOpacity < 1.0) {
+				$opts[] = "opacityfill=$fillOpacity";
+			}
+
+			$strokeOpacity = $style->strokeOpacity;
+			if ($strokeOpacity !== null && $strokeOpacity < 1.0) {
+				$opts[] = "opacitystroke=$strokeOpacity";
+			}
+		}
+
+		if (count($opts)) {
+			$gs = $canvas->create_gstate(implode(" ", $opts));
+			$canvas->set_gstate($gs);
+		}
+
+		$font = $this->getFont($style->fontFamily, $style->fontStyle);
+		if ($font) {
+			$canvas->setfont($font, $style->fontSize);
+		}
+	}
+
+	private function getFont($family, $style)
+	{
+		$map = array(
+			"serif"      => "Times",
+			"sans-serif" => "Helvetica",
+			"fantasy"    => "Symbol",
+			"cursive"    => "Times",
+			"monospace"  => "Courier",
+
+			"arial"      => "Helvetica",
+			"verdana"    => "Helvetica",
+		);
+
+		$family = strtolower($family);
+		if (isset($map[$family])) {
+			$family = $map[$family];
+		}
+
+		return $this->canvas->load_font($family, "unicode", "fontstyle=$style");
+	}
+
+	public function setFont($family, $style, $weight)
+	{
+		// TODO: Implement setFont() method.
+	}
 }

Spacing +37 added lines, -37 removed lines

@@ -25,13 +25,13 @@ 
 
     public function __construct(Document $doc, $canvas = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         $dimensions = $doc->getDimensions();
         $w = $dimensions["width"];
         $h = $dimensions["height"];
 
-        if (!$canvas) {
+        if ( ! $canvas) {
             $canvas = new \PDFlib();
 
             /* all strings are expected as utf8 */
@@ -40,7 +40,7 @@ 
 
             /*  open new PDF file; insert a file name to create the PDF on disk */
             if ($canvas->begin_document("", "") == 0) {
-                die("Error: " . $canvas->get_errmsg());
+                die("Error: ".$canvas->get_errmsg());
             }
             $canvas->set_info("Creator", "PDFlib starter sample");
             $canvas->set_info("Title", "starter_graphics");
@@ -64,7 +64,7 @@ 
 
     function out()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         $this->canvas->end_page_ext("");
         $this->canvas->end_document("");
@@ -74,55 +74,55 @@ 
 
     public function save()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->save();
     }
 
     public function restore()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->restore();
     }
 
     public function scale($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->scale($x, $y);
     }
 
     public function rotate($angle)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->rotate($angle);
     }
 
     public function translate($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->translate($x, $y);
     }
 
     public function transform($a, $b, $c, $d, $e, $f)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->concat($a, $b, $c, $d, $e, $f);
     }
 
     public function beginPath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         // TODO: Implement beginPath() method.
     }
 
     public function closePath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->closepath();
     }
 
     public function fillStroke(bool $close = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         if ($close) {
             $this->canvas->closepath_fill_stroke();
         } else {
@@ -132,26 +132,26 @@ 
 
     public function clip()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->clip();
     }
 
     public function fillText($text, $x, $y, $maxWidth = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->set_text_pos($x, $y);
         $this->canvas->show($text);
     }
 
     public function strokeText($text, $x, $y, $maxWidth = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         // TODO: Implement drawImage() method.
     }
 
     public function drawImage($image, $sx, $sy, $sw = null, $sh = null, $dx = null, $dy = null, $dw = null, $dh = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         if (strpos($image, "data:") === 0) {
             $data = substr($image, strpos($image, ";") + 1);
@@ -169,26 +169,26 @@ 
         $img = $this->canvas->load_image("auto", $image, "");
 
         $sy = $sy - $sh;
-        $this->canvas->fit_image($img, $sx, $sy, 'boxsize={' . "$sw $sh" . '} fitmethod=entire');
+        $this->canvas->fit_image($img, $sx, $sy, 'boxsize={'."$sw $sh".'} fitmethod=entire');
 
         unlink($image);
     }
 
     public function lineTo($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->lineto($x, $y);
     }
 
     public function moveTo($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->moveto($x, $y);
     }
 
     public function quadraticCurveTo($cpx, $cpy, $x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         // FIXME not accurate
         $this->canvas->curveTo($cpx, $cpy, $cpx, $cpy, $x, $y);
@@ -196,43 +196,43 @@ 
 
     public function bezierCurveTo($cp1x, $cp1y, $cp2x, $cp2y, $x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->curveto($cp1x, $cp1y, $cp2x, $cp2y, $x, $y);
     }
 
     public function arcTo($x1, $y1, $x2, $y2, $radius)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
     }
 
     public function arc($x, $y, $radius, $startAngle, $endAngle, $anticlockwise = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->arc($x, $y, $radius, $startAngle, $endAngle);
     }
 
     public function circle($x, $y, $radius)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->circle($x, $y, $radius);
     }
 
     public function ellipse($x, $y, $radiusX, $radiusY, $rotation, $startAngle, $endAngle, $anticlockwise)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->ellipse($x, $y, $radiusX, $radiusY);
     }
 
     public function fillRect($x, $y, $w, $h)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->rect($x, $y, $w, $h);
         $this->fill();
     }
 
     public function rect($x, $y, $w, $h, $rx = 0, $ry = 0)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         $canvas = $this->canvas;
 
@@ -254,7 +254,7 @@ 
         $canvas->arc($x + $w - $rx, $y + $rx, $rx, 270, 360);
 
         /* Start of the arc segment in the upper right corner */
-        $canvas->lineto($x + $w, $y + $h - $rx );
+        $canvas->lineto($x + $w, $y + $h - $rx);
 
         /* Arc segment in the upper right corner */
         $canvas->arc($x + $w - $rx, $y + $h - $rx, $rx, 0, 90);
@@ -266,7 +266,7 @@ 
         $canvas->arc($x + $rx, $y + $h - $rx, $rx, 90, 180);
 
         /* Start of the arc segment in the lower left corner */
-        $canvas->lineto($x , $y + $rx);
+        $canvas->lineto($x, $y + $rx);
 
         /* Arc segment in the lower left corner */
         $canvas->arc($x + $rx, $y + $rx, $rx, 180, 270);
@@ -274,20 +274,20 @@ 
 
     public function fill()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->fill();
     }
 
     public function strokeRect($x, $y, $w, $h)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->rect($x, $y, $w, $h);
         $this->stroke();
     }
 
     public function stroke(bool $close = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         if ($close) {
             $this->canvas->closepath_stroke();
         } else {
@@ -297,13 +297,13 @@ 
 
     public function endPath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $this->canvas->endPath();
     }
 
     public function measureText($text)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         $style = $this->getStyle();
         $font = $this->getFont($style->fontFamily, $style->fontStyle);
 
@@ -312,13 +312,13 @@ 
 
     public function getStyle()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
         return $this->style;
     }
 
     public function setStyle(Style $style)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) echo __FUNCTION__."\n";
 
         $this->style = $style;
         $canvas = $this->canvas;

Braces +98 added lines, -36 removed lines

@@ -25,7 +25,9 @@ 
 
     public function __construct(Document $doc, $canvas = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         $dimensions = $doc->getDimensions();
         $w = $dimensions["width"];
@@ -64,7 +66,9 @@ 
 
     function out()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         $this->canvas->end_page_ext("");
         $this->canvas->end_document("");
@@ -74,55 +78,73 @@ 
 
     public function save()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->save();
     }
 
     public function restore()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->restore();
     }
 
     public function scale($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->scale($x, $y);
     }
 
     public function rotate($angle)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->rotate($angle);
     }
 
     public function translate($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->translate($x, $y);
     }
 
     public function transform($a, $b, $c, $d, $e, $f)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->concat($a, $b, $c, $d, $e, $f);
     }
 
     public function beginPath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         // TODO: Implement beginPath() method.
     }
 
     public function closePath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->closepath();
     }
 
     public function fillStroke(bool $close = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         if ($close) {
             $this->canvas->closepath_fill_stroke();
         } else {
@@ -132,34 +154,41 @@ 
 
     public function clip()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->clip();
     }
 
     public function fillText($text, $x, $y, $maxWidth = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->set_text_pos($x, $y);
         $this->canvas->show($text);
     }
 
     public function strokeText($text, $x, $y, $maxWidth = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         // TODO: Implement drawImage() method.
     }
 
     public function drawImage($image, $sx, $sy, $sw = null, $sh = null, $dx = null, $dy = null, $dw = null, $dh = null)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         if (strpos($image, "data:") === 0) {
             $data = substr($image, strpos($image, ";") + 1);
             if (strpos($data, "base64") === 0) {
                 $data = base64_decode(substr($data, 7));
             }
-        }
-        else {
+        } else {
             $data = file_get_contents($image);
         }
 
@@ -176,19 +205,25 @@ 
 
     public function lineTo($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->lineto($x, $y);
     }
 
     public function moveTo($x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->moveto($x, $y);
     }
 
     public function quadraticCurveTo($cpx, $cpy, $x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         // FIXME not accurate
         $this->canvas->curveTo($cpx, $cpy, $cpx, $cpy, $x, $y);
@@ -196,43 +231,57 @@ 
 
     public function bezierCurveTo($cp1x, $cp1y, $cp2x, $cp2y, $x, $y)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->curveto($cp1x, $cp1y, $cp2x, $cp2y, $x, $y);
     }
 
     public function arcTo($x1, $y1, $x2, $y2, $radius)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
     }
 
     public function arc($x, $y, $radius, $startAngle, $endAngle, $anticlockwise = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->arc($x, $y, $radius, $startAngle, $endAngle);
     }
 
     public function circle($x, $y, $radius)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->circle($x, $y, $radius);
     }
 
     public function ellipse($x, $y, $radiusX, $radiusY, $rotation, $startAngle, $endAngle, $anticlockwise)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->ellipse($x, $y, $radiusX, $radiusY);
     }
 
     public function fillRect($x, $y, $w, $h)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->rect($x, $y, $w, $h);
         $this->fill();
     }
 
     public function rect($x, $y, $w, $h, $rx = 0, $ry = 0)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         $canvas = $this->canvas;
 
@@ -274,20 +323,26 @@ 
 
     public function fill()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->fill();
     }
 
     public function strokeRect($x, $y, $w, $h)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->rect($x, $y, $w, $h);
         $this->stroke();
     }
 
     public function stroke(bool $close = false)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         if ($close) {
             $this->canvas->closepath_stroke();
         } else {
@@ -297,13 +352,17 @@ 
 
     public function endPath()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $this->canvas->endPath();
     }
 
     public function measureText($text)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         $style = $this->getStyle();
         $font = $this->getFont($style->fontFamily, $style->fontStyle);
 
@@ -312,13 +371,17 @@ 
 
     public function getStyle()
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
         return $this->style;
     }
 
     public function setStyle(Style $style)
     {
-        if (self::DEBUG) echo __FUNCTION__ . "\n";
+        if (self::DEBUG) {
+        	echo __FUNCTION__ . "\n";
+        }
 
         $this->style = $style;
         $canvas = $this->canvas;
@@ -378,8 +441,7 @@ 
         if ($opacity !== null && $opacity < 1.0) {
             $opts[] = "opacityfill=$opacity";
             $opts[] = "opacitystroke=$opacity";
-        }
-        else {
+        } else {
             $fillOpacity = $style->fillOpacity;
             if ($fillOpacity !== null && $fillOpacity < 1.0) {
                 $opts[] = "opacityfill=$fillOpacity";