From 2c5dff1eed898117f7e85fd1bef93b81e5322975 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sat, 28 Mar 2009 18:42:58 +0100 Subject: [PATCH] 4.5.035 --- CHANGELOG.TXT | 3 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 66 +++++++++---------- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 2 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 13 ++-- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index aa67cee..36ae6f4 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,5 +1,6 @@ 4.5.035 (2009-03-28) - - Bug # "2717436 "writeHTML rowspan problem (continued)" was fixed. + - Bug #2717436 "writeHTML rowspan problem (continued)" was fixed. + - Bug #2719090 "writeHTML fix follow up" was fixed. - The method _putuserrights() was changed to avoid Adobe Reader 9.1 crash. This broken the 'trick' used to display forms in Acrobat Reader. 4.5.034 (2009-03-27) diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 5a098b1..05d18aa 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index d700df9..e749e54 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -5309,7 +5309,7 @@ $style = -1])
-

method addHTMLVertSpace [line 12186]

+

method addHTMLVertSpace [line 12185]

@@ -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]

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;
@@ -13568,7 +13568,7 @@ $width)
-

method setLIsymbol [line 12215]

+

method setLIsymbol [line 12214]

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
- Documentation generated on Sat, 28 Mar 2009 17:50:53 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
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
- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
@@ -13661,7 +13661,7 @@ $right = -1])
-

method setOpenCell [line 12315]

+

method setOpenCell [line 12314]

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
- Documentation generated on Sat, 28 Mar 2009 17:50:59 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:53 +0100 by phpDocumentor 1.4.1
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
- Documentation generated on Sat, 28 Mar 2009 17:50:53 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
@@ -13748,7 +13748,7 @@ $resetmargins = false])
-

method setPageBuffer [line 12767]

+

method setPageBuffer [line 12766]

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
- Documentation generated on Sat, 28 Mar 2009 17:50:53 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
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.



- Documentation generated on Sat, 28 Mar 2009 17:50:59 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:53 +0100 by phpDocumentor 1.4.1
@@ -15200,7 +15200,7 @@ $page = ''])
-

method startTransaction [line 13211]

+

method startTransaction [line 13210]

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

- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
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.



- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
@@ -15290,7 +15290,7 @@ $page = ''])
-

method swapMargins [line 12271]

+

method swapMargins [line 12270]

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.



- Documentation generated on Sat, 28 Mar 2009 17:50:59 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:53 +0100 by phpDocumentor 1.4.1
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
- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
@@ -16298,7 +16298,7 @@ $code)
-

method writeDiskCache [line 12695]

+

method writeDiskCache [line 12694]

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)
- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1
@@ -18586,7 +18586,7 @@ $file)
- Documentation generated on Sat, 28 Mar 2009 17:50:54 +0100 by phpDocumentor 1.4.1 + Documentation generated on Sat, 28 Mar 2009 18:42:48 +0100 by phpDocumentor 1.4.1