From a3f1c1f9dbe042e17f4199f3ed5d247dcf500a76 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 19 Aug 2010 22:39:07 +0200 Subject: [PATCH] 5.8.008 --- CHANGELOG.TXT | 14 +- README.TXT | 4 +- config/tcpdf_config.php | 4 +- config/tcpdf_config_alt.php | 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 | 691 +++++++++--------- 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 +- examples/example_027.php | 102 ++- tcpdf.php | 293 ++++---- 25 files changed, 623 insertions(+), 529 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e878800..236bbb9 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,13 @@ +5.8.008 (2010-08-19) + - Method write1DBarcode() was changed, check the example n. 27. + - Method Footer() was changed to account for barcode changes. + - Automatic calculation of K_PATH_URL constant was fixed on configuration file. + - Method setEqualColumns() was fixed for $width=0 case. + - Method AddTOC() was fixed for multipage and multicolumn modes. + - Better support for SVG "font-family" property. + - A problem on default Page Zoom mode was fixed. + - Several Annotation bugs were fixed. + 5.8.007 (2010-08-18) - A bug affecting HTML tables was fixed. - Bug #3047500 "SVG not rendering paths properly" was fixed. @@ -9,7 +19,7 @@ - A bug affecting the HTML 'select' tag in certain conditions was fixed. 5.8.004 (2010-08-17) - - Better support for HTML and SVG "font-family" property. + - Better support for HTML "font-family" property. - A bug related to HTML multicolumn was fixed. 5.8.003 (2010-08-16) @@ -46,7 +56,7 @@ - CSS borders are now supported for HTML tables and other block tags (see example n. 61); - Cell borders were improved (see example n. 57); - Minor bugs were fixed. - +encry ------------------------------------------------------------ 5.6.000 (2010-07-31) diff --git a/README.TXT b/README.TXT index 0836cfc..bb6501a 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.007 -Release date: 2010-08-18 +Version: 5.8.008 +Release date: 2010-08-19 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/config/tcpdf_config.php b/config/tcpdf_config.php index 0336130..8b66211 100755 --- a/config/tcpdf_config.php +++ b/config/tcpdf_config.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2010-08-08 +// Last Update : 2010-08-19 // // Description : Configuration file for TCPDF. // @@ -66,7 +66,7 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { $k_path_url = 'http://'; } $k_path_url .= $_SERVER['HTTP_HOST']; - $k_path_url .= str_replace( '\\', '/', substr($_SERVER['PHP_SELF'], 0, -24)); + $k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1))); } /** diff --git a/config/tcpdf_config_alt.php b/config/tcpdf_config_alt.php index 118cffa..b3a9184 100755 --- a/config/tcpdf_config_alt.php +++ b/config/tcpdf_config_alt.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2010-08-08 +// Last Update : 2010-08-19 // // Description : Alternative configuration file for TCPDF. // @@ -61,7 +61,7 @@ if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) { $k_path_url = 'http://'; } $k_path_url .= $_SERVER['HTTP_HOST']; - $k_path_url .= str_replace( '\\', '/', substr($_SERVER['PHP_SELF'], 0, -24)); + $k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1))); } /** diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index fdc5060..34c3b45 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Wed, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 8f58dc2..b075cc1 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Wed, 18 Aug 2010 10:20:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index c0c089e..c87a936 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Wed, 18 Aug 2010 10:20:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 844ab86..8996768 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

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

method AcceptPageBreak [line 4858]

+

method AcceptPageBreak [line 4868]

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

method addExtGState [line 14715]

+

method addExtGState [line 14726]

@@ -6966,7 +6966,7 @@ $params)
-

method AddFont [line 4325]

+

method AddFont [line 4335]

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

method addHtmlLink [line 10745]

+

method addHtmlLink [line 10769]

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

method addHTMLTOC [line 21350]

+

method addHTMLTOC [line 21399]

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

method addHTMLVertSpace [line 19857]

+

method addHTMLVertSpace [line 19893]

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

method addJavascriptObject [line 13312]

+

method addJavascriptObject [line 13338]

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

method AddLink [line 4658]

+

method AddLink [line 4668]

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

method AddSpotColor [line 3934]

+

method AddSpotColor [line 3944]

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

method addTOC [line 21187]

+

method addTOC [line 21227]

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

method AliasNbPages [line 14529]

+

method AliasNbPages [line 14540]

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

method AliasNumPage [line 14556]

+

method AliasNumPage [line 14567]

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

method Annotation [line 4714]

+

method Annotation [line 4724]

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

method Arrow [line 12516]

+

method Arrow [line 12542]

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

method arrUTF8ToUTF16BE [line 10640]

+

method arrUTF8ToUTF16BE [line 10664]

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

method Bookmark [line 13184]

+

method Bookmark [line 13210]

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

method Button [line 14202]

+

method Button [line 14212]

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

method Cell [line 4965]

+

method Cell [line 4975]

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

method CheckBox [line 14132]

+

method CheckBox [line 14144]

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

method checkPageBreak [line 4885]

+

method checkPageBreak [line 4895]

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

method Circle [line 12204]

+

method Circle [line 12230]

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

method Clip [line 15176]

+

method Clip [line 15187]

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

method closeHTMLTagHandler [line 19357]

+

method closeHTMLTagHandler [line 19393]

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

method colorRegistrationBar [line 14851]

+

method colorRegistrationBar [line 14862]

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

method ComboBox [line 14071]

+

method ComboBox [line 14087]

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

method commitTransaction [line 21462]

+

method commitTransaction [line 21511]

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

method convertHexStringToString [line 11367]

+

method convertHexStringToString [line 11393]

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

method convertHTMLColorToDec [line 10778]

+

method convertHTMLColorToDec [line 10802]

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

method convertStringToHexString [line 11389]

+

method convertStringToHexString [line 11415]

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

method convertSVGtMatrix [line 22530]

+

method convertSVGtMatrix [line 22579]

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

method CoonsPatchMesh [line 15091]

+

method CoonsPatchMesh [line 15102]

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

method copyPage [line 21117]

+

method copyPage [line 21157]

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

method cropMark [line 14949]

+

method cropMark [line 14960]

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

method Curve [line 12009]

+

method Curve [line 12035]

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

method deletePage [line 20974]

+

method deletePage [line 21014]

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

method drawHTMLTagBorder [line 19894]

+

method drawHTMLTagBorder [line 19930]

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

method Ellipse [line 12073]

+

method Ellipse [line 12099]

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

method empty_string [line 21516]

+

method empty_string [line 21565]

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

method endSVGElementHandler [line 23558]

+

method endSVGElementHandler [line 23607]

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

method extractCSSproperties [line 16364]

+

method extractCSSproperties [line 16400]

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

method fitBlock [line 6525]

+

method fitBlock [line 6535]

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

method formatPageNumber [line 14633]

+

method formatPageNumber [line 14644]

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

method formatTOCPageNumber [line 14645]

+

method formatTOCPageNumber [line 14656]

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

method GetAbsX [line 7257]

+

method GetAbsX [line 7267]

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

method getAliasNbPages [line 14541]

+

method getAliasNbPages [line 14552]

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

method getAliasNumPage [line 14569]

+

method getAliasNumPage [line 14580]

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

method getAnnotOptFromJSProp [line 13438]

+

method getAnnotOptFromJSProp [line 13464]

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

method GetArrStringWidth [line 4227]

+

method GetArrStringWidth [line 4237]

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

method getBarcode [line 15813]

+

method getBarcode [line 15824]

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

method getBorderMode [line 5836]

+

method getBorderMode [line 5846]

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

method getBorderStartPosition [line 19878]

+

method getBorderStartPosition [line 19914]

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

method getBuffer [line 20654]

+

method getBuffer [line 20690]

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

method getCellBorder [line 5363]

+

method getCellBorder [line 5373]

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

method getCellCode [line 4996]

+

method getCellCode [line 5006]

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

method getCellHeightRatio [line 14811]

+

method getCellHeightRatio [line 14822]

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

method GetCharWidth [line 4263]

+

method GetCharWidth [line 4273]

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

method getColumn [line 21667]

+

method getColumn [line 21716]

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

method getCSSBorderDashStyle [line 16659]

+

method getCSSBorderDashStyle [line 16695]

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

method getCSSBorderStyle [line 16695]

+

method getCSSBorderStyle [line 16731]

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

method getCSSBorderWidth [line 16639]

+

method getCSSBorderWidth [line 16675]

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

method getEncPermissionsString [line 11406]

+

method getEncPermissionsString [line 11432]

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

method getFontAscent [line 4628]

+

method getFontAscent [line 4638]

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

method getFontBuffer [line 20814]

+

method getFontBuffer [line 20854]

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

