From 766488a040f346c429ded72fb8c3d58c8ddae708 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 19 Nov 2010 17:05:41 +0100 Subject: [PATCH] 5.9.019 --- CHANGELOG.TXT | 5 + README.TXT | 2 +- 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 | 600 +++++++++--------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.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 | 4 +- 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 | 42 +- 23 files changed, 357 insertions(+), 332 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 724bcd3..a8c8c5a 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +5.9.019 (2010-11-19) + - An SVG bug was fixed. + - ImageSVG() and ImageEPS() methods now accepts image data streams (put the string on the $file parameter preceded by '@' character). + - Option 'E' was added to the $dest parameter of Output() method to return the document as base64 mime multi-part email attachment (RFC 2045). + 5.9.018 (2010-11-19) - An SVG bug was fixed. diff --git a/README.TXT b/README.TXT index c353eba..34f2b70 100755 --- a/README.TXT +++ b/README.TXT @@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.018 +Version: 5.9.019 Release date: 2010-11-19 Author: Nicola Asuni diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index da61dfb..8fb169f 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -65,7 +65,7 @@
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 592049a..a8f011a 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1004,7 +1004,7 @@ $code)
- Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:32 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 9b6db6f..ecbb79c 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5552,7 +5552,7 @@ $frame)
- Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:32 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 37befe6..1a544c4 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -84,7 +84,7 @@ Source Location: /tcpdf.php

Version:

@@ -784,7 +784,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.9.018 + version:  5.9.019 link:  http://www.tcpdf.org @@ -6338,7 +6338,7 @@ This is a PHP class for generating PDF documents without requiring external exte
[ Top ]

-

$tcpdf_version =  '5.9.018'

+

$tcpdf_version =  '5.9.019'

[line 164]



Tags:

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

method addExtGState [line 15600]

+

method addExtGState [line 15610]

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

method addHtmlLink [line 11374]

+

method addHtmlLink [line 11384]

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

method addHTMLTOC [line 23112]

+

method addHTMLTOC [line 23126]

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

method addHTMLVertSpace [line 21535]

+

method addHTMLVertSpace [line 21549]

@@ -7553,7 +7553,7 @@ $lasttag = false])
-

method addJavascriptObject [line 14184]

+

method addJavascriptObject [line 14194]

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

method addPageRegion [line 24205]

+

method addPageRegion [line 24219]

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

method addTOC [line 22940]

+

method addTOC [line 22954]

@@ -7965,7 +7965,7 @@ $brd = 0])
-

method AliasNbPages [line 15414]

+

method AliasNbPages [line 15424]

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

method AliasNumPage [line 15441]

+

method AliasNumPage [line 15451]

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

method Arrow [line 13389]

+

method Arrow [line 13399]

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

method arrUTF8ToUTF16BE [line 11269]

+

method arrUTF8ToUTF16BE [line 11279]

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

method Bookmark [line 14056]

+

method Bookmark [line 14066]

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

method Button [line 15070]

+

method Button [line 15080]

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

method CheckBox [line 15000]

+

method CheckBox [line 15010]

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

method checkPageRegions [line 24241]

+

method checkPageRegions [line 24255]

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

method Circle [line 13077]

+

method Circle [line 13087]

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

method Clip [line 16061]

+

method Clip [line 16071]

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

method closeHTMLTagHandler [line 21020]

+

method closeHTMLTagHandler [line 21034]

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

method colorRegistrationBar [line 15736]

+

method colorRegistrationBar [line 15746]

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

method ComboBox [line 14941]

+

method ComboBox [line 14951]

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

method commitTransaction [line 23236]

+

method commitTransaction [line 23250]

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

method convertHexStringToString [line 12193]

+

method convertHexStringToString [line 12203]

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

method convertHTMLColorToDec [line 11418]

+

method convertHTMLColorToDec [line 11428]

@@ -9278,7 +9278,7 @@ $hcolor = '#FFFFFF'])
-

method convertStringToHexString [line 12215]

+

method convertStringToHexString [line 12225]

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

method convertSVGtMatrix [line 24738]

+

method convertSVGtMatrix [line 24757]

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

method CoonsPatchMesh [line 15976]

+

method CoonsPatchMesh [line 15986]

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

method copyPage [line 22870]

+

method copyPage [line 22884]

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

method cropMark [line 15834]

+

method cropMark [line 15844]

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

method Curve [line 12854]

+

method Curve [line 12864]

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

method deletePage [line 22727]

+

