diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 1293b51..3d13098 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.5.005 (2010-06-28) + - Bug #3022170 "getFontDescent() does not return correct descent value" was fixed. + - Some problems with multicolumn mode were fixed. + 5.5.004 (2010-06-27) - Bug #3021803 "SVG Border" was fixed. @@ -15,7 +19,7 @@ 5.5.000 (2010-06-22) - Several PDF syntax errors (and related bugs) were fixed. - Bug #3019090 "/Length values are wrong if AES encryption is used" was fixed. - + ------------------------------------------------------------ 5.4.003 (2010-06-19) diff --git a/README.TXT b/README.TXT index 0d74446..09fd66b 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.5.004 -Release date: 2010-06-27 +Version: 5.5.005 +Release date: 2010-06-28 Author: Nicola Asuni Copyright (c) 2002-2010: @@ -32,7 +32,7 @@ Main Features: * all standard page formats, custom page formats, custom margins and units of measure; * UTF-8 Unicode and Right-To-Left languages; * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts; - * Font subsetting; + * font subsetting; * methods to publish some XHTML + CSS code, Javascript and Forms; * images, graphic (geometric figures) and transformation methods; * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http: www.imagemagick.org/www/formats.html) diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 6c55a85..716cce3 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@

- Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index e7ecb13..9cca6c5 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)

- Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 0f68eff..41c8a1e 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)

- Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index e487c57..6d1618b 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

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

method AcceptPageBreak [line 4819]

+

method AcceptPageBreak [line 4823]

@@ -6988,7 +6988,7 @@ $diskcache = false])
-

method addExtGState [line 14408]

+

method addExtGState [line 14413]

@@ -7099,7 +7099,7 @@ $subset = 'default'])
-

method addHtmlLink [line 10448]

+

method addHtmlLink [line 10453]

@@ -7174,7 +7174,7 @@ $firstblock = false])
-

method addHTMLTOC [line 20460]

+

method addHTMLTOC [line 20469]

@@ -7237,7 +7237,7 @@ $correct_align = true])
-

method addHTMLVertSpace [line 19190]

+

method addHTMLVertSpace [line 19199]

@@ -7291,7 +7291,7 @@ $firstorlast = false])
-

method addJavascriptObject [line 13004]

+

method addJavascriptObject [line 13009]

@@ -7342,7 +7342,7 @@ $onload = false])
-

method AddLink [line 4620]

+

method AddLink [line 4624]

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

method addTOC [line 20310]

+

method addTOC [line 20319]

@@ -7616,7 +7616,7 @@ $keepmargins = false])
-

method AliasNbPages [line 14220]

+

method AliasNbPages [line 14225]

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

method AliasNumPage [line 14247]

+

method AliasNumPage [line 14252]

@@ -7700,7 +7700,7 @@ $alias = '{pnb}'])
-

method Annotation [line 4676]

+

method Annotation [line 4680]

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

method Arrow [line 12213]

+

method Arrow [line 12218]

@@ -7853,7 +7853,7 @@ $arm_angle = 15])
-

method arrUTF8ToUTF16BE [line 10343]

+

method arrUTF8ToUTF16BE [line 10348]

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

method Bookmark [line 12881]

+

method Bookmark [line 12886]

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

method Button [line 13893]

+

method Button [line 13898]

@@ -8084,7 +8084,7 @@ $js = false])
-

method Cell [line 4926]

+

method Cell [line 4930]

@@ -8192,7 +8192,7 @@ $valign = 'M'])
-

method CheckBox [line 13823]

+

method CheckBox [line 13828]

@@ -8282,7 +8282,7 @@ $js = false])
-

method checkPageBreak [line 4846]

+

method checkPageBreak [line 4850]

@@ -8336,7 +8336,7 @@ $addpage = true])
-

method Circle [line 11901]

+

method Circle [line 11906]

@@ -8435,7 +8435,7 @@ $angend:)
-

method Clip [line 14870]

+

method Clip [line 14875]

@@ -8526,7 +8526,7 @@ $h)
-

method closeHTMLTagHandler [line 18800]

+

method closeHTMLTagHandler [line 18809]

@@ -8586,7 +8586,7 @@ $dom)
-

method colorRegistrationBar [line 14545]

+

method colorRegistrationBar [line 14550]

@@ -8664,7 +8664,7 @@ $colors = 'A,R,G,B,C,M,Y,K'])
-

method ComboBox [line 13762]

+

method ComboBox [line 13767]

@@ -8754,7 +8754,7 @@ $js = false])
-

method commitTransaction [line 20572]

+

method commitTransaction [line 20581]

@@ -8782,7 +8782,7 @@ $js = false])
-

method convertHexStringToString [line 11071]

+

method convertHexStringToString [line 11076]

@@ -8824,7 +8824,7 @@ $bs)
-

method convertHTMLColorToDec [line 10481]

+

method convertHTMLColorToDec [line 10486]

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

method convertStringToHexString [line 11093]

+

method convertStringToHexString [line 11098]

@@ -8908,7 +8908,7 @@ $s)
-

method convertSVGtMatrix [line 21539]

+

method convertSVGtMatrix [line 21549]

@@ -8950,7 +8950,7 @@ $tm)
-

method CoonsPatchMesh [line 14785]

+

method CoonsPatchMesh [line 14790]

@@ -9058,7 +9058,7 @@ $antialias = false])
-

method copyPage [line 20242]

+

method copyPage [line 20251]

@@ -9100,7 +9100,7 @@ $page = 0])
-

method cropMark [line 14643]

+

method cropMark [line 14648]

@@ -9172,7 +9172,7 @@ $color = array(0,0,0)])
-

method Curve [line 11706]

+

method Curve [line 11711]

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

method deletePage [line 20105]

+

method deletePage [line 20114]

@@ -9316,7 +9316,7 @@ $page)
-

method Ellipse [line 11770]

+

method Ellipse [line 11775]

@@ -9436,7 +9436,7 @@ $afinish:)
-

method empty_string [line 20626]

+

method empty_string [line 20635]

@@ -9520,7 +9520,7 @@ $tocpage = false])
-

method endSVGElementHandler [line 22565]

+

method endSVGElementHandler [line 22575]

@@ -9638,7 +9638,7 @@ $msg)
-

method extractCSSproperties [line 16099]

+

method extractCSSproperties [line 16107]

@@ -9708,7 +9708,7 @@ $cssdata)
-

method formatPageNumber [line 14324]

+

method formatPageNumber [line 14329]

@@ -9747,7 +9747,7 @@ $num)
-

method formatTOCPageNumber [line 14336]

+

method formatTOCPageNumber [line 14341]

@@ -9789,7 +9789,7 @@ $num)
-

