From c318a61d7945ce9af277416347427014d9dbbe57 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 26 Aug 2010 11:46:00 +0200 Subject: [PATCH] 5.8.019 --- CHANGELOG.TXT | 5 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 640 +++++++++--------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_pdf417.php.html | 2 +- doc/com-tecnick-tcpdf/_qrcode.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 95 +-- 22 files changed, 403 insertions(+), 381 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index ff152bb..d4c71f0 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +5.8.019 (2010-08-26) + - XObject Templates now includes support for links and annotations. + - A problem related to link alignment on cell was fixed. + - A problem related to SVG styles was fixed. + 5.8.018 (2010-08-25) - Method getNumberOfColumns() was added. - A problem related to table header was fixed. diff --git a/README.TXT b/README.TXT index 559c332..6b9f510 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.8.018 -Release date: 2010-08-25 +Version: 5.8.019 +Release date: 2010-08-26 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index bd0c720..b16e5d9 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index a725356..6952d5e 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:48 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 4757181..013fb6b 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:48 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index ee90b53..6afc2fd 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

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

method AcceptPageBreak [line 4936]

+

method AcceptPageBreak [line 4929]

var:  true when we are inside a XObjectvar:  true when we are inside an XObject
since:  5.8.017 (2010-08-24)
@@ -6934,7 +6934,7 @@ $diskcache = false])
-

method addExtGState [line 14891]

+

method addExtGState [line 14888]

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

method addHtmlLink [line 10911]

+

method addHtmlLink [line 10908]

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

method addHTMLTOC [line 21708]

+

method addHTMLTOC [line 21705]

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

method addHTMLVertSpace [line 20167]

+

method addHTMLVertSpace [line 20164]

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

method addJavascriptObject [line 13484]

+

method addJavascriptObject [line 13481]

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

method addTOC [line 21536]

+

method addTOC [line 21533]

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

method AliasNbPages [line 14705]

+

method AliasNbPages [line 14702]

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

method AliasNumPage [line 14732]

+

method AliasNumPage [line 14729]

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

method Annotation [line 4789]

+

method Annotation [line 4781]

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

method Arrow [line 12688]

+

method Arrow [line 12685]

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

method arrUTF8ToUTF16BE [line 10806]

+

method arrUTF8ToUTF16BE [line 10803]

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

method Bookmark [line 13356]

+

method Bookmark [line 13353]

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

method Button [line 14360]

+

method Button [line 14357]

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

method Cell [line 5043]

+

method Cell [line 5036]

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

method CheckBox [line 14292]

+

method CheckBox [line 14289]

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

method checkPageBreak [line 4963]

+

method checkPageBreak [line 4956]

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

method Circle [line 12376]

+

method Circle [line 12373]

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

method Clip [line 15352]

+

method Clip [line 15349]

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

method closeHTMLTagHandler [line 19667]

+

method closeHTMLTagHandler [line 19664]

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

method colorRegistrationBar [line 15027]

+

method colorRegistrationBar [line 15024]

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

method ComboBox [line 14235]

+

method ComboBox [line 14232]

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

method commitTransaction [line 21820]

+

method commitTransaction [line 21817]

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

method convertHexStringToString [line 11535]

+

method convertHexStringToString [line 11532]

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

method convertHTMLColorToDec [line 10944]

+

method convertHTMLColorToDec [line 10941]

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

method convertStringToHexString [line 11557]

+

method convertStringToHexString [line 11554]

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

method convertSVGtMatrix [line 23092]

+

method convertSVGtMatrix [line 23103]

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

method CoonsPatchMesh [line 15267]

+

method CoonsPatchMesh [line 15264]

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

method copyPage [line 21466]

+

method copyPage [line 21463]

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

method cropMark [line 15125]

+

method cropMark [line 15122]

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

method Curve [line 12181]

+

method Curve [line 12178]

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

method deletePage [line 21323]

+

method deletePage [line 21320]

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

method drawHTMLTagBorder [line 20204]

+

method drawHTMLTagBorder [line 20201]

@@ -9307,7 +9307,7 @@ $xmax)
-

method Ellipse [line 12245]

+

method Ellipse [line 12242]

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

method empty_string [line 21874]

+

method empty_string [line 21871]

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

method endSVGElementHandler [line 24140]

+

method endSVGElementHandler [line 24157]

@@ -9559,7 +9559,7 @@ $name)
-

method endTemplate [line 22552]

+

method endTemplate [line 22550]

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

method extractCSSproperties [line 16644]

+

method extractCSSproperties [line 16641]

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

method fitBlock [line 6608]

+

method fitBlock [line 6604]

@@ -9823,7 +9823,7 @@ $y)
-

method formatPageNumber [line 14809]

+

method formatPageNumber [line 14806]

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

method formatTOCPageNumber [line 14821]

+

method formatTOCPageNumber [line 14818]

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

method GetAbsX [line 7344]

+

method GetAbsX [line 7340]

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

method getAliasNbPages [line 14717]

+

method getAliasNbPages [line 14714]

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

method getAliasNumPage [line 14745]

+

method getAliasNumPage [line 14742]

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

method getAnnotOptFromJSProp [line 13609]

+

method getAnnotOptFromJSProp [line 13606]

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

method getBarcode [line 15991]

+

method getBarcode [line 15988]

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

method getBorderMode [line 5918]

+

method getBorderMode [line 5914]

@@ -10187,7 +10187,7 @@ $position = 'start'])
-

method getBorderStartPosition [line 20188]

+

method getBorderStartPosition [line 20185]

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

method getBuffer [line 20999]

+

method getBuffer [line 20996]

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

method getCellBorder [line 5445]

+

method getCellBorder [line 5441]

@@ -10372,7 +10372,7 @@ $mode)
-

method getCellCode [line 5074]

+

method getCellCode [line 5067]

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

method getCellHeightRatio [line 14987]

+

method getCellHeightRatio [line 14984]

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

method getColumn [line 22025]

+

method getColumn [line 22022]

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

method getCSSBorderDashStyle [line 16943]

+

method getCSSBorderDashStyle [line 16940]

@@ -10629,7 +10629,7 @@ $style)
-

method getCSSBorderStyle [line 16979]

+

method getCSSBorderStyle [line 16976]

@@ -10671,7 +10671,7 @@ $cssborder)
-

method getCSSBorderWidth [line 16923]

+

method getCSSBorderWidth [line 16920]

@@ -10713,7 +10713,7 @@ $width)
-

method getEncPermissionsString [line 11574]

+

method getEncPermissionsString [line 11571]

@@ -10812,7 +10812,7 @@ $size = 0])
-