method deletePage [line 22741]

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

method drawHTMLTagBorder [line 21577]

+

method drawHTMLTagBorder [line 21591]

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

method Ellipse [line 12918]

+

method Ellipse [line 12928]

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

method empty_string [line 23290]

+

method empty_string [line 23304]

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

method endSVGElementHandler [line 25863]

+

method endSVGElementHandler [line 25883]

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

method endTemplate [line 23972]

+

method endTemplate [line 23986]

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

method extractCSSproperties [line 17508]

+

method extractCSSproperties [line 17522]

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

method fixHTMLCode [line 17447]

+

method fixHTMLCode [line 17461]

@@ -10358,7 +10358,7 @@ $tidy_options = ''])
-

method formatPageNumber [line 15518]

+

method formatPageNumber [line 15528]

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

method formatTOCPageNumber [line 15530]

+

method formatTOCPageNumber [line 15540]

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

method getAliasNbPages [line 15426]

+

method getAliasNbPages [line 15436]

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

method getAliasNumPage [line 15454]

+

method getAliasNumPage [line 15464]

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

method getAnnotOptFromJSProp [line 14309]

+

method getAnnotOptFromJSProp [line 14319]

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

method getBarcode [line 16732]

+

method getBarcode [line 16746]

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

method getBorderStartPosition [line 21561]

+

method getBorderStartPosition [line 21575]

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

method getBuffer [line 22403]

+

method getBuffer [line 22417]

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

method getCellHeightRatio [line 15696]

+

method getCellHeightRatio [line 15706]

@@ -11165,7 +11165,7 @@ $notlast = true])
-

method getColumn [line 23441]

+

method getColumn [line 23455]

@@ -11196,7 +11196,7 @@ $notlast = true])
-

method getCSSBorderDashStyle [line 17808]

+

method getCSSBorderDashStyle [line 17822]

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

method getCSSBorderMargin [line 18003]

+

method getCSSBorderMargin [line 18017]

@@ -11286,7 +11286,7 @@ $width = 0])
-

method getCSSBorderStyle [line 17844]

+

method getCSSBorderStyle [line 17858]

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

method getCSSBorderWidth [line 17788]

+

method getCSSBorderWidth [line 17802]

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

method getCSSFontSpacing [line 18037]

+

method getCSSFontSpacing [line 18051]

@@ -11418,7 +11418,7 @@ $parent = 0])
-

method getCSSFontStretching [line 18068]

+

method getCSSFontStretching [line 18082]

@@ -11466,7 +11466,7 @@ $parent = 100])
-

method getCSSMargin [line 17949]

+

method getCSSMargin [line 17963]

@@ -11514,7 +11514,7 @@ $width = 0])
-

method getCSSPadding [line 17895]

+

method getCSSPadding [line 17909]

@@ -11562,7 +11562,7 @@ $width = 0])
-

method getEncPermissionsString [line 12232]

+

method getEncPermissionsString [line 12242]

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

method getFontBuffer [line 22567]

+

method getFontBuffer [line 22581]

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

method getFontFamily [line 17421]

+

method getFontFamily [line 17435]

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

method getFontFamilyName [line 23870]

+

method getFontFamilyName [line 23884]

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

method getFontSize [line 17401]

+

method getFontSize [line 17415]

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

method getFontSizePt [line 17411]

+

method getFontSizePt [line 17425]

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

method getFontSpacing [line 24158]

+

method getFontSpacing [line 24172]

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

method getFontStretching [line 24136]

+

method getFontStretching [line 24150]

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

method getFontStyle [line 17431]

+

method getFontStyle [line 17445]

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

method getFontSubsetting [line 23806]

+

method getFontSubsetting [line 23820]

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

method getFooterFont [line 11332]

+

method getFooterFont [line 11342]

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

method getFormDefaultProp [line 14684]

+

method getFormDefaultProp [line 14694]

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

method getGraphicVars [line 22194]

+

method getGraphicVars [line 22208]

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

method getGroupPageNo [line 15467]

+

method getGroupPageNo [line 15477]

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

method getGroupPageNoFormatted [line 15477]

+

method getGroupPageNoFormatted [line 15487]

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

method getHeaderFont [line 11312]

+

method getHeaderFont [line 11322]

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

method getHtmlDomArray [line 18138]

+

method getHtmlDomArray [line 18152]

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

method getHTMLUnitToUnits [line 21899]

+

method getHTMLUnitToUnits [line 21913]

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