method GetAbsX [line 6910]

+

method GetAbsX [line 6915]

@@ -9820,7 +9820,7 @@ $num)
-

method getAliasNbPages [line 14232]

+

method getAliasNbPages [line 14237]

@@ -9851,7 +9851,7 @@ $num)
-

method getAliasNumPage [line 14260]

+

method getAliasNumPage [line 14265]

@@ -9882,7 +9882,7 @@ $num)
-

method getAnnotOptFromJSProp [line 13130]

+

method getAnnotOptFromJSProp [line 13135]

@@ -9996,7 +9996,7 @@ $getarray = false])
-

method getBarcode [line 15532]

+

method getBarcode [line 15538]

@@ -10024,7 +10024,7 @@ $getarray = false])
-

method getBorderMode [line 5549]

+

method getBorderMode [line 5553]

@@ -10120,7 +10120,7 @@ $pagenum = ''])
-

method getBuffer [line 19791]

+

method getBuffer [line 19800]

@@ -10151,7 +10151,7 @@ $pagenum = ''])
-

method getCellCode [line 4956]

+

method getCellCode [line 4960]

@@ -10259,7 +10259,7 @@ $valign = 'M'])
-

method getCellHeightRatio [line 14505]

+

method getCellHeightRatio [line 14510]

@@ -10332,7 +10332,7 @@ $char)
-

method getEncPermissionsString [line 11110]

+

method getEncPermissionsString [line 11115]

@@ -10374,7 +10374,7 @@ $protection)
-

method getFontAscent [line 4591]

+

method getFontAscent [line 4594]

+ + + @@ -10428,7 +10431,7 @@ $size = 0])
-

method getFontBuffer [line 19951]

+

method getFontBuffer [line 19960]

@@ -10393,6 +10393,9 @@ $size = 0])
return:  font ascent
author:  Nicola Asuni
since:  4.9.003 (2010-03-30)
@@ -10470,7 +10473,7 @@ $font)
-

method getFontDescent [line 4570]

+

method getFontDescent [line 4571]

+ + + @@ -10524,7 +10530,7 @@ $size = 0])
-

method getFontFamily [line 16077]

+

method getFontFamily [line 16085]

@@ -10489,6 +10492,9 @@ $size = 0])
return:  font descent
author:  Nicola Asuni
since:  4.9.003 (2010-03-30)
@@ -10555,7 +10561,7 @@ $size = 0])
-

method getFontSize [line 16057]

+

method getFontSize [line 16065]

@@ -10586,7 +10592,7 @@ $size = 0])
-

method getFontSizePt [line 16067]

+

method getFontSizePt [line 16075]

@@ -10645,7 +10651,7 @@ $size = 0])
-

method getFontStyle [line 16087]

+

method getFontStyle [line 16095]

@@ -10676,7 +10682,7 @@ $size = 0])
-

method getFontSubsetting [line 21098]

+

method getFontSubsetting [line 21107]

@@ -10710,7 +10716,7 @@ $size = 0])
-

method getFooterFont [line 10406]

+

method getFooterFont [line 10411]

@@ -10766,7 +10772,7 @@ $size = 0])
-

method getFormDefaultProp [line 13505]

+

method getFormDefaultProp [line 13510]

@@ -10800,7 +10806,7 @@ $size = 0])
-

method getGDgamma [line 6850]

+

method getGDgamma [line 6855]

@@ -10839,7 +10845,7 @@ $v)
-

method getGraphicVars [line 19625]

+

method getGraphicVars [line 19634]

@@ -10870,7 +10876,7 @@ $v)
-

method getGroupPageNo [line 14273]

+

method getGroupPageNo [line 14278]

@@ -10901,7 +10907,7 @@ $v)
-

method getGroupPageNoFormatted [line 14283]

+

method getGroupPageNoFormatted [line 14288]

@@ -10960,7 +10966,7 @@ $v)
-

method getHeaderFont [line 10386]

+

method getHeaderFont [line 10391]

@@ -11016,7 +11022,7 @@ $v)
-

method getHtmlDomArray [line 16375]

+

method getHtmlDomArray [line 16383]

@@ -11055,7 +11061,7 @@ $html)
-

method getHTMLUnitToUnits [line 19336]

+

method getHTMLUnitToUnits [line 19345]

@@ -11121,7 +11127,7 @@ $point)
-

method getHyphenPatternsFromTEX [line 20898]

+

method getHyphenPatternsFromTEX [line 20907]

@@ -11166,7 +11172,7 @@ $file)
-

method getImageBuffer [line 19893]

+

method getImageBuffer [line 19902]

@@ -11208,7 +11214,7 @@ $image)
-

method getImageFileType [line 6215]

+

method getImageFileType [line 6219]

@@ -11371,7 +11377,7 @@ $iminfo = array()])
-

method GetLineWidth [line 11453]

+

method GetLineWidth [line 11458]

@@ -11405,7 +11411,7 @@ $iminfo = array()])
-

method getMargins [line 16020]

+

method getMargins [line 16028]

@@ -11478,7 +11484,7 @@ $s)
-

method getNumLines [line 5633]

+

method getNumLines [line 5637]

@@ -11587,7 +11593,7 @@ $lineWidth = ''])
-

method getObjFilename [line 19705]

+

method getObjFilename [line 19714]

@@ -11632,7 +11638,7 @@ $prefix)
-

method getOriginalMargins [line 16043]

+

method getOriginalMargins [line 16051]

@@ -11697,7 +11703,7 @@ $prefix)
-

method getPageBuffer [line 19834]

+

method getPageBuffer [line 19843]

@@ -11784,7 +11790,7 @@ $pagenum = ''])
-

method getPageGroupAlias [line 14295]

+

method getPageGroupAlias [line 14300]

@@ -11863,7 +11869,7 @@ $pagenum = ''])
-

method getPageNumGroupAlias [line 14310]

+

method getPageNumGroupAlias [line 14315]

@@ -11984,7 +11990,7 @@ $pagenum = ''])
-

method getPathPaintOperator [line 21010]

+

method getPathPaintOperator [line 21019]

@@ -12038,7 +12044,7 @@ $mode)
-

method getPDFData [line 10429]

+

method getPDFData [line 10434]

@@ -12063,7 +12069,7 @@ $mode)
-

method getRemainingWidth [line 6116]

+

method getRemainingWidth [line 6120]

@@ -12153,7 +12159,7 @@ $mode)
-

method getSpaceString [line 16980]

+

method getSpaceString [line 16988]

@@ -12184,7 +12190,7 @@ $mode)
-

method getStringHeight [line 5732]

+

method getStringHeight [line 5736]