method getFontBuffer [line 21163]

+

method getFontBuffer [line 21160]

@@ -10911,7 +10911,7 @@ $size = 0])
-

method getFontFamily [line 16622]

+

method getFontFamily [line 16619]

@@ -10942,7 +10942,7 @@ $size = 0])
-

method getFontFamilyName [line 22455]

+

method getFontFamilyName [line 22452]

@@ -10987,7 +10987,7 @@ $fontfamily)
-

method getFontSize [line 16602]

+

method getFontSize [line 16599]

@@ -11018,7 +11018,7 @@ $fontfamily)
-

method getFontSizePt [line 16612]

+

method getFontSizePt [line 16609]

@@ -11077,7 +11077,7 @@ $fontfamily)
-

method getFontStyle [line 16632]

+

method getFontStyle [line 16629]

@@ -11108,7 +11108,7 @@ $fontfamily)
-

method getFontSubsetting [line 22391]

+

method getFontSubsetting [line 22388]

@@ -11142,7 +11142,7 @@ $fontfamily)
-

method getFooterFont [line 10869]

+

method getFooterFont [line 10866]

@@ -11198,7 +11198,7 @@ $fontfamily)
-

method getFormDefaultProp [line 13984]

+

method getFormDefaultProp [line 13981]

@@ -11232,7 +11232,7 @@ $fontfamily)
-

method getGDgamma [line 7284]

+

method getGDgamma [line 7280]

@@ -11271,7 +11271,7 @@ $v)
-

method getGraphicVars [line 20796]

+

method getGraphicVars [line 20793]

@@ -11302,7 +11302,7 @@ $v)
-

method getGroupPageNo [line 14758]

+

method getGroupPageNo [line 14755]

@@ -11333,7 +11333,7 @@ $v)
-

method getGroupPageNoFormatted [line 14768]

+

method getGroupPageNoFormatted [line 14765]

@@ -11392,7 +11392,7 @@ $v)
-

method getHeaderFont [line 10849]

+

method getHeaderFont [line 10846]

@@ -11448,7 +11448,7 @@ $v)
-

method getHtmlDomArray [line 17027]

+

method getHtmlDomArray [line 17024]

@@ -11487,7 +11487,7 @@ $html)
-

method getHTMLUnitToUnits [line 20507]

+

method getHTMLUnitToUnits [line 20504]

@@ -11553,7 +11553,7 @@ $point)
-

method getHyphenPatternsFromTEX [line 22191]

+

method getHyphenPatternsFromTEX [line 22188]

@@ -11598,7 +11598,7 @@ $file)
-

method getImageBuffer [line 21101]

+

method getImageBuffer [line 21098]

@@ -11640,7 +11640,7 @@ $image)
-

method getImageFileType [line 6578]

+

method getImageFileType [line 6574]

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

method GetLineWidth [line 11921]

+

method GetLineWidth [line 11918]

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

method getMargins [line 16565]

+

method getMargins [line 16562]

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

method getNumberOfColumns [line 22035]

+

method getNumberOfColumns [line 22032]

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

method getNumLines [line 5996]

+

method getNumLines [line 5992]

@@ -12050,7 +12050,7 @@ $lineWidth = ''])
-

method getObjFilename [line 20913]

+

method getObjFilename [line 20910]

@@ -12095,7 +12095,7 @@ $prefix)
-

method getOriginalMargins [line 16588]

+

method getOriginalMargins [line 16585]

@@ -12160,7 +12160,7 @@ $prefix)
-

method getPageBuffer [line 21042]

+

method getPageBuffer [line 21039]

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

method getPageGroupAlias [line 14780]

+

method getPageGroupAlias [line 14777]

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

method getPageNumGroupAlias [line 14795]

+

method getPageNumGroupAlias [line 14792]

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

method getPathPaintOperator [line 22303]

+

method getPathPaintOperator [line 22300]

@@ -12501,7 +12501,7 @@ $mode)
-

method getPDFData [line 10892]

+

method getPDFData [line 10889]

@@ -12526,7 +12526,7 @@ $mode)
-

method getRemainingWidth [line 6479]

+

method getRemainingWidth [line 6475]

@@ -12616,7 +12616,7 @@ $mode)
-

method getSpaceString [line 17736]

+

method getSpaceString [line 17733]

@@ -12647,7 +12647,7 @@ $mode)
-

method getStringHeight [line 6097]

+

method getStringHeight [line 6093]

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

method getSVGTransformMatrix [line 22978]

+

method getSVGTransformMatrix [line 22989]

@@ -12864,7 +12864,7 @@ $attribute)
-

method getTagStyleFromCSS [line 16895]

+

method getTagStyleFromCSS [line 16892]

@@ -12918,7 +12918,7 @@ $css)
-

method getTransformationMatrixProduct [line 23074]

+

method getTransformationMatrixProduct [line 23085]

@@ -12969,7 +12969,7 @@ $tb)
-

method getUserPermissionCode [line 11414]

+

method getUserPermissionCode [line 11411]

@@ -13017,7 +13017,7 @@ $mode = 0])
-

method getVectorsAngle [line 23706]

+

method getVectorsAngle [line 23717]

@@ -13077,7 +13077,7 @@ $y2)
-

method GetX [line 7328]

+

method GetX [line 7324]

@@ -13108,7 +13108,7 @@ $y2)
-

method GetY [line 7355]

+

method GetY [line 7351]

@@ -13139,7 +13139,7 @@ $y2)
-

method get_mqr [line 7000]

+

method get_mqr [line 6996]

@@ -13170,7 +13170,7 @@ $y2)
-

method Gradient [line 15376]

+

method Gradient [line 15373]

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

method hyphenateText [line 22230]

+

method hyphenateText [line 22227]

@@ -13342,7 +13342,7 @@ $charmax = 8])
-

method hyphenateWord [line 22121]

+

method hyphenateWord [line 22118]

@@ -13423,7 +13423,7 @@ $charmax = 8])
-

method Image [line 6685]

+

method Image [line 6681]

@@ -13561,7 +13561,7 @@ $fitonpage = false])
-

method ImageEps [line 15724]

+

method ImageEps [line 15721]

@@ -13663,7 +13663,7 @@ $fitonpage = false])
-

method ImagePngAlpha [line 7240]

+

method ImagePngAlpha [line 7236]

@@ -13780,7 +13780,7 @@ $palign)
-

method ImageSVG [line 22704]

+

method ImageSVG [line 22715]

@@ -13876,7 +13876,7 @@ $fitonpage = false])
-

method IncludeJS [line 13471]

+

method IncludeJS [line 13468]