method getHyphenPatternsFromTEX [line 23607]

+

method getHyphenPatternsFromTEX [line 23621]

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

method getImageBuffer [line 22505]

+

method getImageBuffer [line 22519]

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

method GetLineWidth [line 12594]

+

method GetLineWidth [line 12604]

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

method getMargins [line 17360]

+

method getMargins [line 17374]

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

method getNumberOfColumns [line 23451]

+

method getNumberOfColumns [line 23465]

@@ -12967,7 +12967,7 @@ $border = 0])
-

method getObjFilename [line 22317]

+

method getObjFilename [line 22331]

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

method getOriginalMargins [line 17387]

+

method getOriginalMargins [line 17401]

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

method getPageBuffer [line 22446]

+

method getPageBuffer [line 22460]

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

method getPageGroupAlias [line 15489]

+

method getPageGroupAlias [line 15499]

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

method getPageNumGroupAlias [line 15504]

+

method getPageNumGroupAlias [line 15514]

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

method getPageRegions [line 24170]

+

method getPageRegions [line 24184]

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

method getPathPaintOperator [line 23718]

+

method getPathPaintOperator [line 23732]

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

method getPDFData [line 11355]

+

method getPDFData [line 11365]

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

method getRandomSeed [line 11538]

+

method getRandomSeed [line 11548]

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

method getSpaceString [line 18900]

+

method getSpaceString [line 18914]

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

method getSVGTransformMatrix [line 24624]

+

method getSVGTransformMatrix [line 24643]

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

method getTagStyleFromCSS [line 17760]

+

method getTagStyleFromCSS [line 17774]

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

method getTransformationMatrixProduct [line 24720]

+

method getTransformationMatrixProduct [line 24739]

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

method getUserPermissionCode [line 12054]

+

method getUserPermissionCode [line 12064]

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

method getVectorsAngle [line 25382]

+

method getVectorsAngle [line 25402]

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

method Gradient [line 16085]

+

method Gradient [line 16095]

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

method hyphenateText [line 23646]

+

method hyphenateText [line 23660]

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

method hyphenateWord [line 23537]

+

method hyphenateWord [line 23551]

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

method ImageEps [line 16433]

+

method ImageEps [line 16443]

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

method ImageSVG [line 24327]

+

method ImageSVG [line 24341]

@@ -14680,7 +14680,7 @@ $fitonpage = false])
string   $file  Name of the file containing the image.Name of the file containing the image or a '@' character followed by the EPS/AI data string.
float  
- + @@ -14951,7 +14951,7 @@ $fitonpage = false])
-

method IncludeJS [line 14171]

+

method IncludeJS [line 14181]

@@ -14898,7 +14898,7 @@ $fitonpage = false])
string   $file  Name of the SVG file.Name of the SVG file or a '@' character followed by the SVG data string.
float  
@@ -14993,7 +14993,7 @@ $script)
-

method intToRoman [line 21978]

+

method intToRoman [line 21992]

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

method isUnicodeFont [line 23858]

+

method isUnicodeFont [line 23872]

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

method isValidCSSSelectorForTag [line 17600]

+

method isValidCSSSelectorForTag [line 17614]

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

method Line [line 12771]

+

method Line [line 12781]

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

method LinearGradient [line 15935]

+

method LinearGradient [line 15945]

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

method ListBox [line 14883]

+

method ListBox [line 14893]

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

method MirrorH [line 12368]

+

method MirrorH [line 12378]

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

method MirrorL [line 12404]

+

method MirrorL [line 12414]

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

method MirrorP [line 12391]

+

method MirrorP [line 12401]

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

method MirrorV [line 12379]

+

method MirrorV [line 12389]

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

method movePage [line 22584]

+

method movePage [line 22598]

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

method objclone [line 23279]

+

method objclone [line 23293]

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

method openHTMLTagHandler [line 20403]

+

method openHTMLTagHandler [line 20417]

- +
@@ -16086,7 +16086,7 @@ $dest = 'I'])
string   $dest  Destination where to send the document. It can take one of the following values:
  • I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
  • D: send to the browser and force a file download with the name given by name.
  • F: save to a local server file with the name given by name.
  • S: return the document as a string. name is ignored.
  • FI: equivalent to F + I option
  • FD: equivalent to F + D option
Destination where to send the document. It can take one of the following values:
  • I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
  • D: send to the browser and force a file download with the name given by name.
  • F: save to a local server file with the name given by name.
  • S: return the document as a string (name is ignored).
  • FI: equivalent to F + I option
  • FD: equivalent to F + D option
  • E: return the document as base64 mime multi-part email attachment (RFC 2045)

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

