From 00455b22a719c573487236d66a83c76b66a5670b Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 28 Apr 2009 10:12:11 +0200 Subject: [PATCH] 4.6.006 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 634 +++++++++--------- doc/com-tecnick-tcpdf/TCPDFBarcode.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/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 4 +- doc/elementindex_com-tecnick-tcpdf.html | 4 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 36 +- 16 files changed, 382 insertions(+), 328 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 5e2f5bc..6ae5305 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.6.006 (2009-04-28) + - Support for "..." was added. + - By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces). + 4.6.005 (2009-04-25) - Points (pt) conversion in getHTMLUnitToUnits() was fixed. - Default tcpdf.pem certificate file was added. diff --git a/README.TXT b/README.TXT index 56187ac..63487fb 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.6.005 -Release date: 2009-04-25 +Version: 4.6.006 +Release date: 2009-04-28 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 8b81bda..6ddb76e 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 9d9be17..43d3291 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

  • $print_footer
  • $print_header
  • $Pvalue
    • +
  • $re_spaces
  • $rMargin
  • $rtl
  • $sign
    • @@ -586,7 +587,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.005 + version:  4.6.006 link:  http://www.tcpdf.org @@ -4308,6 +4309,33 @@ This is a PHP class for generating PDF documents without requiring external exte access:  protected + + +
    +
    + + + + + +
    Type:  mixed
    +


    +
    [ Top ]

    + +

    +

    $re_spaces =  '/[\s\p{Z}\p{Lo}]/'

    +

    [line 1295]

    + Regular expression used to find blank characters used for word-wrapping.



    +

    Tags:

    +
    + + + + + + + +
    since:  4.6.006 (2009-04-28)
    access:  protected

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

    constructor __construct [line 1307]

    +

    constructor __construct [line 1314]

    @@ -5262,7 +5290,7 @@ $diskcache = false])
    -

    destructor __destruct [line 1416]

    +

    destructor __destruct [line 1434]

    @@ -5290,7 +5318,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 3280]

    +

    method AcceptPageBreak [line 3298]

    @@ -5321,7 +5349,7 @@ $diskcache = false])
    -

    method addExtGState [line 9486]

    +

    method addExtGState [line 9504]

    @@ -5357,7 +5385,7 @@ $parms)
    -

    method AddFont [line 2878]

    +

    method AddFont [line 2896]

    @@ -5414,7 +5442,7 @@ $fontfile = ''])
    -

    method addHtmlLink [line 6857]

    +

    method addHtmlLink [line 6875]

    @@ -5483,7 +5511,7 @@ $style = -1])
    -

    method addHTMLVertSpace [line 12603]

    +

    method addHTMLVertSpace [line 12621]

    @@ -5549,7 +5577,7 @@ $closing = false])
    -

    method AddLink [line 3100]

    +

    method AddLink [line 3118]

    @@ -5580,7 +5608,7 @@ $closing = false])
    -

    method AddPage [line 2121]

    +

    method AddPage [line 2139]

    @@ -5628,7 +5656,7 @@ $format = ''])
    -

    method AddSpotColor [line 2511]

    +

    method AddSpotColor [line 2529]

    @@ -5694,7 +5722,7 @@ $k)
    -

    method addTOC [line 13625]

    +

    method addTOC [line 13643]

    @@ -5748,7 +5776,7 @@ $filler = '.'])
    -

    method AliasNbPages [line 9294]

    +

    method AliasNbPages [line 9312]

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

    method AliasNumPage [line 9321]

    +

    method AliasNumPage [line 9339]

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

    method Annotation [line 3156]

    +

    method Annotation [line 3174]

    @@ -5907,7 +5935,7 @@ $spaces = 0])
    -

    method arrUTF8ToUTF16BE [line 6759]

    +

    method arrUTF8ToUTF16BE [line 6777]

    @@ -5982,7 +6010,7 @@ $setbom = true])
    -

    method Bookmark [line 8865]

    +

    method Bookmark [line 8883]

    @@ -6036,7 +6064,7 @@ $page = ''])
    -

    method Button [line 9147]

    +

    method Button [line 9165]

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

    method Cell [line 3334]

    +

    method Cell [line 3352]

    @@ -6198,7 +6226,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 9127]

    +

    method CheckBox [line 9145]

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

    method checkPageBreak [line 3291]

    +

    method checkPageBreak [line 3309]

    @@ -6294,7 +6322,7 @@ $h)
    -

    method Circle [line 7971]

    +

    method Circle [line 7989]

    @@ -6393,7 +6421,7 @@ $afinish:)
    -

    method Clip [line 9749]

    +

    method Clip [line 9767]

    @@ -6453,7 +6481,7 @@ $h)
    -

    method Close [line 2015]

    +

    method Close [line 2033]

    @@ -6484,7 +6512,7 @@ $h)
    -

    method closeHTMLTagHandler [line 12279]

    +

    method closeHTMLTagHandler [line 12297]

    @@ -6538,7 +6566,7 @@ $dom)
    -

    method ComboBox [line 9108]

    +

    method ComboBox [line 9126]

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

    method commitTransaction [line 13782]

    +

    method commitTransaction [line 13800]

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

    method convertHTMLColorToDec [line 6890]

    +

    method convertHTMLColorToDec [line 6908]

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

    method CoonsPatchMesh [line 9669]

    +

    method CoonsPatchMesh [line 9687]

    @@ -6767,7 +6795,7 @@ $coords_max = 1])
    -

    method Curve [line 7746]

    +

    method Curve [line 7764]

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

    method deletePage [line 13485]

    +

    method deletePage [line 13503]

    @@ -6911,7 +6939,7 @@ $page)
    -

    method Ellipse [line 7867]

    +

    method Ellipse [line 7885]

    @@ -7028,7 +7056,7 @@ $afinish:)
    -

    method empty_string [line 13829]

    +

    method empty_string [line 13847]

    @@ -7070,7 +7098,7 @@ $str)
    -

    method endPage [line 2140]

    +

    method endPage [line 2158]

    @@ -7101,7 +7129,7 @@ $str)
    -

    method Error [line 1987]

    +

    method Error [line 2005]

    @@ -7140,7 +7168,7 @@ $msg)
    -

    method Footer [line 2361]

    +

    method Footer [line 2379]

    @@ -7165,7 +7193,7 @@ $msg)
    -

    method formatPageNumber [line 9398]

    +

    method formatPageNumber [line 9416]

    @@ -7204,7 +7232,7 @@ $num)
    -

    method formatTOCPageNumber [line 9410]

    +

    method formatTOCPageNumber [line 9428]

    @@ -7246,7 +7274,7 @@ $num)
    -

    method GetAbsX [line 4821]

    +

    method GetAbsX [line 4839]

    @@ -7277,7 +7305,7 @@ $num)
    -

    method getAliasNbPages [line 9306]

    +

    method getAliasNbPages [line 9324]

    @@ -7308,7 +7336,7 @@ $num)
    -

    method getAliasNumPage [line 9334]

    +

    method getAliasNumPage [line 9352]

    @@ -7339,7 +7367,7 @@ $num)
    -

    method GetArrStringWidth [line 2790]

    +

    method GetArrStringWidth [line 2808]

    @@ -7408,7 +7436,7 @@ $arr)
    -

    method getBarcode [line 10217]

    +

    method getBarcode [line 10235]

    @@ -7436,7 +7464,7 @@ $arr)
    -

    method getBorderMode [line 3779]

    +

    method getBorderMode [line 3797]

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

    method getBreakMargin [line 1718]

    +

    method getBreakMargin [line 1736]

    @@ -7532,7 +7560,7 @@ $pagenum = ''])
    -

    method getBuffer [line 13171]

    +

    method getBuffer [line 13189]

    @@ -7563,7 +7591,7 @@ $pagenum = ''])
    -

    method getCellCode [line 3386]

    +

    method getCellCode [line 3404]

    @@ -7659,7 +7687,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 9572]

    +

    method getCellHeightRatio [line 9590]

    @@ -7684,7 +7712,7 @@ $ignore_min_height = false])
    -

    method GetCharWidth [line 2817]

    +

    method GetCharWidth [line 2835]

    @@ -7729,7 +7757,7 @@ $char)
    -

    method getFontBuffer [line 13331]

    +

    method getFontBuffer [line 13349]

    @@ -7771,7 +7799,7 @@ $font)
    -

    method getFontFamily [line 10693]

    +

    method getFontFamily [line 10711]

    @@ -7802,7 +7830,7 @@ $font)
    -

    method getFontSize [line 10673]

    +

    method getFontSize [line 10691]

    @@ -7833,7 +7861,7 @@ $font)
    -

    method getFontSizePt [line 10683]

    +

    method getFontSizePt [line 10701]

    @@ -7864,7 +7892,7 @@ $font)
    -

    method getFontsList [line 2856]

    +

    method getFontsList [line 2874]

    @@ -7892,7 +7920,7 @@ $font)
    -

    method getFontStyle [line 10703]

    +

    method getFontStyle [line 10721]

    @@ -7923,7 +7951,7 @@ $font)
    -

    method getFooterFont [line 6820]

    +

    method getFooterFont [line 6838]

    @@ -7951,7 +7979,7 @@ $font)
    -

    method getFooterMargin [line 2275]

    +

    method getFooterMargin [line 2293]

    @@ -7979,7 +8007,7 @@ $font)
    -

    method getGDgamma [line 4764]

    +

    method getGDgamma [line 4782]

    @@ -8018,7 +8046,7 @@ $v)
    -

    method getGraphicVars [line 13039]

    +

    method getGraphicVars [line 13057]

    @@ -8049,7 +8077,7 @@ $v)
    -

    method getGroupPageNo [line 9347]

    +

    method getGroupPageNo [line 9365]

    @@ -8074,7 +8102,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 9357]

    +

    method getGroupPageNoFormatted [line 9375]

    @@ -8105,7 +8133,7 @@ $v)
    -

    method getHeaderData [line 2230]

    +

    method getHeaderData [line 2248]

    @@ -8133,7 +8161,7 @@ $v)
    -

    method getHeaderFont [line 6800]

    +

    method getHeaderFont [line 6818]

    @@ -8161,7 +8189,7 @@ $v)
    -

    method getHeaderMargin [line 2255]

    +

    method getHeaderMargin [line 2273]

    @@ -8189,7 +8217,7 @@ $v)
    -

    method getHtmlDomArray [line 10739]

    +

    method getHtmlDomArray [line 10757]

    @@ -8228,7 +8256,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 12758]

    +

    method getHTMLUnitToUnits [line 12776]

    @@ -8294,7 +8322,7 @@ $point)
    -

    method getImageBuffer [line 13273]

    +

    method getImageBuffer [line 13291]

    @@ -8336,7 +8364,7 @@ $image)
    -

    method getImageRBX [line 2301]

    +

    method getImageRBX [line 2319]

    @@ -8361,7 +8389,7 @@ $image)
    -

    method getImageRBY [line 2310]

    +

    method getImageRBY [line 2328]

    @@ -8386,7 +8414,7 @@ $image)
    -

    method getImageScale [line 1657]

    +

    method getImageScale [line 1675]

    @@ -8420,7 +8448,7 @@ $image)
    -

    method getLastH [line 1635]

    +

    method getLastH [line 1653]

    @@ -8451,7 +8479,7 @@ $image)
    -

    method GetLineWidth [line 7463]

    +

    method GetLineWidth [line 7481]

    @@ -8485,7 +8513,7 @@ $image)
    -

    method getMargins [line 10636]

    +

    method getMargins [line 10654]

    @@ -8516,7 +8544,7 @@ $image)
    -

    method GetNumChars [line 2844]

    +

    method GetNumChars [line 2862]

    @@ -8558,7 +8586,7 @@ $s)
    -

    method getNumLines [line 3858]

    +

    method getNumLines [line 3876]

    @@ -8606,7 +8634,7 @@ $w = 0])
    -

    method getNumPages [line 2108]

    +

    method getNumPages [line 2126]

    @@ -8640,7 +8668,7 @@ $w = 0])
    -

    method getObjFilename [line 13103]

    +

    method getObjFilename [line 13121]

    @@ -8685,7 +8713,7 @@ $prefix)
    -

    method getOriginalMargins [line 10659]

    +

    method getOriginalMargins [line 10677]

    @@ -8716,7 +8744,7 @@ $prefix)
    -

    method getPage [line 2096]

    +

    method getPage [line 2114]

    @@ -8750,7 +8778,7 @@ $prefix)
    -

    method getPageBuffer [line 13214]

    +

    method getPageBuffer [line 13232]

    @@ -8792,7 +8820,7 @@ $page)
    -

    method getPageDimensions [line 1670]

    +

    method getPageDimensions [line 1688]

    @@ -8837,7 +8865,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 9369]

    +

    method getPageGroupAlias [line 9387]

    @@ -8862,7 +8890,7 @@ $pagenum = ''])
    -

    method getPageHeight [line 1702]

    +

    method getPageHeight [line 1720]

    @@ -8910,7 +8938,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 9384]

    +

    method getPageNumGroupAlias [line 9402]

    @@ -8935,7 +8963,7 @@ $pagenum = ''])
    -

    method getPageWidth [line 1686]

    +

    method getPageWidth [line 1704]

    @@ -8983,7 +9011,7 @@ $pagenum = ''])
    -

    method getPDFData [line 6839]

    +

    method getPDFData [line 6857]

    @@ -9008,7 +9036,7 @@ $pagenum = ''])
    -

    method getRemainingWidth [line 4215]

    +

    method getRemainingWidth [line 4233]

    @@ -9036,7 +9064,7 @@ $pagenum = ''])
    -

    method getRTL [line 1598]

    +

    method getRTL [line 1616]

    @@ -9064,7 +9092,7 @@ $pagenum = ''])
    -

    method getScaleFactor [line 1732]

    +

    method getScaleFactor [line 1750]

    @@ -9098,7 +9126,7 @@ $pagenum = ''])
    -

    method GetStringWidth [line 2775]

    +

    method GetStringWidth [line 2793]

    @@ -9161,7 +9189,7 @@ $fontsize = 0])
    -

    method GetX [line 4805]

    +

    method GetX [line 4823]

    @@ -9192,7 +9220,7 @@ $fontsize = 0])
    -

    method GetY [line 4832]

    +

    method GetY [line 4850]

    @@ -9223,7 +9251,7 @@ $fontsize = 0])
    -

    method Gradient [line 9772]

    +

    method Gradient [line 9790]

    @@ -9283,7 +9311,7 @@ $coords)
    -

    method Header [line 2319]

    +

    method Header [line 2337]

    @@ -9308,7 +9336,7 @@ $coords)
    -

    method Image [line 4336]

    +

    method Image [line 4354]

    @@ -9428,7 +9456,7 @@ $border = 0])
    -

    method ImageEps [line 9944]

    +

    method ImageEps [line 9962]

    @@ -9524,7 +9552,7 @@ $border = 0])
    -

    method ImagePngAlpha [line 4720]

    +

    method ImagePngAlpha [line 4738]

    @@ -9629,7 +9657,7 @@ $palign = ''])
    -

    method IncludeJS [line 8957]

    +

    method IncludeJS [line 8975]

    @@ -9665,7 +9693,7 @@ $script)
    -

    method intToRoman [line 12832]

    +

    method intToRoman [line 12850]

    @@ -9707,7 +9735,7 @@ $number)
    -

    method lastPage [line 2085]

    +

    method lastPage [line 2103]

    @@ -9749,7 +9777,7 @@ $resetmargins = false])
    -

    method Line [line 7613]

    +

    method Line [line 7631]

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

    method LinearGradient [line 9629]

    +

    method LinearGradient [line 9647]

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

    method Link [line 3139]

    +

    method Link [line 3157]

    @@ -9965,7 +9993,7 @@ $spaces = 0])
    -

    method ListBox [line 9085]

    +

    method ListBox [line 9103]

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

    method Ln [line 4777]

    +

    method Ln [line 4795]

    @@ -10073,7 +10101,7 @@ $cell = false])
    -

    method MirrorH [line 7237]

    +

    method MirrorH [line 7255]

    @@ -10115,7 +10143,7 @@ $x = ''])
    -

    method MirrorL [line 7273]

    +

    method MirrorL [line 7291]

    @@ -10169,7 +10197,7 @@ $y = ''])
    -

    method MirrorP [line 7260]

    +

    method MirrorP [line 7278]

    @@ -10217,7 +10245,7 @@ $y = ''])
    -

    method MirrorV [line 7248]

    +

    method MirrorV [line 7266]

    @@ -10259,7 +10287,7 @@ $y = ''])
    -

    method movePage [line 13348]

    +

    method movePage [line 13366]

    @@ -10307,7 +10335,7 @@ $topage)
    -

    method MultiCell [line 3621]

    +

    method MultiCell [line 3639]

    @@ -10433,7 +10461,7 @@ $maxh = 0])
    -

    method objclone [line 13818]

    +

    method objclone [line 13836]

    @@ -10475,7 +10503,7 @@ $object)
    -

    method Open [line 2002]

    +

    method Open [line 2020]

    @@ -10506,7 +10534,7 @@ $object)
    -

    method openHTMLTagHandler [line 11955]

    +

    method openHTMLTagHandler [line 11973]

    @@ -10560,7 +10588,7 @@ $dom)
    -

    method Output [line 4924]

    +

    method Output [line 4942]

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

    method PageNo [line 2495]

    +

    method PageNo [line 2513]

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

    method PageNoFormatted [line 9420]

    +

    method PageNoFormatted [line 9438]

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

    method PieSector [line 9866]

    +

    method PieSector [line 9884]

    @@ -10775,7 +10803,7 @@ $o:)
    -

    method pixelsToUnits [line 6942]

    +

    method pixelsToUnits [line 6960]

    @@ -10817,7 +10845,7 @@ $px)
    -

    method Polycurve [line 7803]

    +

    method Polycurve [line 7821]

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

    method Polygon [line 7996]

    +

    method Polygon [line 8014]

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

    method putHtmlListBullet [line 12897]

    +

    method putHtmlListBullet [line 12915]

    @@ -10997,7 +11025,7 @@ $size = 10])
    -

    method RadialGradient [line 9647]

    +

    method RadialGradient [line 9665]

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

    method RadioButton [line 9067]

    +

    method RadioButton [line 9085]

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

    method readDiskCache [line 13143]

    +

    method readDiskCache [line 13161]

    @@ -11171,7 +11199,7 @@ $file)
    -

    method Rect [line 7648]

    +

    method Rect [line 7666]

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

    method RegularPolygon [line 8095]

    +

    method RegularPolygon [line 8113]

    @@ -11360,7 +11388,7 @@ $r:)
    -

    method removeSHY [line 3351]

    +

    method removeSHY [line 3369]

    @@ -11402,7 +11430,7 @@ $txt = ''])
    -

    method rfread [line 4690]

    +

    method rfread [line 4708]

    @@ -11453,7 +11481,7 @@ $length)
    -

    method rollbackTransaction [line 13795]

    +

    method rollbackTransaction [line 13813]

    @@ -11484,7 +11512,7 @@ $length)
    -

    method Rotate [line 7332]

    +

    method Rotate [line 7350]

    @@ -11538,7 +11566,7 @@ $y = ''])
    -

    method RoundedRect [line 8199]

    +

    method RoundedRect [line 8217]

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

    method Scale [line 7202]

    +

    method Scale [line 7220]

    @@ -11685,7 +11713,7 @@ $y = ''])
    -

    method ScaleX [line 7162]

    +

    method ScaleX [line 7180]

    @@ -11739,7 +11767,7 @@ $y = ''])
    -

    method ScaleXY [line 7188]

    +

    method ScaleXY [line 7206]

    @@ -11793,7 +11821,7 @@ $y = ''])
    -

    method ScaleY [line 7175]

    +

    method ScaleY [line 7193]

    @@ -11847,7 +11875,7 @@ $y = ''])
    -

    method setAlpha [line 9529]

    +

    method setAlpha [line 9547]

    @@ -11889,7 +11917,7 @@ $bm = 'Normal'])
    -

    method SetAuthor [line 1951]

    +

    method SetAuthor [line 1969]

    @@ -11931,7 +11959,7 @@ $author)
    -

    method SetAutoPageBreak [line 1818]

    +

    method SetAutoPageBreak [line 1836]

    @@ -11979,7 +12007,7 @@ $margin = 0])
    -

    method setBarcode [line 10207]

    +

    method setBarcode [line 10225]

    @@ -12015,7 +12043,7 @@ $bc = ''])
    -

    method SetBooklet [line 12672]

    +

    method SetBooklet [line 12690]

    @@ -12066,7 +12094,7 @@ $outer = -1])
    -

    method setBuffer [line 13153]

    +

    method setBuffer [line 13171]

    @@ -12105,7 +12133,7 @@ $data)
    -

    method setCellHeightRatio [line 9563]

    +

    method setCellHeightRatio [line 9581]

    @@ -12141,7 +12169,7 @@ $h)
    -

    method SetCellPadding [line 1806]

    +

    method SetCellPadding [line 1824]

    @@ -12183,7 +12211,7 @@ $pad)
    -

    method SetCompression [line 1911]

    +

    method SetCompression [line 1929]

    @@ -12222,7 +12250,7 @@ $compress)
    -

    method SetCreator [line 1975]

    +

    method SetCreator [line 1993]

    @@ -12264,7 +12292,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 3089]

    +

    method SetDefaultMonospacedFont [line 3107]

    @@ -12303,7 +12331,7 @@ $font)
    -

    method setDefaultTableColumns [line 9553]

    +

    method setDefaultTableColumns [line 9571]

    @@ -12339,7 +12367,7 @@ $cols = 4])
    -

    method SetDisplayMode [line 1833]

    +

    method SetDisplayMode [line 1851]

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

    method SetDrawColor [line 2550]

    +

    method SetDrawColor [line 2568]

    @@ -12450,7 +12478,7 @@ $col4 = -1])
    -

    method SetDrawColorArray [line 2527]

    +

    method SetDrawColorArray [line 2545]

    @@ -12492,7 +12520,7 @@ $color)
    -

    method SetDrawSpotColor [line 2588]

    +

    method SetDrawSpotColor [line 2606]

    @@ -12540,7 +12568,7 @@ $tint = 100])
    -

    method setExtGState [line 9498]

    +

    method setExtGState [line 9516]

    @@ -12576,7 +12604,7 @@ $gs)
    -

    method SetFillColor [line 2630]

    +

    method SetFillColor [line 2648]

    @@ -12636,7 +12664,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 2607]

    +

    method SetFillColorArray [line 2625]

    @@ -12678,7 +12706,7 @@ $color)
    -

    method SetFillSpotColor [line 2672]

    +

    method SetFillSpotColor [line 2690]

    @@ -12726,7 +12754,7 @@ $tint = 100])
    -

    method SetFont [line 3044]

    +

    method SetFont [line 3062]

    @@ -12786,7 +12814,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 13289]

    +

    method setFontBuffer [line 13307]

    @@ -12831,7 +12859,7 @@ $data)
    -

    method SetFontSize [line 3064]

    +

    method SetFontSize [line 3082]

    @@ -12873,7 +12901,7 @@ $size)
    -

    method setFontSubBuffer [line 13311]

    +

    method setFontSubBuffer [line 13329]

    @@ -12924,7 +12952,7 @@ $data)
    -

    method setFooter [line 2427]

    +

    method setFooter [line 2445]

    @@ -12952,7 +12980,7 @@ $data)
    -

    method setFooterFont [line 6810]

    +

    method setFooterFont [line 6828]

    @@ -12991,7 +13019,7 @@ $font)
    -

    method setFooterMargin [line 2265]

    +

    method setFooterMargin [line 2283]

    @@ -13027,7 +13055,7 @@ $fm = 10])
    -

    method setGraphicVars [line 13070]

    +

    method setGraphicVars [line 13088]

    @@ -13066,7 +13094,7 @@ $gvars)
    -

    method setHeader [line 2396]

    +

    method setHeader [line 2414]

    @@ -13094,7 +13122,7 @@ $gvars)
    -

    method setHeaderData [line 2216]

    +

    method setHeaderData [line 2234]

    @@ -13148,7 +13176,7 @@ $hs = ''])
    -

    method setHeaderFont [line 6790]

    +

    method setHeaderFont [line 6808]

    @@ -13187,7 +13215,7 @@ $font)
    -

    method setHeaderMargin [line 2245]

    +

    method setHeaderMargin [line 2263]

    @@ -13223,7 +13251,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 12743]

    +

    method setHtmlLinksStyle [line 12761]

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

    method setHtmlVSpace [line 12712]

    +

    method setHtmlVSpace [line 12730]

    @@ -13307,7 +13335,7 @@ $tagvs)
    -

    method setImageBuffer [line 13230]

    +

    method setImageBuffer [line 13248]

    @@ -13352,7 +13380,7 @@ $data)
    -

    method setImageScale [line 1646]

    +

    method setImageScale [line 1664]

    @@ -13394,7 +13422,7 @@ $scale)
    -

    method setImageSubBuffer [line 13253]

    +

    method setImageSubBuffer [line 13271]

    @@ -13445,7 +13473,7 @@ $data)
    -

    method setJPEGQuality [line 9540]

    +

    method setJPEGQuality [line 9558]

    @@ -13481,7 +13509,7 @@ $quality)
    -

    method SetKeywords [line 1963]

    +

    method SetKeywords [line 1981]

    @@ -13523,7 +13551,7 @@ $keywords)
    -

    method setLanguageArray [line 6830]

    +

    method setLanguageArray [line 6848]

    @@ -13562,7 +13590,7 @@ $language)
    -

    method setLastH [line 1625]

    +

    method setLastH [line 1643]

    @@ -13604,7 +13632,7 @@ $h)
    -

    method SetLeftMargin [line 1762]

    +

    method SetLeftMargin [line 1780]

    @@ -13646,7 +13674,7 @@ $margin)
    -

    method SetLineStyle [line 7488]

    +

    method SetLineStyle [line 7506]

    @@ -13692,7 +13720,7 @@ $style)
    -

    method SetLineWidth [line 7449]

    +

    method SetLineWidth [line 7467]

    @@ -13734,7 +13762,7 @@ $width)
    -

    method SetLink [line 3116]

    +

    method SetLink [line 3134]

    @@ -13788,7 +13816,7 @@ $page = -1])
    -

    method setListIndentWidth [line 12722]

    +

    method setListIndentWidth [line 12740]

    @@ -13827,7 +13855,7 @@ $width)
    -

    method setLIsymbol [line 12632]

    +

    method setLIsymbol [line 12650]

    @@ -13866,7 +13894,7 @@ $symbol = '!'])
    -

    method SetMargins [line 1745]

    +

    method SetMargins [line 1763]

    @@ -13920,7 +13948,7 @@ $right = -1])
    -

    method setOpenCell [line 12732]

    +

    method setOpenCell [line 12750]

    @@ -13959,7 +13987,7 @@ $isopen)
    -

    method setPage [line 2038]

    +

    method setPage [line 2056]

    @@ -14007,7 +14035,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 13187]

    +

    method setPageBuffer [line 13205]

    @@ -14058,7 +14086,7 @@ $append = false])
    -

    method setPageFormat [line 1473]

    +

    method setPageFormat [line 1491]

    @@ -14103,7 +14131,7 @@ $orientation = 'P'])
    -

    method setPageMark [line 2204]

    +

    method setPageMark [line 2222]

    @@ -14131,7 +14159,7 @@ $orientation = 'P'])
    -

    method setPageOrientation [line 1546]

    +

    method setPageOrientation [line 1564]

    @@ -14182,7 +14210,7 @@ $bottommargin = ''])
    -

    method setPageUnit [line 1431]

    +

    method setPageUnit [line 1449]

    @@ -14221,7 +14249,7 @@ $unit)
    -

    method setPDFVersion [line 9582]

    +

    method setPDFVersion [line 9600]

    @@ -14257,7 +14285,7 @@ $version = '1.7'])
    -

    method setPrintFooter [line 2292]

    +

    method setPrintFooter [line 2310]

    @@ -14299,7 +14327,7 @@ $value)
    -

    method setPrintHeader [line 2283]

    +

    method setPrintHeader [line 2301]

    @@ -14335,7 +14363,7 @@ $val = true])
    -

    method SetProtection [line 7105]

    +

    method SetProtection [line 7123]

    @@ -14389,7 +14417,7 @@ $owner_pass = null])
    -

    method SetRightMargin [line 1792]

    +

    method SetRightMargin [line 1810]

    @@ -14431,7 +14459,7 @@ $margin)
    -

    method setRTL [line 1587]

    +

    method setRTL [line 1605]

    @@ -14470,7 +14498,7 @@ $enable)
    -

    method setSignature [line 9256]

    +

    method setSignature [line 9274]

    @@ -14524,7 +14552,7 @@ $extracerts = ''])
    -

    method SetSubject [line 1939]

    +

    method SetSubject [line 1957]

    @@ -14566,7 +14594,7 @@ $subject)
    -

    method setTableHeader [line 2469]

    +

    method setTableHeader [line 2487]

    @@ -14594,7 +14622,7 @@ $subject)
    -

    method setTempRTL [line 1608]

    +

    method setTempRTL [line 1626]

    @@ -14633,7 +14661,7 @@ $mode)
    -

    method SetTextColor [line 2714]

    +

    method SetTextColor [line 2732]

    @@ -14693,7 +14721,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 2691]

    +

    method SetTextColorArray [line 2709]

    @@ -14735,7 +14763,7 @@ $color)
    -

    method SetTextSpotColor [line 2753]

    +

    method SetTextSpotColor [line 2771]

    @@ -14783,7 +14811,7 @@ $tint = 100])
    -

    method SetTitle [line 1927]

    +

    method SetTitle [line 1945]

    @@ -14825,7 +14853,7 @@ $title)
    -

    method SetTopMargin [line 1777]

    +

    method SetTopMargin [line 1795]

    @@ -14867,7 +14895,7 @@ $margin)
    -

    method setUserRights [line 9228]

    +

    method setUserRights [line 9246]

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

    method setViewerPreferences [line 9612]

    +

    method setViewerPreferences [line 9630]

    @@ -14963,7 +14991,7 @@ $preferences)
    -

    method setVisibility [line 9450]

    +

    method setVisibility [line 9468]

    @@ -14999,7 +15027,7 @@ $v)
    -

    method SetX [line 4845]

    +

    method SetX [line 4863]

    @@ -15041,7 +15069,7 @@ $x)
    -

    method SetXY [line 4908]

    +

    method SetXY [line 4926]

    @@ -15089,7 +15117,7 @@ $y)
    -

    method SetY [line 4877]

    +

    method SetY [line 4895]

    @@ -15137,7 +15165,7 @@ $resetx = true])
    -

    method Skew [line 7392]

    +

    method Skew [line 7410]

    @@ -15197,7 +15225,7 @@ $y = ''])
    -

    method SkewX [line 7365]

    +

    method SkewX [line 7383]

    @@ -15251,7 +15279,7 @@ $y = ''])
    -

    method SkewY [line 7378]

    +

    method SkewY [line 7396]

    @@ -15305,7 +15333,7 @@ $y = ''])
    -

    method StarPolygon [line 8150]

    +

    method StarPolygon [line 8168]

    @@ -15429,7 +15457,7 @@ $draw_circle:)
    -

    method startPage [line 2164]

    +

    method startPage [line 2182]

    @@ -15477,7 +15505,7 @@ $format = ''])
    -

    method startPageGroup [line 9279]

    +

    method startPageGroup [line 9297]

    @@ -15513,7 +15541,7 @@ $page = ''])
    -

    method startTransaction [line 13768]

    +

    method startTransaction [line 13786]

    @@ -15541,7 +15569,7 @@ $page = ''])
    -

    method StartTransform [line 7133]

    +

    method StartTransform [line 7151]

    @@ -15572,7 +15600,7 @@ $page = ''])
    -

    method StopTransform [line 7146]

    +

    method StopTransform [line 7164]

    @@ -15603,7 +15631,7 @@ $page = ''])
    -

    method swapMargins [line 12688]

    +

    method swapMargins [line 12706]

    @@ -15642,7 +15670,7 @@ $reverse = true])
    -

    method Text [line 3240]

    +

    method Text [line 3258]

    @@ -15711,7 +15739,7 @@ $clip = false])
    -

    method TextField [line 9054]

    +

    method TextField [line 9072]

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

    method Transform [line 7425]

    +

    method Transform [line 7443]

    @@ -15807,7 +15835,7 @@ $tm)
    -

    method Translate [line 7308]

    +

    method Translate [line 7326]

    @@ -15855,7 +15883,7 @@ $t_y)
    -

    method TranslateX [line 7285]

    +

    method TranslateX [line 7303]

    @@ -15897,7 +15925,7 @@ $t_x)
    -

    method TranslateY [line 7296]

    +

    method TranslateY [line 7314]

    @@ -15939,7 +15967,7 @@ $t_y)
    -

    method unhtmlentities [line 6953]

    +

    method unhtmlentities [line 6971]

    @@ -15978,7 +16006,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 4254]

    +

    method UniArrSubString [line 4272]

    @@ -16032,7 +16060,7 @@ $end = ''])
    -

    method unichr [line 4287]

    +

    method unichr [line 4305]

    @@ -16077,7 +16105,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 4275]

    +

    method UTF8ArrayToUniArray [line 4293]

    @@ -16119,7 +16147,7 @@ $ta)
    -

    method UTF8ArrSubString [line 4231]

    +

    method UTF8ArrSubString [line 4249]

    @@ -16170,7 +16198,7 @@ $end = ''])
    -

    method utf8Bidi [line 8298]

    +

    method utf8Bidi [line 8316]

    @@ -16224,7 +16252,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 6592]

    +

    method UTF8StringToArray [line 6610]

    @@ -16290,7 +16318,7 @@ $str)
    -

    method utf8StrRev [line 8284]

    +

    method utf8StrRev [line 8302]

    @@ -16344,7 +16372,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 6699]

    +

    method UTF8ToLatin1 [line 6717]

    @@ -16386,7 +16414,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 6683]

    +

    method UTF8ToUTF16BE [line 6701]

    @@ -16437,7 +16465,7 @@ $setbom = true])
    -

    method Write [line 3901]

    +

    method Write [line 3919]

    @@ -16533,7 +16561,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 10236]

    +

    method write1DBarcode [line 10254]

    @@ -16623,7 +16651,7 @@ $align = ''])
    -

    method write2DBarcode [line 10489]

    +

    method write2DBarcode [line 10507]

    @@ -16707,7 +16735,7 @@ $align = ''])
    -

    method writeBarcode [line 10439]

    +

    method writeBarcode [line 10457]

    @@ -16797,7 +16825,7 @@ $code)
    -

    method writeDiskCache [line 13115]

    +

    method writeDiskCache [line 13133]

    @@ -16854,7 +16882,7 @@ $file)
    -

    method writeHTML [line 11135]

    +

    method writeHTML [line 11153]

    @@ -16920,7 +16948,7 @@ $align = ''])
    -

    method writeHTMLCell [line 10727]

    +

    method writeHTMLCell [line 10745]

    @@ -17022,7 +17050,7 @@ $autopadding = true])
    -

    method _addfield [line 9019]

    +

    method _addfield [line 9037]

    @@ -17094,7 +17122,7 @@ $prop)
    -

    method _beginpage [line 6372]

    +

    method _beginpage [line 6390]

    @@ -17136,7 +17164,7 @@ $format = ''])
    -

    method _datastring [line 6482]

    +

    method _datastring [line 6500]

    @@ -17175,7 +17203,7 @@ $s)
    -

    method _destroy [line 5079]

    +

    method _destroy [line 5097]

    @@ -17220,7 +17248,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 5106]

    +

    method _dochecks [line 5124]

    @@ -17245,7 +17273,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 6447]

    +

    method _dolinethrough [line 6465]

    @@ -17293,7 +17321,7 @@ $txt)
    -

    method _dounderline [line 6433]

    +

    method _dounderline [line 6451]

    @@ -17341,7 +17369,7 @@ $txt)
    -

    method _enddoc [line 6315]

    +

    method _enddoc [line 6333]

    @@ -17366,7 +17394,7 @@ $txt)
    -

    method _endpage [line 6411]

    +

    method _endpage [line 6429]

    @@ -17391,7 +17419,7 @@ $txt)
    -

    method _escape [line 6471]

    +

    method _escape [line 6489]

    @@ -17430,7 +17458,7 @@ $s)
    -

    method _escapetext [line 6509]

    +

    method _escapetext [line 6527]

    @@ -17469,7 +17497,7 @@ $s)
    -

    method _freadint [line 6460]

    +

    method _freadint [line 6478]

    @@ -17508,7 +17536,7 @@ $f)
    -

    method _generateencryptionkey [line 7073]

    +

    method _generateencryptionkey [line 7091]

    @@ -17562,7 +17590,7 @@ $protection)
    -

    method _getfontpath [line 5122]

    +

    method _getfontpath [line 5140]

    @@ -17587,7 +17615,7 @@ $protection)
    -

    method _JScolor [line 8995]

    +

    method _JScolor [line 9013]

    @@ -17623,7 +17651,7 @@ $color)
    -

    method _md5_16 [line 7034]

    +

    method _md5_16 [line 7052]

    @@ -17668,7 +17696,7 @@ $str)
    -

    method _newobj [line 6420]

    +

    method _newobj [line 6438]

    @@ -17693,7 +17721,7 @@ $str)
    -

    method _objectkey [line 6966]

    +

    method _objectkey [line 6984]

    @@ -17732,7 +17760,7 @@ $n)
    -

    method _out [line 6540]

    +

    method _out [line 6558]

    @@ -17768,7 +17796,7 @@ $s)
    -

    method _outarc [line 9846]

    +

    method _outarc [line 9864]

    @@ -17840,7 +17868,7 @@ $y3)
    -

    method _outCurve [line 7593]

    +

    method _outCurve [line 7611]

    @@ -17906,7 +17934,7 @@ $y3)
    -

    method _outLine [line 7557]

    +

    method _outLine [line 7575]

    @@ -17948,7 +17976,7 @@ $y)
    -

    method _outPoint [line 7543]

    +

    method _outPoint [line 7561]

    @@ -17990,7 +18018,7 @@ $y)
    -

    method _outRect [line 7574]

    +

    method _outRect [line 7592]

    @@ -18053,7 +18081,7 @@ $op)
    -

    method _Ovalue [line 7047]

    +

    method _Ovalue [line 7065]

    @@ -18104,7 +18132,7 @@ $owner_pass)
    -

    method _parsejpeg [line 4559]

    +

    method _parsejpeg [line 4577]

    @@ -18143,7 +18171,7 @@ $file)
    -

    method _parsepng [line 4585]

    +

    method _parsepng [line 4603]

    @@ -18182,7 +18210,7 @@ $file)
    -

    method _putannots [line 5278]

    +

    method _putannots [line 5296]

    @@ -18224,7 +18252,7 @@ $n)
    -

    method _putbookmarks [line 8893]

    +

    method _putbookmarks [line 8911]

    @@ -18249,7 +18277,7 @@ $n)
    -

    method _putcatalog [line 6180]

    +

    method _putcatalog [line 6198]

    @@ -18274,7 +18302,7 @@ $n)
    -

    method _putcidfont0 [line 5936]

    +

    method _putcidfont0 [line 5954]

    @@ -18316,7 +18344,7 @@ $font)
    -

    method _putEmbeddedFiles [line 3209]

    +

    method _putEmbeddedFiles [line 3227]

    @@ -18347,7 +18375,7 @@ $font)
    -

    method _putencryption [line 6975]

    +

    method _putencryption [line 6993]

    @@ -18375,7 +18403,7 @@ $font)
    -

    method _putextgstates [line 9508]

    +

    method _putextgstates [line 9526]

    @@ -18400,7 +18428,7 @@ $font)
    -

    method _putfonts [line 5626]

    +

    method _putfonts [line 5644]

    @@ -18425,7 +18453,7 @@ $font)
    -

    method _putfontwidths [line 5753]

    +

    method _putfontwidths [line 5771]

    @@ -18473,7 +18501,7 @@ $cidoffset = 0])
    -

    method _putheader [line 6307]

    +

    method _putheader [line 6325]

    @@ -18498,7 +18526,7 @@ $cidoffset = 0])
    -

    method _putimages [line 5996]

    +

    method _putimages [line 6014]

    @@ -18523,7 +18551,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 6153]

    +

    method _putinfo [line 6171]

    @@ -18548,7 +18576,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 8967]

    +

    method _putjavascript [line 8985]

    @@ -18573,7 +18601,7 @@ $cidoffset = 0])
    -

    method _putocg [line 9429]

    +

    method _putocg [line 9447]

    @@ -18598,7 +18626,7 @@ $cidoffset = 0])
    -

    method _putpages [line 5133]

    +

    method _putpages [line 5151]

    @@ -18623,7 +18651,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 6079]

    +

    method _putresourcedict [line 6097]

    @@ -18648,7 +18676,7 @@ $cidoffset = 0])
    -

    method _putresources [line 6120]

    +

    method _putresources [line 6138]

    @@ -18673,7 +18701,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 9796]

    +

    method _putshaders [line 9814]

    @@ -18704,7 +18732,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 6051]

    +

    method _putspotcolors [line 6069]

    @@ -18732,7 +18760,7 @@ $cidoffset = 0])
    -

    method _putstream [line 6526]

    +

    method _putstream [line 6544]

    @@ -18768,7 +18796,7 @@ $s)
    -

    method _puttrailer [line 6293]

    +

    method _puttrailer [line 6311]

    @@ -18793,7 +18821,7 @@ $s)
    -

    method _puttruetypeunicode [line 5851]

    +

    method _puttruetypeunicode [line 5869]

    @@ -18835,7 +18863,7 @@ $font)
    -

    method _putuserrights [line 9170]

    +

    method _putuserrights [line 9188]

    diff --git a/tcpdf.php b/tcpdf.php index fd7dc1d..ee1be1c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-04-25 +// Last Update : 2009-04-28 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.005 +// Version : 4.6.006 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -126,7 +126,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.6.005 + * @version 4.6.006 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.005 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.006 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
    * 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 4.6.005 + * @version 4.6.006 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1285,7 +1285,14 @@ if (!class_exists('TCPDF', false)) { * @access protected * @since 4.6.005 (2009-04-24) */ - protected $signature_max_lenght = 5120; + protected $signature_max_lenght = 5120; + + /** + * Regular expression used to find blank characters used for word-wrapping. + * @access protected + * @since 4.6.006 (2009-04-28) + */ + protected $re_spaces = '/[\s\p{Z}\p{Lo}]/'; //------------------------------------------------------------ // METHODS @@ -1405,7 +1412,18 @@ if (!class_exists('TCPDF', false)) { // initialize some settings $this->utf8Bidi(array(''), ''); // set default font - $this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt); + $this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt); + // check if PCRE Unicode support is enabled + if (@preg_match('/\pL/u', 'a') == 1) { + // PCRE unicode support is turned ON + // \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 because Chinese characters are packed next to each other without spaces in between. + $this->re_spaces = '/[\s\p{Z}\p{Lo}]/'; + } else { + // PCRE unicode support is turned OFF + $this->re_spaces = '/[\s]/'; + } } /** @@ -4011,7 +4029,7 @@ if (!class_exists('TCPDF', false)) { // \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 because Chinese characters are packed next to each other without spaces in between. - if (($c != 160) AND (($c == 173) OR preg_match('/[\s\p{Z}\p{Lo}]/', $this->unichr($c)))) { + if (($c != 160) AND (($c == 173) OR preg_match($this->re_spaces, $this->unichr($c)))) { // update last blank space position $sep = $i; // check if is a SHY @@ -11827,7 +11845,7 @@ if (!class_exists('TCPDF', false)) { $firstblock = false; } $strrest = ''; - if (!empty($this->HREF)) { + if (!empty($this->HREF) AND (isset($this->HREF['url']))) { // HTML Link $strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $this->HREF['color'], $this->HREF['style']); } else {
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index d4fe637..70c12e2 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    @@ -18860,7 +18888,7 @@ $font)
    -

    method _putviewerpreferences [line 6223]

    +

    method _putviewerpreferences [line 6241]

    diff --git a/doc/index.html b/doc/index.html index d4fe637..70c12e2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/errors.html b/doc/errors.html index a24c033..8f411ac 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Sat, 25 Apr 2009 10:57:22 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:12:04 +0200 by phpDocumentor 1.4.1
    @@ -18891,7 +18919,7 @@ $font)
    -

    method _putxobjectdict [line 6068]

    +

    method _putxobjectdict [line 6086]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 08be247..7eb7421 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -992,6 +992,8 @@

    r

    +
    $re_spaces
    +
    in file tcpdf.php, variable TCPDF::$re_spaces
        Regular expression used to find blank characters used for word-wrapping.
    $rMargin
    in file tcpdf.php, variable TCPDF::$rMargin
    $rtl
    @@ -1383,7 +1385,7 @@ top
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:57 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 8559218..9535b86 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -843,6 +843,8 @@

    r

    +
    $re_spaces
    +
    in file tcpdf.php, variable TCPDF::$re_spaces
        Regular expression used to find blank characters used for word-wrapping.
    $rMargin
    in file tcpdf.php, variable TCPDF::$rMargin
    $rtl
    @@ -1360,7 +1362,7 @@ top
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:57 +0200 by phpDocumentor 1.4.1
    @@ -18916,7 +18944,7 @@ $font)
    -

    method _RC4 [line 6994]

    +

    method _RC4 [line 7012]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 236467c..e187b49 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.



    - Documentation generated on Sat, 25 Apr 2009 10:57:22 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:12:03 +0200 by phpDocumentor 1.4.1
    @@ -18967,7 +18995,7 @@ $text)
    -

    method _textstring [line 6495]

    +

    method _textstring [line 6513]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index dcb0135..cbbd32a 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -104,7 +104,7 @@ unicode data

    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 623be78..03722be 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.



    - Documentation generated on Sat, 25 Apr 2009 10:57:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    @@ -19006,7 +19034,7 @@ $s)
    -

    method _toJPEG [line 4543]

    +

    method _toJPEG [line 4561]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index f66ec35..da2f8d4 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -507,7 +507,7 @@ Configuration file for TCPDF.



    - Documentation generated on Sat, 25 Apr 2009 10:57:22 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:12:03 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 6c4aa4d..e615f8d 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    @@ -19048,7 +19076,7 @@ $file)
    -

    method _Uvalue [line 7060]

    +

    method _Uvalue [line 7078]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 509fa72..3e9d32e 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
    - Documentation generated on Sat, 25 Apr 2009 10:57:16 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    @@ -19085,7 +19113,7 @@ $file)
    - Documentation generated on Sat, 25 Apr 2009 10:57:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1
    		author:  Nicola Asuni
    version:  4.6.005version:  4.6.006
    copyright:  2002-2009 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 4.6.005 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.006 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data

    - Documentation generated on Sat, 25 Apr 2009 10:57:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 28 Apr 2009 10:11:58 +0200 by phpDocumentor 1.4.1