From 4a9a31272d2a167f07c07bae94ce218ff9111b02 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sun, 21 Nov 2010 17:21:13 +0100 Subject: [PATCH] 5.9.022 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 246 ++++++------ 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 | 362 ++++++++++-------- 23 files changed, 345 insertions(+), 311 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index bfe161d..fcd4deb 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.9.022 (2010-11-21) + - Method ImageEPS includes support for EPS/AI Spot colors. + - Method ImageEPS includes a new parameter $fixoutvals to remove values outside the bounding box. + 5.9.021 (2010-11-20) - Support for custom bullet points images was added (check the example n.6) - Examples n. 6 and 61 were update (check the comments inside). diff --git a/README.TXT b/README.TXT index d05c2ea..63055f3 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.021 -Release date: 2010-11-20 +Version: 5.9.022 +Release date: 2010-11-21 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 3e3b030..ad251a3 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -65,7 +65,7 @@
- Documentation generated on Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index b7cd156..164c1fb 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1004,7 +1004,7 @@ $code)
- Documentation generated on Sat, 20 Nov 2010 10:51:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 243c35d..2198712 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5552,7 +5552,7 @@ $frame)
- Documentation generated on Sat, 20 Nov 2010 10:51:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index f91d93f..891fe96 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.021 + version:  5.9.022 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.021'

+

$tcpdf_version =  '5.9.022'

[line 164]



Tags:

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

method addHTMLTOC [line 23164]

+

method addHTMLTOC [line 23188]

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

method addHTMLVertSpace [line 21550]

+

method addHTMLVertSpace [line 21574]

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

method addPageRegion [line 24257]

+

method addPageRegion [line 24281]

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

method addTOC [line 22992]

+

method addTOC [line 23016]

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

method checkPageRegions [line 24293]

+

method checkPageRegions [line 24317]

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

method closeHTMLTagHandler [line 21035]

+

method closeHTMLTagHandler [line 21059]

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

method commitTransaction [line 23288]

+

method commitTransaction [line 23312]

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

method convertSVGtMatrix [line 24795]

+

method convertSVGtMatrix [line 24819]

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

method copyPage [line 22922]

+

method copyPage [line 22946]

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

method deletePage [line 22779]

+

method deletePage [line 22803]

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

method drawHTMLTagBorder [line 21592]

+

method drawHTMLTagBorder [line 21616]

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

method empty_string [line 23342]

+

method empty_string [line 23366]

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

method endSVGElementHandler [line 25919]

+

method endSVGElementHandler [line 25943]

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

method endTemplate [line 24024]

+

method endTemplate [line 24048]

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

method extractCSSproperties [line 17523]

+

method extractCSSproperties [line 17547]

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

method fixHTMLCode [line 17462]

+

method fixHTMLCode [line 17486]

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

method getBarcode [line 16747]

+

method getBarcode [line 16771]

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

method getBorderStartPosition [line 21576]

+

method getBorderStartPosition [line 21600]

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

method getBuffer [line 22455]

+

method getBuffer [line 22479]

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

method getColumn [line 23493]

+

method getColumn [line 23517]

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

method getCSSBorderDashStyle [line 17823]

+

method getCSSBorderDashStyle [line 17847]

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

method getCSSBorderMargin [line 18018]

+

method getCSSBorderMargin [line 18042]

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

method getCSSBorderStyle [line 17859]

+

method getCSSBorderStyle [line 17883]

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

method getCSSBorderWidth [line 17803]

+

method getCSSBorderWidth [line 17827]

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

method getCSSFontSpacing [line 18052]

+

method getCSSFontSpacing [line 18076]

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

method getCSSFontStretching [line 18083]

+

method getCSSFontStretching [line 18107]

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

method getCSSMargin [line 17964]

+

method getCSSMargin [line 17988]

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

method getCSSPadding [line 17910]

+

method getCSSPadding [line 17934]

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

method getFontBuffer [line 22619]

+

method getFontBuffer [line 22643]

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

method getFontFamily [line 17436]

+

method getFontFamily [line 17460]

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

method getFontFamilyName [line 23922]

+

method getFontFamilyName [line 23946]

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

method getFontSize [line 17416]

+

method getFontSize [line 17440]

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

method getFontSizePt [line 17426]

+

method getFontSizePt [line 17450]

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

method getFontSpacing [line 24210]

+

method getFontSpacing [line 24234]

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

method getFontStretching [line 24188]

+

method getFontStretching [line 24212]

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

method getFontStyle [line 17446]

+

method getFontStyle [line 17470]

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

method getFontSubsetting [line 23858]

+

method getFontSubsetting [line 23882]

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

method getGraphicVars [line 22246]

+

method getGraphicVars [line 22270]

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

method getHtmlDomArray [line 18153]

+

method getHtmlDomArray [line 18177]

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

method getHTMLUnitToUnits [line 21919]