method PageNoFormatted [line 15540]

+

method PageNoFormatted [line 15550]

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

method PieSector [line 16372]

+

method PieSector [line 16382]

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

method PieSectorXY [line 16393]

+

method PieSectorXY [line 16403]

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

method pixelsToUnits [line 11513]

+

method pixelsToUnits [line 11523]

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

method Polycurve [line 12881]

+

method Polycurve [line 12891]

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

method Polygon [line 13115]

+

method Polygon [line 13125]

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

method PolyLine [line 13096]

+

method PolyLine [line 13106]

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

method printTemplate [line 24001]

+

method printTemplate [line 24015]

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

method putHtmlListBullet [line 22043]

+

method putHtmlListBullet [line 22057]

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

method RadialGradient [line 15953]

+

method RadialGradient [line 15963]

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

method RadioButton [line 14791]

+

method RadioButton [line 14801]

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

method readDiskCache [line 22357]

+

method readDiskCache [line 22371]

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

method Rect [line 12799]

+

method Rect [line 12809]

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

method registrationMark [line 15904]

+

method registrationMark [line 15914]

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

method RegularPolygon [line 13213]

+

method RegularPolygon [line 13223]

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

method removePageRegion [line 24224]

+

method removePageRegion [line 24238]

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

method replaceBuffer [line 22385]

+

method replaceBuffer [line 22399]

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

method revstrpos [line 23303]

+

method revstrpos [line 23317]

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

method rollbackTransaction [line 23250]

+

method rollbackTransaction [line 23264]

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

method Rotate [line 12461]

+

method Rotate [line 12471]

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

method RoundedRect [line 13303]

+

method RoundedRect [line 13313]

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

method RoundedRectXY [line 13322]

+

method RoundedRectXY [line 13332]

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

method Scale [line 12335]

+

method Scale [line 12345]

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

method ScaleX [line 12295]

+

method ScaleX [line 12305]

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

method ScaleXY [line 12321]

+

method ScaleXY [line 12331]

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

method ScaleY [line 12308]

+

method ScaleY [line 12318]

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

method segSVGContentHandler [line 25932]

+

method segSVGContentHandler [line 25952]

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

method selectColumn [line 23366]

+

method selectColumn [line 23380]

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

method serializeTCPDFtagParameters [line 23462]

+

method serializeTCPDFtagParameters [line 23476]

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

method setAlpha [line 15653]

+

method setAlpha [line 15663]

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

method setBarcode [line 16722]

+

method setBarcode [line 16736]

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

method SetBooklet [line 21813]

+

method SetBooklet [line 21827]

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

method setBuffer [line 22367]

+

method setBuffer [line 22381]

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

method setCellHeightRatio [line 15687]

+

method setCellHeightRatio [line 15697]

@@ -18566,7 +18566,7 @@ $bottom = ''])
-

method setColumnsArray [line 23353]

+

method setColumnsArray [line 23367]

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

method setDefaultTableColumns [line 15677]

+

method setDefaultTableColumns [line 15687]

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

method setEqualColumns [line 23320]

+

method setEqualColumns [line 23334]

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

method setExtGState [line 15619]

+

method setExtGState [line 15629]

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

method setFontBuffer [line 22521]

+

method setFontBuffer [line 22535]

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

method setFontSpacing [line 24147]

+

method setFontSpacing [line 24161]

@@ -19493,7 +19493,7 @@ $spacing = 0])
-

method setFontStretching [line 24125]

+

method setFontStretching [line 24139]

@@ -19535,7 +19535,7 @@ $perc = 100])
-

method setFontSubBuffer [line 22547]

+

method setFontSubBuffer [line 22561]

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

method setFontSubsetting [line 23795]

+

method setFontSubsetting [line 23809]

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

method setFooterFont [line 11322]

+

method setFooterFont [line 11332]

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

method setFormDefaultProp [line 14673]

+

method setFormDefaultProp [line 14683]

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

method setGraphicVars [line 22254]

+

method setGraphicVars [line 22268]

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

method setHeaderFont [line 11302]

+

method setHeaderFont [line 11312]

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

method setHtmlLinksStyle [line 21884]

+

method setHtmlLinksStyle [line 21898]

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

method setHtmlVSpace [line 21853]

+

method setHtmlVSpace [line 21867]

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

method setImageBuffer [line 22462]