@@ -13918,7 +13918,7 @@ $script)
-

method intToRoman [line 20586]

+

method intToRoman [line 20583]

@@ -13988,7 +13988,7 @@ $number)
-

method isUnicodeFont [line 22443]

+

method isUnicodeFont [line 22440]

@@ -14022,7 +14022,7 @@ $number)
-

method isValidCSSSelectorForTag [line 16736]

+

method isValidCSSSelectorForTag [line 16733]

@@ -14118,7 +14118,7 @@ $resetmargins = false])
-

method Line [line 12098]

+

method Line [line 12095]

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

method LinearGradient [line 15226]

+

method LinearGradient [line 15223]

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

method Link [line 4772]

+

method Link [line 4764]

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

method ListBox [line 14179]

+

method ListBox [line 14176]

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

method Ln [line 7297]

+

method Ln [line 7293]

@@ -14472,7 +14472,7 @@ $cell = false])
-

method MirrorH [line 11700]

+

method MirrorH [line 11697]

@@ -14514,7 +14514,7 @@ $x = ''])
-

method MirrorL [line 11736]

+

method MirrorL [line 11733]

@@ -14568,7 +14568,7 @@ $y = ''])
-

method MirrorP [line 11723]

+

method MirrorP [line 11720]

@@ -14616,7 +14616,7 @@ $y = ''])
-

method MirrorV [line 11711]

+

method MirrorV [line 11708]

@@ -14658,7 +14658,7 @@ $y = ''])
-

method movePage [line 21180]

+

method movePage [line 21177]

@@ -14706,7 +14706,7 @@ $topage)
-

method MultiCell [line 5648]

+

method MultiCell [line 5644]

@@ -14844,7 +14844,7 @@ $fitcell = false])
-

method objclone [line 21863]

+

method objclone [line 21860]

@@ -14917,7 +14917,7 @@ $object)
-

method openHTMLTagHandler [line 19066]

+

method openHTMLTagHandler [line 19063]

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

method Output [line 7447]

+

method Output [line 7443]

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

method PageNoFormatted [line 14831]

+

method PageNoFormatted [line 14828]

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

method PieSector [line 15663]

+

method PieSector [line 15660]

@@ -15180,7 +15180,7 @@ $o:)
-

method PieSectorXY [line 15684]

+

method PieSectorXY [line 15681]

@@ -15288,7 +15288,7 @@ $o:)
-

method pixelsToUnits [line 11011]

+

method pixelsToUnits [line 11008]

@@ -15330,7 +15330,7 @@ $px)
-

method Polycurve [line 12208]

+

method Polycurve [line 12205]

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

method Polygon [line 12414]

+

method Polygon [line 12411]

@@ -15465,7 +15465,7 @@ $closed = true])
-

method PolyLine [line 12395]

+

method PolyLine [line 12392]

@@ -15528,7 +15528,7 @@ $closed)
-

method printTemplate [line 22581]

+

method printTemplate [line 22579]

@@ -15615,7 +15615,7 @@ $fitonpage = false])
-

method putHtmlListBullet [line 20651]

+

method putHtmlListBullet [line 20648]

@@ -15666,7 +15666,7 @@ $size = 10])
-

method RadialGradient [line 15244]

+

method RadialGradient [line 15241]

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

method RadioButton [line 14089]

+

method RadioButton [line 14086]

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

method readDiskCache [line 20953]

+

method readDiskCache [line 20950]

@@ -15882,7 +15882,7 @@ $file)
-

method Rect [line 12126]

+

method Rect [line 12123]

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

method registrationMark [line 15195]

+

method registrationMark [line 15192]

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

method RegularPolygon [line 12512]

+

method RegularPolygon [line 12509]

@@ -16143,7 +16143,7 @@ $r:)
-

method removeSHY [line 5016]

+

method removeSHY [line 5009]

@@ -16185,7 +16185,7 @@ $txt = ''])
-

method replaceBuffer [line 20981]

+

method replaceBuffer [line 20978]

@@ -16224,7 +16224,7 @@ $data)
-

method revstrpos [line 21887]

+

method revstrpos [line 21884]

@@ -16278,7 +16278,7 @@ $offset = 0])
-

method rfread [line 7208]

+

method rfread [line 7204]

@@ -16329,7 +16329,7 @@ $length)
-

method rollbackTransaction [line 21834]

+

method rollbackTransaction [line 21831]

@@ -16371,7 +16371,7 @@ $self = false])
-

method Rotate [line 11793]

+

method Rotate [line 11790]

@@ -16425,7 +16425,7 @@ $y = ''])
-

method RoundedRect [line 12602]

+

method RoundedRect [line 12599]

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

method RoundedRectXY [line 12621]

+

method RoundedRectXY [line 12618]

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

method Scale [line 11667]

+

method Scale [line 11664]

@@ -16665,7 +16665,7 @@ $y = ''])
-

method ScaleX [line 11627]

+

method ScaleX [line 11624]

@@ -16719,7 +16719,7 @@ $y = ''])
-

method ScaleXY [line 11653]

+

method ScaleXY [line 11650]

@@ -16773,7 +16773,7 @@ $y = ''])
-

method ScaleY [line 11640]

+

method ScaleY [line 11637]

@@ -16827,7 +16827,7 @@ $y = ''])
-

method segSVGContentHandler [line 24203]

+

method segSVGContentHandler [line 24220]

@@ -16875,7 +16875,7 @@ $data)
-

method selectColumn [line 21950]

+

method selectColumn [line 21947]

@@ -16914,7 +16914,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 22046]

+

method serializeTCPDFtagParameters [line 22043]

@@ -16956,7 +16956,7 @@ $pararray)
-

method setAlpha [line 14944]

+

method setAlpha [line 14941]

@@ -17091,7 +17091,7 @@ $margin = 0])
-

method setBarcode [line 15981]

+

method setBarcode [line 15978]

@@ -17127,7 +17127,7 @@ $bc = ''])
-

method SetBooklet [line 20421]

+

method SetBooklet [line 20418]

@@ -17178,7 +17178,7 @@ $outer = -1])
-

method setBuffer [line 20963]

+

method setBuffer [line 20960]

@@ -17217,7 +17217,7 @@ $data)
-

method setCellHeightRatio [line 14978]

+

method setCellHeightRatio [line 14975]

@@ -17298,7 +17298,7 @@ $pad)
-

method setColumnsArray [line 21937]

+

method setColumnsArray [line 21934]

@@ -17496,7 +17496,7 @@ $font)
-

method setDefaultTableColumns [line 14968]

+

method setDefaultTableColumns [line 14965]

@@ -17754,7 +17754,7 @@ $tint = 100])
-

