diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 3c9a4ef..dfcab54 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,9 @@ +4.6.010 (2009-05-17) + - Image() method was improved: now is possible to specify the maximum dimensions for a constraint box defined by $w and $h parameters, and setting the $resize parameter to null. + - tag indent problem was fixed. + - $y parameter was added to checkPageBreak() method. + - Bug n. 2791773 "writeHTML" was fixed. + 4.6.009 (2009-05-13) - xref table for embedded files was fixed. diff --git a/README.TXT b/README.TXT index a97911f..fdc77da 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.6.009 -Release date: 2009-05-13 +Version: 4.6.010 +Release date: 2009-05-17 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 7924ae8..5e48861 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index a0cf5e2..b32e95a 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -588,7 +588,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.009 + version:  4.6.010 link:  http://www.tcpdf.org @@ -5350,7 +5350,7 @@ $diskcache = false])
-

method addExtGState [line 9567]

+

method addExtGState [line 9576]

@@ -5443,7 +5443,7 @@ $fontfile = ''])
-

method addHtmlLink [line 6885]

+

method addHtmlLink [line 6894]

@@ -5512,7 +5512,7 @@ $style = -1])
-

method addHTMLVertSpace [line 12679]

+

method addHTMLVertSpace [line 12694]

@@ -5723,7 +5723,7 @@ $k)
-

method addTOC [line 13701]

+

method addTOC [line 13716]

@@ -5777,7 +5777,7 @@ $filler = '.'])
-

method AliasNbPages [line 9375]

+

method AliasNbPages [line 9384]

@@ -5819,7 +5819,7 @@ $alias = '{nb}'])
-

method AliasNumPage [line 9402]

+

method AliasNumPage [line 9411]

@@ -5936,7 +5936,7 @@ $spaces = 0])
-

method arrUTF8ToUTF16BE [line 6787]

+

method arrUTF8ToUTF16BE [line 6796]

@@ -6011,7 +6011,7 @@ $setbom = true])
-

method Bookmark [line 8894]

+

method Bookmark [line 8903]

@@ -6065,7 +6065,7 @@ $page = ''])
-

method Button [line 9176]

+

method Button [line 9185]

@@ -6131,7 +6131,7 @@ $prop = array()])
-

method Cell [line 3352]

+

method Cell [line 3356]

@@ -6227,7 +6227,7 @@ $ignore_min_height = false])
-

method CheckBox [line 9156]

+

method CheckBox [line 9165]

+ + + + +
@@ -6281,13 +6281,14 @@ $prop = array()])
-

method checkPageBreak [line 3309]

+

method checkPageBreak [line 3310]

boolean checkPageBreak( -float -$h) +[float +$h = 0], [mixed +$y = ''])

@@ -6316,6 +6317,11 @@ $h)
float   $h   Cell height. Default value: 0.
mixed  $y  starting y position, leave empty for current position.

@@ -6323,7 +6329,7 @@ $h)
-

method Circle [line 8000]

+

method Circle [line 8009]

@@ -6422,7 +6428,7 @@ $afinish:)
-

method Clip [line 9830]

+

method Clip [line 9839]

@@ -6513,7 +6519,7 @@ $h)
-

method closeHTMLTagHandler [line 12355]

+

method closeHTMLTagHandler [line 12370]

@@ -6567,7 +6573,7 @@ $dom)
-

method ComboBox [line 9137]

+

method ComboBox [line 9146]

@@ -6627,7 +6633,7 @@ $prop = array()])
-

method commitTransaction [line 13858]

+

method commitTransaction [line 13873]

@@ -6655,7 +6661,7 @@ $prop = array()])
-

method convertHTMLColorToDec [line 6918]

+

method convertHTMLColorToDec [line 6927]

@@ -6694,7 +6700,7 @@ $color = '#FFFFFF'])
-

method CoonsPatchMesh [line 9750]

+

method CoonsPatchMesh [line 9759]

@@ -6796,7 +6802,7 @@ $coords_max = 1])
-

method Curve [line 7775]

+

method Curve [line 7784]

@@ -6898,7 +6904,7 @@ $fill_color = array()])
-

method deletePage [line 13561]

+

method deletePage [line 13576]

@@ -6940,7 +6946,7 @@ $page)
-

method Ellipse [line 7896]

+

method Ellipse [line 7905]

@@ -7057,7 +7063,7 @@ $afinish:)
-

method empty_string [line 13905]

+

method empty_string [line 13920]

@@ -7194,7 +7200,7 @@ $msg)
-

method formatPageNumber [line 9479]

+

method formatPageNumber [line 9488]

@@ -7233,7 +7239,7 @@ $num)
-

method formatTOCPageNumber [line 9491]

+

method formatTOCPageNumber [line 9500]

@@ -7275,7 +7281,7 @@ $num)
-

method GetAbsX [line 4839]

+

method GetAbsX [line 4848]

@@ -7306,7 +7312,7 @@ $num)
-

method getAliasNbPages [line 9387]

+

method getAliasNbPages [line 9396]

@@ -7337,7 +7343,7 @@ $num)
-

