@@ -5520,7 +5520,7 @@ $k)
- method addTOC [line 13068]
+ method addTOC [line 13067]
@@ -6424,7 +6424,7 @@ $prop = array()])
- method commitTransaction [line 13225]
+ method commitTransaction [line 13224]
@@ -7271,7 +7271,7 @@ $pagenum = ''])
- method getBuffer [line 12751]
+ method getBuffer [line 12750]
@@ -7468,7 +7468,7 @@ $char)
- method getFontBuffer [line 12911]
+ method getFontBuffer [line 12910]
@@ -7757,7 +7757,7 @@ $v)
- method getGraphicVars [line 12619]
+ method getGraphicVars [line 12618]
@@ -7967,7 +7967,7 @@ $html)
- method getHTMLUnitToUnits [line 12341]
+ method getHTMLUnitToUnits [line 12340]
@@ -8033,7 +8033,7 @@ $point)
- method getImageBuffer [line 12853]
+ method getImageBuffer [line 12852]
@@ -8379,7 +8379,7 @@ $w = 0])
- method getObjFilename [line 12683]
+ method getObjFilename [line 12682]
@@ -8489,7 +8489,7 @@ $prefix)
- method getPageBuffer [line 12794]
+ method getPageBuffer [line 12793]
@@ -9404,7 +9404,7 @@ $script)
- method intToRoman [line 12412]
+ method intToRoman [line 12411]
@@ -9998,7 +9998,7 @@ $y = ''])
- method movePage [line 12929]
+ method movePage [line 12928]
@@ -10172,7 +10172,7 @@ $maxh = 0])
- method objclone [line 13260]
+ method objclone [line 13259]
@@ -10682,7 +10682,7 @@ $fill_color = array()])
- method putHtmlListBullet [line 12477]
+ method putHtmlListBullet [line 12476]
@@ -10859,7 +10859,7 @@ $prop = array()])
- method readDiskCache [line 12723]
+ method readDiskCache [line 12722]
@@ -11186,7 +11186,7 @@ $length)
- method rollbackTransaction [line 13238]
+ method rollbackTransaction [line 13237]
@@ -11756,7 +11756,7 @@ $bc = ''])
- method SetBooklet [line 12255]
+ method SetBooklet [line 12254]
@@ -11807,7 +11807,7 @@ $outer = -1])
- method setBuffer [line 12733]
+ method setBuffer [line 12732]
@@ -12527,7 +12527,7 @@ $fontfile = ''])
- method setFontBuffer [line 12869]
+ method setFontBuffer [line 12868]
@@ -12614,7 +12614,7 @@ $size)
- method setFontSubBuffer [line 12891]
+ method setFontSubBuffer [line 12890]
@@ -12768,7 +12768,7 @@ $fm = 10])
- method setGraphicVars [line 12650]
+ method setGraphicVars [line 12649]
@@ -12964,7 +12964,7 @@ $hm = 10])
- method setHtmlLinksStyle [line 12326]
+ method setHtmlLinksStyle [line 12325]
@@ -13009,7 +13009,7 @@ $fontstyle = 'U'])
- method setHtmlVSpace [line 12295]
+ method setHtmlVSpace [line 12294]
@@ -13048,7 +13048,7 @@ $tagvs)
- method setImageBuffer [line 12810]
+ method setImageBuffer [line 12809]
@@ -13135,7 +13135,7 @@ $scale)
- method setImageSubBuffer [line 12833]
+ method setImageSubBuffer [line 12832]
@@ -13529,7 +13529,7 @@ $page = -1])
- method setListIndentWidth [line 12305]
+ method setListIndentWidth [line 12304]
@@ -13568,7 +13568,7 @@ $width)
- method setLIsymbol [line 12215]
+ method setLIsymbol [line 12214]
@@ -13661,7 +13661,7 @@ $right = -1])
- method setOpenCell [line 12315]
+ method setOpenCell [line 12314]
@@ -13748,7 +13748,7 @@ $resetmargins = false])
- method setPageBuffer [line 12767]
+ method setPageBuffer [line 12766]
@@ -15200,7 +15200,7 @@ $page = ''])
- method startTransaction [line 13211]
+ method startTransaction [line 13210]
@@ -15290,7 +15290,7 @@ $page = ''])
- method swapMargins [line 12271]
+ method swapMargins [line 12270]
@@ -16298,7 +16298,7 @@ $code)
- method writeDiskCache [line 12695]
+ method writeDiskCache [line 12694]
|
@@ -18586,7 +18586,7 @@ $file)
|
|
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
index 1a8821f..ac47fa1 100644
--- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html
+++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
@@ -640,7 +640,7 @@ $type)
|
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html
index aa9442f..e289cac 100644
--- a/doc/com-tecnick-tcpdf/_barcodes.php.html
+++ b/doc/com-tecnick-tcpdf/_barcodes.php.html
@@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
index f948e89..797b0be 100644
--- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
+++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
@@ -507,7 +507,7 @@ Configuration file for TCPDF.
|
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
index fc906f7..1e800a5 100644
--- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html
+++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
@@ -88,7 +88,7 @@ Array of WEB safe colors.
|
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html
index d454b00..376b35b 100644
--- a/doc/com-tecnick-tcpdf/_tcpdf.php.html
+++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html
@@ -115,7 +115,7 @@ unicode data
|
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html
index 5c3e281..52c00fd 100644
--- a/doc/com-tecnick-tcpdf/_unicode_data.php.html
+++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html
@@ -237,7 +237,7 @@ Unicode Include file for TCPDF.
|
diff --git a/doc/elementindex.html b/doc/elementindex.html
index 0e7e227..c966c0c 100644
--- a/doc/elementindex.html
+++ b/doc/elementindex.html
@@ -1302,7 +1302,7 @@
top
|
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html
index 53e3be2..c8529e2 100644
--- a/doc/elementindex_com-tecnick-tcpdf.html
+++ b/doc/elementindex_com-tecnick-tcpdf.html
@@ -1325,7 +1325,7 @@
top
|
diff --git a/doc/errors.html b/doc/errors.html
index efa8d74..f84c638 100644
--- a/doc/errors.html
+++ b/doc/errors.html
@@ -35,7 +35,7 @@
Post-parsing
|
diff --git a/doc/index.html b/doc/index.html
index d120c52..f61a239 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -58,7 +58,7 @@
This documentation was generated by phpDocumentor v1.4.1
|
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html
index da81da0..f61a239 100644
--- a/doc/li_com-tecnick-tcpdf.html
+++ b/doc/li_com-tecnick-tcpdf.html
@@ -58,7 +58,7 @@
This documentation was generated by phpDocumentor v1.4.1
|
diff --git a/tcpdf.php b/tcpdf.php
index e523e16..72d9eff 100755
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -11335,11 +11335,6 @@ if (!class_exists('TCPDF', false)) {
$dom[$trid]['cellpos'][($cellid - 1)]['endx'] = $this->x;
// update the end of row position
if ($rowspan <= 1) {
- if (isset($dom[$trid]['endpage'])) {
- $dom[$trid]['endpage'] = max($this->page, $dom[$trid]['endpage']);
- } else {
- $dom[$trid]['endpage'] = $this->page;
- }
if (isset($dom[$trid]['endy'])) {
if ($this->page == $dom[$trid]['endpage']) {
$dom[$trid]['endy'] = max($this->y, $dom[$trid]['endy']);
@@ -11349,6 +11344,11 @@ if (!class_exists('TCPDF', false)) {
} else {
$dom[$trid]['endy'] = $this->y;
}
+ if (isset($dom[$trid]['endpage'])) {
+ $dom[$trid]['endpage'] = max($this->page, $dom[$trid]['endpage']);
+ } else {
+ $dom[$trid]['endpage'] = $this->page;
+ }
} else {
// account for row-spanned cells
$dom[$table_el]['rowspans'][($trsid - 1)]['endx'] = $this->x;
@@ -11907,8 +11907,7 @@ if (!class_exists('TCPDF', false)) {
}
}
$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
- $this->y = $dom[($dom[$key]['parent'])]['endy'];
-
+ $this->y = $dom[($dom[$key]['parent'])]['endy'];
if (isset($dom[$table_el]['attribute']['cellspacing'])) {
$cellspacing = $this->getHTMLUnitToUnits($dom[$table_el]['attribute']['cellspacing'], 1, 'px');
$this->y += $cellspacing;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|