method getFontDescent [line 4605]

+

method getFontDescent [line 4615]

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

method getFontFamily [line 16342]

+

method getFontFamily [line 16378]

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

method getFontFamilyName [line 22087]

+

method getFontFamilyName [line 22136]

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

method getFontSize [line 16322]

+

method getFontSize [line 16358]

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

method getFontSizePt [line 16332]

+

method getFontSizePt [line 16368]

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

method getFontsList [line 4302]

+

method getFontsList [line 4312]

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

method getFontStyle [line 16352]

+

method getFontStyle [line 16388]

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

method getFontSubsetting [line 22023]

+

method getFontSubsetting [line 22072]

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

method getFooterFont [line 10703]

+

method getFooterFont [line 10727]

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

method getFormDefaultProp [line 13813]

+

method getFormDefaultProp [line 13839]

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

method getGDgamma [line 7197]

+

method getGDgamma [line 7207]

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

method getGraphicVars [line 20486]

+

method getGraphicVars [line 20522]

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

method getGroupPageNo [line 14582]

+

method getGroupPageNo [line 14593]

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

method getGroupPageNoFormatted [line 14592]

+

method getGroupPageNoFormatted [line 14603]

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

method getHeaderFont [line 10683]

+

method getHeaderFont [line 10707]

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

method getHtmlDomArray [line 16743]

+

method getHtmlDomArray [line 16779]

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

method getHTMLUnitToUnits [line 20197]

+

method getHTMLUnitToUnits [line 20233]

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

method getHyphenPatternsFromTEX [line 21823]

+

method getHyphenPatternsFromTEX [line 21872]

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

method getImageBuffer [line 20756]

+

method getImageBuffer [line 20792]

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

method getImageFileType [line 6495]

+

method getImageFileType [line 6505]

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

method GetLineWidth [line 11749]

+

method GetLineWidth [line 11775]

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

method getMargins [line 16285]

+

method getMargins [line 16321]

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

method GetNumChars [line 4290]

+

method GetNumChars [line 4300]

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

method getNumLines [line 5914]

+

method getNumLines [line 5924]

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

method getObjFilename [line 20568]

+

method getObjFilename [line 20604]

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

method getOriginalMargins [line 16308]

+

method getOriginalMargins [line 16344]

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

method getPageBuffer [line 20697]

+

method getPageBuffer [line 20733]

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

method getPageGroupAlias [line 14604]

+

method getPageGroupAlias [line 14615]

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

method getPageNumGroupAlias [line 14619]

+

method getPageNumGroupAlias [line 14630]

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

method getPathPaintOperator [line 21935]

+

method getPathPaintOperator [line 21984]

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

method getPDFData [line 10726]

+

method getPDFData [line 10750]

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

method getRemainingWidth [line 6396]

+

method getRemainingWidth [line 6406]

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

method getSpaceString [line 17442]

+

method getSpaceString [line 17478]

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

method getStringHeight [line 6015]

+

method getStringHeight [line 6025]

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

method GetStringWidth [line 4211]

+

method GetStringWidth [line 4221]

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

method getSVGTransformMatrix [line 22408]

+

method getSVGTransformMatrix [line 22457]

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

method getTagStyleFromCSS [line 16611]

+

method getTagStyleFromCSS [line 16647]

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

method getTransformationMatrixProduct [line 22512]

+

method getTransformationMatrixProduct [line 22561]

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

method getUserPermissionCode [line 11246]

+

method getUserPermissionCode [line 11272]

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

method getVectorsAngle [line 23144]

+

method getVectorsAngle [line 23193]

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

method GetX [line 7241]

+

method GetX [line 7251]

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

method GetY [line 7268]

+

method GetY [line 7278]

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

method get_mqr [line 6913]

+

method get_mqr [line 6923]

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

method Gradient [line 15200]

+

method Gradient [line 15211]

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

method hyphenateText [line 21862]

+

method hyphenateText [line 21911]

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

method hyphenateWord [line 21753]

+

method hyphenateWord [line 21802]

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

method Image [line 6602]

+

method Image [line 6612]

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

method ImageEps [line 15546]

+

method ImageEps [line 15557]

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

method ImagePngAlpha [line 7153]

+

method ImagePngAlpha [line 7163]

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

method ImageSVG [line 22137]

+

method ImageSVG [line 22186]

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

method IncludeJS [line 13299]

+

method IncludeJS [line 13325]

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

method intToRoman [line 20276]

+

method intToRoman [line 20312]

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

method isUnicodeFont [line 22075]

+

method isUnicodeFont [line 22124]

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

method isValidCSSSelectorForTag [line 16452]

+

method isValidCSSSelectorForTag [line 16488]

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

method Line [line 11926]

+

method Line [line 11952]

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

method LinearGradient [line 15050]

+

method LinearGradient [line 15061]

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

method Link [line 4697]

+

method Link [line 4707]

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

method ListBox [line 14011]

+

method ListBox [line 14031]

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

method Ln [line 7210]

+

method Ln [line 7220]

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

method MirrorH [line 11531]

+

method MirrorH [line 11557]

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

method MirrorL [line 11567]

+

method MirrorL [line 11593]

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

method MirrorP [line 11554]

+

method MirrorP [line 11580]

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

method MirrorV [line 11542]

+

method MirrorV [line 11568]

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

method movePage [line 20831]

+

method movePage [line 20871]

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

method MultiCell [line 5566]

+

method MultiCell [line 5576]

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

method objclone [line 21505]

+

method objclone [line 21554]

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

method openHTMLTagHandler [line 18756]

+

method openHTMLTagHandler [line 18792]

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

method Output [line 7360]

+

method Output [line 7370]

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

method PageNo [line 3918]

+

method PageNo [line 3928]

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

method PageNoFormatted [line 14655]

+

method PageNoFormatted [line 14666]

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

method PieSector [line 15485]

+

method PieSector [line 15496]

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

method PieSectorXY [line 15506]

+

method PieSectorXY [line 15517]

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

method pixelsToUnits [line 10845]

+

method pixelsToUnits [line 10869]

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

method Polycurve [line 12036]

+

method Polycurve [line 12062]

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

method Polygon [line 12242]

+

method Polygon [line 12268]

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

method PolyLine [line 12223]

+

method PolyLine [line 12249]

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

method putHtmlListBullet [line 20341]

+

method putHtmlListBullet [line 20377]

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

method RadialGradient [line 15068]

+

method RadialGradient [line 15079]

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

method RadioButton [line 13922]

+

method RadioButton [line 13944]

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

method readDiskCache [line 20608]

+

method readDiskCache [line 20644]

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

method Rect [line 11954]

+

method Rect [line 11980]

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

method registrationMark [line 15019]

+

method registrationMark [line 15030]

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

method RegularPolygon [line 12340]

+

method RegularPolygon [line 12366]

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

method removeSHY [line 4938]

+

method removeSHY [line 4948]

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

method replaceBuffer [line 20636]

+

method replaceBuffer [line 20672]

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

method revstrpos [line 21529]

+

method revstrpos [line 21578]

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

method rfread [line 7121]

+

method rfread [line 7131]

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

method rollbackTransaction [line 21476]

+

method rollbackTransaction [line 21525]

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

method Rotate [line 11623]

+

method Rotate [line 11649]

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

method RoundedRect [line 12430]

+

method RoundedRect [line 12456]

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

method RoundedRectXY [line 12449]

+

method RoundedRectXY [line 12475]

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

method Scale [line 11499]

+

method Scale [line 11525]

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

method ScaleX [line 11459]

+

method ScaleX [line 11485]

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

method ScaleXY [line 11485]

+

method ScaleXY [line 11511]

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

method ScaleY [line 11472]

+

method ScaleY [line 11498]

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

method segSVGContentHandler [line 23597]

+

method segSVGContentHandler [line 23646]

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

method selectColumn [line 21592]

+

method selectColumn [line 21641]

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

method serializeTCPDFtagParameters [line 21678]

+

method serializeTCPDFtagParameters [line 21727]

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

method setAlpha [line 14768]

+

method setAlpha [line 14779]

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

method setBarcode [line 15803]

+

method setBarcode [line 15814]

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

method SetBooklet [line 20111]

+

method SetBooklet [line 20147]

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

method setBuffer [line 20618]

+

method setBuffer [line 20654]

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

method setCellHeightRatio [line 14802]

+

method setCellHeightRatio [line 14813]

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

method setColumnsArray [line 21579]

+

method setColumnsArray [line 21628]

@@ -17286,7 +17286,7 @@ $creator)
-

method SetDefaultMonospacedFont [line 4647]

+

method SetDefaultMonospacedFont [line 4657]

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

method setDefaultTableColumns [line 14792]