@@ -12356,7 +12362,7 @@ $getarray = false])
-

method getSVGTransformMatrix [line 21417]

+

method getSVGTransformMatrix [line 21427]

@@ -12401,7 +12407,7 @@ $attribute)
-

method getTagStyleFromCSS [line 16346]

+

method getTagStyleFromCSS [line 16354]

@@ -12455,7 +12461,7 @@ $css)
-

method getTransformationMatrixProduct [line 21521]

+

method getTransformationMatrixProduct [line 21531]

@@ -12506,7 +12512,7 @@ $tb)
-

method getUserPermissionCode [line 10950]

+

method getUserPermissionCode [line 10955]

@@ -12554,7 +12560,7 @@ $mode = 0])
-

method getVectorsAngle [line 22151]

+

method getVectorsAngle [line 22161]

@@ -12614,7 +12620,7 @@ $y2)
-

method GetX [line 6894]

+

method GetX [line 6899]

@@ -12645,7 +12651,7 @@ $y2)
-

method GetY [line 6921]

+

method GetY [line 6926]

@@ -12676,7 +12682,7 @@ $y2)
-

method get_mqr [line 6566]

+

method get_mqr [line 6571]

@@ -12707,7 +12713,7 @@ $y2)
-

method Gradient [line 14894]

+

method Gradient [line 14899]

@@ -12798,7 +12804,7 @@ $antialias = false])
-

method hyphenateText [line 20937]

+

method hyphenateText [line 20946]

@@ -12879,7 +12885,7 @@ $charmax = 8])
-

method hyphenateWord [line 20828]

+

method hyphenateWord [line 20837]

@@ -12960,7 +12966,7 @@ $charmax = 8])
-

method Image [line 6267]

+

method Image [line 6271]

@@ -13098,7 +13104,7 @@ $fitonpage = false])
-

method ImageEps [line 15242]

+

method ImageEps [line 15247]

@@ -13200,7 +13206,7 @@ $fitonpage = false])
-

method ImagePngAlpha [line 6804]

+

method ImagePngAlpha [line 6809]

@@ -13305,7 +13311,7 @@ $palign = ''])
-

method ImageSVG [line 21123]

+

method ImageSVG [line 21132]

@@ -13401,7 +13407,7 @@ $fitonpage = false])
-

method IncludeJS [line 12991]

+

method IncludeJS [line 12996]

@@ -13443,7 +13449,7 @@ $script)
-

method intToRoman [line 19415]

+

method intToRoman [line 19424]

@@ -13513,7 +13519,7 @@ $number)
-

method isValidCSSSelectorForTag [line 16187]

+

method isValidCSSSelectorForTag [line 16195]

@@ -13609,7 +13615,7 @@ $resetmargins = false])
-

method Line [line 11623]

+

method Line [line 11628]

@@ -13675,7 +13681,7 @@ $style = array()])
-

method LinearGradient [line 14744]

+

method LinearGradient [line 14749]

@@ -13753,7 +13759,7 @@ $coords = array(0,0,1,0)])
-

method Link [line 4659]

+

method Link [line 4663]

@@ -13825,7 +13831,7 @@ $spaces = 0])
-

method ListBox [line 13702]

+

method ListBox [line 13707]

@@ -13915,7 +13921,7 @@ $js = false])
-

method Ln [line 6863]

+

method Ln [line 6868]

@@ -13963,7 +13969,7 @@ $cell = false])
-

method MirrorH [line 11235]

+

method MirrorH [line 11240]

@@ -14005,7 +14011,7 @@ $x = ''])
-

method MirrorL [line 11271]

+

method MirrorL [line 11276]

@@ -14059,7 +14065,7 @@ $y = ''])
-

method MirrorP [line 11258]

+

method MirrorP [line 11263]

@@ -14107,7 +14113,7 @@ $y = ''])
-

method MirrorV [line 11246]

+

method MirrorV [line 11251]

@@ -14149,7 +14155,7 @@ $y = ''])
-

method movePage [line 19968]

+

method movePage [line 19977]

@@ -14197,7 +14203,7 @@ $topage)
-

method MultiCell [line 5366]

+

method MultiCell [line 5370]

@@ -14323,7 +14329,7 @@ $maxh = 0])
-

method objclone [line 20615]

+

method objclone [line 20624]

@@ -14396,7 +14402,7 @@ $object)
-

method openHTMLTagHandler [line 18213]

+

method openHTMLTagHandler [line 18221]

@@ -14450,7 +14456,7 @@ $dom)
-

method Output [line 7013]

+

method Output [line 7018]

@@ -14532,7 +14538,7 @@ $dest = 'I'])
-

method PageNoFormatted [line 14346]

+

method PageNoFormatted [line 14351]

@@ -14563,7 +14569,7 @@ $dest = 'I'])
-

method PieSector [line 15181]

+

method PieSector [line 15186]

@@ -14659,7 +14665,7 @@ $o:)
-

method PieSectorXY [line 15202]

+

method PieSectorXY [line 15207]

@@ -14767,7 +14773,7 @@ $o:)
-

method pixelsToUnits [line 10548]

+

method pixelsToUnits [line 10553]

@@ -14809,7 +14815,7 @@ $px)
-

method Polycurve [line 11733]

+

method Polycurve [line 11738]

@@ -14881,7 +14887,7 @@ $fill_color = array()])
-

method Polygon [line 11939]

+

method Polygon [line 11944]

@@ -14944,7 +14950,7 @@ $closed = true])
-

method PolyLine [line 11920]

+

method PolyLine [line 11925]

@@ -15007,7 +15013,7 @@ $closed)
-

method putHtmlListBullet [line 19480]

+

method putHtmlListBullet [line 19489]

@@ -15058,7 +15064,7 @@ $size = 10])
-

method RadialGradient [line 14762]

+

method RadialGradient [line 14767]

@@ -15136,7 +15142,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])
-

method RadioButton [line 13614]

+

method RadioButton [line 13619]

@@ -15226,7 +15232,7 @@ $js = false])
-

method readDiskCache [line 19745]

+

method readDiskCache [line 19754]

@@ -15274,7 +15280,7 @@ $file)
-

method Rect [line 11651]

+

method Rect [line 11656]

@@ -15352,7 +15358,7 @@ $fill_color = array()])
-

method registrationMark [line 14713]

+

method registrationMark [line 14718]

@@ -15424,7 +15430,7 @@ $colb = array(255,255,255)])
-

method RegularPolygon [line 12037]

+

method RegularPolygon [line 12042]

@@ -15535,7 +15541,7 @@ $r:)
-

method removeSHY [line 4899]

+

method removeSHY [line 4903]