+

method setImageBuffer [line 22476]

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

method setImageSubBuffer [line 22485]

+

method setImageSubBuffer [line 22499]

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

method setJPEGQuality [line 15664]

+

method setJPEGQuality [line 15674]

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

method setLanguageArray [line 11342]

+

method setLanguageArray [line 11352]

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

method SetLineStyle [line 12621]

+

method SetLineStyle [line 12631]

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

method SetLineWidth [line 12578]

+

method SetLineWidth [line 12588]

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

method setListIndentWidth [line 21863]

+

method setListIndentWidth [line 21877]

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

method setLIsymbol [line 21774]

+

method setLIsymbol [line 21788]

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

method setOpenCell [line 21873]

+

method setOpenCell [line 21887]

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

method setPageBuffer [line 22419]

+

method setPageBuffer [line 22433]

@@ -21030,7 +21030,7 @@ $bottommargin = ''])
-

method setPageRegions [line 24185]

+

method setPageRegions [line 24199]

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

method setPDFVersion [line 15706]

+

method setPDFVersion [line 15716]

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

method SetProtection [line 12098]

+

method SetProtection [line 12108]

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

method setRasterizeVectorImages [line 23692]

+

method setRasterizeVectorImages [line 23706]

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

method setSignature [line 15343]

+

method setSignature [line 15353]

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

method setSignatureAppearance [line 15379]

+

method setSignatureAppearance [line 15389]

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

method setSVGStyles [line 24777]

+

method setSVGStyles [line 24796]

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

method setTextRenderingMode [line 23474]

+

method setTextRenderingMode [line 23488]

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

method setUserRights [line 15307]

+

method setUserRights [line 15317]

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

method setViewerPreferences [line 15719]

+

method setViewerPreferences [line 15729]

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

method setVisibility [line 15564]

+

method setVisibility [line 15574]

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

method Skew [line 12518]

+

method Skew [line 12528]

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

method SkewX [line 12491]

+

method SkewX [line 12501]

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

method SkewY [line 12504]

+

method SkewY [line 12514]

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

method StarPolygon [line 13261]

+

method StarPolygon [line 13271]

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

method startPageGroup [line 15399]

+

method startPageGroup [line 15409]

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

method startSVGElementHandler [line 25406]

+

method startSVGElementHandler [line 25426]

@@ -22901,7 +22901,7 @@ $ctm = array()])
-

method startTemplate [line 23912]

+

method startTemplate [line 23926]

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

method startTransaction [line 23219]

+

method startTransaction [line 23233]

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

method StartTransform [line 12253]

+

method StartTransform [line 12263]

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

method StopTransform [line 12273]

+

method StopTransform [line 12283]

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

method stringLeftTrim [line 23819]

+

method stringLeftTrim [line 23833]

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

method stringRightTrim [line 23832]

+

method stringRightTrim [line 23846]

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

method stringTrim [line 23845]

+

method stringTrim [line 23859]

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

method SVGPath [line 25057]

+

method SVGPath [line 25076]

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

method SVGTransform [line 24758]

+

method SVGTransform [line 24777]

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

method swapMargins [line 21829]

+

method swapMargins [line 21843]

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

method TextField [line 14702]

+

method TextField [line 14712]

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

method Transform [line 12549]

+

method Transform [line 12559]

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

method Translate [line 12439]

+

method Translate [line 12449]

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

method TranslateX [line 12416]

+

method TranslateX [line 12426]

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

method TranslateY [line 12427]

+

method TranslateY [line 12437]

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

method unhtmlentities [line 11524]

+

method unhtmlentities [line 11534]

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

method UTF8ArrToLatin1 [line 11211]

+

method UTF8ArrToLatin1 [line 11221]

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

method utf8Bidi [line 13483]

+

method utf8Bidi [line 13493]

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

method utf8StrArrRev [line 13469]

+

method utf8StrArrRev [line 13479]

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

method UTF8StringToArray [line 11047]

+

method UTF8StringToArray [line 11057]

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

method utf8StrRev [line 13454]

+

method utf8StrRev [line 13464]

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

method UTF8ToLatin1 [line 11182]

+

method UTF8ToLatin1 [line 11192]

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

method UTF8ToUTF16BE [line 11166]

+

method UTF8ToUTF16BE [line 11176]

@@ -24467,7 +24467,7 @@ $margin = ''])
-

method write1DBarcode [line 16766]

+

method write1DBarcode [line 16780]

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