method getAliasNumPage [line 9415]

+

method getAliasNumPage [line 9424]

@@ -7437,7 +7443,7 @@ $arr)
-

method getBarcode [line 10298]

+

method getBarcode [line 10304]

@@ -7465,7 +7471,7 @@ $arr)
-

method getBorderMode [line 3797]

+

method getBorderMode [line 3801]

@@ -7561,7 +7567,7 @@ $pagenum = ''])
-

method getBuffer [line 13247]

+

method getBuffer [line 13262]

@@ -7592,7 +7598,7 @@ $pagenum = ''])
-

method getCellCode [line 3404]

+

method getCellCode [line 3408]

@@ -7688,7 +7694,7 @@ $ignore_min_height = false])
-

method getCellHeightRatio [line 9653]

+

method getCellHeightRatio [line 9662]

@@ -7758,7 +7764,7 @@ $char)
-

method getFontBuffer [line 13407]

+

method getFontBuffer [line 13422]

@@ -7800,7 +7806,7 @@ $font)
-

method getFontFamily [line 10774]

+

method getFontFamily [line 10780]

@@ -7831,7 +7837,7 @@ $font)
-

method getFontSize [line 10754]

+

method getFontSize [line 10760]

@@ -7862,7 +7868,7 @@ $font)
-

method getFontSizePt [line 10764]

+

method getFontSizePt [line 10770]

@@ -7921,7 +7927,7 @@ $font)
-

method getFontStyle [line 10784]

+

method getFontStyle [line 10790]

@@ -7952,7 +7958,7 @@ $font)
-

method getFooterFont [line 6848]

+

method getFooterFont [line 6857]

@@ -8008,7 +8014,7 @@ $font)
-

method getGDgamma [line 4782]

+

method getGDgamma [line 4791]

@@ -8047,7 +8053,7 @@ $v)
-

method getGraphicVars [line 13115]

+

method getGraphicVars [line 13130]

@@ -8078,7 +8084,7 @@ $v)
-

method getGroupPageNo [line 9428]

+

method getGroupPageNo [line 9437]

@@ -8103,7 +8109,7 @@ $v)
-

method getGroupPageNoFormatted [line 9438]

+

method getGroupPageNoFormatted [line 9447]

@@ -8162,7 +8168,7 @@ $v)
-

method getHeaderFont [line 6828]

+

method getHeaderFont [line 6837]

@@ -8218,7 +8224,7 @@ $v)
-

method getHtmlDomArray [line 10820]

+

method getHtmlDomArray [line 10826]

@@ -8257,7 +8263,7 @@ $html)
-

method getHTMLUnitToUnits [line 12834]

+

method getHTMLUnitToUnits [line 12849]

@@ -8323,7 +8329,7 @@ $point)
-

method getImageBuffer [line 13349]

+

method getImageBuffer [line 13364]

@@ -8480,7 +8486,7 @@ $image)
-

method GetLineWidth [line 7492]

+

method GetLineWidth [line 7501]

@@ -8514,7 +8520,7 @@ $image)
-

method getMargins [line 10717]

+

method getMargins [line 10723]

@@ -8587,7 +8593,7 @@ $s)
-

method getNumLines [line 3876]

+

method getNumLines [line 3880]

@@ -8669,7 +8675,7 @@ $w = 0])
-

method getObjFilename [line 13179]

+

method getObjFilename [line 13194]

@@ -8714,7 +8720,7 @@ $prefix)
-

method getOriginalMargins [line 10740]

+

method getOriginalMargins [line 10746]

@@ -8779,7 +8785,7 @@ $prefix)
-

method getPageBuffer [line 13290]

+

method getPageBuffer [line 13305]

@@ -8866,7 +8872,7 @@ $pagenum = ''])
-

method getPageGroupAlias [line 9450]

+

method getPageGroupAlias [line 9459]

@@ -8939,7 +8945,7 @@ $pagenum = ''])
-

method getPageNumGroupAlias [line 9465]

+

method getPageNumGroupAlias [line 9474]

@@ -9012,7 +9018,7 @@ $pagenum = ''])
-

method getPDFData [line 6867]

+

method getPDFData [line 6876]

@@ -9037,7 +9043,7 @@ $pagenum = ''])
-

method getRemainingWidth [line 4233]

+

method getRemainingWidth [line 4237]

@@ -9190,7 +9196,7 @@ $fontsize = 0])
-

method GetX [line 4823]

+

method GetX [line 4832]

@@ -9221,7 +9227,7 @@ $fontsize = 0])
-

method GetY [line 4850]

+

method GetY [line 4859]

@@ -9252,7 +9258,7 @@ $fontsize = 0])
-

method Gradient [line 9853]

+

method Gradient [line 9862]

@@ -9337,7 +9343,7 @@ $coords)
-

method Image [line 4354]

+

method Image [line 4358]

- + - + @@ -9457,7 +9463,7 @@ $border = 0])
-

method ImageEps [line 10025]

+

method ImageEps [line 10034]