+

method setDefaultTableColumns [line 14803]

@@ -17415,7 +17415,7 @@ $mode = 'UseNone'])
-

method SetDrawColor [line 3978]

+

method SetDrawColor [line 3988]

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

method SetDrawColorArray [line 3952]

+

method SetDrawColorArray [line 3962]

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

method SetDrawSpotColor [line 4023]

+

method SetDrawSpotColor [line 4033]

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

method setEqualColumns [line 21546]

+

method setEqualColumns [line 21595]

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

method setExtGState [line 14734]

+

method setExtGState [line 14745]

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

method SetFillColor [line 4065]

+

method SetFillColor [line 4075]

@@ -17733,7 +17733,7 @@ $col4 = -1])
-

method SetFillColorArray [line 4042]

+

method SetFillColorArray [line 4052]

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

method SetFillSpotColor [line 4107]

+

method SetFillSpotColor [line 4117]

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

method SetFont [line 4555]

+

method SetFont [line 4565]

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

method setFontBuffer [line 20772]

+

method setFontBuffer [line 20808]

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

method SetFontSize [line 4576]

+

method SetFontSize [line 4586]

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

method setFontSubBuffer [line 20794]

+

method setFontSubBuffer [line 20834]

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

method setFontSubsetting [line 22012]

+

method setFontSubsetting [line 22061]

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

method setFooter [line 3825]

+

method setFooter [line 3835]

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

method setFooterFont [line 10693]

+

method setFooterFont [line 10717]

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

method setFormDefaultProp [line 13802]

+

method setFormDefaultProp [line 13828]

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

method setGraphicVars [line 20526]

+

method setGraphicVars [line 20562]

@@ -18262,7 +18262,7 @@ $gvars)
-

method setHeader [line 3788]

+

method setHeader [line 3798]

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

method setHeaderFont [line 10673]

+

method setHeaderFont [line 10697]

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

method setHtmlLinksStyle [line 20182]

+

method setHtmlLinksStyle [line 20218]

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

method setHtmlVSpace [line 20151]

+

method setHtmlVSpace [line 20187]

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

method setImageBuffer [line 20713]

+

method setImageBuffer [line 20749]

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

method setImageSubBuffer [line 20736]

+

method setImageSubBuffer [line 20772]

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

method setJPEGQuality [line 14779]

+

method setJPEGQuality [line 14790]

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

method setLanguageArray [line 10713]

+

method setLanguageArray [line 10737]

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

method SetLineStyle [line 11776]

+

method SetLineStyle [line 11802]

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

method SetLineWidth [line 11733]

+

method SetLineWidth [line 11759]

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

method SetLink [line 4674]

+

method SetLink [line 4684]

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

method setListIndentWidth [line 20161]

+

method setListIndentWidth [line 20197]

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

method setLIsymbol [line 20072]

+

method setLIsymbol [line 20108]

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

method setOpenCell [line 20171]

+

method setOpenCell [line 20207]

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

method setPageBuffer [line 20670]

+

method setPageBuffer [line 20706]

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

method setPDFVersion [line 14821]

+

method setPDFVersion [line 14832]

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

method SetProtection [line 11290]

+

method SetProtection [line 11316]

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

method setRasterizeVectorImages [line 21909]

+

method setRasterizeVectorImages [line 21958]

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

method setSignature [line 14461]

+

method setSignature [line 14472]

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

method setSignatureAppearance [line 14494]

+

method setSignatureAppearance [line 14505]

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

method setSVGStyles [line 22569]

+

method setSVGStyles [line 22618]

@@ -20131,7 +20131,7 @@ $clip_params = array()])
-

method setTableHeader [line 3872]

+

method setTableHeader [line 3882]

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

method SetTextColor [line 4149]

+

method SetTextColor [line 4159]

@@ -20258,7 +20258,7 @@ $col4 = -1])
-

method SetTextColorArray [line 4126]

+

method SetTextColorArray [line 4136]

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

method setTextRenderingMode [line 21690]

+

method setTextRenderingMode [line 21739]

@@ -20351,7 +20351,7 @@ $clip = false])
-

method SetTextSpotColor [line 4188]

+

method SetTextSpotColor [line 4198]

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

method setUserRights [line 14428]

+

method setUserRights [line 14439]

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

method setViewerPreferences [line 14834]

+

method setViewerPreferences [line 14845]

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

method setVisibility [line 14679]

+

method setVisibility [line 14690]

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

method SetX [line 7281]

+

method SetX [line 7291]

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

method SetXY [line 7345]

+

method SetXY [line 7355]

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

method SetY [line 7313]

+

method SetY [line 7323]

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

method set_mqr [line 6898]

+

method set_mqr [line 6908]

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

method Skew [line 11679]

+

method Skew [line 11705]

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

method SkewX [line 11652]

+

method SkewX [line 11678]

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

method SkewY [line 11665]

+

method SkewY [line 11691]

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

method StarPolygon [line 12388]

+

method StarPolygon [line 12414]

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

method startPageGroup [line 14514]

+

method startPageGroup [line 14525]

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

method startSVGElementHandler [line 23167]

+

method startSVGElementHandler [line 23216]

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

method startTransaction [line 21445]

+

method startTransaction [line 21494]

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

method StartTransform [line 11427]

+

method StartTransform [line 11453]

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

method StopTransform [line 11442]

+

method StopTransform [line 11468]

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

method stringLeftTrim [line 22036]

+

method stringLeftTrim [line 22085]

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

method stringRightTrim [line 22049]

+

method stringRightTrim [line 22098]

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

method stringTrim [line 22062]

+

method stringTrim [line 22111]

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

method SVGPath [line 22824]

+

method SVGPath [line 22873]

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

method SVGTransform [line 22550]

+

method SVGTransform [line 22599]

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

method swapMargins [line 20127]

+

method swapMargins [line 20163]

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

method Text [line 4838]

+

method Text [line 4848]

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

method TextField [line 13831]

+

method TextField [line 13857]

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

method Transform [line 11709]

+

method Transform [line 11735]

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

method Translate [line 11602]

+

method Translate [line 11628]

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

method TranslateX [line 11579]

+

method TranslateX [line 11605]

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

method TranslateY [line 11590]

+

method TranslateY [line 11616]

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

method unhtmlentities [line 10856]

+

method unhtmlentities [line 10880]

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

method UniArrSubString [line 6435]

+

method UniArrSubString [line 6445]

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

method unichr [line 6468]

+

method unichr [line 6478]

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

method UTF8ArrayToUniArray [line 6456]

+

method UTF8ArrayToUniArray [line 6466]

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

method UTF8ArrSubString [line 6412]

+

method UTF8ArrSubString [line 6422]

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

method UTF8ArrToLatin1 [line 10581]

+

method UTF8ArrToLatin1 [line 10605]

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

method utf8Bidi [line 12610]

+

method utf8Bidi [line 12636]

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

method utf8StrArrRev [line 12596]

+

method utf8StrArrRev [line 12622]

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

method UTF8StringToArray [line 10416]

+

method UTF8StringToArray [line 10440]

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

method utf8StrRev [line 12581]

+

method utf8StrRev [line 12607]

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

method UTF8ToLatin1 [line 10551]

+

method UTF8ToLatin1 [line 10575]

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

method UTF8ToUTF16BE [line 10535]

+

method UTF8ToUTF16BE [line 10559]

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

method Write [line 6055]

+

method Write [line 6065]

@@ -22764,7 +22764,7 @@ $maxh = 0])
-

method write1DBarcode [line 15832]

+

method write1DBarcode [line 15843]

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

method write2DBarcode [line 16068]

+

method write2DBarcode [line 16104]

@@ -22841,7 +22841,7 @@ $align = ''])
array   $style  array of options:
  • boolean $style['border'] if true prints a border around the barcode
  • int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
  • array $style['fgcolor'] color array for bars and text
  • mixed $style['bgcolor'] color array for background or false for transparent
  • boolean $style["text"] boolean if true prints text below the barcode
  • string $style['font'] font name for text
  • int $style['fontsize'] font size for text
  • int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing
  • string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch
array of options:
  • boolean $style['border'] if true prints a border around the barcode
  • int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
  • array $style['fgcolor'] color array for bars and text
  • mixed $style['bgcolor'] color array for background or false for transparent
  • boolean $style["text"] boolean if true prints text below the barcode
  • string $style['font'] font name for text
  • int $style['fontsize'] font size for text
  • int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing
  • string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin.
  • string $style['align'] barcode position on the containing rectangle: L = left; C = center; R = right.
  • string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
string  
@@ -22944,7 +22944,7 @@ $distort = false])
-

method writeBarcode [line 16017]

+

method writeBarcode [line 16052]

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