+

method getHTMLUnitToUnits [line 21943]

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

method getHyphenPatternsFromTEX [line 23659]

+

method getHyphenPatternsFromTEX [line 23683]

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

method getImageBuffer [line 22557]

+

method getImageBuffer [line 22581]

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

method getMargins [line 17375]

+

method getMargins [line 17399]

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

method getNumberOfColumns [line 23503]

+

method getNumberOfColumns [line 23527]

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

method getObjFilename [line 22369]

+

method getObjFilename [line 22393]

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

method getOriginalMargins [line 17402]

+

method getOriginalMargins [line 17426]

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

method getPageBuffer [line 22498]

+

method getPageBuffer [line 22522]

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

method getPageRegions [line 24222]

+

method getPageRegions [line 24246]

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

method getPathPaintOperator [line 23770]

+

method getPathPaintOperator [line 23794]

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

method getSpaceString [line 18915]

+

method getSpaceString [line 18939]

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

method getSVGTransformMatrix [line 24681]

+

method getSVGTransformMatrix [line 24705]

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

method getTagStyleFromCSS [line 17775]

+

method getTagStyleFromCSS [line 17799]

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

method getTransformationMatrixProduct [line 24777]

+

method getTransformationMatrixProduct [line 24801]

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

method getVectorsAngle [line 25438]

+

method getVectorsAngle [line 25462]

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

method hyphenateText [line 23698]

+

method hyphenateText [line 23722]

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

method hyphenateWord [line 23589]

+

method hyphenateWord [line 23613]

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

method ImageSVG [line 24379]

+

method ImageSVG [line 24403]

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

method ImageEps [line 16444]

+

method ImageEps [line 16445]

@@ -14652,7 +14652,8 @@ $useBoundingBox = true], [string $align = ''], [string $palign = ''], [mixed $border = 0], [boolean -$fitonpage = false]) +$fitonpage = false], [boolean +$fixoutvals = false])

@@ -14726,6 +14727,11 @@ $fitonpage = false])
boolean   $fitonpage   if true the image is resized to not exceed page dimensions.
boolean  $fixoutvals  if true remove values outside the bounding box.
boolean  
@@ -14993,7 +14999,7 @@ $script)
-

method intToRoman [line 21998]

+

method intToRoman [line 22022]

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

method isUnicodeFont [line 23910]

+

method isUnicodeFont [line 23934]

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

method isValidCSSSelectorForTag [line 17615]

+

method isValidCSSSelectorForTag [line 17639]

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

method movePage [line 22636]

+

method movePage [line 22660]

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

method objclone [line 23331]

+

method objclone [line 23355]

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

method openHTMLTagHandler [line 20418]

+

method openHTMLTagHandler [line 20442]

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

method printTemplate [line 24053]

+

method printTemplate [line 24077]

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

method putHtmlListBullet [line 22063]

+

method putHtmlListBullet [line 22087]

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

method readDiskCache [line 22409]

+

method readDiskCache [line 22433]

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

method removePageRegion [line 24276]

+

method removePageRegion [line 24300]

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

method replaceBuffer [line 22437]

+

method replaceBuffer [line 22461]

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

method revstrpos [line 23355]

+

method revstrpos [line 23379]

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

method rollbackTransaction [line 23302]

+

method rollbackTransaction [line 23326]

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

method segSVGContentHandler [line 25988]

+

method segSVGContentHandler [line 26012]

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

method selectColumn [line 23418]

+

method selectColumn [line 23442]

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

method serializeTCPDFtagParameters [line 23514]

+

method serializeTCPDFtagParameters [line 23538]

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

method setBarcode [line 16737]

+

method setBarcode [line 16761]

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

method SetBooklet [line 21833]

+

method SetBooklet [line 21857]

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

method setBuffer [line 22419]

+

method setBuffer [line 22443]

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

method setColumnsArray [line 23405]

+

method setColumnsArray [line 23429]

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

method setEqualColumns [line 23372]

+

method setEqualColumns [line 23396]

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

method setFontBuffer [line 22573]

+

method setFontBuffer [line 22597]

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

method setFontSpacing [line 24199]

+

method setFontSpacing [line 24223]

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

method setFontStretching [line 24177]

+

method setFontStretching [line 24201]

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

method setFontSubBuffer [line 22599]

+

method setFontSubBuffer [line 22623]

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

method setFontSubsetting [line 23847]

+

method setFontSubsetting [line 23871]

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

method setGraphicVars [line 22306]

+

method setGraphicVars [line 22330]

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

method setHtmlLinksStyle [line 21904]

+

method setHtmlLinksStyle [line 21928]

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

method setHtmlVSpace [line 21873]

+

method setHtmlVSpace [line 21897]

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

method setImageBuffer [line 22514]

+

method setImageBuffer [line 22538]

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