@@ -9350,7 +9356,7 @@ $w = 0], [float $h = 0], [string $type = ''], [mixed $link = ''], [string -$align = ''], [boolean +$align = ''], [mixed $resize = false], [int $dpi = 300], [string $palign = ''], [boolean @@ -9422,9 +9428,9 @@ $border = 0]) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
boolean  mixed   $resize  If true resize (reduce) the image to fit $w and $h (requires GD library).If false do not resize, if true resize (reduce) the image to fit $w and $h (requires GD library), if null scale image dimensions to fit within the ($w,$h) box proportionally.
int  
@@ -9553,7 +9559,7 @@ $border = 0])
-

method ImagePngAlpha [line 4738]

+

method ImagePngAlpha [line 4747]

@@ -9658,7 +9664,7 @@ $palign = ''])
-

method IncludeJS [line 8986]

+

method IncludeJS [line 8995]

@@ -9694,7 +9700,7 @@ $script)
-

method intToRoman [line 12908]

+

method intToRoman [line 12923]

@@ -9778,7 +9784,7 @@ $resetmargins = false])
-

method Line [line 7642]

+

method Line [line 7651]

@@ -9844,7 +9850,7 @@ $style = array()])
-

method LinearGradient [line 9710]

+

method LinearGradient [line 9719]

@@ -9994,7 +10000,7 @@ $spaces = 0])
-

method ListBox [line 9114]

+

method ListBox [line 9123]

@@ -10054,7 +10060,7 @@ $prop = array()])
-

method Ln [line 4795]

+

method Ln [line 4804]

@@ -10102,7 +10108,7 @@ $cell = false])
-

method MirrorH [line 7266]

+

method MirrorH [line 7275]

@@ -10144,7 +10150,7 @@ $x = ''])
-

method MirrorL [line 7302]

+

method MirrorL [line 7311]

@@ -10198,7 +10204,7 @@ $y = ''])
-

method MirrorP [line 7289]

+

method MirrorP [line 7298]

@@ -10246,7 +10252,7 @@ $y = ''])
-

method MirrorV [line 7277]

+

method MirrorV [line 7286]

@@ -10288,7 +10294,7 @@ $y = ''])
-

method movePage [line 13424]

+

method movePage [line 13439]

@@ -10336,7 +10342,7 @@ $topage)
-

method MultiCell [line 3639]

+

method MultiCell [line 3643]

@@ -10462,7 +10468,7 @@ $maxh = 0])
-

method objclone [line 13894]

+

method objclone [line 13909]

@@ -10535,7 +10541,7 @@ $object)
-

method openHTMLTagHandler [line 12031]

+

method openHTMLTagHandler [line 12044]

@@ -10589,7 +10595,7 @@ $dom)
-

method Output [line 4942]

+

method Output [line 4951]

@@ -10671,7 +10677,7 @@ $dest = 'I'])
-

method PageNoFormatted [line 9501]

+

method PageNoFormatted [line 9510]

@@ -10702,7 +10708,7 @@ $dest = 'I'])
-

method PieSector [line 9947]

+

method PieSector [line 9956]

@@ -10804,7 +10810,7 @@ $o:)
-

method pixelsToUnits [line 6971]

+

method pixelsToUnits [line 6980]

@@ -10846,7 +10852,7 @@ $px)
-

method Polycurve [line 7832]

+

method Polycurve [line 7841]

@@ -10918,7 +10924,7 @@ $fill_color = array()])
-

method Polygon [line 8025]

+

method Polygon [line 8034]

@@ -10975,7 +10981,7 @@ $fill_color = array()])
-

method putHtmlListBullet [line 12973]

+

method putHtmlListBullet [line 12988]

@@ -11026,7 +11032,7 @@ $size = 10])
-

method RadialGradient [line 9728]

+

method RadialGradient [line 9737]

@@ -11104,7 +11110,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])
-

method RadioButton [line 9096]

+

method RadioButton [line 9105]

@@ -11152,7 +11158,7 @@ $prop = array()])
-

method readDiskCache [line 13219]

+

method readDiskCache [line 13234]

@@ -11200,7 +11206,7 @@ $file)
-

method Rect [line 7677]

+

method Rect [line 7686]

@@ -11278,7 +11284,7 @@ $fill_color = array()])
-

method RegularPolygon [line 8124]

+

method RegularPolygon [line 8133]

@@ -11389,7 +11395,7 @@ $r:)
-

method removeSHY [line 3369]

+

method removeSHY [line 3373]

@@ -11431,7 +11437,7 @@ $txt = ''])
-

method rfread [line 4708]

+

method rfread [line 4717]

@@ -11482,7 +11488,7 @@ $length)
-

method rollbackTransaction [line 13871]

+

method rollbackTransaction [line 13886]

@@ -11513,7 +11519,7 @@ $length)
-

method Rotate [line 7361]

+

method Rotate [line 7370]

@@ -11567,7 +11573,7 @@ $y = ''])
-

method RoundedRect [line 8228]

+

method RoundedRect [line 8237]

@@ -11654,7 +11660,7 @@ $fill_color = array()])
-

method Scale [line 7231]