method writeDiskCache [line 20580]

+

method writeDiskCache [line 20616]

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

method writeHTML [line 17486]

+

method writeHTML [line 17522]

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

method writeHTMLCell [line 17470]

+

method writeHTMLCell [line 17506]

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

method _addfield [line 13403]

+

method _addfield [line 13429]

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

method _AES [line 11078]

+

method _AES [line 11104]

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

method _beginpage [line 10102]

+

method _beginpage [line 10125]

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

method _datastring [line 10269]

+

method _datastring [line 10292]

@@ -23478,12 +23478,13 @@ $n = 0])
-

method _datestring [line 10283]

+

method _datestring [line 10307]

string _datestring( -) +[int +$n = 0])

@@ -23505,11 +23506,21 @@ $n = 0])

+

Parameters:

+
+ + + + + + +
int  $n  object ID
+

[ Top ]
-

method _destroy [line 7554]

+

method _destroy [line 7564]

@@ -23554,7 +23565,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 7582]

+

method _dochecks [line 7592]

@@ -23579,7 +23590,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 10195]

+

method _dolinethrough [line 10218]

@@ -23627,7 +23638,7 @@ $txt)
-

method _dolinethroughw [line 10208]

+

method _dolinethroughw [line 10231]

@@ -23684,7 +23695,7 @@ $txt)
-

method _dooverline [line 10221]

+

method _dooverline [line 10244]

@@ -23735,7 +23746,7 @@ $txt)
-

method _dooverlinew [line 10234]

+

method _dooverlinew [line 10257]

@@ -23786,7 +23797,7 @@ $w)
-

method _dounderline [line 10170]

+

method _dounderline [line 10193]

@@ -23834,7 +23845,7 @@ $txt)
-

method _dounderlinew [line 10183]

+

method _dounderlinew [line 10206]

@@ -23885,7 +23896,7 @@ $w)
-

method _encrypt_data [line 10889]

+

method _encrypt_data [line 10913]

@@ -23933,7 +23944,7 @@ $s)
-

method _enddoc [line 10014]

+

method _enddoc [line 10037]

@@ -23958,7 +23969,7 @@ $s)
-

method _endpage [line 10146]

+

method _endpage [line 10169]

@@ -23983,7 +23994,7 @@ $s)
-

method _escape [line 10257]

+

method _escape [line 10280]

@@ -24022,7 +24033,7 @@ $s)
-

method _escapetext [line 10309]

+

method _escapetext [line 10333]

@@ -24061,7 +24072,7 @@ $s)
-

method _freadint [line 10246]

+

method _freadint [line 10269]

@@ -24100,7 +24111,7 @@ $f)
-

method _generateencryptionkey [line 11165]

+

method _generateencryptionkey [line 11191]

@@ -24154,7 +24165,7 @@ $protection)
-

method _getannotsrefs [line 7831]

+

method _getannotsrefs [line 7841]

@@ -24196,7 +24207,7 @@ $n)
-

method _getBYTE [line 8552]

+

method _getBYTE [line 8569]

@@ -24259,7 +24270,7 @@ $offset)
-

method _getfontpath [line 7598]

+

method _getfontpath [line 7608]

@@ -24284,7 +24295,7 @@ $offset)
-

method _getrawstream [line 10329]

+

method _getrawstream [line 10353]

@@ -24332,7 +24343,7 @@ $n = 0])
-

method _getSHORT [line 8537]

+

method _getSHORT [line 8554]

@@ -24395,7 +24406,7 @@ $offset)
-

method _getstream [line 10344]

+

method _getstream [line 10368]

@@ -24440,7 +24451,7 @@ $n = 0])
-

method _getTrueTypeFontSubset [line 8567]

+

method _getTrueTypeFontSubset [line 8584]

@@ -24491,7 +24502,7 @@ $subsetchars)
-

method _getTTFtableChecksum [line 8898]

+

method _getTTFtableChecksum [line 8915]

@@ -24542,7 +24553,7 @@ $length)
-

method _getULONG [line 8507]

+

method _getULONG [line 8524]

@@ -24605,7 +24616,7 @@ $offset)
-

method _getUSHORT [line 8522]

+

method _getUSHORT [line 8539]

@@ -24668,7 +24679,7 @@ $offset)
-

method _JScolor [line 13379]

+

method _JScolor [line 13405]

@@ -24710,7 +24721,7 @@ $color)
-

method _md5_16 [line 11096]

+

method _md5_16 [line 11122]

@@ -24755,7 +24766,7 @@ $str)
-

method _newobj [line 10156]

+

method _newobj [line 10179]

@@ -24783,7 +24794,7 @@ $str)
-

method _objectkey [line 10870]

+

method _objectkey [line 10894]

@@ -24825,7 +24836,7 @@ $n)
-

method _out [line 10364]

+

method _out [line 10388]

@@ -24861,7 +24872,7 @@ $s)
-

method _outCurve [line 11881]

+

method _outCurve [line 11907]

@@ -24930,7 +24941,7 @@ $y3)
-

method _outCurveV [line 11895]

+

method _outCurveV [line 11921]

@@ -24987,7 +24998,7 @@ $y3)
-

method _outCurveY [line 11911]

+

method _outCurveY [line 11937]

@@ -25056,7 +25067,7 @@ $y2)
-

method _outellipticalarc [line 12107]

+

method _outellipticalarc [line 12133]

@@ -25164,7 +25175,7 @@ $angf:)
-

method _outLine [line 11851]

+

method _outLine [line 11877]

@@ -25209,7 +25220,7 @@ $y)
-

method _outPoint [line 11839]

+

method _outPoint [line 11865]

@@ -25254,7 +25265,7 @@ $y)
-

method _outRect [line 11865]

+

method _outRect [line 11891]

@@ -25317,7 +25328,7 @@ $op)
-

method _Ovalue [line 11109]

+

method _Ovalue [line 11135]

@@ -25368,7 +25379,7 @@ $owner_pass)
-

method _parsejpeg [line 6990]

+

method _parsejpeg [line 7000]

@@ -25407,7 +25418,7 @@ $file)
-

method _parsepng [line 7016]

+

method _parsepng [line 7026]

@@ -25446,7 +25457,7 @@ $file)
-

method _putannotsobjs [line 7859]

+

method _putannotsobjs [line 7869]

@@ -25477,7 +25488,7 @@ $file)
-

method _putannotsrefs [line 7819]

+

method _putannotsrefs [line 7829]

@@ -25522,7 +25533,7 @@ $n)
-

method _putAPXObject [line 8472]

+

method _putAPXObject [line 8482]

@@ -25576,7 +25587,7 @@ $stream = ''])
-

method _putbookmarks [line 13215]

+

method _putbookmarks [line 13241]

@@ -25607,7 +25618,7 @@ $stream = ''])
-

method _putcatalog [line 9845]

+

method _putcatalog [line 9867]

@@ -25635,7 +25646,7 @@ $stream = ''])
-

method _putcidfont0 [line 9568]

+

method _putcidfont0 [line 9588]

@@ -25680,7 +25691,7 @@ $font)
-

method _putEmbeddedFiles [line 4795]

+

method _putEmbeddedFiles [line 4805]

@@ -25711,7 +25722,7 @@ $font)
-

method _putencryption [line 10913]

+

method _putencryption [line 10937]

@@ -25742,7 +25753,7 @@ $font)
-

method _putextgstates [line 14744]

+

method _putextgstates [line 14755]

@@ -25781,7 +25792,7 @@ $gs)
-

method _putfonts [line 9019]

+

method _putfonts [line 9036]

@@ -25809,7 +25820,7 @@ $gs)
-

method _putfontwidths [line 8920]

+

method _putfontwidths [line 8937]

@@ -25860,7 +25871,7 @@ $cidoffset = 0])
-

method _putheader [line 10006]

+

method _putheader [line 10029]

@@ -25885,7 +25896,7 @@ $cidoffset = 0])
-

method _putimages [line 9639]

+

method _putimages [line 9661]

@@ -25910,7 +25921,7 @@ $cidoffset = 0])
-

method _putinfo [line 9798]

+

method _putinfo [line 9820]

@@ -25938,7 +25949,7 @@ $cidoffset = 0])
-

method _putjavascript [line 13324]

+

method _putjavascript [line 13350]

@@ -25969,7 +25980,7 @@ $cidoffset = 0])
-

method _putocg [line 14664]

+

method _putocg [line 14675]

@@ -25997,7 +26008,7 @@ $cidoffset = 0])
-

method _putpages [line 7609]

+

method _putpages [line 7619]

@@ -26022,7 +26033,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 9713]

+

method _putresourcedict [line 9735]

@@ -26047,7 +26058,7 @@ $cidoffset = 0])
-