method setImageSubBuffer [line 22537]

+

method setImageSubBuffer [line 22561]

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

method setListIndentWidth [line 21883]

+

method setListIndentWidth [line 21907]

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

method setLIsymbol [line 21789]

+

method setLIsymbol [line 21813]

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

method setOpenCell [line 21893]

+

method setOpenCell [line 21917]

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

method setPageBuffer [line 22471]

+

method setPageBuffer [line 22495]

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

method setPageRegions [line 24237]

+

method setPageRegions [line 24261]

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

method setRasterizeVectorImages [line 23744]

+

method setRasterizeVectorImages [line 23768]

@@ -21575,9 +21581,9 @@ $re = '/[^\S\xa0]/']) Unicode and PCRE unicode support: '/[^\S\P{Z}\xa0]/u' Unicode and PCRE unicode support in Chinese mode: '/[^\S\P{Z}\P{Lo}\xa0]/u' if PCRE unicode support is turned ON (\P is the negate class of \p): - \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator. - \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants. - \p{Lo} is needed for Chinese characters because are packed next to each other without spaces in between.




+ \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator. + \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants. + \p{Lo} is needed for Chinese characters because are packed next to each other without spaces in between.




Tags:

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

method setSVGStyles [line 24834]

+

method setSVGStyles [line 24858]

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

method setTextRenderingMode [line 23526]

+

method setTextRenderingMode [line 23550]

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

method startSVGElementHandler [line 25462]

+

method startSVGElementHandler [line 25486]

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

method startTemplate [line 23964]

+

method startTemplate [line 23988]

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

method startTransaction [line 23271]

+

method startTransaction [line 23295]

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

method stringLeftTrim [line 23871]

+

method stringLeftTrim [line 23895]

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

method stringRightTrim [line 23884]

+

method stringRightTrim [line 23908]

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

method stringTrim [line 23897]

+

method stringTrim [line 23921]

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

method SVGPath [line 25114]

+

method SVGPath [line 25138]

diff --git a/tcpdf.php b/tcpdf.php index d8dc605..e27ddb4 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @name TCPDF * @package com.tecnick.tcpdf -* @version 5.9.021 +* @version 5.9.022 * @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.021'; + private $tcpdf_version = '5.9.022'; // Protected properties @@ -2957,9 +2957,9 @@ class TCPDF { * Unicode and PCRE unicode support: '/[^\S\P{Z}\xa0]/u' * Unicode and PCRE unicode support in Chinese mode: '/[^\S\P{Z}\P{Lo}\xa0]/u' * if PCRE unicode support is turned ON (\P is the negate class of \p): - * \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator. - * \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants. - * \p{Lo} is needed for Chinese characters because are packed next to each other without spaces in between. + * \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator. + * \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants. + * \p{Lo} is needed for Chinese characters because are packed next to each other without spaces in between. * * @param string $re regular expression (leave empty for default). * @access public @@ -3851,12 +3851,12 @@ class TCPDF { } /** - * Set start-writing mark on current page stream used to put borders and fills. - * Borders and fills are always created after content and inserted on the position marked by this method. - * This function must be called after calling Image() function for a background image. - * Background images must be always inserted before calling Multicell() or WriteHTMLCell() or WriteHTML() functions. - * @access public - * @since 4.0.016 (2008-07-30) + * Set start-writing mark on current page stream used to put borders and fills. + * Borders and fills are always created after content and inserted on the position marked by this method. + * This function must be called after calling Image() function for a background image. + * Background images must be always inserted before calling Multicell() or WriteHTMLCell() or WriteHTML() functions. + * @access public + * @since 4.0.016 (2008-07-30) */ public function setPageMark() { $this->intmrk[$this->page] = $this->pagelen[$this->page]; @@ -3865,11 +3865,11 @@ class TCPDF { } /** - * Set start-writing mark on selected page. - * Borders and fills are always created after content and inserted on the position marked by this method. - * @param int $page page number (default is the current page) - * @access protected - * @since 4.6.021 (2009-07-20) + * Set start-writing mark on selected page. + * Borders and fills are always created after content and inserted on the position marked by this method. + * @param int $page page number (default is the current page) + * @access protected + * @since 4.6.021 (2009-07-20) */ protected function setContentMark($page=0) { if ($page <= 0) { @@ -3883,7 +3883,7 @@ class TCPDF { } /** - * Set header data. + * Set header data. * @param string $ln header image logo * @param string $lw header image logo width in mm * @param string $ht string to print as title on document header @@ -3898,8 +3898,8 @@ class TCPDF { } /** - * Returns header data: - *
  • $ret['logo'] = logo image
  • $ret['logo_width'] = width of the image logo in user units
  • $ret['title'] = header title
  • $ret['string'] = header description string