method setEqualColumns [line 21904]

+

method setEqualColumns [line 21901]

@@ -17805,7 +17805,7 @@ $y = ''])
-

method setExtGState [line 14910]

+

method setExtGState [line 14907]

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

method setFontBuffer [line 21117]

+

method setFontBuffer [line 21114]

@@ -18156,7 +18156,7 @@ $out = true])
-

method setFontSubBuffer [line 21143]

+

method setFontSubBuffer [line 21140]

@@ -18207,7 +18207,7 @@ $data)
-

method setFontSubsetting [line 22380]

+

method setFontSubsetting [line 22377]

@@ -18277,7 +18277,7 @@ $enable = true])
-

method setFooterFont [line 10859]

+

method setFooterFont [line 10856]

@@ -18352,7 +18352,7 @@ $fm = 10])
-

method setFormDefaultProp [line 13973]

+

method setFormDefaultProp [line 13970]

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

method setGraphicVars [line 20853]

+

method setGraphicVars [line 20850]

@@ -18521,7 +18521,7 @@ $hs = ''])
-

method setHeaderFont [line 10839]

+

method setHeaderFont [line 10836]

@@ -18596,7 +18596,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 20492]

+

method setHtmlLinksStyle [line 20489]

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

method setHtmlVSpace [line 20461]

+

method setHtmlVSpace [line 20458]

@@ -18680,7 +18680,7 @@ $tagvs)
-

method setImageBuffer [line 21058]

+

method setImageBuffer [line 21055]

@@ -18767,7 +18767,7 @@ $scale)
-

method setImageSubBuffer [line 21081]

+

method setImageSubBuffer [line 21078]

@@ -18818,7 +18818,7 @@ $data)
-

method setJPEGQuality [line 14955]

+

method setJPEGQuality [line 14952]

@@ -18899,7 +18899,7 @@ $keywords)
-

method setLanguageArray [line 10879]

+

method setLanguageArray [line 10876]

@@ -19022,7 +19022,7 @@ $margin)
-

method SetLineStyle [line 11948]

+

method SetLineStyle [line 11945]

@@ -19077,7 +19077,7 @@ $ret = false])
-

method SetLineWidth [line 11905]

+

method SetLineWidth [line 11902]

@@ -19119,7 +19119,7 @@ $width)
-

method SetLink [line 4745]

+

method SetLink [line 4741]

@@ -19173,7 +19173,7 @@ $page = -1])
-

method setListIndentWidth [line 20471]

+

method setListIndentWidth [line 20468]

@@ -19212,7 +19212,7 @@ $width)
-

method setLIsymbol [line 20382]

+

method setLIsymbol [line 20379]

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

method setOpenCell [line 20481]

+

method setOpenCell [line 20478]

@@ -19473,7 +19473,7 @@ $points = false])
-

method setPageBuffer [line 21015]

+

method setPageBuffer [line 21012]

@@ -19690,7 +19690,7 @@ $unit)
-

method setPDFVersion [line 14997]

+

method setPDFVersion [line 14994]

@@ -19807,7 +19807,7 @@ $val = true])
-

method SetProtection [line 11458]

+

method SetProtection [line 11455]

@@ -19873,7 +19873,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 22277]

+

method setRasterizeVectorImages [line 22274]

@@ -19999,7 +19999,7 @@ $resetx = true])
-

method setSignature [line 14634]

+

method setSignature [line 14631]

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

method setSignatureAppearance [line 14670]

+

method setSignatureAppearance [line 14667]

@@ -20224,7 +20224,7 @@ $subject)
-

method setSVGStyles [line 23131]

+

method setSVGStyles [line 23142]

@@ -20477,7 +20477,7 @@ $color)
-

method setTextRenderingMode [line 22058]

+

method setTextRenderingMode [line 22055]

@@ -20660,7 +20660,7 @@ $margin)
-

method setUserRights [line 14598]

+

method setUserRights [line 14595]

@@ -20738,7 +20738,7 @@ $formex = ''])
-

method setViewerPreferences [line 15010]

+

method setViewerPreferences [line 15007]

@@ -20780,7 +20780,7 @@ $preferences)
-

method setVisibility [line 14855]

+

method setVisibility [line 14852]

@@ -20819,7 +20819,7 @@ $v)
-

method SetX [line 7368]

+

method SetX [line 7364]

@@ -20867,7 +20867,7 @@ $rtloff = false])
-

method SetXY [line 7432]

+

method SetXY [line 7428]

@@ -20921,7 +20921,7 @@ $rtloff = false])
-

method SetY [line 7400]

+

method SetY [line 7396]

@@ -20975,7 +20975,7 @@ $rtloff = false])
-

method set_mqr [line 6985]

+

method set_mqr [line 6981]

@@ -21014,7 +21014,7 @@ $mqr)
-

method Skew [line 11850]

+

method Skew [line 11847]

@@ -21074,7 +21074,7 @@ $y = ''])
-

method SkewX [line 11823]

+

method SkewX [line 11820]

@@ -21128,7 +21128,7 @@ $y = ''])
-

method SkewY [line 11836]

+

method SkewY [line 11833]

@@ -21182,7 +21182,7 @@ $y = ''])
-

method StarPolygon [line 12560]

+

method StarPolygon [line 12557]

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

method startPageGroup [line 14690]

+

method startPageGroup [line 14687]

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

method startSVGElementHandler [line 23729]

+

method startSVGElementHandler [line 23740]

@@ -21453,7 +21453,7 @@ $attribs)
-

method startTemplate [line 22497]

+

method startTemplate [line 22494]

@@ -21507,7 +21507,7 @@ $h = 0])
-

method startTransaction [line 21803]

+

method startTransaction [line 21800]

@@ -21535,7 +21535,7 @@ $h = 0])
-

method StartTransform [line 11595]

+

method StartTransform [line 11592]

@@ -21566,7 +21566,7 @@ $h = 0])
-

method StopTransform [line 11610]

+

method StopTransform [line 11607]

@@ -21597,7 +21597,7 @@ $h = 0])
-

method stringLeftTrim [line 22404]

+

method stringLeftTrim [line 22401]

@@ -21648,7 +21648,7 @@ $replace = ''])
-

method stringRightTrim [line 22417]

+

method stringRightTrim [line 22414]

@@ -21699,7 +21699,7 @@ $replace = ''])
-

method stringTrim [line 22430]

+

method stringTrim [line 22427]

@@ -21750,7 +21750,7 @@ $replace = ''])
-

method SVGPath [line 23386]

+

method SVGPath [line 23397]

@@ -21801,7 +21801,7 @@ $style = ''])
-