method _putresources [line 9774]

+

method _putresources [line 9796]

@@ -26072,7 +26083,7 @@ $cidoffset = 0])
-

method _putshaders [line 15298]

+

method _putshaders [line 15309]

@@ -26103,7 +26114,7 @@ $cidoffset = 0])
-

method _putsignature [line 14352]

+

method _putsignature [line 14363]

@@ -26134,7 +26145,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 9695]

+

method _putspotcolors [line 9717]

@@ -26162,7 +26173,7 @@ $cidoffset = 0])
-

method _putstream [line 10355]

+

method _putstream [line 10379]

diff --git a/examples/example_027.php b/examples/example_027.php index 26c4096..f4fc3a5 100755 --- a/examples/example_027.php +++ b/examples/example_027.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_027.php // Begin : 2008-03-04 -// Last Update : 2010-08-08 +// Last Update : 2010-08-19 // // Description : Example 027 for TCPDF class // 1D Barcodes @@ -80,7 +80,9 @@ $pdf->AddPage(); // define barcode style $style = array( - 'position' => 'S', + 'position' => '', + 'align' => '', + 'stretch' => true, 'border' => true, 'padding' => 'auto', 'fgcolor' => array(0,0,0), @@ -95,179 +97,179 @@ $style = array( // CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9. $pdf->Cell(0, 0, 'CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9', 0, 1); -$pdf->write1DBarcode('CODE 39', 'C39', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39', 'C39', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 + CHECKSUM $pdf->Cell(0, 0, 'CODE 39 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('CODE 39 +', 'C39+', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 +', 'C39+', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 EXTENDED $pdf->Cell(0, 0, 'CODE 39 EXTENDED', 0, 1); -$pdf->write1DBarcode('CODE 39 E', 'C39E', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 E', 'C39E', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 EXTENDED + CHECKSUM $pdf->Cell(0, 0, 'CODE 39 EXTENDED + CHECKSUM', 0, 1); -$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 93 - USS-93 $pdf->Cell(0, 0, 'CODE 93 - USS-93', 0, 1); -$pdf->write1DBarcode('TEST93', 'C93', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('TEST93', 'C93', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // Standard 2 of 5 $pdf->Cell(0, 0, 'Standard 2 of 5', 0, 1); -$pdf->write1DBarcode('1234567', 'S25', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'S25', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // Standard 2 of 5 + CHECKSUM $pdf->Cell(0, 0, 'Standard 2 of 5 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('1234567', 'S25+', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'S25+', '', '', 80, 25, 0.4, $style, 'N'); // add a page ---------- $pdf->AddPage(); // Interleaved 2 of 5 $pdf->Cell(0, 0, 'Interleaved 2 of 5', 0, 1); -$pdf->write1DBarcode('1234567', 'I25', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'I25', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // Interleaved 2 of 5 + CHECKSUM $pdf->Cell(0, 0, 'Interleaved 2 of 5 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('1234567', 'I25+', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'I25+', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 128 A $pdf->Cell(0, 0, 'CODE 128 A', 0, 1); -$pdf->write1DBarcode('CODE 128 A', 'C128A', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 128 A', 'C128A', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 128 B $pdf->Cell(0, 0, 'CODE 128 B', 0, 1); -$pdf->write1DBarcode('CODE 128 B', 'C128B', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 128 B', 'C128B', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 128 C $pdf->Cell(0, 0, 'CODE 128 C', 0, 1); -$pdf->write1DBarcode('0123456789', 'C128C', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('0123456789', 'C128C', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // EAN 8 $pdf->Cell(0, 0, 'EAN 8', 0, 1); -$pdf->write1DBarcode('1234567', 'EAN8', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'EAN8', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // EAN 13 $pdf->Cell(0, 0, 'EAN 13', 0, 1); -$pdf->write1DBarcode('1234567890128', 'EAN13', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567890128', 'EAN13', '', '', 80, 25, 0.4, $style, 'N'); // add a page ---------- $pdf->AddPage(); // 2-Digits UPC-Based Extention $pdf->Cell(0, 0, '2-Digits UPC-Based Extention', 0, 1); -$pdf->write1DBarcode('34', 'EAN2', '', '', 20, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('34', 'EAN2', '', '', 20, 25, 0.4, $style, 'N'); $pdf->Ln(); // 5-Digits UPC-Based Extention $pdf->Cell(0, 0, '5-Digits UPC-Based Extention', 0, 1); -$pdf->write1DBarcode('51234', 'EAN5', '', '', 40, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('51234', 'EAN5', '', '', 40, 25, 0.4, $style, 'N'); $pdf->Ln(); // UPC-A $pdf->Cell(0, 0, 'UPC-A', 0, 1); -$pdf->write1DBarcode('12345678901', 'UPCA', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('12345678901', 'UPCA', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // UPC-E $pdf->Cell(0, 0, 'UPC-E', 0, 1); -$pdf->write1DBarcode('04210000526', 'UPCE', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('04210000526', 'UPCE', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // MSI $pdf->Cell(0, 0, 'MSI', 0, 1); -$pdf->write1DBarcode('80523', 'MSI', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('80523', 'MSI', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // MSI + CHECKSUM (module 11) $pdf->Cell(0, 0, 'MSI + CHECKSUM (module 11)', 0, 1); -$pdf->write1DBarcode('80523', 'MSI+', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('80523', 'MSI+', '', '', 80, 25, 0.4, $style, 'N'); // add a page ---------- $pdf->AddPage(); // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200 $pdf->Cell(0, 0, 'IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200', 0, 1); -$pdf->write1DBarcode('01234567094987654321-01234567891', 'IMB', '', '', 130, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('01234567094987654321-01234567891', 'IMB', '', '', 130, 25, 0.4, $style, 'N'); $pdf->Ln(); // POSTNET $pdf->Cell(0, 0, 'POSTNET', 0, 1); -$pdf->write1DBarcode('98000', 'POSTNET', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('98000', 'POSTNET', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // PLANET $pdf->Cell(0, 0, 'PLANET', 0, 1); -$pdf->write1DBarcode('98000', 'PLANET', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('98000', 'PLANET', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) $pdf->Cell(0, 0, 'RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)', 0, 1); -$pdf->write1DBarcode('SN34RD1A', 'RMS4CC', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('SN34RD1A', 'RMS4CC', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // KIX (Klant index - Customer index) $pdf->Cell(0, 0, 'KIX (Klant index - Customer index)', 0, 1); -$pdf->write1DBarcode('SN34RDX1A', 'KIX', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('SN34RDX1A', 'KIX', '', '', 80, 25, 0.4, $style, 'N'); // add a page ---------- $pdf->AddPage(); // CODABAR $pdf->Cell(0, 0, 'CODABAR', 0, 1); -$pdf->write1DBarcode('123456789', 'CODABAR', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('123456789', 'CODABAR', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // CODE 11 $pdf->Cell(0, 0, 'CODE 11', 0, 1); -$pdf->write1DBarcode('123-456-789', 'CODE11', '', '', 80, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('123-456-789', 'CODE11', '', '', 80, 25, 0.4, $style, 'N'); $pdf->Ln(); // PHARMACODE $pdf->Cell(0, 0, 'PHARMACODE', 0, 1); -$pdf->write1DBarcode('789', 'PHARMA', '', '', 30, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('789', 'PHARMA', '', '', 30, 25, 0.4, $style, 'N'); $pdf->Ln(); // PHARMACODE TWO-TRACKS $pdf->Cell(0, 0, 'PHARMACODE TWO-TRACKS', 0, 1); -$pdf->write1DBarcode('105', 'PHARMA2T', '', '', 20, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('105', 'PHARMA2T', '', '', 20, 25, 0.4, $style, 'N'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // TEST BARCODE ALIGNMENTS @@ -275,21 +277,41 @@ $pdf->write1DBarcode('105', 'PHARMA2T', '', '', 20, 15, 0.4, $style, 'N'); // add a page $pdf->AddPage(); -// Left alignment +// Left position $style['position'] = 'L'; -$pdf->write1DBarcode('LEFT', 'C128A', '', '', 180, 30, 0.4, $style, 'N'); +$pdf->write1DBarcode('LEFT', 'C128A', '', '', 50, 30, 0.4, $style, 'N'); + +$pdf->Ln(); + +// Center position +$style['position'] = 'C'; +$pdf->write1DBarcode('CENTER', 'C128A', '', '', 50, 30, 0.4, $style, 'N'); + +$pdf->Ln(); + +// Right position +$style['position'] = 'R'; +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', 50, 30, 0.4, $style, 'N'); + +$pdf->Ln(10); + +$style['stretch'] = false; + +// Left alignment +$style['align'] = 'L'; +$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 30, 0.4, $style, 'N'); $pdf->Ln(); // Center alignment -$style['position'] = 'C'; -$pdf->write1DBarcode('CENTER', 'C128A', '', '', 180, 30, 0.4, $style, 'N'); +$style['align'] = 'C'; +$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 30, 0.4, $style, 'N'); $pdf->Ln(); // Right alignment -$style['position'] = 'R'; -$pdf->write1DBarcode('RIGHT', 'C128A', '', '', 180, 30, 0.4, $style, 'N'); +$style['align'] = 'R'; +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 30, 0.4, $style, 'N'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // TEST BARCODE STYLES @@ -299,7 +321,9 @@ $pdf->AddPage(); // define barcode style $style = array( - 'position' => 'S', + 'position' => '', + 'align' => '', + 'stretch' => true, 'border' => true, 'padding' => 'auto', 'fgcolor' => array(0,0,128), @@ -312,7 +336,7 @@ $style = array( // CODE 39 EXTENDED + CHECKSUM $pdf->Cell(0, 0, 'CODE 39 EXTENDED + CHECKSUM', 0, 1); -$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', 100, 15, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', 100, 25, 0.4, $style, 'N'); // --------------------------------------------------------- diff --git a/tcpdf.php b/tcpdf.php index d2cf701..2d60d5e 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.007 + * @version 5.8.008 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3761,8 +3761,18 @@ if (!class_exists('TCPDF', false)) { $barcode = $this->getBarcode(); if (!empty($barcode)) { $this->Ln($line_width); - $barcode_width = round(($this->getPageWidth() - $ormargins['left'] - $ormargins['right'])/3); - $this->write1DBarcode($barcode, 'C128B', $this->GetX(), $cur_y + $line_width, $barcode_width, (($this->getFooterMargin() / 3) - $line_width), 0.3, '', ''); + $barcode_width = round(($this->getPageWidth() - $ormargins['left'] - $ormargins['right']) / 3); + $style = array( + 'position' => $this->rtl?'R':'L', + 'align' => $this->rtl?'R':'L', + 'stretch' => false, + 'border' => false, + 'padding' => 0, + 'fgcolor' => array(0,0,0), + 'bgcolor' => false, + 'text' => false + ); + $this->write1DBarcode($barcode, 'C128B', '', $cur_y + $line_width, '', (($this->getFooterMargin() / 3) - $line_width), 0.3, $style, ''); } if (empty($this->pagegroups)) { $pagenumtxt = $this->l['w_page'].' '.$this->getAliasNumPage().' / '.$this->getAliasNbPages(); @@ -7911,7 +7921,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id); $annots .= ' /P '.$this->page_obj_id[$n].' 0 R'; $annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id); - $annots .= ' /M '.$this->_datestring(); + $annots .= ' /M '.$this->_datestring($annot_obj_id); if (isset($pl['opt']['f'])) { $val = 0; if (is_array($pl['opt']['f'])) { @@ -8069,7 +8079,7 @@ if (!class_exists('TCPDF', false)) { if (isset($pl['opt']['rc'])) { $annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id); } - $annots .= ' /CreationDate '.$this->_datestring(); + $annots .= ' /CreationDate '.$this->_datestring($annot_obj_id); //$annots .= ' /IRT '; if (isset($pl['opt']['subj'])) { $annots .= ' /Subj '.$this->_textstring($pl['opt']['subj'], $annot_obj_id); @@ -8274,13 +8284,13 @@ if (!class_exists('TCPDF', false)) { $annots .= ']'; } if (isset($pl['opt']['mk']['ca'])) { - $annots .= ' /CA '.$pl['opt']['mk']['ca'].''; + $annots .= ' /CA '.$pl['opt']['mk']['ca']; } if (isset($pl['opt']['mk']['rc'])) { - $annots .= ' /RC '.$pl['opt']['mk']['ca'].''; + $annots .= ' /RC '.$pl['opt']['mk']['rc']; } if (isset($pl['opt']['mk']['ac'])) { - $annots .= ' /AC '.$pl['opt']['mk']['ca'].''; + $annots .= ' /AC '.$pl['opt']['mk']['ac']; } if (isset($pl['opt']['mk']['i'])) { $info = $this->getImageBuffer($pl['opt']['mk']['i']); @@ -8485,7 +8495,14 @@ if (!class_exists('TCPDF', false)) { $rect = sprintf('%.2F %.2F', $w, $h); $out .= ' /BBox [0 0 '.$rect.']'; $out .= ' /Matrix [1 0 0 1 0 0]'; - $out .= ' /Resources <>'; + $out .= ' /Resources <<'; + $out .= ' /ProcSet [/PDF /Text]'; + $out .= ' /Font <<'; + foreach ($this->annotation_fonts as $fontkey => $fontid) { + $out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R'; + } + $out .= ' >>'; + $out .= ' >>'; $stream = $this->_getrawstream($stream); $out .= ' /Length '.strlen($stream); $out .= ' >>'; @@ -9088,31 +9105,34 @@ if (!class_exists('TCPDF', false)) { $this->set_mqr($mqr); foreach ($this->fontkeys as $k) { //Font objects - $this->setFontSubBuffer($k, 'n', $this->n + 1); $font = $this->getFontBuffer($k); $type = $font['type']; $name = $font['name']; if ($type == 'core') { // standard core font - $obj_id = $this->_newobj(); - $out = '<font_obj_ids[$k]; + $this->offsets[$obj_id] = $this->bufferlen; + $out = $obj_id.' 0 obj'."\n"; + $out .= '<annotation_fonts['helvetica'] = $k; + $this->annotation_fonts[$k] = $font['i']; } $out .= ' >>'; $out .= "\n".'endobj'; $this->_out($out); } elseif (($type == 'Type1') OR ($type == 'TrueType')) { // additional Type1 or TrueType font - $obj_id = $this->_newobj(); - $out = '<font_obj_ids[$k]; + $this->offsets[$obj_id] = $this->bufferlen; + $out = $obj_id.' 0 obj'."\n"; + $out .= '<Error('Unsupported font type: '.$type); } - $obj_id = $this->$mtd($font); + $this->$mtd($font); } - // store object ID for current font - $this->font_obj_ids[$k] = $obj_id; } } @@ -9187,8 +9205,10 @@ if (!class_exists('TCPDF', false)) { $fontname .= $font['name']; // Type0 Font // A composite font composed of other fonts, organized hierarchically - $obj_id = $this->_newobj(); - $out = '<< /Type /Font'; + $obj_id = $this->font_obj_ids[$font['fontkey']]; + $this->offsets[$obj_id] = $this->bufferlen; + $out = $obj_id.' 0 obj'."\n"; + $out .= '<< /Type /Font'; $out .= ' /Subtype /Type0'; $out .= ' /BaseFont /'.$fontname; $out .= ' /Name /F'.$font['i']; @@ -9590,8 +9610,10 @@ if (!class_exists('TCPDF', false)) { } else { $longname = $name; } - $obj_id = $this->_newobj(); - $out = '<font_obj_ids[$font['fontkey']]; + $this->offsets[$obj_id] = $this->bufferlen; + $out = $obj_id.' 0 obj'."\n"; + $out .= '<ZoomMode == 'fullpage') { - $out .= ' /OpenAction [3 0 R /Fit]'; + $out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /Fit]'; } elseif ($this->ZoomMode == 'fullwidth') { - $out .= ' /OpenAction [3 0 R /FitH null]'; + $out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /FitH null]'; } elseif ($this->ZoomMode == 'real') { - $out .= ' /OpenAction [3 0 R /XYZ null null 1]'; + $out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null 1]'; } elseif (!is_string($this->ZoomMode)) { - $out .= ' /OpenAction [3 0 R /XYZ null null '.($this->ZoomMode / 100).']'; + $out .= sprintf(' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null %.2F]',($this->ZoomMode / 100)); } if (isset($this->LayoutMode) AND (!$this->empty_string($this->LayoutMode))) { $out .= ' /PageLayout /'.$this->LayoutMode; @@ -9901,12 +9923,13 @@ if (!class_exists('TCPDF', false)) { if (isset($this->annotation_fonts) AND !empty($this->annotation_fonts)) { $out .= ' /DR <<'; $out .= ' /Font <<'; - foreach ($this->annotation_fonts as $font => $fontkey) { - $out .= ' /F'.($fontkey + 1).' '.$this->font_obj_ids[$font].' 0 R'; + foreach ($this->annotation_fonts as $fontkey => $fontid) { + $out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R'; } $out .= ' >> >>'; } - $out .= ' /DA (/F'.(array_search('helvetica', $this->fontkeys) + 1).' 0 Tf 0 g)'; + $font = $this->getFontBuffer('helvetica'); + $out .= ' /DA (/F'.$font['i'].' 0 Tf 0 g)'; $out .= ' /Q '.(($this->rtl)?'2':'0'); //$out .= ' /XFA '; $out .= ' >>'; @@ -10276,13 +10299,14 @@ if (!class_exists('TCPDF', false)) { /** * Returns a formatted date for meta information + * @param int $n object ID * @return string escaped date string. * @access protected * @since 4.6.028 (2009-08-25) */ - protected function _datestring() { + protected function _datestring($n=0) { $current_time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\''; - return $this->_datastring('D:'.$current_time); + return $this->_datastring('D:'.$current_time, $n); } /** @@ -10928,7 +10952,9 @@ if (!class_exists('TCPDF', false)) { } // V is a code specifying the algorithm to be used in encrypting and decrypting the document $out .= ' /V '.$this->encryptdata['V']; - if (($this->encryptdata['V'] == 2) OR ($this->encryptdata['V'] == 3)) { + if ($this->encryptdata['V'] == 1) { + $out .= ' /Length 40'; + } elseif (($this->encryptdata['V'] == 2) OR ($this->encryptdata['V'] == 3)) { if (isset($this->encryptdata['Length']) AND !empty($this->encryptdata['Length'])) { // The length of the encryption key, in bits. The value shall be a multiple of 8, in the range 40 to 128 $out .= ' /Length '.$this->encryptdata['Length']; @@ -13844,12 +13870,8 @@ if (!class_exists('TCPDF', false)) { // get annotation data $popt = $this->getAnnotOptFromJSProp($prop); // set default appearance stream - $font = $this->FontFamily; - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; - } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $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'; @@ -13960,11 +13982,9 @@ if (!class_exists('TCPDF', false)) { // set additional default values $font = 'zapfdingbats'; $this->AddFont($font); - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; - } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $tmpfont = $this->getFontBuffer($font); + $this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i']; + $fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor); $popt['da'] = $fontstyle; $popt['ap'] = array(); $popt['ap']['n'] = array(); @@ -14029,12 +14049,8 @@ if (!class_exists('TCPDF', false)) { // get annotation data $popt = $this->getAnnotOptFromJSProp($prop); // set additional default values - $font = $this->FontFamily; - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; - } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $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'; @@ -14090,12 +14106,8 @@ if (!class_exists('TCPDF', false)) { // get annotation data $popt = $this->getAnnotOptFromJSProp($prop); // set additional default options - $font = $this->FontFamily; - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; - } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $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'; @@ -14151,11 +14163,9 @@ if (!class_exists('TCPDF', false)) { // set additional default options $font = 'zapfdingbats'; $this->AddFont($font); - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; - } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $tmpfont = $this->getFontBuffer($font); + $this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i']; + $fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor); $popt['da'] = $fontstyle; $popt['ap'] = array(); $popt['ap']['n'] = array(); @@ -14225,15 +14235,16 @@ if (!class_exists('TCPDF', false)) { if (!isset($popt['mk'])) { $popt['mk'] = array(); } - $popt['mk']['ca'] = $this->_textstring($caption); - $popt['mk']['rc'] = $this->_textstring($caption); - $popt['mk']['ac'] = $this->_textstring($caption); - $font = $this->FontFamily; - $fontkey = array_search($font, $this->fontkeys); - if (!in_array($fontkey, $this->annotation_fonts)) { - $this->annotation_fonts[$font] = $fontkey; + if (!empty($action) AND (is_array($action))) { + $ann_obj_id = ($this->n + 1); + } else { + $ann_obj_id = ($this->n + 2); } - $fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor); + $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'; @@ -14253,11 +14264,11 @@ if (!class_exists('TCPDF', false)) { if (($key == 'S') AND in_array($val, $bmode)) { $opt['aa'] .= ' /S /'.$val; } elseif (($key == 'F') AND (!empty($val))) { - $opt['aa'] .= ' /F '.$this->_datastring($val); + $opt['aa'] .= ' /F '.$this->_datastring($val, $ann_obj_id); } elseif (($key == 'Fields') AND is_array($val) AND !empty($val)) { $opt['aa'] .= ' /Fields ['; foreach ($val AS $field) { - $opt['aa'] .= ' '.$this->_textstring($field); + $opt['aa'] .= ' '.$this->_textstring($field, $ann_obj_id); } $opt['aa'] .= ']'; } elseif (($key == 'Flags')) { @@ -15823,7 +15834,7 @@ if (!class_exists('TCPDF', false)) { * @param int $w width in user units * @param int $h height in user units * @param float $xres width of the smallest bar in user units - * @param array $style array of options:
  • boolean $style['border'] if true prints a border around the barcode
  • int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
  • array $style['fgcolor'] color array for bars and text
  • mixed $style['bgcolor'] color array for background or false for transparent
  • boolean $style["text"] boolean if true prints text below the barcode
  • string $style['font'] font name for text
  • int $style['fontsize'] font size for text
  • int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing
  • string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch
+ * @param array $style array of options:
  • boolean $style['border'] if true prints a border around the barcode
  • int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
  • array $style['fgcolor'] color array for bars and text
  • mixed $style['bgcolor'] color array for background or false for transparent
  • boolean $style["text"] boolean if true prints text below the barcode
  • string $style['font'] font name for text
  • int $style['fontsize'] font size for text
  • int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing
  • string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin.
  • string $style['align'] barcode position on the containing rectangle: L = left; C = center; R = right.
  • string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
* @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
* @author Nicola Asuni * @since 3.1.000 (2008-06-09) @@ -15846,6 +15857,12 @@ if (!class_exists('TCPDF', false)) { if (!isset($style['position'])) { $style['position'] = ''; } + if (!isset($style['align'])) { + $style['align'] = 'C'; + } + if (!isset($style['stretch'])) { + $style['stretch'] = false; + } if (!isset($style['fgcolor'])) { $style['fgcolor'] = array(0,0,0); // default black } @@ -15885,23 +15902,35 @@ if (!class_exists('TCPDF', false)) { } } if (($h === '') OR ($h <= 0)) { - // horizontal aspect ration by default + // set default horizontal aspect ratio $h = $w / 3; } - if ($this->empty_string($xres)) { - $xres = 0.4; - } // padding if (!isset($style['padding'])) { - $style['padding'] = 0; + $padding = 0; } elseif ($style['padding'] === 'auto') { - $style['padding'] = $h / 4; + $padding = 5 * ($w / ($arrcode['maxw'] + 10)); + } else { + $padding = $style['padding']; + } + // calculate xres (single bar width) + $max_xres = ($w - (2 * $padding)) / $arrcode['maxw']; + if ($style['stretch']) { + $xres = $max_xres; + } else { + if ($this->empty_string($xres)) { + $xres = 0.4; // default value + } + if ($xres > $max_xres) { + // correct xres to fit on $w + $max_xres = $max_xres; + } + if ($style['padding'] === 'auto') { + $padding = 5 * $xres; + } } - $fbw = ($arrcode['maxw'] * $xres) + (2 * $style['padding']); - $extraspace = ($this->cell_height_ratio * $fontsize / $this->k) + (2 * $style['padding']); // maximum bar height - $barh = $h; - $h += $extraspace; + $barh = $h - ($this->cell_height_ratio * $fontsize / $this->k) - (2 * $padding); // fit the barcode on available space $this->fitBlock($w, $h, $x, $y, false); // set alignment @@ -15911,51 +15940,57 @@ if (!class_exists('TCPDF', false)) { if ($style['position'] == 'L') { $xpos = $this->lMargin; } elseif ($style['position'] == 'C') { - $xpos = ($this->w + $this->lMargin - $this->rMargin - $fbw) / 2; + $xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2; } elseif ($style['position'] == 'R') { - $xpos = $this->w - $this->rMargin - $fbw; - } elseif ($style['position'] == 'S') { - $fbw = $w; - $xres = ($w - (2 * $style['padding'])) / $arrcode['maxw']; - $xpos = $x - $w; + $xpos = $this->w - $this->rMargin - $w; } else { - $xpos = $x - $fbw; + $xpos = $x - $w; } $this->img_rb_x = $xpos; } else { if ($style['position'] == 'L') { $xpos = $this->lMargin; } elseif ($style['position'] == 'C') { - $xpos = ($this->w + $this->lMargin - $this->rMargin - $fbw) / 2; + $xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2; } elseif ($style['position'] == 'R') { - $xpos = $this->w - $this->rMargin - $fbw; - } elseif ($style['position'] == 'S') { - $fbw = $w; - $xres = ($w - (2 * $style['padding'])) / $arrcode['maxw']; - $xpos = $x; + $xpos = $this->w - $this->rMargin - $w; } else { $xpos = $x; } - $this->img_rb_x = $xpos + $fbw; + $this->img_rb_x = $xpos + $w; } $xpos_rect = $xpos; - $xpos = $xpos_rect + $style['padding']; + switch ($style['align']) { + case 'L': { + $xpos = $xpos_rect + $padding; + break; + } + case 'R': { + $xpos = $xpos_rect + ($w - ($arrcode['maxw'] * $xres)) - $padding; + break; + } + case 'C': + default : { + $xpos = $xpos_rect + (($w - ($arrcode['maxw'] * $xres)) / 2); + break; + } + } $xpos_text = $xpos; // barcode is always printed in LTR direction $tempRTL = $this->rtl; $this->rtl = false; // print background color if ($style['bgcolor']) { - $this->Rect($xpos_rect, $y, $fbw, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']); + $this->Rect($xpos_rect, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']); } elseif ($style['border']) { - $this->Rect($xpos_rect, $y, $fbw, $h, 'D'); + $this->Rect($xpos_rect, $y, $w, $h, 'D'); } // print bars foreach ($arrcode['bcode'] as $k => $v) { $bw = ($v['w'] * $xres); if ($v['t']) { // draw a vertical bar - $ypos = $y + $style['padding'] + ($v['p'] * $barh / $arrcode['maxh']); + $ypos = $y + $padding + ($v['p'] * $barh / $arrcode['maxh']); $this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']); } $xpos += $bw; @@ -15964,7 +15999,7 @@ if (!class_exists('TCPDF', false)) { if ($style['text']) { // print text $this->x = $xpos_text; - $this->y = $y + $style['padding'] + $barh; + $this->y = $y + $padding + $barh; $this->Cell(($arrcode['maxw'] * $xres), ($this->cell_height_ratio * $fontsize / $this->k), $code, 0, 0, 'C', 0, '', $style['stretchtext']); } // restore original direction @@ -15979,7 +16014,7 @@ if (!class_exists('TCPDF', false)) { break; } case 'M':{ - $this->y = $y + round($h/2); + $this->y = $y + round($h / 2); $this->x = $this->img_rb_x; break; } @@ -16018,7 +16053,8 @@ if (!class_exists('TCPDF', false)) { // convert old settings for the new write1DBarcode() function. $xres = 1 / $xres; $newstyle = array( - 'position' => 'L', + 'position' => '', + 'stretch' => false, 'border' => false, 'padding' => 0, 'fgcolor' => array(0,0,0), @@ -20780,6 +20816,10 @@ if (!class_exists('TCPDF', false)) { } if (!in_array($font, $this->fontkeys)) { $this->fontkeys[] = $font; + // store object ID for current font + ++$this->n; + $this->font_obj_ids[$font] = $this->n; + $this->setFontSubBuffer($font, 'n', $this->n); } } @@ -21223,6 +21263,26 @@ if (!class_exists('TCPDF', false)) { } else { $this->SetFont($fontfamily, $fontstyle, $fontsize - $outline['l']); } + // check for page break + $this->checkPageBreak(($this->FontSize * $this->cell_height_ratio)); + // set margins and X position + if (($this->page == $current_page) AND ($this->current_column == $current_column)) { + $this->lMargin = $lmargin; + $this->rMargin = $rmargin; + } else { + if ($this->current_column != $current_column) { + if ($this->rtl) { + $x_start = $this->w - $this->columns[$this->current_column]['x']; + } else { + $x_start = $this->columns[$this->current_column]['x']; + } + } + $lmargin = $this->lMargin; + $rmargin = $this->rMargin; + $current_page = $this->page; + $current_column = $this->current_column; + } + $this->SetX($x_start); $indent = ($spacer * $outline['l']); if ($this->rtl) { $this->rMargin += $indent; @@ -21265,17 +21325,6 @@ if (!class_exists('TCPDF', false)) { } // write the number $this->Cell($tw, 0, $pagenum, 0, 1, $alignnum, 0, $link, 0); - if (($this->page == $current_page) AND ($this->current_column == $current_column)) { - $this->SetX($x_start); - $this->lMargin = $lmargin; - $this->rMargin = $rmargin; - } else { - $current_page = $this->page; - $current_column = $this->current_column; - $lmargin = $this->lMargin; - $rmargin = $this->rMargin; - $x_start = $this->GetX(); - } } $page_last = $this->getPage(); $numpages = $page_last - $page_first + 1; @@ -21551,7 +21600,7 @@ if (!class_exists('TCPDF', false)) { } else { // maximum column width $maxwidth = ($this->w - $this->original_lMargin - $this->original_rMargin) / $numcols; - if ($width > $maxwidth) { + if (($width == 0) OR ($width > $maxwidth)) { $width = $maxwidth; } if ($this->empty_string($y)) { @@ -22732,7 +22781,7 @@ if (!class_exists('TCPDF', false)) { // font $regs = array(); if (!empty($svgstyle['font'])) { - if (preg_match('/font-family[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) { + if (preg_match('/font-family[\s]*:[\s]*([^\;\"]*)/si', $svgstyle['font'], $regs)) { $font_family = $this->getFontFamilyName($regs[1]); } else { $font_family = $svgstyle['font-family']; @@ -22753,7 +22802,7 @@ if (!class_exists('TCPDF', false)) { $font_weight = $svgstyle['font-weight']; } } else { - $font_family = $svgstyle['font-family']; + $font_family = $this->getFontFamilyName($svgstyle['font-family']); $font_size = $svgstyle['font-size']; $font_style = $svgstyle['font-style']; $font_weight = $svgstyle['font-weight']; @@ -23195,7 +23244,7 @@ if (!class_exists('TCPDF', false)) { } elseif (isset($attribs['style'])) { // CSS style syntax $attrval = array(); - if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"\s]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) { + if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) { if ($attrval[1] == 'inherit') { $svgstyle[$key] = $val; } else {
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 2eeb257..244955d 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, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
@@ -26207,7 +26218,7 @@ $n = 0])
-