method write2DBarcode [line 17137]

+

method write2DBarcode [line 17151]

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

method writeBarcode [line 17072]

+

method writeBarcode [line 17086]

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

method writeDiskCache [line 22329]

+

method writeDiskCache [line 22343]

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

method writeHTML [line 18944]

+

method writeHTML [line 18958]

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

method writeHTMLCell [line 18928]

+

method writeHTMLCell [line 18942]

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

method _addfield [line 14274]

+

method _addfield [line 14284]

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

method _AES [line 11798]

+

method _AES [line 11808]

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

method _beginpage [line 10713]

+

method _beginpage [line 10723]

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

method _datastring [line 10894]

+

method _datastring [line 10904]

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

method _datestring [line 10909]

+

method _datestring [line 10919]

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

method _destroy [line 8111]

+

method _destroy [line 8121]

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

method _dochecks [line 8139]

+

method _dochecks [line 8149]

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

method _dolinethrough [line 10820]

+

method _dolinethrough [line 10830]

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

method _dolinethroughw [line 10833]

+

method _dolinethroughw [line 10843]

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

method _dooverline [line 10846]

+

method _dooverline [line 10856]

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

method _dooverlinew [line 10859]

+

method _dooverlinew [line 10869]

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

method _dounderline [line 10795]

+

method _dounderline [line 10805]

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

method _dounderlinew [line 10808]

+

method _dounderlinew [line 10818]

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

method _encrypt_data [line 11601]

+

method _encrypt_data [line 11611]

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

method _enddoc [line 10641]

+

method _enddoc [line 10651]

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

method _endpage [line 10757]

+

method _endpage [line 10767]

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

method _escape [line 10882]

+

method _escape [line 10892]

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

method _escapetext [line 10937]

+

method _escapetext [line 10947]

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

method _fixAES256Password [line 11924]

+

method _fixAES256Password [line 11934]

@@ -25826,7 +25826,7 @@ $password)
-

method _freadint [line 10871]

+

method _freadint [line 10881]

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

method _generateencryptionkey [line 11939]

+

method _generateencryptionkey [line 11949]

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

method _getannotsrefs [line 8387]

+

method _getannotsrefs [line 8397]

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

method _getBYTE [line 9121]

+

method _getBYTE [line 9131]

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

method _getfontpath [line 8155]

+

method _getfontpath [line 8165]

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

method _getobj [line 10779]

+

method _getobj [line 10789]

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

method _getrawstream [line 10957]

+

method _getrawstream [line 10967]

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

method _getSHORT [line 9106]

+

method _getSHORT [line 9116]

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

method _getstream [line 10972]

+

method _getstream [line 10982]

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

method _getTrueTypeFontSubset [line 9136]

+

method _getTrueTypeFontSubset [line 9146]

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

method _getTTFtableChecksum [line 9467]

+

method _getTTFtableChecksum [line 9477]

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

method _getULONG [line 9076]

+

method _getULONG [line 9086]

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

method _getUSHORT [line 9091]

+

method _getUSHORT [line 9101]

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

method _getxobjectdict [line 10332]

+

method _getxobjectdict [line 10342]

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

method _JScolor [line 14250]

+

method _JScolor [line 14260]

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

method _md5_16 [line 11816]

+

method _md5_16 [line 11826]

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

method _newobj [line 10767]

+

method _newobj [line 10777]

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

method _objectkey [line 11581]

+

method _objectkey [line 11591]

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

method _OEvalue [line 11911]

+

method _OEvalue [line 11921]

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

method _out [line 10992]

+

method _out [line 11002]

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

method _outCurve [line 12726]

+

method _outCurve [line 12736]

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

method _outCurveV [line 12740]

+

method _outCurveV [line 12750]

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

method _outCurveY [line 12756]

+

method _outCurveY [line 12766]

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

method _outellipticalarc [line 12955]

+

method _outellipticalarc [line 12965]

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

method _outLine [line 12696]

+

method _outLine [line 12706]

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

method _outPoint [line 12684]

+

method _outPoint [line 12694]

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

method _outRect [line 12710]

+

method _outRect [line 12720]

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

method _Ovalue [line 11873]

+

method _Ovalue [line 11883]

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

method _putannotsobjs [line 8423]

+

method _putannotsobjs [line 8433]

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

method _putannotsrefs [line 8375]

+

method _putannotsrefs [line 8385]

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

method _putAPXObject [line 9035]

+

method _putAPXObject [line 9045]

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

method _putbookmarks [line 14087]