+

method Scale [line 7240]

@@ -11714,7 +11720,7 @@ $y = ''])
-

method ScaleX [line 7191]

+

method ScaleX [line 7200]

@@ -11768,7 +11774,7 @@ $y = ''])
-

method ScaleXY [line 7217]

+

method ScaleXY [line 7226]

@@ -11822,7 +11828,7 @@ $y = ''])
-

method ScaleY [line 7204]

+

method ScaleY [line 7213]

@@ -11876,7 +11882,7 @@ $y = ''])
-

method setAlpha [line 9610]

+

method setAlpha [line 9619]

@@ -12008,7 +12014,7 @@ $margin = 0])
-

method setBarcode [line 10288]

+

method setBarcode [line 10294]

@@ -12044,7 +12050,7 @@ $bc = ''])
-

method SetBooklet [line 12748]

+

method SetBooklet [line 12763]

@@ -12095,7 +12101,7 @@ $outer = -1])
-

method setBuffer [line 13229]

+

method setBuffer [line 13244]

@@ -12134,7 +12140,7 @@ $data)
-

method setCellHeightRatio [line 9644]

+

method setCellHeightRatio [line 9653]

@@ -12332,7 +12338,7 @@ $font)
-

method setDefaultTableColumns [line 9634]

+

method setDefaultTableColumns [line 9643]

@@ -12569,7 +12575,7 @@ $tint = 100])
-

method setExtGState [line 9579]

+

method setExtGState [line 9588]

@@ -12815,7 +12821,7 @@ $fontfile = ''])
-

method setFontBuffer [line 13365]

+

method setFontBuffer [line 13380]

@@ -12902,7 +12908,7 @@ $size)
-

method setFontSubBuffer [line 13387]

+

method setFontSubBuffer [line 13402]

@@ -12981,7 +12987,7 @@ $data)
-

method setFooterFont [line 6838]

+

method setFooterFont [line 6847]

@@ -13056,7 +13062,7 @@ $fm = 10])
-

method setGraphicVars [line 13146]

+

method setGraphicVars [line 13161]

@@ -13177,7 +13183,7 @@ $hs = ''])
-

method setHeaderFont [line 6818]

+

method setHeaderFont [line 6827]

@@ -13252,7 +13258,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 12819]

+

method setHtmlLinksStyle [line 12834]

@@ -13297,7 +13303,7 @@ $fontstyle = 'U'])
-

method setHtmlVSpace [line 12788]

+

method setHtmlVSpace [line 12803]

@@ -13336,7 +13342,7 @@ $tagvs)
-

method setImageBuffer [line 13306]

+

method setImageBuffer [line 13321]

@@ -13423,7 +13429,7 @@ $scale)
-

method setImageSubBuffer [line 13329]

+

method setImageSubBuffer [line 13344]

@@ -13474,7 +13480,7 @@ $data)
-

method setJPEGQuality [line 9621]

+

method setJPEGQuality [line 9630]

@@ -13552,7 +13558,7 @@ $keywords)
-

method setLanguageArray [line 6858]

+

method setLanguageArray [line 6867]

@@ -13675,7 +13681,7 @@ $margin)
-

method SetLineStyle [line 7517]

+

method SetLineStyle [line 7526]

@@ -13721,7 +13727,7 @@ $style)
-

method SetLineWidth [line 7478]

+

method SetLineWidth [line 7487]

@@ -13817,7 +13823,7 @@ $page = -1])
-

method setListIndentWidth [line 12798]

+

method setListIndentWidth [line 12813]

@@ -13856,7 +13862,7 @@ $width)
-

method setLIsymbol [line 12708]

+

method setLIsymbol [line 12723]

@@ -13949,7 +13955,7 @@ $right = -1])
-

method setOpenCell [line 12808]

+

method setOpenCell [line 12823]

@@ -14036,7 +14042,7 @@ $resetmargins = false])
-

method setPageBuffer [line 13263]

+

method setPageBuffer [line 13278]

@@ -14250,7 +14256,7 @@ $unit)
-

method setPDFVersion [line 9663]

+

method setPDFVersion [line 9672]

@@ -14364,7 +14370,7 @@ $val = true])
-

method SetProtection [line 7134]

+

method SetProtection [line 7143]

@@ -14499,7 +14505,7 @@ $enable)
-

method setSignature [line 9335]

+

method setSignature [line 9344]

@@ -14908,7 +14914,7 @@ $margin)
-

method setUserRights [line 9306]

+

method setUserRights [line 9315]

@@ -14968,7 +14974,7 @@ $signature = '/Modify'])
-

method setViewerPreferences [line 9693]

+

method setViewerPreferences [line 9702]

@@ -15004,7 +15010,7 @@ $preferences)
-

method setVisibility [line 9531]

+

method setVisibility [line 9540]

@@ -15040,7 +15046,7 @@ $v)
-

method SetX [line 4863]

+

method SetX [line 4872]

@@ -15082,7 +15088,7 @@ $x)
-

method SetXY [line 4926]

+

method SetXY [line 4935]