method _puttruetypeunicode [line 9179]

+

method _puttruetypeunicode [line 9197]

diff --git a/doc/index.html b/doc/index.html index 2eeb257..244955d 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, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 22afed5..ead667a 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 18 Aug 2010 10:20:33 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:39:00 +0200 by phpDocumentor 1.4.3
@@ -26252,7 +26263,7 @@ $font)
-

method _putviewerpreferences [line 9935]

+

method _putviewerpreferences [line 9958]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index abdfc10..fb291aa 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2074,7 +2074,7 @@ top
- Documentation generated on Wed, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 8d0cfa7..c9bd0c5 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2042,7 +2042,7 @@ top
- Documentation generated on Wed, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
@@ -26286,7 +26297,7 @@ $font)
-

method _RC4 [line 11032]

+

method _RC4 [line 11058]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index fd59415..6c47357 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, 18 Aug 2010 10:20:33 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:39:00 +0200 by phpDocumentor 1.4.3
@@ -26337,7 +26348,7 @@ $text)
-

method _setGDImageTransparency [line 6969]

+

method _setGDImageTransparency [line 6979]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index ce6bcf4..e3f16e9 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 33dabed..0fafb99 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, 18 Aug 2010 10:20:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3
@@ -26382,7 +26393,7 @@ $image)
-