+

method _putbookmarks [line 14097]

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

method _putcatalog [line 10466]

+

method _putcatalog [line 10476]

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

method _putcidfont0 [line 10131]

+

method _putcidfont0 [line 10141]

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

method _putencryption [line 11629]

+

method _putencryption [line 11639]

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

method _putextgstates [line 15629]

+

method _putextgstates [line 15639]

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

method _putfonts [line 9588]

+

method _putfonts [line 9598]

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

method _putfontwidths [line 9489]

+

method _putfontwidths [line 9499]

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

method _putheader [line 10633]

+

method _putheader [line 10643]

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

method _putimages [line 10201]

+

method _putimages [line 10211]

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

method _putinfo [line 10424]

+

method _putinfo [line 10434]

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

method _putjavascript [line 14196]

+

method _putjavascript [line 14206]

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

method _putocg [line 15549]

+

method _putocg [line 15559]

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

method _putpages [line 8166]

+

method _putpages [line 8176]

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

method _putresourcedict [line 10344]

+

method _putresourcedict [line 10354]

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

method _putresources [line 10402]

+

method _putresources [line 10412]

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

method _putshaders [line 16183]

+

method _putshaders [line 16193]

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

method _putsignature [line 15222]

+

method _putsignature [line 15232]

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

method _putspotcolors [line 10312]

+

method _putspotcolors [line 10322]

diff --git a/tcpdf.php b/tcpdf.php index b6376a8..9c07024 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,7 +1,7 @@ * @name TCPDF * @package com.tecnick.tcpdf -* @version 5.9.018 +* @version 5.9.019 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -161,7 +161,7 @@ class TCPDF { * @var current TCPDF version * @access private */ - private $tcpdf_version = '5.9.018'; + private $tcpdf_version = '5.9.019'; // Protected properties @@ -7909,7 +7909,7 @@ class TCPDF { * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.
* The method first calls Close() if necessary to terminate the document. * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character. - * @param string $dest Destination where to send the document. It can take one of the following values:
  • I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
  • D: send to the browser and force a file download with the name given by name.
  • F: save to a local server file with the name given by name.
  • S: return the document as a string. name is ignored.
  • FI: equivalent to F + I option
  • FD: equivalent to F + D option
+ * @param string $dest Destination where to send the document. It can take one of the following values:
  • I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
  • D: send to the browser and force a file download with the name given by name.
  • F: save to a local server file with the name given by name.
  • S: return the document as a string (name is ignored).
  • FI: equivalent to F + I option
  • FD: equivalent to F + D option
  • E: return the document as base64 mime multi-part email attachment (RFC 2045)
* @access public * @since 1.0 * @see Close() @@ -8090,6 +8090,16 @@ class TCPDF { } break; } + case 'E': { + // Return PDF as base64 mime multi-part email attachment (RFC 2045) + $retval = 'Content-Type: application/pdf;'."\r\n"; + $retval .= ' name="'.$name.'"'."\r\n"; + $retval .= 'Content-Transfer-Encoding: base64'."\r\n"; + $retval .= 'Content-Disposition: attachment;'."\r\n"; + $retval .= ' filename="'.$name.'"'."\r\n\r\n"; + $retval .= chunk_split(base64_encode($this->getBuffer()), 76, "\r\n"); + return $retval; + } case 'S': { // Returns PDF as a string return $this->getBuffer(); @@ -16415,7 +16425,7 @@ class TCPDF { * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library. * Only vector drawing is supported, not text or bitmap. * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2). - * @param string $file Name of the file containing the image. + * @param string $file Name of the file containing the image or a '@' character followed by the EPS/AI data string. * @param float $x Abscissa of the upper-left corner. * @param float $y Ordinate of the upper-left corner. * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated. @@ -16444,7 +16454,11 @@ class TCPDF { // check page for no-write regions and adapt page margins if necessary $this->checkPageRegions($h, $x, $y); $k = $this->k; - $data = file_get_contents($file); + if ($file{0} === '@') { // image from string + $data = substr($file, 1); + } else { // EPS/AI file + $data = file_get_contents($file); + } if ($data === false) { $this->Error('EPS file not found: '.$file); } @@ -24310,7 +24324,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: /** * Embedd a Scalable Vector Graphics (SVG) image. * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library. - * @param string $file Name of the SVG file. + * @param string $file Name of the SVG file or a '@' character followed by the SVG data string. * @param float $x Abscissa of the upper-left corner. * @param float $y Ordinate of the upper-left corner. * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated. @@ -24329,8 +24343,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: // convert SVG to raster image using GD or ImageMagick libraries return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false); } - $this->svgdir = dirname($file); - $svgdata = file_get_contents($file); + if ($file{0} === '@') { // image from string + $this->svgdir = ''; + $svgdata = substr($file, 1); + } else { // SVG file + $this->svgdir = dirname($file); + $svgdata = file_get_contents($file); + } if ($svgdata === false) { $this->Error('SVG file not found: '.$file); } @@ -25063,7 +25082,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $paths = array(); $d = str_replace('-', ' -', $d); $d = str_replace('+', ' +', $d); - preg_match_all('/([a-zA-Z])[\s]*([^a-zA-Z\"]*)/si', $d, $paths, PREG_SET_ORDER); + $d = str_replace('e ', 'e', $d); + preg_match_all('/([ACHLMQSTVZ])[\s]*([^ACHLMQSTVZ\"]*)/si', $d, $paths, PREG_SET_ORDER); $x = 0; $y = 0; $x1 = 0;
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index ab299f4..5a8a7d6 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
@@ -28009,7 +28009,7 @@ $cidoffset = 0])
-