@@ -15130,7 +15136,7 @@ $y)
-

method SetY [line 4895]

+

method SetY [line 4904]

@@ -15178,7 +15184,7 @@ $resetx = true])
-

method Skew [line 7421]

+

method Skew [line 7430]

@@ -15238,7 +15244,7 @@ $y = ''])
-

method SkewX [line 7394]

+

method SkewX [line 7403]

@@ -15292,7 +15298,7 @@ $y = ''])
-

method SkewY [line 7407]

+

method SkewY [line 7416]

@@ -15346,7 +15352,7 @@ $y = ''])
-

method StarPolygon [line 8179]

+

method StarPolygon [line 8188]

@@ -15518,7 +15524,7 @@ $format = ''])
-

method startPageGroup [line 9360]

+

method startPageGroup [line 9369]

@@ -15554,7 +15560,7 @@ $page = ''])
-

method startTransaction [line 13844]

+

method startTransaction [line 13859]

@@ -15582,7 +15588,7 @@ $page = ''])
-

method StartTransform [line 7162]

+

method StartTransform [line 7171]

@@ -15613,7 +15619,7 @@ $page = ''])
-

method StopTransform [line 7175]

+

method StopTransform [line 7184]

@@ -15644,7 +15650,7 @@ $page = ''])
-

method swapMargins [line 12764]

+

method swapMargins [line 12779]

@@ -15752,7 +15758,7 @@ $clip = false])
-

method TextField [line 9083]

+

method TextField [line 9092]

@@ -15806,7 +15812,7 @@ $prop = array()])
-

method Transform [line 7454]

+

method Transform [line 7463]

@@ -15848,7 +15854,7 @@ $tm)
-

method Translate [line 7337]

+

method Translate [line 7346]

@@ -15896,7 +15902,7 @@ $t_y)
-

method TranslateX [line 7314]

+

method TranslateX [line 7323]

@@ -15938,7 +15944,7 @@ $t_x)
-

method TranslateY [line 7325]

+

method TranslateY [line 7334]

@@ -15980,7 +15986,7 @@ $t_y)
-

method unhtmlentities [line 6982]

+

method unhtmlentities [line 6991]

@@ -16019,7 +16025,7 @@ $text_to_convert)
-

method UniArrSubString [line 4272]

+

method UniArrSubString [line 4276]

@@ -16073,7 +16079,7 @@ $end = ''])
-

method unichr [line 4305]

+

method unichr [line 4309]

@@ -16118,7 +16124,7 @@ $c)
-

method UTF8ArrayToUniArray [line 4293]

+

method UTF8ArrayToUniArray [line 4297]

@@ -16160,7 +16166,7 @@ $ta)
-

method UTF8ArrSubString [line 4249]

+

method UTF8ArrSubString [line 4253]

@@ -16211,7 +16217,7 @@ $end = ''])
-

method utf8Bidi [line 8327]

+

method utf8Bidi [line 8336]

@@ -16265,7 +16271,7 @@ $forcertl = false])
-

method UTF8StringToArray [line 6620]

+

method UTF8StringToArray [line 6629]

@@ -16331,7 +16337,7 @@ $str)
-

method utf8StrRev [line 8313]

+

method utf8StrRev [line 8322]

@@ -16385,7 +16391,7 @@ $forcertl = false])
-

method UTF8ToLatin1 [line 6727]

+

method UTF8ToLatin1 [line 6736]

@@ -16427,7 +16433,7 @@ $str)
-

method UTF8ToUTF16BE [line 6711]

+

method UTF8ToUTF16BE [line 6720]

@@ -16478,7 +16484,7 @@ $setbom = true])
-

method Write [line 3919]

+

method Write [line 3923]

@@ -16574,7 +16580,7 @@ $maxh = 0])
-

method write1DBarcode [line 10317]

+

method write1DBarcode [line 10323]

@@ -16664,7 +16670,7 @@ $align = ''])
-

method write2DBarcode [line 10570]

+

method write2DBarcode [line 10576]

@@ -16748,7 +16754,7 @@ $align = ''])
-

method writeBarcode [line 10520]

+

method writeBarcode [line 10526]

@@ -16838,7 +16844,7 @@ $code)
-

method writeDiskCache [line 13191]

+

method writeDiskCache [line 13206]

@@ -16895,7 +16901,7 @@ $file)
-

method writeHTML [line 11213]

+

method writeHTML [line 11219]

@@ -16961,7 +16967,7 @@ $align = ''])
-

method writeHTMLCell [line 10808]

+

method writeHTMLCell [line 10814]

@@ -17063,7 +17069,7 @@ $autopadding = true])
-

method _addfield [line 9048]

+

method _addfield [line 9057]

@@ -17135,7 +17141,7 @@ $prop)
-

method _beginpage [line 6400]

+

method _beginpage [line 6409]

@@ -17177,7 +17183,7 @@ $format = ''])
-

method _datastring [line 6510]

+

method _datastring [line 6519]

@@ -17216,7 +17222,7 @@ $s)
-

method _destroy [line 5097]

+

method _destroy [line 5106]

