eventespresso / event-espresso-core

vendor/dompdf/dompdf/src/Frame/Factory.php

Indentation +232 added lines, -232 removed lines

@@ -28,236 +28,236 @@
 class Factory
 {
 
-     /**
-     * Array of positioners for specific frame types
-     *
-     * @var AbstractPositioner[]
-     */
-    protected static $_positioners;
-
-    /**
-     * Decorate the root Frame
-     *
-     * @param $root   Frame The frame to decorate
-     * @param $dompdf Dompdf The dompdf instance
-     *
-     * @return PageFrameDecorator
-     */
-    static function decorate_root(Frame $root, Dompdf $dompdf)
-    {
-        $frame = new PageFrameDecorator($root, $dompdf);
-        $frame->set_reflower(new PageFrameReflower($frame));
-        $root->set_decorator($frame);
-
-        return $frame;
-    }
-
-    /**
-     * Decorate a Frame
-     *
-     * @param Frame $frame   The frame to decorate
-     * @param Dompdf $dompdf The dompdf instance
-     * @param Frame $root    The root of the frame
-     *
-     * @throws Exception
-     * @return AbstractFrameDecorator
-     * FIXME: this is admittedly a little smelly...
-     */
-    static function decorate_frame(Frame $frame, Dompdf $dompdf, Frame $root = null)
-    {
-        $style = $frame->get_style();
-        $display = $style->display;
-
-        switch ($display) {
-
-            case "block":
-                $positioner = "Block";
-                $decorator = "Block";
-                $reflower = "Block";
-                break;
-
-            case "inline-block":
-                $positioner = "Inline";
-                $decorator = "Block";
-                $reflower = "Block";
-                break;
-
-            case "inline":
-                $positioner = "Inline";
-                if ($frame->is_text_node()) {
-                    $decorator = "Text";
-                    $reflower = "Text";
-                } else {
-                    $decorator = "Inline";
-                    $reflower = "Inline";
-                }
-                break;
-
-            case "table":
-                $positioner = "Block";
-                $decorator = "Table";
-                $reflower = "Table";
-                break;
-
-            case "inline-table":
-                $positioner = "Inline";
-                $decorator = "Table";
-                $reflower = "Table";
-                break;
-
-            case "table-row-group":
-            case "table-header-group":
-            case "table-footer-group":
-                $positioner = "NullPositioner";
-                $decorator = "TableRowGroup";
-                $reflower = "TableRowGroup";
-                break;
-
-            case "table-row":
-                $positioner = "NullPositioner";
-                $decorator = "TableRow";
-                $reflower = "TableRow";
-                break;
-
-            case "table-cell":
-                $positioner = "TableCell";
-                $decorator = "TableCell";
-                $reflower = "TableCell";
-                break;
-
-            case "list-item":
-                $positioner = "Block";
-                $decorator = "Block";
-                $reflower = "Block";
-                break;
-
-            case "-dompdf-list-bullet":
-                if ($style->list_style_position === "inside") {
-                    $positioner = "Inline";
-                } else {
-                    $positioner = "ListBullet";
-                }
-
-                if ($style->list_style_image !== "none") {
-                    $decorator = "ListBulletImage";
-                } else {
-                    $decorator = "ListBullet";
-                }
-
-                $reflower = "ListBullet";
-                break;
-
-            case "-dompdf-image":
-                $positioner = "Inline";
-                $decorator = "Image";
-                $reflower = "Image";
-                break;
-
-            case "-dompdf-br":
-                $positioner = "Inline";
-                $decorator = "Inline";
-                $reflower = "Inline";
-                break;
-
-            default:
-            case "none":
-                if ($style->_dompdf_keep !== "yes") {
-                    // Remove the node and the frame
-                    $frame->get_parent()->remove_child($frame);
-                    return;
-                }
-
-                $positioner = "NullPositioner";
-                $decorator = "NullFrameDecorator";
-                $reflower = "NullFrameReflower";
-                break;
-        }
-
-        // Handle CSS position
-        $position = $style->position;
-
-        if ($position === "absolute") {
-            $positioner = "Absolute";
-        } else {
-            if ($position === "fixed") {
-                $positioner = "Fixed";
-            }
-        }
-
-        $node = $frame->get_node();
-
-        // Handle nodeName
-        if ($node->nodeName === "img") {
-            $style->set_prop("display", "-dompdf-image");
-            $decorator = "Image";
-            $reflower = "Image";
-        }
-
-        $decorator  = "Dompdf\\FrameDecorator\\$decorator";
-        $reflower   = "Dompdf\\FrameReflower\\$reflower";
-
-        /** @var AbstractFrameDecorator $deco */
-        $deco = new $decorator($frame, $dompdf);
-
-        $deco->set_positioner(self::getPositionerInstance($positioner));
-        $deco->set_reflower(new $reflower($deco, $dompdf->getFontMetrics()));
-
-        if ($root) {
-            $deco->set_root($root);
-        }
-
-        if ($display === "list-item") {
-            // Insert a list-bullet frame
-            $xml = $dompdf->getDom();
-            $bullet_node = $xml->createElement("bullet"); // arbitrary choice
-            $b_f = new Frame($bullet_node);
-
-            $node = $frame->get_node();
-            $parent_node = $node->parentNode;
-            if ($parent_node && $parent_node instanceof \DOMElement) {
-                if (!$parent_node->hasAttribute("dompdf-children-count")) {
-                    $xpath = new DOMXPath($xml);
-                    $count = $xpath->query("li", $parent_node)->length;
-                    $parent_node->setAttribute("dompdf-children-count", $count);
-                }
-
-                if (is_numeric($node->getAttribute("value"))) {
-                    $index = intval($node->getAttribute("value"));
-                } else {
-                    if (!$parent_node->hasAttribute("dompdf-counter")) {
-                        $index = ($parent_node->hasAttribute("start") ? $parent_node->getAttribute("start") : 1);
-                    } else {
-                        $index = (int)$parent_node->getAttribute("dompdf-counter") + 1;
-                    }
-                }
-
-                $parent_node->setAttribute("dompdf-counter", $index);
-                $bullet_node->setAttribute("dompdf-counter", $index);
-            }
-
-            $new_style = $dompdf->getCss()->create_style();
-            $new_style->set_prop("display", "-dompdf-list-bullet");
-            $new_style->inherit($style);
-            $b_f->set_style($new_style);
-
-            $deco->prepend_child(Factory::decorate_frame($b_f, $dompdf, $root));
-        }
-
-        return $deco;
-    }
-
-    /**
-     * Creates Positioners
-     *
-     * @param string $type type of positioner to use
-     * @return AbstractPositioner
-     */
-    protected static function getPositionerInstance($type)
-    {
-        if (!isset(self::$_positioners[$type])) {
-            $class = '\\Dompdf\\Positioner\\'.$type;
-            self::$_positioners[$type] = new $class();
-        }
-        return self::$_positioners[$type];
-    }
+	 /**
+	  * Array of positioners for specific frame types
+	  *
+	  * @var AbstractPositioner[]
+	  */
+	protected static $_positioners;
+
+	/**
+	 * Decorate the root Frame
+	 *
+	 * @param $root   Frame The frame to decorate
+	 * @param $dompdf Dompdf The dompdf instance
+	 *
+	 * @return PageFrameDecorator
+	 */
+	static function decorate_root(Frame $root, Dompdf $dompdf)
+	{
+		$frame = new PageFrameDecorator($root, $dompdf);
+		$frame->set_reflower(new PageFrameReflower($frame));
+		$root->set_decorator($frame);
+
+		return $frame;
+	}
+
+	/**
+	 * Decorate a Frame
+	 *
+	 * @param Frame $frame   The frame to decorate
+	 * @param Dompdf $dompdf The dompdf instance
+	 * @param Frame $root    The root of the frame
+	 *
+	 * @throws Exception
+	 * @return AbstractFrameDecorator
+	 * FIXME: this is admittedly a little smelly...
+	 */
+	static function decorate_frame(Frame $frame, Dompdf $dompdf, Frame $root = null)
+	{
+		$style = $frame->get_style();
+		$display = $style->display;
+
+		switch ($display) {
+
+			case "block":
+				$positioner = "Block";
+				$decorator = "Block";
+				$reflower = "Block";
+				break;
+
+			case "inline-block":
+				$positioner = "Inline";
+				$decorator = "Block";
+				$reflower = "Block";
+				break;
+
+			case "inline":
+				$positioner = "Inline";
+				if ($frame->is_text_node()) {
+					$decorator = "Text";
+					$reflower = "Text";
+				} else {
+					$decorator = "Inline";
+					$reflower = "Inline";
+				}
+				break;
+
+			case "table":
+				$positioner = "Block";
+				$decorator = "Table";
+				$reflower = "Table";
+				break;
+
+			case "inline-table":
+				$positioner = "Inline";
+				$decorator = "Table";
+				$reflower = "Table";
+				break;
+
+			case "table-row-group":
+			case "table-header-group":
+			case "table-footer-group":
+				$positioner = "NullPositioner";
+				$decorator = "TableRowGroup";
+				$reflower = "TableRowGroup";
+				break;
+
+			case "table-row":
+				$positioner = "NullPositioner";
+				$decorator = "TableRow";
+				$reflower = "TableRow";
+				break;
+
+			case "table-cell":
+				$positioner = "TableCell";
+				$decorator = "TableCell";
+				$reflower = "TableCell";
+				break;
+
+			case "list-item":
+				$positioner = "Block";
+				$decorator = "Block";
+				$reflower = "Block";
+				break;
+
+			case "-dompdf-list-bullet":
+				if ($style->list_style_position === "inside") {
+					$positioner = "Inline";
+				} else {
+					$positioner = "ListBullet";
+				}
+
+				if ($style->list_style_image !== "none") {
+					$decorator = "ListBulletImage";
+				} else {
+					$decorator = "ListBullet";
+				}
+
+				$reflower = "ListBullet";
+				break;
+
+			case "-dompdf-image":
+				$positioner = "Inline";
+				$decorator = "Image";
+				$reflower = "Image";
+				break;
+
+			case "-dompdf-br":
+				$positioner = "Inline";
+				$decorator = "Inline";
+				$reflower = "Inline";
+				break;
+
+			default:
+			case "none":
+				if ($style->_dompdf_keep !== "yes") {
+					// Remove the node and the frame
+					$frame->get_parent()->remove_child($frame);
+					return;
+				}
+
+				$positioner = "NullPositioner";
+				$decorator = "NullFrameDecorator";
+				$reflower = "NullFrameReflower";
+				break;
+		}
+
+		// Handle CSS position
+		$position = $style->position;
+
+		if ($position === "absolute") {
+			$positioner = "Absolute";
+		} else {
+			if ($position === "fixed") {
+				$positioner = "Fixed";
+			}
+		}
+
+		$node = $frame->get_node();
+
+		// Handle nodeName
+		if ($node->nodeName === "img") {
+			$style->set_prop("display", "-dompdf-image");
+			$decorator = "Image";
+			$reflower = "Image";
+		}
+
+		$decorator  = "Dompdf\\FrameDecorator\\$decorator";
+		$reflower   = "Dompdf\\FrameReflower\\$reflower";
+
+		/** @var AbstractFrameDecorator $deco */
+		$deco = new $decorator($frame, $dompdf);
+
+		$deco->set_positioner(self::getPositionerInstance($positioner));
+		$deco->set_reflower(new $reflower($deco, $dompdf->getFontMetrics()));
+
+		if ($root) {
+			$deco->set_root($root);
+		}
+
+		if ($display === "list-item") {
+			// Insert a list-bullet frame
+			$xml = $dompdf->getDom();
+			$bullet_node = $xml->createElement("bullet"); // arbitrary choice
+			$b_f = new Frame($bullet_node);
+
+			$node = $frame->get_node();
+			$parent_node = $node->parentNode;
+			if ($parent_node && $parent_node instanceof \DOMElement) {
+				if (!$parent_node->hasAttribute("dompdf-children-count")) {
+					$xpath = new DOMXPath($xml);
+					$count = $xpath->query("li", $parent_node)->length;
+					$parent_node->setAttribute("dompdf-children-count", $count);
+				}
+
+				if (is_numeric($node->getAttribute("value"))) {
+					$index = intval($node->getAttribute("value"));
+				} else {
+					if (!$parent_node->hasAttribute("dompdf-counter")) {
+						$index = ($parent_node->hasAttribute("start") ? $parent_node->getAttribute("start") : 1);
+					} else {
+						$index = (int)$parent_node->getAttribute("dompdf-counter") + 1;
+					}
+				}
+
+				$parent_node->setAttribute("dompdf-counter", $index);
+				$bullet_node->setAttribute("dompdf-counter", $index);
+			}
+
+			$new_style = $dompdf->getCss()->create_style();
+			$new_style->set_prop("display", "-dompdf-list-bullet");
+			$new_style->inherit($style);
+			$b_f->set_style($new_style);
+
+			$deco->prepend_child(Factory::decorate_frame($b_f, $dompdf, $root));
+		}
+
+		return $deco;
+	}
+
+	/**
+	 * Creates Positioners
+	 *
+	 * @param string $type type of positioner to use
+	 * @return AbstractPositioner
+	 */
+	protected static function getPositionerInstance($type)
+	{
+		if (!isset(self::$_positioners[$type])) {
+			$class = '\\Dompdf\\Positioner\\'.$type;
+			self::$_positioners[$type] = new $class();
+		}
+		return self::$_positioners[$type];
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -215,7 +215,7 @@ 
             $node = $frame->get_node();
             $parent_node = $node->parentNode;
             if ($parent_node && $parent_node instanceof \DOMElement) {
-                if (!$parent_node->hasAttribute("dompdf-children-count")) {
+                if ( ! $parent_node->hasAttribute("dompdf-children-count")) {
                     $xpath = new DOMXPath($xml);
                     $count = $xpath->query("li", $parent_node)->length;
                     $parent_node->setAttribute("dompdf-children-count", $count);
@@ -224,10 +224,10 @@ 
                 if (is_numeric($node->getAttribute("value"))) {
                     $index = intval($node->getAttribute("value"));
                 } else {
-                    if (!$parent_node->hasAttribute("dompdf-counter")) {
+                    if ( ! $parent_node->hasAttribute("dompdf-counter")) {
                         $index = ($parent_node->hasAttribute("start") ? $parent_node->getAttribute("start") : 1);
                     } else {
-                        $index = (int)$parent_node->getAttribute("dompdf-counter") + 1;
+                        $index = (int) $parent_node->getAttribute("dompdf-counter") + 1;
                     }
                 }
 
@@ -254,7 +254,7 @@ 
      */
     protected static function getPositionerInstance($type)
     {
-        if (!isset(self::$_positioners[$type])) {
+        if ( ! isset(self::$_positioners[$type])) {
             $class = '\\Dompdf\\Positioner\\'.$type;
             self::$_positioners[$type] = new $class();
         }

vendor/dompdf/dompdf/src/Adapter/CPDF.php

Indentation +900 added lines, -900 removed lines

@@ -34,911 +34,911 @@
 class CPDF implements Canvas
 {
 
-    /**
-     * Dimensions of paper sizes in points
-     *
-     * @var array
-     */
-    static $PAPER_SIZES = [
-        "4a0" => [0.0, 0.0, 4767.87, 6740.79],
-        "2a0" => [0.0, 0.0, 3370.39, 4767.87],
-        "a0" => [0.0, 0.0, 2383.94, 3370.39],
-        "a1" => [0.0, 0.0, 1683.78, 2383.94],
-        "a2" => [0.0, 0.0, 1190.55, 1683.78],
-        "a3" => [0.0, 0.0, 841.89, 1190.55],
-        "a4" => [0.0, 0.0, 595.28, 841.89],
-        "a5" => [0.0, 0.0, 419.53, 595.28],
-        "a6" => [0.0, 0.0, 297.64, 419.53],
-        "a7" => [0.0, 0.0, 209.76, 297.64],
-        "a8" => [0.0, 0.0, 147.40, 209.76],
-        "a9" => [0.0, 0.0, 104.88, 147.40],
-        "a10" => [0.0, 0.0, 73.70, 104.88],
-        "b0" => [0.0, 0.0, 2834.65, 4008.19],
-        "b1" => [0.0, 0.0, 2004.09, 2834.65],
-        "b2" => [0.0, 0.0, 1417.32, 2004.09],
-        "b3" => [0.0, 0.0, 1000.63, 1417.32],
-        "b4" => [0.0, 0.0, 708.66, 1000.63],
-        "b5" => [0.0, 0.0, 498.90, 708.66],
-        "b6" => [0.0, 0.0, 354.33, 498.90],
-        "b7" => [0.0, 0.0, 249.45, 354.33],
-        "b8" => [0.0, 0.0, 175.75, 249.45],
-        "b9" => [0.0, 0.0, 124.72, 175.75],
-        "b10" => [0.0, 0.0, 87.87, 124.72],
-        "c0" => [0.0, 0.0, 2599.37, 3676.54],
-        "c1" => [0.0, 0.0, 1836.85, 2599.37],
-        "c2" => [0.0, 0.0, 1298.27, 1836.85],
-        "c3" => [0.0, 0.0, 918.43, 1298.27],
-        "c4" => [0.0, 0.0, 649.13, 918.43],
-        "c5" => [0.0, 0.0, 459.21, 649.13],
-        "c6" => [0.0, 0.0, 323.15, 459.21],
-        "c7" => [0.0, 0.0, 229.61, 323.15],
-        "c8" => [0.0, 0.0, 161.57, 229.61],
-        "c9" => [0.0, 0.0, 113.39, 161.57],
-        "c10" => [0.0, 0.0, 79.37, 113.39],
-        "ra0" => [0.0, 0.0, 2437.80, 3458.27],
-        "ra1" => [0.0, 0.0, 1729.13, 2437.80],
-        "ra2" => [0.0, 0.0, 1218.90, 1729.13],
-        "ra3" => [0.0, 0.0, 864.57, 1218.90],
-        "ra4" => [0.0, 0.0, 609.45, 864.57],
-        "sra0" => [0.0, 0.0, 2551.18, 3628.35],
-        "sra1" => [0.0, 0.0, 1814.17, 2551.18],
-        "sra2" => [0.0, 0.0, 1275.59, 1814.17],
-        "sra3" => [0.0, 0.0, 907.09, 1275.59],
-        "sra4" => [0.0, 0.0, 637.80, 907.09],
-        "letter" => [0.0, 0.0, 612.00, 792.00],
-        "half-letter" => [0.0, 0.0, 396.00, 612.00],
-        "legal" => [0.0, 0.0, 612.00, 1008.00],
-        "ledger" => [0.0, 0.0, 1224.00, 792.00],
-        "tabloid" => [0.0, 0.0, 792.00, 1224.00],
-        "executive" => [0.0, 0.0, 521.86, 756.00],
-        "folio" => [0.0, 0.0, 612.00, 936.00],
-        "commercial #10 envelope" => [0.0, 0.0, 684.00, 297.00],
-        "catalog #10 1/2 envelope" => [0.0, 0.0, 648.00, 864.00],
-        "8.5x11" => [0.0, 0.0, 612.00, 792.00],
-        "8.5x14" => [0.0, 0.0, 612.00, 1008.00],
-        "11x17" => [0.0, 0.0, 792.00, 1224.00],
-    ];
-
-    /**
-     * The Dompdf object
-     *
-     * @var Dompdf
-     */
-    protected $_dompdf;
-
-    /**
-     * Instance of Cpdf class
-     *
-     * @var \Dompdf\Cpdf
-     */
-    protected $_pdf;
-
-    /**
-     * PDF width, in points
-     *
-     * @var float
-     */
-    protected $_width;
-
-    /**
-     * PDF height, in points
-     *
-     * @var float
-     */
-    protected $_height;
-
-    /**
-     * Current page number
-     *
-     * @var int
-     */
-    protected $_page_number;
-
-    /**
-     * Total number of pages
-     *
-     * @var int
-     */
-    protected $_page_count;
-
-    /**
-     * Array of pages for accessing after rendering is initially complete
-     *
-     * @var array
-     */
-    protected $_pages;
-
-    /**
-     * Currently-applied opacity level (0 - 1)
-     *
-     * @var float
-     */
-    protected $_current_opacity = 1;
-
-    public function __construct($paper = "letter", $orientation = "portrait", ?Dompdf $dompdf = null)
-    {
-        if (is_array($paper)) {
-            $size = array_map("floatval", $paper);
-        } else {
-            $paper = strtolower($paper);
-            $size = self::$PAPER_SIZES[$paper] ?? self::$PAPER_SIZES["letter"];
-        }
-
-        if (strtolower($orientation) === "landscape") {
-            [$size[2], $size[3]] = [$size[3], $size[2]];
-        }
-
-        if ($dompdf === null) {
-            $this->_dompdf = new Dompdf();
-        } else {
-            $this->_dompdf = $dompdf;
-        }
-
-        $this->_pdf = new \Dompdf\Cpdf(
-            $size,
-            true,
-            $this->_dompdf->getOptions()->getFontCache(),
-            $this->_dompdf->getOptions()->getTempDir()
-        );
-
-        $this->_pdf->addInfo("Producer", sprintf("%s + CPDF", $this->_dompdf->version));
-        $time = substr_replace(date('YmdHisO'), '\'', -2, 0) . '\'';
-        $this->_pdf->addInfo("CreationDate", "D:$time");
-        $this->_pdf->addInfo("ModDate", "D:$time");
-
-        $this->_width = $size[2] - $size[0];
-        $this->_height = $size[3] - $size[1];
-
-        $this->_page_number = $this->_page_count = 1;
-
-        $this->_pages = [$this->_pdf->getFirstPageId()];
-    }
-
-    public function get_dompdf()
-    {
-        return $this->_dompdf;
-    }
-
-    /**
-     * Returns the Cpdf instance
-     *
-     * @return \Dompdf\Cpdf
-     */
-    public function get_cpdf()
-    {
-        return $this->_pdf;
-    }
-
-    public function add_info(string $label, string $value): void
-    {
-        $this->_pdf->addInfo($label, $value);
-    }
-
-    /**
-     * Opens a new 'object'
-     *
-     * While an object is open, all drawing actions are recorded in the object,
-     * as opposed to being drawn on the current page.  Objects can be added
-     * later to a specific page or to several pages.
-     *
-     * The return value is an integer ID for the new object.
-     *
-     * @see CPDF::close_object()
-     * @see CPDF::add_object()
-     *
-     * @return int
-     */
-    public function open_object()
-    {
-        $ret = $this->_pdf->openObject();
-        $this->_pdf->saveState();
-        return $ret;
-    }
-
-    /**
-     * Reopens an existing 'object'
-     *
-     * @see CPDF::open_object()
-     * @param int $object the ID of a previously opened object
-     */
-    public function reopen_object($object)
-    {
-        $this->_pdf->reopenObject($object);
-        $this->_pdf->saveState();
-    }
-
-    /**
-     * Closes the current 'object'
-     *
-     * @see CPDF::open_object()
-     */
-    public function close_object()
-    {
-        $this->_pdf->restoreState();
-        $this->_pdf->closeObject();
-    }
-
-    /**
-     * Adds a specified 'object' to the document
-     *
-     * $object int specifying an object created with {@link
-     * CPDF::open_object()}.  $where can be one of:
-     * - 'add' add to current page only
-     * - 'all' add to every page from the current one onwards
-     * - 'odd' add to all odd numbered pages from now on
-     * - 'even' add to all even numbered pages from now on
-     * - 'next' add the object to the next page only
-     * - 'nextodd' add to all odd numbered pages from the next one
-     * - 'nexteven' add to all even numbered pages from the next one
-     *
-     * @see Cpdf::addObject()
-     *
-     * @param int $object
-     * @param string $where
-     */
-    public function add_object($object, $where = 'all')
-    {
-        $this->_pdf->addObject($object, $where);
-    }
-
-    /**
-     * Stops the specified 'object' from appearing in the document.
-     *
-     * The object will stop being displayed on the page following the current
-     * one.
-     *
-     * @param int $object
-     */
-    public function stop_object($object)
-    {
-        $this->_pdf->stopObject($object);
-    }
-
-    /**
-     * Serialize the pdf object's current state for retrieval later
-     */
-    public function serialize_object($id)
-    {
-        return $this->_pdf->serializeObject($id);
-    }
-
-    public function reopen_serialized_object($obj)
-    {
-        return $this->_pdf->restoreSerializedObject($obj);
-    }
-
-    //........................................................................
-
-    public function get_width()
-    {
-        return $this->_width;
-    }
-
-    public function get_height()
-    {
-        return $this->_height;
-    }
-
-    public function get_page_number()
-    {
-        return $this->_page_number;
-    }
-
-    public function get_page_count()
-    {
-        return $this->_page_count;
-    }
-
-    /**
-     * Sets the current page number
-     *
-     * @param int $num
-     */
-    public function set_page_number($num)
-    {
-        $this->_page_number = $num;
-    }
-
-    public function set_page_count($count)
-    {
-        $this->_page_count = $count;
-    }
-
-    /**
-     * Sets the stroke color
-     *
-     * See {@link Style::set_color()} for the format of the color array.
-     *
-     * @param array $color
-     */
-    protected function _set_stroke_color($color)
-    {
-        $this->_pdf->setStrokeColor($color);
-        $alpha = isset($color["alpha"]) ? $color["alpha"] : 1;
-        $alpha *= $this->_current_opacity;
-        $this->_set_line_transparency("Normal", $alpha);
-    }
-
-    /**
-     * Sets the fill colour
-     *
-     * See {@link Style::set_color()} for the format of the colour array.
-     *
-     * @param array $color
-     */
-    protected function _set_fill_color($color)
-    {
-        $this->_pdf->setColor($color);
-        $alpha = isset($color["alpha"]) ? $color["alpha"] : 1;
-        $alpha *= $this->_current_opacity;
-        $this->_set_fill_transparency("Normal", $alpha);
-    }
-
-    /**
-     * Sets line transparency
-     * @see Cpdf::setLineTransparency()
-     *
-     * Valid blend modes are (case-sensitive):
-     *
-     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-     * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
-     * Exclusion
-     *
-     * @param string $mode    the blending mode to use
-     * @param float  $opacity 0.0 fully transparent, 1.0 fully opaque
-     */
-    protected function _set_line_transparency($mode, $opacity)
-    {
-        $this->_pdf->setLineTransparency($mode, $opacity);
-    }
-
-    /**
-     * Sets fill transparency
-     * @see Cpdf::setFillTransparency()
-     *
-     * Valid blend modes are (case-sensitive):
-     *
-     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-     * Exclusion
-     *
-     * @param string $mode    the blending mode to use
-     * @param float  $opacity 0.0 fully transparent, 1.0 fully opaque
-     */
-    protected function _set_fill_transparency($mode, $opacity)
-    {
-        $this->_pdf->setFillTransparency($mode, $opacity);
-    }
-
-    /**
-     * Sets the line style
-     *
-     * @see Cpdf::setLineStyle()
-     *
-     * @param float  $width
-     * @param string $cap
-     * @param string $join
-     * @param array  $dash
-     */
-    protected function _set_line_style($width, $cap, $join, $dash)
-    {
-        $this->_pdf->setLineStyle($width, $cap, $join, $dash);
-    }
-
-    public function set_opacity(float $opacity, string $mode = "Normal"): void
-    {
-        $this->_set_line_transparency($mode, $opacity);
-        $this->_set_fill_transparency($mode, $opacity);
-        $this->_current_opacity = $opacity;
-    }
-
-    public function set_default_view($view, $options = [])
-    {
-        array_unshift($options, $view);
-        call_user_func_array([$this->_pdf, "openHere"], $options);
-    }
-
-    /**
-     * Remaps y coords from 4th to 1st quadrant
-     *
-     * @param float $y
-     * @return float
-     */
-    protected function y($y)
-    {
-        return $this->_height - $y;
-    }
-
-    public function line($x1, $y1, $x2, $y2, $color, $width, $style = [], $cap = "butt")
-    {
-        $this->_set_stroke_color($color);
-        $this->_set_line_style($width, $cap, "", $style);
-
-        $this->_pdf->line($x1, $this->y($y1),
-            $x2, $this->y($y2));
-        $this->_set_line_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function arc($x, $y, $r1, $r2, $astart, $aend, $color, $width, $style = [], $cap = "butt")
-    {
-        $this->_set_stroke_color($color);
-        $this->_set_line_style($width, $cap, "", $style);
-
-        $this->_pdf->ellipse($x, $this->y($y), $r1, $r2, 0, 8, $astart, $aend, false, false, true, false);
-        $this->_set_line_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function rectangle($x1, $y1, $w, $h, $color, $width, $style = [], $cap = "butt")
-    {
-        $this->_set_stroke_color($color);
-        $this->_set_line_style($width, $cap, "", $style);
-        $this->_pdf->rectangle($x1, $this->y($y1) - $h, $w, $h);
-        $this->_set_line_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function filled_rectangle($x1, $y1, $w, $h, $color)
-    {
-        $this->_set_fill_color($color);
-        $this->_pdf->filledRectangle($x1, $this->y($y1) - $h, $w, $h);
-        $this->_set_fill_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function clipping_rectangle($x1, $y1, $w, $h)
-    {
-        $this->_pdf->clippingRectangle($x1, $this->y($y1) - $h, $w, $h);
-    }
-
-    public function clipping_roundrectangle($x1, $y1, $w, $h, $rTL, $rTR, $rBR, $rBL)
-    {
-        $this->_pdf->clippingRectangleRounded($x1, $this->y($y1) - $h, $w, $h, $rTL, $rTR, $rBR, $rBL);
-    }
-
-    public function clipping_polygon(array $points): void
-    {
-        // Adjust y values
-        for ($i = 1; $i < count($points); $i += 2) {
-            $points[$i] = $this->y($points[$i]);
-        }
-
-        $this->_pdf->clippingPolygon($points);
-    }
-
-    public function clipping_end()
-    {
-        $this->_pdf->clippingEnd();
-    }
-
-    public function save()
-    {
-        $this->_pdf->saveState();
-    }
-
-    public function restore()
-    {
-        $this->_pdf->restoreState();
-    }
-
-    public function rotate($angle, $x, $y)
-    {
-        $this->_pdf->rotate($angle, $x, $y);
-    }
-
-    public function skew($angle_x, $angle_y, $x, $y)
-    {
-        $this->_pdf->skew($angle_x, $angle_y, $x, $y);
-    }
-
-    public function scale($s_x, $s_y, $x, $y)
-    {
-        $this->_pdf->scale($s_x, $s_y, $x, $y);
-    }
-
-    public function translate($t_x, $t_y)
-    {
-        $this->_pdf->translate($t_x, $t_y);
-    }
-
-    public function transform($a, $b, $c, $d, $e, $f)
-    {
-        $this->_pdf->transform([$a, $b, $c, $d, $e, $f]);
-    }
-
-    public function polygon($points, $color, $width = null, $style = [], $fill = false)
-    {
-        $this->_set_fill_color($color);
-        $this->_set_stroke_color($color);
-
-        if (!$fill && isset($width)) {
-            $this->_set_line_style($width, "square", "miter", $style);
-        }
-
-        // Adjust y values
-        for ($i = 1; $i < count($points); $i += 2) {
-            $points[$i] = $this->y($points[$i]);
-        }
-
-        $this->_pdf->polygon($points, $fill);
-
-        $this->_set_fill_transparency("Normal", $this->_current_opacity);
-        $this->_set_line_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function circle($x, $y, $r, $color, $width = null, $style = [], $fill = false)
-    {
-        $this->_set_fill_color($color);
-        $this->_set_stroke_color($color);
-
-        if (!$fill && isset($width)) {
-            $this->_set_line_style($width, "round", "round", $style);
-        }
-
-        $this->_pdf->ellipse($x, $this->y($y), $r, 0, 0, 8, 0, 360, 1, $fill);
-
-        $this->_set_fill_transparency("Normal", $this->_current_opacity);
-        $this->_set_line_transparency("Normal", $this->_current_opacity);
-    }
-
-    /**
-     * Convert image to a PNG image
-     *
-     * @param string $image_url
-     * @param string $type
-     *
-     * @return string|null The url of the newly converted image
-     */
-    protected function _convert_to_png($image_url, $type)
-    {
-        $filename = Cache::getTempImage($image_url);
-
-        if ($filename !== null && file_exists($filename)) {
-            return $filename;
-        }
+	/**
+	 * Dimensions of paper sizes in points
+	 *
+	 * @var array
+	 */
+	static $PAPER_SIZES = [
+		"4a0" => [0.0, 0.0, 4767.87, 6740.79],
+		"2a0" => [0.0, 0.0, 3370.39, 4767.87],
+		"a0" => [0.0, 0.0, 2383.94, 3370.39],
+		"a1" => [0.0, 0.0, 1683.78, 2383.94],
+		"a2" => [0.0, 0.0, 1190.55, 1683.78],
+		"a3" => [0.0, 0.0, 841.89, 1190.55],
+		"a4" => [0.0, 0.0, 595.28, 841.89],
+		"a5" => [0.0, 0.0, 419.53, 595.28],
+		"a6" => [0.0, 0.0, 297.64, 419.53],
+		"a7" => [0.0, 0.0, 209.76, 297.64],
+		"a8" => [0.0, 0.0, 147.40, 209.76],
+		"a9" => [0.0, 0.0, 104.88, 147.40],
+		"a10" => [0.0, 0.0, 73.70, 104.88],
+		"b0" => [0.0, 0.0, 2834.65, 4008.19],
+		"b1" => [0.0, 0.0, 2004.09, 2834.65],
+		"b2" => [0.0, 0.0, 1417.32, 2004.09],
+		"b3" => [0.0, 0.0, 1000.63, 1417.32],
+		"b4" => [0.0, 0.0, 708.66, 1000.63],
+		"b5" => [0.0, 0.0, 498.90, 708.66],
+		"b6" => [0.0, 0.0, 354.33, 498.90],
+		"b7" => [0.0, 0.0, 249.45, 354.33],
+		"b8" => [0.0, 0.0, 175.75, 249.45],
+		"b9" => [0.0, 0.0, 124.72, 175.75],
+		"b10" => [0.0, 0.0, 87.87, 124.72],
+		"c0" => [0.0, 0.0, 2599.37, 3676.54],
+		"c1" => [0.0, 0.0, 1836.85, 2599.37],
+		"c2" => [0.0, 0.0, 1298.27, 1836.85],
+		"c3" => [0.0, 0.0, 918.43, 1298.27],
+		"c4" => [0.0, 0.0, 649.13, 918.43],
+		"c5" => [0.0, 0.0, 459.21, 649.13],
+		"c6" => [0.0, 0.0, 323.15, 459.21],
+		"c7" => [0.0, 0.0, 229.61, 323.15],
+		"c8" => [0.0, 0.0, 161.57, 229.61],
+		"c9" => [0.0, 0.0, 113.39, 161.57],
+		"c10" => [0.0, 0.0, 79.37, 113.39],
+		"ra0" => [0.0, 0.0, 2437.80, 3458.27],
+		"ra1" => [0.0, 0.0, 1729.13, 2437.80],
+		"ra2" => [0.0, 0.0, 1218.90, 1729.13],
+		"ra3" => [0.0, 0.0, 864.57, 1218.90],
+		"ra4" => [0.0, 0.0, 609.45, 864.57],
+		"sra0" => [0.0, 0.0, 2551.18, 3628.35],
+		"sra1" => [0.0, 0.0, 1814.17, 2551.18],
+		"sra2" => [0.0, 0.0, 1275.59, 1814.17],
+		"sra3" => [0.0, 0.0, 907.09, 1275.59],
+		"sra4" => [0.0, 0.0, 637.80, 907.09],
+		"letter" => [0.0, 0.0, 612.00, 792.00],
+		"half-letter" => [0.0, 0.0, 396.00, 612.00],
+		"legal" => [0.0, 0.0, 612.00, 1008.00],
+		"ledger" => [0.0, 0.0, 1224.00, 792.00],
+		"tabloid" => [0.0, 0.0, 792.00, 1224.00],
+		"executive" => [0.0, 0.0, 521.86, 756.00],
+		"folio" => [0.0, 0.0, 612.00, 936.00],
+		"commercial #10 envelope" => [0.0, 0.0, 684.00, 297.00],
+		"catalog #10 1/2 envelope" => [0.0, 0.0, 648.00, 864.00],
+		"8.5x11" => [0.0, 0.0, 612.00, 792.00],
+		"8.5x14" => [0.0, 0.0, 612.00, 1008.00],
+		"11x17" => [0.0, 0.0, 792.00, 1224.00],
+	];
+
+	/**
+	 * The Dompdf object
+	 *
+	 * @var Dompdf
+	 */
+	protected $_dompdf;
+
+	/**
+	 * Instance of Cpdf class
+	 *
+	 * @var \Dompdf\Cpdf
+	 */
+	protected $_pdf;
+
+	/**
+	 * PDF width, in points
+	 *
+	 * @var float
+	 */
+	protected $_width;
+
+	/**
+	 * PDF height, in points
+	 *
+	 * @var float
+	 */
+	protected $_height;
+
+	/**
+	 * Current page number
+	 *
+	 * @var int
+	 */
+	protected $_page_number;
+
+	/**
+	 * Total number of pages
+	 *
+	 * @var int
+	 */
+	protected $_page_count;
+
+	/**
+	 * Array of pages for accessing after rendering is initially complete
+	 *
+	 * @var array
+	 */
+	protected $_pages;
+
+	/**
+	 * Currently-applied opacity level (0 - 1)
+	 *
+	 * @var float
+	 */
+	protected $_current_opacity = 1;
+
+	public function __construct($paper = "letter", $orientation = "portrait", ?Dompdf $dompdf = null)
+	{
+		if (is_array($paper)) {
+			$size = array_map("floatval", $paper);
+		} else {
+			$paper = strtolower($paper);
+			$size = self::$PAPER_SIZES[$paper] ?? self::$PAPER_SIZES["letter"];
+		}
+
+		if (strtolower($orientation) === "landscape") {
+			[$size[2], $size[3]] = [$size[3], $size[2]];
+		}
+
+		if ($dompdf === null) {
+			$this->_dompdf = new Dompdf();
+		} else {
+			$this->_dompdf = $dompdf;
+		}
+
+		$this->_pdf = new \Dompdf\Cpdf(
+			$size,
+			true,
+			$this->_dompdf->getOptions()->getFontCache(),
+			$this->_dompdf->getOptions()->getTempDir()
+		);
+
+		$this->_pdf->addInfo("Producer", sprintf("%s + CPDF", $this->_dompdf->version));
+		$time = substr_replace(date('YmdHisO'), '\'', -2, 0) . '\'';
+		$this->_pdf->addInfo("CreationDate", "D:$time");
+		$this->_pdf->addInfo("ModDate", "D:$time");
+
+		$this->_width = $size[2] - $size[0];
+		$this->_height = $size[3] - $size[1];
+
+		$this->_page_number = $this->_page_count = 1;
+
+		$this->_pages = [$this->_pdf->getFirstPageId()];
+	}
+
+	public function get_dompdf()
+	{
+		return $this->_dompdf;
+	}
+
+	/**
+	 * Returns the Cpdf instance
+	 *
+	 * @return \Dompdf\Cpdf
+	 */
+	public function get_cpdf()
+	{
+		return $this->_pdf;
+	}
+
+	public function add_info(string $label, string $value): void
+	{
+		$this->_pdf->addInfo($label, $value);
+	}
+
+	/**
+	 * Opens a new 'object'
+	 *
+	 * While an object is open, all drawing actions are recorded in the object,
+	 * as opposed to being drawn on the current page.  Objects can be added
+	 * later to a specific page or to several pages.
+	 *
+	 * The return value is an integer ID for the new object.
+	 *
+	 * @see CPDF::close_object()
+	 * @see CPDF::add_object()
+	 *
+	 * @return int
+	 */
+	public function open_object()
+	{
+		$ret = $this->_pdf->openObject();
+		$this->_pdf->saveState();
+		return $ret;
+	}
+
+	/**
+	 * Reopens an existing 'object'
+	 *
+	 * @see CPDF::open_object()
+	 * @param int $object the ID of a previously opened object
+	 */
+	public function reopen_object($object)
+	{
+		$this->_pdf->reopenObject($object);
+		$this->_pdf->saveState();
+	}
+
+	/**
+	 * Closes the current 'object'
+	 *
+	 * @see CPDF::open_object()
+	 */
+	public function close_object()
+	{
+		$this->_pdf->restoreState();
+		$this->_pdf->closeObject();
+	}
+
+	/**
+	 * Adds a specified 'object' to the document
+	 *
+	 * $object int specifying an object created with {@link
+	 * CPDF::open_object()}.  $where can be one of:
+	 * - 'add' add to current page only
+	 * - 'all' add to every page from the current one onwards
+	 * - 'odd' add to all odd numbered pages from now on
+	 * - 'even' add to all even numbered pages from now on
+	 * - 'next' add the object to the next page only
+	 * - 'nextodd' add to all odd numbered pages from the next one
+	 * - 'nexteven' add to all even numbered pages from the next one
+	 *
+	 * @see Cpdf::addObject()
+	 *
+	 * @param int $object
+	 * @param string $where
+	 */
+	public function add_object($object, $where = 'all')
+	{
+		$this->_pdf->addObject($object, $where);
+	}
+
+	/**
+	 * Stops the specified 'object' from appearing in the document.
+	 *
+	 * The object will stop being displayed on the page following the current
+	 * one.
+	 *
+	 * @param int $object
+	 */
+	public function stop_object($object)
+	{
+		$this->_pdf->stopObject($object);
+	}
+
+	/**
+	 * Serialize the pdf object's current state for retrieval later
+	 */
+	public function serialize_object($id)
+	{
+		return $this->_pdf->serializeObject($id);
+	}
+
+	public function reopen_serialized_object($obj)
+	{
+		return $this->_pdf->restoreSerializedObject($obj);
+	}
+
+	//........................................................................
+
+	public function get_width()
+	{
+		return $this->_width;
+	}
+
+	public function get_height()
+	{
+		return $this->_height;
+	}
+
+	public function get_page_number()
+	{
+		return $this->_page_number;
+	}
+
+	public function get_page_count()
+	{
+		return $this->_page_count;
+	}
+
+	/**
+	 * Sets the current page number
+	 *
+	 * @param int $num
+	 */
+	public function set_page_number($num)
+	{
+		$this->_page_number = $num;
+	}
+
+	public function set_page_count($count)
+	{
+		$this->_page_count = $count;
+	}
+
+	/**
+	 * Sets the stroke color
+	 *
+	 * See {@link Style::set_color()} for the format of the color array.
+	 *
+	 * @param array $color
+	 */
+	protected function _set_stroke_color($color)
+	{
+		$this->_pdf->setStrokeColor($color);
+		$alpha = isset($color["alpha"]) ? $color["alpha"] : 1;
+		$alpha *= $this->_current_opacity;
+		$this->_set_line_transparency("Normal", $alpha);
+	}
+
+	/**
+	 * Sets the fill colour
+	 *
+	 * See {@link Style::set_color()} for the format of the colour array.
+	 *
+	 * @param array $color
+	 */
+	protected function _set_fill_color($color)
+	{
+		$this->_pdf->setColor($color);
+		$alpha = isset($color["alpha"]) ? $color["alpha"] : 1;
+		$alpha *= $this->_current_opacity;
+		$this->_set_fill_transparency("Normal", $alpha);
+	}
+
+	/**
+	 * Sets line transparency
+	 * @see Cpdf::setLineTransparency()
+	 *
+	 * Valid blend modes are (case-sensitive):
+	 *
+	 * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+	 * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
+	 * Exclusion
+	 *
+	 * @param string $mode    the blending mode to use
+	 * @param float  $opacity 0.0 fully transparent, 1.0 fully opaque
+	 */
+	protected function _set_line_transparency($mode, $opacity)
+	{
+		$this->_pdf->setLineTransparency($mode, $opacity);
+	}
+
+	/**
+	 * Sets fill transparency
+	 * @see Cpdf::setFillTransparency()
+	 *
+	 * Valid blend modes are (case-sensitive):
+	 *
+	 * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+	 * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+	 * Exclusion
+	 *
+	 * @param string $mode    the blending mode to use
+	 * @param float  $opacity 0.0 fully transparent, 1.0 fully opaque
+	 */
+	protected function _set_fill_transparency($mode, $opacity)
+	{
+		$this->_pdf->setFillTransparency($mode, $opacity);
+	}
+
+	/**
+	 * Sets the line style
+	 *
+	 * @see Cpdf::setLineStyle()
+	 *
+	 * @param float  $width
+	 * @param string $cap
+	 * @param string $join
+	 * @param array  $dash
+	 */
+	protected function _set_line_style($width, $cap, $join, $dash)
+	{
+		$this->_pdf->setLineStyle($width, $cap, $join, $dash);
+	}
+
+	public function set_opacity(float $opacity, string $mode = "Normal"): void
+	{
+		$this->_set_line_transparency($mode, $opacity);
+		$this->_set_fill_transparency($mode, $opacity);
+		$this->_current_opacity = $opacity;
+	}
+
+	public function set_default_view($view, $options = [])
+	{
+		array_unshift($options, $view);
+		call_user_func_array([$this->_pdf, "openHere"], $options);
+	}
+
+	/**
+	 * Remaps y coords from 4th to 1st quadrant
+	 *
+	 * @param float $y
+	 * @return float
+	 */
+	protected function y($y)
+	{
+		return $this->_height - $y;
+	}
+
+	public function line($x1, $y1, $x2, $y2, $color, $width, $style = [], $cap = "butt")
+	{
+		$this->_set_stroke_color($color);
+		$this->_set_line_style($width, $cap, "", $style);
+
+		$this->_pdf->line($x1, $this->y($y1),
+			$x2, $this->y($y2));
+		$this->_set_line_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function arc($x, $y, $r1, $r2, $astart, $aend, $color, $width, $style = [], $cap = "butt")
+	{
+		$this->_set_stroke_color($color);
+		$this->_set_line_style($width, $cap, "", $style);
+
+		$this->_pdf->ellipse($x, $this->y($y), $r1, $r2, 0, 8, $astart, $aend, false, false, true, false);
+		$this->_set_line_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function rectangle($x1, $y1, $w, $h, $color, $width, $style = [], $cap = "butt")
+	{
+		$this->_set_stroke_color($color);
+		$this->_set_line_style($width, $cap, "", $style);
+		$this->_pdf->rectangle($x1, $this->y($y1) - $h, $w, $h);
+		$this->_set_line_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function filled_rectangle($x1, $y1, $w, $h, $color)
+	{
+		$this->_set_fill_color($color);
+		$this->_pdf->filledRectangle($x1, $this->y($y1) - $h, $w, $h);
+		$this->_set_fill_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function clipping_rectangle($x1, $y1, $w, $h)
+	{
+		$this->_pdf->clippingRectangle($x1, $this->y($y1) - $h, $w, $h);
+	}
+
+	public function clipping_roundrectangle($x1, $y1, $w, $h, $rTL, $rTR, $rBR, $rBL)
+	{
+		$this->_pdf->clippingRectangleRounded($x1, $this->y($y1) - $h, $w, $h, $rTL, $rTR, $rBR, $rBL);
+	}
+
+	public function clipping_polygon(array $points): void
+	{
+		// Adjust y values
+		for ($i = 1; $i < count($points); $i += 2) {
+			$points[$i] = $this->y($points[$i]);
+		}
+
+		$this->_pdf->clippingPolygon($points);
+	}
+
+	public function clipping_end()
+	{
+		$this->_pdf->clippingEnd();
+	}
+
+	public function save()
+	{
+		$this->_pdf->saveState();
+	}
+
+	public function restore()
+	{
+		$this->_pdf->restoreState();
+	}
+
+	public function rotate($angle, $x, $y)
+	{
+		$this->_pdf->rotate($angle, $x, $y);
+	}
+
+	public function skew($angle_x, $angle_y, $x, $y)
+	{
+		$this->_pdf->skew($angle_x, $angle_y, $x, $y);
+	}
+
+	public function scale($s_x, $s_y, $x, $y)
+	{
+		$this->_pdf->scale($s_x, $s_y, $x, $y);
+	}
+
+	public function translate($t_x, $t_y)
+	{
+		$this->_pdf->translate($t_x, $t_y);
+	}
+
+	public function transform($a, $b, $c, $d, $e, $f)
+	{
+		$this->_pdf->transform([$a, $b, $c, $d, $e, $f]);
+	}
+
+	public function polygon($points, $color, $width = null, $style = [], $fill = false)
+	{
+		$this->_set_fill_color($color);
+		$this->_set_stroke_color($color);
+
+		if (!$fill && isset($width)) {
+			$this->_set_line_style($width, "square", "miter", $style);
+		}
+
+		// Adjust y values
+		for ($i = 1; $i < count($points); $i += 2) {
+			$points[$i] = $this->y($points[$i]);
+		}
+
+		$this->_pdf->polygon($points, $fill);
+
+		$this->_set_fill_transparency("Normal", $this->_current_opacity);
+		$this->_set_line_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function circle($x, $y, $r, $color, $width = null, $style = [], $fill = false)
+	{
+		$this->_set_fill_color($color);
+		$this->_set_stroke_color($color);
+
+		if (!$fill && isset($width)) {
+			$this->_set_line_style($width, "round", "round", $style);
+		}
+
+		$this->_pdf->ellipse($x, $this->y($y), $r, 0, 0, 8, 0, 360, 1, $fill);
+
+		$this->_set_fill_transparency("Normal", $this->_current_opacity);
+		$this->_set_line_transparency("Normal", $this->_current_opacity);
+	}
+
+	/**
+	 * Convert image to a PNG image
+	 *
+	 * @param string $image_url
+	 * @param string $type
+	 *
+	 * @return string|null The url of the newly converted image
+	 */
+	protected function _convert_to_png($image_url, $type)
+	{
+		$filename = Cache::getTempImage($image_url);
+
+		if ($filename !== null && file_exists($filename)) {
+			return $filename;
+		}
  
-        $func_name = "imagecreatefrom$type";
-
-        set_error_handler([Helpers::class, "record_warnings"]);
-
-        if (!function_exists($func_name)) {
-            if (!method_exists(Helpers::class, $func_name)) {
-                throw new Exception("Function $func_name() not found.  Cannot convert $type image: $image_url.  Please install the image PHP extension.");
-            }
-            $func_name = [Helpers::class, $func_name];
-        }
-
-        try {
-            $im = call_user_func($func_name, $image_url);
-
-            if ($im) {
-                imageinterlace($im, false);
-
-                $tmp_dir = $this->_dompdf->getOptions()->getTempDir();
-                $tmp_name = @tempnam($tmp_dir, "{$type}_dompdf_img_");
-                @unlink($tmp_name);
-                $filename = "$tmp_name.png";
-
-                imagepng($im, $filename);
-                imagedestroy($im);
-            } else {
-                $filename = null;
-            }
-        } finally {
-            restore_error_handler();
-        }
-
-        if ($filename !== null) {
-            Cache::addTempImage($image_url, $filename);
-        }
+		$func_name = "imagecreatefrom$type";
+
+		set_error_handler([Helpers::class, "record_warnings"]);
+
+		if (!function_exists($func_name)) {
+			if (!method_exists(Helpers::class, $func_name)) {
+				throw new Exception("Function $func_name() not found.  Cannot convert $type image: $image_url.  Please install the image PHP extension.");
+			}
+			$func_name = [Helpers::class, $func_name];
+		}
+
+		try {
+			$im = call_user_func($func_name, $image_url);
+
+			if ($im) {
+				imageinterlace($im, false);
+
+				$tmp_dir = $this->_dompdf->getOptions()->getTempDir();
+				$tmp_name = @tempnam($tmp_dir, "{$type}_dompdf_img_");
+				@unlink($tmp_name);
+				$filename = "$tmp_name.png";
+
+				imagepng($im, $filename);
+				imagedestroy($im);
+			} else {
+				$filename = null;
+			}
+		} finally {
+			restore_error_handler();
+		}
+
+		if ($filename !== null) {
+			Cache::addTempImage($image_url, $filename);
+		}
 
-        return $filename;
-    }
-
-    public function image($img, $x, $y, $w, $h, $resolution = "normal")
-    {
-        [$width, $height, $type] = Helpers::dompdf_getimagesize($img, $this->get_dompdf()->getHttpContext());
-
-        $debug_png = $this->_dompdf->getOptions()->getDebugPng();
-
-        if ($debug_png) {
-            print "[image:$img|$width|$height|$type]";
-        }
-
-        switch ($type) {
-            case "jpeg":
-                if ($debug_png) {
-                    print '!!!jpg!!!';
-                }
-                $this->_pdf->addJpegFromFile($img, $x, $this->y($y) - $h, $w, $h);
-                break;
-
-            case "webp":
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case "gif":
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case "bmp":
-                if ($debug_png) print "!!!{$type}!!!";
-                $img = $this->_convert_to_png($img, $type);
-                if ($img === null) {
-                    if ($debug_png) print '!!!conversion to PDF failed!!!';
-                    $this->image(Cache::$broken_image, $x, $y, $w, $h, $resolution);
-                    break;
-                }
-
-            case "png":
-                if ($debug_png) print '!!!png!!!';
-
-                $this->_pdf->addPngFromFile($img, $x, $this->y($y) - $h, $w, $h);
-                break;
-
-            case "svg":
-                if ($debug_png) print '!!!SVG!!!';
-
-                $this->_pdf->addSvgFromFile($img, $x, $this->y($y) - $h, $w, $h);
-                break;
-
-            default:
-                if ($debug_png) print '!!!unknown!!!';
-        }
-    }
-
-    public function select($x, $y, $w, $h, $font, $size, $color = [0, 0, 0], $opts = [])
-    {
-        $pdf = $this->_pdf;
-
-        $font .= ".afm";
-        $pdf->selectFont($font);
-
-        if (!isset($pdf->acroFormId)) {
-            $pdf->addForm();
-        }
-
-        $ft = \Dompdf\Cpdf::ACROFORM_FIELD_CHOICE;
-        $ff = \Dompdf\Cpdf::ACROFORM_FIELD_CHOICE_COMBO;
-
-        $id = $pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
-        $pdf->setFormFieldOpt($id, $opts);
-    }
-
-    public function textarea($x, $y, $w, $h, $font, $size, $color = [0, 0, 0])
-    {
-        $pdf = $this->_pdf;
-
-        $font .= ".afm";
-        $pdf->selectFont($font);
-
-        if (!isset($pdf->acroFormId)) {
-            $pdf->addForm();
-        }
-
-        $ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
-        $ff = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT_MULTILINE;
-
-        $pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
-    }
-
-    public function input($x, $y, $w, $h, $type, $font, $size, $color = [0, 0, 0])
-    {
-        $pdf = $this->_pdf;
-
-        $font .= ".afm";
-        $pdf->selectFont($font);
-
-        if (!isset($pdf->acroFormId)) {
-            $pdf->addForm();
-        }
-
-        $ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
-        $ff = 0;
-
-        switch ($type) {
-            case 'text':
-                $ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
-                break;
-            case 'password':
-                $ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
-                $ff = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT_PASSWORD;
-                break;
-            case 'submit':
-                $ft = \Dompdf\Cpdf::ACROFORM_FIELD_BUTTON;
-                break;
-        }
-
-        $pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
-    }
-
-    public function text($x, $y, $text, $font, $size, $color = [0, 0, 0], $word_space = 0.0, $char_space = 0.0, $angle = 0.0)
-    {
-        $pdf = $this->_pdf;
-
-        $this->_set_fill_color($color);
-
-        $is_font_subsetting = $this->_dompdf->getOptions()->getIsFontSubsettingEnabled();
-        $pdf->selectFont($font . '.afm', '', true, $is_font_subsetting);
-
-        $pdf->addText($x, $this->y($y) - $pdf->getFontHeight($size), $size, $text, $angle, $word_space, $char_space);
-
-        $this->_set_fill_transparency("Normal", $this->_current_opacity);
-    }
-
-    public function javascript($code)
-    {
-        $this->_pdf->addJavascript($code);
-    }
-
-    //........................................................................
-
-    public function add_named_dest($anchorname)
-    {
-        $this->_pdf->addDestination($anchorname, "Fit");
-    }
-
-    public function add_link($url, $x, $y, $width, $height)
-    {
-        $y = $this->y($y) - $height;
-
-        if (strpos($url, '#') === 0) {
-            // Local link
-            $name = substr($url, 1);
-            if ($name) {
-                $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
-            }
-        } else {
-            $this->_pdf->addLink($url, $x, $y, $x + $width, $y + $height);
-        }
-    }
-
-    /**
-     * @throws FontNotFoundException
-     */
-    public function get_text_width($text, $font, $size, $word_spacing = 0.0, $char_spacing = 0.0)
-    {
-        $this->_pdf->selectFont($font, '', true, $this->_dompdf->getOptions()->getIsFontSubsettingEnabled());
-        return $this->_pdf->getTextWidth($size, $text, $word_spacing, $char_spacing);
-    }
-
-    /**
-     * @throws FontNotFoundException
-     */
-    public function get_font_height($font, $size)
-    {
-        $options = $this->_dompdf->getOptions();
-        $this->_pdf->selectFont($font, '', true, $options->getIsFontSubsettingEnabled());
-
-        return $this->_pdf->getFontHeight($size) * $options->getFontHeightRatio();
-    }
-
-    /*function get_font_x_height($font, $size) {
+		return $filename;
+	}
+
+	public function image($img, $x, $y, $w, $h, $resolution = "normal")
+	{
+		[$width, $height, $type] = Helpers::dompdf_getimagesize($img, $this->get_dompdf()->getHttpContext());
+
+		$debug_png = $this->_dompdf->getOptions()->getDebugPng();
+
+		if ($debug_png) {
+			print "[image:$img|$width|$height|$type]";
+		}
+
+		switch ($type) {
+			case "jpeg":
+				if ($debug_png) {
+					print '!!!jpg!!!';
+				}
+				$this->_pdf->addJpegFromFile($img, $x, $this->y($y) - $h, $w, $h);
+				break;
+
+			case "webp":
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case "gif":
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case "bmp":
+				if ($debug_png) print "!!!{$type}!!!";
+				$img = $this->_convert_to_png($img, $type);
+				if ($img === null) {
+					if ($debug_png) print '!!!conversion to PDF failed!!!';
+					$this->image(Cache::$broken_image, $x, $y, $w, $h, $resolution);
+					break;
+				}
+
+			case "png":
+				if ($debug_png) print '!!!png!!!';
+
+				$this->_pdf->addPngFromFile($img, $x, $this->y($y) - $h, $w, $h);
+				break;
+
+			case "svg":
+				if ($debug_png) print '!!!SVG!!!';
+
+				$this->_pdf->addSvgFromFile($img, $x, $this->y($y) - $h, $w, $h);
+				break;
+
+			default:
+				if ($debug_png) print '!!!unknown!!!';
+		}
+	}
+
+	public function select($x, $y, $w, $h, $font, $size, $color = [0, 0, 0], $opts = [])
+	{
+		$pdf = $this->_pdf;
+
+		$font .= ".afm";
+		$pdf->selectFont($font);
+
+		if (!isset($pdf->acroFormId)) {
+			$pdf->addForm();
+		}
+
+		$ft = \Dompdf\Cpdf::ACROFORM_FIELD_CHOICE;
+		$ff = \Dompdf\Cpdf::ACROFORM_FIELD_CHOICE_COMBO;
+
+		$id = $pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
+		$pdf->setFormFieldOpt($id, $opts);
+	}
+
+	public function textarea($x, $y, $w, $h, $font, $size, $color = [0, 0, 0])
+	{
+		$pdf = $this->_pdf;
+
+		$font .= ".afm";
+		$pdf->selectFont($font);
+
+		if (!isset($pdf->acroFormId)) {
+			$pdf->addForm();
+		}
+
+		$ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
+		$ff = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT_MULTILINE;
+
+		$pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
+	}
+
+	public function input($x, $y, $w, $h, $type, $font, $size, $color = [0, 0, 0])
+	{
+		$pdf = $this->_pdf;
+
+		$font .= ".afm";
+		$pdf->selectFont($font);
+
+		if (!isset($pdf->acroFormId)) {
+			$pdf->addForm();
+		}
+
+		$ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
+		$ff = 0;
+
+		switch ($type) {
+			case 'text':
+				$ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
+				break;
+			case 'password':
+				$ft = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT;
+				$ff = \Dompdf\Cpdf::ACROFORM_FIELD_TEXT_PASSWORD;
+				break;
+			case 'submit':
+				$ft = \Dompdf\Cpdf::ACROFORM_FIELD_BUTTON;
+				break;
+		}
+
+		$pdf->addFormField($ft, rand(), $x, $this->y($y) - $h, $x + $w, $this->y($y), $ff, $size, $color);
+	}
+
+	public function text($x, $y, $text, $font, $size, $color = [0, 0, 0], $word_space = 0.0, $char_space = 0.0, $angle = 0.0)
+	{
+		$pdf = $this->_pdf;
+
+		$this->_set_fill_color($color);
+
+		$is_font_subsetting = $this->_dompdf->getOptions()->getIsFontSubsettingEnabled();
+		$pdf->selectFont($font . '.afm', '', true, $is_font_subsetting);
+
+		$pdf->addText($x, $this->y($y) - $pdf->getFontHeight($size), $size, $text, $angle, $word_space, $char_space);
+
+		$this->_set_fill_transparency("Normal", $this->_current_opacity);
+	}
+
+	public function javascript($code)
+	{
+		$this->_pdf->addJavascript($code);
+	}
+
+	//........................................................................
+
+	public function add_named_dest($anchorname)
+	{
+		$this->_pdf->addDestination($anchorname, "Fit");
+	}
+
+	public function add_link($url, $x, $y, $width, $height)
+	{
+		$y = $this->y($y) - $height;
+
+		if (strpos($url, '#') === 0) {
+			// Local link
+			$name = substr($url, 1);
+			if ($name) {
+				$this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+			}
+		} else {
+			$this->_pdf->addLink($url, $x, $y, $x + $width, $y + $height);
+		}
+	}
+
+	/**
+	 * @throws FontNotFoundException
+	 */
+	public function get_text_width($text, $font, $size, $word_spacing = 0.0, $char_spacing = 0.0)
+	{
+		$this->_pdf->selectFont($font, '', true, $this->_dompdf->getOptions()->getIsFontSubsettingEnabled());
+		return $this->_pdf->getTextWidth($size, $text, $word_spacing, $char_spacing);
+	}
+
+	/**
+	 * @throws FontNotFoundException
+	 */
+	public function get_font_height($font, $size)
+	{
+		$options = $this->_dompdf->getOptions();
+		$this->_pdf->selectFont($font, '', true, $options->getIsFontSubsettingEnabled());
+
+		return $this->_pdf->getFontHeight($size) * $options->getFontHeightRatio();
+	}
+
+	/*function get_font_x_height($font, $size) {
       $this->_pdf->selectFont($font);
       $ratio = $this->_dompdf->getOptions()->getFontHeightRatio();
       return $this->_pdf->getFontXHeight($size) * $ratio;
     }*/
 
-    /**
-     * @throws FontNotFoundException
-     */
-    public function get_font_baseline($font, $size)
-    {
-        $ratio = $this->_dompdf->getOptions()->getFontHeightRatio();
-        return $this->get_font_height($font, $size) / $ratio;
-    }
-
-    /**
-     * Processes a callback or script on every page.
-     *
-     * The callback function receives the four parameters `int $pageNumber`,
-     * `int $pageCount`, `Canvas $canvas`, and `FontMetrics $fontMetrics`, in
-     * that order. If a script is passed as string, the variables `$PAGE_NUM`,
-     * `$PAGE_COUNT`, `$pdf`, and `$fontMetrics` are available instead. Passing
-     * a script as string is deprecated and will be removed in a future version.
-     *
-     * This function can be used to add page numbers to all pages after the
-     * first one, for example.
-     *
-     * @param callable|string $callback The callback function or PHP script to process on every page
-     */
-    public function page_script($callback): void
-    {
-        if (is_string($callback)) {
-            $this->processPageScript(function (
-                int $PAGE_NUM,
-                int $PAGE_COUNT,
-                self $pdf,
-                FontMetrics $fontMetrics
-            ) use ($callback) {
-                eval($callback);
-            });
-            return;
-        }
-
-        $this->processPageScript($callback);
-    }
-
-    public function page_text($x, $y, $text, $font, $size, $color = [0, 0, 0], $word_space = 0.0, $char_space = 0.0, $angle = 0.0)
-    {
-        $this->processPageScript(function (int $pageNumber, int $pageCount) use ($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle) {
-            $text = str_replace(
-                ["{PAGE_NUM}", "{PAGE_COUNT}"],
-                [$pageNumber, $pageCount],
-                $text
-            );
-            $this->text($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle);
-        });
-    }
-
-    public function page_line($x1, $y1, $x2, $y2, $color, $width, $style = [])
-    {
-        $this->processPageScript(function () use ($x1, $y1, $x2, $y2, $color, $width, $style) {
-            $this->line($x1, $y1, $x2, $y2, $color, $width, $style);
-        });
-    }
-
-    /**
-     * @return int
-     */
-    public function new_page()
-    {
-        $this->_page_number++;
-        $this->_page_count++;
-
-        $ret = $this->_pdf->newPage();
-        $this->_pages[] = $ret;
-        return $ret;
-    }
-
-    protected function processPageScript(callable $callback): void
-    {
-        $pageNumber = 1;
-
-        foreach ($this->_pages as $pid) {
-            $this->reopen_object($pid);
-
-            $fontMetrics = $this->_dompdf->getFontMetrics();
-            $callback($pageNumber, $this->_page_count, $this, $fontMetrics);
-
-            $this->close_object();
-            $pageNumber++;
-        }
-    }
-
-    public function stream($filename = "document.pdf", $options = [])
-    {
-        if (headers_sent()) {
-            die("Unable to stream pdf: headers already sent");
-        }
-
-        if (!isset($options["compress"])) $options["compress"] = true;
-        if (!isset($options["Attachment"])) $options["Attachment"] = true;
-
-        $debug = !$options['compress'];
-        $tmp = ltrim($this->_pdf->output($debug));
-
-        header("Cache-Control: private");
-        header("Content-Type: application/pdf");
-        header("Content-Length: " . mb_strlen($tmp, "8bit"));
-
-        $filename = str_replace(["\n", "'"], "", basename($filename, ".pdf")) . ".pdf";
-        $attachment = $options["Attachment"] ? "attachment" : "inline";
-        header(Helpers::buildContentDispositionHeader($attachment, $filename));
-
-        echo $tmp;
-        flush();
-    }
-
-    public function output($options = [])
-    {
-        if (!isset($options["compress"])) $options["compress"] = true;
-
-        $debug = !$options['compress'];
-
-        return $this->_pdf->output($debug);
-    }
-
-    /**
-     * Returns logging messages generated by the Cpdf class
-     *
-     * @return string
-     */
-    public function get_messages()
-    {
-        return $this->_pdf->messages;
-    }
+	/**
+	 * @throws FontNotFoundException
+	 */
+	public function get_font_baseline($font, $size)
+	{
+		$ratio = $this->_dompdf->getOptions()->getFontHeightRatio();
+		return $this->get_font_height($font, $size) / $ratio;
+	}
+
+	/**
+	 * Processes a callback or script on every page.
+	 *
+	 * The callback function receives the four parameters `int $pageNumber`,
+	 * `int $pageCount`, `Canvas $canvas`, and `FontMetrics $fontMetrics`, in
+	 * that order. If a script is passed as string, the variables `$PAGE_NUM`,
+	 * `$PAGE_COUNT`, `$pdf`, and `$fontMetrics` are available instead. Passing
+	 * a script as string is deprecated and will be removed in a future version.
+	 *
+	 * This function can be used to add page numbers to all pages after the
+	 * first one, for example.
+	 *
+	 * @param callable|string $callback The callback function or PHP script to process on every page
+	 */
+	public function page_script($callback): void
+	{
+		if (is_string($callback)) {
+			$this->processPageScript(function (
+				int $PAGE_NUM,
+				int $PAGE_COUNT,
+				self $pdf,
+				FontMetrics $fontMetrics
+			) use ($callback) {
+				eval($callback);
+			});
+			return;
+		}
+
+		$this->processPageScript($callback);
+	}
+
+	public function page_text($x, $y, $text, $font, $size, $color = [0, 0, 0], $word_space = 0.0, $char_space = 0.0, $angle = 0.0)
+	{
+		$this->processPageScript(function (int $pageNumber, int $pageCount) use ($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle) {
+			$text = str_replace(
+				["{PAGE_NUM}", "{PAGE_COUNT}"],
+				[$pageNumber, $pageCount],
+				$text
+			);
+			$this->text($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle);
+		});
+	}
+
+	public function page_line($x1, $y1, $x2, $y2, $color, $width, $style = [])
+	{
+		$this->processPageScript(function () use ($x1, $y1, $x2, $y2, $color, $width, $style) {
+			$this->line($x1, $y1, $x2, $y2, $color, $width, $style);
+		});
+	}
+
+	/**
+	 * @return int
+	 */
+	public function new_page()
+	{
+		$this->_page_number++;
+		$this->_page_count++;
+
+		$ret = $this->_pdf->newPage();
+		$this->_pages[] = $ret;
+		return $ret;
+	}
+
+	protected function processPageScript(callable $callback): void
+	{
+		$pageNumber = 1;
+
+		foreach ($this->_pages as $pid) {
+			$this->reopen_object($pid);
+
+			$fontMetrics = $this->_dompdf->getFontMetrics();
+			$callback($pageNumber, $this->_page_count, $this, $fontMetrics);
+
+			$this->close_object();
+			$pageNumber++;
+		}
+	}
+
+	public function stream($filename = "document.pdf", $options = [])
+	{
+		if (headers_sent()) {
+			die("Unable to stream pdf: headers already sent");
+		}
+
+		if (!isset($options["compress"])) $options["compress"] = true;
+		if (!isset($options["Attachment"])) $options["Attachment"] = true;
+
+		$debug = !$options['compress'];
+		$tmp = ltrim($this->_pdf->output($debug));
+
+		header("Cache-Control: private");
+		header("Content-Type: application/pdf");
+		header("Content-Length: " . mb_strlen($tmp, "8bit"));
+
+		$filename = str_replace(["\n", "'"], "", basename($filename, ".pdf")) . ".pdf";
+		$attachment = $options["Attachment"] ? "attachment" : "inline";
+		header(Helpers::buildContentDispositionHeader($attachment, $filename));
+
+		echo $tmp;
+		flush();
+	}
+
+	public function output($options = [])
+	{
+		if (!isset($options["compress"])) $options["compress"] = true;
+
+		$debug = !$options['compress'];
+
+		return $this->_pdf->output($debug);
+	}
+
+	/**
+	 * Returns logging messages generated by the Cpdf class
+	 *
+	 * @return string
+	 */
+	public function get_messages()
+	{
+		return $this->_pdf->messages;
+	}
 }

vendor/dompdf/dompdf/src/Positioner/Block.php

Indentation +17 added lines, -17 removed lines

@@ -16,25 +16,25 @@
 class Block extends AbstractPositioner
 {
 
-    function position(AbstractFrameDecorator $frame): void
-    {
-        $style = $frame->get_style();
-        $cb = $frame->get_containing_block();
-        $p = $frame->find_block_parent();
+	function position(AbstractFrameDecorator $frame): void
+	{
+		$style = $frame->get_style();
+		$cb = $frame->get_containing_block();
+		$p = $frame->find_block_parent();
 
-        if ($p) {
-            $float = $style->float;
+		if ($p) {
+			$float = $style->float;
 
-            if (!$float || $float === "none") {
-                $p->add_line(true);
-            }
-            $y = $p->get_current_line_box()->y;
-        } else {
-            $y = $cb["y"];
-        }
+			if (!$float || $float === "none") {
+				$p->add_line(true);
+			}
+			$y = $p->get_current_line_box()->y;
+		} else {
+			$y = $cb["y"];
+		}
 
-        $x = $cb["x"];
+		$x = $cb["x"];
 
-        $frame->set_position($x, $y);
-    }
+		$frame->set_position($x, $y);
+	}
 }

vendor/dompdf/dompdf/src/FontMetrics.php

Indentation +592 added lines, -592 removed lines

@@ -20,381 +20,381 @@ 
  */
 class FontMetrics
 {
-    /**
-     * Name of the user font families file
-     *
-     * This file must be writable by the webserver process only to update it
-     * with save_font_families() after adding the .afm file references of a new font family
-     * with FontMetrics::saveFontFamilies().
-     * This is typically done only from command line with load_font.php on converting
-     * ttf fonts to ufm with php-font-lib.
-     */
-    const USER_FONTS_FILE = "installed-fonts.json";
-
-
-    /**
-     * Underlying {@link Canvas} object to perform text size calculations
-     *
-     * @var Canvas
-     */
-    protected $canvas;
-
-    /**
-     * Array of bundled font family names to variants
-     *
-     * @var array
-     */
-    protected $bundledFonts = [];
-
-    /**
-     * Array of user defined font family names to variants
-     *
-     * @var array
-     */
-    protected $userFonts = [];
-
-    /**
-     * combined list of all font families with absolute paths
-     *
-     * @var array
-     */
-    protected $fontFamilies;
-
-    /**
-     * @var Options
-     */
-    private $options;
-
-    /**
-     * Class initialization
-     */
-    public function __construct(Canvas $canvas, Options $options)
-    {
-        $this->setCanvas($canvas);
-        $this->setOptions($options);
-        $this->loadFontFamilies();
-    }
-
-    /**
-     * @deprecated
-     */
-    public function save_font_families()
-    {
-        $this->saveFontFamilies();
-    }
-
-    /**
-     * Saves the stored font family cache
-     *
-     * The name and location of the cache file are determined by {@link
-     * FontMetrics::USER_FONTS_FILE}. This file should be writable by the
-     * webserver process.
-     *
-     * @see FontMetrics::loadFontFamilies()
-     */
-    public function saveFontFamilies()
-    {
-        file_put_contents($this->getUserFontsFilePath(), json_encode($this->userFonts, JSON_PRETTY_PRINT));
-    }
-
-    /**
-     * @deprecated
-     */
-    public function load_font_families()
-    {
-        $this->loadFontFamilies();
-    }
-
-    /**
-     * Loads the stored font family cache
-     *
-     * @see FontMetrics::saveFontFamilies()
-     */
-    public function loadFontFamilies()
-    {
-        $file = $this->options->getRootDir() . "/lib/fonts/installed-fonts.dist.json";
-        $this->bundledFonts = json_decode(file_get_contents($file), true);
-
-        if (is_readable($this->getUserFontsFilePath())) {
-            $this->userFonts = json_decode(file_get_contents($this->getUserFontsFilePath()), true);
-        } else {
-            $this->loadFontFamiliesLegacy();
-        }
-    }
-
-    private function loadFontFamiliesLegacy()
-    {
-        $legacyCacheFile = $this->options->getFontDir() . '/dompdf_font_family_cache.php';
-        if (is_readable($legacyCacheFile)) {
-            $fontDir = $this->options->getFontDir();
-            $rootDir = $this->options->getRootDir();
+	/**
+	 * Name of the user font families file
+	 *
+	 * This file must be writable by the webserver process only to update it
+	 * with save_font_families() after adding the .afm file references of a new font family
+	 * with FontMetrics::saveFontFamilies().
+	 * This is typically done only from command line with load_font.php on converting
+	 * ttf fonts to ufm with php-font-lib.
+	 */
+	const USER_FONTS_FILE = "installed-fonts.json";
+
+
+	/**
+	 * Underlying {@link Canvas} object to perform text size calculations
+	 *
+	 * @var Canvas
+	 */
+	protected $canvas;
+
+	/**
+	 * Array of bundled font family names to variants
+	 *
+	 * @var array
+	 */
+	protected $bundledFonts = [];
+
+	/**
+	 * Array of user defined font family names to variants
+	 *
+	 * @var array
+	 */
+	protected $userFonts = [];
+
+	/**
+	 * combined list of all font families with absolute paths
+	 *
+	 * @var array
+	 */
+	protected $fontFamilies;
+
+	/**
+	 * @var Options
+	 */
+	private $options;
+
+	/**
+	 * Class initialization
+	 */
+	public function __construct(Canvas $canvas, Options $options)
+	{
+		$this->setCanvas($canvas);
+		$this->setOptions($options);
+		$this->loadFontFamilies();
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public function save_font_families()
+	{
+		$this->saveFontFamilies();
+	}
+
+	/**
+	 * Saves the stored font family cache
+	 *
+	 * The name and location of the cache file are determined by {@link
+	 * FontMetrics::USER_FONTS_FILE}. This file should be writable by the
+	 * webserver process.
+	 *
+	 * @see FontMetrics::loadFontFamilies()
+	 */
+	public function saveFontFamilies()
+	{
+		file_put_contents($this->getUserFontsFilePath(), json_encode($this->userFonts, JSON_PRETTY_PRINT));
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public function load_font_families()
+	{
+		$this->loadFontFamilies();
+	}
+
+	/**
+	 * Loads the stored font family cache
+	 *
+	 * @see FontMetrics::saveFontFamilies()
+	 */
+	public function loadFontFamilies()
+	{
+		$file = $this->options->getRootDir() . "/lib/fonts/installed-fonts.dist.json";
+		$this->bundledFonts = json_decode(file_get_contents($file), true);
+
+		if (is_readable($this->getUserFontsFilePath())) {
+			$this->userFonts = json_decode(file_get_contents($this->getUserFontsFilePath()), true);
+		} else {
+			$this->loadFontFamiliesLegacy();
+		}
+	}
+
+	private function loadFontFamiliesLegacy()
+	{
+		$legacyCacheFile = $this->options->getFontDir() . '/dompdf_font_family_cache.php';
+		if (is_readable($legacyCacheFile)) {
+			$fontDir = $this->options->getFontDir();
+			$rootDir = $this->options->getRootDir();
     
-            if (!defined("DOMPDF_DIR")) { define("DOMPDF_DIR", $rootDir); }
-            if (!defined("DOMPDF_FONT_DIR")) { define("DOMPDF_FONT_DIR", $fontDir); }
+			if (!defined("DOMPDF_DIR")) { define("DOMPDF_DIR", $rootDir); }
+			if (!defined("DOMPDF_FONT_DIR")) { define("DOMPDF_FONT_DIR", $fontDir); }
     
-            $cacheDataClosure = require $legacyCacheFile;
-            $cacheData = is_array($cacheDataClosure) ? $cacheDataClosure : $cacheDataClosure($fontDir, $rootDir);
-            if (is_array($cacheData)) {
-                foreach ($cacheData as $family => $variants) {
-                    if (!isset($this->bundledFonts[$family]) && is_array($variants)) {
-                        foreach ($variants as $variant => $variantPath) {
-                            $variantName = basename($variantPath);
-                            $variantDir = dirname($variantPath);
-                            if ($variantDir == $fontDir) {
-                                $this->userFonts[$family][$variant] = $variantName;
-                            } else {
-                                $this->userFonts[$family][$variant] = $variantPath;
-                            }
-                        }
-                    }
-                }
-                $this->saveFontFamilies();
-            }
-        }
-    }
-
-    /**
-     * @param array $style
-     * @param string $remote_file
-     * @param resource $context
-     * @return bool
-     * @deprecated
-     */
-    public function register_font($style, $remote_file, $context = null)
-    {
-        return $this->registerFont($style, $remote_file);
-    }
-
-    /**
-     * @param array $style
-     * @param string $remoteFile
-     * @param resource $context
-     * @return bool
-     */
-    public function registerFont($style, $remoteFile, $context = null)
-    {
-        $fontname = mb_strtolower($style["family"]);
-        $families = $this->getFontFamilies();
-
-        $entry = [];
-        if (isset($families[$fontname])) {
-            $entry = $families[$fontname];
-        }
-
-        $styleString = $this->getType("{$style['weight']} {$style['style']}");
-
-        $remoteHash = md5($remoteFile);
-
-        $prefix = $fontname . "_" . $styleString;
-        $prefix = trim($prefix, "-");
-        if (function_exists('iconv')) {
-            $prefix = @iconv('utf-8', 'us-ascii//TRANSLIT', $prefix);
-        }
-        $prefix_encoding = mb_detect_encoding($prefix, mb_detect_order(), true);
-        $substchar = mb_substitute_character();
-        mb_substitute_character(0x005F);
-        $prefix = mb_convert_encoding($prefix, "ISO-8859-1", $prefix_encoding);
-        mb_substitute_character($substchar);
-        $prefix = preg_replace("[\W]", "_", $prefix);
-        $prefix = preg_replace("/[^-_\w]+/", "", $prefix);
-
-        $localFile = $prefix . "_" . $remoteHash;
-        $localFilePath = $this->getOptions()->getFontDir() . "/" . $localFile;
-
-        if (isset($entry[$styleString]) && $localFilePath == $entry[$styleString]) {
-            return true;
-        }
-
-
-        $entry[$styleString] = $localFile;
-
-        // Download the remote file
-        [$protocol] = Helpers::explode_url($remoteFile);
-        $allowed_protocols = $this->options->getAllowedProtocols();
-        if (!array_key_exists($protocol, $allowed_protocols)) {
-            Helpers::record_warnings(E_USER_WARNING, "Permission denied on $remoteFile. The communication protocol is not supported.", __FILE__, __LINE__);
-            return false;
-        }
-
-        foreach ($allowed_protocols[$protocol]["rules"] as $rule) {
-            [$result, $message] = $rule($remoteFile);
-            if ($result !== true) {
-                Helpers::record_warnings(E_USER_WARNING, "Error loading $remoteFile: $message", __FILE__, __LINE__);
-                return false;
-            }
-        }
-
-        list($remoteFileContent, $http_response_header) = @Helpers::getFileContent($remoteFile, $context);
-        if ($remoteFileContent === null) {
-            return false;
-        }
-
-        $localTempFile = @tempnam($this->options->get("tempDir"), "dompdf-font-");
-        file_put_contents($localTempFile, $remoteFileContent);
-
-        $font = Font::load($localTempFile);
-
-        if (!$font) {
-            unlink($localTempFile);
-            return false;
-        }
-
-        $font->parse();
-        $font->saveAdobeFontMetrics("$localFilePath.ufm");
-        $font->close();
-
-        unlink($localTempFile);
-
-        if ( !file_exists("$localFilePath.ufm") ) {
-            return false;
-        }
-
-        $fontExtension = ".ttf";
-        switch ($font->getFontType()) {
-            case "TrueType":
-            default:
-                $fontExtension = ".ttf";
-                break;
-        }
-
-        // Save the changes
-        file_put_contents($localFilePath.$fontExtension, $remoteFileContent);
-
-        if ( !file_exists($localFilePath.$fontExtension) ) {
-            unlink("$localFilePath.ufm");
-            return false;
-        }
-
-        $this->setFontFamily($fontname, $entry);
-
-        return true;
-    }
-
-    /**
-     * @param $text
-     * @param $font
-     * @param $size
-     * @param float $word_spacing
-     * @param float $char_spacing
-     * @return float
-     * @deprecated
-     */
-    public function get_text_width($text, $font, $size, $word_spacing = 0.0, $char_spacing = 0.0)
-    {
-        //return self::$_pdf->get_text_width($text, $font, $size, $word_spacing, $char_spacing);
-        return $this->getTextWidth($text, $font, $size, $word_spacing, $char_spacing);
-    }
-
-    /**
-     * Calculates text size, in points
-     *
-     * @param string $text        The text to be sized
-     * @param string $font        The font file to use
-     * @param float  $size        The font size, in points
-     * @param float  $wordSpacing Word spacing, if any
-     * @param float  $charSpacing Char spacing, if any
-     *
-     * @return float
-     */
-    public function getTextWidth(string $text, $font, float $size, float $wordSpacing = 0.0, float $charSpacing = 0.0): float
-    {
-        // @todo Make sure this cache is efficient before enabling it
-        static $cache = [];
-
-        if ($text === "") {
-            return 0;
-        }
-
-        // Don't cache long strings
-        $useCache = !isset($text[50]); // Faster than strlen
-
-        // Text-size calculations depend on the canvas used. Make sure to not
-        // return wrong values when switching canvas backends
-        $canvasClass = get_class($this->canvas);
-        $key = "$canvasClass/$font/$size/$wordSpacing/$charSpacing";
-
-        if ($useCache && isset($cache[$key][$text])) {
-            return $cache[$key][$text];
-        }
-
-        $width = $this->canvas->get_text_width($text, $font, $size, $wordSpacing, $charSpacing);
-
-        if ($useCache) {
-            $cache[$key][$text] = $width;
-        }
-
-        return $width;
-    }
-
-    /**
-     * @param $font
-     * @param $size
-     * @return float
-     * @deprecated
-     */
-    public function get_font_height($font, $size)
-    {
-        return $this->getFontHeight($font, $size);
-    }
-
-    /**
-     * Calculates font height, in points
-     *
-     * @param string $font The font file to use
-     * @param float  $size The font size, in points
-     *
-     * @return float
-     */
-    public function getFontHeight($font, float $size): float
-    {
-        return $this->canvas->get_font_height($font, $size);
-    }
-
-    /**
-     * Calculates font baseline, in points
-     *
-     * @param string $font The font file to use
-     * @param float  $size The font size, in points
-     *
-     * @return float
-     */
-    public function getFontBaseline($font, float $size): float
-    {
-        return $this->canvas->get_font_baseline($font, $size);
-    }
-
-    /**
-     * @param $family_raw
-     * @param string $subtype_raw
-     * @return string
-     * @deprecated
-     */
-    public function get_font($family_raw, $subtype_raw = "normal")
-    {
-        return $this->getFont($family_raw, $subtype_raw);
-    }
-
-    /**
-     * Resolves a font family & subtype into an actual font file
-     * Subtype can be one of 'normal', 'bold', 'italic' or 'bold_italic'.  If
-     * the particular font family has no suitable font file, the default font
-     * ({@link Options::defaultFont}) is used.  The font file returned
-     * is the absolute pathname to the font file on the system.
-     *
-     * @param string|null $familyRaw
-     * @param string      $subtypeRaw
-     *
-     * @return string|null
-     */
-    public function getFont($familyRaw, $subtypeRaw = "normal")
-    {
-        static $cache = [];
-
-        if (isset($cache[$familyRaw][$subtypeRaw])) {
-            return $cache[$familyRaw][$subtypeRaw];
-        }
-
-        /* Allow calling for various fonts in search path. Therefore not immediately
+			$cacheDataClosure = require $legacyCacheFile;
+			$cacheData = is_array($cacheDataClosure) ? $cacheDataClosure : $cacheDataClosure($fontDir, $rootDir);
+			if (is_array($cacheData)) {
+				foreach ($cacheData as $family => $variants) {
+					if (!isset($this->bundledFonts[$family]) && is_array($variants)) {
+						foreach ($variants as $variant => $variantPath) {
+							$variantName = basename($variantPath);
+							$variantDir = dirname($variantPath);
+							if ($variantDir == $fontDir) {
+								$this->userFonts[$family][$variant] = $variantName;
+							} else {
+								$this->userFonts[$family][$variant] = $variantPath;
+							}
+						}
+					}
+				}
+				$this->saveFontFamilies();
+			}
+		}
+	}
+
+	/**
+	 * @param array $style
+	 * @param string $remote_file
+	 * @param resource $context
+	 * @return bool
+	 * @deprecated
+	 */
+	public function register_font($style, $remote_file, $context = null)
+	{
+		return $this->registerFont($style, $remote_file);
+	}
+
+	/**
+	 * @param array $style
+	 * @param string $remoteFile
+	 * @param resource $context
+	 * @return bool
+	 */
+	public function registerFont($style, $remoteFile, $context = null)
+	{
+		$fontname = mb_strtolower($style["family"]);
+		$families = $this->getFontFamilies();
+
+		$entry = [];
+		if (isset($families[$fontname])) {
+			$entry = $families[$fontname];
+		}
+
+		$styleString = $this->getType("{$style['weight']} {$style['style']}");
+
+		$remoteHash = md5($remoteFile);
+
+		$prefix = $fontname . "_" . $styleString;
+		$prefix = trim($prefix, "-");
+		if (function_exists('iconv')) {
+			$prefix = @iconv('utf-8', 'us-ascii//TRANSLIT', $prefix);
+		}
+		$prefix_encoding = mb_detect_encoding($prefix, mb_detect_order(), true);
+		$substchar = mb_substitute_character();
+		mb_substitute_character(0x005F);
+		$prefix = mb_convert_encoding($prefix, "ISO-8859-1", $prefix_encoding);
+		mb_substitute_character($substchar);
+		$prefix = preg_replace("[\W]", "_", $prefix);
+		$prefix = preg_replace("/[^-_\w]+/", "", $prefix);
+
+		$localFile = $prefix . "_" . $remoteHash;
+		$localFilePath = $this->getOptions()->getFontDir() . "/" . $localFile;
+
+		if (isset($entry[$styleString]) && $localFilePath == $entry[$styleString]) {
+			return true;
+		}
+
+
+		$entry[$styleString] = $localFile;
+
+		// Download the remote file
+		[$protocol] = Helpers::explode_url($remoteFile);
+		$allowed_protocols = $this->options->getAllowedProtocols();
+		if (!array_key_exists($protocol, $allowed_protocols)) {
+			Helpers::record_warnings(E_USER_WARNING, "Permission denied on $remoteFile. The communication protocol is not supported.", __FILE__, __LINE__);
+			return false;
+		}
+
+		foreach ($allowed_protocols[$protocol]["rules"] as $rule) {
+			[$result, $message] = $rule($remoteFile);
+			if ($result !== true) {
+				Helpers::record_warnings(E_USER_WARNING, "Error loading $remoteFile: $message", __FILE__, __LINE__);
+				return false;
+			}
+		}
+
+		list($remoteFileContent, $http_response_header) = @Helpers::getFileContent($remoteFile, $context);
+		if ($remoteFileContent === null) {
+			return false;
+		}
+
+		$localTempFile = @tempnam($this->options->get("tempDir"), "dompdf-font-");
+		file_put_contents($localTempFile, $remoteFileContent);
+
+		$font = Font::load($localTempFile);
+
+		if (!$font) {
+			unlink($localTempFile);
+			return false;
+		}
+
+		$font->parse();
+		$font->saveAdobeFontMetrics("$localFilePath.ufm");
+		$font->close();
+
+		unlink($localTempFile);
+
+		if ( !file_exists("$localFilePath.ufm") ) {
+			return false;
+		}
+
+		$fontExtension = ".ttf";
+		switch ($font->getFontType()) {
+			case "TrueType":
+			default:
+				$fontExtension = ".ttf";
+				break;
+		}
+
+		// Save the changes
+		file_put_contents($localFilePath.$fontExtension, $remoteFileContent);
+
+		if ( !file_exists($localFilePath.$fontExtension) ) {
+			unlink("$localFilePath.ufm");
+			return false;
+		}
+
+		$this->setFontFamily($fontname, $entry);
+
+		return true;
+	}
+
+	/**
+	 * @param $text
+	 * @param $font
+	 * @param $size
+	 * @param float $word_spacing
+	 * @param float $char_spacing
+	 * @return float
+	 * @deprecated
+	 */
+	public function get_text_width($text, $font, $size, $word_spacing = 0.0, $char_spacing = 0.0)
+	{
+		//return self::$_pdf->get_text_width($text, $font, $size, $word_spacing, $char_spacing);
+		return $this->getTextWidth($text, $font, $size, $word_spacing, $char_spacing);
+	}
+
+	/**
+	 * Calculates text size, in points
+	 *
+	 * @param string $text        The text to be sized
+	 * @param string $font        The font file to use
+	 * @param float  $size        The font size, in points
+	 * @param float  $wordSpacing Word spacing, if any
+	 * @param float  $charSpacing Char spacing, if any
+	 *
+	 * @return float
+	 */
+	public function getTextWidth(string $text, $font, float $size, float $wordSpacing = 0.0, float $charSpacing = 0.0): float
+	{
+		// @todo Make sure this cache is efficient before enabling it
+		static $cache = [];
+
+		if ($text === "") {
+			return 0;
+		}
+
+		// Don't cache long strings
+		$useCache = !isset($text[50]); // Faster than strlen
+
+		// Text-size calculations depend on the canvas used. Make sure to not
+		// return wrong values when switching canvas backends
+		$canvasClass = get_class($this->canvas);
+		$key = "$canvasClass/$font/$size/$wordSpacing/$charSpacing";
+
+		if ($useCache && isset($cache[$key][$text])) {
+			return $cache[$key][$text];
+		}
+
+		$width = $this->canvas->get_text_width($text, $font, $size, $wordSpacing, $charSpacing);
+
+		if ($useCache) {
+			$cache[$key][$text] = $width;
+		}
+
+		return $width;
+	}
+
+	/**
+	 * @param $font
+	 * @param $size
+	 * @return float
+	 * @deprecated
+	 */
+	public function get_font_height($font, $size)
+	{
+		return $this->getFontHeight($font, $size);
+	}
+
+	/**
+	 * Calculates font height, in points
+	 *
+	 * @param string $font The font file to use
+	 * @param float  $size The font size, in points
+	 *
+	 * @return float
+	 */
+	public function getFontHeight($font, float $size): float
+	{
+		return $this->canvas->get_font_height($font, $size);
+	}
+
+	/**
+	 * Calculates font baseline, in points
+	 *
+	 * @param string $font The font file to use
+	 * @param float  $size The font size, in points
+	 *
+	 * @return float
+	 */
+	public function getFontBaseline($font, float $size): float
+	{
+		return $this->canvas->get_font_baseline($font, $size);
+	}
+
+	/**
+	 * @param $family_raw
+	 * @param string $subtype_raw
+	 * @return string
+	 * @deprecated
+	 */
+	public function get_font($family_raw, $subtype_raw = "normal")
+	{
+		return $this->getFont($family_raw, $subtype_raw);
+	}
+
+	/**
+	 * Resolves a font family & subtype into an actual font file
+	 * Subtype can be one of 'normal', 'bold', 'italic' or 'bold_italic'.  If
+	 * the particular font family has no suitable font file, the default font
+	 * ({@link Options::defaultFont}) is used.  The font file returned
+	 * is the absolute pathname to the font file on the system.
+	 *
+	 * @param string|null $familyRaw
+	 * @param string      $subtypeRaw
+	 *
+	 * @return string|null
+	 */
+	public function getFont($familyRaw, $subtypeRaw = "normal")
+	{
+		static $cache = [];
+
+		if (isset($cache[$familyRaw][$subtypeRaw])) {
+			return $cache[$familyRaw][$subtypeRaw];
+		}
+
+		/* Allow calling for various fonts in search path. Therefore not immediately
          * return replacement on non match.
          * Only when called with NULL try replacement.
          * When this is also missing there is really trouble.
@@ -402,234 +402,234 @@ 
          * Only on checking the fallback font, check various subtypes on same font.
          */
 
-        $subtype = strtolower($subtypeRaw);
+		$subtype = strtolower($subtypeRaw);
 
-        $families = $this->getFontFamilies();
-        if ($familyRaw) {
-            $family = str_replace(["'", '"'], "", strtolower($familyRaw));
+		$families = $this->getFontFamilies();
+		if ($familyRaw) {
+			$family = str_replace(["'", '"'], "", strtolower($familyRaw));
 
-            if (isset($families[$family][$subtype])) {
-                return $cache[$familyRaw][$subtypeRaw] = $families[$family][$subtype];
-            }
+			if (isset($families[$family][$subtype])) {
+				return $cache[$familyRaw][$subtypeRaw] = $families[$family][$subtype];
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        $fallback_families = [strtolower($this->options->getDefaultFont()), "serif"];
-        foreach ($fallback_families as $family) {
-            if (isset($families[$family][$subtype])) {
-                return $cache[$familyRaw][$subtypeRaw] = $families[$family][$subtype];
-            }
+		$fallback_families = [strtolower($this->options->getDefaultFont()), "serif"];
+		foreach ($fallback_families as $family) {
+			if (isset($families[$family][$subtype])) {
+				return $cache[$familyRaw][$subtypeRaw] = $families[$family][$subtype];
+			}
     
-            if (!isset($families[$family])) {
-                continue;
-            }
+			if (!isset($families[$family])) {
+				continue;
+			}
     
-            $family = $families[$family];
+			$family = $families[$family];
     
-            foreach ($family as $sub => $font) {
-                if (strpos($subtype, $sub) !== false) {
-                    return $cache[$familyRaw][$subtypeRaw] = $font;
-                }
-            }
+			foreach ($family as $sub => $font) {
+				if (strpos($subtype, $sub) !== false) {
+					return $cache[$familyRaw][$subtypeRaw] = $font;
+				}
+			}
     
-            if ($subtype !== "normal") {
-                foreach ($family as $sub => $font) {
-                    if ($sub !== "normal") {
-                        return $cache[$familyRaw][$subtypeRaw] = $font;
-                    }
-                }
-            }
+			if ($subtype !== "normal") {
+				foreach ($family as $sub => $font) {
+					if ($sub !== "normal") {
+						return $cache[$familyRaw][$subtypeRaw] = $font;
+					}
+				}
+			}
     
-            $subtype = "normal";
+			$subtype = "normal";
     
-            if (isset($family[$subtype])) {
-                return $cache[$familyRaw][$subtypeRaw] = $family[$subtype];
-            }
-        }
+			if (isset($family[$subtype])) {
+				return $cache[$familyRaw][$subtypeRaw] = $family[$subtype];
+			}
+		}
         
-        return null;
-    }
-
-    /**
-     * @param $family
-     * @return null|string
-     * @deprecated
-     */
-    public function get_family($family)
-    {
-        return $this->getFamily($family);
-    }
-
-    /**
-     * @param string $family
-     * @return null|string
-     */
-    public function getFamily($family)
-    {
-        $family = str_replace(["'", '"'], "", mb_strtolower($family));
-        $families = $this->getFontFamilies();
-
-        if (isset($families[$family])) {
-            return $families[$family];
-        }
-
-        return null;
-    }
-
-    /**
-     * @param $type
-     * @return string
-     * @deprecated
-     */
-    public function get_type($type)
-    {
-        return $this->getType($type);
-    }
-
-    /**
-     * @param string $type
-     * @return string
-     */
-    public function getType($type)
-    {
-        if (preg_match('/bold/i', $type)) {
-            $weight = 700;
-        } elseif (preg_match('/([1-9]00)/', $type, $match)) {
-            $weight = (int)$match[0];
-        } else {
-            $weight = 400;
-        }
-        $weight = $weight === 400 ? 'normal' : $weight;
-        $weight = $weight === 700 ? 'bold' : $weight;
-
-        $style = preg_match('/italic|oblique/i', $type) ? 'italic' : null;
-
-        if ($weight === 'normal' && $style !== null) {
-            return $style;
-        }
-
-        return $style === null
-            ? $weight
-            : $weight.'_'.$style;
-    }
-
-    /**
-     * @return array
-     * @deprecated
-     */
-    public function get_font_families()
-    {
-        return $this->getFontFamilies();
-    }
-
-    /**
-     * Returns the current font lookup table
-     *
-     * @return array
-     */
-    public function getFontFamilies()
-    {
-        if (!isset($this->fontFamilies)) {
-            $this->setFontFamilies();
-        }
-        return $this->fontFamilies;
-    }
-
-    /**
-     * Convert loaded fonts to font lookup table
-     *
-     * @return array
-     */
-    public function setFontFamilies()
-    {
-        $fontFamilies = [];
-        if (isset($this->bundledFonts) && is_array($this->bundledFonts)) {
-            foreach ($this->bundledFonts as $family => $variants) {
-                if (!isset($fontFamilies[$family])) {
-                    $fontFamilies[$family] = array_map(function ($variant) {
-                        return $this->getOptions()->getRootDir() . '/lib/fonts/' . $variant;
-                    }, $variants);
-                }
-            }
-        }
-        if (isset($this->userFonts) && is_array($this->userFonts)) {
-            foreach ($this->userFonts as $family => $variants) {
-                $fontFamilies[$family] = array_map(function ($variant) {
-                    $variantName = basename($variant);
-                    if ($variantName === $variant) {
-                        return $this->getOptions()->getFontDir() . '/' . $variant;
-                    }
-                    return $variant;
-                }, $variants);
-            }
-        }
-        $this->fontFamilies = $fontFamilies;
-    }
-
-    /**
-     * @param string $fontname
-     * @param mixed $entry
-     * @deprecated
-     */
-    public function set_font_family($fontname, $entry)
-    {
-        $this->setFontFamily($fontname, $entry);
-    }
-
-    /**
-     * @param string $fontname
-     * @param mixed $entry
-     */
-    public function setFontFamily($fontname, $entry)
-    {
-        $this->userFonts[mb_strtolower($fontname)] = $entry;
-        $this->saveFontFamilies();
-        unset($this->fontFamilies);
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserFontsFilePath()
-    {
-        return $this->options->getFontDir() . '/' . self::USER_FONTS_FILE;
-    }
-
-    /**
-     * @param Options $options
-     * @return $this
-     */
-    public function setOptions(Options $options)
-    {
-        $this->options = $options;
-        unset($this->fontFamilies);
-        return $this;
-    }
-
-    /**
-     * @return Options
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * @param Canvas $canvas
-     * @return $this
-     */
-    public function setCanvas(Canvas $canvas)
-    {
-        $this->canvas = $canvas;
-        return $this;
-    }
-
-    /**
-     * @return Canvas
-     */
-    public function getCanvas()
-    {
-        return $this->canvas;
-    }
+		return null;
+	}
+
+	/**
+	 * @param $family
+	 * @return null|string
+	 * @deprecated
+	 */
+	public function get_family($family)
+	{
+		return $this->getFamily($family);
+	}
+
+	/**
+	 * @param string $family
+	 * @return null|string
+	 */
+	public function getFamily($family)
+	{
+		$family = str_replace(["'", '"'], "", mb_strtolower($family));
+		$families = $this->getFontFamilies();
+
+		if (isset($families[$family])) {
+			return $families[$family];
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param $type
+	 * @return string
+	 * @deprecated
+	 */
+	public function get_type($type)
+	{
+		return $this->getType($type);
+	}
+
+	/**
+	 * @param string $type
+	 * @return string
+	 */
+	public function getType($type)
+	{
+		if (preg_match('/bold/i', $type)) {
+			$weight = 700;
+		} elseif (preg_match('/([1-9]00)/', $type, $match)) {
+			$weight = (int)$match[0];
+		} else {
+			$weight = 400;
+		}
+		$weight = $weight === 400 ? 'normal' : $weight;
+		$weight = $weight === 700 ? 'bold' : $weight;
+
+		$style = preg_match('/italic|oblique/i', $type) ? 'italic' : null;
+
+		if ($weight === 'normal' && $style !== null) {
+			return $style;
+		}
+
+		return $style === null
+			? $weight
+			: $weight.'_'.$style;
+	}
+
+	/**
+	 * @return array
+	 * @deprecated
+	 */
+	public function get_font_families()
+	{
+		return $this->getFontFamilies();
+	}
+
+	/**
+	 * Returns the current font lookup table
+	 *
+	 * @return array
+	 */
+	public function getFontFamilies()
+	{
+		if (!isset($this->fontFamilies)) {
+			$this->setFontFamilies();
+		}
+		return $this->fontFamilies;
+	}
+
+	/**
+	 * Convert loaded fonts to font lookup table
+	 *
+	 * @return array
+	 */
+	public function setFontFamilies()
+	{
+		$fontFamilies = [];
+		if (isset($this->bundledFonts) && is_array($this->bundledFonts)) {
+			foreach ($this->bundledFonts as $family => $variants) {
+				if (!isset($fontFamilies[$family])) {
+					$fontFamilies[$family] = array_map(function ($variant) {
+						return $this->getOptions()->getRootDir() . '/lib/fonts/' . $variant;
+					}, $variants);
+				}
+			}
+		}
+		if (isset($this->userFonts) && is_array($this->userFonts)) {
+			foreach ($this->userFonts as $family => $variants) {
+				$fontFamilies[$family] = array_map(function ($variant) {
+					$variantName = basename($variant);
+					if ($variantName === $variant) {
+						return $this->getOptions()->getFontDir() . '/' . $variant;
+					}
+					return $variant;
+				}, $variants);
+			}
+		}
+		$this->fontFamilies = $fontFamilies;
+	}
+
+	/**
+	 * @param string $fontname
+	 * @param mixed $entry
+	 * @deprecated
+	 */
+	public function set_font_family($fontname, $entry)
+	{
+		$this->setFontFamily($fontname, $entry);
+	}
+
+	/**
+	 * @param string $fontname
+	 * @param mixed $entry
+	 */
+	public function setFontFamily($fontname, $entry)
+	{
+		$this->userFonts[mb_strtolower($fontname)] = $entry;
+		$this->saveFontFamilies();
+		unset($this->fontFamilies);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserFontsFilePath()
+	{
+		return $this->options->getFontDir() . '/' . self::USER_FONTS_FILE;
+	}
+
+	/**
+	 * @param Options $options
+	 * @return $this
+	 */
+	public function setOptions(Options $options)
+	{
+		$this->options = $options;
+		unset($this->fontFamilies);
+		return $this;
+	}
+
+	/**
+	 * @return Options
+	 */
+	public function getOptions()
+	{
+		return $this->options;
+	}
+
+	/**
+	 * @param Canvas $canvas
+	 * @return $this
+	 */
+	public function setCanvas(Canvas $canvas)
+	{
+		$this->canvas = $canvas;
+		return $this;
+	}
+
+	/**
+	 * @return Canvas
+	 */
+	public function getCanvas()
+	{
+		return $this->canvas;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function loadFontFamilies()
     {
-        $file = $this->options->getRootDir() . "/lib/fonts/installed-fonts.dist.json";
+        $file = $this->options->getRootDir()."/lib/fonts/installed-fonts.dist.json";
         $this->bundledFonts = json_decode(file_get_contents($file), true);
 
         if (is_readable($this->getUserFontsFilePath())) {
@@ -124,19 +124,19 @@ 
 
     private function loadFontFamiliesLegacy()
     {
-        $legacyCacheFile = $this->options->getFontDir() . '/dompdf_font_family_cache.php';
+        $legacyCacheFile = $this->options->getFontDir().'/dompdf_font_family_cache.php';
         if (is_readable($legacyCacheFile)) {
             $fontDir = $this->options->getFontDir();
             $rootDir = $this->options->getRootDir();
     
-            if (!defined("DOMPDF_DIR")) { define("DOMPDF_DIR", $rootDir); }
-            if (!defined("DOMPDF_FONT_DIR")) { define("DOMPDF_FONT_DIR", $fontDir); }
+            if ( ! defined("DOMPDF_DIR")) { define("DOMPDF_DIR", $rootDir); }
+            if ( ! defined("DOMPDF_FONT_DIR")) { define("DOMPDF_FONT_DIR", $fontDir); }
     
             $cacheDataClosure = require $legacyCacheFile;
             $cacheData = is_array($cacheDataClosure) ? $cacheDataClosure : $cacheDataClosure($fontDir, $rootDir);
             if (is_array($cacheData)) {
                 foreach ($cacheData as $family => $variants) {
-                    if (!isset($this->bundledFonts[$family]) && is_array($variants)) {
+                    if ( ! isset($this->bundledFonts[$family]) && is_array($variants)) {
                         foreach ($variants as $variant => $variantPath) {
                             $variantName = basename($variantPath);
                             $variantDir = dirname($variantPath);
@@ -185,7 +185,7 @@ 
 
         $remoteHash = md5($remoteFile);
 
-        $prefix = $fontname . "_" . $styleString;
+        $prefix = $fontname."_".$styleString;
         $prefix = trim($prefix, "-");
         if (function_exists('iconv')) {
             $prefix = @iconv('utf-8', 'us-ascii//TRANSLIT', $prefix);
@@ -198,8 +198,8 @@ 
         $prefix = preg_replace("[\W]", "_", $prefix);
         $prefix = preg_replace("/[^-_\w]+/", "", $prefix);
 
-        $localFile = $prefix . "_" . $remoteHash;
-        $localFilePath = $this->getOptions()->getFontDir() . "/" . $localFile;
+        $localFile = $prefix."_".$remoteHash;
+        $localFilePath = $this->getOptions()->getFontDir()."/".$localFile;
 
         if (isset($entry[$styleString]) && $localFilePath == $entry[$styleString]) {
             return true;
@@ -211,7 +211,7 @@ 
         // Download the remote file
         [$protocol] = Helpers::explode_url($remoteFile);
         $allowed_protocols = $this->options->getAllowedProtocols();
-        if (!array_key_exists($protocol, $allowed_protocols)) {
+        if ( ! array_key_exists($protocol, $allowed_protocols)) {
             Helpers::record_warnings(E_USER_WARNING, "Permission denied on $remoteFile. The communication protocol is not supported.", __FILE__, __LINE__);
             return false;
         }
@@ -234,7 +234,7 @@ 
 
         $font = Font::load($localTempFile);
 
-        if (!$font) {
+        if ( ! $font) {
             unlink($localTempFile);
             return false;
         }
@@ -245,7 +245,7 @@ 
 
         unlink($localTempFile);
 
-        if ( !file_exists("$localFilePath.ufm") ) {
+        if ( ! file_exists("$localFilePath.ufm")) {
             return false;
         }
 
@@ -260,7 +260,7 @@ 
         // Save the changes
         file_put_contents($localFilePath.$fontExtension, $remoteFileContent);
 
-        if ( !file_exists($localFilePath.$fontExtension) ) {
+        if ( ! file_exists($localFilePath.$fontExtension)) {
             unlink("$localFilePath.ufm");
             return false;
         }
@@ -306,7 +306,7 @@ 
         }
 
         // Don't cache long strings
-        $useCache = !isset($text[50]); // Faster than strlen
+        $useCache = ! isset($text[50]); // Faster than strlen
 
         // Text-size calculations depend on the canvas used. Make sure to not
         // return wrong values when switching canvas backends
@@ -421,7 +421,7 @@ 
                 return $cache[$familyRaw][$subtypeRaw] = $families[$family][$subtype];
             }
     
-            if (!isset($families[$family])) {
+            if ( ! isset($families[$family])) {
                 continue;
             }
     
@@ -496,7 +496,7 @@ 
         if (preg_match('/bold/i', $type)) {
             $weight = 700;
         } elseif (preg_match('/([1-9]00)/', $type, $match)) {
-            $weight = (int)$match[0];
+            $weight = (int) $match[0];
         } else {
             $weight = 400;
         }
@@ -530,7 +530,7 @@ 
      */
     public function getFontFamilies()
     {
-        if (!isset($this->fontFamilies)) {
+        if ( ! isset($this->fontFamilies)) {
             $this->setFontFamilies();
         }
         return $this->fontFamilies;
@@ -546,19 +546,19 @@ 
         $fontFamilies = [];
         if (isset($this->bundledFonts) && is_array($this->bundledFonts)) {
             foreach ($this->bundledFonts as $family => $variants) {
-                if (!isset($fontFamilies[$family])) {
-                    $fontFamilies[$family] = array_map(function ($variant) {
-                        return $this->getOptions()->getRootDir() . '/lib/fonts/' . $variant;
+                if ( ! isset($fontFamilies[$family])) {
+                    $fontFamilies[$family] = array_map(function($variant) {
+                        return $this->getOptions()->getRootDir().'/lib/fonts/'.$variant;
                     }, $variants);
                 }
             }
         }
         if (isset($this->userFonts) && is_array($this->userFonts)) {
             foreach ($this->userFonts as $family => $variants) {
-                $fontFamilies[$family] = array_map(function ($variant) {
+                $fontFamilies[$family] = array_map(function($variant) {
                     $variantName = basename($variant);
                     if ($variantName === $variant) {
-                        return $this->getOptions()->getFontDir() . '/' . $variant;
+                        return $this->getOptions()->getFontDir().'/'.$variant;
                     }
                     return $variant;
                 }, $variants);
@@ -593,7 +593,7 @@ 
      */
     public function getUserFontsFilePath()
     {
-        return $this->options->getFontDir() . '/' . self::USER_FONTS_FILE;
+        return $this->options->getFontDir().'/'.self::USER_FONTS_FILE;
     }
 
     /**

vendor/dompdf/dompdf/src/FrameReflower/TableCell.php

Indentation +139 added lines, -139 removed lines

@@ -17,145 +17,145 @@
  */
 class TableCell extends Block
 {
-    /**
-     * TableCell constructor.
-     * @param BlockFrameDecorator $frame
-     */
-    function __construct(BlockFrameDecorator $frame)
-    {
-        parent::__construct($frame);
-    }
+	/**
+	 * TableCell constructor.
+	 * @param BlockFrameDecorator $frame
+	 */
+	function __construct(BlockFrameDecorator $frame)
+	{
+		parent::__construct($frame);
+	}
 
-    /**
-     * @param BlockFrameDecorator|null $block
-     */
-    function reflow(BlockFrameDecorator $block = null)
-    {
-        // Counters and generated content
-        $this->_set_content();
-
-        $style = $this->_frame->get_style();
-
-        $table = TableFrameDecorator::find_parent_table($this->_frame);
-        $cellmap = $table->get_cellmap();
-
-        list($x, $y) = $cellmap->get_frame_position($this->_frame);
-        $this->_frame->set_position($x, $y);
-
-        $cells = $cellmap->get_spanned_cells($this->_frame);
-
-        $w = 0;
-        foreach ($cells["columns"] as $i) {
-            $col = $cellmap->get_column($i);
-            $w += $col["used-width"];
-        }
-
-        //FIXME?
-        $h = $this->_frame->get_containing_block("h");
-
-        $left_space = (float)$style->length_in_pt([$style->margin_left,
-                $style->padding_left,
-                $style->border_left_width],
-            $w);
-
-        $right_space = (float)$style->length_in_pt([$style->padding_right,
-                $style->margin_right,
-                $style->border_right_width],
-            $w);
-
-        $top_space = (float)$style->length_in_pt([$style->margin_top,
-                $style->padding_top,
-                $style->border_top_width],
-            $h);
-        $bottom_space = (float)$style->length_in_pt([$style->margin_bottom,
-                $style->padding_bottom,
-                $style->border_bottom_width],
-            $h);
-
-        $cb_w = $w - $left_space - $right_space;
-        $style->set_used("width", $cb_w);
-
-        $content_x = $x + $left_space;
-        $content_y = $line_y = $y + $top_space;
-
-        // Adjust the first line based on the text-indent property
-        $indent = (float)$style->length_in_pt($style->text_indent, $w);
-        $this->_frame->increase_line_width($indent);
-
-        $page = $this->_frame->get_root();
-
-        // Set the y position of the first line in the cell
-        $line_box = $this->_frame->get_current_line_box();
-        $line_box->y = $line_y;
-
-        // Set the containing blocks and reflow each child
-        foreach ($this->_frame->get_children() as $child) {
-            $child->set_containing_block($content_x, $content_y, $cb_w, $h);
-            $this->process_clear($child);
-            $child->reflow($this->_frame);
-            $this->process_float($child, $content_x, $cb_w);
-
-            if ($page->is_full()) {
-                break;
-            }
-        }
-
-        // Determine our height
-        $style_height = (float)$style->length_in_pt($style->height, $h);
-
-        /** @var FrameDecorator\TableCell */
-        $frame = $this->_frame;
-
-        $frame->set_content_height($this->_calculate_content_height());
-
-        $height = max($style_height, (float)$frame->get_content_height());
-
-        // Let the cellmap know our height
-        $cell_height = $height / count($cells["rows"]);
-
-        if ($style_height <= $height) {
-            $cell_height += $top_space + $bottom_space;
-        }
-
-        foreach ($cells["rows"] as $i) {
-            $cellmap->set_row_height($i, $cell_height);
-        }
-
-        $style->set_used("height", $height);
-
-        $this->_text_align();
-        $this->vertical_align();
-
-        // Handle relative positioning
-        foreach ($this->_frame->get_children() as $child) {
-            $this->position_relative($child);
-        }
-    }
+	/**
+	 * @param BlockFrameDecorator|null $block
+	 */
+	function reflow(BlockFrameDecorator $block = null)
+	{
+		// Counters and generated content
+		$this->_set_content();
+
+		$style = $this->_frame->get_style();
+
+		$table = TableFrameDecorator::find_parent_table($this->_frame);
+		$cellmap = $table->get_cellmap();
+
+		list($x, $y) = $cellmap->get_frame_position($this->_frame);
+		$this->_frame->set_position($x, $y);
+
+		$cells = $cellmap->get_spanned_cells($this->_frame);
+
+		$w = 0;
+		foreach ($cells["columns"] as $i) {
+			$col = $cellmap->get_column($i);
+			$w += $col["used-width"];
+		}
+
+		//FIXME?
+		$h = $this->_frame->get_containing_block("h");
+
+		$left_space = (float)$style->length_in_pt([$style->margin_left,
+				$style->padding_left,
+				$style->border_left_width],
+			$w);
+
+		$right_space = (float)$style->length_in_pt([$style->padding_right,
+				$style->margin_right,
+				$style->border_right_width],
+			$w);
+
+		$top_space = (float)$style->length_in_pt([$style->margin_top,
+				$style->padding_top,
+				$style->border_top_width],
+			$h);
+		$bottom_space = (float)$style->length_in_pt([$style->margin_bottom,
+				$style->padding_bottom,
+				$style->border_bottom_width],
+			$h);
+
+		$cb_w = $w - $left_space - $right_space;
+		$style->set_used("width", $cb_w);
+
+		$content_x = $x + $left_space;
+		$content_y = $line_y = $y + $top_space;
+
+		// Adjust the first line based on the text-indent property
+		$indent = (float)$style->length_in_pt($style->text_indent, $w);
+		$this->_frame->increase_line_width($indent);
+
+		$page = $this->_frame->get_root();
+
+		// Set the y position of the first line in the cell
+		$line_box = $this->_frame->get_current_line_box();
+		$line_box->y = $line_y;
+
+		// Set the containing blocks and reflow each child
+		foreach ($this->_frame->get_children() as $child) {
+			$child->set_containing_block($content_x, $content_y, $cb_w, $h);
+			$this->process_clear($child);
+			$child->reflow($this->_frame);
+			$this->process_float($child, $content_x, $cb_w);
+
+			if ($page->is_full()) {
+				break;
+			}
+		}
+
+		// Determine our height
+		$style_height = (float)$style->length_in_pt($style->height, $h);
+
+		/** @var FrameDecorator\TableCell */
+		$frame = $this->_frame;
+
+		$frame->set_content_height($this->_calculate_content_height());
+
+		$height = max($style_height, (float)$frame->get_content_height());
+
+		// Let the cellmap know our height
+		$cell_height = $height / count($cells["rows"]);
+
+		if ($style_height <= $height) {
+			$cell_height += $top_space + $bottom_space;
+		}
+
+		foreach ($cells["rows"] as $i) {
+			$cellmap->set_row_height($i, $cell_height);
+		}
+
+		$style->set_used("height", $height);
+
+		$this->_text_align();
+		$this->vertical_align();
+
+		// Handle relative positioning
+		foreach ($this->_frame->get_children() as $child) {
+			$this->position_relative($child);
+		}
+	}
 
-    public function get_min_max_content_width(): array
-    {
-        // Ignore percentage values for a specified width here, as they are
-        // relative to the table width, which is not determined yet
-        $style = $this->_frame->get_style();
-        $width = $style->width;
-        $fixed_width = $width !== "auto" && !Helpers::is_percent($width);
-
-        [$min, $max] = $this->get_min_max_child_width();
-
-        // For table cells: Use specified width if it is greater than the
-        // minimum defined by the content
-        if ($fixed_width) {
-            $width = (float) $style->length_in_pt($width, 0);
-            $min = max($width, $min);
-            $max = $min;
-        }
-
-        // Handle min/max width style properties
-        $min_width = $this->resolve_min_width(null);
-        $max_width = $this->resolve_max_width(null);
-        $min = Helpers::clamp($min, $min_width, $max_width);
-        $max = Helpers::clamp($max, $min_width, $max_width);
-
-        return [$min, $max];
-    }
+	public function get_min_max_content_width(): array
+	{
+		// Ignore percentage values for a specified width here, as they are
+		// relative to the table width, which is not determined yet
+		$style = $this->_frame->get_style();
+		$width = $style->width;
+		$fixed_width = $width !== "auto" && !Helpers::is_percent($width);
+
+		[$min, $max] = $this->get_min_max_child_width();
+
+		// For table cells: Use specified width if it is greater than the
+		// minimum defined by the content
+		if ($fixed_width) {
+			$width = (float) $style->length_in_pt($width, 0);
+			$min = max($width, $min);
+			$max = $min;
+		}
+
+		// Handle min/max width style properties
+		$min_width = $this->resolve_min_width(null);
+		$max_width = $this->resolve_max_width(null);
+		$min = Helpers::clamp($min, $min_width, $max_width);
+		$max = Helpers::clamp($max, $min_width, $max_width);
+
+		return [$min, $max];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -53,21 +53,21 @@ 
         //FIXME?
         $h = $this->_frame->get_containing_block("h");
 
-        $left_space = (float)$style->length_in_pt([$style->margin_left,
+        $left_space = (float) $style->length_in_pt([$style->margin_left,
                 $style->padding_left,
                 $style->border_left_width],
             $w);
 
-        $right_space = (float)$style->length_in_pt([$style->padding_right,
+        $right_space = (float) $style->length_in_pt([$style->padding_right,
                 $style->margin_right,
                 $style->border_right_width],
             $w);
 
-        $top_space = (float)$style->length_in_pt([$style->margin_top,
+        $top_space = (float) $style->length_in_pt([$style->margin_top,
                 $style->padding_top,
                 $style->border_top_width],
             $h);
-        $bottom_space = (float)$style->length_in_pt([$style->margin_bottom,
+        $bottom_space = (float) $style->length_in_pt([$style->margin_bottom,
                 $style->padding_bottom,
                 $style->border_bottom_width],
             $h);
@@ -79,7 +79,7 @@ 
         $content_y = $line_y = $y + $top_space;
 
         // Adjust the first line based on the text-indent property
-        $indent = (float)$style->length_in_pt($style->text_indent, $w);
+        $indent = (float) $style->length_in_pt($style->text_indent, $w);
         $this->_frame->increase_line_width($indent);
 
         $page = $this->_frame->get_root();
@@ -101,14 +101,14 @@ 
         }
 
         // Determine our height
-        $style_height = (float)$style->length_in_pt($style->height, $h);
+        $style_height = (float) $style->length_in_pt($style->height, $h);
 
         /** @var FrameDecorator\TableCell */
         $frame = $this->_frame;
 
         $frame->set_content_height($this->_calculate_content_height());
 
-        $height = max($style_height, (float)$frame->get_content_height());
+        $height = max($style_height, (float) $frame->get_content_height());
 
         // Let the cellmap know our height
         $cell_height = $height / count($cells["rows"]);
@@ -138,7 +138,7 @@ 
         // relative to the table width, which is not determined yet
         $style = $this->_frame->get_style();
         $width = $style->width;
-        $fixed_width = $width !== "auto" && !Helpers::is_percent($width);
+        $fixed_width = $width !== "auto" && ! Helpers::is_percent($width);
 
         [$min, $max] = $this->get_min_max_child_width();
 

vendor/dompdf/dompdf/src/FrameReflower/Page.php

Indentation +178 added lines, -178 removed lines

@@ -18,182 +18,182 @@
 class Page extends AbstractFrameReflower
 {
 
-    /**
-     * Cache of the callbacks array
-     *
-     * @var array
-     */
-    private $_callbacks;
-
-    /**
-     * Cache of the canvas
-     *
-     * @var \Dompdf\Canvas
-     */
-    private $_canvas;
-
-    /**
-     * Page constructor.
-     * @param PageFrameDecorator $frame
-     */
-    function __construct(PageFrameDecorator $frame)
-    {
-        parent::__construct($frame);
-    }
-
-    /**
-     * @param PageFrameDecorator $frame
-     * @param int $page_number
-     */
-    function apply_page_style(Frame $frame, $page_number)
-    {
-        $style = $frame->get_style();
-        $page_styles = $style->get_stylesheet()->get_page_styles();
-
-        // http://www.w3.org/TR/CSS21/page.html#page-selectors
-        if (count($page_styles) > 1) {
-            $odd = $page_number % 2 == 1;
-            $first = $page_number == 1;
-
-            $style = clone $page_styles["base"];
-
-            // FIXME RTL
-            if ($odd && isset($page_styles[":right"])) {
-                $style->merge($page_styles[":right"]);
-            }
-
-            if ($odd && isset($page_styles[":odd"])) {
-                $style->merge($page_styles[":odd"]);
-            }
-
-            // FIXME RTL
-            if (!$odd && isset($page_styles[":left"])) {
-                $style->merge($page_styles[":left"]);
-            }
-
-            if (!$odd && isset($page_styles[":even"])) {
-                $style->merge($page_styles[":even"]);
-            }
-
-            if ($first && isset($page_styles[":first"])) {
-                $style->merge($page_styles[":first"]);
-            }
-
-            $frame->set_style($style);
-        }
-
-        $frame->calculate_bottom_page_edge();
-    }
-
-    /**
-     * Paged layout:
-     * http://www.w3.org/TR/CSS21/page.html
-     *
-     * @param BlockFrameDecorator|null $block
-     */
-    function reflow(BlockFrameDecorator $block = null)
-    {
-        /** @var PageFrameDecorator $frame */
-        $frame = $this->_frame;
-        $child = $frame->get_first_child();
-        $fixed_children = [];
-        $prev_child = null;
-        $current_page = 0;
-
-        while ($child) {
-            $this->apply_page_style($frame, $current_page + 1);
-
-            $style = $frame->get_style();
-
-            // Pages are only concerned with margins
-            $cb = $frame->get_containing_block();
-            $left = (float)$style->length_in_pt($style->margin_left, $cb["w"]);
-            $right = (float)$style->length_in_pt($style->margin_right, $cb["w"]);
-            $top = (float)$style->length_in_pt($style->margin_top, $cb["h"]);
-            $bottom = (float)$style->length_in_pt($style->margin_bottom, $cb["h"]);
-
-            $content_x = $cb["x"] + $left;
-            $content_y = $cb["y"] + $top;
-            $content_width = $cb["w"] - $left - $right;
-            $content_height = $cb["h"] - $top - $bottom;
-
-            // Only if it's the first page, we save the nodes with a fixed position
-            if ($current_page == 0) {
-                foreach ($child->get_children() as $onechild) {
-                    if ($onechild->get_style()->position === "fixed") {
-                        $fixed_children[] = $onechild->deep_copy();
-                    }
-                }
-                $fixed_children = array_reverse($fixed_children);
-            }
-
-            $child->set_containing_block($content_x, $content_y, $content_width, $content_height);
-
-            // Check for begin reflow callback
-            $this->_check_callbacks("begin_page_reflow", $child);
-
-            //Insert a copy of each node which have a fixed position
-            if ($current_page >= 1) {
-                foreach ($fixed_children as $fixed_child) {
-                    $child->insert_child_before($fixed_child->deep_copy(), $child->get_first_child());
-                }
-            }
-
-            $child->reflow();
-            $next_child = $child->get_next_sibling();
-
-            // Check for begin render callback
-            $this->_check_callbacks("begin_page_render", $child);
-
-            // Render the page
-            $frame->get_renderer()->render($child);
-
-            // Check for end render callback
-            $this->_check_callbacks("end_page_render", $child);
-
-            if ($next_child) {
-                $frame->next_page();
-            }
-
-            // Wait to dispose of all frames on the previous page
-            // so callback will have access to them
-            if ($prev_child) {
-                $prev_child->dispose(true);
-            }
-            $prev_child = $child;
-            $child = $next_child;
-            $current_page++;
-        }
-
-        // Dispose of previous page if it still exists
-        if ($prev_child) {
-            $prev_child->dispose(true);
-        }
-    }
-
-    /**
-     * Check for callbacks that need to be performed when a given event
-     * gets triggered on a page
-     *
-     * @param string $event The type of event
-     * @param Frame  $frame The frame that event is triggered on
-     */
-    protected function _check_callbacks(string $event, Frame $frame): void
-    {
-        if (!isset($this->_callbacks)) {
-            $dompdf = $this->get_dompdf();
-            $this->_callbacks = $dompdf->getCallbacks();
-            $this->_canvas = $dompdf->getCanvas();
-        }
-
-        if (isset($this->_callbacks[$event])) {
-            $fs = $this->_callbacks[$event];
-            $canvas = $this->_canvas;
-            $fontMetrics = $this->get_dompdf()->getFontMetrics();
-
-            foreach ($fs as $f) {
-                $f($frame, $canvas, $fontMetrics);
-            }
-        }
-    }
+	/**
+	 * Cache of the callbacks array
+	 *
+	 * @var array
+	 */
+	private $_callbacks;
+
+	/**
+	 * Cache of the canvas
+	 *
+	 * @var \Dompdf\Canvas
+	 */
+	private $_canvas;
+
+	/**
+	 * Page constructor.
+	 * @param PageFrameDecorator $frame
+	 */
+	function __construct(PageFrameDecorator $frame)
+	{
+		parent::__construct($frame);
+	}
+
+	/**
+	 * @param PageFrameDecorator $frame
+	 * @param int $page_number
+	 */
+	function apply_page_style(Frame $frame, $page_number)
+	{
+		$style = $frame->get_style();
+		$page_styles = $style->get_stylesheet()->get_page_styles();
+
+		// http://www.w3.org/TR/CSS21/page.html#page-selectors
+		if (count($page_styles) > 1) {
+			$odd = $page_number % 2 == 1;
+			$first = $page_number == 1;
+
+			$style = clone $page_styles["base"];
+
+			// FIXME RTL
+			if ($odd && isset($page_styles[":right"])) {
+				$style->merge($page_styles[":right"]);
+			}
+
+			if ($odd && isset($page_styles[":odd"])) {
+				$style->merge($page_styles[":odd"]);
+			}
+
+			// FIXME RTL
+			if (!$odd && isset($page_styles[":left"])) {
+				$style->merge($page_styles[":left"]);
+			}
+
+			if (!$odd && isset($page_styles[":even"])) {
+				$style->merge($page_styles[":even"]);
+			}
+
+			if ($first && isset($page_styles[":first"])) {
+				$style->merge($page_styles[":first"]);
+			}
+
+			$frame->set_style($style);
+		}
+
+		$frame->calculate_bottom_page_edge();
+	}
+
+	/**
+	 * Paged layout:
+	 * http://www.w3.org/TR/CSS21/page.html
+	 *
+	 * @param BlockFrameDecorator|null $block
+	 */
+	function reflow(BlockFrameDecorator $block = null)
+	{
+		/** @var PageFrameDecorator $frame */
+		$frame = $this->_frame;
+		$child = $frame->get_first_child();
+		$fixed_children = [];
+		$prev_child = null;
+		$current_page = 0;
+
+		while ($child) {
+			$this->apply_page_style($frame, $current_page + 1);
+
+			$style = $frame->get_style();
+
+			// Pages are only concerned with margins
+			$cb = $frame->get_containing_block();
+			$left = (float)$style->length_in_pt($style->margin_left, $cb["w"]);
+			$right = (float)$style->length_in_pt($style->margin_right, $cb["w"]);
+			$top = (float)$style->length_in_pt($style->margin_top, $cb["h"]);
+			$bottom = (float)$style->length_in_pt($style->margin_bottom, $cb["h"]);
+
+			$content_x = $cb["x"] + $left;
+			$content_y = $cb["y"] + $top;
+			$content_width = $cb["w"] - $left - $right;
+			$content_height = $cb["h"] - $top - $bottom;
+
+			// Only if it's the first page, we save the nodes with a fixed position
+			if ($current_page == 0) {
+				foreach ($child->get_children() as $onechild) {
+					if ($onechild->get_style()->position === "fixed") {
+						$fixed_children[] = $onechild->deep_copy();
+					}
+				}
+				$fixed_children = array_reverse($fixed_children);
+			}
+
+			$child->set_containing_block($content_x, $content_y, $content_width, $content_height);
+
+			// Check for begin reflow callback
+			$this->_check_callbacks("begin_page_reflow", $child);
+
+			//Insert a copy of each node which have a fixed position
+			if ($current_page >= 1) {
+				foreach ($fixed_children as $fixed_child) {
+					$child->insert_child_before($fixed_child->deep_copy(), $child->get_first_child());
+				}
+			}
+
+			$child->reflow();
+			$next_child = $child->get_next_sibling();
+
+			// Check for begin render callback
+			$this->_check_callbacks("begin_page_render", $child);
+
+			// Render the page
+			$frame->get_renderer()->render($child);
+
+			// Check for end render callback
+			$this->_check_callbacks("end_page_render", $child);
+
+			if ($next_child) {
+				$frame->next_page();
+			}
+
+			// Wait to dispose of all frames on the previous page
+			// so callback will have access to them
+			if ($prev_child) {
+				$prev_child->dispose(true);
+			}
+			$prev_child = $child;
+			$child = $next_child;
+			$current_page++;
+		}
+
+		// Dispose of previous page if it still exists
+		if ($prev_child) {
+			$prev_child->dispose(true);
+		}
+	}
+
+	/**
+	 * Check for callbacks that need to be performed when a given event
+	 * gets triggered on a page
+	 *
+	 * @param string $event The type of event
+	 * @param Frame  $frame The frame that event is triggered on
+	 */
+	protected function _check_callbacks(string $event, Frame $frame): void
+	{
+		if (!isset($this->_callbacks)) {
+			$dompdf = $this->get_dompdf();
+			$this->_callbacks = $dompdf->getCallbacks();
+			$this->_canvas = $dompdf->getCanvas();
+		}
+
+		if (isset($this->_callbacks[$event])) {
+			$fs = $this->_callbacks[$event];
+			$canvas = $this->_canvas;
+			$fontMetrics = $this->get_dompdf()->getFontMetrics();
+
+			foreach ($fs as $f) {
+				$f($frame, $canvas, $fontMetrics);
+			}
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -67,11 +67,11 @@ 
             }
 
             // FIXME RTL
-            if (!$odd && isset($page_styles[":left"])) {
+            if ( ! $odd && isset($page_styles[":left"])) {
                 $style->merge($page_styles[":left"]);
             }
 
-            if (!$odd && isset($page_styles[":even"])) {
+            if ( ! $odd && isset($page_styles[":even"])) {
                 $style->merge($page_styles[":even"]);
             }
 
@@ -107,10 +107,10 @@ 
 
             // Pages are only concerned with margins
             $cb = $frame->get_containing_block();
-            $left = (float)$style->length_in_pt($style->margin_left, $cb["w"]);
-            $right = (float)$style->length_in_pt($style->margin_right, $cb["w"]);
-            $top = (float)$style->length_in_pt($style->margin_top, $cb["h"]);
-            $bottom = (float)$style->length_in_pt($style->margin_bottom, $cb["h"]);
+            $left = (float) $style->length_in_pt($style->margin_left, $cb["w"]);
+            $right = (float) $style->length_in_pt($style->margin_right, $cb["w"]);
+            $top = (float) $style->length_in_pt($style->margin_top, $cb["h"]);
+            $bottom = (float) $style->length_in_pt($style->margin_bottom, $cb["h"]);
 
             $content_x = $cb["x"] + $left;
             $content_y = $cb["y"] + $top;
@@ -180,7 +180,7 @@ 
      */
     protected function _check_callbacks(string $event, Frame $frame): void
     {
-        if (!isset($this->_callbacks)) {
+        if ( ! isset($this->_callbacks)) {
             $dompdf = $this->get_dompdf();
             $this->_callbacks = $dompdf->getCallbacks();
             $this->_canvas = $dompdf->getCanvas();

vendor/dompdf/dompdf/src/FrameReflower/Text.php

Indentation +583 added lines, -583 removed lines

@@ -19,587 +19,587 @@
  */
 class Text extends AbstractFrameReflower
 {
-    /**
-     * PHP string representation of HTML entity <shy>
-     */
-    const SOFT_HYPHEN = "\xC2\xAD";
-
-    /**
-     * The regex splits on everything that's a separator (^\S double negative),
-     * excluding the following non-breaking space characters:
-     * * nbsp (\xA0)
-     * * narrow nbsp (\x{202F})
-     * * figure space (\x{2007})
-     */
-    public static $_whitespace_pattern = '/([^\S\xA0\x{202F}\x{2007}]+)/u';
-
-    /**
-     * The regex splits on everything that's a separator (^\S double negative)
-     * plus dashes, excluding the following non-breaking space characters:
-     * * nbsp (\xA0)
-     * * narrow nbsp (\x{202F})
-     * * figure space (\x{2007})
-     */
-    public static $_wordbreak_pattern = '/([^\S\xA0\x{202F}\x{2007}\n]+|\R|\-+|\xAD+)/u';
-
-    /**
-     * Frame for this reflower
-     *
-     * @var TextFrameDecorator
-     */
-    protected $_frame;
-
-    /**
-     * Saves trailing whitespace trimmed after a line break, so it can be
-     * restored when needed.
-     *
-     * @var string|null
-     */
-    protected $trailingWs = null;
-
-    /**
-     * @var FontMetrics
-     */
-    private $fontMetrics;
-
-    /**
-     * @param TextFrameDecorator $frame
-     * @param FontMetrics $fontMetrics
-     */
-    public function __construct(TextFrameDecorator $frame, FontMetrics $fontMetrics)
-    {
-        parent::__construct($frame);
-        $this->setFontMetrics($fontMetrics);
-    }
-
-    /**
-     * Apply text transform and white-space collapse according to style.
-     *
-     * * http://www.w3.org/TR/CSS21/text.html#propdef-text-transform
-     * * http://www.w3.org/TR/CSS21/text.html#propdef-white-space
-     *
-     * @param string $text
-     * @return string
-     */
-    protected function pre_process_text(string $text): string
-    {
-        $style = $this->_frame->get_style();
-
-        // Handle text transform
-        switch ($style->text_transform) {
-            case "capitalize":
-                $text = Helpers::mb_ucwords($text);
-                break;
-            case "uppercase":
-                $text = mb_convert_case($text, MB_CASE_UPPER);
-                break;
-            case "lowercase":
-                $text = mb_convert_case($text, MB_CASE_LOWER);
-                break;
-            default:
-                break;
-        }
-
-        // Handle white-space collapse
-        switch ($style->white_space) {
-            default:
-            case "normal":
-            case "nowrap":
-                $text = preg_replace(self::$_whitespace_pattern, " ", $text) ?? "";
-                break;
-
-            case "pre-line":
-                // Collapse white space except for line breaks
-                $text = preg_replace('/([^\S\xA0\x{202F}\x{2007}\n]+)/u', " ", $text) ?? "";
-                break;
-
-            case "pre":
-            case "pre-wrap":
-                break;
-
-        }
-
-        return $text;
-    }
-
-    /**
-     * @param string              $text
-     * @param BlockFrameDecorator $block
-     * @param bool                $nowrap
-     *
-     * @return bool|int
-     */
-    protected function line_break(string $text, BlockFrameDecorator $block, bool $nowrap = false)
-    {
-        $fontMetrics = $this->getFontMetrics();
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $font = $style->font_family;
-        $size = $style->font_size;
-        $word_spacing = $style->word_spacing;
-        $letter_spacing = $style->letter_spacing;
-
-        // Determine the available width
-        $current_line = $block->get_current_line_box();
-        $line_width = $frame->get_containing_block("w");
-        $current_line_width = $current_line->left + $current_line->w + $current_line->right;
-        $available_width = $line_width - $current_line_width;
-
-        // Determine the frame width including margin, padding & border
-        $visible_text = preg_replace('/\xAD/u', "", $text);
-        $text_width = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
-        $mbp_width = (float) $style->length_in_pt([
-            $style->margin_left,
-            $style->border_left_width,
-            $style->padding_left,
-            $style->padding_right,
-            $style->border_right_width,
-            $style->margin_right
-        ], $line_width);
-        $frame_width = $text_width + $mbp_width;
-
-        if (Helpers::lengthLessOrEqual($frame_width, $available_width)) {
-            return false;
-        }
-
-        if ($nowrap) {
-            return $current_line_width == 0 ? false : 0;
-        }
-
-        // Split the text into words
-        $words = preg_split(self::$_wordbreak_pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $wc = count($words);
-
-        // Determine the split point
-        $width = 0.0;
-        $str = "";
-
-        $space_width = $fontMetrics->getTextWidth(" ", $font, $size, $word_spacing, $letter_spacing);
-        $shy_width = $fontMetrics->getTextWidth(self::SOFT_HYPHEN, $font, $size);
-
-        // @todo support <wbr>
-        for ($i = 0; $i < $wc; $i += 2) {
-            // Allow trailing white space to overflow. White space is always
-            // collapsed to the standard space character currently, so only
-            // handle that for now
-            $sep = $words[$i + 1] ?? "";
-            $word = $sep === " " ? $words[$i] : $words[$i] . $sep;
-            $word_width = $fontMetrics->getTextWidth($word, $font, $size, $word_spacing, $letter_spacing);
-            $used_width = $width + $word_width + $mbp_width;
-
-            if (Helpers::lengthGreater($used_width, $available_width)) {
-                // If the previous split happened by soft hyphen, we have to
-                // append its width again because the last hyphen of a line
-                // won't be removed
-                if (isset($words[$i - 1]) && self::SOFT_HYPHEN === $words[$i - 1]) {
-                    $width += $shy_width;
-                }
-                break;
-            }
-
-            // If the word is splitted by soft hyphen, but no line break is needed
-            // we have to reduce the width. But the str is not modified, otherwise
-            // the wrong offset is calculated at the end of this method.
-            if ($sep === self::SOFT_HYPHEN) {
-                $width += $word_width - $shy_width;
-                $str .= $word;
-            } elseif ($sep === " ") {
-                $width += $word_width + $space_width;
-                $str .= $word . $sep;
-            } else {
-                $width += $word_width;
-                $str .= $word;
-            }
-        }
-
-        // The first word has overflowed. Force it onto the line, or as many
-        // characters as fit if breaking words is allowed
-        if ($current_line_width == 0 && $width === 0.0) {
-            if ($sep === " ") {
-                $word .= $sep;
-            }
-
-            // https://www.w3.org/TR/css-text-3/#overflow-wrap-property
-            $wrap = $style->overflow_wrap;
-            $break_word = $wrap === "anywhere" || $wrap === "break-word";
-
-            if ($break_word) {
-                $s = "";
-
-                for ($j = 0; $j < mb_strlen($word); $j++) {
-                    $c = mb_substr($word, $j, 1);
-                    $w = $fontMetrics->getTextWidth($s . $c, $font, $size, $word_spacing, $letter_spacing);
-
-                    if (Helpers::lengthGreater($w, $available_width)) {
-                        break;
-                    }
-
-                    $s .= $c;
-                }
-
-                // Always force the first character onto the line
-                $str = $j === 0 ? $s . $c : $s;
-            } else {
-                $str = $word;
-            }
-        }
-
-        $offset = mb_strlen($str);
-        return $offset;
-    }
-
-    /**
-     * @param string $text
-     * @return bool|int
-     */
-    protected function newline_break(string $text)
-    {
-        if (($i = mb_strpos($text, "\n")) === false) {
-            return false;
-        }
-
-        return $i + 1;
-    }
-
-    /**
-     * @param BlockFrameDecorator $block
-     * @return bool|null Whether to add a new line at the end. `null` if reflow
-     *         should be stopped.
-     */
-    protected function layout_line(BlockFrameDecorator $block): ?bool
-    {
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $current_line = $block->get_current_line_box();
-        $text = $frame->get_text();
-
-        // Trim leading white space if this is the first text on the line
-        if ($current_line->w === 0.0 && !$frame->is_pre()) {
-            $text = ltrim($text, " ");
-        }
-
-        // Exclude wrapped white space. This handles white space between block
-        // elements in case white space is collapsed
-        if ($text === "") {
-            $frame->set_text("");
-            $style->set_used("width", 0.0);
-            return null;
-        }
-
-        // Determine the next line break
-        // http://www.w3.org/TR/CSS21/text.html#propdef-white-space
-        $white_space = $style->white_space;
-        $nowrap = $white_space === "nowrap" || $white_space === "pre";
-
-        switch ($white_space) {
-            default:
-            case "normal":
-            case "nowrap":
-                $split = $this->line_break($text, $block, $nowrap);
-                $add_line = false;
-                break;
-
-            case "pre":
-            case "pre-line":
-            case "pre-wrap":
-                $hard_split = $this->newline_break($text);
-                $first_line = $hard_split !== false
-                    ? mb_substr($text, 0, $hard_split)
-                    : $text;
-                $soft_split = $this->line_break($first_line, $block, $nowrap);
-
-                $split = $soft_split !== false ? $soft_split : $hard_split;
-                $add_line = $hard_split !== false;
-                break;
-        }
-
-        if ($split === 0) {
-            // Make sure to move text when floating frames leave no space to
-            // place anything onto the line
-            // TODO: Would probably be better to move just below the current
-            // floating frame instead of trying to place text in line-height
-            // increments
-            if ($current_line->h === 0.0) {
-                // Line height might be 0
-                $h = max($frame->get_margin_height(), 1.0);
-                $block->maximize_line_height($h, $frame);
-            }
-
-            // Break line and repeat layout
-            $block->add_line();
-
-            // Find the appropriate inline ancestor to split
-            $child = $frame;
-            $p = $child->get_parent();
-            while ($p instanceof InlineFrameDecorator && !$child->get_prev_sibling()) {
-                $child = $p;
-                $p = $p->get_parent();
-            }
-
-            if ($p instanceof InlineFrameDecorator) {
-                // Split parent and stop current reflow. Reflow continues
-                // via child-reflow loop of split parent
-                $p->split($child);
-                return null;
-            }
-
-            return $this->layout_line($block);
-        }
-
-        // Final split point is determined
-        if ($split !== false && $split < mb_strlen($text)) {
-            // Split the line
-            $frame->set_text($text);
-            $frame->split_text($split);
-            $add_line = true;
-
-            // Remove inner soft hyphens
-            $t = $frame->get_text();
-            $shyPosition = mb_strpos($t, self::SOFT_HYPHEN);
-            if (false !== $shyPosition && $shyPosition < mb_strlen($t) - 1) {
-                $t = str_replace(self::SOFT_HYPHEN, "", mb_substr($t, 0, -1)) . mb_substr($t, -1);
-                $frame->set_text($t);
-            }
-        } else {
-            // No split required
-            // Remove soft hyphens
-            $text = str_replace(self::SOFT_HYPHEN, "", $text);
-            $frame->set_text($text);
-        }
-
-        // Set our new width
-        $frame->recalculate_width();
-
-        return $add_line;
-    }
-
-    /**
-     * @param BlockFrameDecorator|null $block
-     */
-    function reflow(BlockFrameDecorator $block = null)
-    {
-        $frame = $this->_frame;
-        $page = $frame->get_root();
-        $page->check_forced_page_break($frame);
-
-        if ($page->is_full()) {
-            return;
-        }
-
-        // Determine the text height
-        $style = $frame->get_style();
-        $size = $style->font_size;
-        $font = $style->font_family;
-        $font_height = $this->getFontMetrics()->getFontHeight($font, $size);
-        $style->set_used("height", $font_height);
-
-        // Handle text transform and white space
-        $text = $this->pre_process_text($frame->get_text());
-        $frame->set_text($text);
-
-        $add_line = $this->layout_line($block);
-
-        if ($add_line === null) {
-            return;
-        }
-
-        $frame->position();
-
-        if ($block) {
-            $line = $block->add_frame_to_line($frame);
-            $trimmed = trim($frame->get_text());
-
-            // Split the text into words (used to determine spacing between
-            // words on justified lines)
-            if ($trimmed !== "") {
-                $words = preg_split(self::$_whitespace_pattern, $trimmed);
-                $line->wc += count($words);
-            }
-
-            if ($add_line) {
-                $block->add_line();
-            }
-        }
-    }
-
-    /**
-     * Trim trailing white space from the frame text.
-     */
-    public function trim_trailing_ws(): void
-    {
-        $frame = $this->_frame;
-        $text = $frame->get_text();
-        $trailing = mb_substr($text, -1);
-
-        // White space is always collapsed to the standard space character
-        // currently, so only handle that for now
-        if ($trailing === " ") {
-            $this->trailingWs = $trailing;
-            $frame->set_text(mb_substr($text, 0, -1));
-            $frame->recalculate_width();
-        }
-    }
-
-    public function reset(): void
-    {
-        parent::reset();
-
-        // Restore trimmed trailing white space, as the frame will go through
-        // another reflow and line breaks might be different after a split
-        if ($this->trailingWs !== null) {
-            $text = $this->_frame->get_text();
-            $this->_frame->set_text($text . $this->trailingWs);
-            $this->trailingWs = null;
-        }
-    }
-
-    //........................................................................
-
-    public function get_min_max_width(): array
-    {
-        $fontMetrics = $this->getFontMetrics();
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $text = $frame->get_text();
-        $font = $style->font_family;
-        $size = $style->font_size;
-        $word_spacing = $style->word_spacing;
-        $letter_spacing = $style->letter_spacing;
-
-        // Handle text transform and white space
-        $text = $this->pre_process_text($frame->get_text());
-
-        if (!$frame->is_pre()) {
-            // Determine whether the frame is at the start of its parent block.
-            // Trim leading white space in that case
-            $child = $frame;
-            $p = $frame->get_parent();
-            while (!$p->is_block() && !$child->get_prev_sibling()) {
-                $child = $p;
-                $p = $p->get_parent();
-            }
-
-            if (!$child->get_prev_sibling()) {
-                $text = ltrim($text, " ");
-            }
-
-            // Determine whether the frame is at the end of its parent block.
-            // Trim trailing white space in that case
-            $child = $frame;
-            $p = $frame->get_parent();
-            while (!$p->is_block() && !$child->get_next_sibling()) {
-                $child = $p;
-                $p = $p->get_parent();
-            }
-
-            if (!$child->get_next_sibling()) {
-                $text = rtrim($text, " ");
-            }
-        }
-
-        // Strip soft hyphens for max-line-width calculations
-        $visible_text = preg_replace('/\xAD/u', "", $text);
-
-        // Determine minimum text width
-        switch ($style->white_space) {
-            default:
-            case "normal":
-            case "pre-line":
-            case "pre-wrap":
-                // The min width is the longest word or, if breaking words is
-                // allowed with the `anywhere` keyword, the widest character.
-                // For performance reasons, we only check the first character in
-                // the latter case.
-                // https://www.w3.org/TR/css-text-3/#overflow-wrap-property
-                if ($style->overflow_wrap === "anywhere") {
-                    $char = mb_substr($visible_text, 0, 1);
-                    $min = $fontMetrics->getTextWidth($char, $font, $size, $word_spacing, $letter_spacing);
-                } else {
-                    // Find the longest word
-                    $words = preg_split(self::$_wordbreak_pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-                    $lengths = array_map(function ($chunk) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
-                        // Allow trailing white space to overflow. As in actual
-                        // layout above, only handle a single space for now
-                        $sep = $chunk[1] ?? "";
-                        $word = $sep === " " ? $chunk[0] : $chunk[0] . $sep;
-                        return $fontMetrics->getTextWidth($word, $font, $size, $word_spacing, $letter_spacing);
-                    }, array_chunk($words, 2));
-                    $min = max($lengths);
-                }
-                break;
-
-            case "pre":
-                // Find the longest line
-                $lines = array_flip(preg_split("/\R/u", $visible_text));
-                array_walk($lines, function (&$chunked_text_width, $chunked_text) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
-                    $chunked_text_width = $fontMetrics->getTextWidth($chunked_text, $font, $size, $word_spacing, $letter_spacing);
-                });
-                arsort($lines);
-                $min = reset($lines);
-                break;
-
-            case "nowrap":
-                $min = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
-                break;
-        }
-
-        // Determine maximum text width
-        switch ($style->white_space) {
-            default:
-            case "normal":
-                $max = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
-                break;
-
-            case "pre-line":
-            case "pre-wrap":
-                // Find the longest line
-                $lines = array_flip(preg_split("/\R/u", $visible_text));
-                array_walk($lines, function (&$chunked_text_width, $chunked_text) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
-                    $chunked_text_width = $fontMetrics->getTextWidth($chunked_text, $font, $size, $word_spacing, $letter_spacing);
-                });
-                arsort($lines);
-                $max = reset($lines);
-                break;
-
-            case "pre":
-            case "nowrap":
-                $max = $min;
-                break;
-        }
-
-        // Account for margins, borders, and padding
-        $dims = [
-            $style->padding_left,
-            $style->padding_right,
-            $style->border_left_width,
-            $style->border_right_width,
-            $style->margin_left,
-            $style->margin_right
-        ];
-
-        // The containing block is not defined yet, treat percentages as 0
-        $delta = (float) $style->length_in_pt($dims, 0);
-        $min += $delta;
-        $max += $delta;
-
-        return [$min, $max, "min" => $min, "max" => $max];
-    }
-
-    /**
-     * @param FontMetrics $fontMetrics
-     * @return $this
-     */
-    public function setFontMetrics(FontMetrics $fontMetrics)
-    {
-        $this->fontMetrics = $fontMetrics;
-        return $this;
-    }
-
-    /**
-     * @return FontMetrics
-     */
-    public function getFontMetrics()
-    {
-        return $this->fontMetrics;
-    }
+	/**
+	 * PHP string representation of HTML entity <shy>
+	 */
+	const SOFT_HYPHEN = "\xC2\xAD";
+
+	/**
+	 * The regex splits on everything that's a separator (^\S double negative),
+	 * excluding the following non-breaking space characters:
+	 * * nbsp (\xA0)
+	 * * narrow nbsp (\x{202F})
+	 * * figure space (\x{2007})
+	 */
+	public static $_whitespace_pattern = '/([^\S\xA0\x{202F}\x{2007}]+)/u';
+
+	/**
+	 * The regex splits on everything that's a separator (^\S double negative)
+	 * plus dashes, excluding the following non-breaking space characters:
+	 * * nbsp (\xA0)
+	 * * narrow nbsp (\x{202F})
+	 * * figure space (\x{2007})
+	 */
+	public static $_wordbreak_pattern = '/([^\S\xA0\x{202F}\x{2007}\n]+|\R|\-+|\xAD+)/u';
+
+	/**
+	 * Frame for this reflower
+	 *
+	 * @var TextFrameDecorator
+	 */
+	protected $_frame;
+
+	/**
+	 * Saves trailing whitespace trimmed after a line break, so it can be
+	 * restored when needed.
+	 *
+	 * @var string|null
+	 */
+	protected $trailingWs = null;
+
+	/**
+	 * @var FontMetrics
+	 */
+	private $fontMetrics;
+
+	/**
+	 * @param TextFrameDecorator $frame
+	 * @param FontMetrics $fontMetrics
+	 */
+	public function __construct(TextFrameDecorator $frame, FontMetrics $fontMetrics)
+	{
+		parent::__construct($frame);
+		$this->setFontMetrics($fontMetrics);
+	}
+
+	/**
+	 * Apply text transform and white-space collapse according to style.
+	 *
+	 * * http://www.w3.org/TR/CSS21/text.html#propdef-text-transform
+	 * * http://www.w3.org/TR/CSS21/text.html#propdef-white-space
+	 *
+	 * @param string $text
+	 * @return string
+	 */
+	protected function pre_process_text(string $text): string
+	{
+		$style = $this->_frame->get_style();
+
+		// Handle text transform
+		switch ($style->text_transform) {
+			case "capitalize":
+				$text = Helpers::mb_ucwords($text);
+				break;
+			case "uppercase":
+				$text = mb_convert_case($text, MB_CASE_UPPER);
+				break;
+			case "lowercase":
+				$text = mb_convert_case($text, MB_CASE_LOWER);
+				break;
+			default:
+				break;
+		}
+
+		// Handle white-space collapse
+		switch ($style->white_space) {
+			default:
+			case "normal":
+			case "nowrap":
+				$text = preg_replace(self::$_whitespace_pattern, " ", $text) ?? "";
+				break;
+
+			case "pre-line":
+				// Collapse white space except for line breaks
+				$text = preg_replace('/([^\S\xA0\x{202F}\x{2007}\n]+)/u', " ", $text) ?? "";
+				break;
+
+			case "pre":
+			case "pre-wrap":
+				break;
+
+		}
+
+		return $text;
+	}
+
+	/**
+	 * @param string              $text
+	 * @param BlockFrameDecorator $block
+	 * @param bool                $nowrap
+	 *
+	 * @return bool|int
+	 */
+	protected function line_break(string $text, BlockFrameDecorator $block, bool $nowrap = false)
+	{
+		$fontMetrics = $this->getFontMetrics();
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$font = $style->font_family;
+		$size = $style->font_size;
+		$word_spacing = $style->word_spacing;
+		$letter_spacing = $style->letter_spacing;
+
+		// Determine the available width
+		$current_line = $block->get_current_line_box();
+		$line_width = $frame->get_containing_block("w");
+		$current_line_width = $current_line->left + $current_line->w + $current_line->right;
+		$available_width = $line_width - $current_line_width;
+
+		// Determine the frame width including margin, padding & border
+		$visible_text = preg_replace('/\xAD/u', "", $text);
+		$text_width = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
+		$mbp_width = (float) $style->length_in_pt([
+			$style->margin_left,
+			$style->border_left_width,
+			$style->padding_left,
+			$style->padding_right,
+			$style->border_right_width,
+			$style->margin_right
+		], $line_width);
+		$frame_width = $text_width + $mbp_width;
+
+		if (Helpers::lengthLessOrEqual($frame_width, $available_width)) {
+			return false;
+		}
+
+		if ($nowrap) {
+			return $current_line_width == 0 ? false : 0;
+		}
+
+		// Split the text into words
+		$words = preg_split(self::$_wordbreak_pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$wc = count($words);
+
+		// Determine the split point
+		$width = 0.0;
+		$str = "";
+
+		$space_width = $fontMetrics->getTextWidth(" ", $font, $size, $word_spacing, $letter_spacing);
+		$shy_width = $fontMetrics->getTextWidth(self::SOFT_HYPHEN, $font, $size);
+
+		// @todo support <wbr>
+		for ($i = 0; $i < $wc; $i += 2) {
+			// Allow trailing white space to overflow. White space is always
+			// collapsed to the standard space character currently, so only
+			// handle that for now
+			$sep = $words[$i + 1] ?? "";
+			$word = $sep === " " ? $words[$i] : $words[$i] . $sep;
+			$word_width = $fontMetrics->getTextWidth($word, $font, $size, $word_spacing, $letter_spacing);
+			$used_width = $width + $word_width + $mbp_width;
+
+			if (Helpers::lengthGreater($used_width, $available_width)) {
+				// If the previous split happened by soft hyphen, we have to
+				// append its width again because the last hyphen of a line
+				// won't be removed
+				if (isset($words[$i - 1]) && self::SOFT_HYPHEN === $words[$i - 1]) {
+					$width += $shy_width;
+				}
+				break;
+			}
+
+			// If the word is splitted by soft hyphen, but no line break is needed
+			// we have to reduce the width. But the str is not modified, otherwise
+			// the wrong offset is calculated at the end of this method.
+			if ($sep === self::SOFT_HYPHEN) {
+				$width += $word_width - $shy_width;
+				$str .= $word;
+			} elseif ($sep === " ") {
+				$width += $word_width + $space_width;
+				$str .= $word . $sep;
+			} else {
+				$width += $word_width;
+				$str .= $word;
+			}
+		}
+
+		// The first word has overflowed. Force it onto the line, or as many
+		// characters as fit if breaking words is allowed
+		if ($current_line_width == 0 && $width === 0.0) {
+			if ($sep === " ") {
+				$word .= $sep;
+			}
+
+			// https://www.w3.org/TR/css-text-3/#overflow-wrap-property
+			$wrap = $style->overflow_wrap;
+			$break_word = $wrap === "anywhere" || $wrap === "break-word";
+
+			if ($break_word) {
+				$s = "";
+
+				for ($j = 0; $j < mb_strlen($word); $j++) {
+					$c = mb_substr($word, $j, 1);
+					$w = $fontMetrics->getTextWidth($s . $c, $font, $size, $word_spacing, $letter_spacing);
+
+					if (Helpers::lengthGreater($w, $available_width)) {
+						break;
+					}
+
+					$s .= $c;
+				}
+
+				// Always force the first character onto the line
+				$str = $j === 0 ? $s . $c : $s;
+			} else {
+				$str = $word;
+			}
+		}
+
+		$offset = mb_strlen($str);
+		return $offset;
+	}
+
+	/**
+	 * @param string $text
+	 * @return bool|int
+	 */
+	protected function newline_break(string $text)
+	{
+		if (($i = mb_strpos($text, "\n")) === false) {
+			return false;
+		}
+
+		return $i + 1;
+	}
+
+	/**
+	 * @param BlockFrameDecorator $block
+	 * @return bool|null Whether to add a new line at the end. `null` if reflow
+	 *         should be stopped.
+	 */
+	protected function layout_line(BlockFrameDecorator $block): ?bool
+	{
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$current_line = $block->get_current_line_box();
+		$text = $frame->get_text();
+
+		// Trim leading white space if this is the first text on the line
+		if ($current_line->w === 0.0 && !$frame->is_pre()) {
+			$text = ltrim($text, " ");
+		}
+
+		// Exclude wrapped white space. This handles white space between block
+		// elements in case white space is collapsed
+		if ($text === "") {
+			$frame->set_text("");
+			$style->set_used("width", 0.0);
+			return null;
+		}
+
+		// Determine the next line break
+		// http://www.w3.org/TR/CSS21/text.html#propdef-white-space
+		$white_space = $style->white_space;
+		$nowrap = $white_space === "nowrap" || $white_space === "pre";
+
+		switch ($white_space) {
+			default:
+			case "normal":
+			case "nowrap":
+				$split = $this->line_break($text, $block, $nowrap);
+				$add_line = false;
+				break;
+
+			case "pre":
+			case "pre-line":
+			case "pre-wrap":
+				$hard_split = $this->newline_break($text);
+				$first_line = $hard_split !== false
+					? mb_substr($text, 0, $hard_split)
+					: $text;
+				$soft_split = $this->line_break($first_line, $block, $nowrap);
+
+				$split = $soft_split !== false ? $soft_split : $hard_split;
+				$add_line = $hard_split !== false;
+				break;
+		}
+
+		if ($split === 0) {
+			// Make sure to move text when floating frames leave no space to
+			// place anything onto the line
+			// TODO: Would probably be better to move just below the current
+			// floating frame instead of trying to place text in line-height
+			// increments
+			if ($current_line->h === 0.0) {
+				// Line height might be 0
+				$h = max($frame->get_margin_height(), 1.0);
+				$block->maximize_line_height($h, $frame);
+			}
+
+			// Break line and repeat layout
+			$block->add_line();
+
+			// Find the appropriate inline ancestor to split
+			$child = $frame;
+			$p = $child->get_parent();
+			while ($p instanceof InlineFrameDecorator && !$child->get_prev_sibling()) {
+				$child = $p;
+				$p = $p->get_parent();
+			}
+
+			if ($p instanceof InlineFrameDecorator) {
+				// Split parent and stop current reflow. Reflow continues
+				// via child-reflow loop of split parent
+				$p->split($child);
+				return null;
+			}
+
+			return $this->layout_line($block);
+		}
+
+		// Final split point is determined
+		if ($split !== false && $split < mb_strlen($text)) {
+			// Split the line
+			$frame->set_text($text);
+			$frame->split_text($split);
+			$add_line = true;
+
+			// Remove inner soft hyphens
+			$t = $frame->get_text();
+			$shyPosition = mb_strpos($t, self::SOFT_HYPHEN);
+			if (false !== $shyPosition && $shyPosition < mb_strlen($t) - 1) {
+				$t = str_replace(self::SOFT_HYPHEN, "", mb_substr($t, 0, -1)) . mb_substr($t, -1);
+				$frame->set_text($t);
+			}
+		} else {
+			// No split required
+			// Remove soft hyphens
+			$text = str_replace(self::SOFT_HYPHEN, "", $text);
+			$frame->set_text($text);
+		}
+
+		// Set our new width
+		$frame->recalculate_width();
+
+		return $add_line;
+	}
+
+	/**
+	 * @param BlockFrameDecorator|null $block
+	 */
+	function reflow(BlockFrameDecorator $block = null)
+	{
+		$frame = $this->_frame;
+		$page = $frame->get_root();
+		$page->check_forced_page_break($frame);
+
+		if ($page->is_full()) {
+			return;
+		}
+
+		// Determine the text height
+		$style = $frame->get_style();
+		$size = $style->font_size;
+		$font = $style->font_family;
+		$font_height = $this->getFontMetrics()->getFontHeight($font, $size);
+		$style->set_used("height", $font_height);
+
+		// Handle text transform and white space
+		$text = $this->pre_process_text($frame->get_text());
+		$frame->set_text($text);
+
+		$add_line = $this->layout_line($block);
+
+		if ($add_line === null) {
+			return;
+		}
+
+		$frame->position();
+
+		if ($block) {
+			$line = $block->add_frame_to_line($frame);
+			$trimmed = trim($frame->get_text());
+
+			// Split the text into words (used to determine spacing between
+			// words on justified lines)
+			if ($trimmed !== "") {
+				$words = preg_split(self::$_whitespace_pattern, $trimmed);
+				$line->wc += count($words);
+			}
+
+			if ($add_line) {
+				$block->add_line();
+			}
+		}
+	}
+
+	/**
+	 * Trim trailing white space from the frame text.
+	 */
+	public function trim_trailing_ws(): void
+	{
+		$frame = $this->_frame;
+		$text = $frame->get_text();
+		$trailing = mb_substr($text, -1);
+
+		// White space is always collapsed to the standard space character
+		// currently, so only handle that for now
+		if ($trailing === " ") {
+			$this->trailingWs = $trailing;
+			$frame->set_text(mb_substr($text, 0, -1));
+			$frame->recalculate_width();
+		}
+	}
+
+	public function reset(): void
+	{
+		parent::reset();
+
+		// Restore trimmed trailing white space, as the frame will go through
+		// another reflow and line breaks might be different after a split
+		if ($this->trailingWs !== null) {
+			$text = $this->_frame->get_text();
+			$this->_frame->set_text($text . $this->trailingWs);
+			$this->trailingWs = null;
+		}
+	}
+
+	//........................................................................
+
+	public function get_min_max_width(): array
+	{
+		$fontMetrics = $this->getFontMetrics();
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$text = $frame->get_text();
+		$font = $style->font_family;
+		$size = $style->font_size;
+		$word_spacing = $style->word_spacing;
+		$letter_spacing = $style->letter_spacing;
+
+		// Handle text transform and white space
+		$text = $this->pre_process_text($frame->get_text());
+
+		if (!$frame->is_pre()) {
+			// Determine whether the frame is at the start of its parent block.
+			// Trim leading white space in that case
+			$child = $frame;
+			$p = $frame->get_parent();
+			while (!$p->is_block() && !$child->get_prev_sibling()) {
+				$child = $p;
+				$p = $p->get_parent();
+			}
+
+			if (!$child->get_prev_sibling()) {
+				$text = ltrim($text, " ");
+			}
+
+			// Determine whether the frame is at the end of its parent block.
+			// Trim trailing white space in that case
+			$child = $frame;
+			$p = $frame->get_parent();
+			while (!$p->is_block() && !$child->get_next_sibling()) {
+				$child = $p;
+				$p = $p->get_parent();
+			}
+
+			if (!$child->get_next_sibling()) {
+				$text = rtrim($text, " ");
+			}
+		}
+
+		// Strip soft hyphens for max-line-width calculations
+		$visible_text = preg_replace('/\xAD/u', "", $text);
+
+		// Determine minimum text width
+		switch ($style->white_space) {
+			default:
+			case "normal":
+			case "pre-line":
+			case "pre-wrap":
+				// The min width is the longest word or, if breaking words is
+				// allowed with the `anywhere` keyword, the widest character.
+				// For performance reasons, we only check the first character in
+				// the latter case.
+				// https://www.w3.org/TR/css-text-3/#overflow-wrap-property
+				if ($style->overflow_wrap === "anywhere") {
+					$char = mb_substr($visible_text, 0, 1);
+					$min = $fontMetrics->getTextWidth($char, $font, $size, $word_spacing, $letter_spacing);
+				} else {
+					// Find the longest word
+					$words = preg_split(self::$_wordbreak_pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+					$lengths = array_map(function ($chunk) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
+						// Allow trailing white space to overflow. As in actual
+						// layout above, only handle a single space for now
+						$sep = $chunk[1] ?? "";
+						$word = $sep === " " ? $chunk[0] : $chunk[0] . $sep;
+						return $fontMetrics->getTextWidth($word, $font, $size, $word_spacing, $letter_spacing);
+					}, array_chunk($words, 2));
+					$min = max($lengths);
+				}
+				break;
+
+			case "pre":
+				// Find the longest line
+				$lines = array_flip(preg_split("/\R/u", $visible_text));
+				array_walk($lines, function (&$chunked_text_width, $chunked_text) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
+					$chunked_text_width = $fontMetrics->getTextWidth($chunked_text, $font, $size, $word_spacing, $letter_spacing);
+				});
+				arsort($lines);
+				$min = reset($lines);
+				break;
+
+			case "nowrap":
+				$min = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
+				break;
+		}
+
+		// Determine maximum text width
+		switch ($style->white_space) {
+			default:
+			case "normal":
+				$max = $fontMetrics->getTextWidth($visible_text, $font, $size, $word_spacing, $letter_spacing);
+				break;
+
+			case "pre-line":
+			case "pre-wrap":
+				// Find the longest line
+				$lines = array_flip(preg_split("/\R/u", $visible_text));
+				array_walk($lines, function (&$chunked_text_width, $chunked_text) use ($fontMetrics, $font, $size, $word_spacing, $letter_spacing) {
+					$chunked_text_width = $fontMetrics->getTextWidth($chunked_text, $font, $size, $word_spacing, $letter_spacing);
+				});
+				arsort($lines);
+				$max = reset($lines);
+				break;
+
+			case "pre":
+			case "nowrap":
+				$max = $min;
+				break;
+		}
+
+		// Account for margins, borders, and padding
+		$dims = [
+			$style->padding_left,
+			$style->padding_right,
+			$style->border_left_width,
+			$style->border_right_width,
+			$style->margin_left,
+			$style->margin_right
+		];
+
+		// The containing block is not defined yet, treat percentages as 0
+		$delta = (float) $style->length_in_pt($dims, 0);
+		$min += $delta;
+		$max += $delta;
+
+		return [$min, $max, "min" => $min, "max" => $max];
+	}
+
+	/**
+	 * @param FontMetrics $fontMetrics
+	 * @return $this
+	 */
+	public function setFontMetrics(FontMetrics $fontMetrics)
+	{
+		$this->fontMetrics = $fontMetrics;
+		return $this;
+	}
+
+	/**
+	 * @return FontMetrics
+	 */
+	public function getFontMetrics()
+	{
+		return $this->fontMetrics;
+	}
 }

vendor/dompdf/dompdf/src/FrameReflower/Block.php

Indentation +924 added lines, -924 removed lines

@@ -22,928 +22,928 @@
  */
 class Block extends AbstractFrameReflower
 {
-    // Minimum line width to justify, as fraction of available width
-    const MIN_JUSTIFY_WIDTH = 0.80;
-
-    /**
-     * Frame for this reflower
-     *
-     * @var BlockFrameDecorator
-     */
-    protected $_frame;
-
-    function __construct(BlockFrameDecorator $frame)
-    {
-        parent::__construct($frame);
-    }
-
-    /**
-     *  Calculate the ideal used value for the width property as per:
-     *  http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
-     *
-     * @param float $width
-     *
-     * @return array
-     */
-    protected function _calculate_width($width)
-    {
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $absolute = $frame->is_absolute();
-
-        $cb = $frame->get_containing_block();
-        $w = $cb["w"];
-
-        $rm = $style->length_in_pt($style->margin_right, $w);
-        $lm = $style->length_in_pt($style->margin_left, $w);
-
-        $left = $style->length_in_pt($style->left, $w);
-        $right = $style->length_in_pt($style->right, $w);
-
-        // Handle 'auto' values
-        $dims = [$style->border_left_width,
-            $style->border_right_width,
-            $style->padding_left,
-            $style->padding_right,
-            $width !== "auto" ? $width : 0,
-            $rm !== "auto" ? $rm : 0,
-            $lm !== "auto" ? $lm : 0];
-
-        // absolutely positioned boxes take the 'left' and 'right' properties into account
-        if ($absolute) {
-            $dims[] = $left !== "auto" ? $left : 0;
-            $dims[] = $right !== "auto" ? $right : 0;
-        }
-
-        $sum = (float)$style->length_in_pt($dims, $w);
-
-        // Compare to the containing block
-        $diff = $w - $sum;
-
-        if ($absolute) {
-            // Absolutely positioned
-            // http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width
-
-            if ($width === "auto" || $left === "auto" || $right === "auto") {
-                // "all of the three are 'auto'" logic + otherwise case
-                if ($lm === "auto") {
-                    $lm = 0;
-                }
-                if ($rm === "auto") {
-                    $rm = 0;
-                }
-
-                $block_parent = $frame->find_block_parent();
-                $parent_content = $block_parent->get_content_box();
-                $line = $block_parent->get_current_line_box();
-
-                // TODO: This is the in-flow inline position. Use the in-flow
-                // block position if the original display type is block-level
-                $inflow_x = $parent_content["x"] - $cb["x"] + $line->left + $line->w;
-
-                if ($width === "auto" && $left === "auto" && $right === "auto") {
-                    // rule 3, per instruction preceding rule set
-                    // shrink-to-fit width
-                    $left = $inflow_x;
-                    [$min, $max] = $this->get_min_max_child_width();
-                    $width = min(max($min, $diff - $left), $max);
-                    $right = $diff - $left - $width;
-                } elseif ($width === "auto" && $left === "auto") {
-                    // rule 1
-                    // shrink-to-fit width
-                    [$min, $max] = $this->get_min_max_child_width();
-                    $width = min(max($min, $diff), $max);
-                    $left = $diff - $width;
-                } elseif ($width === "auto" && $right === "auto") {
-                    // rule 3
-                    // shrink-to-fit width
-                    [$min, $max] = $this->get_min_max_child_width();
-                    $width = min(max($min, $diff), $max);
-                    $right = $diff - $width;
-                } elseif ($left === "auto" && $right === "auto") {
-                    // rule 2
-                    $left = $inflow_x;
-                    $right = $diff - $left;
-                } elseif ($left === "auto") {
-                    // rule 4
-                    $left = $diff;
-                } elseif ($width === "auto") {
-                    // rule 5
-                    $width = max($diff, 0);
-                } else {
-                    // $right === "auto"
-                    // rule 6
-                    $right = $diff;
-                }
-            } else {
-                // "none of the three are 'auto'" logic described in paragraph preceding the rules
-                if ($diff >= 0) {
-                    if ($lm === "auto" && $rm === "auto") {
-                        $lm = $rm = $diff / 2;
-                    } elseif ($lm === "auto") {
-                        $lm = $diff;
-                    } elseif ($rm === "auto") {
-                        $rm = $diff;
-                    }
-                } else {
-                    // over-constrained, solve for right
-                    $right = $right + $diff;
-
-                    if ($lm === "auto") {
-                        $lm = 0;
-                    }
-                    if ($rm === "auto") {
-                        $rm = 0;
-                    }
-                }
-            }
-        } elseif ($style->float !== "none" || $style->display === "inline-block") {
-            // Shrink-to-fit width for float and inline block
-            // https://www.w3.org/TR/CSS21/visudet.html#float-width
-            // https://www.w3.org/TR/CSS21/visudet.html#inlineblock-width
-
-            if ($width === "auto") {
-                [$min, $max] = $this->get_min_max_child_width();
-                $width = min(max($min, $diff), $max);
-            }
-            if ($lm === "auto") {
-                $lm = 0;
-            }
-            if ($rm === "auto") {
-                $rm = 0;
-            }
-        } else {
-            // Block-level, normal flow
-            // https://www.w3.org/TR/CSS21/visudet.html#blockwidth
-
-            if ($diff >= 0) {
-                // Find auto properties and get them to take up the slack
-                if ($width === "auto") {
-                    $width = $diff;
-
-                    if ($lm === "auto") {
-                        $lm = 0;
-                    }
-                    if ($rm === "auto") {
-                        $rm = 0;
-                    }
-                } elseif ($lm === "auto" && $rm === "auto") {
-                    $lm = $rm = $diff / 2;
-                } elseif ($lm === "auto") {
-                    $lm = $diff;
-                } elseif ($rm === "auto") {
-                    $rm = $diff;
-                }
-            } else {
-                // We are over constrained--set margin-right to the difference
-                $rm = (float) $rm + $diff;
-
-                if ($width === "auto") {
-                    $width = 0;
-                }
-                if ($lm === "auto") {
-                    $lm = 0;
-                }
-            }
-        }
-
-        return [
-            "width" => $width,
-            "margin_left" => $lm,
-            "margin_right" => $rm,
-            "left" => $left,
-            "right" => $right,
-        ];
-    }
-
-    /**
-     * Call the above function, but resolve max/min widths
-     *
-     * @throws Exception
-     * @return array
-     */
-    protected function _calculate_restricted_width()
-    {
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $cb = $frame->get_containing_block();
-
-        if (!isset($cb["w"])) {
-            throw new Exception("Box property calculation requires containing block width");
-        }
-
-        $width = $style->length_in_pt($style->width, $cb["w"]);
-
-        $values = $this->_calculate_width($width);
-        $margin_left = $values["margin_left"];
-        $margin_right = $values["margin_right"];
-        $width = $values["width"];
-        $left = $values["left"];
-        $right = $values["right"];
-
-        // Handle min/max width
-        // https://www.w3.org/TR/CSS21/visudet.html#min-max-widths
-        $min_width = $this->resolve_min_width($cb["w"]);
-        $max_width = $this->resolve_max_width($cb["w"]);
-
-        if ($width > $max_width) {
-            $values = $this->_calculate_width($max_width);
-            $margin_left = $values["margin_left"];
-            $margin_right = $values["margin_right"];
-            $width = $values["width"];
-            $left = $values["left"];
-            $right = $values["right"];
-        }
-
-        if ($width < $min_width) {
-            $values = $this->_calculate_width($min_width);
-            $margin_left = $values["margin_left"];
-            $margin_right = $values["margin_right"];
-            $width = $values["width"];
-            $left = $values["left"];
-            $right = $values["right"];
-        }
-
-        return [$width, $margin_left, $margin_right, $left, $right];
-    }
-
-    /**
-     * Determine the unrestricted height of content within the block
-     * not by adding each line's height, but by getting the last line's position.
-     * This because lines could have been pushed lower by a clearing element.
-     *
-     * @return float
-     */
-    protected function _calculate_content_height()
-    {
-        $height = 0;
-        $lines = $this->_frame->get_line_boxes();
-        if (count($lines) > 0) {
-            $last_line = end($lines);
-            $content_box = $this->_frame->get_content_box();
-            $height = $last_line->y + $last_line->h - $content_box["y"];
-        }
-        return $height;
-    }
-
-    /**
-     * Determine the frame's restricted height
-     *
-     * @return array
-     */
-    protected function _calculate_restricted_height()
-    {
-        $frame = $this->_frame;
-        $style = $frame->get_style();
-        $content_height = $this->_calculate_content_height();
-        $cb = $frame->get_containing_block();
-
-        $height = $style->length_in_pt($style->height, $cb["h"]);
-        $margin_top = $style->length_in_pt($style->margin_top, $cb["w"]);
-        $margin_bottom = $style->length_in_pt($style->margin_bottom, $cb["w"]);
-
-        $top = $style->length_in_pt($style->top, $cb["h"]);
-        $bottom = $style->length_in_pt($style->bottom, $cb["h"]);
-
-        if ($frame->is_absolute()) {
-            // Absolutely positioned
-            // http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
-
-            $h_dims = [
-                $top !== "auto" ? $top : 0,
-                $height !== "auto" ? $height : 0,
-                $bottom !== "auto" ? $bottom : 0
-            ];
-            $w_dims = [
-                $style->margin_top !== "auto" ? $style->margin_top : 0,
-                $style->padding_top,
-                $style->border_top_width,
-                $style->border_bottom_width,
-                $style->padding_bottom,
-                $style->margin_bottom !== "auto" ? $style->margin_bottom : 0
-            ];
-
-            $sum = (float)$style->length_in_pt($h_dims, $cb["h"])
-                + (float)$style->length_in_pt($w_dims, $cb["w"]);
-
-            $diff = $cb["h"] - $sum;
-
-            if ($height === "auto" || $top === "auto" || $bottom === "auto") {
-                // "all of the three are 'auto'" logic + otherwise case
-                if ($margin_top === "auto") {
-                    $margin_top = 0;
-                }
-                if ($margin_bottom === "auto") {
-                    $margin_bottom = 0;
-                }
-
-                $block_parent = $frame->find_block_parent();
-                $current_line = $block_parent->get_current_line_box();
-
-                // TODO: This is the in-flow inline position. Use the in-flow
-                // block position if the original display type is block-level
-                $inflow_y = $current_line->y - $cb["y"];
-
-                if ($height === "auto" && $top === "auto" && $bottom === "auto") {
-                    // rule 3, per instruction preceding rule set
-                    $top = $inflow_y;
-                    $height = $content_height;
-                    $bottom = $diff - $top - $height;
-                } elseif ($height === "auto" && $top === "auto") {
-                    // rule 1
-                    $height = $content_height;
-                    $top = $diff - $height;
-                } elseif ($height === "auto" && $bottom === "auto") {
-                    // rule 3
-                    $height = $content_height;
-                    $bottom = $diff - $height;
-                } elseif ($top === "auto" && $bottom === "auto") {
-                    // rule 2
-                    $top = $inflow_y;
-                    $bottom = $diff - $top;
-                } elseif ($top === "auto") {
-                    // rule 4
-                    $top = $diff;
-                } elseif ($height === "auto") {
-                    // rule 5
-                    $height = max($diff, 0);
-                } else {
-                    // $bottom === "auto"
-                    // rule 6
-                    $bottom = $diff;
-                }
-            } else {
-                // "none of the three are 'auto'" logic described in paragraph preceding the rules
-                if ($diff >= 0) {
-                    if ($margin_top === "auto" && $margin_bottom === "auto") {
-                        $margin_top = $margin_bottom = $diff / 2;
-                    } elseif ($margin_top === "auto") {
-                        $margin_top = $diff;
-                    } elseif ($margin_bottom === "auto") {
-                        $margin_bottom = $diff;
-                    }
-                } else {
-                    // over-constrained, solve for bottom
-                    $bottom = $bottom + $diff;
-
-                    if ($margin_top === "auto") {
-                        $margin_top = 0;
-                    }
-                    if ($margin_bottom === "auto") {
-                        $margin_bottom = 0;
-                    }
-                }
-            }
-        } else {
-            // https://www.w3.org/TR/CSS21/visudet.html#normal-block
-            // https://www.w3.org/TR/CSS21/visudet.html#block-root-margin
-
-            if ($height === "auto") {
-                $height = $content_height;
-            }
-            if ($margin_top === "auto") {
-                $margin_top = 0;
-            }
-            if ($margin_bottom === "auto") {
-                $margin_bottom = 0;
-            }
-
-            // Handle min/max height
-            // https://www.w3.org/TR/CSS21/visudet.html#min-max-heights
-            $min_height = $this->resolve_min_height($cb["h"]);
-            $max_height = $this->resolve_max_height($cb["h"]);
-            $height = Helpers::clamp($height, $min_height, $max_height);
-        }
-
-        // TODO: Need to also take min/max height into account for absolute
-        // positioning, using similar logic to the `_calculate_width`/
-        // `calculate_restricted_width` split above. The non-absolute case
-        // can simply clamp height within min/max, as margins and offsets are
-        // not affected
-
-        return [$height, $margin_top, $margin_bottom, $top, $bottom];
-    }
-
-    /**
-     * Adjust the justification of each of our lines.
-     * http://www.w3.org/TR/CSS21/text.html#propdef-text-align
-     */
-    protected function _text_align()
-    {
-        $style = $this->_frame->get_style();
-        $w = $this->_frame->get_containing_block("w");
-        $width = (float)$style->length_in_pt($style->width, $w);
-        $text_indent = (float)$style->length_in_pt($style->text_indent, $w);
-
-        switch ($style->text_align) {
-            default:
-            case "left":
-                foreach ($this->_frame->get_line_boxes() as $line) {
-                    if (!$line->inline) {
-                        continue;
-                    }
-
-                    $line->trim_trailing_ws();
-
-                    if ($line->left) {
-                        foreach ($line->frames_to_align() as $frame) {
-                            $frame->move($line->left, 0);
-                        }
-                    }
-                }
-                break;
-
-            case "right":
-                foreach ($this->_frame->get_line_boxes() as $i => $line) {
-                    if (!$line->inline) {
-                        continue;
-                    }
-
-                    $line->trim_trailing_ws();
-
-                    $indent = $i === 0 ? $text_indent : 0;
-                    $dx = $width - $line->w - $line->right - $indent;
-
-                    foreach ($line->frames_to_align() as $frame) {
-                        $frame->move($dx, 0);
-                    }
-                }
-                break;
-
-            case "justify":
-                // We justify all lines except the last one, unless the frame
-                // has been split, in which case the actual last line is part of
-                // the split-off frame
-                $lines = $this->_frame->get_line_boxes();
-                $last_line_index = $this->_frame->is_split ? null : count($lines) - 1;
-
-                foreach ($lines as $i => $line) {
-                    if (!$line->inline) {
-                        continue;
-                    }
-
-                    $line->trim_trailing_ws();
-
-                    if ($line->left) {
-                        foreach ($line->frames_to_align() as $frame) {
-                            $frame->move($line->left, 0);
-                        }
-                    }
-
-                    if ($line->br || $i === $last_line_index) {
-                        continue;
-                    }
-
-                    $frames = $line->get_frames();
-                    $other_frame_count = 0;
-
-                    foreach ($frames as $frame) {
-                        if (!($frame instanceof TextFrameDecorator)) {
-                            $other_frame_count++;
-                        }
-                    }
-
-                    $word_count = $line->wc + $other_frame_count;
-
-                    // Set the spacing for each child
-                    if ($word_count > 1) {
-                        $indent = $i === 0 ? $text_indent : 0;
-                        $spacing = ($width - $line->get_width() - $indent) / ($word_count - 1);
-                    } else {
-                        $spacing = 0;
-                    }
-
-                    $dx = 0;
-                    foreach ($frames as $frame) {
-                        if ($frame instanceof TextFrameDecorator) {
-                            $text = $frame->get_text();
-                            $spaces = mb_substr_count($text, " ");
-
-                            $frame->move($dx, 0);
-                            $frame->set_text_spacing($spacing);
-
-                            $dx += $spaces * $spacing;
-                        } else {
-                            $frame->move($dx, 0);
-                        }
-                    }
-
-                    // The line (should) now occupy the entire width
-                    $line->w = $width;
-                }
-                break;
-
-            case "center":
-            case "centre":
-                foreach ($this->_frame->get_line_boxes() as $i => $line) {
-                    if (!$line->inline) {
-                        continue;
-                    }
-
-                    $line->trim_trailing_ws();
-
-                    $indent = $i === 0 ? $text_indent : 0;
-                    $dx = ($width + $line->left - $line->w - $line->right - $indent) / 2;
-
-                    foreach ($line->frames_to_align() as $frame) {
-                        $frame->move($dx, 0);
-                    }
-                }
-                break;
-        }
-    }
-
-    /**
-     * Align inline children vertically.
-     * Aligns each child vertically after each line is reflowed
-     */
-    function vertical_align()
-    {
-        $fontMetrics = $this->get_dompdf()->getFontMetrics();
-
-        foreach ($this->_frame->get_line_boxes() as $line) {
-            $height = $line->h;
-
-            // Move all markers to the top of the line box
-            foreach ($line->get_list_markers() as $marker) {
-                $x = $marker->get_position("x");
-                $marker->set_position($x, $line->y);
-            }
-
-            foreach ($line->frames_to_align() as $frame) {
-                $style = $frame->get_style();
-                $isInlineBlock = $style->display !== "inline"
-                    && $style->display !== "-dompdf-list-bullet";
-
-                $baseline = $fontMetrics->getFontBaseline($style->font_family, $style->font_size);
-                $y_offset = 0;
-
-                //FIXME: The 0.8 ratio applied to the height is arbitrary (used to accommodate descenders?)
-                if ($isInlineBlock) {
-                    // Workaround: Skip vertical alignment if the frame is the
-                    // only one one the line, excluding empty text frames, which
-                    // may be the result of trailing white space
-                    // FIXME: This special case should be removed once vertical
-                    // alignment is properly fixed
-                    $skip = true;
-
-                    foreach ($line->get_frames() as $other) {
-                        if ($other !== $frame
-                            && !($other->is_text_node() && $other->get_node()->nodeValue === "")
-                         ) {
-                            $skip = false;
-                            break;
-                        }
-                    }
-
-                    if ($skip) {
-                        continue;
-                    }
-
-                    $marginHeight = $frame->get_margin_height();
-                    $imageHeightDiff = $height * 0.8 - $marginHeight;
-
-                    $align = $frame->get_style()->vertical_align;
-                    if (in_array($align, Style::VERTICAL_ALIGN_KEYWORDS, true)) {
-                        switch ($align) {
-                            case "middle":
-                                $y_offset = $imageHeightDiff / 2;
-                                break;
-
-                            case "sub":
-                                $y_offset = 0.3 * $height + $imageHeightDiff;
-                                break;
-
-                            case "super":
-                                $y_offset = -0.2 * $height + $imageHeightDiff;
-                                break;
-
-                            case "text-top": // FIXME: this should be the height of the frame minus the height of the text
-                                $y_offset = $height - $style->line_height;
-                                break;
-
-                            case "top":
-                                break;
-
-                            case "text-bottom": // FIXME: align bottom of image with the descender?
-                            case "bottom":
-                                $y_offset = 0.3 * $height + $imageHeightDiff;
-                                break;
-
-                            case "baseline":
-                            default:
-                                $y_offset = $imageHeightDiff;
-                                break;
-                        }
-                    } else {
-                        $y_offset = $baseline - (float)$style->length_in_pt($align, $style->font_size) - $marginHeight;
-                    }
-                } else {
-                    $parent = $frame->get_parent();
-                    if ($parent instanceof TableCellFrameDecorator) {
-                        $align = "baseline";
-                    } else {
-                        $align = $parent->get_style()->vertical_align;
-                    }
-                    if (in_array($align, Style::VERTICAL_ALIGN_KEYWORDS, true)) {
-                        switch ($align) {
-                            case "middle":
-                                $y_offset = ($height * 0.8 - $baseline) / 2;
-                                break;
-
-                            case "sub":
-                                $y_offset = $height * 0.8 - $baseline * 0.5;
-                                break;
-
-                            case "super":
-                                $y_offset = $height * 0.8 - $baseline * 1.4;
-                                break;
-
-                            case "text-top":
-                            case "top": // Not strictly accurate, but good enough for now
-                                break;
-
-                            case "text-bottom":
-                            case "bottom":
-                                $y_offset = $height * 0.8 - $baseline;
-                                break;
-
-                            case "baseline":
-                            default:
-                                $y_offset = $height * 0.8 - $baseline;
-                                break;
-                        }
-                    } else {
-                        $y_offset = $height * 0.8 - $baseline - (float)$style->length_in_pt($align, $style->font_size);
-                    }
-                }
-
-                if ($y_offset !== 0) {
-                    $frame->move(0, $y_offset);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param AbstractFrameDecorator $child
-     */
-    function process_clear(AbstractFrameDecorator $child)
-    {
-        $child_style = $child->get_style();
-        $root = $this->_frame->get_root();
-
-        // Handle "clear"
-        if ($child_style->clear !== "none") {
-            //TODO: this is a WIP for handling clear/float frames that are in between inline frames
-            if ($child->get_prev_sibling() !== null) {
-                $this->_frame->add_line();
-            }
-            if ($child_style->float !== "none" && $child->get_next_sibling()) {
-                $this->_frame->set_current_line_number($this->_frame->get_current_line_number() - 1);
-            }
-
-            $lowest_y = $root->get_lowest_float_offset($child);
-
-            // If a float is still applying, we handle it
-            if ($lowest_y) {
-                if ($child->is_in_flow()) {
-                    $line_box = $this->_frame->get_current_line_box();
-                    $line_box->y = $lowest_y + $child->get_margin_height();
-                    $line_box->left = 0;
-                    $line_box->right = 0;
-                }
-
-                $child->move(0, $lowest_y - $child->get_position("y"));
-            }
-        }
-    }
-
-    /**
-     * @param AbstractFrameDecorator $child
-     * @param float $cb_x
-     * @param float $cb_w
-     */
-    function process_float(AbstractFrameDecorator $child, $cb_x, $cb_w)
-    {
-        $child_style = $child->get_style();
-        $root = $this->_frame->get_root();
-
-        // Handle "float"
-        if ($child_style->float !== "none") {
-            $root->add_floating_frame($child);
-
-            // Remove next frame's beginning whitespace
-            $next = $child->get_next_sibling();
-            if ($next && $next instanceof TextFrameDecorator) {
-                $next->set_text(ltrim($next->get_text()));
-            }
-
-            $line_box = $this->_frame->get_current_line_box();
-            list($old_x, $old_y) = $child->get_position();
-
-            $float_x = $cb_x;
-            $float_y = $old_y;
-            $float_w = $child->get_margin_width();
-
-            if ($child_style->clear === "none") {
-                switch ($child_style->float) {
-                    case "left":
-                        $float_x += $line_box->left;
-                        break;
-                    case "right":
-                        $float_x += ($cb_w - $line_box->right - $float_w);
-                        break;
-                }
-            } else {
-                if ($child_style->float === "right") {
-                    $float_x += ($cb_w - $float_w);
-                }
-            }
-
-            if ($cb_w < $float_x + $float_w - $old_x) {
-                // TODO handle when floating elements don't fit
-            }
-
-            $line_box->get_float_offsets();
-
-            if ($child->_float_next_line) {
-                $float_y += $line_box->h;
-            }
-
-            $child->set_position($float_x, $float_y);
-            $child->move($float_x - $old_x, $float_y - $old_y, true);
-        }
-    }
-
-    /**
-     * @param BlockFrameDecorator $block
-     */
-    function reflow(BlockFrameDecorator $block = null)
-    {
-
-        // Check if a page break is forced
-        $page = $this->_frame->get_root();
-        $page->check_forced_page_break($this->_frame);
-
-        // Bail if the page is full
-        if ($page->is_full()) {
-            return;
-        }
-
-        $this->determine_absolute_containing_block();
-
-        // Counters and generated content
-        $this->_set_content();
-
-        // Inherit any dangling list markers
-        if ($block && $this->_frame->is_in_flow()) {
-            $this->_frame->inherit_dangling_markers($block);
-        }
-
-        // Collapse margins if required
-        $this->_collapse_margins();
-
-        $style = $this->_frame->get_style();
-        $cb = $this->_frame->get_containing_block();
-
-        // Determine the constraints imposed by this frame: calculate the width
-        // of the content area:
-        [$width, $margin_left, $margin_right, $left, $right] = $this->_calculate_restricted_width();
-
-        // Store the calculated properties
-        $style->set_used("width", $width);
-        $style->set_used("margin_left", $margin_left);
-        $style->set_used("margin_right", $margin_right);
-        $style->set_used("left", $left);
-        $style->set_used("right", $right);
-
-        $margin_top = $style->length_in_pt($style->margin_top, $cb["w"]);
-        $margin_bottom = $style->length_in_pt($style->margin_bottom, $cb["w"]);
-
-        $auto_top = $style->top === "auto";
-        $auto_margin_top = $margin_top === "auto";
-
-        // Update the position
-        $this->_frame->position();
-        [$x, $y] = $this->_frame->get_position();
-
-        // Adjust the first line based on the text-indent property
-        $indent = (float)$style->length_in_pt($style->text_indent, $cb["w"]);
-        $this->_frame->increase_line_width($indent);
-
-        // Determine the content edge
-        $top = (float)$style->length_in_pt([
-            $margin_top !== "auto" ? $margin_top : 0,
-            $style->border_top_width,
-            $style->padding_top
-        ], $cb["w"]);
-        $bottom = (float)$style->length_in_pt([
-            $margin_bottom !== "auto" ? $margin_bottom : 0,
-            $style->border_bottom_width,
-            $style->padding_bottom
-        ], $cb["w"]);
-
-        $cb_x = $x + (float)$margin_left + (float)$style->length_in_pt([$style->border_left_width,
-                $style->padding_left], $cb["w"]);
-
-        $cb_y = $y + $top;
-
-        $height = $style->length_in_pt($style->height, $cb["h"]);
-        if ($height === "auto") {
-            $height = ($cb["h"] + $cb["y"]) - $bottom - $cb_y;
-        }
-
-        // Set the y position of the first line in this block
-        $line_box = $this->_frame->get_current_line_box();
-        $line_box->y = $cb_y;
-        $line_box->get_float_offsets();
-
-        // Set the containing blocks and reflow each child
-        foreach ($this->_frame->get_children() as $child) {
-            $child->set_containing_block($cb_x, $cb_y, $width, $height);
-            $this->process_clear($child);
-            $child->reflow($this->_frame);
-
-            // Check for a page break before the child
-            $page->check_page_break($child);
-
-            // Don't add the child to the line if a page break has occurred
-            // before it (possibly via a descendant), in which case it has been
-            // reset, including its position
-            if ($page->is_full() && $child->get_position("x") === null) {
-                break;
-            }
-
-            $this->process_float($child, $cb_x, $width);
-        }
-
-        // Stop reflow if a page break has occurred before the frame, in which
-        // case it has been reset, including its position
-        if ($page->is_full() && $this->_frame->get_position("x") === null) {
-            return;
-        }
-
-        // Determine our height
-        [$height, $margin_top, $margin_bottom, $top, $bottom] = $this->_calculate_restricted_height();
-
-        $style->set_used("height", $height);
-        $style->set_used("margin_top", $margin_top);
-        $style->set_used("margin_bottom", $margin_bottom);
-        $style->set_used("top", $top);
-        $style->set_used("bottom", $bottom);
-
-        if ($this->_frame->is_absolute()) {
-            if ($auto_top) {
-                $this->_frame->move(0, $top);
-            }
-            if ($auto_margin_top) {
-                $this->_frame->move(0, $margin_top, true);
-            }
-        }
-
-        $this->_text_align();
-        $this->vertical_align();
-
-        // Handle relative positioning
-        foreach ($this->_frame->get_children() as $child) {
-            $this->position_relative($child);
-        }
-
-        if ($block && $this->_frame->is_in_flow()) {
-            $block->add_frame_to_line($this->_frame);
-
-            if ($this->_frame->is_block_level()) {
-                $block->add_line();
-            }
-        }
-    }
-
-    public function get_min_max_content_width(): array
-    {
-        // TODO: While the containing block is not set yet on the frame, it can
-        // already be determined in some cases due to fixed dimensions on the
-        // ancestor forming the containing block. In such cases, percentage
-        // values could be resolved here
-        $style = $this->_frame->get_style();
-        $width = $style->width;
-        $fixed_width = $width !== "auto" && !Helpers::is_percent($width);
-
-        // If the frame has a specified width, then we don't need to check
-        // its children
-        if ($fixed_width) {
-            $min = (float) $style->length_in_pt($width, 0);
-            $max = $min;
-        } else {
-            [$min, $max] = $this->get_min_max_child_width();
-        }
-
-        // Handle min/max width style properties
-        $min_width = $this->resolve_min_width(null);
-        $max_width = $this->resolve_max_width(null);
-        $min = Helpers::clamp($min, $min_width, $max_width);
-        $max = Helpers::clamp($max, $min_width, $max_width);
-
-        return [$min, $max];
-    }
+	// Minimum line width to justify, as fraction of available width
+	const MIN_JUSTIFY_WIDTH = 0.80;
+
+	/**
+	 * Frame for this reflower
+	 *
+	 * @var BlockFrameDecorator
+	 */
+	protected $_frame;
+
+	function __construct(BlockFrameDecorator $frame)
+	{
+		parent::__construct($frame);
+	}
+
+	/**
+	 *  Calculate the ideal used value for the width property as per:
+	 *  http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
+	 *
+	 * @param float $width
+	 *
+	 * @return array
+	 */
+	protected function _calculate_width($width)
+	{
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$absolute = $frame->is_absolute();
+
+		$cb = $frame->get_containing_block();
+		$w = $cb["w"];
+
+		$rm = $style->length_in_pt($style->margin_right, $w);
+		$lm = $style->length_in_pt($style->margin_left, $w);
+
+		$left = $style->length_in_pt($style->left, $w);
+		$right = $style->length_in_pt($style->right, $w);
+
+		// Handle 'auto' values
+		$dims = [$style->border_left_width,
+			$style->border_right_width,
+			$style->padding_left,
+			$style->padding_right,
+			$width !== "auto" ? $width : 0,
+			$rm !== "auto" ? $rm : 0,
+			$lm !== "auto" ? $lm : 0];
+
+		// absolutely positioned boxes take the 'left' and 'right' properties into account
+		if ($absolute) {
+			$dims[] = $left !== "auto" ? $left : 0;
+			$dims[] = $right !== "auto" ? $right : 0;
+		}
+
+		$sum = (float)$style->length_in_pt($dims, $w);
+
+		// Compare to the containing block
+		$diff = $w - $sum;
+
+		if ($absolute) {
+			// Absolutely positioned
+			// http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width
+
+			if ($width === "auto" || $left === "auto" || $right === "auto") {
+				// "all of the three are 'auto'" logic + otherwise case
+				if ($lm === "auto") {
+					$lm = 0;
+				}
+				if ($rm === "auto") {
+					$rm = 0;
+				}
+
+				$block_parent = $frame->find_block_parent();
+				$parent_content = $block_parent->get_content_box();
+				$line = $block_parent->get_current_line_box();
+
+				// TODO: This is the in-flow inline position. Use the in-flow
+				// block position if the original display type is block-level
+				$inflow_x = $parent_content["x"] - $cb["x"] + $line->left + $line->w;
+
+				if ($width === "auto" && $left === "auto" && $right === "auto") {
+					// rule 3, per instruction preceding rule set
+					// shrink-to-fit width
+					$left = $inflow_x;
+					[$min, $max] = $this->get_min_max_child_width();
+					$width = min(max($min, $diff - $left), $max);
+					$right = $diff - $left - $width;
+				} elseif ($width === "auto" && $left === "auto") {
+					// rule 1
+					// shrink-to-fit width
+					[$min, $max] = $this->get_min_max_child_width();
+					$width = min(max($min, $diff), $max);
+					$left = $diff - $width;
+				} elseif ($width === "auto" && $right === "auto") {
+					// rule 3
+					// shrink-to-fit width
+					[$min, $max] = $this->get_min_max_child_width();
+					$width = min(max($min, $diff), $max);
+					$right = $diff - $width;
+				} elseif ($left === "auto" && $right === "auto") {
+					// rule 2
+					$left = $inflow_x;
+					$right = $diff - $left;
+				} elseif ($left === "auto") {
+					// rule 4
+					$left = $diff;
+				} elseif ($width === "auto") {
+					// rule 5
+					$width = max($diff, 0);
+				} else {
+					// $right === "auto"
+					// rule 6
+					$right = $diff;
+				}
+			} else {
+				// "none of the three are 'auto'" logic described in paragraph preceding the rules
+				if ($diff >= 0) {
+					if ($lm === "auto" && $rm === "auto") {
+						$lm = $rm = $diff / 2;
+					} elseif ($lm === "auto") {
+						$lm = $diff;
+					} elseif ($rm === "auto") {
+						$rm = $diff;
+					}
+				} else {
+					// over-constrained, solve for right
+					$right = $right + $diff;
+
+					if ($lm === "auto") {
+						$lm = 0;
+					}
+					if ($rm === "auto") {
+						$rm = 0;
+					}
+				}
+			}
+		} elseif ($style->float !== "none" || $style->display === "inline-block") {
+			// Shrink-to-fit width for float and inline block
+			// https://www.w3.org/TR/CSS21/visudet.html#float-width
+			// https://www.w3.org/TR/CSS21/visudet.html#inlineblock-width
+
+			if ($width === "auto") {
+				[$min, $max] = $this->get_min_max_child_width();
+				$width = min(max($min, $diff), $max);
+			}
+			if ($lm === "auto") {
+				$lm = 0;
+			}
+			if ($rm === "auto") {
+				$rm = 0;
+			}
+		} else {
+			// Block-level, normal flow
+			// https://www.w3.org/TR/CSS21/visudet.html#blockwidth
+
+			if ($diff >= 0) {
+				// Find auto properties and get them to take up the slack
+				if ($width === "auto") {
+					$width = $diff;
+
+					if ($lm === "auto") {
+						$lm = 0;
+					}
+					if ($rm === "auto") {
+						$rm = 0;
+					}
+				} elseif ($lm === "auto" && $rm === "auto") {
+					$lm = $rm = $diff / 2;
+				} elseif ($lm === "auto") {
+					$lm = $diff;
+				} elseif ($rm === "auto") {
+					$rm = $diff;
+				}
+			} else {
+				// We are over constrained--set margin-right to the difference
+				$rm = (float) $rm + $diff;
+
+				if ($width === "auto") {
+					$width = 0;
+				}
+				if ($lm === "auto") {
+					$lm = 0;
+				}
+			}
+		}
+
+		return [
+			"width" => $width,
+			"margin_left" => $lm,
+			"margin_right" => $rm,
+			"left" => $left,
+			"right" => $right,
+		];
+	}
+
+	/**
+	 * Call the above function, but resolve max/min widths
+	 *
+	 * @throws Exception
+	 * @return array
+	 */
+	protected function _calculate_restricted_width()
+	{
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$cb = $frame->get_containing_block();
+
+		if (!isset($cb["w"])) {
+			throw new Exception("Box property calculation requires containing block width");
+		}
+
+		$width = $style->length_in_pt($style->width, $cb["w"]);
+
+		$values = $this->_calculate_width($width);
+		$margin_left = $values["margin_left"];
+		$margin_right = $values["margin_right"];
+		$width = $values["width"];
+		$left = $values["left"];
+		$right = $values["right"];
+
+		// Handle min/max width
+		// https://www.w3.org/TR/CSS21/visudet.html#min-max-widths
+		$min_width = $this->resolve_min_width($cb["w"]);
+		$max_width = $this->resolve_max_width($cb["w"]);
+
+		if ($width > $max_width) {
+			$values = $this->_calculate_width($max_width);
+			$margin_left = $values["margin_left"];
+			$margin_right = $values["margin_right"];
+			$width = $values["width"];
+			$left = $values["left"];
+			$right = $values["right"];
+		}
+
+		if ($width < $min_width) {
+			$values = $this->_calculate_width($min_width);
+			$margin_left = $values["margin_left"];
+			$margin_right = $values["margin_right"];
+			$width = $values["width"];
+			$left = $values["left"];
+			$right = $values["right"];
+		}
+
+		return [$width, $margin_left, $margin_right, $left, $right];
+	}
+
+	/**
+	 * Determine the unrestricted height of content within the block
+	 * not by adding each line's height, but by getting the last line's position.
+	 * This because lines could have been pushed lower by a clearing element.
+	 *
+	 * @return float
+	 */
+	protected function _calculate_content_height()
+	{
+		$height = 0;
+		$lines = $this->_frame->get_line_boxes();
+		if (count($lines) > 0) {
+			$last_line = end($lines);
+			$content_box = $this->_frame->get_content_box();
+			$height = $last_line->y + $last_line->h - $content_box["y"];
+		}
+		return $height;
+	}
+
+	/**
+	 * Determine the frame's restricted height
+	 *
+	 * @return array
+	 */
+	protected function _calculate_restricted_height()
+	{
+		$frame = $this->_frame;
+		$style = $frame->get_style();
+		$content_height = $this->_calculate_content_height();
+		$cb = $frame->get_containing_block();
+
+		$height = $style->length_in_pt($style->height, $cb["h"]);
+		$margin_top = $style->length_in_pt($style->margin_top, $cb["w"]);
+		$margin_bottom = $style->length_in_pt($style->margin_bottom, $cb["w"]);
+
+		$top = $style->length_in_pt($style->top, $cb["h"]);
+		$bottom = $style->length_in_pt($style->bottom, $cb["h"]);
+
+		if ($frame->is_absolute()) {
+			// Absolutely positioned
+			// http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
+
+			$h_dims = [
+				$top !== "auto" ? $top : 0,
+				$height !== "auto" ? $height : 0,
+				$bottom !== "auto" ? $bottom : 0
+			];
+			$w_dims = [
+				$style->margin_top !== "auto" ? $style->margin_top : 0,
+				$style->padding_top,
+				$style->border_top_width,
+				$style->border_bottom_width,
+				$style->padding_bottom,
+				$style->margin_bottom !== "auto" ? $style->margin_bottom : 0
+			];
+
+			$sum = (float)$style->length_in_pt($h_dims, $cb["h"])
+				+ (float)$style->length_in_pt($w_dims, $cb["w"]);
+
+			$diff = $cb["h"] - $sum;
+
+			if ($height === "auto" || $top === "auto" || $bottom === "auto") {
+				// "all of the three are 'auto'" logic + otherwise case
+				if ($margin_top === "auto") {
+					$margin_top = 0;
+				}
+				if ($margin_bottom === "auto") {
+					$margin_bottom = 0;
+				}
+
+				$block_parent = $frame->find_block_parent();
+				$current_line = $block_parent->get_current_line_box();
+
+				// TODO: This is the in-flow inline position. Use the in-flow
+				// block position if the original display type is block-level
+				$inflow_y = $current_line->y - $cb["y"];
+
+				if ($height === "auto" && $top === "auto" && $bottom === "auto") {
+					// rule 3, per instruction preceding rule set
+					$top = $inflow_y;
+					$height = $content_height;
+					$bottom = $diff - $top - $height;
+				} elseif ($height === "auto" && $top === "auto") {
+					// rule 1
+					$height = $content_height;
+					$top = $diff - $height;
+				} elseif ($height === "auto" && $bottom === "auto") {
+					// rule 3
+					$height = $content_height;
+					$bottom = $diff - $height;
+				} elseif ($top === "auto" && $bottom === "auto") {
+					// rule 2
+					$top = $inflow_y;
+					$bottom = $diff - $top;
+				} elseif ($top === "auto") {
+					// rule 4
+					$top = $diff;
+				} elseif ($height === "auto") {
+					// rule 5
+					$height = max($diff, 0);
+				} else {
+					// $bottom === "auto"
+					// rule 6
+					$bottom = $diff;
+				}
+			} else {
+				// "none of the three are 'auto'" logic described in paragraph preceding the rules
+				if ($diff >= 0) {
+					if ($margin_top === "auto" && $margin_bottom === "auto") {
+						$margin_top = $margin_bottom = $diff / 2;
+					} elseif ($margin_top === "auto") {
+						$margin_top = $diff;
+					} elseif ($margin_bottom === "auto") {
+						$margin_bottom = $diff;
+					}
+				} else {
+					// over-constrained, solve for bottom
+					$bottom = $bottom + $diff;
+
+					if ($margin_top === "auto") {
+						$margin_top = 0;
+					}
+					if ($margin_bottom === "auto") {
+						$margin_bottom = 0;
+					}
+				}
+			}
+		} else {
+			// https://www.w3.org/TR/CSS21/visudet.html#normal-block
+			// https://www.w3.org/TR/CSS21/visudet.html#block-root-margin
+
+			if ($height === "auto") {
+				$height = $content_height;
+			}
+			if ($margin_top === "auto") {
+				$margin_top = 0;
+			}
+			if ($margin_bottom === "auto") {
+				$margin_bottom = 0;
+			}
+
+			// Handle min/max height
+			// https://www.w3.org/TR/CSS21/visudet.html#min-max-heights
+			$min_height = $this->resolve_min_height($cb["h"]);
+			$max_height = $this->resolve_max_height($cb["h"]);
+			$height = Helpers::clamp($height, $min_height, $max_height);
+		}
+
+		// TODO: Need to also take min/max height into account for absolute
+		// positioning, using similar logic to the `_calculate_width`/
+		// `calculate_restricted_width` split above. The non-absolute case
+		// can simply clamp height within min/max, as margins and offsets are
+		// not affected
+
+		return [$height, $margin_top, $margin_bottom, $top, $bottom];
+	}
+
+	/**
+	 * Adjust the justification of each of our lines.
+	 * http://www.w3.org/TR/CSS21/text.html#propdef-text-align
+	 */
+	protected function _text_align()
+	{
+		$style = $this->_frame->get_style();
+		$w = $this->_frame->get_containing_block("w");
+		$width = (float)$style->length_in_pt($style->width, $w);
+		$text_indent = (float)$style->length_in_pt($style->text_indent, $w);
+
+		switch ($style->text_align) {
+			default:
+			case "left":
+				foreach ($this->_frame->get_line_boxes() as $line) {
+					if (!$line->inline) {
+						continue;
+					}
+
+					$line->trim_trailing_ws();
+
+					if ($line->left) {
+						foreach ($line->frames_to_align() as $frame) {
+							$frame->move($line->left, 0);
+						}
+					}
+				}
+				break;
+
+			case "right":
+				foreach ($this->_frame->get_line_boxes() as $i => $line) {
+					if (!$line->inline) {
+						continue;
+					}
+
+					$line->trim_trailing_ws();
+
+					$indent = $i === 0 ? $text_indent : 0;
+					$dx = $width - $line->w - $line->right - $indent;
+
+					foreach ($line->frames_to_align() as $frame) {
+						$frame->move($dx, 0);
+					}
+				}
+				break;
+
+			case "justify":
+				// We justify all lines except the last one, unless the frame
+				// has been split, in which case the actual last line is part of
+				// the split-off frame
+				$lines = $this->_frame->get_line_boxes();
+				$last_line_index = $this->_frame->is_split ? null : count($lines) - 1;
+
+				foreach ($lines as $i => $line) {
+					if (!$line->inline) {
+						continue;
+					}
+
+					$line->trim_trailing_ws();
+
+					if ($line->left) {
+						foreach ($line->frames_to_align() as $frame) {
+							$frame->move($line->left, 0);
+						}
+					}
+
+					if ($line->br || $i === $last_line_index) {
+						continue;
+					}
+
+					$frames = $line->get_frames();
+					$other_frame_count = 0;
+
+					foreach ($frames as $frame) {
+						if (!($frame instanceof TextFrameDecorator)) {
+							$other_frame_count++;
+						}
+					}
+
+					$word_count = $line->wc + $other_frame_count;
+
+					// Set the spacing for each child
+					if ($word_count > 1) {
+						$indent = $i === 0 ? $text_indent : 0;
+						$spacing = ($width - $line->get_width() - $indent) / ($word_count - 1);
+					} else {
+						$spacing = 0;
+					}
+
+					$dx = 0;
+					foreach ($frames as $frame) {
+						if ($frame instanceof TextFrameDecorator) {
+							$text = $frame->get_text();
+							$spaces = mb_substr_count($text, " ");
+
+							$frame->move($dx, 0);
+							$frame->set_text_spacing($spacing);
+
+							$dx += $spaces * $spacing;
+						} else {
+							$frame->move($dx, 0);
+						}
+					}
+
+					// The line (should) now occupy the entire width
+					$line->w = $width;
+				}
+				break;
+
+			case "center":
+			case "centre":
+				foreach ($this->_frame->get_line_boxes() as $i => $line) {
+					if (!$line->inline) {
+						continue;
+					}
+
+					$line->trim_trailing_ws();
+
+					$indent = $i === 0 ? $text_indent : 0;
+					$dx = ($width + $line->left - $line->w - $line->right - $indent) / 2;
+
+					foreach ($line->frames_to_align() as $frame) {
+						$frame->move($dx, 0);
+					}
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Align inline children vertically.
+	 * Aligns each child vertically after each line is reflowed
+	 */
+	function vertical_align()
+	{
+		$fontMetrics = $this->get_dompdf()->getFontMetrics();
+
+		foreach ($this->_frame->get_line_boxes() as $line) {
+			$height = $line->h;
+
+			// Move all markers to the top of the line box
+			foreach ($line->get_list_markers() as $marker) {
+				$x = $marker->get_position("x");
+				$marker->set_position($x, $line->y);
+			}
+
+			foreach ($line->frames_to_align() as $frame) {
+				$style = $frame->get_style();
+				$isInlineBlock = $style->display !== "inline"
+					&& $style->display !== "-dompdf-list-bullet";
+
+				$baseline = $fontMetrics->getFontBaseline($style->font_family, $style->font_size);
+				$y_offset = 0;
+
+				//FIXME: The 0.8 ratio applied to the height is arbitrary (used to accommodate descenders?)
+				if ($isInlineBlock) {
+					// Workaround: Skip vertical alignment if the frame is the
+					// only one one the line, excluding empty text frames, which
+					// may be the result of trailing white space
+					// FIXME: This special case should be removed once vertical
+					// alignment is properly fixed
+					$skip = true;
+
+					foreach ($line->get_frames() as $other) {
+						if ($other !== $frame
+							&& !($other->is_text_node() && $other->get_node()->nodeValue === "")
+						 ) {
+							$skip = false;
+							break;
+						}
+					}
+
+					if ($skip) {
+						continue;
+					}
+
+					$marginHeight = $frame->get_margin_height();
+					$imageHeightDiff = $height * 0.8 - $marginHeight;
+
+					$align = $frame->get_style()->vertical_align;
+					if (in_array($align, Style::VERTICAL_ALIGN_KEYWORDS, true)) {
+						switch ($align) {
+							case "middle":
+								$y_offset = $imageHeightDiff / 2;
+								break;
+
+							case "sub":
+								$y_offset = 0.3 * $height + $imageHeightDiff;
+								break;
+
+							case "super":
+								$y_offset = -0.2 * $height + $imageHeightDiff;
+								break;
+
+							case "text-top": // FIXME: this should be the height of the frame minus the height of the text
+								$y_offset = $height - $style->line_height;
+								break;
+
+							case "top":
+								break;
+
+							case "text-bottom": // FIXME: align bottom of image with the descender?
+							case "bottom":
+								$y_offset = 0.3 * $height + $imageHeightDiff;
+								break;
+
+							case "baseline":
+							default:
+								$y_offset = $imageHeightDiff;
+								break;
+						}
+					} else {
+						$y_offset = $baseline - (float)$style->length_in_pt($align, $style->font_size) - $marginHeight;
+					}
+				} else {
+					$parent = $frame->get_parent();
+					if ($parent instanceof TableCellFrameDecorator) {
+						$align = "baseline";
+					} else {
+						$align = $parent->get_style()->vertical_align;
+					}
+					if (in_array($align, Style::VERTICAL_ALIGN_KEYWORDS, true)) {
+						switch ($align) {
+							case "middle":
+								$y_offset = ($height * 0.8 - $baseline) / 2;
+								break;
+
+							case "sub":
+								$y_offset = $height * 0.8 - $baseline * 0.5;
+								break;
+
+							case "super":
+								$y_offset = $height * 0.8 - $baseline * 1.4;
+								break;
+
+							case "text-top":
+							case "top": // Not strictly accurate, but good enough for now
+								break;
+
+							case "text-bottom":
+							case "bottom":
+								$y_offset = $height * 0.8 - $baseline;
+								break;
+
+							case "baseline":
+							default:
+								$y_offset = $height * 0.8 - $baseline;
+								break;
+						}
+					} else {
+						$y_offset = $height * 0.8 - $baseline - (float)$style->length_in_pt($align, $style->font_size);
+					}
+				}
+
+				if ($y_offset !== 0) {
+					$frame->move(0, $y_offset);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param AbstractFrameDecorator $child
+	 */
+	function process_clear(AbstractFrameDecorator $child)
+	{
+		$child_style = $child->get_style();
+		$root = $this->_frame->get_root();
+
+		// Handle "clear"
+		if ($child_style->clear !== "none") {
+			//TODO: this is a WIP for handling clear/float frames that are in between inline frames
+			if ($child->get_prev_sibling() !== null) {
+				$this->_frame->add_line();
+			}
+			if ($child_style->float !== "none" && $child->get_next_sibling()) {
+				$this->_frame->set_current_line_number($this->_frame->get_current_line_number() - 1);
+			}
+
+			$lowest_y = $root->get_lowest_float_offset($child);
+
+			// If a float is still applying, we handle it
+			if ($lowest_y) {
+				if ($child->is_in_flow()) {
+					$line_box = $this->_frame->get_current_line_box();
+					$line_box->y = $lowest_y + $child->get_margin_height();
+					$line_box->left = 0;
+					$line_box->right = 0;
+				}
+
+				$child->move(0, $lowest_y - $child->get_position("y"));
+			}
+		}
+	}
+
+	/**
+	 * @param AbstractFrameDecorator $child
+	 * @param float $cb_x
+	 * @param float $cb_w
+	 */
+	function process_float(AbstractFrameDecorator $child, $cb_x, $cb_w)
+	{
+		$child_style = $child->get_style();
+		$root = $this->_frame->get_root();
+
+		// Handle "float"
+		if ($child_style->float !== "none") {
+			$root->add_floating_frame($child);
+
+			// Remove next frame's beginning whitespace
+			$next = $child->get_next_sibling();
+			if ($next && $next instanceof TextFrameDecorator) {
+				$next->set_text(ltrim($next->get_text()));
+			}
+
+			$line_box = $this->_frame->get_current_line_box();
+			list($old_x, $old_y) = $child->get_position();
+
+			$float_x = $cb_x;
+			$float_y = $old_y;
+			$float_w = $child->get_margin_width();
+
+			if ($child_style->clear === "none") {
+				switch ($child_style->float) {
+					case "left":
+						$float_x += $line_box->left;
+						break;
+					case "right":
+						$float_x += ($cb_w - $line_box->right - $float_w);
+						break;
+				}
+			} else {
+				if ($child_style->float === "right") {
+					$float_x += ($cb_w - $float_w);
+				}
+			}
+
+			if ($cb_w < $float_x + $float_w - $old_x) {
+				// TODO handle when floating elements don't fit
+			}
+
+			$line_box->get_float_offsets();
+
+			if ($child->_float_next_line) {
+				$float_y += $line_box->h;
+			}
+
+			$child->set_position($float_x, $float_y);
+			$child->move($float_x - $old_x, $float_y - $old_y, true);
+		}
+	}
+
+	/**
+	 * @param BlockFrameDecorator $block
+	 */
+	function reflow(BlockFrameDecorator $block = null)
+	{
+
+		// Check if a page break is forced
+		$page = $this->_frame->get_root();
+		$page->check_forced_page_break($this->_frame);
+
+		// Bail if the page is full
+		if ($page->is_full()) {
+			return;
+		}
+
+		$this->determine_absolute_containing_block();
+
+		// Counters and generated content
+		$this->_set_content();
+
+		// Inherit any dangling list markers
+		if ($block && $this->_frame->is_in_flow()) {
+			$this->_frame->inherit_dangling_markers($block);
+		}
+
+		// Collapse margins if required
+		$this->_collapse_margins();
+
+		$style = $this->_frame->get_style();
+		$cb = $this->_frame->get_containing_block();
+
+		// Determine the constraints imposed by this frame: calculate the width
+		// of the content area:
+		[$width, $margin_left, $margin_right, $left, $right] = $this->_calculate_restricted_width();
+
+		// Store the calculated properties
+		$style->set_used("width", $width);
+		$style->set_used("margin_left", $margin_left);
+		$style->set_used("margin_right", $margin_right);
+		$style->set_used("left", $left);
+		$style->set_used("right", $right);
+
+		$margin_top = $style->length_in_pt($style->margin_top, $cb["w"]);
+		$margin_bottom = $style->length_in_pt($style->margin_bottom, $cb["w"]);
+
+		$auto_top = $style->top === "auto";
+		$auto_margin_top = $margin_top === "auto";
+
+		// Update the position
+		$this->_frame->position();
+		[$x, $y] = $this->_frame->get_position();
+
+		// Adjust the first line based on the text-indent property
+		$indent = (float)$style->length_in_pt($style->text_indent, $cb["w"]);
+		$this->_frame->increase_line_width($indent);
+
+		// Determine the content edge
+		$top = (float)$style->length_in_pt([
+			$margin_top !== "auto" ? $margin_top : 0,
+			$style->border_top_width,
+			$style->padding_top
+		], $cb["w"]);
+		$bottom = (float)$style->length_in_pt([
+			$margin_bottom !== "auto" ? $margin_bottom : 0,
+			$style->border_bottom_width,
+			$style->padding_bottom
+		], $cb["w"]);
+
+		$cb_x = $x + (float)$margin_left + (float)$style->length_in_pt([$style->border_left_width,
+				$style->padding_left], $cb["w"]);
+
+		$cb_y = $y + $top;
+
+		$height = $style->length_in_pt($style->height, $cb["h"]);
+		if ($height === "auto") {
+			$height = ($cb["h"] + $cb["y"]) - $bottom - $cb_y;
+		}
+
+		// Set the y position of the first line in this block
+		$line_box = $this->_frame->get_current_line_box();
+		$line_box->y = $cb_y;
+		$line_box->get_float_offsets();
+
+		// Set the containing blocks and reflow each child
+		foreach ($this->_frame->get_children() as $child) {
+			$child->set_containing_block($cb_x, $cb_y, $width, $height);
+			$this->process_clear($child);
+			$child->reflow($this->_frame);
+
+			// Check for a page break before the child
+			$page->check_page_break($child);
+
+			// Don't add the child to the line if a page break has occurred
+			// before it (possibly via a descendant), in which case it has been
+			// reset, including its position
+			if ($page->is_full() && $child->get_position("x") === null) {
+				break;
+			}
+
+			$this->process_float($child, $cb_x, $width);
+		}
+
+		// Stop reflow if a page break has occurred before the frame, in which
+		// case it has been reset, including its position
+		if ($page->is_full() && $this->_frame->get_position("x") === null) {
+			return;
+		}
+
+		// Determine our height
+		[$height, $margin_top, $margin_bottom, $top, $bottom] = $this->_calculate_restricted_height();
+
+		$style->set_used("height", $height);
+		$style->set_used("margin_top", $margin_top);
+		$style->set_used("margin_bottom", $margin_bottom);
+		$style->set_used("top", $top);
+		$style->set_used("bottom", $bottom);
+
+		if ($this->_frame->is_absolute()) {
+			if ($auto_top) {
+				$this->_frame->move(0, $top);
+			}
+			if ($auto_margin_top) {
+				$this->_frame->move(0, $margin_top, true);
+			}
+		}
+
+		$this->_text_align();
+		$this->vertical_align();
+
+		// Handle relative positioning
+		foreach ($this->_frame->get_children() as $child) {
+			$this->position_relative($child);
+		}
+
+		if ($block && $this->_frame->is_in_flow()) {
+			$block->add_frame_to_line($this->_frame);
+
+			if ($this->_frame->is_block_level()) {
+				$block->add_line();
+			}
+		}
+	}
+
+	public function get_min_max_content_width(): array
+	{
+		// TODO: While the containing block is not set yet on the frame, it can
+		// already be determined in some cases due to fixed dimensions on the
+		// ancestor forming the containing block. In such cases, percentage
+		// values could be resolved here
+		$style = $this->_frame->get_style();
+		$width = $style->width;
+		$fixed_width = $width !== "auto" && !Helpers::is_percent($width);
+
+		// If the frame has a specified width, then we don't need to check
+		// its children
+		if ($fixed_width) {
+			$min = (float) $style->length_in_pt($width, 0);
+			$max = $min;
+		} else {
+			[$min, $max] = $this->get_min_max_child_width();
+		}
+
+		// Handle min/max width style properties
+		$min_width = $this->resolve_min_width(null);
+		$max_width = $this->resolve_max_width(null);
+		$min = Helpers::clamp($min, $min_width, $max_width);
+		$max = Helpers::clamp($max, $min_width, $max_width);
+
+		return [$min, $max];
+	}
 }

vendor/dompdf/dompdf/src/FrameDecorator/TableRowGroup.php

Indentation +45 added lines, -45 removed lines

@@ -19,56 +19,56 @@
 class TableRowGroup extends AbstractFrameDecorator
 {
 
-    /**
-     * Class constructor
-     *
-     * @param Frame $frame   Frame to decorate
-     * @param Dompdf $dompdf Current dompdf instance
-     */
-    function __construct(Frame $frame, Dompdf $dompdf)
-    {
-        parent::__construct($frame, $dompdf);
-    }
+	/**
+	 * Class constructor
+	 *
+	 * @param Frame $frame   Frame to decorate
+	 * @param Dompdf $dompdf Current dompdf instance
+	 */
+	function __construct(Frame $frame, Dompdf $dompdf)
+	{
+		parent::__construct($frame, $dompdf);
+	}
 
-    /**
-     * Split the row group at the given child and remove all subsequent child
-     * rows and all subsequent row groups from the cellmap.
-     */
-    public function split(?Frame $child = null, bool $page_break = false, bool $forced = false): void
-    {
-        if (is_null($child)) {
-            parent::split($child, $page_break, $forced);
-            return;
-        }
+	/**
+	 * Split the row group at the given child and remove all subsequent child
+	 * rows and all subsequent row groups from the cellmap.
+	 */
+	public function split(?Frame $child = null, bool $page_break = false, bool $forced = false): void
+	{
+		if (is_null($child)) {
+			parent::split($child, $page_break, $forced);
+			return;
+		}
 
-        // Remove child & all subsequent rows from the cellmap
-        /** @var Table $parent */
-        $parent = $this->get_parent();
-        $cellmap = $parent->get_cellmap();
-        $iter = $child;
+		// Remove child & all subsequent rows from the cellmap
+		/** @var Table $parent */
+		$parent = $this->get_parent();
+		$cellmap = $parent->get_cellmap();
+		$iter = $child;
 
-        while ($iter) {
-            $cellmap->remove_row($iter);
-            $iter = $iter->get_next_sibling();
-        }
+		while ($iter) {
+			$cellmap->remove_row($iter);
+			$iter = $iter->get_next_sibling();
+		}
 
-        // Remove all subsequent row groups from the cellmap
-        $iter = $this->get_next_sibling();
+		// Remove all subsequent row groups from the cellmap
+		$iter = $this->get_next_sibling();
 
-        while ($iter) {
-            $cellmap->remove_row_group($iter);
-            $iter = $iter->get_next_sibling();
-        }
+		while ($iter) {
+			$cellmap->remove_row_group($iter);
+			$iter = $iter->get_next_sibling();
+		}
 
-        // If we are splitting at the first child remove the
-        // table-row-group from the cellmap as well
-        if ($child === $this->get_first_child()) {
-            $cellmap->remove_row_group($this);
-            parent::split(null, $page_break, $forced);
-            return;
-        }
+		// If we are splitting at the first child remove the
+		// table-row-group from the cellmap as well
+		if ($child === $this->get_first_child()) {
+			$cellmap->remove_row_group($this);
+			parent::split(null, $page_break, $forced);
+			return;
+		}
 
-        $cellmap->update_row_group($this, $child->get_prev_sibling());
-        parent::split($child, $page_break, $forced);
-    }
+		$cellmap->update_row_group($this, $child->get_prev_sibling());
+		parent::split($child, $page_break, $forced);
+	}
 }