From 36a6bac44503314fd73ff3d43053c9a4066ef2b6 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Mon, 15 Jun 2009 14:18:24 +0200 Subject: [PATCH] 4.6.016 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 648 ++++++++++-------- 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 | 68 +- 16 files changed, 413 insertions(+), 343 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e1c6087..2535aeb 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.6.016 (2009-06-16) + - Method setSpacesRE() was added to set the regular expression for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/'); + - The method _putinfo() now automatically fills the metadata with '?' in case of empty string. + 4.6.015 (2009-06-11) - Bug #2804667 "word wrap bug" was fixed. diff --git a/README.TXT b/README.TXT index 8c5b5f0..2f58fb7 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.015 -Release date: 2009-06-11 +Version: 4.6.016 +Release date: 2009-06-15 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index e1a20e9..d9af3cb 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index f91e5fb..96f6818 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

  • SetRightMargin
  • setRTL
  • setSignature
    • +
  • setSpacesRE
  • SetSubject
  • setTableHeader
  • setTempRTL
    • @@ -588,7 +589,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.015 + version:  4.6.016 link:  http://www.tcpdf.org @@ -4324,7 +4325,7 @@ This is a PHP class for generating PDF documents without requiring external exte
    [ Top ]

    -

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

    +

    $re_spaces =  '/[\s]/'

    [line 1295]

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



    Tags:

    @@ -5291,7 +5292,7 @@ $diskcache = false])
    -

    destructor __destruct [line 1434]

    +

    destructor __destruct [line 1435]

    @@ -5319,7 +5320,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 3303]

    +

    method AcceptPageBreak [line 3318]

    @@ -5350,7 +5351,7 @@ $diskcache = false])
    -

    method addExtGState [line 9584]

    +

    method addExtGState [line 9606]

    @@ -5386,7 +5387,7 @@ $parms)
    -

    method AddFont [line 2901]

    +

    method AddFont [line 2916]

    @@ -5443,7 +5444,7 @@ $fontfile = ''])
    -

    method addHtmlLink [line 6905]

    +

    method addHtmlLink [line 6927]

    @@ -5512,7 +5513,7 @@ $style = -1])
    -

    method addHTMLVertSpace [line 12720]

    +

    method addHTMLVertSpace [line 12742]

    @@ -5578,7 +5579,7 @@ $closing = false])
    -

    method AddLink [line 3123]

    +

    method AddLink [line 3138]

    @@ -5609,7 +5610,7 @@ $closing = false])
    -

    method AddPage [line 2139]

    +

    method AddPage [line 2154]

    @@ -5657,7 +5658,7 @@ $format = ''])
    -

    method AddSpotColor [line 2534]

    +

    method AddSpotColor [line 2549]

    @@ -5723,7 +5724,7 @@ $k)
    -

    method addTOC [line 13742]

    +

    method addTOC [line 13764]

    @@ -5777,7 +5778,7 @@ $filler = '.'])
    -

    method AliasNbPages [line 9392]

    +

    method AliasNbPages [line 9414]

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

    method AliasNumPage [line 9419]

    +

    method AliasNumPage [line 9441]

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

    method Annotation [line 3179]

    +

    method Annotation [line 3194]

    @@ -5936,7 +5937,7 @@ $spaces = 0])
    -

    method arrUTF8ToUTF16BE [line 6807]

    +

    method arrUTF8ToUTF16BE [line 6829]

    @@ -6011,7 +6012,7 @@ $setbom = true])
    -

    method Bookmark [line 8914]

    +

    method Bookmark [line 8936]

    @@ -6065,7 +6066,7 @@ $page = ''])
    -

    method Button [line 9196]

    +

    method Button [line 9218]

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

    method Cell [line 3361]

    +

    method Cell [line 3376]

    @@ -6227,7 +6228,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 9176]

    +

    method CheckBox [line 9198]

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

    method checkPageBreak [line 3315]

    +

    method checkPageBreak [line 3330]

    @@ -6329,7 +6330,7 @@ $y = ''])
    -

    method Circle [line 8020]

    +

    method Circle [line 8042]

    @@ -6428,7 +6429,7 @@ $afinish:)
    -

    method Clip [line 9847]

    +

    method Clip [line 9869]

    @@ -6488,7 +6489,7 @@ $h)
    -

    method Close [line 2033]

    +

    method Close [line 2048]

    @@ -6519,7 +6520,7 @@ $h)
    -

    method closeHTMLTagHandler [line 12389]

    +

    method closeHTMLTagHandler [line 12411]

    @@ -6573,7 +6574,7 @@ $dom)
    -

    method ComboBox [line 9157]

    +

    method ComboBox [line 9179]

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

    method commitTransaction [line 13899]

    +

    method commitTransaction [line 13921]

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

    method convertHTMLColorToDec [line 6938]

    +

    method convertHTMLColorToDec [line 6960]

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

    method CoonsPatchMesh [line 9767]

    +

    method CoonsPatchMesh [line 9789]

    @@ -6802,7 +6803,7 @@ $coords_max = 1])
    -

    method Curve [line 7795]

    +

    method Curve [line 7817]

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

    method deletePage [line 13602]

    +

    method deletePage [line 13624]

    @@ -6946,7 +6947,7 @@ $page)
    -

    method Ellipse [line 7916]

    +

    method Ellipse [line 7938]

    @@ -7063,7 +7064,7 @@ $afinish:)
    -

    method empty_string [line 13946]

    +

    method empty_string [line 13968]

    @@ -7105,7 +7106,7 @@ $str)
    -

    method endPage [line 2158]

    +

    method endPage [line 2173]

    @@ -7136,7 +7137,7 @@ $str)
    -

    method Error [line 2005]

    +

    method Error [line 2020]

    @@ -7175,7 +7176,7 @@ $msg)
    -

    method Footer [line 2379]

    +

    method Footer [line 2394]

    @@ -7200,7 +7201,7 @@ $msg)
    -

    method formatPageNumber [line 9496]

    +

    method formatPageNumber [line 9518]

    @@ -7239,7 +7240,7 @@ $num)
    -

    method formatTOCPageNumber [line 9508]

    +

    method formatTOCPageNumber [line 9530]

    @@ -7281,7 +7282,7 @@ $num)
    -

    method GetAbsX [line 4857]

    +

    method GetAbsX [line 4872]

    @@ -7312,7 +7313,7 @@ $num)
    -

    method getAliasNbPages [line 9404]

    +

    method getAliasNbPages [line 9426]

    @@ -7343,7 +7344,7 @@ $num)
    -

    method getAliasNumPage [line 9432]

    +

    method getAliasNumPage [line 9454]

    @@ -7374,7 +7375,7 @@ $num)
    -

    method GetArrStringWidth [line 2813]

    +

    method GetArrStringWidth [line 2828]

    @@ -7443,7 +7444,7 @@ $arr)
    -

    method getBarcode [line 10312]

    +

    method getBarcode [line 10334]

    @@ -7471,7 +7472,7 @@ $arr)
    -

    method getBorderMode [line 3806]

    +

    method getBorderMode [line 3821]

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

    method getBreakMargin [line 1736]

    +

    method getBreakMargin [line 1751]

    @@ -7567,7 +7568,7 @@ $pagenum = ''])
    -

    method getBuffer [line 13288]

    +

    method getBuffer [line 13310]

    @@ -7598,7 +7599,7 @@ $pagenum = ''])
    -

    method getCellCode [line 3413]

    +

    method getCellCode [line 3428]

    @@ -7694,7 +7695,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 9670]

    +

    method getCellHeightRatio [line 9692]

    @@ -7719,7 +7720,7 @@ $ignore_min_height = false])
    -

    method GetCharWidth [line 2840]

    +

    method GetCharWidth [line 2855]

    @@ -7764,7 +7765,7 @@ $char)
    -

    method getFontBuffer [line 13448]

    +

    method getFontBuffer [line 13470]

    @@ -7806,7 +7807,7 @@ $font)
    -

    method getFontFamily [line 10788]

    +

    method getFontFamily [line 10810]

    @@ -7837,7 +7838,7 @@ $font)
    -

    method getFontSize [line 10768]

    +

    method getFontSize [line 10790]

    @@ -7868,7 +7869,7 @@ $font)
    -

    method getFontSizePt [line 10778]

    +

    method getFontSizePt [line 10800]

    @@ -7899,7 +7900,7 @@ $font)
    -

    method getFontsList [line 2879]

    +

    method getFontsList [line 2894]

    @@ -7927,7 +7928,7 @@ $font)
    -

    method getFontStyle [line 10798]

    +

    method getFontStyle [line 10820]

    @@ -7958,7 +7959,7 @@ $font)
    -

    method getFooterFont [line 6868]

    +

    method getFooterFont [line 6890]

    @@ -7986,7 +7987,7 @@ $font)
    -

    method getFooterMargin [line 2293]

    +

    method getFooterMargin [line 2308]

    @@ -8014,7 +8015,7 @@ $font)
    -

    method getGDgamma [line 4800]

    +

    method getGDgamma [line 4815]

    @@ -8053,7 +8054,7 @@ $v)
    -

    method getGraphicVars [line 13156]

    +

    method getGraphicVars [line 13178]

    @@ -8084,7 +8085,7 @@ $v)
    -

    method getGroupPageNo [line 9445]

    +

    method getGroupPageNo [line 9467]

    @@ -8109,7 +8110,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 9455]

    +

    method getGroupPageNoFormatted [line 9477]

    @@ -8140,7 +8141,7 @@ $v)
    -

    method getHeaderData [line 2248]

    +

    method getHeaderData [line 2263]

    @@ -8168,7 +8169,7 @@ $v)
    -

    method getHeaderFont [line 6848]

    +

    method getHeaderFont [line 6870]

    @@ -8196,7 +8197,7 @@ $v)
    -

    method getHeaderMargin [line 2273]

    +

    method getHeaderMargin [line 2288]

    @@ -8224,7 +8225,7 @@ $v)
    -

    method getHtmlDomArray [line 10834]

    +

    method getHtmlDomArray [line 10856]

    @@ -8263,7 +8264,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 12875]

    +

    method getHTMLUnitToUnits [line 12897]

    @@ -8329,7 +8330,7 @@ $point)
    -

    method getImageBuffer [line 13390]

    +

    method getImageBuffer [line 13412]

    @@ -8371,7 +8372,7 @@ $image)
    -

    method getImageRBX [line 2319]

    +

    method getImageRBX [line 2334]

    @@ -8396,7 +8397,7 @@ $image)
    -

    method getImageRBY [line 2328]

    +

    method getImageRBY [line 2343]

    @@ -8421,7 +8422,7 @@ $image)
    -

    method getImageScale [line 1675]

    +

    method getImageScale [line 1690]

    @@ -8455,7 +8456,7 @@ $image)
    -

    method getLastH [line 1653]

    +

    method getLastH [line 1668]

    @@ -8486,7 +8487,7 @@ $image)
    -

    method GetLineWidth [line 7512]

    +

    method GetLineWidth [line 7534]

    @@ -8520,7 +8521,7 @@ $image)
    -

    method getMargins [line 10731]

    +

    method getMargins [line 10753]

    @@ -8551,7 +8552,7 @@ $image)
    -

    method GetNumChars [line 2867]

    +

    method GetNumChars [line 2882]

    @@ -8593,7 +8594,7 @@ $s)
    -

    method getNumLines [line 3885]

    +

    method getNumLines [line 3900]

    @@ -8641,7 +8642,7 @@ $w = 0])
    -

    method getNumPages [line 2126]

    +

    method getNumPages [line 2141]

    @@ -8675,7 +8676,7 @@ $w = 0])
    -

    method getObjFilename [line 13220]

    +

    method getObjFilename [line 13242]

    @@ -8720,7 +8721,7 @@ $prefix)
    -

    method getOriginalMargins [line 10754]

    +

    method getOriginalMargins [line 10776]

    @@ -8751,7 +8752,7 @@ $prefix)
    -

    method getPage [line 2114]

    +

    method getPage [line 2129]

    @@ -8785,7 +8786,7 @@ $prefix)
    -

    method getPageBuffer [line 13331]

    +

    method getPageBuffer [line 13353]

    @@ -8827,7 +8828,7 @@ $page)
    -

    method getPageDimensions [line 1688]

    +

    method getPageDimensions [line 1703]

    @@ -8872,7 +8873,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 9467]

    +

    method getPageGroupAlias [line 9489]

    @@ -8897,7 +8898,7 @@ $pagenum = ''])
    -

    method getPageHeight [line 1720]

    +

    method getPageHeight [line 1735]

    @@ -8945,7 +8946,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 9482]

    +

    method getPageNumGroupAlias [line 9504]

    @@ -8970,7 +8971,7 @@ $pagenum = ''])
    -

    method getPageWidth [line 1704]

    +

    method getPageWidth [line 1719]

    @@ -9018,7 +9019,7 @@ $pagenum = ''])
    -

    method getPDFData [line 6887]

    +

    method getPDFData [line 6909]

    @@ -9043,7 +9044,7 @@ $pagenum = ''])
    -

    method getRemainingWidth [line 4246]

    +

    method getRemainingWidth [line 4261]

    @@ -9071,7 +9072,7 @@ $pagenum = ''])
    -

    method getRTL [line 1616]

    +

    method getRTL [line 1631]

    @@ -9099,7 +9100,7 @@ $pagenum = ''])
    -

    method getScaleFactor [line 1750]

    +

    method getScaleFactor [line 1765]

    @@ -9133,7 +9134,7 @@ $pagenum = ''])
    -

    method GetStringWidth [line 2798]

    +

    method GetStringWidth [line 2813]

    @@ -9196,7 +9197,7 @@ $fontsize = 0])
    -

    method GetX [line 4841]

    +

    method GetX [line 4856]

    @@ -9227,7 +9228,7 @@ $fontsize = 0])
    -

    method GetY [line 4868]

    +

    method GetY [line 4883]

    @@ -9258,7 +9259,7 @@ $fontsize = 0])
    -

    method Gradient [line 9870]

    +

    method Gradient [line 9892]

    @@ -9318,7 +9319,7 @@ $coords)
    -

    method Header [line 2337]

    +

    method Header [line 2352]

    @@ -9343,7 +9344,7 @@ $coords)
    -

    method Image [line 4368]

    +

    method Image [line 4383]

    @@ -9469,7 +9470,7 @@ $fitbox = false])
    -

    method ImageEps [line 10042]

    +

    method ImageEps [line 10064]

    @@ -9565,7 +9566,7 @@ $border = 0])
    -

    method ImagePngAlpha [line 4756]

    +

    method ImagePngAlpha [line 4771]

    @@ -9670,7 +9671,7 @@ $palign = ''])
    -

    method IncludeJS [line 9006]

    +

    method IncludeJS [line 9028]

    @@ -9706,7 +9707,7 @@ $script)
    -

    method intToRoman [line 12949]

    +

    method intToRoman [line 12971]

    @@ -9748,7 +9749,7 @@ $number)
    -

    method lastPage [line 2103]

    +

    method lastPage [line 2118]

    @@ -9790,7 +9791,7 @@ $resetmargins = false])
    -

    method Line [line 7662]

    +

    method Line [line 7684]

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

    method LinearGradient [line 9727]

    +

    method LinearGradient [line 9749]

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

    method Link [line 3162]

    +

    method Link [line 3177]

    @@ -10006,7 +10007,7 @@ $spaces = 0])
    -

    method ListBox [line 9134]

    +

    method ListBox [line 9156]

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

    method Ln [line 4813]

    +

    method Ln [line 4828]

    @@ -10114,7 +10115,7 @@ $cell = false])
    -

    method MirrorH [line 7286]

    +

    method MirrorH [line 7308]

    @@ -10156,7 +10157,7 @@ $x = ''])
    -

    method MirrorL [line 7322]

    +

    method MirrorL [line 7344]

    @@ -10210,7 +10211,7 @@ $y = ''])
    -

    method MirrorP [line 7309]

    +

    method MirrorP [line 7331]

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

    method MirrorV [line 7297]

    +

    method MirrorV [line 7319]

    @@ -10300,7 +10301,7 @@ $y = ''])
    -

    method movePage [line 13465]

    +

    method movePage [line 13487]

    @@ -10348,7 +10349,7 @@ $topage)
    -

    method MultiCell [line 3648]

    +

    method MultiCell [line 3663]

    @@ -10474,7 +10475,7 @@ $maxh = 0])
    -

    method objclone [line 13935]

    +

    method objclone [line 13957]

    @@ -10516,7 +10517,7 @@ $object)
    -

    method Open [line 2020]

    +

    method Open [line 2035]

    @@ -10547,7 +10548,7 @@ $object)
    -

    method openHTMLTagHandler [line 12059]

    +

    method openHTMLTagHandler [line 12081]

    @@ -10601,7 +10602,7 @@ $dom)
    -

    method Output [line 4960]

    +

    method Output [line 4975]

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

    method PageNo [line 2518]

    +

    method PageNo [line 2533]

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

    method PageNoFormatted [line 9518]

    +

    method PageNoFormatted [line 9540]

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

    method PieSector [line 9964]

    +

    method PieSector [line 9986]

    @@ -10816,7 +10817,7 @@ $o:)
    -

    method pixelsToUnits [line 6991]

    +

    method pixelsToUnits [line 7013]

    @@ -10858,7 +10859,7 @@ $px)
    -

    method Polycurve [line 7852]

    +

    method Polycurve [line 7874]

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

    method Polygon [line 8045]

    +

    method Polygon [line 8067]

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

    method putHtmlListBullet [line 13014]

    +

    method putHtmlListBullet [line 13036]

    @@ -11038,7 +11039,7 @@ $size = 10])
    -

    method RadialGradient [line 9745]

    +

    method RadialGradient [line 9767]

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

    method RadioButton [line 9116]

    +

    method RadioButton [line 9138]

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

    method readDiskCache [line 13260]

    +

    method readDiskCache [line 13282]

    @@ -11212,7 +11213,7 @@ $file)
    -

    method Rect [line 7697]

    +

    method Rect [line 7719]

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

    method RegularPolygon [line 8144]

    +

    method RegularPolygon [line 8166]

    @@ -11401,7 +11402,7 @@ $r:)
    -

    method removeSHY [line 3378]

    +

    method removeSHY [line 3393]

    @@ -11443,7 +11444,7 @@ $txt = ''])
    -

    method rfread [line 4726]

    +

    method rfread [line 4741]

    @@ -11494,7 +11495,7 @@ $length)
    -

    method rollbackTransaction [line 13912]

    +

    method rollbackTransaction [line 13934]

    @@ -11525,7 +11526,7 @@ $length)
    -

    method Rotate [line 7381]

    +

    method Rotate [line 7403]

    @@ -11579,7 +11580,7 @@ $y = ''])
    -

    method RoundedRect [line 8248]

    +

    method RoundedRect [line 8270]

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

    method Scale [line 7251]

    +

    method Scale [line 7273]

    @@ -11726,7 +11727,7 @@ $y = ''])
    -

    method ScaleX [line 7211]

    +

    method ScaleX [line 7233]

    @@ -11780,7 +11781,7 @@ $y = ''])
    -

    method ScaleXY [line 7237]

    +

    method ScaleXY [line 7259]

    @@ -11834,7 +11835,7 @@ $y = ''])
    -

    method ScaleY [line 7224]

    +

    method ScaleY [line 7246]

    @@ -11888,7 +11889,7 @@ $y = ''])
    -

    method setAlpha [line 9627]

    +

    method setAlpha [line 9649]

    @@ -11930,7 +11931,7 @@ $bm = 'Normal'])
    -

    method SetAuthor [line 1969]

    +

    method SetAuthor [line 1984]

    @@ -11972,7 +11973,7 @@ $author)
    -

    method SetAutoPageBreak [line 1836]

    +

    method SetAutoPageBreak [line 1851]

    @@ -12020,7 +12021,7 @@ $margin = 0])
    -

    method setBarcode [line 10302]

    +

    method setBarcode [line 10324]

    @@ -12056,7 +12057,7 @@ $bc = ''])
    -

    method SetBooklet [line 12789]

    +

    method SetBooklet [line 12811]

    @@ -12107,7 +12108,7 @@ $outer = -1])
    -

    method setBuffer [line 13270]

    +

    method setBuffer [line 13292]

    @@ -12146,7 +12147,7 @@ $data)
    -

    method setCellHeightRatio [line 9661]

    +

    method setCellHeightRatio [line 9683]

    @@ -12182,7 +12183,7 @@ $h)
    -

    method SetCellPadding [line 1824]

    +

    method SetCellPadding [line 1839]

    @@ -12224,7 +12225,7 @@ $pad)
    -

    method SetCompression [line 1929]

    +

    method SetCompression [line 1944]

    @@ -12263,7 +12264,7 @@ $compress)
    -

    method SetCreator [line 1993]

    +

    method SetCreator [line 2008]

    @@ -12305,7 +12306,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 3112]

    +

    method SetDefaultMonospacedFont [line 3127]

    @@ -12344,7 +12345,7 @@ $font)
    -

    method setDefaultTableColumns [line 9651]

    +

    method setDefaultTableColumns [line 9673]

    @@ -12380,7 +12381,7 @@ $cols = 4])
    -

    method SetDisplayMode [line 1851]

    +

    method SetDisplayMode [line 1866]

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

    method SetDrawColor [line 2573]

    +

    method SetDrawColor [line 2588]

    @@ -12491,7 +12492,7 @@ $col4 = -1])
    -

    method SetDrawColorArray [line 2550]

    +

    method SetDrawColorArray [line 2565]

    @@ -12533,7 +12534,7 @@ $color)
    -

    method SetDrawSpotColor [line 2611]

    +

    method SetDrawSpotColor [line 2626]

    @@ -12581,7 +12582,7 @@ $tint = 100])
    -

    method setExtGState [line 9596]

    +

    method setExtGState [line 9618]

    @@ -12617,7 +12618,7 @@ $gs)
    -

    method SetFillColor [line 2653]

    +

    method SetFillColor [line 2668]

    @@ -12677,7 +12678,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 2630]

    +

    method SetFillColorArray [line 2645]

    @@ -12719,7 +12720,7 @@ $color)
    -

    method SetFillSpotColor [line 2695]

    +

    method SetFillSpotColor [line 2710]

    @@ -12767,7 +12768,7 @@ $tint = 100])
    -

    method SetFont [line 3067]

    +

    method SetFont [line 3082]

    @@ -12827,7 +12828,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 13406]

    +

    method setFontBuffer [line 13428]

    @@ -12872,7 +12873,7 @@ $data)
    -

    method SetFontSize [line 3087]

    +

    method SetFontSize [line 3102]

    @@ -12914,7 +12915,7 @@ $size)
    -

    method setFontSubBuffer [line 13428]

    +

    method setFontSubBuffer [line 13450]

    @@ -12965,7 +12966,7 @@ $data)
    -

    method setFooter [line 2445]

    +

    method setFooter [line 2460]

    @@ -12993,7 +12994,7 @@ $data)
    -

    method setFooterFont [line 6858]

    +

    method setFooterFont [line 6880]

    @@ -13032,7 +13033,7 @@ $font)
    -

    method setFooterMargin [line 2283]

    +

    method setFooterMargin [line 2298]

    @@ -13068,7 +13069,7 @@ $fm = 10])
    -

    method setGraphicVars [line 13187]

    +

    method setGraphicVars [line 13209]

    @@ -13107,7 +13108,7 @@ $gvars)
    -

    method setHeader [line 2414]

    +

    method setHeader [line 2429]

    @@ -13135,7 +13136,7 @@ $gvars)
    -

    method setHeaderData [line 2234]

    +

    method setHeaderData [line 2249]

    @@ -13189,7 +13190,7 @@ $hs = ''])
    -

    method setHeaderFont [line 6838]

    +

    method setHeaderFont [line 6860]

    @@ -13228,7 +13229,7 @@ $font)
    -

    method setHeaderMargin [line 2263]

    +

    method setHeaderMargin [line 2278]

    @@ -13264,7 +13265,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 12860]

    +

    method setHtmlLinksStyle [line 12882]

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

    method setHtmlVSpace [line 12829]

    +

    method setHtmlVSpace [line 12851]

    @@ -13348,7 +13349,7 @@ $tagvs)
    -

    method setImageBuffer [line 13347]

    +

    method setImageBuffer [line 13369]

    @@ -13393,7 +13394,7 @@ $data)
    -

    method setImageScale [line 1664]

    +

    method setImageScale [line 1679]

    @@ -13435,7 +13436,7 @@ $scale)
    -

    method setImageSubBuffer [line 13370]

    +

    method setImageSubBuffer [line 13392]

    @@ -13486,7 +13487,7 @@ $data)
    -

    method setJPEGQuality [line 9638]

    +

    method setJPEGQuality [line 9660]

    @@ -13522,7 +13523,7 @@ $quality)
    -

    method SetKeywords [line 1981]

    +

    method SetKeywords [line 1996]

    @@ -13564,7 +13565,7 @@ $keywords)
    -

    method setLanguageArray [line 6878]

    +

    method setLanguageArray [line 6900]

    @@ -13603,7 +13604,7 @@ $language)
    -

    method setLastH [line 1643]

    +

    method setLastH [line 1658]

    @@ -13645,7 +13646,7 @@ $h)
    -

    method SetLeftMargin [line 1780]

    +

    method SetLeftMargin [line 1795]

    @@ -13687,7 +13688,7 @@ $margin)
    -

    method SetLineStyle [line 7537]

    +

    method SetLineStyle [line 7559]

    @@ -13733,7 +13734,7 @@ $style)
    -

    method SetLineWidth [line 7498]

    +

    method SetLineWidth [line 7520]

    @@ -13775,7 +13776,7 @@ $width)
    -

    method SetLink [line 3139]

    +

    method SetLink [line 3154]

    @@ -13829,7 +13830,7 @@ $page = -1])
    -

    method setListIndentWidth [line 12839]

    +

    method setListIndentWidth [line 12861]

    @@ -13868,7 +13869,7 @@ $width)
    -

    method setLIsymbol [line 12749]

    +

    method setLIsymbol [line 12771]

    @@ -13907,7 +13908,7 @@ $symbol = '!'])
    -

    method SetMargins [line 1763]

    +

    method SetMargins [line 1778]

    @@ -13961,7 +13962,7 @@ $right = -1])
    -

    method setOpenCell [line 12849]

    +

    method setOpenCell [line 12871]

    @@ -14000,7 +14001,7 @@ $isopen)
    -

    method setPage [line 2056]

    +

    method setPage [line 2071]

    @@ -14048,7 +14049,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 13304]

    +

    method setPageBuffer [line 13326]

    @@ -14099,7 +14100,7 @@ $append = false])
    -

    method setPageFormat [line 1491]

    +

    method setPageFormat [line 1492]

    @@ -14144,7 +14145,7 @@ $orientation = 'P'])
    -

    method setPageMark [line 2222]

    +

    method setPageMark [line 2237]

    @@ -14172,7 +14173,7 @@ $orientation = 'P'])
    -

    method setPageOrientation [line 1564]

    +

    method setPageOrientation [line 1565]

    @@ -14223,7 +14224,7 @@ $bottommargin = ''])
    -

    method setPageUnit [line 1449]

    +

    method setPageUnit [line 1450]

    @@ -14262,7 +14263,7 @@ $unit)
    -

    method setPDFVersion [line 9680]

    +

    method setPDFVersion [line 9702]

    @@ -14298,7 +14299,7 @@ $version = '1.7'])
    -

    method setPrintFooter [line 2310]

    +

    method setPrintFooter [line 2325]

    @@ -14340,7 +14341,7 @@ $value)
    -

    method setPrintHeader [line 2301]

    +

    method setPrintHeader [line 2316]

    @@ -14376,7 +14377,7 @@ $val = true])
    -

    method SetProtection [line 7154]

    +

    method SetProtection [line 7176]

    @@ -14430,7 +14431,7 @@ $owner_pass = null])
    -

    method SetRightMargin [line 1810]

    +

    method SetRightMargin [line 1825]

    @@ -14472,7 +14473,7 @@ $margin)
    -

    method setRTL [line 1605]

    +

    method setRTL [line 1620]

    @@ -14511,7 +14512,7 @@ $enable)
    -

    method setSignature [line 9352]

    +

    method setSignature [line 9374]

    @@ -14575,9 +14576,48 @@ $info = array()])
    [ Top ]
    +
    + +

    method setSpacesRE [line 1606]

    +
    +
    +
    + void setSpacesRE( +[string +$re = '/[\s]/']) +
    +

    + + Set regular expression to detect withespaces or word separators.



    +

    Tags:

    +
    + + + + + + + +
    since:  4.6.016 (2009-06-15)
    access:  public
    +
    +

    + + +

    Parameters:

    +
    + + + + + + +
    string  $re  regular expression (leave empty for default).
    +

    +
    [ Top ]
    +
    -

    method SetSubject [line 1957]

    +

    method SetSubject [line 1972]

    @@ -14619,7 +14659,7 @@ $subject)
    -

    method setTableHeader [line 2487]

    +

    method setTableHeader [line 2502]

    @@ -14647,7 +14687,7 @@ $subject)
    -

    method setTempRTL [line 1626]

    +

    method setTempRTL [line 1641]

    @@ -14686,7 +14726,7 @@ $mode)
    -

    method SetTextColor [line 2737]

    +

    method SetTextColor [line 2752]

    @@ -14746,7 +14786,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 2714]

    +

    method SetTextColorArray [line 2729]

    @@ -14788,7 +14828,7 @@ $color)
    -

    method SetTextSpotColor [line 2776]

    +

    method SetTextSpotColor [line 2791]

    @@ -14836,7 +14876,7 @@ $tint = 100])
    -

    method SetTitle [line 1945]

    +

    method SetTitle [line 1960]

    @@ -14878,7 +14918,7 @@ $title)
    -

    method SetTopMargin [line 1795]

    +

    method SetTopMargin [line 1810]

    @@ -14920,7 +14960,7 @@ $margin)
    -

    method setUserRights [line 9326]

    +

    method setUserRights [line 9348]

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

    method setViewerPreferences [line 9710]

    +

    method setViewerPreferences [line 9732]

    @@ -15016,7 +15056,7 @@ $preferences)
    -

    method setVisibility [line 9548]

    +

    method setVisibility [line 9570]

    @@ -15052,7 +15092,7 @@ $v)
    -

    method SetX [line 4881]

    +

    method SetX [line 4896]

    @@ -15094,7 +15134,7 @@ $x)
    -

    method SetXY [line 4944]

    +

    method SetXY [line 4959]

    @@ -15142,7 +15182,7 @@ $y)
    -

    method SetY [line 4913]

    +

    method SetY [line 4928]

    @@ -15190,7 +15230,7 @@ $resetx = true])
    -

    method Skew [line 7441]

    +

    method Skew [line 7463]

    @@ -15250,7 +15290,7 @@ $y = ''])
    -

    method SkewX [line 7414]

    +

    method SkewX [line 7436]

    @@ -15304,7 +15344,7 @@ $y = ''])
    -

    method SkewY [line 7427]

    +

    method SkewY [line 7449]

    @@ -15358,7 +15398,7 @@ $y = ''])
    -

    method StarPolygon [line 8199]

    +

    method StarPolygon [line 8221]

    @@ -15482,7 +15522,7 @@ $draw_circle:)
    -

    method startPage [line 2182]

    +

    method startPage [line 2197]

    @@ -15530,7 +15570,7 @@ $format = ''])
    -

    method startPageGroup [line 9377]

    +

    method startPageGroup [line 9399]

    @@ -15566,7 +15606,7 @@ $page = ''])
    -

    method startTransaction [line 13885]

    +

    method startTransaction [line 13907]

    @@ -15594,7 +15634,7 @@ $page = ''])
    -

    method StartTransform [line 7182]

    +

    method StartTransform [line 7204]

    @@ -15625,7 +15665,7 @@ $page = ''])
    -

    method StopTransform [line 7195]

    +

    method StopTransform [line 7217]

    @@ -15656,7 +15696,7 @@ $page = ''])
    -

    method swapMargins [line 12805]

    +

    method swapMargins [line 12827]

    @@ -15695,7 +15735,7 @@ $reverse = true])
    -

    method Text [line 3263]

    +

    method Text [line 3278]

    @@ -15764,7 +15804,7 @@ $clip = false])
    -

    method TextField [line 9103]

    +

    method TextField [line 9125]

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

    method Transform [line 7474]

    +

    method Transform [line 7496]

    @@ -15860,7 +15900,7 @@ $tm)
    -

    method Translate [line 7357]

    +

    method Translate [line 7379]

    @@ -15908,7 +15948,7 @@ $t_y)
    -

    method TranslateX [line 7334]

    +

    method TranslateX [line 7356]

    @@ -15950,7 +15990,7 @@ $t_x)
    -

    method TranslateY [line 7345]

    +

    method TranslateY [line 7367]

    @@ -15992,7 +16032,7 @@ $t_y)
    -

    method unhtmlentities [line 7002]

    +

    method unhtmlentities [line 7024]

    @@ -16031,7 +16071,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 4285]

    +

    method UniArrSubString [line 4300]

    @@ -16085,7 +16125,7 @@ $end = ''])
    -

    method unichr [line 4318]

    +

    method unichr [line 4333]

    @@ -16130,7 +16170,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 4306]

    +

    method UTF8ArrayToUniArray [line 4321]

    @@ -16172,7 +16212,7 @@ $ta)
    -

    method UTF8ArrSubString [line 4262]

    +

    method UTF8ArrSubString [line 4277]

    @@ -16223,7 +16263,7 @@ $end = ''])
    -

    method utf8Bidi [line 8347]

    +

    method utf8Bidi [line 8369]

    @@ -16277,7 +16317,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 6640]

    +

    method UTF8StringToArray [line 6662]

    @@ -16343,7 +16383,7 @@ $str)
    -

    method utf8StrRev [line 8333]

    +

    method utf8StrRev [line 8355]

    @@ -16397,7 +16437,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 6747]

    +

    method UTF8ToLatin1 [line 6769]

    @@ -16439,7 +16479,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 6731]

    +

    method UTF8ToUTF16BE [line 6753]

    @@ -16490,7 +16530,7 @@ $setbom = true])
    -

    method Write [line 3928]

    +

    method Write [line 3943]

    @@ -16586,7 +16626,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 10331]

    +

    method write1DBarcode [line 10353]

    @@ -16676,7 +16716,7 @@ $align = ''])
    -

    method write2DBarcode [line 10584]

    +

    method write2DBarcode [line 10606]

    @@ -16760,7 +16800,7 @@ $align = ''])
    -

    method writeBarcode [line 10534]

    +

    method writeBarcode [line 10556]

    @@ -16850,7 +16890,7 @@ $code)
    -

    method writeDiskCache [line 13232]

    +

    method writeDiskCache [line 13254]

    @@ -16907,7 +16947,7 @@ $file)
    -

    method writeHTML [line 11234]

    +

    method writeHTML [line 11256]

    @@ -16973,7 +17013,7 @@ $align = ''])
    -

    method writeHTMLCell [line 10822]

    +

    method writeHTMLCell [line 10844]

    @@ -17075,7 +17115,7 @@ $autopadding = true])
    -

    method _addfield [line 9068]

    +

    method _addfield [line 9090]

    @@ -17147,7 +17187,7 @@ $prop)
    -

    method _beginpage [line 6420]

    +

    method _beginpage [line 6442]

    @@ -17189,7 +17229,7 @@ $format = ''])
    -

    method _datastring [line 6530]

    +

    method _datastring [line 6552]

    @@ -17228,7 +17268,7 @@ $s)
    -

    method _destroy [line 5115]

    +

    method _destroy [line 5130]

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

    method _dochecks [line 5142]

    +

    method _dochecks [line 5157]

    @@ -17298,7 +17338,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 6495]

    +

    method _dolinethrough [line 6517]

    @@ -17346,7 +17386,7 @@ $txt)
    -

    method _dounderline [line 6481]

    +

    method _dounderline [line 6503]

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

    method _enddoc [line 6359]

    +

    method _enddoc [line 6381]

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

    method _endpage [line 6459]

    +

    method _endpage [line 6481]

    @@ -17444,7 +17484,7 @@ $txt)
    -

    method _escape [line 6519]

    +

    method _escape [line 6541]

    @@ -17483,7 +17523,7 @@ $s)
    -

    method _escapetext [line 6557]

    +

    method _escapetext [line 6579]

    @@ -17522,7 +17562,7 @@ $s)
    -

    method _freadint [line 6508]

    +

    method _freadint [line 6530]

    @@ -17561,7 +17601,7 @@ $f)
    -

    method _generateencryptionkey [line 7122]

    +

    method _generateencryptionkey [line 7144]

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

    method _getfontpath [line 5158]

    +

    method _getfontpath [line 5173]

    @@ -17640,7 +17680,7 @@ $protection)
    -

    method _JScolor [line 9044]

    +

    method _JScolor [line 9066]

    @@ -17676,7 +17716,7 @@ $color)
    -

    method _md5_16 [line 7083]

    +

    method _md5_16 [line 7105]

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

    method _newobj [line 6468]

    +

    method _newobj [line 6490]

    @@ -17746,7 +17786,7 @@ $str)
    -

    method _objectkey [line 7015]

    +

    method _objectkey [line 7037]

    @@ -17785,7 +17825,7 @@ $n)
    -

    method _out [line 6588]

    +

    method _out [line 6610]

    @@ -17821,7 +17861,7 @@ $s)
    -

    method _outarc [line 9944]

    +

    method _outarc [line 9966]

    @@ -17893,7 +17933,7 @@ $y3)
    -

    method _outCurve [line 7642]

    +

    method _outCurve [line 7664]

    @@ -17959,7 +17999,7 @@ $y3)
    -

    method _outLine [line 7606]

    +

    method _outLine [line 7628]

    @@ -18001,7 +18041,7 @@ $y)
    -

    method _outPoint [line 7592]

    +

    method _outPoint [line 7614]

    @@ -18043,7 +18083,7 @@ $y)
    -

    method _outRect [line 7623]

    +

    method _outRect [line 7645]

    @@ -18106,7 +18146,7 @@ $op)
    -

    method _Ovalue [line 7096]

    +

    method _Ovalue [line 7118]

    @@ -18157,7 +18197,7 @@ $owner_pass)
    -

    method _parsejpeg [line 4595]

    +

    method _parsejpeg [line 4610]

    @@ -18196,7 +18236,7 @@ $file)
    -

    method _parsepng [line 4621]

    +

    method _parsepng [line 4636]

    @@ -18235,7 +18275,7 @@ $file)
    -

    method _putannots [line 5314]

    +

    method _putannots [line 5329]

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

    method _putbookmarks [line 8942]

    +

    method _putbookmarks [line 8964]

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

    method _putcatalog [line 6224]

    +

    method _putcatalog [line 6246]

    @@ -18327,7 +18367,7 @@ $n)
    -

    method _putcertification [line 9269]

    +

    method _putcertification [line 9291]

    @@ -18352,7 +18392,7 @@ $n)
    -

    method _putcidfont0 [line 5980]

    +

    method _putcidfont0 [line 5995]

    @@ -18394,7 +18434,7 @@ $font)
    -

    method _putEmbeddedFiles [line 3232]

    +

    method _putEmbeddedFiles [line 3247]

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

    method _putencryption [line 7024]

    +

    method _putencryption [line 7046]

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

    method _putextgstates [line 9606]

    +

    method _putextgstates [line 9628]

    @@ -18478,7 +18518,7 @@ $font)
    -

    method _putfonts [line 5670]

    +

    method _putfonts [line 5685]

    @@ -18503,7 +18543,7 @@ $font)
    -

    method _putfontwidths [line 5797]

    +

    method _putfontwidths [line 5812]

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

    method _putheader [line 6351]

    +

    method _putheader [line 6373]

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

    method _putimages [line 6040]

    +

    method _putimages [line 6055]

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

    method _putinfo [line 6197]

    +

    method _putinfo [line 6212]

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

    method _putjavascript [line 9016]

    +

    method _putjavascript [line 9038]

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

    method _putocg [line 9527]

    +

    method _putocg [line 9549]

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

    method _putpages [line 5169]

    +

    method _putpages [line 5184]

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

    method _putresourcedict [line 6123]

    +

    method _putresourcedict [line 6138]

    @@ -18726,7 +18766,7 @@ $cidoffset = 0])
    -

    method _putresources [line 6164]

    +

    method _putresources [line 6179]

    @@ -18751,7 +18791,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 9894]

    +

    method _putshaders [line 9916]

    @@ -18782,7 +18822,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 6095]

    +

    method _putspotcolors [line 6110]

    @@ -18810,7 +18850,7 @@ $cidoffset = 0])
    -

    method _putstream [line 6574]

    +

    method _putstream [line 6596]

    @@ -18846,7 +18886,7 @@ $s)
    -

    method _puttrailer [line 6337]

    +

    method _puttrailer [line 6359]

    @@ -18871,7 +18911,7 @@ $s)
    -

    method _puttruetypeunicode [line 5895]

    +

    method _puttruetypeunicode [line 5910]

    @@ -18913,7 +18953,7 @@ $font)
    -

    method _putuserrights [line 9219]

    +

    method _putuserrights [line 9241]

    diff --git a/tcpdf.php b/tcpdf.php index b96a0c9..5c6e651 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-06-11 +// Last Update : 2009-06-15 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.015 +// Version : 4.6.016 // 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.015 + * @version 4.6.016 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.015 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.016 (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.015 + * @version 4.6.016 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1292,7 +1292,7 @@ if (!class_exists('TCPDF', false)) { * @access protected * @since 4.6.006 (2009-04-28) */ - protected $re_spaces = '/[\s\p{Z}\p{Lo}]/'; + protected $re_spaces = '/[\s]/'; //------------------------------------------------------------ // METHODS @@ -1419,7 +1419,8 @@ 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. - $this->re_spaces = '/[\s\p{Z}\p{Lo}]/'; + //$this->re_spaces = '/[\s\p{Z}\p{Lo}]/'; + $this->re_spaces = '/[\s\p{Z}]/'; } else { // PCRE unicode support is turned OFF $this->re_spaces = '/[\s]/'; @@ -1595,7 +1596,21 @@ if (!class_exists('TCPDF', false)) { // store page dimensions $this->pagedim[$this->page] = array('w' => $this->wPt, 'h' => $this->hPt, 'wk' => $this->w, 'hk' => $this->h, 'tm' => $this->tMargin, 'bm' => $bottommargin, 'lm' => $this->lMargin, 'rm' => $this->rMargin, 'pb' => $autopagebreak, 'or' => $this->CurOrientation, 'olm' => $this->original_lMargin, 'orm' => $this->original_rMargin); } - + + /** + * Set regular expression to detect withespaces or word separators. + * @param string $re regular expression (leave empty for default). + * @access public + * @since 4.6.016 (2009-06-15) + */ + public function setSpacesRE($re='/[\s]/') { + // if 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 = $re; + } + /** * Enable or disable Right-To-Left language mode * @param Boolean $enable if true enable Right-To-Left language mode. @@ -6195,23 +6210,30 @@ if (!class_exists('TCPDF', false)) { * @access protected */ protected function _putinfo() { - if (!$this->empty_string($this->title)) { - $this->_out('/Title '.$this->_textstring($this->title)); - } - if (!$this->empty_string($this->author)) { - $this->_out('/Author '.$this->_textstring($this->author)); - } - if (!$this->empty_string($this->subject)) { - $this->_out('/Subject '.$this->_textstring($this->subject)); - } - if (!$this->empty_string($this->keywords)) { - $this->_out('/Keywords '.$this->_textstring($this->keywords)); - } - if (!$this->empty_string($this->creator)) { - $this->_out('/Creator '.$this->_textstring($this->creator)); - } + if ($this->empty_string($this->title)) { + $this->title = '?'; + } + $this->_out('/Title '.$this->_textstring($this->title)); + if ($this->empty_string($this->author)) { + $this->author = '?'; + } + $this->_out('/Author '.$this->_textstring($this->author)); + if ($this->empty_string($this->subject)) { + $this->subject = '?'; + } + $this->_out('/Subject '.$this->_textstring($this->subject)); + if ($this->empty_string($this->keywords)) { + $this->keywords = '?'; + } + $this->_out('/Keywords '.$this->_textstring($this->keywords)); + if ($this->empty_string($this->creator)) { + $this->creator = '?'; + } + $this->_out('/Creator '.$this->_textstring($this->creator)); if (defined('PDF_PRODUCER')) { $this->_out('/Producer '.$this->_textstring(PDF_PRODUCER)); + } else { + $this->_out('/Producer '.$this->_textstring('TCPDF')); } $this->_out('/CreationDate '.$this->_datastring('D:'.date('YmdHis'))); $this->_out('/ModDate '.$this->_datastring('D:'.date('YmdHis')));
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 3a1d3a4..9d08f1c 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 Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    @@ -18938,7 +18978,7 @@ $font)
    -

    method _putviewerpreferences [line 6267]

    +

    method _putviewerpreferences [line 6289]

    diff --git a/doc/index.html b/doc/index.html index 3a1d3a4..9d08f1c 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 Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/errors.html b/doc/errors.html index 239d226..00417ab 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Thu, 11 Jun 2009 11:54:18 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by phpDocumentor 1.4.1
    @@ -18969,7 +19009,7 @@ $font)
    -

    method _putxobjectdict [line 6112]

    +

    method _putxobjectdict [line 6127]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 1b0e190..bb37d8e 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1174,6 +1174,8 @@
    in file tcpdf.php, method TCPDF::setRTL()
        Enable or disable Right-To-Left language mode
    setSignature
    in file tcpdf.php, method TCPDF::setSignature()
    +
    setSpacesRE
    +
    in file tcpdf.php, method TCPDF::setSpacesRE()
        Set regular expression to detect withespaces or word separators.
    SetSubject
    in file tcpdf.php, method TCPDF::SetSubject()
        Defines the subject of the document.
    setTableHeader
    @@ -1387,7 +1389,7 @@ top
    - Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 0a42d74..0ad3134 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1023,6 +1023,8 @@
    in file tcpdf.php, method TCPDF::setRTL()
        Enable or disable Right-To-Left language mode
    setSignature
    in file tcpdf.php, method TCPDF::setSignature()
    +
    setSpacesRE
    +
    in file tcpdf.php, method TCPDF::setSpacesRE()
        Set regular expression to detect withespaces or word separators.
    SetSubject
    in file tcpdf.php, method TCPDF::SetSubject()
        Defines the subject of the document.
    setTableHeader
    @@ -1364,7 +1366,7 @@ top
    - Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    @@ -18994,7 +19034,7 @@ $font)
    -

    method _RC4 [line 7043]

    +

    method _RC4 [line 7065]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index c6401d8..ab5dbde 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 Thu, 11 Jun 2009 11:54:18 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by phpDocumentor 1.4.1
    @@ -19045,7 +19085,7 @@ $text)
    -

    method _textstring [line 6543]

    +

    method _textstring [line 6565]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 27b622d..0904e56 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 345a90c..97707e4 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 Thu, 11 Jun 2009 11:54:08 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1
    @@ -19084,7 +19124,7 @@ $s)
    -

    method _toJPEG [line 4579]

    +

    method _toJPEG [line 4594]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 27d3321..2218cf6 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 Thu, 11 Jun 2009 11:54:18 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:17 +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 41e32b1..e0917df 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 Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    @@ -19126,7 +19166,7 @@ $file)
    -

    method _Uvalue [line 7109]

    +

    method _Uvalue [line 7131]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 63e5793..8a5953d 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
    - Documentation generated on Thu, 11 Jun 2009 11:54:07 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1
    @@ -19163,7 +19203,7 @@ $file)
    - Documentation generated on Thu, 11 Jun 2009 11:54:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1
    		author:  Nicola Asuni
    version:  4.6.015version:  4.6.016
    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.015 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.016 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data

    - Documentation generated on Thu, 11 Jun 2009 11:54:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1