method SVGTransform [line 23112]

+

method SVGTransform [line 23123]

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

method swapMargins [line 20437]

+

method swapMargins [line 20434]

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

method Text [line 4916]

+

method Text [line 4909]

@@ -22050,7 +22050,7 @@ $rtloff = false])
-

method TextField [line 14002]

+

method TextField [line 13999]

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

method Transform [line 11881]

+

method Transform [line 11878]

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

method Translate [line 11771]

+

method Translate [line 11768]

@@ -22224,7 +22224,7 @@ $t_y)
-

method TranslateX [line 11748]

+

method TranslateX [line 11745]

@@ -22266,7 +22266,7 @@ $t_x)
-

method TranslateY [line 11759]

+

method TranslateY [line 11756]

@@ -22308,7 +22308,7 @@ $t_y)
-

method unhtmlentities [line 11022]

+

method unhtmlentities [line 11019]

@@ -22347,7 +22347,7 @@ $text_to_convert)
-

method UniArrSubString [line 6518]

+

method UniArrSubString [line 6514]

@@ -22401,7 +22401,7 @@ $end = ''])
-

method unichr [line 6551]

+

method unichr [line 6547]

@@ -22446,7 +22446,7 @@ $c)
-

method UTF8ArrayToUniArray [line 6539]

+

method UTF8ArrayToUniArray [line 6535]

@@ -22488,7 +22488,7 @@ $ta)
-

method UTF8ArrSubString [line 6495]

+

method UTF8ArrSubString [line 6491]

@@ -22539,7 +22539,7 @@ $end = ''])
-

method UTF8ArrToLatin1 [line 10747]

+

method UTF8ArrToLatin1 [line 10744]

@@ -22581,7 +22581,7 @@ $unicode)
-

method utf8Bidi [line 12782]

+

method utf8Bidi [line 12779]

@@ -22638,7 +22638,7 @@ $forcertl = false])
-

method utf8StrArrRev [line 12768]

+

method utf8StrArrRev [line 12765]

@@ -22698,7 +22698,7 @@ $forcertl = false])
-

method UTF8StringToArray [line 10582]

+

method UTF8StringToArray [line 10579]

@@ -22764,7 +22764,7 @@ $str)
-

method utf8StrRev [line 12753]

+

method utf8StrRev [line 12750]

@@ -22818,7 +22818,7 @@ $forcertl = false])
-

method UTF8ToLatin1 [line 10717]

+

method UTF8ToLatin1 [line 10714]

@@ -22860,7 +22860,7 @@ $str)
-

method UTF8ToUTF16BE [line 10701]

+

method UTF8ToUTF16BE [line 10698]

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

method Write [line 6138]

+

method Write [line 6134]

@@ -23013,7 +23013,7 @@ $wadj = 0])
-

method write1DBarcode [line 16012]

+

method write1DBarcode [line 16009]

@@ -23103,7 +23103,7 @@ $align = ''])
-

method write2DBarcode [line 16348]

+

method write2DBarcode [line 16345]

@@ -23193,7 +23193,7 @@ $distort = false])
-

method writeBarcode [line 16293]

+

method writeBarcode [line 16290]

@@ -23283,7 +23283,7 @@ $code)
-

method writeDiskCache [line 20925]

+

method writeDiskCache [line 20922]

@@ -23340,7 +23340,7 @@ $file)
-

method writeHTML [line 17780]

+

method writeHTML [line 17777]

@@ -23406,7 +23406,7 @@ $align = ''])
-

method writeHTMLCell [line 17764]

+

method writeHTMLCell [line 17761]

@@ -23508,7 +23508,7 @@ $autopadding = true])
-

method _addfield [line 13574]

+

method _addfield [line 13571]

@@ -23586,7 +23586,7 @@ $prop)
-

method _AES [line 11246]

+

method _AES [line 11243]

@@ -23637,7 +23637,7 @@ $text)
-

method _beginpage [line 10248]

+

method _beginpage [line 10245]

@@ -23682,7 +23682,7 @@ $format = ''])
-

method _datastring [line 10429]

+

method _datastring [line 10426]

@@ -23727,7 +23727,7 @@ $n = 0])
-

method _datestring [line 10444]

+

method _datestring [line 10441]

@@ -23769,7 +23769,7 @@ $n = 0])
-

method _destroy [line 7641]

+

method _destroy [line 7637]

@@ -23814,7 +23814,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 7669]

+

method _dochecks [line 7665]

@@ -23839,7 +23839,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 10355]

+

method _dolinethrough [line 10352]

@@ -23887,7 +23887,7 @@ $txt)
-

method _dolinethroughw [line 10368]

+

method _dolinethroughw [line 10365]

@@ -23944,7 +23944,7 @@ $txt)
-

method _dooverline [line 10381]

+

method _dooverline [line 10378]

@@ -23995,7 +23995,7 @@ $txt)
-

method _dooverlinew [line 10394]

+

method _dooverlinew [line 10391]

@@ -24046,7 +24046,7 @@ $w)
-

method _dounderline [line 10330]

+

method _dounderline [line 10327]

@@ -24094,7 +24094,7 @@ $txt)
-

method _dounderlinew [line 10343]

+

method _dounderlinew [line 10340]

@@ -24145,7 +24145,7 @@ $w)
-

method _encrypt_data [line 11055]

+

method _encrypt_data [line 11052]

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

method _enddoc [line 10176]

+

method _enddoc [line 10173]

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

method _endpage [line 10292]

+

method _endpage [line 10289]

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

method _escape [line 10417]

+

method _escape [line 10414]

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

method _escapetext [line 10472]

+

method _escapetext [line 10469]

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

method _freadint [line 10406]

+

method _freadint [line 10403]

@@ -24363,7 +24363,7 @@ $f)
-

method _generateencryptionkey [line 11333]

+

method _generateencryptionkey [line 11330]

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

method _getannotsrefs [line 7917]

+

method _getannotsrefs [line 7913]

@@ -24459,7 +24459,7 @@ $n)
-

method _getBYTE [line 8651]

+

method _getBYTE [line 8648]

@@ -24522,7 +24522,7 @@ $offset)
-

method _getfontpath [line 7685]

+

method _getfontpath [line 7681]

@@ -24547,7 +24547,7 @@ $offset)
-

method _getobj [line 10314]

+

method _getobj [line 10311]

@@ -24589,7 +24589,7 @@ $objid = ''])
-

method _getrawstream [line 10492]

+

method _getrawstream [line 10489]

@@ -24637,7 +24637,7 @@ $n = 0])
-

method _getSHORT [line 8636]

+