method _putstream [line 10983]

+

method _putstream [line 10993]

diff --git a/doc/index.html b/doc/index.html index ab299f4..5a8a7d6 100644 --- a/doc/index.html +++ b/doc/index.html @@ -68,7 +68,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index bb6f2d3..f449436 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:38 +0100 by phpDocumentor 1.4.3
@@ -28054,7 +28054,7 @@ $n = 0])
-

method _puttruetypeunicode [line 9744]

+

method _puttruetypeunicode [line 9754]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 979d7ca..8b4bac4 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2173,7 +2173,7 @@ top
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index d7c151b..38aed46 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2140,7 +2140,7 @@ top
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
@@ -28096,7 +28096,7 @@ $font)
-

method _putviewerpreferences [line 10562]

+

method _putviewerpreferences [line 10572]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 6f215aa..af8919e 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -103,7 +103,7 @@ Unicode data class for TCPDF library.



- Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:38 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index ead687d..6e8d6b1 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -83,7 +83,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -110,7 +110,7 @@ main configuration file

(define the K_TCPDF_EXTERNAL_CONFIG consta

- Documentation generated on Fri, 19 Nov 2010 13:00:05 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:33 +0100 by phpDocumentor 1.4.3
@@ -28130,7 +28130,7 @@ $font)
-

method _putxobjects [line 10260]

+

method _putxobjects [line 10270]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 404ee73..dae946d 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -481,7 +481,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:32 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 0ad28f6..5c08d26 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -158,7 +158,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:32 +0100 by phpDocumentor 1.4.3
@@ -28164,7 +28164,7 @@ $font)
-

method _RC4 [line 11752]

+

method _RC4 [line 11762]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 3c513c0..7ef8741 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -98,7 +98,7 @@ Array of WEB safe colors



- Documentation generated on Fri, 19 Nov 2010 13:00:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:32 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index b4a8e1e..545dd8a 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -543,7 +543,7 @@ Configuration file for TCPDF.



- Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:38 +0100 by phpDocumentor 1.4.3
@@ -28260,7 +28260,7 @@ $image)
-

method _textstring [line 10921]

+

method _textstring [line 10931]

diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index c422797..5f152c2 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 5d55a65..acc628c 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -106,7 +106,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
@@ -28392,7 +28392,7 @@ $file)
-

method _UEvalue [line 11860]

+

method _UEvalue [line 11870]

diff --git a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html index a42332a..3be7ee3 100644 --- a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html +++ b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html @@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library


- Documentation generated on Fri, 19 Nov 2010 13:00:10 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:38 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 0d165dc..be4f709 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1378,7 +1378,7 @@ $type)
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
@@ -28426,7 +28426,7 @@ $file)
-

method _Uvalue [line 11827]

+

method _Uvalue [line 11837]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 46c2676..d988f88 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -300,7 +300,7 @@ $type)
- Documentation generated on Fri, 19 Nov 2010 13:00:03 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:31 +0100 by phpDocumentor 1.4.3
@@ -28463,7 +28463,7 @@ $file)
- Documentation generated on Fri, 19 Nov 2010 13:00:05 +0100 by phpDocumentor 1.4.3 + Documentation generated on Fri, 19 Nov 2010 17:05:33 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.9.018version:  5.9.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