fix: keep every cell bounding box so MultiCell() frames continue across pages and writeHTML() moves the cursor below the text (v7.0.17)

Author: nicolaasuni

VERSION

@@ -1 +1 @@
-7.0.16
+7.0.17

composer.json

@@ -29,7 +29,7 @@
     "require": {
         "php": ">=8.2",
         "ext-curl": "*",
-        "tecnickcom/tc-lib-pdf": "^8.78"
+        "tecnickcom/tc-lib-pdf": "^8.80"
     },
     "require-dev": {
         "carthage-software/mago": "1.55.0",

tcpdf.php

@@ -2,7 +2,7 @@
 
 //============================================================+
 // File name    : tcpdf.php
-// Version      : 7.0.16
+// Version      : 7.0.17
 // Author       : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License      : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
 // Copyright (C): 2002-2026 Nicola Asuni - Tecnick.com LTD
@@ -15,7 +15,7 @@
  * See: https://tcpdf.org
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 7.0.16
+ * @version 7.0.17
  */
 
 // TCPDF configuration
@@ -1827,7 +1827,10 @@ protected function overflowCellOutput(
             default => $cellx,
         };
 
-        return (is_string($box) ? $box : '') . $this->cellTextRun($txt, $boxx, $boxw, $height, $valign, $halign, $cell, $this->engineShadow());
+        return (
+            (is_string($box) ? $box : '')
+            . $this->cellTextRun($txt, $boxx, $boxw, $height, $valign, $halign, $cell, $this->engineShadow())
+        );
     }
 
     /**
@@ -3577,7 +3580,7 @@ public function Cell(
         if ($stretchmode === 0 && $txt !== '') {
             $txtw = $stretchtextw > 0 ? $stretchtextw : $this->engineTextWidth($txt);
             $innerw = $width - $borderpadding['L'] - $borderpadding['R'];
-            if ($txtw <= $innerw * 0.95) {
+            if ($txtw <= ($innerw * 0.95)) {
                 $txtw = 0.0;
             }
         }
@@ -8800,6 +8803,8 @@ public function ImageSVG(
  * start of every page the engine opens.
  *
  * @package com.tecnick.tcpdf
+ *
+ * @phpstan-import-type TBBox from \Com\Tecnick\Pdf\Base
  */
 // The single-file layout (tcpdf.php as the only historical include) and the
 // legacy ALL-CAPS underscore class naming (TCPDF_STATIC, TCPDF_FONTS, ...)
@@ -8834,6 +8839,22 @@ public function setPageContext(int $pid = -1): void
         }
     }
 
+    /**
+     * Keeps every bounding box in the list: the facade reads the cell boxes
+     * added by a call (see TCPDF::cellBBoxCount() and cellBBoxBottomSince()).
+     *
+     * @param array<int, TBBox> $list Current bounding box list.
+     * @param TBBox             $box  New bounding box.
+     *
+     * @return array<int, TBBox>
+     */
+    protected function getNextBBoxList(array $list, array $box): array
+    {
+        $list[] = $box;
+
+        return $list;
+    }
+
     /**
      * Anchor the page regions (columns) at the content top margin.
      *

test/TcpdfCellTest.php

@@ -83,6 +83,37 @@ public function testMultiCellWrapsAndAdvances(): void
         $this->assertSame(10.0, $pdf->GetX(), 'default ln=1 must reset X to the left margin');
     }
 
+    public function testMultiCellFrameContinuesOnEveryPage(): void
+    {
+        $pdf = $this->newPdf();
+        $pdf->setFont('helvetica', '', 12);
+        $pdf->AddPage();
+        $pdf->MultiCell(80, 0, str_repeat('frame me over the pages please ', 150), 1, 'L');
+
+        $pages = $this->pageContents($pdf);
+        $this->assertGreaterThan(2, count($pages));
+        foreach ($pages as $idx => $content) {
+            $this->assertMatchesRegularExpression('/ l\n/', $content, 'page ' . ($idx + 1) . ' must draw the frame');
+        }
+    }
+
+    public function testWriteHTMLMovesTheCursorBelowTheText(): void
+    {
+        $pdf = $this->newPdf();
+        $pdf->setFont('helvetica', '', 12);
+        $pdf->AddPage();
+        $starty = $pdf->GetY();
+        $pdf->writeHTML('<div style="text-align:center">first line</div>', true, false, true, false, '');
+        $this->assertGreaterThan($starty, $pdf->GetY(), 'the cursor must move below the text');
+
+        $pdf->writeHTML('<p>second line</p>', true, false, true, false, '');
+        $this->assertGreaterThanOrEqual(
+            $this->wordBox($pdf, 'first')['ymax'] - 0.1,
+            $this->wordBox($pdf, 'second')['ymin'],
+            'the second block must start below the first',
+        );
+    }
+
     public function testWriteFlowsFromTheCursor(): void
     {
         $pdf = $this->newPdf();
@@ -255,8 +286,8 @@ public function testRtlStretchedCellTextStaysInsideTheCell(): void
 
         $box = $this->wordBox($pdf, 'stretched');
         $k = 72 / 25.4;
-        $this->assertGreaterThanOrEqual(($right - 20) * $k - 0.1, $box['xmin']);
-        $this->assertLessThanOrEqual($right * $k + 0.1, $box['xmax']);
+        $this->assertGreaterThanOrEqual((($right - 20) * $k) - 0.1, $box['xmin']);
+        $this->assertLessThanOrEqual(($right * $k) + 0.1, $box['xmax']);
     }
 
     public function testCellOverflowKeepsTheBorderGeometry(): void
@@ -302,6 +333,31 @@ private function borderedCellContent(string $txt): string
         return $content;
     }
 
+    /**
+     * Decompressed content streams of the document pages that hold text.
+     *
+     * @return list<string>
+     */
+    private function pageContents(TCPDF $pdf): array
+    {
+        $raw = (string) $pdf->getPDFData();
+        $streams = [];
+        preg_match_all('/stream\r?\n(.*?)\r?\nendstream/s', $raw, $streams);
+        $pages = [];
+        foreach ($streams[1] ?? [] as $stream) {
+            if (!str_starts_with($stream, "\x78")) {
+                continue;
+            }
+
+            $data = gzuncompress($stream);
+            if (is_string($data) && str_contains($data, 'BT')) {
+                $pages[] = $data;
+            }
+        }
+
+        return $pages;
+    }
+
     /**
      * Graphics state lines of a content stream, without text objects.
      */