method _getSHORT [line 8633]

@@ -24700,7 +24700,7 @@ $offset)
-

method _getstream [line 10507]

+

method _getstream [line 10504]

@@ -24745,7 +24745,7 @@ $n = 0])
-

method _getTrueTypeFontSubset [line 8666]

+

method _getTrueTypeFontSubset [line 8663]

@@ -24796,7 +24796,7 @@ $subsetchars)
-

method _getTTFtableChecksum [line 8997]

+

method _getTTFtableChecksum [line 8994]

@@ -24847,7 +24847,7 @@ $length)
-

method _getULONG [line 8606]

+

method _getULONG [line 8603]

@@ -24910,7 +24910,7 @@ $offset)
-

method _getUSHORT [line 8621]

+

method _getUSHORT [line 8618]

@@ -24973,7 +24973,7 @@ $offset)
-

method _getxobjectdict [line 9862]

+

method _getxobjectdict [line 9859]

@@ -25004,7 +25004,7 @@ $offset)
-

method _JScolor [line 13550]

+

method _JScolor [line 13547]

@@ -25046,7 +25046,7 @@ $color)
-

method _md5_16 [line 11264]

+

method _md5_16 [line 11261]

@@ -25091,7 +25091,7 @@ $str)
-

method _newobj [line 10302]

+

method _newobj [line 10299]

@@ -25119,7 +25119,7 @@ $str)
-

method _objectkey [line 11036]

+

method _objectkey [line 11033]

@@ -25161,7 +25161,7 @@ $n)
-

method _out [line 10527]

+

method _out [line 10524]

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

method _outCurve [line 12053]

+

method _outCurve [line 12050]

@@ -25266,7 +25266,7 @@ $y3)
-

method _outCurveV [line 12067]

+

method _outCurveV [line 12064]

@@ -25323,7 +25323,7 @@ $y3)
-

method _outCurveY [line 12083]

+

method _outCurveY [line 12080]

@@ -25392,7 +25392,7 @@ $y2)
-

method _outellipticalarc [line 12279]

+

method _outellipticalarc [line 12276]

@@ -25500,7 +25500,7 @@ $angf:)
-

method _outLine [line 12023]

+

method _outLine [line 12020]

@@ -25545,7 +25545,7 @@ $y)
-

method _outPoint [line 12011]

+

method _outPoint [line 12008]

@@ -25590,7 +25590,7 @@ $y)
-

method _outRect [line 12037]

+

method _outRect [line 12034]

@@ -25653,7 +25653,7 @@ $op)
-

method _Ovalue [line 11277]

+

method _Ovalue [line 11274]

@@ -25704,7 +25704,7 @@ $owner_pass)
-

method _parsejpeg [line 7077]

+

method _parsejpeg [line 7073]

@@ -25743,7 +25743,7 @@ $file)
-

method _parsepng [line 7103]

+

method _parsepng [line 7099]

@@ -25782,7 +25782,7 @@ $file)
-

method _putannotsobjs [line 7953]

+

method _putannotsobjs [line 7949]

@@ -25813,7 +25813,7 @@ $file)
-

method _putannotsrefs [line 7905]

+

method _putannotsrefs [line 7901]

@@ -25858,7 +25858,7 @@ $n)
-

method _putAPXObject [line 8565]

+

method _putAPXObject [line 8562]

@@ -25912,7 +25912,7 @@ $stream = ''])
-

method _putbookmarks [line 13387]

+

method _putbookmarks [line 13384]

@@ -25943,7 +25943,7 @@ $stream = ''])
-

method _putcatalog [line 10001]

+

method _putcatalog [line 9998]

@@ -25971,7 +25971,7 @@ $stream = ''])
-

method _putcidfont0 [line 9661]

+

method _putcidfont0 [line 9658]

@@ -26013,7 +26013,7 @@ $font)
-

method _putEmbeddedFiles [line 4874]

+

method _putEmbeddedFiles [line 4867]

@@ -26044,7 +26044,7 @@ $font)
-

method _putencryption [line 11079]

+

method _putencryption [line 11076]

@@ -26075,7 +26075,7 @@ $font)
-

method _putextgstates [line 14920]

+

method _putextgstates [line 14917]

@@ -26114,7 +26114,7 @@ $gs)
-

method _putfonts [line 9118]

+

method _putfonts [line 9115]

@@ -26142,7 +26142,7 @@ $gs)
-

method _putfontwidths [line 9019]

+

method _putfontwidths [line 9016]

@@ -26193,7 +26193,7 @@ $cidoffset = 0])
-

method _putheader [line 10168]

+

method _putheader [line 10165]

@@ -26218,7 +26218,7 @@ $cidoffset = 0])
-

method _putimages [line 9731]

+

method _putimages [line 9728]

@@ -26243,7 +26243,7 @@ $cidoffset = 0])
-

method _putinfo [line 9954]

+

method _putinfo [line 9951]

@@ -26271,7 +26271,7 @@ $cidoffset = 0])
-

method _putjavascript [line 13496]

+

method _putjavascript [line 13493]

@@ -26302,7 +26302,7 @@ $cidoffset = 0])
-

method _putocg [line 14840]

+

method _putocg [line 14837]

@@ -26330,7 +26330,7 @@ $cidoffset = 0])
-

method _putpages [line 7696]

+

method _putpages [line 7692]

@@ -26355,7 +26355,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 9874]

+

method _putresourcedict [line 9871]

@@ -26380,7 +26380,7 @@ $cidoffset = 0])
-

method _putresources [line 9932]

+

method _putresources [line 9929]

@@ -26405,7 +26405,7 @@ $cidoffset = 0])
-

method _putshaders [line 15474]

+

method _putshaders [line 15471]

@@ -26436,7 +26436,7 @@ $cidoffset = 0])
-

method _putsignature [line 14513]

+

method _putsignature [line 14510]

@@ -26467,7 +26467,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 9842]

+

method _putspotcolors [line 9839]

@@ -26495,7 +26495,7 @@ $cidoffset = 0])
-

method _putstream [line 10518]

+

method _putstream [line 10515]

@@ -26540,7 +26540,7 @@ $n = 0])
-

method _puttruetypeunicode [line 9274]

+

method _puttruetypeunicode [line 9271]

