diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 0bb37f1..6cd93a6 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,10 @@ +5.8.013 (2010-08-23) + - SVG support for 'direction' property was added. + - A problem on default width calculation for linear barcodes was fixed. + - New option was added to write1DBarcode() method to improve alignments (see example n. 27). + - Bug #3050896 "Nested HTML tables: styles are not applied" was fixed. + - Method _putresourcedict() was improved to include external XObject templates. + 5.8.012 (2010-08-22) - Support for SVG 'text-anchor' property was added. diff --git a/README.TXT b/README.TXT index f85774e..ca05e76 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.012 -Release date: 2010-08-22 +Version: 5.8.013 +Release date: 2010-08-23 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index e3efa72..5b9fd4b 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index c4c8e98..ceb7521 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index c1fe8d9..14e34e2 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 6e23161..a9c783a 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

@@ -280,7 +280,7 @@ Source Location: /tcpdf.php

  • $svginheritprop
  • $svgstyles
  • $svgtext
    • -
  • $svgtextanchor
    • +
  • $svgtextmode
  • $svgunit
  • $tagvspaces
  • $tempfontsize
    • @@ -294,6 +294,8 @@ Source Location: /tcpdf.php

  • $tMargin
  • $tmprtl
  • $tocpage
    • +
  • $tplprefix
    • +
  • $tpls
  • $transfmatrix
  • $transfmatrix_key
  • $transfmrk
    • @@ -742,7 +744,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.8.012 + version:  5.8.013 link:  http://www.tcpdf.org @@ -5604,7 +5606,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgclipid =  0

    -

    [line 1608]

    +

    [line 1622]



    Tags:

    @@ -5634,7 +5636,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgclipmode =  false

    -

    [line 1594]

    +

    [line 1608]



    Tags:

    @@ -5664,7 +5666,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgclippaths = array()

    -

    [line 1601]

    +

    [line 1615]



    Tags:

    @@ -5694,7 +5696,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgdefs = array()

    -

    [line 1587]

    +

    [line 1601]



    Tags:

    @@ -5724,7 +5726,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgdefsmode =  false

    -

    [line 1580]

    +

    [line 1594]



    Tags:

    @@ -5754,7 +5756,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgdir =  ''

    -

    [line 1552]

    +

    [line 1566]



    Tags:

    @@ -5784,7 +5786,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svggradientid =  0

    -

    [line 1573]

    +

    [line 1587]



    Tags:

    @@ -5814,7 +5816,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svggradients = array()

    -

    [line 1566]

    +

    [line 1580]



    Tags:

    @@ -5844,7 +5846,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode')

    -

    [line 1629]

    +

    [line 1643]



    Tags:

    @@ -5937,7 +5939,7 @@ This is a PHP class for generating PDF documents without requiring external exte          'writing-mode' => 'lr-tb',
             'text-color' => 'black',
             'transfmatrix' => array(1, 0, 0, 1, 0, 0))) -

    [line 1636]

    +

    [line 1650]



    Tags:

    @@ -5967,7 +5969,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgtext =  ''

    -

    [line 1615]

    +

    [line 1629]



    Tags:

    @@ -5994,19 +5996,19 @@ This is a PHP class for generating PDF documents without requiring external exte


    [ Top ]

    - +

    -

    $svgtextanchor =  'start'

    -

    [line 1622]

    +

    $svgtextmode = array()

    +

    [line 1636]



    Tags:

    - + - + @@ -6027,7 +6029,7 @@ This is a PHP class for generating PDF documents without requiring external exte

    $svgunit =  'px'

    -

    [line 1559]

    +

    [line 1573]



    Tags:

    @@ -6374,6 +6376,66 @@ This is a PHP class for generating PDF documents without requiring external exte
    + +
    var:  text-achor propertyvar:  text properties
    since:  5.8.012 (2010-08-22)since:  5.8.013 (2010-08-23)
    access:  protected
    Type:   true
    +


    +
    [ Top ]

    + +

    +

    $tplprefix =  '/TPL'

    +

    [line 1559]

    +

    +

    Tags:

    +
    + + + + + + + + + + +
    var:  prefix for external XObjects templates
    since:  5.8.013 (2010-08-23)
    access:  protected
    +
    + +
    +
    + + + + + +
    Type:  String
    +


    +
    [ Top ]

    + +

    +

    $tpls = array()

    +

    [line 1552]

    +

    +

    Tags:

    +
    + + + + + + + + + + +
    var:  of external XObjects templates
    since:  5.8.013 (2010-08-23)
    access:  protected
    +
    + +
    +
    + + + +
    Type:  Array


    @@ -6819,7 +6881,7 @@ This is a PHP class for generating PDF documents without requiring external exte
    -

    constructor __construct [line 1720]

    +

    constructor __construct [line 1734]

    @@ -6891,7 +6953,7 @@ $diskcache = false])
    -

    destructor __destruct [line 1851]

    +

    destructor __destruct [line 1865]

    @@ -6919,7 +6981,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 4875]

    +

    method AcceptPageBreak [line 4890]

    @@ -6950,7 +7012,7 @@ $diskcache = false])
    -

    method addExtGState [line 14730]

    +

    method addExtGState [line 14749]

    @@ -6998,7 +7060,7 @@ $params)
    -

    method AddFont [line 4343]

    +

    method AddFont [line 4358]

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

    method addHtmlLink [line 10772]

    +

    method addHtmlLink [line 10791]

    @@ -7136,7 +7198,7 @@ $firstblock = false])
    -

    method addHTMLTOC [line 21453]

    +

    method addHTMLTOC [line 21514]

    @@ -7199,7 +7261,7 @@ $correct_align = true])
    -

    method addHTMLVertSpace [line 19947]

    +

    method addHTMLVertSpace [line 20008]

    @@ -7253,7 +7315,7 @@ $firstorlast = false])
    -

    method addJavascriptObject [line 13341]

    +

    method addJavascriptObject [line 13360]

    @@ -7304,7 +7366,7 @@ $onload = false])
    -

    method AddLink [line 4676]

    +

    method AddLink [line 4691]

    @@ -7335,7 +7397,7 @@ $onload = false])
    -

    method AddPage [line 3490]

    +

    method AddPage [line 3504]

    @@ -7395,7 +7457,7 @@ $tocpage = false])
    -

    method AddSpotColor [line 3952]

    +

    method AddSpotColor [line 3967]

    @@ -7461,7 +7523,7 @@ $k)
    -

    method addTOC [line 21281]

    +

    method addTOC [line 21342]

    @@ -7524,7 +7586,7 @@ $toc_name = 'TOC'])
    -

    method addTOCPage [line 3465]

    +

    method addTOCPage [line 3479]

    @@ -7578,7 +7640,7 @@ $keepmargins = false])
    -

    method AliasNbPages [line 14544]

    +

    method AliasNbPages [line 14563]

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

    method AliasNumPage [line 14571]

    +

    method AliasNumPage [line 14590]

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

    method Annotation [line 4732]

    +

    method Annotation [line 4747]

    @@ -7737,7 +7799,7 @@ $spaces = 0])
    -

    method Arrow [line 12545]

    +

    method Arrow [line 12564]

    @@ -7815,7 +7877,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 10667]

    +

    method arrUTF8ToUTF16BE [line 10686]

    @@ -7890,7 +7952,7 @@ $setbom = true])
    -

    method Bookmark [line 13213]

    +

    method Bookmark [line 13232]

    @@ -7950,7 +8012,7 @@ $page = ''])
    -

    method Button [line 14214]

    +

    method Button [line 14233]

    @@ -8046,7 +8108,7 @@ $js = false])
    -

    method Cell [line 4982]

    +

    method Cell [line 4997]

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

    method CheckBox [line 14146]

    +

    method CheckBox [line 14165]

    @@ -8244,7 +8306,7 @@ $js = false])
    -

    method checkPageBreak [line 4902]

    +

    method checkPageBreak [line 4917]

    @@ -8298,7 +8360,7 @@ $addpage = true])
    -

    method Circle [line 12233]

    +

    method Circle [line 12252]

    @@ -8397,7 +8459,7 @@ $angend:)
    -

    method Clip [line 15191]

    +

    method Clip [line 15210]

    @@ -8457,7 +8519,7 @@ $h)
    -

    method Close [line 3342]

    +

    method Close [line 3356]

    @@ -8488,7 +8550,7 @@ $h)
    -

    method closeHTMLTagHandler [line 19447]

    +

    method closeHTMLTagHandler [line 19508]

    @@ -8548,7 +8610,7 @@ $dom)
    -

    method colorRegistrationBar [line 14866]

    +

    method colorRegistrationBar [line 14885]

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

    method ComboBox [line 14089]

    +

    method ComboBox [line 14108]

    @@ -8716,7 +8778,7 @@ $js = false])
    -

    method commitTransaction [line 21565]

    +

    method commitTransaction [line 21626]

    @@ -8744,7 +8806,7 @@ $js = false])
    -

    method convertHexStringToString [line 11396]

    +

    method convertHexStringToString [line 11415]

    @@ -8786,7 +8848,7 @@ $bs)
    -

    method convertHTMLColorToDec [line 10805]

    +

    method convertHTMLColorToDec [line 10824]

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

    method convertStringToHexString [line 11418]

    +

    method convertStringToHexString [line 11437]

    @@ -8870,7 +8932,7 @@ $s)
    -

    method convertSVGtMatrix [line 22633]

    +

    method convertSVGtMatrix [line 22694]

    @@ -8912,7 +8974,7 @@ $tm)
    -

    method CoonsPatchMesh [line 15106]

    +

    method CoonsPatchMesh [line 15125]

    @@ -9020,7 +9082,7 @@ $antialias = false])
    -

    method copyPage [line 21211]

    +

    method copyPage [line 21272]

    @@ -9062,7 +9124,7 @@ $page = 0])
    -

    method cropMark [line 14964]

    +

    method cropMark [line 14983]

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

    method Curve [line 12038]

    +

    method Curve [line 12057]

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

    method deletePage [line 21068]

    +

    method deletePage [line 21129]

    @@ -9278,7 +9340,7 @@ $page)
    -

    method drawHTMLTagBorder [line 19984]

    +

    method drawHTMLTagBorder [line 20045]

    @@ -9323,7 +9385,7 @@ $xmax)
    -

    method Ellipse [line 12102]

    +

    method Ellipse [line 12121]

    @@ -9443,7 +9505,7 @@ $afinish:)
    -

    method empty_string [line 21619]

    +

    method empty_string [line 21680]

    @@ -9485,7 +9547,7 @@ $str)
    -

    method endPage [line 3510]

    +

    method endPage [line 3524]

    @@ -9527,7 +9589,7 @@ $tocpage = false])
    -

    method endSVGElementHandler [line 23666]

    +

    method endSVGElementHandler [line 23736]

    @@ -9575,7 +9637,7 @@ $name)
    -

    method endTOCPage [line 3475]

    +

    method endTOCPage [line 3489]

    @@ -9606,7 +9668,7 @@ $name)
    -

    method Error [line 3314]

    +

    method Error [line 3328]

    @@ -9645,7 +9707,7 @@ $msg)
    -

    method extractCSSproperties [line 16450]

    +

    method extractCSSproperties [line 16501]

    @@ -9690,7 +9752,7 @@ $cssdata)
    -

    method fitBlock [line 6542]

    +

    method fitBlock [line 6557]

    @@ -9777,7 +9839,7 @@ $y)
    -

    method Footer [line 3760]

    +

    method Footer [line 3774]

    @@ -9802,7 +9864,7 @@ $y)
    -

    method formatPageNumber [line 14648]

    +

    method formatPageNumber [line 14667]

    @@ -9841,7 +9903,7 @@ $num)
    -

    method formatTOCPageNumber [line 14660]

    +

    method formatTOCPageNumber [line 14679]

    @@ -9883,7 +9945,7 @@ $num)
    -

    method GetAbsX [line 7274]

    +

    method GetAbsX [line 7289]

    @@ -9914,7 +9976,7 @@ $num)
    -

    method getAliasNbPages [line 14556]

    +

    method getAliasNbPages [line 14575]

    @@ -9945,7 +10007,7 @@ $num)
    -

    method getAliasNumPage [line 14584]

    +

    method getAliasNumPage [line 14603]

    @@ -9976,7 +10038,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 13466]

    +

    method getAnnotOptFromJSProp [line 13485]

    @@ -10021,7 +10083,7 @@ $prop)
    -

    method GetArrStringWidth [line 4245]

    +

    method GetArrStringWidth [line 4260]

    @@ -10090,7 +10152,7 @@ $getarray = false])
    -

    method getBarcode [line 15828]

    +

    method getBarcode [line 15847]

    @@ -10118,7 +10180,7 @@ $getarray = false])
    -

    method getBorderMode [line 5853]

    +

    method getBorderMode [line 5868]

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

    method getBorderStartPosition [line 19968]

    +

    method getBorderStartPosition [line 20029]

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

    method getBreakMargin [line 3039]

    +

    method getBreakMargin [line 3053]

    @@ -10245,7 +10307,7 @@ $pagenum = ''])
    -

    method getBuffer [line 20744]

    +

    method getBuffer [line 20805]

    @@ -10276,7 +10338,7 @@ $pagenum = ''])
    -

    method getCellBorder [line 5380]

    +

    method getCellBorder [line 5395]

    @@ -10351,7 +10413,7 @@ $mode)
    -

    method getCellCode [line 5013]

    +

    method getCellCode [line 5028]

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

    method getCellHeightRatio [line 14826]

    +

    method getCellHeightRatio [line 14845]

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

    method GetCharWidth [line 4281]

    +

    method GetCharWidth [line 4296]

    @@ -10535,7 +10597,7 @@ $char)
    -

    method getColumn [line 21770]

    +

    method getColumn [line 21831]

    @@ -10566,7 +10628,7 @@ $char)
    -

    method getCSSBorderDashStyle [line 16749]

    +

    method getCSSBorderDashStyle [line 16800]

    @@ -10608,7 +10670,7 @@ $style)
    -

    method getCSSBorderStyle [line 16785]

    +

    method getCSSBorderStyle [line 16836]

    @@ -10650,7 +10712,7 @@ $cssborder)
    -

    method getCSSBorderWidth [line 16729]

    +

    method getCSSBorderWidth [line 16780]

    @@ -10692,7 +10754,7 @@ $width)
    -

    method getEncPermissionsString [line 11435]

    +

    method getEncPermissionsString [line 11454]

    @@ -10734,7 +10796,7 @@ $protection)
    -

    method getFontAscent [line 4646]

    +

    method getFontAscent [line 4661]

    @@ -10791,7 +10853,7 @@ $size = 0])
    -

    method getFontBuffer [line 20908]

    +

    method getFontBuffer [line 20969]

    @@ -10833,7 +10895,7 @@ $font)
    -

    method getFontDescent [line 4623]

    +

    method getFontDescent [line 4638]

    @@ -10890,7 +10952,7 @@ $size = 0])
    -

    method getFontFamily [line 16428]

    +

    method getFontFamily [line 16479]

    @@ -10921,7 +10983,7 @@ $size = 0])
    -

    method getFontFamilyName [line 22190]

    +

    method getFontFamilyName [line 22251]

    @@ -10966,7 +11028,7 @@ $fontfamily)
    -

    method getFontSize [line 16408]

    +

    method getFontSize [line 16459]

    @@ -10997,7 +11059,7 @@ $fontfamily)
    -

    method getFontSizePt [line 16418]

    +

    method getFontSizePt [line 16469]

    @@ -11028,7 +11090,7 @@ $fontfamily)
    -

    method getFontsList [line 4320]

    +

    method getFontsList [line 4335]

    @@ -11056,7 +11118,7 @@ $fontfamily)
    -

    method getFontStyle [line 16438]

    +

    method getFontStyle [line 16489]

    @@ -11087,7 +11149,7 @@ $fontfamily)
    -

    method getFontSubsetting [line 22126]

    +

    method getFontSubsetting [line 22187]

    @@ -11121,7 +11183,7 @@ $fontfamily)
    -

    method getFooterFont [line 10730]

    +

    method getFooterFont [line 10749]

    @@ -11149,7 +11211,7 @@ $fontfamily)
    -

    method getFooterMargin [line 3674]

    +

    method getFooterMargin [line 3688]

    @@ -11177,7 +11239,7 @@ $fontfamily)
    -

    method getFormDefaultProp [line 13841]

    +

    method getFormDefaultProp [line 13860]

    @@ -11211,7 +11273,7 @@ $fontfamily)
    -

    method getGDgamma [line 7214]

    +

    method getGDgamma [line 7229]

    @@ -11250,7 +11312,7 @@ $v)
    -

    method getGraphicVars [line 20576]

    +

    method getGraphicVars [line 20637]

    @@ -11281,7 +11343,7 @@ $v)
    -

    method getGroupPageNo [line 14597]

    +

    method getGroupPageNo [line 14616]

    @@ -11312,7 +11374,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 14607]

    +

    method getGroupPageNoFormatted [line 14626]

    @@ -11343,7 +11405,7 @@ $v)
    -

    method getHeaderData [line 3629]

    +

    method getHeaderData [line 3643]

    @@ -11371,7 +11433,7 @@ $v)
    -

    method getHeaderFont [line 10710]

    +

    method getHeaderFont [line 10729]

    @@ -11399,7 +11461,7 @@ $v)
    -

    method getHeaderMargin [line 3654]

    +

    method getHeaderMargin [line 3668]

    @@ -11427,7 +11489,7 @@ $v)
    -

    method getHtmlDomArray [line 16833]

    +

    method getHtmlDomArray [line 16884]

    @@ -11466,7 +11528,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 20287]

    +

    method getHTMLUnitToUnits [line 20348]

    @@ -11532,7 +11594,7 @@ $point)
    -

    method getHyphenPatternsFromTEX [line 21926]

    +

    method getHyphenPatternsFromTEX [line 21987]

    @@ -11577,7 +11639,7 @@ $file)
    -

    method getImageBuffer [line 20846]

    +

    method getImageBuffer [line 20907]

    @@ -11619,7 +11681,7 @@ $image)
    -

    method getImageFileType [line 6512]

    +

    method getImageFileType [line 6527]

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

    method getImageRBX [line 3700]

    +

    method getImageRBX [line 3714]

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

    method getImageRBY [line 3709]

    +

    method getImageRBY [line 3723]

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

    method getImageScale [line 2978]

    +

    method getImageScale [line 2992]

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

    method getLastH [line 2956]

    +

    method getLastH [line 2970]

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

    method GetLineWidth [line 11778]

    +

    method GetLineWidth [line 11797]

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

    method getMargins [line 16371]

    +

    method getMargins [line 16422]

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

    method GetNumChars [line 4308]

    +

    method GetNumChars [line 4323]

    @@ -11889,7 +11951,7 @@ $s)
    -

    method getNumLines [line 5931]

    +

    method getNumLines [line 5946]

    @@ -11964,7 +12026,7 @@ $lineWidth = ''])
    -

    method getNumPages [line 3453]

    +

    method getNumPages [line 3467]

    @@ -11998,7 +12060,7 @@ $lineWidth = ''])
    -

    method getObjFilename [line 20658]

    +

    method getObjFilename [line 20719]

    @@ -12043,7 +12105,7 @@ $prefix)
    -

    method getOriginalMargins [line 16394]

    +

    method getOriginalMargins [line 16445]

    @@ -12074,7 +12136,7 @@ $prefix)
    -

    method getPage [line 3441]

    +

    method getPage [line 3455]

    @@ -12108,7 +12170,7 @@ $prefix)
    -

    method getPageBuffer [line 20787]

    +

    method getPageBuffer [line 20848]

    @@ -12150,7 +12212,7 @@ $page)
    -

    method getPageDimensions [line 2991]

    +

    method getPageDimensions [line 3005]

    @@ -12195,7 +12257,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 14619]

    +

    method getPageGroupAlias [line 14638]

    @@ -12226,7 +12288,7 @@ $pagenum = ''])
    -

    method getPageHeight [line 3023]

    +

    method getPageHeight [line 3037]

    @@ -12274,7 +12336,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 14634]

    +

    method getPageNumGroupAlias [line 14653]

    @@ -12305,7 +12367,7 @@ $pagenum = ''])
    -

    method getPageSizeFromFormat [line 2217]

    +

    method getPageSizeFromFormat [line 2231]

    @@ -12347,7 +12409,7 @@ $format)
    -

    method getPageWidth [line 3007]

    +

    method getPageWidth [line 3021]

    @@ -12395,7 +12457,7 @@ $pagenum = ''])
    -

    method getPathPaintOperator [line 22038]

    +

    method getPathPaintOperator [line 22099]

    @@ -12449,7 +12511,7 @@ $mode)
    -

    method getPDFData [line 10753]

    +

    method getPDFData [line 10772]

    @@ -12474,7 +12536,7 @@ $mode)
    -

    method getRemainingWidth [line 6413]

    +

    method getRemainingWidth [line 6428]

    @@ -12502,7 +12564,7 @@ $mode)
    -

    method getRTL [line 2891]

    +

    method getRTL [line 2905]

    @@ -12530,7 +12592,7 @@ $mode)
    -

    method getScaleFactor [line 3053]

    +

    method getScaleFactor [line 3067]

    @@ -12564,7 +12626,7 @@ $mode)
    -

    method getSpaceString [line 17532]

    +

    method getSpaceString [line 17593]

    @@ -12595,7 +12657,7 @@ $mode)
    -

    method getStringHeight [line 6032]

    +

    method getStringHeight [line 6047]

    @@ -12698,7 +12760,7 @@ $lineWidth = ''])
    -

    method GetStringWidth [line 4229]

    +

    method GetStringWidth [line 4244]

    @@ -12767,7 +12829,7 @@ $getarray = false])
    -

    method getSVGTransformMatrix [line 22511]

    +

    method getSVGTransformMatrix [line 22572]

    @@ -12812,7 +12874,7 @@ $attribute)
    -

    method getTagStyleFromCSS [line 16701]

    +

    method getTagStyleFromCSS [line 16752]

    @@ -12866,7 +12928,7 @@ $css)
    -

    method getTransformationMatrixProduct [line 22615]

    +

    method getTransformationMatrixProduct [line 22676]

    @@ -12917,7 +12979,7 @@ $tb)
    -

    method getUserPermissionCode [line 11275]

    +

    method getUserPermissionCode [line 11294]

    @@ -12965,7 +13027,7 @@ $mode = 0])
    -

    method getVectorsAngle [line 23247]

    +

    method getVectorsAngle [line 23308]

    @@ -13025,7 +13087,7 @@ $y2)
    -

    method GetX [line 7258]

    +

    method GetX [line 7273]

    @@ -13056,7 +13118,7 @@ $y2)
    -

    method GetY [line 7285]

    +

    method GetY [line 7300]

    @@ -13087,7 +13149,7 @@ $y2)
    -

    method get_mqr [line 6930]

    +

    method get_mqr [line 6945]

    @@ -13118,7 +13180,7 @@ $y2)
    -

    method Gradient [line 15215]

    +

    method Gradient [line 15234]

    @@ -13184,7 +13246,7 @@ $antialias = false])
    -

    method Header [line 3718]

    +

    method Header [line 3732]

    @@ -13209,7 +13271,7 @@ $antialias = false])
    -

    method hyphenateText [line 21965]

    +

    method hyphenateText [line 22026]

    @@ -13290,7 +13352,7 @@ $charmax = 8])
    -

    method hyphenateWord [line 21856]

    +

    method hyphenateWord [line 21917]

    @@ -13371,7 +13433,7 @@ $charmax = 8])
    -

    method Image [line 6619]

    +

    method Image [line 6634]

    @@ -13509,7 +13571,7 @@ $fitonpage = false])
    -

    method ImageEps [line 15561]

    +

    method ImageEps [line 15580]

    @@ -13611,7 +13673,7 @@ $fitonpage = false])
    -

    method ImagePngAlpha [line 7170]

    +

    method ImagePngAlpha [line 7185]

    @@ -13728,7 +13790,7 @@ $palign)
    -

    method ImageSVG [line 22240]

    +

    method ImageSVG [line 22301]

    @@ -13824,7 +13886,7 @@ $fitonpage = false])
    -

    method IncludeJS [line 13328]

    +

    method IncludeJS [line 13347]

    @@ -13866,7 +13928,7 @@ $script)
    -

    method intToRoman [line 20366]

    +

    method intToRoman [line 20427]

    @@ -13908,7 +13970,7 @@ $number)
    -

    method isRTLTextDir [line 2935]

    +

    method isRTLTextDir [line 2949]

    @@ -13936,7 +13998,7 @@ $number)
    -

    method isUnicodeFont [line 22178]

    +

    method isUnicodeFont [line 22239]

    @@ -13970,7 +14032,7 @@ $number)
    -

    method isValidCSSSelectorForTag [line 16542]

    +

    method isValidCSSSelectorForTag [line 16593]

    @@ -14024,7 +14086,7 @@ $selector)
    -

    method lastPage [line 3430]

    +

    method lastPage [line 3444]

    @@ -14066,7 +14128,7 @@ $resetmargins = false])
    -

    method Line [line 11955]

    +

    method Line [line 11974]

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

    method LinearGradient [line 15065]

    +

    method LinearGradient [line 15084]

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

    method Link [line 4715]

    +

    method Link [line 4730]

    @@ -14282,7 +14344,7 @@ $spaces = 0])
    -

    method ListBox [line 14033]

    +

    method ListBox [line 14052]

    @@ -14372,7 +14434,7 @@ $js = false])
    -

    method Ln [line 7227]

    +

    method Ln [line 7242]

    @@ -14420,7 +14482,7 @@ $cell = false])
    -

    method MirrorH [line 11560]

    +

    method MirrorH [line 11579]

    @@ -14462,7 +14524,7 @@ $x = ''])
    -

    method MirrorL [line 11596]

    +

    method MirrorL [line 11615]

    @@ -14516,7 +14578,7 @@ $y = ''])
    -

    method MirrorP [line 11583]

    +

    method MirrorP [line 11602]

    @@ -14564,7 +14626,7 @@ $y = ''])
    -

    method MirrorV [line 11571]

    +

    method MirrorV [line 11590]

    @@ -14606,7 +14668,7 @@ $y = ''])
    -

    method movePage [line 20925]

    +

    method movePage [line 20986]

    @@ -14654,7 +14716,7 @@ $topage)
    -

    method MultiCell [line 5583]

    +

    method MultiCell [line 5598]

    @@ -14792,7 +14854,7 @@ $fitcell = false])
    -

    method objclone [line 21608]

    +

    method objclone [line 21669]

    @@ -14834,7 +14896,7 @@ $object)
    -

    method Open [line 3329]

    +

    method Open [line 3343]

    @@ -14865,7 +14927,7 @@ $object)
    -

    method openHTMLTagHandler [line 18846]

    +

    method openHTMLTagHandler [line 18907]

    @@ -14919,7 +14981,7 @@ $dom)
    -

    method Output [line 7377]

    +

    method Output [line 7392]

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

    method PageNo [line 3936]

    +

    method PageNo [line 3951]

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

    method PageNoFormatted [line 14670]

    +

    method PageNoFormatted [line 14689]

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

    method PieSector [line 15500]

    +

    method PieSector [line 15519]

    @@ -15128,7 +15190,7 @@ $o:)
    -

    method PieSectorXY [line 15521]

    +

    method PieSectorXY [line 15540]

    @@ -15236,7 +15298,7 @@ $o:)
    -

    method pixelsToUnits [line 10872]

    +

    method pixelsToUnits [line 10891]

    @@ -15278,7 +15340,7 @@ $px)
    -

    method Polycurve [line 12065]

    +

    method Polycurve [line 12084]

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

    method Polygon [line 12271]

    +

    method Polygon [line 12290]

    @@ -15413,7 +15475,7 @@ $closed = true])
    -

    method PolyLine [line 12252]

    +

    method PolyLine [line 12271]

    @@ -15476,7 +15538,7 @@ $closed)
    -

    method putHtmlListBullet [line 20431]

    +

    method putHtmlListBullet [line 20492]

    @@ -15527,7 +15589,7 @@ $size = 10])
    -

    method RadialGradient [line 15083]

    +

    method RadialGradient [line 15102]

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

    method RadioButton [line 13946]

    +

    method RadioButton [line 13965]

    @@ -15695,7 +15757,7 @@ $js = false])
    -

    method readDiskCache [line 20698]

    +

    method readDiskCache [line 20759]

    @@ -15743,7 +15805,7 @@ $file)
    -

    method Rect [line 11983]

    +

    method Rect [line 12002]

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

    method registrationMark [line 15034]

    +

    method registrationMark [line 15053]

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

    method RegularPolygon [line 12369]

    +

    method RegularPolygon [line 12388]

    @@ -16004,7 +16066,7 @@ $r:)
    -

    method removeSHY [line 4955]

    +

    method removeSHY [line 4970]

    @@ -16046,7 +16108,7 @@ $txt = ''])
    -

    method replaceBuffer [line 20726]

    +

    method replaceBuffer [line 20787]

    @@ -16085,7 +16147,7 @@ $data)
    -

    method revstrpos [line 21632]

    +

    method revstrpos [line 21693]

    @@ -16139,7 +16201,7 @@ $offset = 0])
    -

    method rfread [line 7138]

    +

    method rfread [line 7153]

    @@ -16190,7 +16252,7 @@ $length)
    -

    method rollbackTransaction [line 21579]

    +

    method rollbackTransaction [line 21640]

    @@ -16232,7 +16294,7 @@ $self = false])
    -

    method Rotate [line 11652]

    +

    method Rotate [line 11671]

    @@ -16286,7 +16348,7 @@ $y = ''])
    -

    method RoundedRect [line 12459]

    +

    method RoundedRect [line 12478]

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

    method RoundedRectXY [line 12478]

    +

    method RoundedRectXY [line 12497]

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

    method Scale [line 11528]

    +

    method Scale [line 11547]

    @@ -16526,7 +16588,7 @@ $y = ''])
    -

    method ScaleX [line 11488]

    +

    method ScaleX [line 11507]

    @@ -16580,7 +16642,7 @@ $y = ''])
    -

    method ScaleXY [line 11514]

    +

    method ScaleXY [line 11533]

    @@ -16634,7 +16696,7 @@ $y = ''])
    -

    method ScaleY [line 11501]

    +

    method ScaleY [line 11520]

    @@ -16688,7 +16750,7 @@ $y = ''])
    -

    method segSVGContentHandler [line 23722]

    +

    method segSVGContentHandler [line 23793]

    @@ -16736,7 +16798,7 @@ $data)
    -

    method selectColumn [line 21695]

    +

    method selectColumn [line 21756]

    @@ -16775,7 +16837,7 @@ $col = ''])
    -

    method serializeTCPDFtagParameters [line 21781]

    +

    method serializeTCPDFtagParameters [line 21842]

    @@ -16817,7 +16879,7 @@ $pararray)
    -

    method setAlpha [line 14783]

    +

    method setAlpha [line 14802]

    @@ -16862,7 +16924,7 @@ $bm = 'Normal'])
    -

    method SetAuthor [line 3278]

    +

    method SetAuthor [line 3292]

    @@ -16904,7 +16966,7 @@ $author)
    -

    method SetAutoPageBreak [line 3145]

    +

    method SetAutoPageBreak [line 3159]

    @@ -16952,7 +17014,7 @@ $margin = 0])
    -

    method setBarcode [line 15818]

    +

    method setBarcode [line 15837]

    @@ -16988,7 +17050,7 @@ $bc = ''])
    -

    method SetBooklet [line 20201]

    +

    method SetBooklet [line 20262]

    @@ -17039,7 +17101,7 @@ $outer = -1])
    -

    method setBuffer [line 20708]

    +

    method setBuffer [line 20769]

    @@ -17078,7 +17140,7 @@ $data)
    -

    method setCellHeightRatio [line 14817]

    +

    method setCellHeightRatio [line 14836]

    @@ -17117,7 +17179,7 @@ $h)
    -

    method SetCellPadding [line 3133]

    +

    method SetCellPadding [line 3147]

    @@ -17159,7 +17221,7 @@ $pad)
    -

    method setColumnsArray [line 21682]

    +

    method setColumnsArray [line 21743]

    @@ -17198,7 +17260,7 @@ $columns)
    -

    method SetCompression [line 3238]

    +

    method SetCompression [line 3252]

    @@ -17237,7 +17299,7 @@ $compress)
    -

    method setContentMark [line 3596]

    +

    method setContentMark [line 3610]

    @@ -17276,7 +17338,7 @@ $page = 0])
    -

    method SetCreator [line 3302]

    +

    method SetCreator [line 3316]

    @@ -17318,7 +17380,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 4665]

    +

    method SetDefaultMonospacedFont [line 4680]

    @@ -17357,7 +17419,7 @@ $font)
    -

    method setDefaultTableColumns [line 14807]

    +

    method setDefaultTableColumns [line 14826]

    @@ -17396,7 +17458,7 @@ $cols = 4])
    -

    method SetDisplayMode [line 3160]

    +

    method SetDisplayMode [line 3174]

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

    method SetDrawColor [line 3996]

    +

    method SetDrawColor [line 4011]

    @@ -17516,7 +17578,7 @@ $ret = false])
    -

    method SetDrawColorArray [line 3970]

    +

    method SetDrawColorArray [line 3985]

    @@ -17567,7 +17629,7 @@ $ret = false])
    -

    method SetDrawSpotColor [line 4041]

    +

    method SetDrawSpotColor [line 4056]

    @@ -17615,7 +17677,7 @@ $tint = 100])
    -

    method setEqualColumns [line 21649]

    +

    method setEqualColumns [line 21710]

    @@ -17666,7 +17728,7 @@ $y = ''])
    -

    method setExtGState [line 14749]

    +

    method setExtGState [line 14768]

    @@ -17705,7 +17767,7 @@ $gs)
    -

    method SetFillColor [line 4083]

    +

    method SetFillColor [line 4098]

    @@ -17765,7 +17827,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 4060]

    +

    method SetFillColorArray [line 4075]

    @@ -17807,7 +17869,7 @@ $color)
    -

    method SetFillSpotColor [line 4125]

    +

    method SetFillSpotColor [line 4140]

    @@ -17855,7 +17917,7 @@ $tint = 100])
    -

    method SetFont [line 4573]

    +

    method SetFont [line 4588]

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

    method setFontBuffer [line 20862]

    +

    method setFontBuffer [line 20923]

    @@ -17969,7 +18031,7 @@ $data)
    -

    method SetFontSize [line 4594]

    +

    method SetFontSize [line 4609]

    @@ -18017,7 +18079,7 @@ $out = true])
    -

    method setFontSubBuffer [line 20888]

    +

    method setFontSubBuffer [line 20949]

    @@ -18068,7 +18130,7 @@ $data)
    -

    method setFontSubsetting [line 22115]

    +

    method setFontSubsetting [line 22176]

    @@ -18110,7 +18172,7 @@ $enable = true])
    -

    method setFooter [line 3843]

    +

    method setFooter [line 3858]

    @@ -18138,7 +18200,7 @@ $enable = true])
    -

    method setFooterFont [line 10720]

    +

    method setFooterFont [line 10739]

    @@ -18177,7 +18239,7 @@ $font)
    -

    method setFooterMargin [line 3664]

    +

    method setFooterMargin [line 3678]

    @@ -18213,7 +18275,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 13830]

    +

    method setFormDefaultProp [line 13849]

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

    method setGraphicVars [line 20616]

    +

    method setGraphicVars [line 20677]

    @@ -18294,7 +18356,7 @@ $gvars)
    -

    method setHeader [line 3806]

    +

    method setHeader [line 3821]

    @@ -18322,7 +18384,7 @@ $gvars)
    -

    method setHeaderData [line 3615]

    +

    method setHeaderData [line 3629]

    @@ -18376,7 +18438,7 @@ $hs = ''])
    -

    method setHeaderFont [line 10700]

    +

    method setHeaderFont [line 10719]

    @@ -18415,7 +18477,7 @@ $font)
    -

    method setHeaderMargin [line 3644]

    +

    method setHeaderMargin [line 3658]

    @@ -18451,7 +18513,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 20272]

    +

    method setHtmlLinksStyle [line 20333]

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

    method setHtmlVSpace [line 20241]

    +

    method setHtmlVSpace [line 20302]

    @@ -18535,7 +18597,7 @@ $tagvs)
    -

    method setImageBuffer [line 20803]

    +

    method setImageBuffer [line 20864]

    @@ -18580,7 +18642,7 @@ $data)
    -

    method setImageScale [line 2967]

    +

    method setImageScale [line 2981]

    @@ -18622,7 +18684,7 @@ $scale)
    -

    method setImageSubBuffer [line 20826]

    +

    method setImageSubBuffer [line 20887]

    @@ -18673,7 +18735,7 @@ $data)
    -

    method setJPEGQuality [line 14794]

    +

    method setJPEGQuality [line 14813]

    @@ -18712,7 +18774,7 @@ $quality)
    -

    method SetKeywords [line 3290]

    +

    method SetKeywords [line 3304]

    @@ -18754,7 +18816,7 @@ $keywords)
    -

    method setLanguageArray [line 10740]

    +

    method setLanguageArray [line 10759]

    @@ -18793,7 +18855,7 @@ $language)
    -

    method setLastH [line 2946]

    +

    method setLastH [line 2960]

    @@ -18835,7 +18897,7 @@ $h)
    -

    method SetLeftMargin [line 3089]

    +

    method SetLeftMargin [line 3103]

    @@ -18877,7 +18939,7 @@ $margin)
    -

    method SetLineStyle [line 11805]

    +

    method SetLineStyle [line 11824]

    @@ -18932,7 +18994,7 @@ $ret = false])
    -

    method SetLineWidth [line 11762]

    +

    method SetLineWidth [line 11781]

    @@ -18974,7 +19036,7 @@ $width)
    -

    method SetLink [line 4692]

    +

    method SetLink [line 4707]

    @@ -19028,7 +19090,7 @@ $page = -1])
    -

    method setListIndentWidth [line 20251]

    +

    method setListIndentWidth [line 20312]

    @@ -19067,7 +19129,7 @@ $width)
    -

    method setLIsymbol [line 20162]

    +

    method setLIsymbol [line 20223]

    @@ -19106,7 +19168,7 @@ $symbol = '!'])
    -

    method SetMargins [line 3067]

    +

    method SetMargins [line 3081]

    @@ -19166,7 +19228,7 @@ $keepmargins = false])
    -

    method setOpenCell [line 20261]

    +

    method setOpenCell [line 20322]

    @@ -19205,7 +19267,7 @@ $isopen)
    -

    method setPage [line 3383]

    +

    method setPage [line 3397]

    @@ -19253,7 +19315,7 @@ $resetmargins = false])
    -

    method setPageBoxes [line 2696]

    +

    method setPageBoxes [line 2710]

    @@ -19328,7 +19390,7 @@ $points = false])
    -

    method setPageBuffer [line 20760]

    +

    method setPageBuffer [line 20821]

    @@ -19379,7 +19441,7 @@ $append = false])
    -

    method setPageFormat [line 2578]

    +

    method setPageFormat [line 2592]

    @@ -19427,7 +19489,7 @@ $orientation = 'P'])
    -

    method setPageMark [line 3583]

    +

    method setPageMark [line 3597]

    @@ -19455,7 +19517,7 @@ $orientation = 'P'])
    -

    method setPageOrientation [line 2745]

    +

    method setPageOrientation [line 2759]

    @@ -19506,7 +19568,7 @@ $bottommargin = ''])
    -

    method setPageUnit [line 1866]

    +

    method setPageUnit [line 1880]

    @@ -19545,7 +19607,7 @@ $unit)
    -

    method setPDFVersion [line 14836]

    +

    method setPDFVersion [line 14855]

    @@ -19584,7 +19646,7 @@ $version = '1.7'])
    -

    method setPrintFooter [line 3691]

    +

    method setPrintFooter [line 3705]

    @@ -19626,7 +19688,7 @@ $value)
    -

    method setPrintHeader [line 3682]

    +

    method setPrintHeader [line 3696]

    @@ -19662,7 +19724,7 @@ $val = true])
    -

    method SetProtection [line 11319]

    +

    method SetProtection [line 11338]

    @@ -19728,7 +19790,7 @@ $pubkeys = null])
    -

    method setRasterizeVectorImages [line 22012]

    +

    method setRasterizeVectorImages [line 22073]

    @@ -19767,7 +19829,7 @@ $mode)
    -

    method SetRightMargin [line 3119]

    +

    method SetRightMargin [line 3133]

    @@ -19809,7 +19871,7 @@ $margin)
    -

    method setRTL [line 2875]

    +

    method setRTL [line 2889]

    @@ -19854,7 +19916,7 @@ $resetx = true])
    -

    method setSignature [line 14476]

    +

    method setSignature [line 14495]

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

    method setSignatureAppearance [line 14509]

    +

    method setSignatureAppearance [line 14528]

    @@ -19992,7 +20054,7 @@ $page = -1])
    -

    method setSpacesRE [line 2850]

    +

    method setSpacesRE [line 2864]

    @@ -20037,7 +20099,7 @@ $re = '/[^\S\xa0]/'])
    -

    method SetSubject [line 3266]

    +

    method SetSubject [line 3280]

    @@ -20079,7 +20141,7 @@ $subject)
    -

    method setSVGStyles [line 22672]

    +

    method setSVGStyles [line 22733]

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

    method setTableHeader [line 3890]

    +

    method setTableHeader [line 3905]

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

    method setTempRTL [line 2901]

    +

    method setTempRTL [line 2915]

    @@ -20230,7 +20292,7 @@ $mode)
    -

    method SetTextColor [line 4167]

    +

    method SetTextColor [line 4182]

    @@ -20290,7 +20352,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 4144]

    +

    method SetTextColorArray [line 4159]

    @@ -20332,7 +20394,7 @@ $color)
    -

    method setTextRenderingMode [line 21793]

    +

    method setTextRenderingMode [line 21854]

    @@ -20383,7 +20445,7 @@ $clip = false])
    -

    method SetTextSpotColor [line 4206]

    +

    method SetTextSpotColor [line 4221]

    @@ -20431,7 +20493,7 @@ $tint = 100])
    -

    method SetTitle [line 3254]

    +

    method SetTitle [line 3268]

    @@ -20473,7 +20535,7 @@ $title)
    -

    method SetTopMargin [line 3104]

    +

    method SetTopMargin [line 3118]

    @@ -20515,7 +20577,7 @@ $margin)
    -

    method setUserRights [line 14443]

    +

    method setUserRights [line 14462]

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

    method setViewerPreferences [line 14849]

    +

    method setViewerPreferences [line 14868]

    @@ -20623,7 +20685,7 @@ $preferences)
    -

    method setVisibility [line 14694]

    +

    method setVisibility [line 14713]

    @@ -20662,7 +20724,7 @@ $v)
    -

    method SetX [line 7298]

    +

    method SetX [line 7313]

    @@ -20710,7 +20772,7 @@ $rtloff = false])
    -

    method SetXY [line 7362]

    +

    method SetXY [line 7377]

    @@ -20764,7 +20826,7 @@ $rtloff = false])
    -

    method SetY [line 7330]

    +

    method SetY [line 7345]

    @@ -20818,7 +20880,7 @@ $rtloff = false])
    -

    method set_mqr [line 6915]

    +

    method set_mqr [line 6930]

    @@ -20857,7 +20919,7 @@ $mqr)
    -

    method Skew [line 11708]

    +

    method Skew [line 11727]

    @@ -20917,7 +20979,7 @@ $y = ''])
    -

    method SkewX [line 11681]

    +

    method SkewX [line 11700]

    @@ -20971,7 +21033,7 @@ $y = ''])
    -

    method SkewY [line 11694]

    +

    method SkewY [line 11713]

    @@ -21025,7 +21087,7 @@ $y = ''])
    -

    method StarPolygon [line 12417]

    +

    method StarPolygon [line 12436]

    @@ -21149,7 +21211,7 @@ $draw_circle:)
    -

    method startPage [line 3537]

    +

    method startPage [line 3551]

    @@ -21203,7 +21265,7 @@ $tocpage = false])
    -

    method startPageGroup [line 14529]

    +

    method startPageGroup [line 14548]

    @@ -21242,7 +21304,7 @@ $page = ''])
    -

    method startSVGElementHandler [line 23270]

    +

    method startSVGElementHandler [line 23331]

    @@ -21296,7 +21358,7 @@ $attribs)
    -

    method startTransaction [line 21548]

    +

    method startTransaction [line 21609]

    @@ -21324,7 +21386,7 @@ $attribs)
    -

    method StartTransform [line 11456]

    +

    method StartTransform [line 11475]

    @@ -21355,7 +21417,7 @@ $attribs)
    -

    method StopTransform [line 11471]

    +

    method StopTransform [line 11490]

    @@ -21386,7 +21448,7 @@ $attribs)
    -

    method stringLeftTrim [line 22139]

    +

    method stringLeftTrim [line 22200]

    @@ -21437,7 +21499,7 @@ $replace = ''])
    -

    method stringRightTrim [line 22152]

    +

    method stringRightTrim [line 22213]

    @@ -21488,7 +21550,7 @@ $replace = ''])
    -

    method stringTrim [line 22165]

    +

    method stringTrim [line 22226]

    @@ -21539,7 +21601,7 @@ $replace = ''])
    -

    method SVGPath [line 22927]

    +

    method SVGPath [line 22988]

    @@ -21590,7 +21652,7 @@ $style = ''])
    -

    method SVGTransform [line 22653]

    +

    method SVGTransform [line 22714]

    @@ -21629,7 +21691,7 @@ $tm)
    -

    method swapMargins [line 20217]

    +

    method swapMargins [line 20278]

    @@ -21668,7 +21730,7 @@ $reverse = true])
    -

    method swapPageBoxCoordinates [line 2722]

    +

    method swapPageBoxCoordinates [line 2736]

    @@ -21707,7 +21769,7 @@ $page)
    -

    method Text [line 4855]

    +

    method Text [line 4870]

    @@ -21839,7 +21901,7 @@ $rtloff = false])
    -

    method TextField [line 13859]

    +

    method TextField [line 13878]

    @@ -21923,7 +21985,7 @@ $js = false])
    -

    method Transform [line 11738]

    +

    method Transform [line 11757]

    @@ -21965,7 +22027,7 @@ $tm)
    -

    method Translate [line 11631]

    +

    method Translate [line 11650]

    @@ -22013,7 +22075,7 @@ $t_y)
    -

    method TranslateX [line 11608]

    +

    method TranslateX [line 11627]

    @@ -22055,7 +22117,7 @@ $t_x)
    -

    method TranslateY [line 11619]

    +

    method TranslateY [line 11638]

    @@ -22097,7 +22159,7 @@ $t_y)
    -

    method unhtmlentities [line 10883]

    +

    method unhtmlentities [line 10902]

    @@ -22136,7 +22198,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 6452]

    +

    method UniArrSubString [line 6467]

    @@ -22190,7 +22252,7 @@ $end = ''])
    -

    method unichr [line 6485]

    +

    method unichr [line 6500]

    @@ -22235,7 +22297,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 6473]

    +

    method UTF8ArrayToUniArray [line 6488]

    @@ -22277,7 +22339,7 @@ $ta)
    -

    method UTF8ArrSubString [line 6429]

    +

    method UTF8ArrSubString [line 6444]

    @@ -22328,7 +22390,7 @@ $end = ''])
    -

    method UTF8ArrToLatin1 [line 10608]

    +

    method UTF8ArrToLatin1 [line 10627]

    @@ -22370,7 +22432,7 @@ $unicode)
    -

    method utf8Bidi [line 12639]

    +

    method utf8Bidi [line 12658]

    @@ -22427,7 +22489,7 @@ $forcertl = false])
    -

    method utf8StrArrRev [line 12625]

    +

    method utf8StrArrRev [line 12644]

    @@ -22487,7 +22549,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 10443]

    +

    method UTF8StringToArray [line 10462]

    @@ -22553,7 +22615,7 @@ $str)
    -

    method utf8StrRev [line 12610]

    +

    method utf8StrRev [line 12629]

    @@ -22607,7 +22669,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 10578]

    +

    method UTF8ToLatin1 [line 10597]

    @@ -22649,7 +22711,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 10562]

    +

    method UTF8ToUTF16BE [line 10581]

    @@ -22700,7 +22762,7 @@ $setbom = true])
    -

    method Write [line 6072]

    +

    method Write [line 6087]

    @@ -22796,7 +22858,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 15847]

    +

    method write1DBarcode [line 15869]

    - + @@ -22886,7 +22948,7 @@ $align = ''])
    -

    method write2DBarcode [line 16154]

    +

    method write2DBarcode [line 16205]

    @@ -22873,7 +22935,7 @@ $align = ''])
    array   $style  array of options:
    • boolean $style['border'] if true prints a border
    • 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['fitwidth'] if true reduce the width to fit the barcode + padding width (stretch doesn't work with this option enabled).
    • string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
    		array of options:
    string  
    @@ -22976,7 +23038,7 @@ $distort = false])
    -

    method writeBarcode [line 16100]

    +

    method writeBarcode [line 16150]

    @@ -23066,7 +23128,7 @@ $code)
    -

    method writeDiskCache [line 20670]

    +

    method writeDiskCache [line 20731]

    @@ -23123,7 +23185,7 @@ $file)
    -

    method writeHTML [line 17576]

    +

    method writeHTML [line 17637]

    @@ -23189,7 +23251,7 @@ $align = ''])
    -

    method writeHTMLCell [line 17560]

    +

    method writeHTMLCell [line 17621]

    @@ -23291,7 +23353,7 @@ $autopadding = true])
    -

    method _addfield [line 13431]

    +

    method _addfield [line 13450]

    @@ -23369,7 +23431,7 @@ $prop)
    -

    method _AES [line 11107]

    +

    method _AES [line 11126]

    @@ -23420,7 +23482,7 @@ $text)
    -

    method _beginpage [line 10112]

    +

    method _beginpage [line 10131]

    @@ -23465,7 +23527,7 @@ $format = ''])
    -

    method _datastring [line 10293]

    +

    method _datastring [line 10312]

    @@ -23510,7 +23572,7 @@ $n = 0])
    -

    method _datestring [line 10308]

    +

    method _datestring [line 10327]

    @@ -23552,7 +23614,7 @@ $n = 0])
    -

    method _destroy [line 7571]

    +

    method _destroy [line 7586]

    @@ -23597,7 +23659,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 7599]

    +

    method _dochecks [line 7614]

    @@ -23622,7 +23684,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 10219]

    +

    method _dolinethrough [line 10238]

    @@ -23670,7 +23732,7 @@ $txt)
    -

    method _dolinethroughw [line 10232]

    +

    method _dolinethroughw [line 10251]

    @@ -23727,7 +23789,7 @@ $txt)
    -

    method _dooverline [line 10245]

    +

    method _dooverline [line 10264]

    @@ -23778,7 +23840,7 @@ $txt)
    -

    method _dooverlinew [line 10258]

    +

    method _dooverlinew [line 10277]

    @@ -23829,7 +23891,7 @@ $w)
    -

    method _dounderline [line 10194]

    +

    method _dounderline [line 10213]

    @@ -23877,7 +23939,7 @@ $txt)
    -

    method _dounderlinew [line 10207]

    +

    method _dounderlinew [line 10226]

    @@ -23928,7 +23990,7 @@ $w)
    -

    method _encrypt_data [line 10916]

    +

    method _encrypt_data [line 10935]

    @@ -23976,7 +24038,7 @@ $s)
    -

    method _enddoc [line 10024]

    +

    method _enddoc [line 10043]

    @@ -24001,7 +24063,7 @@ $s)
    -

    method _endpage [line 10156]

    +

    method _endpage [line 10175]

    @@ -24026,7 +24088,7 @@ $s)
    -

    method _escape [line 10281]

    +

    method _escape [line 10300]

    @@ -24065,7 +24127,7 @@ $s)
    -

    method _escapetext [line 10336]

    +

    method _escapetext [line 10355]

    @@ -24107,7 +24169,7 @@ $s)
    -

    method _freadint [line 10270]

    +

    method _freadint [line 10289]

    @@ -24146,7 +24208,7 @@ $f)
    -

    method _generateencryptionkey [line 11194]

    +

    method _generateencryptionkey [line 11213]

    @@ -24200,7 +24262,7 @@ $protection)
    -

    method _getannotsrefs [line 7847]

    +

    method _getannotsrefs [line 7862]

    @@ -24242,7 +24304,7 @@ $n)
    -

    method _getBYTE [line 8571]

    +

    method _getBYTE [line 8586]

    @@ -24305,7 +24367,7 @@ $offset)
    -

    method _getfontpath [line 7615]

    +

    method _getfontpath [line 7630]

    @@ -24330,7 +24392,7 @@ $offset)
    -

    method _getobj [line 10178]

    +

    method _getobj [line 10197]

    @@ -24372,7 +24434,7 @@ $objid = ''])
    -

    method _getrawstream [line 10356]

    +

    method _getrawstream [line 10375]

    @@ -24420,7 +24482,7 @@ $n = 0])
    -

    method _getSHORT [line 8556]

    +

    method _getSHORT [line 8571]

    @@ -24483,7 +24545,7 @@ $offset)
    -

    method _getstream [line 10371]

    +

    method _getstream [line 10390]

    @@ -24528,7 +24590,7 @@ $n = 0])
    -

    method _getTrueTypeFontSubset [line 8586]

    +

    method _getTrueTypeFontSubset [line 8601]

    @@ -24579,7 +24641,7 @@ $subsetchars)
    -

    method _getTTFtableChecksum [line 8917]

    +

    method _getTTFtableChecksum [line 8932]

    @@ -24630,7 +24692,7 @@ $length)
    -

    method _getULONG [line 8526]

    +

    method _getULONG [line 8541]

    @@ -24693,7 +24755,7 @@ $offset)
    -

    method _getUSHORT [line 8541]

    +

    method _getUSHORT [line 8556]

    @@ -24756,7 +24818,7 @@ $offset)
    -

    method _JScolor [line 13407]

    +

    method _JScolor [line 13426]

    @@ -24798,7 +24860,7 @@ $color)
    -

    method _md5_16 [line 11125]

    +

    method _md5_16 [line 11144]

    @@ -24843,7 +24905,7 @@ $str)
    -

    method _newobj [line 10166]

    +

    method _newobj [line 10185]

    @@ -24871,7 +24933,7 @@ $str)
    -

    method _objectkey [line 10897]

    +

    method _objectkey [line 10916]

    @@ -24913,7 +24975,7 @@ $n)
    -

    method _out [line 10391]

    +

    method _out [line 10410]

    @@ -24949,7 +25011,7 @@ $s)
    -

    method _outCurve [line 11910]

    +

    method _outCurve [line 11929]

    @@ -25018,7 +25080,7 @@ $y3)
    -

    method _outCurveV [line 11924]

    +

    method _outCurveV [line 11943]

    @@ -25075,7 +25137,7 @@ $y3)
    -

    method _outCurveY [line 11940]

    +

    method _outCurveY [line 11959]

    @@ -25144,7 +25206,7 @@ $y2)
    -

    method _outellipticalarc [line 12136]

    +

    method _outellipticalarc [line 12155]

    @@ -25252,7 +25314,7 @@ $angf:)
    -

    method _outLine [line 11880]

    +

    method _outLine [line 11899]

    @@ -25297,7 +25359,7 @@ $y)
    -

    method _outPoint [line 11868]

    +

    method _outPoint [line 11887]

    @@ -25342,7 +25404,7 @@ $y)
    -

    method _outRect [line 11894]

    +

    method _outRect [line 11913]

    @@ -25405,7 +25467,7 @@ $op)
    -

    method _Ovalue [line 11138]

    +

    method _Ovalue [line 11157]

    @@ -25456,7 +25518,7 @@ $owner_pass)
    -

    method _parsejpeg [line 7007]

    +

    method _parsejpeg [line 7022]

    @@ -25495,7 +25557,7 @@ $file)
    -

    method _parsepng [line 7033]

    +

    method _parsepng [line 7048]

    @@ -25534,7 +25596,7 @@ $file)
    -

    method _putannotsobjs [line 7875]

    +

    method _putannotsobjs [line 7890]

    @@ -25565,7 +25627,7 @@ $file)
    -

    method _putannotsrefs [line 7835]

    +

    method _putannotsrefs [line 7850]

    @@ -25610,7 +25672,7 @@ $n)
    -

    method _putAPXObject [line 8486]

    +

    method _putAPXObject [line 8501]

    @@ -25664,7 +25726,7 @@ $stream = ''])
    -

    method _putbookmarks [line 13244]

    +

    method _putbookmarks [line 13263]

    @@ -25695,7 +25757,7 @@ $stream = ''])
    -

    method _putcatalog [line 9854]

    +

    method _putcatalog [line 9873]

    @@ -25723,7 +25785,7 @@ $stream = ''])
    -

    method _putcidfont0 [line 9581]

    +

    method _putcidfont0 [line 9596]

    @@ -25765,7 +25827,7 @@ $font)
    -

    method _putEmbeddedFiles [line 4813]

    +

    method _putEmbeddedFiles [line 4828]

    @@ -25796,7 +25858,7 @@ $font)
    -

    method _putencryption [line 10940]

    +

    method _putencryption [line 10959]

    @@ -25827,7 +25889,7 @@ $font)
    -

    method _putextgstates [line 14759]

    +

    method _putextgstates [line 14778]

    @@ -25866,7 +25928,7 @@ $gs)
    -

    method _putfonts [line 9038]

    +

    method _putfonts [line 9053]

    @@ -25894,7 +25956,7 @@ $gs)
    -

    method _putfontwidths [line 8939]

    +

    method _putfontwidths [line 8954]

    @@ -25945,7 +26007,7 @@ $cidoffset = 0])
    -

    method _putheader [line 10016]

    +

    method _putheader [line 10035]

    @@ -25970,7 +26032,7 @@ $cidoffset = 0])
    -

    method _putimages [line 9651]

    +

    method _putimages [line 9666]

    @@ -25995,7 +26057,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 9807]

    +

    method _putinfo [line 9826]

    @@ -26023,7 +26085,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 13353]

    +

    method _putjavascript [line 13372]

    @@ -26054,7 +26116,7 @@ $cidoffset = 0])
    -

    method _putocg [line 14679]

    +

    method _putocg [line 14698]

    @@ -26082,7 +26144,7 @@ $cidoffset = 0])
    -

    method _putpages [line 7626]

    +

    method _putpages [line 7641]

    @@ -26107,7 +26169,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 9725]

    +

    method _putresourcedict [line 9740]

    @@ -26132,7 +26194,7 @@ $cidoffset = 0])
    -

    method _putresources [line 9786]

    +

    method _putresources [line 9805]

    @@ -26157,7 +26219,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 15313]

    +

    method _putshaders [line 15332]

    @@ -26188,7 +26250,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 14367]

    +

    method _putsignature [line 14386]

    @@ -26219,7 +26281,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 9707]

    +

    method _putspotcolors [line 9722]

    @@ -26247,7 +26309,7 @@ $cidoffset = 0])
    -

    method _putstream [line 10382]

    +

    method _putstream [line 10401]

    diff --git a/examples/example_027.php b/examples/example_027.php index 2d864a8..7720912 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-21 +// Last Update : 2010-08-23 // // Description : Example 027 for TCPDF class // 1D Barcodes @@ -82,8 +82,9 @@ $pdf->AddPage(); $style = array( 'position' => '', 'align' => 'C', - 'fitwidth' => true, 'stretch' => false, + 'fitwidth' => true, + 'cellfitalign' => '', 'border' => true, 'padding' => 'auto', 'fgcolor' => array(0,0,0), @@ -280,69 +281,92 @@ $pdf->AddPage(); // set a background color $style['bgcolor'] = array(255,255,240); -$style['fgcolor'] = array(128,0,0); +$style['fgcolor'] = array(127,0,0); // Left position $style['position'] = 'L'; -$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Center position $style['position'] = 'C'; -$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Right position $style['position'] = 'R'; -$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . -$style['fgcolor'] = array(0,128,0); +$style['fgcolor'] = array(0,127,0); $style['position'] = ''; $style['stretch'] = false; // disable stretch $style['fitwidth'] = false; // disable fitwidth // Left alignment $style['align'] = 'L'; -$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Center alignment $style['align'] = 'C'; -$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Right alignment $style['align'] = 'R'; -$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . -$style['fgcolor'] = array(0,0,128); -$style['fitwidth'] = true; // enable fitwidth +$style['fgcolor'] = array(0,64,127); +$style['position'] = ''; +$style['stretch'] = false; // disable stretch +$style['fitwidth'] = true; // disable fitwidth + +// Left alignment +$style['cellfitalign'] = 'L'; +$pdf->write1DBarcode('LEFT', 'C128A', 105, '', 90, 15, 0.4, $style, 'N'); + +$pdf->Ln(2); + +// Center alignment +$style['cellfitalign'] = 'C'; +$pdf->write1DBarcode('CENTER', 'C128A', 105, '', 90, 15, 0.4, $style, 'N'); + +$pdf->Ln(2); + +// Right alignment +$style['cellfitalign'] = 'R'; +$pdf->write1DBarcode('RIGHT', 'C128A', 105, '', 90, 15, 0.4, $style, 'N'); + +$pdf->Ln(2); +// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + +$style['fgcolor'] = array(127,0,127); // Left alignment $style['position'] = 'L'; -$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Center alignment $style['position'] = 'C'; -$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 15, 0.4, $style, 'N'); -$pdf->Ln(); +$pdf->Ln(2); // Right alignment $style['position'] = 'R'; -$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 15, 0.4, $style, 'N'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // TEST BARCODE STYLE @@ -351,8 +375,9 @@ $pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); $style = array( 'position' => '', 'align' => '', - 'fitwidth' => false, 'stretch' => true, + 'fitwidth' => false, + 'cellfitalign' => '', 'border' => true, 'padding' => 'auto', 'fgcolor' => array(0,0,128), diff --git a/tcpdf.php b/tcpdf.php index c87461a..6482706 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.012 + * @version 5.8.013 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1544,6 +1544,20 @@ if (!class_exists('TCPDF', false)) { */ protected $default_graphic_vars = array(); + /** + * @var Array of external XObjects templates + * @access protected + * @since 5.8.013 (2010-08-23) + */ + protected $tpls = array(); + + /** + * @var String prefix for external XObjects templates + * @access protected + * @since 5.8.013 (2010-08-23) + */ + protected $tplprefix = '/TPL'; + /** * @var directory used for the last SVG image * @access protected @@ -1615,11 +1629,11 @@ if (!class_exists('TCPDF', false)) { protected $svgtext = ''; /** - * @var svg text-achor property + * @var svg text properties * @access protected - * @since 5.8.012 (2010-08-22) + * @since 5.8.013 (2010-08-23) */ - protected $svgtextanchor = 'start'; + protected $svgtextmode = array(); /** * @var array of hinheritable SVG properties @@ -3772,8 +3786,9 @@ if (!class_exists('TCPDF', false)) { $style = array( 'position' => $this->rtl?'R':'L', 'align' => $this->rtl?'R':'L', - 'fitwidth' => true, 'stretch' => false, + 'fitwidth' => true, + 'cellfitalign' => '', 'border' => false, 'padding' => 0, 'fgcolor' => array(0,0,0), @@ -9736,6 +9751,10 @@ if (!class_exists('TCPDF', false)) { $info = $this->getImageBuffer($file); $out .= ' /I'.$info['i'].' '.$info['n'].' 0 R'; } + // support for external XObject templates + foreach($this->tpls as $tplidx => $tpl) { + $out .= sprintf(' %s%u %u 0 R', $this->tplprefix, $tplidx, $tpl['n']); + } $out .= ' >>'; // visibility $out .= ' /Properties <n_ocg_print.' 0 R /OC2 '.$this->n_ocg_view.' 0 R>>'; @@ -15838,7 +15857,10 @@ if (!class_exists('TCPDF', false)) { * @param int $w width in user units (empty string = remaining page width) * @param int $h height in user units (empty string = remaining page height) * @param float $xres width of the smallest bar in user units (empty string = default value = 0.4mm) - * @param array $style array of options:
    • boolean $style['border'] if true prints a border
    • 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['fitwidth'] if true reduce the width to fit the barcode + padding width (stretch doesn't work with this option enabled).
    • string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
    + * @param array $style array of options:
      + +
    • boolean $style['border'] if true prints a border
      • +
    • int $style['padding'] padding to leave around the barcode (minimum distance between the barcode and the containing cell border) 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 (set to 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'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.
    • string $style['align'] horizontal position of the barcode 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 $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.
    • string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.
    * @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) @@ -15865,9 +15887,6 @@ if (!class_exists('TCPDF', false)) { $style['position'] = ''; $style['stretch'] = true; } - if (!isset($style['align'])) { - $style['align'] = 'C'; - } if (!isset($style['fitwidth'])) { if (!isset($style['stretch'])) { $style['fitwidth'] = true; @@ -15916,9 +15935,9 @@ if (!class_exists('TCPDF', false)) { } if (($w === '') OR ($w <= 0)) { if ($this->rtl) { - $w = $this->x - $this->lMargin; + $w = $x - $this->lMargin; } else { - $w = $this->w - $this->rMargin - $this->x; + $w = $this->w - $this->rMargin - $x; } } // horizontal padding @@ -15946,7 +15965,35 @@ if (!class_exists('TCPDF', false)) { } } if ($style['fitwidth']) { + $wold = $w; $w = (($arrcode['maxw'] * $xres) + (2 * $hpadding)); + if (isset($style['cellfitalign'])) { + switch ($style['cellfitalign']) { + case 'L': { + if ($this->rtl) { + $x -= ($wold - $w); + } + break; + } + case 'R': { + if (!$this->rtl) { + $x += ($wold - $w); + } + break; + } + case 'C': { + if ($this->rtl) { + $x -= (($wold - $w) / 2); + } else { + $x += (($wold - $w) / 2); + } + break; + } + default : { + break; + } + } + } } // vertical padding $vpadding = $hpadding; @@ -15998,6 +16045,9 @@ if (!class_exists('TCPDF', false)) { $this->img_rb_x = $xpos + $w; } $xpos_rect = $xpos; + if (!isset($style['align'])) { + $style['align'] = 'C'; + } switch ($style['align']) { case 'L': { $xpos = $xpos_rect + $hpadding; @@ -16103,8 +16153,9 @@ if (!class_exists('TCPDF', false)) { $newstyle = array( 'position' => '', 'align' => '', - 'fitwidth' => false, 'stretch' => false, + 'fitwidth' => false, + 'cellfitalign' => '', 'border' => false, 'padding' => 0, 'fgcolor' => array(0,0,0), @@ -16833,6 +16884,14 @@ if (!class_exists('TCPDF', false)) { protected function getHtmlDomArray($html) { // array of CSS styles ( selector => properties). $css = array(); + // get CSS array defined at previous call + $matches = array(); + if (preg_match_all('/([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) { + if (isset($matches[1][0])) { + $css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0]))); + } + $html = preg_replace('/(.*?)<\/cssarray>/isU', '', $html); + } // extract external CSS files $matches = array(); if (preg_match_all('/]*)>/isU', $html, $matches) > 0) { @@ -16868,6 +16927,8 @@ if (!class_exists('TCPDF', false)) { } } } + // create a special tag to contain the CSS array (used for table content) + $csstagarray = ''.htmlentities(serialize($css)).''; // remove head and style blocks $html = preg_replace('/]*)>(.*?)<\/head>/siU', '', $html); $html = preg_replace('/]*)>([^\<]*)<\/style>/isU', '', $html); @@ -17031,7 +17092,7 @@ if (!class_exists('TCPDF', false)) { $dom[($dom[($dom[$key]['parent'])]['parent'])]['cols'] = $dom[($dom[$key]['parent'])]['cols']; } if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) { - $dom[($dom[$key]['parent'])]['content'] = ''; + $dom[($dom[$key]['parent'])]['content'] = $csstagarray; for ($i = ($dom[$key]['parent'] + 1); $i < $key; ++$i) { $dom[($dom[$key]['parent'])]['content'] .= $a[$dom[$i]['elkey']]; } @@ -23624,9 +23685,18 @@ if (!class_exists('TCPDF', false)) { $svgstyle['text-color'] = $svgstyle['fill']; $this->svgtext = ''; if (isset($svgstyle['text-anchor'])) { - $this->svgtextanchor = $svgstyle['text-anchor']; + $this->svgtextmode['text-anchor'] = $svgstyle['text-anchor']; } else { - $this->svgtextanchor = 'start'; + $this->svgtextmode['text-anchor'] = 'start'; + } + if (isset($svgstyle['direction'])) { + if ($svgstyle['direction'] == 'rtl') { + $this->svgtextmode['rtl'] = true; + } else { + $this->svgtextmode['rtl'] = false; + } + } else { + $this->svgtextmode['rtl'] = false; } $this->StartTransform(); $this->SVGTransform($tm); @@ -23684,16 +23754,17 @@ if (!class_exists('TCPDF', false)) { case 'tspan': { // print text $text = $this->stringTrim($this->svgtext); - if ($this->svgtextanchor != 'start') { + if ($this->svgtextmode['text-anchor'] != 'start') { $textlen = $this->GetStringWidth($text); - if ($this->svgtextanchor == 'end') { - if ($this->rtl) { + // check if string is RTL text + if ($this->svgtextmode['text-anchor'] == 'end') { + if ($this->svgtextmode['rtl']) { $this->x += $textlen; } else { $this->x -= $textlen; } - } elseif ($this->svgtextanchor == 'middle') { - if ($this->rtl) { + } elseif ($this->svgtextmode['text-anchor'] == 'middle') { + if ($this->svgtextmode['rtl']) { $this->x += ($textlen / 2); } else { $this->x -= ($textlen / 2);
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 51bc6c1..2c595c8 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26292,7 +26354,7 @@ $n = 0])
    -

    method _puttruetypeunicode [line 9194]

    +

    method _puttruetypeunicode [line 9209]

    diff --git a/doc/index.html b/doc/index.html index 51bc6c1..2c595c8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/errors.html b/doc/errors.html index a9e1fa6..dfcb4de 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Sun, 22 Aug 2010 11:57:23 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:18 +0200 by phpDocumentor 1.4.3
    @@ -26334,7 +26396,7 @@ $font)
    -

    method _putviewerpreferences [line 9945]

    +

    method _putviewerpreferences [line 9964]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index a83a947..c97e0f1 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1631,8 +1631,8 @@
    in file tcpdf.php, variable TCPDF::$svgstyles
    $svgtext
    in file tcpdf.php, variable TCPDF::$svgtext
    -
    $svgtextanchor
    -
    in file tcpdf.php, variable TCPDF::$svgtextanchor
    +
    $svgtextmode
    +
    in file tcpdf.php, variable TCPDF::$svgtextmode
    $svgunit
    in file tcpdf.php, variable TCPDF::$svgunit
    Scale
    @@ -1907,6 +1907,10 @@
    in file tcpdf.php, variable TCPDF::$tmprtl
    $tocpage
    in file tcpdf.php, variable TCPDF::$tocpage
    +
    $tplprefix
    +
    in file tcpdf.php, variable TCPDF::$tplprefix
    +
    $tpls
    +
    in file tcpdf.php, variable TCPDF::$tpls
    $transfmatrix
    in file tcpdf.php, variable TCPDF::$transfmatrix
        Array of transformation matrix
    $transfmatrix_key
    @@ -2078,7 +2082,7 @@ top
    - Documentation generated on Sun, 22 Aug 2010 11:57:16 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:11 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 0b88aa3..5a3e9ae 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1435,8 +1435,8 @@
    in file tcpdf.php, variable TCPDF::$svgstyles
    $svgtext
    in file tcpdf.php, variable TCPDF::$svgtext
    -
    $svgtextanchor
    -
    in file tcpdf.php, variable TCPDF::$svgtextanchor
    +
    $svgtextmode
    +
    in file tcpdf.php, variable TCPDF::$svgtextmode
    $svgunit
    in file tcpdf.php, variable TCPDF::$svgunit
    Scale
    @@ -1711,6 +1711,10 @@
    in file tcpdf.php, variable TCPDF::$tmprtl
    $tocpage
    in file tcpdf.php, variable TCPDF::$tocpage
    +
    $tplprefix
    +
    in file tcpdf.php, variable TCPDF::$tplprefix
    +
    $tpls
    +
    in file tcpdf.php, variable TCPDF::$tpls
    $transfmatrix
    in file tcpdf.php, variable TCPDF::$transfmatrix
        Array of transformation matrix
    $transfmatrix_key
    @@ -2046,7 +2050,7 @@ top
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26368,7 +26430,7 @@ $font)
    -

    method _RC4 [line 11061]

    +

    method _RC4 [line 11080]

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



    - Documentation generated on Sun, 22 Aug 2010 11:57:23 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:18 +0200 by phpDocumentor 1.4.3
    @@ -26419,7 +26481,7 @@ $text)
    -

    method _setGDImageTransparency [line 6986]

    +

    method _setGDImageTransparency [line 7001]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 956cadd..79a862b 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 ab0a4a4..07d4696 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26464,7 +26526,7 @@ $image)
    -

    method _textstring [line 10320]

    +

    method _textstring [line 10339]

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

    PDF417 (ISO

    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +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 e762edc..21a8132 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26509,7 +26571,7 @@ $n = 0])
    -

    method _toJPEG [line 6949]

    +

    method _toJPEG [line 6964]

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



    - Documentation generated on Sun, 22 Aug 2010 11:57:23 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:18 +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 6e3dd74..8fad2da 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26551,7 +26613,7 @@ $file)
    -

    method _toPNG [line 6968]

    +

    method _toPNG [line 6983]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index f3d746e..6a7984e 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 2ed6947..83f3499 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26596,7 +26658,7 @@ $file)
    -

    method _Uvalue [line 11167]

    +

    method _Uvalue [line 11186]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 9597c45..a61acad 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
    - Documentation generated on Sun, 22 Aug 2010 11:57:17 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:12 +0200 by phpDocumentor 1.4.3
    @@ -26633,7 +26695,7 @@ $file)
    - Documentation generated on Sun, 22 Aug 2010 11:57:18 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:13 +0200 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  5.8.012version:  5.8.013
    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.012 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.8.013 (http://www.tcpdf.org)'
    @@ -124,7 +124,7 @@ unicode data

    - Documentation generated on Sun, 22 Aug 2010 11:57:18 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 23 Aug 2010 12:50:13 +0200 by phpDocumentor 1.4.3