Check page break

tecnickcom · Aug 27, 2024 · 160305e · 160305e
1 parent 58de3e1
commit 160305e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.0.75
+8.0.76
diff --git a/src/Base.php b/src/Base.php
@@ -156,7 +156,7 @@ abstract class Base
     /**
      * TCPDF version.
      */
-    protected string $version = '8.0.75';
+    protected string $version = '8.0.76';
 
     /**
      * Time is seconds since EPOCH when the document was created.

diff --git a/src/Tcpdf.php b/src/Tcpdf.php
@@ -1125,9 +1125,12 @@ public function addTOC(
             $region = $this->page->getRegion($pid);
 
             if (($posy + $cellSpaceT + $cellSpaceB + $font['height']) > $region['RH']) {
-                $opage = $this->page->getNextRegion($pid);
-                $this->setPageContext($pid);
-                $pid = $opage['pid'];
+                $this->page->getNextRegion($pid);
+                $curpid = $this->page->getPageId();
+                if ($curpid > $pid) {
+                    $pid = $curpid;
+                    $this->setPageContext($pid);
+                }
                 $region = $this->page->getRegion($pid);
                 $posy = 0; // $region['RY'];
             }

diff --git a/src/Text.php b/src/Text.php
@@ -324,6 +324,10 @@ public function addTextCell(
             return;
         }
 
+        if ($pid < 0) {
+            $pid = $this->page->getPageId();
+        }
+
         if ($halign == '') {
             $halign = $this->rtl ? 'R' : 'L';
         }
@@ -478,7 +482,11 @@ public function addTextCell(
             $cell['margin']['B'] = 0;
 
             $this->page->getNextRegion($pid);
-            $this->setPageContext($pid);
+            $curpid = $this->page->getPageId();
+            if ($curpid > $pid) {
+                $pid = $curpid;
+                $this->setPageContext($pid);
+            }
         }
     }
 
@@ -1618,7 +1626,7 @@ public function defaultPageContent(int $pid = -1): string
             $this->defaultfont = $this->font->insert($this->pon, 'helvetica', '', 10);
         }
 
-        $region = $this->page->getRegion($pid);
+        $page = $this->page->getPage($pid);
 
         // print page number in the footer
         $out = $this->graph->getStartTransform();
@@ -1630,8 +1638,8 @@ public function defaultPageContent(int $pid = -1): string
         $out .= $this->getTextCell(
             (string) ($pid + 1),
             $this->toUnit($this->defaultfont['dw']),
-            $region['RH'] - (2 * $this->toUnit($this->defaultfont['height'])),
-            $region['RW'] - (2 * $this->toUnit($this->defaultfont['dw'])),
+            $page['height'] - (2 * $this->toUnit($this->defaultfont['height'])),
+            $page['width'] - (4 * $this->toUnit($this->defaultfont['dw'])),
             0,
             0,
             0,