diff --git a/tcpdf.php b/tcpdf.php index 2e9f42a..d2ca66a 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * 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.8.018 + * @version 5.8.019 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1523,7 +1523,7 @@ if (!class_exists('TCPDF', false)) { protected $xobjects = array(); /** - * @var boolean true when we are inside a XObject + * @var boolean true when we are inside an XObject * @access protected * @since 5.8.017 (2010-08-24) */ @@ -3529,7 +3529,7 @@ if (!class_exists('TCPDF', false)) { */ public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) { if ($this->inxobj) { - // we are inside a template + // we are inside an XObject template return; } if (!isset($this->original_lMargin) OR $keepmargins) { @@ -4566,7 +4566,7 @@ if (!class_exists('TCPDF', false)) { $subsetchars = array_fill(0, 256, true); $this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars)); if ($this->inxobj) { - // we are inside a template + // we are inside an XObject template $this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts; } if (isset($diff) AND (!empty($diff))) { @@ -4723,10 +4723,6 @@ if (!class_exists('TCPDF', false)) { * @see Cell(), Write(), Image(), Link(), SetLink() */ public function AddLink() { - if ($this->inxobj) { - // we are inside a template - return; - } //Create a new internal link $n = count($this->links) + 1; $this->links[$n] = array(0, 0); @@ -4743,10 +4739,6 @@ if (!class_exists('TCPDF', false)) { * @see AddLink() */ public function SetLink($link, $y=0, $page=-1) { - if ($this->inxobj) { - // we are inside a template - return; - } if ($y == -1) { $y = $this->y; } @@ -4788,7 +4780,8 @@ if (!class_exists('TCPDF', false)) { */ public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) { if ($this->inxobj) { - // we are inside a template + // store parameters for later use on template + $this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces); return; } if ($x === '') { @@ -4798,7 +4791,7 @@ if (!class_exists('TCPDF', false)) { $y = $this->y; } // recalculate coordinates to account for graphic transformations - if (isset($this->transfmatrix)) { + if (isset($this->transfmatrix) AND !empty($this->transfmatrix)) { for ($i=$this->transfmatrix_key; $i > 0; --$i) { $maxid = count($this->transfmatrix[$i]) - 1; for ($j=$maxid; $j >= 0; --$j) { @@ -5095,7 +5088,7 @@ if (!class_exists('TCPDF', false)) { } case 'B': { // bottom - $y -= ($h - $this->FontAscent - $this->FontDescent - ($this->LineWidth / 2)); + $y -= ($h - $this->FontAscent - $this->FontDescent - $this->cMargin - ($this->LineWidth / 2)); break; } default: @@ -5118,7 +5111,7 @@ if (!class_exists('TCPDF', false)) { } case 'B': { // bottom - $y -= ($h - $this->FontDescent - ($this->LineWidth / 2)); + $y -= ($h - $this->FontDescent- $this->cMargin - ($this->LineWidth / 2)); break; } default: @@ -5136,7 +5129,7 @@ if (!class_exists('TCPDF', false)) { switch ($valign) { case 'T': { // top - $y -= ($this->FontAscent + $this->FontDescent + ($this->LineWidth / 2)); + $y -= ($this->FontAscent + $this->FontDescent + $this->cMargin + ($this->LineWidth / 2)); break; } case 'B': { @@ -5148,7 +5141,7 @@ if (!class_exists('TCPDF', false)) { case 'C': case 'M': { // center - $y -= (($h + $this->FontAscent + $this->FontDescent) / 2); + $y -= (($h + $this->FontAscent + $this->FontDescent) / 2) + $this->cMargin; break; } } @@ -5175,11 +5168,13 @@ if (!class_exists('TCPDF', false)) { case 'T': { // top $basefonty = $y + $this->FontAscent + ($this->LineWidth / 2); + $yt = $y + ($this->LineWidth / 2); break; } case 'B': { // bottom - $basefonty = $y + $h - $this->FontDescent - ($this->LineWidth / 2); + $basefonty = $y + $h - $this->FontDescent - $this->cMargin - ($this->LineWidth / 2); + $yt = $y + $h - $this->FontSize - $this->cMargin - ($this->LineWidth / 2); break; } default: @@ -5187,6 +5182,7 @@ if (!class_exists('TCPDF', false)) { case 'M': { // center $basefonty = $y + (($h + $this->FontAscent - $this->FontDescent) / 2); + $yt = $y + (($h - $this->FontSize) / 2); break; } } @@ -5385,7 +5381,7 @@ if (!class_exists('TCPDF', false)) { $s .= ' Q'; } if ($link) { - $this->Link($xdx, $y + (($h - $this->FontSize)/2), $width, $this->FontSize, $link, $ns); + $this->Link($xdx, $yt, $width, ($this->FontSize + $this->cMargin), $link, $ns); } } // output cell @@ -6971,7 +6967,7 @@ if (!class_exists('TCPDF', false)) { } $this->endlinex = $this->img_rb_x; if ($this->inxobj) { - // we are inside a template + // we are inside an XObject template $this->xobjects[$this->xobjid]['images'][] = $info['i']; } return $info['i']; @@ -8077,6 +8073,7 @@ if (!class_exists('TCPDF', false)) { // reference to XObject that define the appearance for this mode-state $apsobjid = $this->_putAPXObject($c, $d, $stream); $annots .= ' /'.$apstate.' '.$apsobjid.' 0 R'; + $annots .= ' /'.$apstate.' /'.$stream; } $annots .= ' >>'; } else { @@ -10527,7 +10524,7 @@ if (!class_exists('TCPDF', false)) { protected function _out($s) { if ($this->state == 2) { if ($this->inxobj) { - // we are inside a template + // we are inside an XObject template $this->xobjects[$this->xobjid]['outdata'] .= $s."\n"; } elseif ((!$this->InFooter) AND isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) { // puts data before page footer @@ -14379,6 +14376,11 @@ if (!class_exists('TCPDF', false)) { $prop['display'] = 'display.noPrint'; // get annotation data $popt = $this->getAnnotOptFromJSProp($prop); + $this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i']; + $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor); + $popt['da'] = $fontstyle; + $popt['ap'] = array(); + $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q'; // set additional default options if (!isset($popt['mk'])) { $popt['mk'] = array(); @@ -14393,11 +14395,6 @@ if (!class_exists('TCPDF', false)) { $popt['mk']['ca'] = $this->_textstring($caption, $ann_obj_id); $popt['mk']['rc'] = $this->_textstring($caption, $ann_obj_id); $popt['mk']['ac'] = $this->_textstring($caption, $ann_obj_id); - $this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i']; - $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor); - $popt['da'] = $fontstyle; - $popt['ap'] = array(); - $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q'; // merge options $opt = array_merge($popt, $opt); // set remaining annotation data @@ -22496,7 +22493,7 @@ if (!class_exists('TCPDF', false)) { */ public function startTemplate($w=0, $h=0) { if ($this->inxobj) { - // we are inside a template + // we are already inside an XObject template return false; } $this->inxobj = true; @@ -22512,6 +22509,7 @@ if (!class_exists('TCPDF', false)) { $this->xobjects[$this->xobjid]['xobjects'] = array(); $this->xobjects[$this->xobjid]['images'] = array(); $this->xobjects[$this->xobjid]['fonts'] = array(); + $this->xobjects[$this->xobjid]['annotations'] = array(); // set new environment $this->num_columns = 1; $this->current_column = 0; @@ -22598,8 +22596,8 @@ if (!class_exists('TCPDF', false)) { if ($y === '') { $y = $this->y; } - $ow = $this->xobjects[$this->xobjid]['w']; - $oh = $this->xobjects[$this->xobjid]['h']; + $ow = $this->xobjects[$id]['w']; + $oh = $this->xobjects[$id]['h']; // calculate image width and height on document if (($w <= 0) AND ($h <= 0)) { $w = $ow; @@ -22640,8 +22638,8 @@ if (!class_exists('TCPDF', false)) { // print XObject Template + Transformation matrix $this->StartTransform(); // translate and scale - $sx = ($w / $this->xobjects[$this->xobjid]['w']); - $sy = ($h / $this->xobjects[$this->xobjid]['h']); + $sx = ($w / $this->xobjects[$id]['w']); + $sy = ($h / $this->xobjects[$id]['h']); $tm = array(); $tm[0] = $sx; $tm[1] = 0; @@ -22653,6 +22651,19 @@ if (!class_exists('TCPDF', false)) { // set object $this->_out('/'.$id.' Do'); $this->StopTransform(); + // add annotations + if (!empty($this->xobjects[$id]['annotations'])) { + foreach ($this->xobjects[$id]['annotations'] as $annot) { + // transform original coordinates + $coordlt = $this->getTransformationMatrixProduct($tm, array(1, 0, 0, 1, ($annot['x'] * $this->k), (-$annot['y'] * $this->k))); + $ax = ($coordlt[4] / $this->k); + $ay = ($this->h - $h - ($coordlt[5] / $this->k)); + $coordrb = $this->getTransformationMatrixProduct($tm, array(1, 0, 0, 1, (($annot['x'] + $annot['w']) * $this->k), ((-$annot['y'] - $annot['h']) * $this->k))); + $aw = ($coordrb[4] / $this->k) - $ax; + $ah = ($this->h - $h - ($coordrb[5] / $this->k)) - $ay; + $this->Annotation($ax, $ay, $aw, $ah, $annot['text'], $annot['opt'], $annot['spaces']); + } + } // set pointer to align the next text/objects switch($align) { case 'T': { @@ -23744,7 +23755,7 @@ if (!class_exists('TCPDF', false)) { // get styling properties $prev_svgstyle = $this->svgstyles[(count($this->svgstyles) - 1)]; // previous style $svgstyle = array(); // current style - if (isset($attribs['style'])) { + if (isset($attribs['style']) AND !$this->empty_string($attribs['style'])) { $attribs['style'] = ';'.$attribs['style']; } foreach ($prev_svgstyle as $key => $val) { @@ -23754,7 +23765,7 @@ if (!class_exists('TCPDF', false)) { } else { $svgstyle[$key] = $attribs[$key]; } - } elseif (isset($attribs['style'])) { + } elseif (isset($attribs['style']) AND !$this->empty_string($attribs['style'])) { // CSS style syntax $attrval = array(); if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) { @@ -23765,7 +23776,13 @@ if (!class_exists('TCPDF', false)) { } } else { // default value - $svgstyle[$key] = $this->svgstyles[0][$key]; + if (in_array($key, $this->svginheritprop)) { + // inherit previous value + $svgstyle[$key] = $val; + } else { + // default value + $svgstyle[$key] = $this->svgstyles[0][$key]; + } } } else { if (in_array($key, $this->svginheritprop)) {
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index c9cfaac..9a0f799 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 Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
@@ -26582,7 +26582,7 @@ $font)
-

method _putviewerpreferences [line 10097]

+

method _putviewerpreferences [line 10094]

diff --git a/doc/index.html b/doc/index.html index c9cfaac..9a0f799 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 Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 903299c..bc5f713 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 25 Aug 2010 20:19:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:53 +0200 by phpDocumentor 1.4.3
@@ -26616,7 +26616,7 @@ $font)
-

method _putxobjects [line 9790]

+

method _putxobjects [line 9787]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 89d405b..b43369b 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2088,7 +2088,7 @@ top
- Documentation generated on Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index abb6aac..b16a4cb 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2056,7 +2056,7 @@ top
- Documentation generated on Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
@@ -26650,7 +26650,7 @@ $font)
-