+ * Returns header data: + *
  • $ret['logo'] = logo image
  • $ret['logo_width'] = width of the image logo in user units
  • $ret['title'] = header title
  • $ret['string'] = header description string
* @return array() * @access public * @since 4.0.012 (2008-07-24) @@ -3914,7 +3914,7 @@ class TCPDF { } /** - * Set header margin. + * Set header margin. * (minimum distance between header and top page margin) * @param int $hm distance in user units * @access public @@ -3924,7 +3924,7 @@ class TCPDF { } /** - * Returns header margin in user units. + * Returns header margin in user units. * @return float * @since 4.0.012 (2008-07-24) * @access public @@ -3934,7 +3934,7 @@ class TCPDF { } /** - * Set footer margin. + * Set footer margin. * (minimum distance between footer and bottom page margin) * @param int $fm distance in user units * @access public @@ -3944,7 +3944,7 @@ class TCPDF { } /** - * Returns footer margin in user units. + * Returns footer margin in user units. * @return float * @since 4.0.012 (2008-07-24) * @access public @@ -3953,7 +3953,7 @@ class TCPDF { return $this->footer_margin; } /** - * Set a flag to print page header. + * Set a flag to print page header. * @param boolean $val set to true to print the page header (default), false otherwise. * @access public */ @@ -3962,7 +3962,7 @@ class TCPDF { } /** - * Set a flag to print page footer. + * Set a flag to print page footer. * @param boolean $value set to true to print the page footer (default), false otherwise. * @access public */ @@ -3971,7 +3971,7 @@ class TCPDF { } /** - * Return the right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image + * Return the right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image * @return float * @access public */ @@ -3980,7 +3980,7 @@ class TCPDF { } /** - * Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image + * Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image * @return float * @access public */ @@ -3989,8 +3989,8 @@ class TCPDF { } /** - * This method is used to render the page header. - * It is automatically called by AddPage() and could be overwritten in your own inherited class. + * This method is used to render the page header. + * It is automatically called by AddPage() and could be overwritten in your own inherited class. * @access public */ public function Header() { @@ -4038,8 +4038,8 @@ class TCPDF { } /** - * This method is used to render the page footer. - * It is automatically called by AddPage() and could be overwritten in your own inherited class. + * This method is used to render the page footer. + * It is automatically called by AddPage() and could be overwritten in your own inherited class. * @access public */ public function Footer() { @@ -4085,9 +4085,9 @@ class TCPDF { } /** - * This method is used to render the page header. - * @access protected - * @since 4.0.012 (2008-07-24) + * This method is used to render the page header. + * @access protected + * @since 4.0.012 (2008-07-24) */ protected function setHeader() { if ($this->print_header) { @@ -4122,9 +4122,9 @@ class TCPDF { } /** - * This method is used to render the page footer. - * @access protected - * @since 4.0.012 (2008-07-24) + * This method is used to render the page footer. + * @access protected + * @since 4.0.012 (2008-07-24) */ protected function setFooter() { //Page footer @@ -4173,9 +4173,9 @@ class TCPDF { } /** - * This method is used to render the table header on new page (if any). - * @access protected - * @since 4.5.030 (2009-03-25) + * This method is used to render the table header on new page (if any). + * @access protected + * @since 4.5.030 (2009-03-25) */ protected function setTableHeader() { if ($this->num_columns > 1) { @@ -6902,7 +6902,7 @@ class TCPDF { } } - /** + /** * Extract a slice of the $strarr array and return it as string. * @param string $strarr The input array of characters. * @param int $start the starting element of $strarr. @@ -6924,7 +6924,7 @@ class TCPDF { return $string; } - /** + /** * Extract a slice of the $uniarr array and return it as string. * @param string $uniarr The input array of characters. * @param int $start the starting element of $strarr. @@ -6947,7 +6947,7 @@ class TCPDF { return $string; } - /** + /** * Convert an array of UTF8 values to array of unicode characters * @param string $ta The input array of UTF8 values. * @return Return array of unicode characters @@ -8825,63 +8825,63 @@ class TCPDF { if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmode)) { $annots .= ' /H /'.$pl['opt']['h']; } - if (isset($pl['opt']['mk']) AND (is_array($pl['opt']['mk'])) AND !empty($pl['opt']['mk'])) { - $annots .= ' /MK <<'; - if (isset($pl['opt']['mk']['r'])) { - $annots .= ' /R '.$pl['opt']['mk']['r']; - } - if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) { - $annots .= ' /BC ['; - foreach($pl['opt']['mk']['bc'] AS $col) { - $col = intval($col); + if (isset($pl['opt']['mk']) AND (is_array($pl['opt']['mk'])) AND !empty($pl['opt']['mk'])) { + $annots .= ' /MK <<'; + if (isset($pl['opt']['mk']['r'])) { + $annots .= ' /R '.$pl['opt']['mk']['r']; + } + if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) { + $annots .= ' /BC ['; + foreach($pl['opt']['mk']['bc'] AS $col) { + $col = intval($col); $color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255); - $annots .= sprintf(' %.2F', $color); - } - $annots .= ']'; - } - if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) { - $annots .= ' /BG ['; - foreach($pl['opt']['mk']['bg'] AS $col) { - $col = intval($col); + $annots .= sprintf(' %.2F', $color); + } + $annots .= ']'; + } + if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) { + $annots .= ' /BG ['; + foreach($pl['opt']['mk']['bg'] AS $col) { + $col = intval($col); $color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255); - $annots .= sprintf(' %.2F', $color); - } - $annots .= ']'; - } - if (isset($pl['opt']['mk']['ca'])) { - $annots .= ' /CA '.$pl['opt']['mk']['ca']; - } - if (isset($pl['opt']['mk']['rc'])) { - $annots .= ' /RC '.$pl['opt']['mk']['rc']; - } - if (isset($pl['opt']['mk']['ac'])) { - $annots .= ' /AC '.$pl['opt']['mk']['ac']; - } - if (isset($pl['opt']['mk']['i'])) { - $info = $this->getImageBuffer($pl['opt']['mk']['i']); - if ($info !== false) { - $annots .= ' /I '.$info['n'].' 0 R'; - } - } - if (isset($pl['opt']['mk']['ri'])) { - $info = $this->getImageBuffer($pl['opt']['mk']['ri']); - if ($info !== false) { - $annots .= ' /RI '.$info['n'].' 0 R'; - } - } - if (isset($pl['opt']['mk']['ix'])) { - $info = $this->getImageBuffer($pl['opt']['mk']['ix']); - if ($info !== false) { - $annots .= ' /IX '.$info['n'].' 0 R'; - } - } - if (isset($pl['opt']['mk']['if']) AND (is_array($pl['opt']['mk']['if'])) AND !empty($pl['opt']['mk']['if'])) { - $annots .= ' /IF <<'; - $if_sw = array('A', 'B', 'S', 'N'); + $annots .= sprintf(' %.2F', $color); + } + $annots .= ']'; + } + if (isset($pl['opt']['mk']['ca'])) { + $annots .= ' /CA '.$pl['opt']['mk']['ca']; + } + if (isset($pl['opt']['mk']['rc'])) { + $annots .= ' /RC '.$pl['opt']['mk']['rc']; + } + if (isset($pl['opt']['mk']['ac'])) { + $annots .= ' /AC '.$pl['opt']['mk']['ac']; + } + if (isset($pl['opt']['mk']['i'])) { + $info = $this->getImageBuffer($pl['opt']['mk']['i']); + if ($info !== false) { + $annots .= ' /I '.$info['n'].' 0 R'; + } + } + if (isset($pl['opt']['mk']['ri'])) { + $info = $this->getImageBuffer($pl['opt']['mk']['ri']); + if ($info !== false) { + $annots .= ' /RI '.$info['n'].' 0 R'; + } + } + if (isset($pl['opt']['mk']['ix'])) { + $info = $this->getImageBuffer($pl['opt']['mk']['ix']); + if ($info !== false) { + $annots .= ' /IX '.$info['n'].' 0 R'; + } + } + if (isset($pl['opt']['mk']['if']) AND (is_array($pl['opt']['mk']['if'])) AND !empty($pl['opt']['mk']['if'])) { + $annots .= ' /IF <<'; + $if_sw = array('A', 'B', 'S', 'N'); if (isset($pl['opt']['mk']['if']['sw']) AND in_array($pl['opt']['mk']['if']['sw'], $if_sw)) { $annots .= ' /SW /'.$pl['opt']['mk']['if']['sw']; } - $if_s = array('A', 'P'); + $if_s = array('A', 'P'); if (isset($pl['opt']['mk']['if']['s']) AND in_array($pl['opt']['mk']['if']['s'], $if_s)) { $annots .= ' /S /'.$pl['opt']['mk']['if']['s']; } @@ -8891,21 +8891,21 @@ class TCPDF { if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) { $annots .= ' /FB true'; } - $annots .= '>>'; - } - if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) { - $annots .= ' /TP '.intval($pl['opt']['mk']['tp']); - } else { - $annots .= ' /TP 0'; - } - $annots .= '>>'; - } // end MK - // --- Entries for field dictionaries --- - if (isset($this->radiobutton_groups[$n][$pl['txt']])) { - // set parent - $annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R'; - } - if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) { + $annots .= '>>'; + } + if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) { + $annots .= ' /TP '.intval($pl['opt']['mk']['tp']); + } else { + $annots .= ' /TP 0'; + } + $annots .= '>>'; + } // end MK + // --- Entries for field dictionaries --- + if (isset($this->radiobutton_groups[$n][$pl['txt']])) { + // set parent + $annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R'; + } + if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) { $annots .= ' /T '.$this->_datastring($pl['opt']['t'], $annot_obj_id); } if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) { @@ -8981,26 +8981,26 @@ class TCPDF { $annots .= ' /Q '.intval($pl['opt']['q']); } if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) { - $annots .= ' /Opt ['; - foreach($pl['opt']['opt'] AS $copt) { - if (is_array($copt)) { - $annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']'; - } else { - $annots .= ' '.$this->_textstring($copt, $annot_obj_id); - } - } - $annots .= ']'; - } - if (isset($pl['opt']['ti'])) { - $annots .= ' /TI '.intval($pl['opt']['ti']); - } - if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) { - $annots .= ' /I ['; - foreach($pl['opt']['i'] AS $copt) { - $annots .= intval($copt).' '; - } - $annots .= ']'; - } + $annots .= ' /Opt ['; + foreach($pl['opt']['opt'] AS $copt) { + if (is_array($copt)) { + $annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']'; + } else { + $annots .= ' '.$this->_textstring($copt, $annot_obj_id); + } + } + $annots .= ']'; + } + if (isset($pl['opt']['ti'])) { + $annots .= ' /TI '.intval($pl['opt']['ti']); + } + if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) { + $annots .= ' /I ['; + foreach($pl['opt']['i'] AS $copt) { + $annots .= intval($copt).' '; + } + $annots .= ']'; + } break; } case 'screen': { @@ -11242,7 +11242,7 @@ class TCPDF { /** * Converts array of UTF-8 characters to UTF16-BE string.
* Based on: http://www.faqs.org/rfcs/rfc2781.html - * 
+	 * 
 	 *   Encoding UTF-16:
 	 *
 	 *   Encoding of a single character from an ISO 10646 character value to
@@ -11305,7 +11305,7 @@ class TCPDF {
 	// ====================================================
 
 	/**
- 	 * Set header font.
+	 * Set header font.
 	 * @param array $font font
 	 * @access public
 	 * @since 1.1
@@ -11315,8 +11315,8 @@ class TCPDF {
 	}
 
 	/**
- 	 * Get header font.
- 	 * @return array()
+	 * Get header font.
+	 * @return array()
 	 * @access public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -11325,7 +11325,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Set footer font.
+	 * Set footer font.
 	 * @param array $font font
 	 * @access public
 	 * @since 1.1
@@ -11335,8 +11335,8 @@ class TCPDF {
 	}
 
 	/**
- 	 * Get Footer font.
- 	 * @return array()
+	 * Get Footer font.
+	 * @return array()
 	 * @access public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -11345,7 +11345,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Set language array.
+	 * Set language array.
 	 * @param array $language
 	 * @access public
 	 * @since 1.1
@@ -13546,7 +13546,7 @@ class TCPDF {
 		$chardata = Array();
 
 		// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
-		// 	In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
+		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
 		for ($i=0; $i < $numchars; ++$i) {
 			if ($ta[$i] == $this->unicode->uni_RLE) {
 				// X2. With each RLE, compute the least greater odd embedding level.
@@ -16437,11 +16437,12 @@ class TCPDF {
 	 * @param string $palign Allows to center or align the image on the current line. Possible values are:
  • L : left align
  • C : center
  • R : right align
  • '' : empty string : left for LTR or right for RTL

 	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:
  • 0: no border (default)
  • 1: frame
 or a string containing some or all of the following characters (in any order):
  • L: left
  • T: top
  • R: right
  • B: bottom
 or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
+	 * @param boolean $fixoutvals if true remove values outside the bounding box.
 	 * @author Valentin Schmidt, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @access public
 	 */
-	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false) {
+	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
 		if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) {
 			// convert EPS to raster image using GD or ImageMagick libraries
 			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
@@ -16486,7 +16487,7 @@ class TCPDF {
 		if (count($regs) > 1) {
 			list($x1, $y1, $x2, $y2) = explode(' ', trim($regs[1]));
 		} else {
-			$this->Error('No BoundingBox found in EPS file: '.$file);
+			$this->Error('No BoundingBox found in EPS/AI file: '.$file);
 		}
 		$start = strpos($data, '%%EndSetup');
 		if ($start === false) {
@@ -16563,8 +16564,7 @@ class TCPDF {
 			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
 		}
 		// handle pc/unix/mac line endings
-		preg_match('/[\r\n]+/s', $data, $regs);
-		$lines = explode($regs[0], $data);
+		$lines = preg_split('/[\r\n]+/si', $data, -1, PREG_SPLIT_NO_EMPTY);
 		$u=0;
 		$cnt = count($lines);
 		for ($i=0; $i < $cnt; ++$i) {
@@ -16595,6 +16595,24 @@ class TCPDF {
 				$this->_out(''.$r.' '.$g.' '.$b.' '.($cmd=='Xa'?'rg':'RG')); //substr($line, 0, -2).'rg' -> in EPS (AI8): c m y k r g b rg!
 				continue;
 			}
+			$skip = false;
+			if ($fixoutvals) {
+				// check for values outside the bounding box
+				switch ($cmd) {
+					case 'm':
+					case 'l':
+					case 'L': {
+						// skip values outside bounding box
+						foreach ($chunks as $key => $val) {
+							if ((($key % 2) == 0) AND (($val < $x1) OR ($val > $x2))) {
+								$skip = true;
+							} elseif ((($key % 2) != 0) AND (($val < $y1) OR ($val > $y2))) {
+								$skip = true;
+							}
+						}
+					}
+				}
+			}
 			switch ($cmd) {
 				case 'm':
 				case 'l':
@@ -16613,6 +16631,9 @@ class TCPDF {
 				case 'M':
 				case 'd':
 				case 'n': {
+					if ($skip) {
+						break;
+					}
 					$this->_out($line);
 					break;
 				}
@@ -16649,6 +16670,9 @@ class TCPDF {
 				case 'V':
 				case 'L':
 				case 'C': {
+					if ($skip) {
+						break;
+					}
 					$line{$len-1} = strtolower($cmd);
 					$this->_out($line);
 					break;
@@ -16730,7 +16754,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Set document barcode.
+	 * Set document barcode.
 	 * @param string $bc barcode
 	 * @access public
 	 */
@@ -16739,7 +16763,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Get current barcode.
+	 * Get current barcode.
 	 * @return string
 	 * @access public
 	 * @since 4.0.012 (2008-07-24)
@@ -16749,9 +16773,9 @@ class TCPDF {
 	}
 
 	/**
- 	 * Print a Linear Barcode.
- 	 * @param string $code code to print
- 	 * @param string $type type of barcode (see barcodes.php for supported formats).
+	 * Print a Linear Barcode.
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see barcodes.php for supported formats).
 	 * @param int $x x position in user units (empty string = current x position)
 	 * @param int $y y position in user units (empty string = current y position)
 	 * @param int $w width in user units (empty string = remaining page width)
@@ -17070,7 +17094,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * This function is DEPRECATED, please use the new write1DBarcode() function.
+	 * This function is DEPRECATED, please use the new write1DBarcode() function.
 	 * @param int $x x position in user units
 	 * @param int $y y position in user units
 	 * @param int $w width in user units
@@ -17125,9 +17149,9 @@ class TCPDF {
 	}
 
 	/**
- 	 * Print 2D Barcode.
- 	 * @param string $code code to print
- 	 * @param string $type type of barcode (see 2dbarcodes.php for supported formats).
+	 * Print 2D Barcode.
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see 2dbarcodes.php for supported formats).
 	 * @param int $x x position in user units
 	 * @param int $y y position in user units
 	 * @param int $w width in user units
@@ -17604,7 +17628,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns true if the CSS selector is valid for the selected HTML tag
+	 * Returns true if the CSS selector is valid for the selected HTML tag
 	 * @param array $dom array of HTML tags and properties
 	 * @param int $key key of the current HTML tag
 	 * @param string $selector CSS selector string
@@ -17764,7 +17788,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the styles that apply for the selected HTML tag.
+	 * Returns the styles that apply for the selected HTML tag.
 	 * @param array $dom array of HTML tags and properties
 	 * @param int $key key of the current HTML tag
 	 * @param array $css array of CSS properties
@@ -17794,7 +17818,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the border width from CSS property
+	 * Returns the border width from CSS property
 	 * @param string $width border width
 	 * @return int with in user units
 	 * @access protected
@@ -17814,7 +17838,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the border dash style from CSS property
+	 * Returns the border dash style from CSS property
 	 * @param string $style border style to convert
 	 * @return int sash style (return -1 in case of none or hidden border)
 	 * @access protected
@@ -17850,7 +17874,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the border style array from CSS border properties
+	 * Returns the border style array from CSS border properties
 	 * @param string $cssborder border properties
 	 * @return array containing border properties
 	 * @access protected
@@ -18042,7 +18066,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the letter-spacing value from CSS value
+	 * Returns the letter-spacing value from CSS value
 	 * @param string $spacing letter-spacing value
 	 * @param float $parent font spacing (tracking/kerning) value of the parent element
 	 * @return float quantity to increases or decreases the space between characters in a text.
@@ -18073,7 +18097,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the percentage of font stretching from CSS value
+	 * Returns the percentage of font stretching from CSS value
 	 * @param string $stretch stretch mode
 	 * @param float $parent stretch value of the parent element
 	 * @return float font stretching percentage
@@ -18144,7 +18168,7 @@ class TCPDF {
 	}
 
 	/**
- 	 * Returns the HTML DOM array.
+	 * Returns the HTML DOM array.
 	 * @param string $html html code
 	 * @return array
 	 * @access protected
@@ -23367,7 +23391,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @param int $width column width
 	 * @param int $y column starting Y position (leave empty for current Y position)
 	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
+	 * @since 4.9.001 (2010-03-28)
 	 */
 	public function setEqualColumns($numcols=0, $width=0, $y='') {
 		$this->columns = array();
@@ -23400,7 +23424,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Each column is represented by and array with the following keys: (w = width, s = space between columns, y = column top position).
 	 * @param array $columns
 	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
+	 * @since 4.9.001 (2010-03-28)
 	 */
 	public function setColumnsArray($columns) {
 		$this->columns = $columns;
@@ -23413,7 +23437,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Set position at a given column
 	 * @param int $col column number (from 0 to getNumberOfColumns()-1); empty string = current column.
 	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
+	 * @since 4.9.001 (2010-03-28)
 	 */
 	public function selectColumn($col='') {
 		if (is_string($col)) {
@@ -23488,7 +23512,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Return the current column number
 	 * @return int current column number
 	 * @access public
- 	 * @since 5.5.011 (2010-07-08)
+	 * @since 5.5.011 (2010-07-08)
 	 */
 	public function getColumn() {
 		return $this->current_column;
@@ -23498,7 +23522,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Return the current number of columns.
 	 * @return int number of columns
 	 * @access public
- 	 * @since 5.8.018 (2010-08-25)
+	 * @since 5.8.018 (2010-08-25)
 	 */
 	public function getNumberOfColumns() {
 		return $this->num_columns;
@@ -23509,7 +23533,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @param array $pararray parameters array
 	 * @return sting containing serialized data
 	 * @access public
- 	 * @since 4.9.006 (2010-04-02)
+	 * @since 4.9.006 (2010-04-02)
 	 */
 	public function serializeTCPDFtagParameters($pararray) {
 		return urlencode(serialize($pararray));
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 3c862e7..9ee8580 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 Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -23249,7 +23255,7 @@ $style = ''])
-

method SVGTransform [line 24815]

+

method SVGTransform [line 24839]

diff --git a/doc/index.html b/doc/index.html index 3c862e7..9ee8580 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 Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index f89baed..f02f859 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Sat, 20 Nov 2010 10:52:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:06 +0100 by phpDocumentor 1.4.3
@@ -23288,7 +23294,7 @@ $tm)
-

method swapMargins [line 21849]

+

method swapMargins [line 21873]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index c17a240..bab7a34 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2173,7 +2173,7 @@ top
- Documentation generated on Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:20:59 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index a9fcd66..ae01d70 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2140,7 +2140,7 @@ top
- Documentation generated on Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -24467,7 +24473,7 @@ $margin = ''])
-

method write1DBarcode [line 16781]

+

method write1DBarcode [line 16805]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index da7cf5b..db44e5f 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 Sat, 20 Nov 2010 10:52:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:06 +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 a1c4e69..ee8c0ba 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 Sat, 20 Nov 2010 10:51:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:01 +0100 by phpDocumentor 1.4.3
@@ -24557,7 +24563,7 @@ $align = ''])
-

method write2DBarcode [line 17152]

+

method write2DBarcode [line 17176]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 6158146..67fbc91 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 Sat, 20 Nov 2010 10:51:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +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 f9f53b9..f7e38e3 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 Sat, 20 Nov 2010 10:51:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -24647,7 +24653,7 @@ $distort = false])
-

method writeBarcode [line 17087]

+

method writeBarcode [line 17111]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index d9d6787..99bd8c1 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 Sat, 20 Nov 2010 10:51:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +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 3d433f6..ee72bee 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 Sat, 20 Nov 2010 10:52:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:06 +0100 by phpDocumentor 1.4.3
@@ -24737,7 +24743,7 @@ $code)
-

method writeDiskCache [line 22381]

+

method writeDiskCache [line 22405]

diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index b83d161..539adde 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 Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +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 548d1fd..cef32fb 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 Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -24794,7 +24800,7 @@ $file)
-

method writeHTML [line 18959]

+

method writeHTML [line 18983]

diff --git a/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html b/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html index 4aca5ce..1a1f14c 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 Sat, 20 Nov 2010 10:52:04 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:06 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index ea86f2b..654930a 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1378,7 +1378,7 @@ $type)
- Documentation generated on Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -24860,7 +24866,7 @@ $align = ''])
-

method writeHTMLCell [line 18943]

+

method writeHTMLCell [line 18967]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index b06c630..79058bd 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -300,7 +300,7 @@ $type)
- Documentation generated on Sat, 20 Nov 2010 10:51:57 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:00 +0100 by phpDocumentor 1.4.3
@@ -28463,7 +28469,7 @@ $file)
- Documentation generated on Sat, 20 Nov 2010 10:51:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sun, 21 Nov 2010 17:21:01 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  5.9.021version:  5.9.022
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