@@ -15577,7 +15583,7 @@ $txt = ''])
-

method replaceBuffer [line 19773]

+

method replaceBuffer [line 19782]

@@ -15616,7 +15622,7 @@ $data)
-

method revstrpos [line 20639]

+

method revstrpos [line 20648]

@@ -15670,7 +15676,7 @@ $offset = 0])
-

method rfread [line 6774]

+

method rfread [line 6779]

@@ -15721,7 +15727,7 @@ $length)
-

method rollbackTransaction [line 20586]

+

method rollbackTransaction [line 20595]

@@ -15763,7 +15769,7 @@ $self = false])
-

method Rotate [line 11327]

+

method Rotate [line 11332]

@@ -15817,7 +15823,7 @@ $y = ''])
-

method RoundedRect [line 12127]

+

method RoundedRect [line 12132]

@@ -15904,7 +15910,7 @@ $fill_color = array()])
-

method RoundedRectXY [line 12146]

+

method RoundedRectXY [line 12151]

@@ -15997,7 +16003,7 @@ $fill_color = array()])
-

method Scale [line 11203]

+

method Scale [line 11208]

@@ -16057,7 +16063,7 @@ $y = ''])
-

method ScaleX [line 11163]

+

method ScaleX [line 11168]

@@ -16111,7 +16117,7 @@ $y = ''])
-

method ScaleXY [line 11189]

+

method ScaleXY [line 11194]

@@ -16165,7 +16171,7 @@ $y = ''])
-

method ScaleY [line 11176]

+

method ScaleY [line 11181]

@@ -16219,7 +16225,7 @@ $y = ''])
-

method segSVGContentHandler [line 22604]

+

method segSVGContentHandler [line 22614]

@@ -16267,7 +16273,7 @@ $data)
-

method selectColumn [line 20702]

+

method selectColumn [line 20711]

@@ -16306,7 +16312,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 20753]

+

method serializeTCPDFtagParameters [line 20762]

@@ -16348,7 +16354,7 @@ $pararray)
-

method setAlpha [line 14462]

+

method setAlpha [line 14467]

@@ -16483,7 +16489,7 @@ $margin = 0])
-

method setBarcode [line 15522]

+

method setBarcode [line 15528]

@@ -16519,7 +16525,7 @@ $bc = ''])
-

method SetBooklet [line 19250]

+

method SetBooklet [line 19259]

@@ -16570,7 +16576,7 @@ $outer = -1])
-

method setBuffer [line 19755]

+

method setBuffer [line 19764]

@@ -16609,7 +16615,7 @@ $data)
-

method setCellHeightRatio [line 14496]

+

method setCellHeightRatio [line 14501]

@@ -16690,7 +16696,7 @@ $pad)
-

method setColumnsArray [line 20689]

+

method setColumnsArray [line 20698]

@@ -16849,7 +16855,7 @@ $creator)
-

method SetDefaultMonospacedFont [line 4609]

+

method SetDefaultMonospacedFont [line 4613]

@@ -16888,7 +16894,7 @@ $font)
-

method setDefaultTableColumns [line 14486]

+

method setDefaultTableColumns [line 14491]

@@ -17128,7 +17134,7 @@ $tint = 100])
-

method setEqualColumns [line 20656]

+

method setEqualColumns [line 20665]

@@ -17179,7 +17185,7 @@ $y = ''])
-

method setExtGState [line 14427]

+

method setExtGState [line 14432]

@@ -17437,7 +17443,7 @@ $subset = 'default'])
-

method setFontBuffer [line 19909]

+

method setFontBuffer [line 19918]

@@ -17524,7 +17530,7 @@ $size)
-

method setFontSubBuffer [line 19931]

+

method setFontSubBuffer [line 19940]

@@ -17575,7 +17581,7 @@ $data)
-

method setFontSubsetting [line 21087]

+

method setFontSubsetting [line 21096]

@@ -17645,7 +17651,7 @@ $enable = true])
-

method setFooterFont [line 10396]

+

method setFooterFont [line 10401]

@@ -17720,7 +17726,7 @@ $fm = 10])
-

method setFormDefaultProp [line 13494]

+

method setFormDefaultProp [line 13499]

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

method setGraphicVars [line 19664]

+

method setGraphicVars [line 19673]

@@ -17883,7 +17889,7 @@ $hs = ''])
-

method setHeaderFont [line 10376]

+

method setHeaderFont [line 10381]

@@ -17958,7 +17964,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 19321]

+

method setHtmlLinksStyle [line 19330]

@@ -18003,7 +18009,7 @@ $fontstyle = 'U'])
-

method setHtmlVSpace [line 19290]

+

method setHtmlVSpace [line 19299]

@@ -18042,7 +18048,7 @@ $tagvs)
-

method setImageBuffer [line 19850]

+

method setImageBuffer [line 19859]

@@ -18129,7 +18135,7 @@ $scale)
-

method setImageSubBuffer [line 19873]

+

method setImageSubBuffer [line 19882]

@@ -18180,7 +18186,7 @@ $data)
-

method setJPEGQuality [line 14473]

+

method setJPEGQuality [line 14478]

@@ -18261,7 +18267,7 @@ $keywords)
-

method setLanguageArray [line 10416]

+

method setLanguageArray [line 10421]

@@ -18384,7 +18390,7 @@ $margin)
-

method SetLineStyle [line 11478]

+

method SetLineStyle [line 11483]

@@ -18430,7 +18436,7 @@ $style)
-

method SetLineWidth [line 11437]

+

method SetLineWidth [line 11442]

@@ -18472,7 +18478,7 @@ $width)
-

method SetLink [line 4636]

+

method SetLink [line 4640]

@@ -18526,7 +18532,7 @@ $page = -1])
-

method setListIndentWidth [line 19300]

+

method setListIndentWidth [line 19309]

@@ -18565,7 +18571,7 @@ $width)
-

method setLIsymbol [line 19211]

+

method setLIsymbol [line 19220]

@@ -18664,7 +18670,7 @@ $keepmargins = false])
-

method setOpenCell [line 19310]

+

method setOpenCell [line 19319]

@@ -18826,7 +18832,7 @@ $points = false])
-

method setPageBuffer [line 19807]

+

method setPageBuffer [line 19816]

@@ -19043,7 +19049,7 @@ $unit)
-

method setPDFVersion [line 14515]

+

method setPDFVersion [line 14520]

@@ -19160,7 +19166,7 @@ $val = true])
-

method SetProtection [line 10994]

+

method SetProtection [line 10999]

@@ -19226,7 +19232,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 20984]

+

method setRasterizeVectorImages [line 20993]

@@ -19352,7 +19358,7 @@ $resetx = true])
-