method _RC4 [line 11200]

+

method _RC4 [line 11197]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 33c990d..e140d3c 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 Wed, 25 Aug 2010 20:19:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:53 +0200 by phpDocumentor 1.4.3
@@ -26701,7 +26701,7 @@ $text)
-

method _setGDImageTransparency [line 7056]

+

method _setGDImageTransparency [line 7052]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 4f1c9b1..fa3d1cd 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -113,7 +113,7 @@ unicode data

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 08bb3fc..78ee87d 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 Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:48 +0200 by phpDocumentor 1.4.3
@@ -26746,7 +26746,7 @@ $image)
-

method _textstring [line 10456]

+

method _textstring [line 10453]

diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 14bbf7b..aa50571 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 Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:48 +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 fae58da..d8c2671 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 Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:48 +0200 by phpDocumentor 1.4.3
@@ -26791,7 +26791,7 @@ $n = 0])
-

method _toJPEG [line 7019]

+

method _toJPEG [line 7015]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index b8a4e82..f6e6686 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 Wed, 25 Aug 2010 20:19:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:53 +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 ef9afcd..39aec18 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 Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
@@ -26833,7 +26833,7 @@ $file)
-

method _toPNG [line 7038]

+

method _toPNG [line 7034]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 539fcf5..8f52bb7 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 Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 58fcedd..f34159b 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Wed, 25 Aug 2010 20:19:12 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
@@ -26878,7 +26878,7 @@ $file)
-

method _Uvalue [line 11306]

+

method _Uvalue [line 11303]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 6f8162a..0189119 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Wed, 25 Aug 2010 20:19:11 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:47 +0200 by phpDocumentor 1.4.3
@@ -26915,7 +26915,7 @@ $file)
- Documentation generated on Wed, 25 Aug 2010 20:19:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:49 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.8.018version:  5.8.019
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.8.018 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.8.019 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Wed, 25 Aug 2010 20:19:13 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 26 Aug 2010 11:45:49 +0200 by phpDocumentor 1.4.3