method _textstring [line 10295]

+

method _textstring [line 10319]

diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index bb6b2f7..4fb97fb 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, 18 Aug 2010 10:20:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:55 +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 7049233..fe0bdbd 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, 18 Aug 2010 10:20:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:55 +0200 by phpDocumentor 1.4.3
@@ -26427,7 +26438,7 @@ $n = 0])
-

method _toJPEG [line 6932]

+

method _toJPEG [line 6942]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index db5baf7..6c7f7be 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, 18 Aug 2010 10:20:33 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:39:00 +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 9ae1878..c8fda0f 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, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
@@ -26469,7 +26480,7 @@ $file)
-

method _toPNG [line 6951]

+

method _toPNG [line 6961]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 8aca38a..6ed010f 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, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index ff7c191..849e97a 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Wed, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
@@ -26514,7 +26525,7 @@ $file)
-

method _Uvalue [line 11138]

+

method _Uvalue [line 11164]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 732a3c7..3f253e6 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Wed, 18 Aug 2010 10:20:27 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:54 +0200 by phpDocumentor 1.4.3
@@ -26551,7 +26562,7 @@ $file)
- Documentation generated on Wed, 18 Aug 2010 10:20:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:56 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.8.007version:  5.8.008
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.007 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.8.008 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Wed, 18 Aug 2010 10:20:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 19 Aug 2010 22:38:56 +0200 by phpDocumentor 1.4.3