method setSignature [line 14152]

+

method setSignature [line 14157]

@@ -19424,7 +19430,7 @@ $info = array()])
-

method setSignatureAppearance [line 14185]

+

method setSignatureAppearance [line 14190]

@@ -19571,7 +19577,7 @@ $subject)
-

method setSVGStyles [line 21578]

+

method setSVGStyles [line 21588]

@@ -19824,7 +19830,7 @@ $color)
-

method setTextRenderingMode [line 20765]

+

method setTextRenderingMode [line 20774]

@@ -20007,7 +20013,7 @@ $margin)
-

method setUserRights [line 14119]

+

method setUserRights [line 14124]

@@ -20073,7 +20079,7 @@ $signature = '/Modify'])
-

method setViewerPreferences [line 14528]

+

method setViewerPreferences [line 14533]

@@ -20115,7 +20121,7 @@ $preferences)
-

method setVisibility [line 14372]

+

method setVisibility [line 14377]

@@ -20154,7 +20160,7 @@ $v)
-

method SetX [line 6934]

+

method SetX [line 6939]

@@ -20202,7 +20208,7 @@ $rtloff = false])
-

method SetXY [line 6998]

+

method SetXY [line 7003]

@@ -20256,7 +20262,7 @@ $rtloff = false])
-

method SetY [line 6966]

+

method SetY [line 6971]

@@ -20310,7 +20316,7 @@ $rtloff = false])
-

method set_mqr [line 6551]

+

method set_mqr [line 6556]

@@ -20349,7 +20355,7 @@ $mqr)
-

method Skew [line 11383]

+

method Skew [line 11388]

@@ -20409,7 +20415,7 @@ $y = ''])
-

method SkewX [line 11356]

+

method SkewX [line 11361]

@@ -20463,7 +20469,7 @@ $y = ''])
-

method SkewY [line 11369]

+

method SkewY [line 11374]

@@ -20517,7 +20523,7 @@ $y = ''])
-

method StarPolygon [line 12085]

+

method StarPolygon [line 12090]

@@ -20695,7 +20701,7 @@ $tocpage = false])
-

method startPageGroup [line 14205]

+

method startPageGroup [line 14210]

@@ -20734,7 +20740,7 @@ $page = ''])
-

method startSVGElementHandler [line 22174]

+

method startSVGElementHandler [line 22184]

@@ -20788,7 +20794,7 @@ $attribs)
-

method startTransaction [line 20555]

+

method startTransaction [line 20564]

@@ -20816,7 +20822,7 @@ $attribs)
-

method StartTransform [line 11131]

+

method StartTransform [line 11136]

@@ -20847,7 +20853,7 @@ $attribs)
-

method StopTransform [line 11146]

+

method StopTransform [line 11151]

@@ -20878,7 +20884,7 @@ $attribs)
-

method SVGPath [line 21833]

+

method SVGPath [line 21843]

@@ -20929,7 +20935,7 @@ $style = ''])
-

method SVGTransform [line 21559]

+

method SVGTransform [line 21569]

@@ -20968,7 +20974,7 @@ $tm)
-

method swapMargins [line 19266]

+

method swapMargins [line 19275]

@@ -21046,7 +21052,7 @@ $page)
-

method Text [line 4799]

+

method Text [line 4803]

@@ -21178,7 +21184,7 @@ $rtloff = false])
-

method TextField [line 13523]

+

method TextField [line 13528]

@@ -21262,7 +21268,7 @@ $js = false])
-

method Transform [line 11413]

+

method Transform [line 11418]

@@ -21304,7 +21310,7 @@ $tm)
-

method Translate [line 11306]

+

method Translate [line 11311]

@@ -21352,7 +21358,7 @@ $t_y)
-

method TranslateX [line 11283]

+

method TranslateX [line 11288]

@@ -21394,7 +21400,7 @@ $t_x)
-

method TranslateY [line 11294]

+

method TranslateY [line 11299]

@@ -21436,7 +21442,7 @@ $t_y)
-

method unhtmlentities [line 10559]

+

method unhtmlentities [line 10564]

@@ -21475,7 +21481,7 @@ $text_to_convert)
-

method UniArrSubString [line 6155]

+

method UniArrSubString [line 6159]

@@ -21529,7 +21535,7 @@ $end = ''])
-

method unichr [line 6188]

+

method unichr [line 6192]

@@ -21574,7 +21580,7 @@ $c)
-

method UTF8ArrayToUniArray [line 6176]

+

method UTF8ArrayToUniArray [line 6180]

@@ -21616,7 +21622,7 @@ $ta)
-

method UTF8ArrSubString [line 6132]

+

method UTF8ArrSubString [line 6136]

@@ -21667,7 +21673,7 @@ $end = ''])
-

method UTF8ArrToLatin1 [line 10284]

+

method UTF8ArrToLatin1 [line 10289]

@@ -21709,7 +21715,7 @@ $unicode)
-

method utf8Bidi [line 12307]

+

method utf8Bidi [line 12312]

@@ -21766,7 +21772,7 @@ $forcertl = false])
-

method utf8StrArrRev [line 12293]

+

method utf8StrArrRev [line 12298]

@@ -21826,7 +21832,7 @@ $forcertl = false])
-

method UTF8StringToArray [line 10137]

+

method UTF8StringToArray [line 10142]

@@ -21892,7 +21898,7 @@ $str)
-

method utf8StrRev [line 12278]

+

method utf8StrRev [line 12283]

@@ -21946,7 +21952,7 @@ $forcertl = false])
-

method UTF8ToLatin1 [line 10254]

+

method UTF8ToLatin1 [line 10259]

@@ -21988,7 +21994,7 @@ $str)
-

method UTF8ToUTF16BE [line 10238]

+

method UTF8ToUTF16BE [line 10243]

@@ -22039,7 +22045,7 @@ $setbom = true])
-

method Write [line 5772]

+

method Write [line 5776]

@@ -22135,7 +22141,7 @@ $maxh = 0])
-

method write1DBarcode [line 15551]

+

method write1DBarcode [line 15557]

@@ -22225,7 +22231,7 @@ $align = ''])
-

method write2DBarcode [line 15795]

+

method write2DBarcode [line 15802]

@@ -22315,7 +22321,7 @@ $distort = false])
-

method writeBarcode [line 15744]

+

method writeBarcode [line 15751]

@@ -22405,7 +22411,7 @@ $code)
-

method writeDiskCache [line 19717]

+

method writeDiskCache [line 19726]

@@ -22462,7 +22468,7 @@ $file)
-

method writeHTML [line 17024]

+

method writeHTML [line 17032]

@@ -22528,7 +22534,7 @@ $align = ''])
-