@@ -17261,7 +17267,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 5124]

+

method _dochecks [line 5133]

@@ -17286,7 +17292,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 6475]

+

method _dolinethrough [line 6484]

@@ -17334,7 +17340,7 @@ $txt)
-

method _dounderline [line 6461]

+

method _dounderline [line 6470]

@@ -17382,7 +17388,7 @@ $txt)
-

method _enddoc [line 6341]

+

method _enddoc [line 6350]

@@ -17407,7 +17413,7 @@ $txt)
-

method _endpage [line 6439]

+

method _endpage [line 6448]

@@ -17432,7 +17438,7 @@ $txt)
-

method _escape [line 6499]

+

method _escape [line 6508]

@@ -17471,7 +17477,7 @@ $s)
-

method _escapetext [line 6537]

+

method _escapetext [line 6546]

@@ -17510,7 +17516,7 @@ $s)
-

method _freadint [line 6488]

+

method _freadint [line 6497]

@@ -17549,7 +17555,7 @@ $f)
-

method _generateencryptionkey [line 7102]

+

method _generateencryptionkey [line 7111]

@@ -17603,7 +17609,7 @@ $protection)
-

method _getfontpath [line 5140]

+

method _getfontpath [line 5149]

@@ -17628,7 +17634,7 @@ $protection)
-

method _JScolor [line 9024]

+

method _JScolor [line 9033]

@@ -17664,7 +17670,7 @@ $color)
-

method _md5_16 [line 7063]

+

method _md5_16 [line 7072]

@@ -17709,7 +17715,7 @@ $str)
-

method _newobj [line 6448]

+

method _newobj [line 6457]

@@ -17734,7 +17740,7 @@ $str)
-

method _objectkey [line 6995]

+

method _objectkey [line 7004]

@@ -17773,7 +17779,7 @@ $n)
-

method _out [line 6568]

+

method _out [line 6577]

@@ -17809,7 +17815,7 @@ $s)
-

method _outarc [line 9927]

+

method _outarc [line 9936]

@@ -17881,7 +17887,7 @@ $y3)
-

method _outCurve [line 7622]

+

method _outCurve [line 7631]

@@ -17947,7 +17953,7 @@ $y3)
-

method _outLine [line 7586]

+

method _outLine [line 7595]

@@ -17989,7 +17995,7 @@ $y)
-

method _outPoint [line 7572]

+

method _outPoint [line 7581]

@@ -18031,7 +18037,7 @@ $y)
-

method _outRect [line 7603]

+

method _outRect [line 7612]

@@ -18094,7 +18100,7 @@ $op)
-

method _Ovalue [line 7076]

+

method _Ovalue [line 7085]

@@ -18145,7 +18151,7 @@ $owner_pass)
-

method _parsejpeg [line 4577]

+

method _parsejpeg [line 4586]

@@ -18184,7 +18190,7 @@ $file)
-

method _parsepng [line 4603]

+

method _parsepng [line 4612]

@@ -18223,7 +18229,7 @@ $file)
-

method _putannots [line 5296]

+

method _putannots [line 5305]

@@ -18265,7 +18271,7 @@ $n)
-

method _putbookmarks [line 8922]

+

method _putbookmarks [line 8931]

@@ -18290,7 +18296,7 @@ $n)
-

method _putcatalog [line 6206]

+

method _putcatalog [line 6215]

@@ -18315,7 +18321,7 @@ $n)
-

method _putcertification [line 9249]

+

method _putcertification [line 9258]

@@ -18340,7 +18346,7 @@ $n)
-

method _putcidfont0 [line 5962]

+

method _putcidfont0 [line 5971]

@@ -18413,7 +18419,7 @@ $font)
-

method _putencryption [line 7004]

+

method _putencryption [line 7013]

@@ -18441,7 +18447,7 @@ $font)
-

method _putextgstates [line 9589]

+

method _putextgstates [line 9598]

@@ -18466,7 +18472,7 @@ $font)
-

method _putfonts [line 5652]

+

method _putfonts [line 5661]

@@ -18491,7 +18497,7 @@ $font)
-

method _putfontwidths [line 5779]

+

method _putfontwidths [line 5788]

@@ -18539,7 +18545,7 @@ $cidoffset = 0])
-

method _putheader [line 6333]

+

method _putheader [line 6342]

@@ -18564,7 +18570,7 @@ $cidoffset = 0])
-

method _putimages [line 6022]

+

method _putimages [line 6031]

@@ -18589,7 +18595,7 @@ $cidoffset = 0])
-

method _putinfo [line 6179]

+

method _putinfo [line 6188]

@@ -18614,7 +18620,7 @@ $cidoffset = 0])
-

method _putjavascript [line 8996]

+

method _putjavascript [line 9005]

@@ -18639,7 +18645,7 @@ $cidoffset = 0])
-

method _putocg [line 9510]

+

method _putocg [line 9519]

@@ -18664,7 +18670,7 @@ $cidoffset = 0])
-

method _putpages [line 5151]

+

method _putpages [line 5160]

@@ -18689,7 +18695,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 6105]