method writeHTMLCell [line 17008]

+

method writeHTMLCell [line 17016]

@@ -22630,7 +22636,7 @@ $autopadding = true])
-

method _addfield [line 13095]

+

method _addfield [line 13100]

@@ -22708,7 +22714,7 @@ $prop)
-

method _AES [line 10782]

+

method _AES [line 10787]

@@ -22759,7 +22765,7 @@ $text)
-

method _beginpage [line 9803]

+

method _beginpage [line 9808]

@@ -22804,7 +22810,7 @@ $format = ''])
-

method _dataannobjstring [line 9980]

+

method _dataannobjstring [line 9985]

@@ -22843,7 +22849,7 @@ $s)
-

method _datastring [line 9969]

+

method _datastring [line 9974]

@@ -22882,7 +22888,7 @@ $s)
-

method _datestring [line 9991]

+

method _datestring [line 9996]

@@ -22913,7 +22919,7 @@ $s)
-

method _destroy [line 7208]

+

method _destroy [line 7213]

@@ -22958,7 +22964,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 7236]

+

method _dochecks [line 7241]

@@ -22983,7 +22989,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 9896]

+

method _dolinethrough [line 9901]

@@ -23031,7 +23037,7 @@ $txt)
-

method _dolinethroughw [line 9909]

+

method _dolinethroughw [line 9914]

@@ -23088,7 +23094,7 @@ $txt)
-

method _dooverline [line 9922]

+

method _dooverline [line 9927]

@@ -23139,7 +23145,7 @@ $txt)
-

method _dooverlinew [line 9935]

+

method _dooverlinew [line 9940]

@@ -23190,7 +23196,7 @@ $w)
-

method _dounderline [line 9871]

+

method _dounderline [line 9876]

@@ -23238,7 +23244,7 @@ $txt)
-

method _dounderlinew [line 9884]

+

method _dounderlinew [line 9889]

@@ -23289,7 +23295,7 @@ $w)
-

method _encrypt_data [line 10592]

+

method _encrypt_data [line 10597]

@@ -23337,7 +23343,7 @@ $s)
-

method _enddoc [line 9671]

+

method _enddoc [line 9676]

@@ -23362,7 +23368,7 @@ $s)
-

method _endpage [line 9847]

+

method _endpage [line 9852]

@@ -23387,7 +23393,7 @@ $s)
-

method _escape [line 9958]

+

method _escape [line 9963]

@@ -23426,7 +23432,7 @@ $s)
-

method _escapetext [line 10030]

+

method _escapetext [line 10035]

@@ -23465,7 +23471,7 @@ $s)
-

method _freadint [line 9947]

+

method _freadint [line 9952]

@@ -23504,7 +23510,7 @@ $f)
-

method _generateencryptionkey [line 10869]

+

method _generateencryptionkey [line 10874]

@@ -23558,7 +23564,7 @@ $protection)
-

method _getannotsrefs [line 7485]

+

method _getannotsrefs [line 7490]

@@ -23600,7 +23606,7 @@ $n)
-

method _getBYTE [line 8209]

+

method _getBYTE [line 8214]

@@ -23663,7 +23669,7 @@ $offset)
-

method _getfontpath [line 7252]

+

method _getfontpath [line 7257]

@@ -23688,7 +23694,7 @@ $offset)
-

method _getrawstream [line 10050]

+

method _getrawstream [line 10055]

@@ -23736,7 +23742,7 @@ $n = 0])
-

method _getSHORT [line 8194]

+

method _getSHORT [line 8199]

@@ -23799,7 +23805,7 @@ $offset)
-

method _getstream [line 10065]

+

method _getstream [line 10070]

@@ -23844,7 +23850,7 @@ $n = 0])
-

method _getTrueTypeFontSubset [line 8224]

+

method _getTrueTypeFontSubset [line 8229]

@@ -23895,7 +23901,7 @@ $subsetchars)
-

method _getTTFtableChecksum [line 8555]

+

method _getTTFtableChecksum [line 8560]

@@ -23946,7 +23952,7 @@ $length)
-

method _getULONG [line 8164]

+

method _getULONG [line 8169]

@@ -24009,7 +24015,7 @@ $offset)
-

method _getUSHORT [line 8179]

+

method _getUSHORT [line 8184]

@@ -24072,7 +24078,7 @@ $offset)
-

method _JScolor [line 13071]

+

method _JScolor [line 13076]

@@ -24114,7 +24120,7 @@ $color)
-

method _md5_16 [line 10800]

+

method _md5_16 [line 10805]

@@ -24159,7 +24165,7 @@ $str)
-

method _newobj [line 9857]

+

method _newobj [line 9862]

@@ -24187,7 +24193,7 @@ $str)
-

method _objectkey [line 10573]

+

method _objectkey [line 10578]

@@ -24229,7 +24235,7 @@ $n)
-

method _out [line 10085]

+

method _out [line 10090]

@@ -24265,7 +24271,7 @@ $s)
-

method _outCurve [line 11578]

+

method _outCurve [line 11583]

@@ -24334,7 +24340,7 @@ $y3)
-

method _outCurveV [line 11592]

+

method _outCurveV [line 11597]

@@ -24391,7 +24397,7 @@ $y3)
-

method _outCurveY [line 11608]

+

method _outCurveY [line 11613]

@@ -24460,7 +24466,7 @@ $y2)
-

method _outellipticalarc [line 11804]

+

method _outellipticalarc [line 11809]

@@ -24568,7 +24574,7 @@ $angf:)
-

method _outLine [line 11548]

+

method _outLine [line 11553]

@@ -24613,7 +24619,7 @@ $y)
-

method _outPoint [line 11536]

+

method _outPoint [line 11541]

@@ -24658,7 +24664,7 @@ $y)
-

method _outRect [line 11562]

+

method _outRect [line 11567]

@@ -24721,7 +24727,7 @@ $op)
-

method _Ovalue [line 10813]

+

method _Ovalue [line 10818]

@@ -24772,7 +24778,7 @@ $owner_pass)
-

method _parsejpeg [line 6643]

+

method _parsejpeg [line 6648]

@@ -24811,7 +24817,7 @@ $file)
-

method _parsepng [line 6669]

+

method _parsepng [line 6674]

@@ -24850,7 +24856,7 @@ $file)
-

method _putannotsobjs [line 7517]

+

method _putannotsobjs [line 7522]

@@ -24881,7 +24887,7 @@ $file)
-

method _putannotsrefs [line 7473]

+

method _putannotsrefs [line 7478]

@@ -24926,7 +24932,7 @@ $n)
-

method _putAPXObject [line 8129]

+

method _putAPXObject [line 8134]

@@ -24980,7 +24986,7 @@ $stream = ''])
-

method _putbookmarks [line 12909]

+

method _putbookmarks [line 12914]

@@ -25011,7 +25017,7 @@ $stream = ''])
-

method _putcatalog [line 9502]

+

method _putcatalog [line 9507]

@@ -25039,7 +25045,7 @@ $stream = ''])
-

method _putcidfont0 [line 9225]

+

method _putcidfont0 [line 9230]

@@ -25084,7 +25090,7 @@ $font)
-

method _putEmbeddedFiles [line 4756]

+

method _putEmbeddedFiles [line 4760]

@@ -25115,7 +25121,7 @@ $font)
-

method _putencryption [line 10616]

+

method _putencryption [line 10621]

@@ -25146,7 +25152,7 @@ $font)
-

method _putextgstates [line 14437]

+

method _putextgstates [line 14442]

@@ -25185,7 +25191,7 @@ $gs)
-

method _putfonts [line 8676]

+

method _putfonts [line 8681]

@@ -25213,7 +25219,7 @@ $gs)
-

method _putfontwidths [line 8577]

+

method _putfontwidths [line 8582]

@@ -25264,7 +25270,7 @@ $cidoffset = 0])
-

method _putheader [line 9663]

+

method _putheader [line 9668]

@@ -25289,7 +25295,7 @@ $cidoffset = 0])
-

method _putimages [line 9296]

+

method _putimages [line 9301]

@@ -25314,7 +25320,7 @@ $cidoffset = 0])
-

method _putinfo [line 9455]

+

method _putinfo [line 9460]

@@ -25342,7 +25348,7 @@ $cidoffset = 0])
-

method _putjavascript [line 13016]

+

method _putjavascript [line 13021]

@@ -25373,7 +25379,7 @@ $cidoffset = 0])
-

method _putocg [line 14355]

+

method _putocg [line 14360]

@@ -25401,7 +25407,7 @@ $cidoffset = 0])
-

method _putpages [line 7263]

+

method _putpages [line 7268]

@@ -25426,7 +25432,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 9370]

+

method _putresourcedict [line 9375]

@@ -25451,7 +25457,7 @@ $cidoffset = 0])
-

method _putresources [line 9431]

+

method _putresources [line 9436]

@@ -25476,7 +25482,7 @@ $cidoffset = 0])
-

method _putshaders [line 14992]

+

method _putshaders [line 14997]

@@ -25507,7 +25513,7 @@ $cidoffset = 0])
-

method _putsignature [line 14043]

+

method _putsignature [line 14048]

@@ -25538,7 +25544,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 9352]

+

method _putspotcolors [line 9357]

@@ -25566,7 +25572,7 @@ $cidoffset = 0])
-

method _putstream [line 10076]

+

method _putstream [line 10081]

@@ -25611,7 +25617,7 @@ $n = 0])
-

method _puttruetypeunicode [line 8836]

+

method _puttruetypeunicode [line 8841]