+

method _putresourcedict [line 6114]

@@ -18714,7 +18720,7 @@ $cidoffset = 0])
-

method _putresources [line 6146]

+

method _putresources [line 6155]

@@ -18739,7 +18745,7 @@ $cidoffset = 0])
-

method _putshaders [line 9877]

+

method _putshaders [line 9886]

@@ -18770,7 +18776,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 6077]

+

method _putspotcolors [line 6086]

@@ -18798,7 +18804,7 @@ $cidoffset = 0])
-

method _putstream [line 6554]

+

method _putstream [line 6563]

@@ -18834,7 +18840,7 @@ $s)
-

method _puttrailer [line 6319]

+

method _puttrailer [line 6328]

@@ -18859,7 +18865,7 @@ $s)
-

method _puttruetypeunicode [line 5877]

+

method _puttruetypeunicode [line 5886]

@@ -18901,7 +18907,7 @@ $font)
-

method _putuserrights [line 9199]

+

method _putuserrights [line 9208]

diff --git a/tcpdf.php b/tcpdf.php index 50496a4..ead9b2a 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-05-13 +// Last Update : 2009-05-17 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.009 +// Version : 4.6.010 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -126,7 +126,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.6.009 + * @version 4.6.010 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.009 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.010 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 4.6.009 + * @version 4.6.010 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3302,12 +3302,16 @@ if (!class_exists('TCPDF', false)) { /** * Add page if needed. * @param float $h Cell height. Default value: 0. + * @param mixed $y starting y position, leave empty for current position. * @return boolean true in case of page break, false otherwise. * @since 3.2.000 (2008-07-01) * @access protected */ - protected function checkPageBreak($h) { - if ((($this->y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) { + protected function checkPageBreak($h=0, $y='') { + if ($this->empty_string($y)) { + $y = $this->y; + } + if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) { //Automatic page break $x = $this->x; $this->AddPage($this->CurOrientation); @@ -4341,7 +4345,7 @@ if (!class_exists('TCPDF', false)) { * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension. * @param mixed $link URL or identifier returned by AddLink(). * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
- * @param boolean $resize If true resize (reduce) the image to fit $w and $h (requires GD library). + * @param mixed $resize If false do not resize, if true resize (reduce) the image to fit $w and $h (requires GD library), if null scale image dimensions to fit within the ($w,$h) box proportionally. * @param int $dpi dot-per-inch resolution used on resize * @param string $palign Allows to center or align the image on the current line. Possible values are:
  • L : left align
  • C : center
  • R : right align
  • '' : empty string : left for LTR or right for RTL
* @param boolean $ismask true if this image is a mask, false otherwise @@ -4379,6 +4383,14 @@ if (!class_exists('TCPDF', false)) { $w = $h * $pixw / $pixh; } elseif ($h <= 0) { $h = $w * $pixh / $pixw; + } elseif (($w > 0) AND ($h > 0) AND is_null($resize)) { + // scale image dimensions to fit within the ($w, $h) box proportionally without resampling the image + if ($pixw >= $pixh) { + $h = $w * $pixh / $pixw; + } else { + $w = $h * $pixw / $pixh; + } + $resize = false; } // calculate new minimum dimensions in pixels $neww = round($w * $this->k * $dpi / $this->dpi); @@ -4463,12 +4475,9 @@ if (!class_exists('TCPDF', false)) { } else { $info = $this->getImageBuffer($file); } - // Check whether we need a new page first as this does not fit - if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND $this->AcceptPageBreak()) { - // Automatic page break - $this->AddPage($this->CurOrientation); - // Reset Y coordinate to the top of next page - $y = $this->GetY() + $this->cMargin; + // Check whether we need a new page first as this does not fit + if ($this->checkPageBreak($h, $y)) { + $y = $this->GetY() + $this->cMargin; } // set bottomcoordinates $this->img_rb_y = $y + $h; @@ -10092,12 +10101,9 @@ if (!class_exists('TCPDF', false)) { $h = ($y2 - $y1) / $k; } } - // Check whether we need a new page first as this does not fit - if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND $this->AcceptPageBreak()) { - // Automatic page break - $this->AddPage($this->CurOrientation); - // Reset Y coordinate to the top of next page - $y = $this->GetY() + $this->cMargin; + // Check whether we need a new page first as this does not fit + if ($this->checkPageBreak($h, $y)) { + $y = $this->GetY() + $this->cMargin; } // set bottomcoordinates $this->img_rb_y = $y + $h; @@ -10822,7 +10828,7 @@ if (!class_exists('TCPDF', false)) { $html = strip_tags($html, '


    • diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index db6a343..1092a68 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 Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    @@ -18926,7 +18932,7 @@ $font)
    -

    method _putviewerpreferences [line 6249]

    +

    method _putviewerpreferences [line 6258]

    diff --git a/doc/index.html b/doc/index.html index db6a343..1092a68 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 Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/errors.html b/doc/errors.html index b2e2820..9e87c65 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Wed, 13 May 2009 13:03:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:20 +0200 by phpDocumentor 1.4.1
    @@ -18957,7 +18963,7 @@ $font)
    -

    method _putxobjectdict [line 6094]

    +

    method _putxobjectdict [line 6103]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 44e0fc1..a970b78 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1387,7 +1387,7 @@ top
    - Documentation generated on Wed, 13 May 2009 13:03:42 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/elementindex.html b/doc/elementindex.html index ee3656a..cca4a5d 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1364,7 +1364,7 @@ top
    - Documentation generated on Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    @@ -18982,7 +18988,7 @@ $font)
    -

    method _RC4 [line 7023]

    +

    method _RC4 [line 7032]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 3268ec6..2ec0168 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 Wed, 13 May 2009 13:03:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:20 +0200 by phpDocumentor 1.4.1
    @@ -19033,7 +19039,7 @@ $text)
    -

    method _textstring [line 6523]

    +

    method _textstring [line 6532]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 6c4eda9..e19f5eb 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -104,7 +104,7 @@ unicode data

    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index c20a7e3..0f320c0 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 Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:15 +0200 by phpDocumentor 1.4.1
    @@ -19072,7 +19078,7 @@ $s)
    -

    method _toJPEG [line 4561]

    +

    method _toJPEG [line 4570]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index ed5a9e7..a3f73fe 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 Wed, 13 May 2009 13:03:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:20 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 60e988c..404bce9 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 Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    @@ -19114,7 +19120,7 @@ $file)
    -

    method _Uvalue [line 7089]

    +

    method _Uvalue [line 7098]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 987d9ea..3d9ff48 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
    - Documentation generated on Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:14 +0200 by phpDocumentor 1.4.1
    @@ -19151,7 +19157,7 @@ $file)
    - Documentation generated on Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:15 +0200 by phpDocumentor 1.4.1
    		author:  Nicola Asuni
    version:  4.6.009version:  4.6.010
    copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
    - PDF_PRODUCER = 'TCPDF 4.6.009 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.010 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data

    - Documentation generated on Wed, 13 May 2009 13:03:43 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 17 May 2009 21:39:15 +0200 by phpDocumentor 1.4.1
      '); //replace some blank characters $html = preg_replace('/
      ]*)>[\n\r\t]+/', '<\\1\\2>', $html);