diff --git a/tcpdf.php b/tcpdf.php index 315c1aa..3567160 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ all standard page formats, custom page formats, custom margins and units of measure; *
  • UTF-8 Unicode and Right-To-Left languages;
  • *
  • TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
  • - *
  • Font subsetting;
  • + *
  • font subsetting;
  • *
  • methods to publish some XHTML + CSS code, Javascript and Forms;
  • *
  • images, graphic (geometric figures) and transformation methods; *
  • supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
  • @@ -126,7 +126,7 @@ * @copyright 2002-2010 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 5.5.004 + * @version 5.5.005 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 5.5.004 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 5.5.005 (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 5.5.004 + * @version 5.5.005 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -4565,14 +4565,16 @@ if (!class_exists('TCPDF', false)) { * @param float $size The size (in points) * @return int font descent * @access public + * @author Nicola Asuni * @since 4.9.003 (2010-03-30) */ public function getFontDescent($font, $style='', $size=0) { //Set font size in points $sizek = $size / $this->k; $fontdata = $this->AddFont($font, $style); - if (isset($fontdata['desc']['Descent']) AND ($fontdata['desc']['Descent'] <= 0)) { - $descent = - $fontdata['desc']['Descent'] * $sizek / 1000; + $fontinfo = $this->getFontBuffer($fontdata['fontkey']); + if (isset($fontinfo['desc']['Descent']) AND ($fontinfo['desc']['Descent'] <= 0)) { + $descent = - $fontinfo['desc']['Descent'] * $sizek / 1000; } else { $descent = 0.15 * $sizek; } @@ -4586,14 +4588,16 @@ if (!class_exists('TCPDF', false)) { * @param float $size The size (in points) * @return int font ascent * @access public + * @author Nicola Asuni * @since 4.9.003 (2010-03-30) */ public function getFontAscent($font, $style='', $size=0) { //Set font size in points $sizek = $size / $this->k; $fontdata = $this->AddFont($font, $style); - if (isset($fontdata['desc']['Ascent']) AND ($fontdata['desc']['Ascent'] > 0)) { - $ascent = $fontdata['desc']['Ascent'] * $sizek / 1000; + $fontinfo = $this->getFontBuffer($fontdata['fontkey']); + if (isset($fontinfo['desc']['Ascent']) AND ($fontinfo['desc']['Ascent'] > 0)) { + $ascent = $fontinfo['desc']['Ascent'] * $sizek / 1000; } else { $ascent = 0.85 * $sizek; } @@ -6306,9 +6310,10 @@ if (!class_exists('TCPDF', false)) { $w = $h * $pixw / $pixh; } } - // Check whether we need a new page first as this does not fit + // Check whether we need a new page or new column first as this does not fit $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { + $prev_y = $this->y; + if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) { $y = $this->y; if ($this->rtl) { $x += ($prev_x - $this->x); @@ -15304,9 +15309,10 @@ if (!class_exists('TCPDF', false)) { } elseif ($h <= 0) { $h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k)); } - // Check whether we need a new page first as this does not fit + // Check whether we need a new page or new column first as this does not fit $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { + $prev_y = $this->y; + if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) { $y = $this->y; if ($this->rtl) { $x += ($prev_x - $this->x); @@ -15621,9 +15627,10 @@ if (!class_exists('TCPDF', false)) { // maximum bar height $barh = $h; $h += $extraspace; - // Check whether we need a new page first as this does not fit + // Check whether we need a new page or new column first as this does not fit $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { + $prev_y = $this->y; + if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) { $y = $this->y; if ($this->rtl) { $x += ($prev_x - $this->x); @@ -15909,9 +15916,10 @@ if (!class_exists('TCPDF', false)) { $style['vpadding'] = ($h - $bh) / (2 * $ch); } } - // Check whether we need a new page first as this does not fit + // Check whether we need a new page or new column first as this does not fit $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { + $prev_y = $this->y; + if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) { $y = $this->y; if ($this->rtl) { $x += ($prev_x - $this->x); @@ -18274,7 +18282,8 @@ if (!class_exists('TCPDF', false)) { if (isset($tag['attribute']['cellspacing'])) { $cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px'); } - if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false)) { + $prev_y = $this->y; + if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false) OR ($this->y < $prev_y)) { $this->inthead = true; // add a page (or trig AcceptPageBreak() for multicolumn mode) $this->checkPageBreak($this->PageBreakTrigger + 1); @@ -21208,9 +21217,10 @@ if (!class_exists('TCPDF', false)) { } elseif ($h <= 0) { $h = $w * $oh / $ow; } - // Check whether we need a new page first as this does not fit + // Check whether we need a new page or new column first as this does not fit $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { + $prev_y = $this->y; + if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) { $y = $this->y; if ($this->rtl) { $x += ($prev_x - $this->x);
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index f796881..2286b4f 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3

    - Documentation generated on Sun, 27 Jun 2010 19:25:36 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:56 +0200 by phpDocumentor 1.4.3
    @@ -25656,7 +25662,7 @@ $font)
    -

    method _putviewerpreferences [line 9592]

    +

    method _putviewerpreferences [line 9597]

    diff --git a/doc/index.html b/doc/index.html index c03c03f..e16d11f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/errors.html b/doc/errors.html index b42897a..377e336 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

    - Documentation generated on Sun, 27 Jun 2010 19:25:42 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:45:02 +0200 by phpDocumentor 1.4.3
    @@ -25690,7 +25696,7 @@ $font)
    -

    method _RC4 [line 10736]

    +

    method _RC4 [line 10741]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index e5fda66..ba45837 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2058,7 +2058,7 @@ top

    - Documentation generated on Sun, 27 Jun 2010 19:25:36 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:56 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index ea8732d..747f985 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2026,7 +2026,7 @@ top

    - Documentation generated on Sun, 27 Jun 2010 19:25:36 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:56 +0200 by phpDocumentor 1.4.3
    @@ -25741,7 +25747,7 @@ $text)
    -

    method _setGDImageTransparency [line 6622]

    +

    method _setGDImageTransparency [line 6627]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index e0b572d..b01b797 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.




    - Documentation generated on Sun, 27 Jun 2010 19:25:42 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:45:02 +0200 by phpDocumentor 1.4.3
    @@ -25786,7 +25792,7 @@ $image)
    -

    method _textannobjstring [line 10016]

    +

    method _textannobjstring [line 10021]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 284ef47..72fcfb4 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php



    Page Details:

    -This is a PHP class for generating PDF documents without requiring external extensions.


    TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
    <h3>TCPDF main features are:</h3>

    • no external libraries are required for the basic functions;
    • all standard page formats, custom page formats, custom margins and units of measure;
    • UTF-8 Unicode and Right-To-Left languages;
    • TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
    • Font subsetting;
    • methods to publish some XHTML + CSS code, Javascript and Forms;
    • images, graphic (geometric figures) and transformation methods;
    • supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
    • 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
    • Grayscale, RGB, CMYK, Spot Colors and Transparencies;
    • automatic page header and footer management;
    • document encryption and digital signature certifications;
    • transactions to UNDO commands;
    • PDF annotations, including links, text and file attachments;
    • text rendering modes (fill, stroke and clipping);
    • multiple columns mode;
    • bookmarks and table of content;
    • text hyphenation;
    • automatic page break, line break and text alignments including justification;
    • automatic page numbering and page groups;
    • move and delete pages;
    • page compression (requires php-zlib extension);
    Tools to encode your unicode fonts are on fonts/utils directory.</p>




    +This is a PHP class for generating PDF documents without requiring external extensions.


    TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
    <h3>TCPDF main features are:</h3>

    • no external libraries are required for the basic functions;
    • all standard page formats, custom page formats, custom margins and units of measure;
    • UTF-8 Unicode and Right-To-Left languages;
    • TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
    • font subsetting;
    • methods to publish some XHTML + CSS code, Javascript and Forms;
    • images, graphic (geometric figures) and transformation methods;
    • supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
    • 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
    • Grayscale, RGB, CMYK, Spot Colors and Transparencies;
    • automatic page header and footer management;
    • document encryption and digital signature certifications;
    • transactions to UNDO commands;
    • PDF annotations, including links, text and file attachments;
    • text rendering modes (fill, stroke and clipping);
    • multiple columns mode;
    • bookmarks and table of content;
    • text hyphenation;
    • automatic page break, line break and text alignments including justification;
    • automatic page numbering and page groups;
    • move and delete pages;
    • page compression (requires php-zlib extension);
    Tools to encode your unicode fonts are on fonts/utils directory.</p>




    Tags:

    diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index f87f3bf..75cd55b 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    @@ -25825,7 +25831,7 @@ $s)
    -

    method _textstring [line 10002]

    +

    method _textstring [line 10007]

    diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index d963c3c..ed8423a 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

    PDF417 (ISO


    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 3e08694..f8e69db 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.




    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    @@ -25864,7 +25870,7 @@ $s)
    -

    method _toJPEG [line 6585]

    +

    method _toJPEG [line 6590]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 17ba2a5..dd085dd 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.




    - Documentation generated on Sun, 27 Jun 2010 19:25:42 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:45:02 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 4c41b71..9ad9297 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    @@ -25906,7 +25912,7 @@ $file)
    -

    method _toPNG [line 6604]

    +

    method _toPNG [line 6609]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 6507074..e881a02 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 6e4ad75..910b760 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    @@ -25951,7 +25957,7 @@ $file)
    -

    method _Uvalue [line 10842]

    +

    method _Uvalue [line 10847]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index e2bda41..e08bbdc 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)

    - Documentation generated on Sun, 27 Jun 2010 19:25:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:57 +0200 by phpDocumentor 1.4.3
    @@ -25988,7 +25994,7 @@ $file)

    - Documentation generated on Sun, 27 Jun 2010 19:25:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:58 +0200 by phpDocumentor 1.4.3
    @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -113,7 +113,7 @@ unicode data

    author:  Nicola Asuni
    version:  5.5.004version:  5.5.005
    copyright:  2002-2010 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 5.5.004 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.5.005 (http://www.tcpdf.org)'
    @@ -124,7 +124,7 @@ unicode data


    - Documentation generated on Sun, 27 Jun 2010 19:25:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 28 Jun 2010 09:44:58 +0200 by phpDocumentor 1.4.3