+			$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
 			$html = preg_replace('@(\r\n|\r)@', "\n", $html);
 			$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
 			$html = strtr($html, $repTable);
@@ -11226,7 +11232,7 @@ if (!class_exists('TCPDF', false)) {
 			$newline = true;
 			$loop = 0;
 			$curpos = 0;
-			$blocktags = array('blockquote','br','dd','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul');
+			$blocktags = array('blockquote','br','dd','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf');
 			$this->premode = false;
 			if (isset($this->PageAnnots[$this->page])) {
 				$pask = count($this->PageAnnots[$this->page]);
@@ -11276,11 +11282,13 @@ if (!class_exists('TCPDF', false)) {
 					if ((!$this->newline)
 						AND ($dom[$key]['value'] == 'img')
 						AND (isset($dom[$key]['attribute']['height']))
-						AND ($dom[$key]['attribute']['height'] > 0)
-						AND (!((($this->y + $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px')) > $this->PageBreakTrigger)
-							AND (!$this->InFooter)
-							AND $this->AcceptPageBreak()))
-						) {
+						AND ($dom[$key]['attribute']['height'] > 0)) {
+						// get image height
+						$imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px');
+						if (!$this->InFooter) {
+							// check for page break
+							$this->checkPageBreak($imgh);
+						}
 						if ($this->page > $startlinepage) {
 							// fix lines splitted over two pages
 							if (isset($this->footerlen[$startlinepage])) {
@@ -11311,9 +11319,14 @@ if (!class_exists('TCPDF', false)) {
 									}
 								}
 							}
+							$startlinepos = $this->intmrk[$this->page];
+							$startlinepage = $this->page;
+							$startliney = $this->y;
 						}
-						$this->y += (($curfontsize / $this->k) - $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px'));
+						
+						$this->y += (($curfontsize / $this->k) - $imgh);
 						$minstartliney = min($this->y, $minstartliney);
+						
 					} elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize'])) {
 						// account for different font size
 						$pfontname = $curfontname;
@@ -11391,7 +11404,7 @@ if (!class_exists('TCPDF', false)) {
 					}
 				}
 				// align lines
-				if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
+				if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
 					$newline = true;
 					// we are at the beginning of a new line
 					if (isset($startlinex)) {
@@ -12180,9 +12193,11 @@ if (!class_exists('TCPDF', false)) {
 							// currently only support 1 (frame) or a combination of 'LTRB'
 							$border = $tag['attribute']['border'];
 						}
+						$iw = '';
 						if (isset($tag['attribute']['width'])) {
 							$iw = $this->getHTMLUnitToUnits($tag['attribute']['width'], 1, 'px', false);
 						}
+						$ih = '';
 						if (isset($tag['attribute']['height'])) {
 							$ih = $this->getHTMLUnitToUnits($tag['attribute']['height'], 1, 'px', false);
 						}