diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index ed250e0..0340425 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.8.014 (2009-11-04) + - Bug item #2891316 "writeHTML, underlining replacing spaces" was fixed. + - The handling of temporary RTL text direction mode was fixed. + 4.8.013 (2009-10-26) - Bug item #2884729 "Problem with word-wrap and hyphen" was fixed. diff --git a/README.TXT b/README.TXT index 0b98d21..af9db52 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.8.013 -Release date: 2009-10-26 +Version: 4.8.014 +Release date: 2009-11-04 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 14ee60f..ed9bfeb 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@

- Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 39443d2..cf4adb1 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

  • ImagePngAlpha
  • IncludeJS
  • intToRoman
  • +
  • isRTLTextDir
  • lastPage
  • Line
  • LinearGradient
  • @@ -628,7 +629,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.8.013 + version:  4.8.014 link:  http://www.tcpdf.org @@ -6058,7 +6059,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 3582]

    +

    method AcceptPageBreak [line 3610]

    @@ -6089,7 +6090,7 @@ $diskcache = false])
    -

    method addExtGState [line 11339]

    +

    method addExtGState [line 11367]

    @@ -6125,7 +6126,7 @@ $parms)
    -

    method AddFont [line 3134]

    +

    method AddFont [line 3162]

    @@ -6182,7 +6183,7 @@ $fontfile = ''])
    -

    method addHtmlLink [line 7708]

    +

    method addHtmlLink [line 7736]

    @@ -6251,7 +6252,7 @@ $style = -1])
    -

    method addHTMLVertSpace [line 14855]

    +

    method addHTMLVertSpace [line 14883]

    @@ -6317,7 +6318,7 @@ $closing = false])
    -

    method addJavascriptObject [line 9959]

    +

    method addJavascriptObject [line 9987]

    @@ -6359,7 +6360,7 @@ $onload = false])
    -

    method AddLink [line 3375]

    +

    method AddLink [line 3403]

    @@ -6390,7 +6391,7 @@ $onload = false])
    -

    method AddPage [line 2350]

    +

    method AddPage [line 2378]

    @@ -6438,7 +6439,7 @@ $format = ''])
    -

    method AddSpotColor [line 2767]

    +

    method AddSpotColor [line 2795]

    @@ -6504,7 +6505,7 @@ $k)
    -

    method addTOC [line 15878]

    +

    method addTOC [line 15906]

    @@ -6564,7 +6565,7 @@ $toc_name = 'TOC'])
    -

    method AliasNbPages [line 11147]

    +

    method AliasNbPages [line 11175]

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

    method AliasNumPage [line 11174]

    +

    method AliasNumPage [line 11202]

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

    method Annotation [line 3431]

    +

    method Annotation [line 3459]

    @@ -6723,7 +6724,7 @@ $spaces = 0])
    -

    method Arrow [line 9201]

    +

    method Arrow [line 9229]

    @@ -6801,7 +6802,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 7606]

    +

    method arrUTF8ToUTF16BE [line 7634]

    @@ -6876,7 +6877,7 @@ $setbom = true])
    -

    method Bookmark [line 9845]

    +

    method Bookmark [line 9873]

    @@ -6930,7 +6931,7 @@ $page = ''])
    -

    method Button [line 10853]

    +

    method Button [line 10881]

    @@ -7020,7 +7021,7 @@ $js = false])
    -

    method Cell [line 3643]

    +

    method Cell [line 3671]

    @@ -7116,7 +7117,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 10783]

    +

    method CheckBox [line 10811]

    @@ -7200,7 +7201,7 @@ $js = false])
    -

    method checkPageBreak [line 3595]

    +

    method checkPageBreak [line 3623]

    @@ -7254,7 +7255,7 @@ $addpage = true])
    -

    method Circle [line 8835]

    +

    method Circle [line 8863]

    @@ -7353,7 +7354,7 @@ $afinish:)
    -

    method Clip [line 11602]

    +

    method Clip [line 11630]

    @@ -7413,7 +7414,7 @@ $h)
    -

    method Close [line 2244]

    +

    method Close [line 2272]

    @@ -7444,7 +7445,7 @@ $h)
    -

    method closeHTMLTagHandler [line 14518]

    +

    method closeHTMLTagHandler [line 14546]

    @@ -7498,7 +7499,7 @@ $dom)
    -

    method ComboBox [line 10722]

    +

    method ComboBox [line 10750]

    @@ -7582,7 +7583,7 @@ $js = false])
    -

    method commitTransaction [line 16037]

    +

    method commitTransaction [line 16065]

    @@ -7610,7 +7611,7 @@ $js = false])
    -

    method convertHTMLColorToDec [line 7741]

    +

    method convertHTMLColorToDec [line 7769]

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

    method CoonsPatchMesh [line 11522]

    +

    method CoonsPatchMesh [line 11550]

    @@ -7751,7 +7752,7 @@ $coords_max = 1])
    -

    method Curve [line 8610]

    +

    method Curve [line 8638]

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

    method deletePage [line 15737]

    +

    method deletePage [line 15765]

    @@ -7895,7 +7896,7 @@ $page)
    -

    method Ellipse [line 8731]

    +

    method Ellipse [line 8759]

    @@ -8012,7 +8013,7 @@ $afinish:)
    -

    method empty_string [line 16091]

    +

    method empty_string [line 16119]

    @@ -8054,7 +8055,7 @@ $str)
    -

    method endPage [line 2369]

    +

    method endPage [line 2397]

    @@ -8085,7 +8086,7 @@ $str)
    -

    method Error [line 2216]

    +

    method Error [line 2244]

    @@ -8124,7 +8125,7 @@ $msg)
    -

    method Footer [line 2608]

    +

    method Footer [line 2636]

    @@ -8149,7 +8150,7 @@ $msg)
    -

    method formatPageNumber [line 11251]

    +

    method formatPageNumber [line 11279]

    @@ -8188,7 +8189,7 @@ $num)
    -

    method formatTOCPageNumber [line 11263]

    +

    method formatTOCPageNumber [line 11291]

    @@ -8230,7 +8231,7 @@ $num)
    -

    method GetAbsX [line 5190]

    +

    method GetAbsX [line 5218]

    @@ -8261,7 +8262,7 @@ $num)
    -

    method getAliasNbPages [line 11159]

    +

    method getAliasNbPages [line 11187]

    @@ -8292,7 +8293,7 @@ $num)
    -

    method getAliasNumPage [line 11187]

    +

    method getAliasNumPage [line 11215]

    @@ -8323,7 +8324,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 10090]

    +

    method getAnnotOptFromJSProp [line 10118]

    @@ -8359,7 +8360,7 @@ $prop)
    -

    method GetArrStringWidth [line 3046]

    +

    method GetArrStringWidth [line 3074]

    @@ -8422,7 +8423,7 @@ $fontsize = 0])
    -

    method getBarcode [line 12073]

    +

    method getBarcode [line 12101]

    @@ -8450,7 +8451,7 @@ $fontsize = 0])
    -

    method getBorderMode [line 4092]

    +

    method getBorderMode [line 4120]

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

    method getBreakMargin [line 1947]

    +

    method getBreakMargin [line 1975]

    @@ -8546,7 +8547,7 @@ $pagenum = ''])
    -

    method getBuffer [line 15423]

    +

    method getBuffer [line 15451]

    @@ -8577,7 +8578,7 @@ $pagenum = ''])
    -

    method getCellCode [line 3695]

    +

    method getCellCode [line 3723]

    @@ -8673,7 +8674,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 11425]

    +

    method getCellHeightRatio [line 11453]

    @@ -8698,7 +8699,7 @@ $ignore_min_height = false])
    -

    method GetCharWidth [line 3073]

    +

    method GetCharWidth [line 3101]

    @@ -8743,7 +8744,7 @@ $char)
    -

    method getFontBuffer [line 15583]

    +

    method getFontBuffer [line 15611]

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

    method getFontFamily [line 12559]

    +

    method getFontFamily [line 12587]

    @@ -8816,7 +8817,7 @@ $font)
    -

    method getFontSize [line 12539]

    +

    method getFontSize [line 12567]

    @@ -8847,7 +8848,7 @@ $font)
    -

    method getFontSizePt [line 12549]

    +

    method getFontSizePt [line 12577]

    @@ -8878,7 +8879,7 @@ $font)
    -

    method getFontsList [line 3112]

    +

    method getFontsList [line 3140]

    @@ -8906,7 +8907,7 @@ $font)
    -

    method getFontStyle [line 12569]

    +

    method getFontStyle [line 12597]

    @@ -8937,7 +8938,7 @@ $font)
    -

    method getFooterFont [line 7667]

    +

    method getFooterFont [line 7695]

    @@ -8965,7 +8966,7 @@ $font)
    -

    method getFooterMargin [line 2522]

    +

    method getFooterMargin [line 2550]

    @@ -8993,7 +8994,7 @@ $font)
    -

    method getFormDefaultProp [line 10465]

    +

    method getFormDefaultProp [line 10493]

    @@ -9018,7 +9019,7 @@ $font)
    -

    method getGDgamma [line 5133]

    +

    method getGDgamma [line 5161]

    @@ -9057,7 +9058,7 @@ $v)
    -

    method getGraphicVars [line 15291]

    +

    method getGraphicVars [line 15319]

    @@ -9088,7 +9089,7 @@ $v)
    -

    method getGroupPageNo [line 11200]

    +

    method getGroupPageNo [line 11228]

    @@ -9113,7 +9114,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 11210]

    +

    method getGroupPageNoFormatted [line 11238]

    @@ -9144,7 +9145,7 @@ $v)
    -

    method getHeaderData [line 2477]

    +

    method getHeaderData [line 2505]

    @@ -9172,7 +9173,7 @@ $v)
    -

    method getHeaderFont [line 7647]

    +

    method getHeaderFont [line 7675]

    @@ -9200,7 +9201,7 @@ $v)
    -

    method getHeaderMargin [line 2502]

    +

    method getHeaderMargin [line 2530]

    @@ -9228,7 +9229,7 @@ $v)
    -

    method getHtmlDomArray [line 12605]

    +

    method getHtmlDomArray [line 12633]

    @@ -9267,7 +9268,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 15010]

    +

    method getHTMLUnitToUnits [line 15038]

    @@ -9333,7 +9334,7 @@ $point)
    -

    method getImageBuffer [line 15525]

    +

    method getImageBuffer [line 15553]

    @@ -9375,7 +9376,7 @@ $image)
    -

    method getImageRBX [line 2548]

    +

    method getImageRBX [line 2576]

    @@ -9400,7 +9401,7 @@ $image)
    -

    method getImageRBY [line 2557]

    +

    method getImageRBY [line 2585]

    @@ -9425,7 +9426,7 @@ $image)
    -

    method getImageScale [line 1886]

    +

    method getImageScale [line 1914]

    @@ -9459,7 +9460,7 @@ $image)
    -

    method getLastH [line 1864]

    +

    method getLastH [line 1892]

    @@ -9490,7 +9491,7 @@ $image)
    -

    method GetLineWidth [line 8324]

    +

    method GetLineWidth [line 8352]

    @@ -9524,7 +9525,7 @@ $image)
    -

    method getMargins [line 12502]

    +

    method getMargins [line 12530]

    @@ -9555,7 +9556,7 @@ $image)
    -

    method GetNumChars [line 3100]

    +

    method GetNumChars [line 3128]

    @@ -9597,7 +9598,7 @@ $s)
    -

    method getNumLines [line 4171]

    +

    method getNumLines [line 4199]

    @@ -9645,7 +9646,7 @@ $w = 0])
    -

    method getNumPages [line 2337]

    +

    method getNumPages [line 2365]

    @@ -9679,7 +9680,7 @@ $w = 0])
    -

    method getObjFilename [line 15355]

    +

    method getObjFilename [line 15383]

    @@ -9724,7 +9725,7 @@ $prefix)
    -

    method getOriginalMargins [line 12525]

    +

    method getOriginalMargins [line 12553]

    @@ -9755,7 +9756,7 @@ $prefix)
    -

    method getPage [line 2325]

    +

    method getPage [line 2353]

    @@ -9789,7 +9790,7 @@ $prefix)
    -

    method getPageBuffer [line 15466]

    +

    method getPageBuffer [line 15494]

    @@ -9831,7 +9832,7 @@ $page)
    -

    method getPageDimensions [line 1899]

    +

    method getPageDimensions [line 1927]

    @@ -9876,7 +9877,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 11222]

    +

    method getPageGroupAlias [line 11250]

    @@ -9901,7 +9902,7 @@ $pagenum = ''])
    -

    method getPageHeight [line 1931]

    +

    method getPageHeight [line 1959]

    @@ -9949,7 +9950,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 11237]

    +

    method getPageNumGroupAlias [line 11265]

    @@ -9974,7 +9975,7 @@ $pagenum = ''])
    -

    method getPageWidth [line 1915]

    +

    method getPageWidth [line 1943]

    @@ -10022,7 +10023,7 @@ $pagenum = ''])
    -

    method getPDFData [line 7690]

    +

    method getPDFData [line 7718]

    @@ -10047,7 +10048,7 @@ $pagenum = ''])
    -

    method getRemainingWidth [line 4542]

    +

    method getRemainingWidth [line 4570]

    @@ -10103,7 +10104,7 @@ $pagenum = ''])
    -

    method getScaleFactor [line 1961]

    +

    method getScaleFactor [line 1989]

    @@ -10137,7 +10138,7 @@ $pagenum = ''])
    -

    method GetStringWidth [line 3031]

    +

    method GetStringWidth [line 3059]

    @@ -10200,7 +10201,7 @@ $fontsize = 0])
    -

    method GetX [line 5174]

    +

    method GetX [line 5202]

    @@ -10231,7 +10232,7 @@ $fontsize = 0])
    -

    method GetY [line 5201]

    +

    method GetY [line 5229]

    @@ -10262,7 +10263,7 @@ $fontsize = 0])
    -

    method get_mqr [line 4893]

    +

    method get_mqr [line 4921]

    @@ -10293,7 +10294,7 @@ $fontsize = 0])
    -

    method Gradient [line 11625]

    +

    method Gradient [line 11653]

    @@ -10353,7 +10354,7 @@ $coords)
    -

    method Header [line 2566]

    +

    method Header [line 2594]

    @@ -10378,7 +10379,7 @@ $coords)
    -

    method Image [line 4665]

    +

    method Image [line 4693]

    @@ -10510,7 +10511,7 @@ $hidden = false])
    -

    method ImageEps [line 11797]

    +

    method ImageEps [line 11825]

    @@ -10606,7 +10607,7 @@ $border = 0])
    -

    method ImagePngAlpha [line 5089]

    +

    method ImagePngAlpha [line 5117]

    @@ -10711,7 +10712,7 @@ $palign = ''])
    -

    method IncludeJS [line 9946]

    +

    method IncludeJS [line 9974]

    @@ -10747,7 +10748,7 @@ $script)
    -

    method intToRoman [line 15084]

    +

    method intToRoman [line 15112]

    @@ -10787,9 +10788,37 @@ $number)
    [ Top ]
    +
    + +

    method isRTLTextDir [line 1871]

    +
    +
    +
    + boolean isRTLTextDir( +) +
    +

    + + Return the current temporary RTL status



    +

    Tags:

    +
    + + + + + + + +
    since:  4.8.014 (2009-11-04)
    access:  public
    +
    +

    + + +
    [ Top ]
    +

    -

    method lastPage [line 2314]

    +

    method lastPage [line 2342]

    @@ -10831,7 +10860,7 @@ $resetmargins = false])
    -

    method Line [line 8477]

    +

    method Line [line 8505]

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

    method LinearGradient [line 11482]

    +

    method LinearGradient [line 11510]

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

    method Link [line 3414]

    +

    method Link [line 3442]

    @@ -11047,7 +11076,7 @@ $spaces = 0])
    -

    method ListBox [line 10662]

    +

    method ListBox [line 10690]

    @@ -11131,7 +11160,7 @@ $js = false])
    -

    method Ln [line 5146]

    +

    method Ln [line 5174]

    @@ -11179,7 +11208,7 @@ $cell = false])
    -

    method MirrorH [line 8096]

    +

    method MirrorH [line 8124]

    @@ -11221,7 +11250,7 @@ $x = ''])
    -

    method MirrorL [line 8132]

    +

    method MirrorL [line 8160]

    @@ -11275,7 +11304,7 @@ $y = ''])
    -

    method MirrorP [line 8119]

    +

    method MirrorP [line 8147]

    @@ -11323,7 +11352,7 @@ $y = ''])
    -

    method MirrorV [line 8107]

    +

    method MirrorV [line 8135]

    @@ -11365,7 +11394,7 @@ $y = ''])
    -

    method movePage [line 15600]

    +

    method movePage [line 15628]

    @@ -11413,7 +11442,7 @@ $topage)
    -

    method MultiCell [line 3933]

    +

    method MultiCell [line 3961]

    @@ -11539,7 +11568,7 @@ $maxh = 0])
    -

    method objclone [line 16080]

    +

    method objclone [line 16108]

    @@ -11581,7 +11610,7 @@ $object)
    -

    method Open [line 2231]

    +

    method Open [line 2259]

    @@ -11612,7 +11641,7 @@ $object)
    -

    method openHTMLTagHandler [line 13981]

    +

    method openHTMLTagHandler [line 14009]

    @@ -11666,7 +11695,7 @@ $dom)
    -

    method Output [line 5293]

    +

    method Output [line 5321]

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

    method PageNo [line 2751]

    +

    method PageNo [line 2779]

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

    method PageNoFormatted [line 11273]

    +

    method PageNoFormatted [line 11301]

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

    method PieSector [line 11719]

    +

    method PieSector [line 11747]

    @@ -11881,7 +11910,7 @@ $o:)
    -

    method pixelsToUnits [line 7798]

    +

    method pixelsToUnits [line 7826]

    @@ -11923,7 +11952,7 @@ $px)
    -

    method Polycurve [line 8667]

    +

    method Polycurve [line 8695]

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

    method Polygon [line 8887]

    +

    method Polygon [line 8915]

    @@ -12058,7 +12087,7 @@ $closed = true])
    -

    method PolyLine [line 8861]

    +

    method PolyLine [line 8889]

    @@ -12121,7 +12150,7 @@ $closed)
    -

    method putHtmlListBullet [line 15149]

    +

    method putHtmlListBullet [line 15177]

    @@ -12172,7 +12201,7 @@ $size = 10])
    -

    method RadialGradient [line 11500]

    +

    method RadialGradient [line 11528]

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

    method RadioButton [line 10574]

    +

    method RadioButton [line 10602]

    @@ -12334,7 +12363,7 @@ $js = false])
    -

    method readDiskCache [line 15395]

    +

    method readDiskCache [line 15423]

    @@ -12382,7 +12411,7 @@ $file)
    -

    method Rect [line 8512]

    +

    method Rect [line 8540]

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

    method RegularPolygon [line 9012]

    +

    method RegularPolygon [line 9040]

    @@ -12571,7 +12600,7 @@ $r:)
    -

    method removeSHY [line 3660]

    +

    method removeSHY [line 3688]

    @@ -12613,7 +12642,7 @@ $txt = ''])
    -

    method rfread [line 5059]

    +

    method rfread [line 5087]

    @@ -12664,7 +12693,7 @@ $length)
    -

    method rollbackTransaction [line 16051]

    +

    method rollbackTransaction [line 16079]

    @@ -12706,7 +12735,7 @@ $self = false])
    -

    method Rotate [line 8191]

    +

    method Rotate [line 8219]

    @@ -12760,7 +12789,7 @@ $y = ''])
    -

    method RoundedRect [line 9116]

    +

    method RoundedRect [line 9144]

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

    method Scale [line 8061]

    +

    method Scale [line 8089]

    @@ -12907,7 +12936,7 @@ $y = ''])
    -

    method ScaleX [line 8021]

    +

    method ScaleX [line 8049]

    @@ -12961,7 +12990,7 @@ $y = ''])
    -

    method ScaleXY [line 8047]

    +

    method ScaleXY [line 8075]

    @@ -13015,7 +13044,7 @@ $y = ''])
    -

    method ScaleY [line 8034]

    +

    method ScaleY [line 8062]

    @@ -13069,7 +13098,7 @@ $y = ''])
    -

    method setAlpha [line 11382]

    +

    method setAlpha [line 11410]

    @@ -13111,7 +13140,7 @@ $bm = 'Normal'])
    -

    method SetAuthor [line 2180]

    +

    method SetAuthor [line 2208]

    @@ -13153,7 +13182,7 @@ $author)
    -

    method SetAutoPageBreak [line 2047]

    +

    method SetAutoPageBreak [line 2075]

    @@ -13201,7 +13230,7 @@ $margin = 0])
    -

    method setBarcode [line 12063]

    +

    method setBarcode [line 12091]

    @@ -13237,7 +13266,7 @@ $bc = ''])
    -

    method SetBooklet [line 14924]

    +

    method SetBooklet [line 14952]

    @@ -13288,7 +13317,7 @@ $outer = -1])
    -

    method setBuffer [line 15405]

    +

    method setBuffer [line 15433]

    @@ -13327,7 +13356,7 @@ $data)
    -

    method setCellHeightRatio [line 11416]

    +

    method setCellHeightRatio [line 11444]

    @@ -13363,7 +13392,7 @@ $h)
    -

    method SetCellPadding [line 2035]

    +

    method SetCellPadding [line 2063]

    @@ -13405,7 +13434,7 @@ $pad)
    -

    method SetCompression [line 2140]

    +

    method SetCompression [line 2168]

    @@ -13444,7 +13473,7 @@ $compress)
    -

    method setContentMark [line 2444]

    +

    method setContentMark [line 2472]

    @@ -13483,7 +13512,7 @@ $page = 0])
    -

    method SetCreator [line 2204]

    +

    method SetCreator [line 2232]

    @@ -13525,7 +13554,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 3364]

    +

    method SetDefaultMonospacedFont [line 3392]

    @@ -13564,7 +13593,7 @@ $font)
    -

    method setDefaultTableColumns [line 11406]

    +

    method setDefaultTableColumns [line 11434]

    @@ -13600,7 +13629,7 @@ $cols = 4])
    -

    method SetDisplayMode [line 2062]

    +

    method SetDisplayMode [line 2090]

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

    method SetDrawColor [line 2806]

    +

    method SetDrawColor [line 2834]

    @@ -13711,7 +13740,7 @@ $col4 = -1])
    -

    method SetDrawColorArray [line 2783]

    +

    method SetDrawColorArray [line 2811]

    @@ -13753,7 +13782,7 @@ $color)
    -

    method SetDrawSpotColor [line 2844]

    +

    method SetDrawSpotColor [line 2872]

    @@ -13801,7 +13830,7 @@ $tint = 100])
    -

    method setExtGState [line 11351]

    +

    method setExtGState [line 11379]

    @@ -13837,7 +13866,7 @@ $gs)
    -

    method SetFillColor [line 2886]

    +

    method SetFillColor [line 2914]

    @@ -13897,7 +13926,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 2863]

    +

    method SetFillColorArray [line 2891]

    @@ -13939,7 +13968,7 @@ $color)
    -

    method SetFillSpotColor [line 2928]

    +

    method SetFillSpotColor [line 2956]

    @@ -13987,7 +14016,7 @@ $tint = 100])
    -

    method SetFont [line 3319]

    +

    method SetFont [line 3347]

    @@ -14047,7 +14076,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 15541]

    +

    method setFontBuffer [line 15569]

    @@ -14092,7 +14121,7 @@ $data)
    -

    method SetFontSize [line 3339]

    +

    method SetFontSize [line 3367]

    @@ -14134,7 +14163,7 @@ $size)
    -

    method setFontSubBuffer [line 15563]

    +

    method setFontSubBuffer [line 15591]

    @@ -14185,7 +14214,7 @@ $data)
    -

    method setFooter [line 2674]

    +

    method setFooter [line 2702]

    @@ -14213,7 +14242,7 @@ $data)
    -

    method setFooterFont [line 7657]

    +

    method setFooterFont [line 7685]

    @@ -14252,7 +14281,7 @@ $font)
    -

    method setFooterMargin [line 2512]

    +

    method setFooterMargin [line 2540]

    @@ -14288,7 +14317,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 10454]

    +

    method setFormDefaultProp [line 10482]

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

    method setGraphicVars [line 15322]

    +

    method setGraphicVars [line 15350]

    @@ -14363,7 +14392,7 @@ $gvars)
    -

    method setHeader [line 2643]

    +

    method setHeader [line 2671]

    @@ -14391,7 +14420,7 @@ $gvars)
    -

    method setHeaderData [line 2463]

    +

    method setHeaderData [line 2491]

    @@ -14445,7 +14474,7 @@ $hs = ''])
    -

    method setHeaderFont [line 7637]

    +

    method setHeaderFont [line 7665]

    @@ -14484,7 +14513,7 @@ $font)
    -

    method setHeaderMargin [line 2492]

    +

    method setHeaderMargin [line 2520]

    @@ -14520,7 +14549,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 14995]

    +

    method setHtmlLinksStyle [line 15023]

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

    method setHtmlVSpace [line 14964]

    +

    method setHtmlVSpace [line 14992]

    @@ -14604,7 +14633,7 @@ $tagvs)
    -

    method setImageBuffer [line 15482]

    +

    method setImageBuffer [line 15510]

    @@ -14649,7 +14678,7 @@ $data)
    -

    method setImageScale [line 1875]

    +

    method setImageScale [line 1903]

    @@ -14691,7 +14720,7 @@ $scale)
    -

    method setImageSubBuffer [line 15505]

    +

    method setImageSubBuffer [line 15533]

    @@ -14742,7 +14771,7 @@ $data)
    -

    method setJPEGQuality [line 11393]

    +

    method setJPEGQuality [line 11421]

    @@ -14778,7 +14807,7 @@ $quality)
    -

    method SetKeywords [line 2192]

    +

    method SetKeywords [line 2220]

    @@ -14820,7 +14849,7 @@ $keywords)
    -

    method setLanguageArray [line 7677]

    +

    method setLanguageArray [line 7705]

    @@ -14859,7 +14888,7 @@ $language)
    -

    method setLastH [line 1854]

    +

    method setLastH [line 1882]

    @@ -14901,7 +14930,7 @@ $h)
    -

    method SetLeftMargin [line 1991]

    +

    method SetLeftMargin [line 2019]

    @@ -14943,7 +14972,7 @@ $margin)
    -

    method SetLineStyle [line 8349]

    +

    method SetLineStyle [line 8377]

    @@ -14989,7 +15018,7 @@ $style)
    -

    method SetLineWidth [line 8308]

    +

    method SetLineWidth [line 8336]

    @@ -15031,7 +15060,7 @@ $width)
    -

    method SetLink [line 3391]

    +

    method SetLink [line 3419]

    @@ -15085,7 +15114,7 @@ $page = -1])
    -

    method setListIndentWidth [line 14974]

    +

    method setListIndentWidth [line 15002]

    @@ -15124,7 +15153,7 @@ $width)
    -

    method setLIsymbol [line 14884]

    +

    method setLIsymbol [line 14912]

    @@ -15163,7 +15192,7 @@ $symbol = '!'])
    -

    method SetMargins [line 1974]

    +

    method SetMargins [line 2002]

    @@ -15217,7 +15246,7 @@ $right = -1])
    -

    method setOpenCell [line 14984]

    +

    method setOpenCell [line 15012]

    @@ -15256,7 +15285,7 @@ $isopen)
    -

    method setPage [line 2267]

    +

    method setPage [line 2295]

    @@ -15304,7 +15333,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 15439]

    +

    method setPageBuffer [line 15467]

    @@ -15400,7 +15429,7 @@ $orientation = 'P'])
    -

    method setPageMark [line 2433]

    +

    method setPageMark [line 2461]

    @@ -15518,7 +15547,7 @@ $unit)
    -

    method setPDFVersion [line 11435]

    +

    method setPDFVersion [line 11463]

    @@ -15554,7 +15583,7 @@ $version = '1.7'])
    -

    method setPrintFooter [line 2539]

    +

    method setPrintFooter [line 2567]

    @@ -15596,7 +15625,7 @@ $value)
    -

    method setPrintHeader [line 2530]

    +

    method setPrintHeader [line 2558]

    @@ -15632,7 +15661,7 @@ $val = true])
    -

    method SetProtection [line 7961]

    +

    method SetProtection [line 7989]

    @@ -15686,7 +15715,7 @@ $owner_pass = null])
    -

    method SetRightMargin [line 2021]

    +

    method SetRightMargin [line 2049]

    @@ -15773,7 +15802,7 @@ $resetx = true])
    -

    method setSignature [line 11104]

    +

    method setSignature [line 11132]

    @@ -15878,7 +15907,7 @@ $re = '/[\s]/'])
    -

    method SetSubject [line 2168]

    +

    method SetSubject [line 2196]

    @@ -15920,7 +15949,7 @@ $subject)
    -

    method setTableHeader [line 2716]

    +

    method setTableHeader [line 2744]

    @@ -15987,7 +16016,7 @@ $mode)
    -

    method SetTextColor [line 2970]

    +

    method SetTextColor [line 2998]

    @@ -16047,7 +16076,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 2947]

    +

    method SetTextColorArray [line 2975]

    @@ -16089,7 +16118,7 @@ $color)
    -

    method SetTextSpotColor [line 3009]

    +

    method SetTextSpotColor [line 3037]

    @@ -16137,7 +16166,7 @@ $tint = 100])
    -

    method SetTitle [line 2156]

    +

    method SetTitle [line 2184]

    @@ -16179,7 +16208,7 @@ $title)
    -

    method SetTopMargin [line 2006]

    +

    method SetTopMargin [line 2034]

    @@ -16221,7 +16250,7 @@ $margin)
    -

    method setUserRights [line 11074]

    +

    method setUserRights [line 11102]

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

    method setViewerPreferences [line 11465]

    +

    method setViewerPreferences [line 11493]

    @@ -16317,7 +16346,7 @@ $preferences)
    -

    method setVisibility [line 11303]

    +

    method setVisibility [line 11331]

    @@ -16353,7 +16382,7 @@ $v)
    -

    method SetX [line 5214]

    +

    method SetX [line 5242]

    @@ -16395,7 +16424,7 @@ $x)
    -

    method SetXY [line 5277]

    +

    method SetXY [line 5305]

    @@ -16443,7 +16472,7 @@ $y)
    -

    method SetY [line 5246]

    +

    method SetY [line 5274]

    @@ -16491,7 +16520,7 @@ $resetx = true])
    -

    method set_mqr [line 4878]

    +

    method set_mqr [line 4906]

    @@ -16530,7 +16559,7 @@ $mqr)
    -

    method Skew [line 8251]

    +

    method Skew [line 8279]

    @@ -16590,7 +16619,7 @@ $y = ''])
    -

    method SkewX [line 8224]

    +

    method SkewX [line 8252]

    @@ -16644,7 +16673,7 @@ $y = ''])
    -

    method SkewY [line 8237]

    +

    method SkewY [line 8265]

    @@ -16698,7 +16727,7 @@ $y = ''])
    -

    method StarPolygon [line 9067]

    +

    method StarPolygon [line 9095]

    @@ -16822,7 +16851,7 @@ $draw_circle:)
    -

    method startPage [line 2393]

    +

    method startPage [line 2421]

    @@ -16870,7 +16899,7 @@ $format = ''])
    -

    method startPageGroup [line 11132]

    +

    method startPageGroup [line 11160]

    @@ -16906,7 +16935,7 @@ $page = ''])
    -

    method startTransaction [line 16021]

    +

    method startTransaction [line 16049]

    @@ -16934,7 +16963,7 @@ $page = ''])
    -

    method StartTransform [line 7989]

    +

    method StartTransform [line 8017]

    @@ -16965,7 +16994,7 @@ $page = ''])
    -

    method StopTransform [line 8004]

    +

    method StopTransform [line 8032]

    @@ -16996,7 +17025,7 @@ $page = ''])
    -

    method swapMargins [line 14940]

    +

    method swapMargins [line 14968]

    @@ -17035,7 +17064,7 @@ $reverse = true])
    -

    method Text [line 3542]

    +

    method Text [line 3570]

    @@ -17104,7 +17133,7 @@ $clip = false])
    -

    method TextField [line 10483]

    +

    method TextField [line 10511]

    @@ -17182,7 +17211,7 @@ $js = false])
    -

    method Transform [line 8284]

    +

    method Transform [line 8312]

    @@ -17224,7 +17253,7 @@ $tm)
    -

    method Translate [line 8167]

    +

    method Translate [line 8195]

    @@ -17272,7 +17301,7 @@ $t_y)
    -

    method TranslateX [line 8144]

    +

    method TranslateX [line 8172]

    @@ -17314,7 +17343,7 @@ $t_x)
    -

    method TranslateY [line 8155]

    +

    method TranslateY [line 8183]

    @@ -17356,7 +17385,7 @@ $t_y)
    -

    method unhtmlentities [line 7809]

    +

    method unhtmlentities [line 7837]

    @@ -17395,7 +17424,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 4581]

    +

    method UniArrSubString [line 4609]

    @@ -17449,7 +17478,7 @@ $end = ''])
    -

    method unichr [line 4614]

    +

    method unichr [line 4642]

    @@ -17494,7 +17523,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 4602]

    +

    method UTF8ArrayToUniArray [line 4630]

    @@ -17536,7 +17565,7 @@ $ta)
    -

    method UTF8ArrSubString [line 4558]

    +

    method UTF8ArrSubString [line 4586]

    @@ -17587,7 +17616,7 @@ $end = ''])
    -

    method utf8Bidi [line 9274]

    +

    method utf8Bidi [line 9302]

    @@ -17641,7 +17670,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 7439]

    +

    method UTF8StringToArray [line 7467]

    @@ -17707,7 +17736,7 @@ $str)
    -

    method utf8StrRev [line 9260]

    +

    method utf8StrRev [line 9288]

    @@ -17761,7 +17790,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 7546]

    +

    method UTF8ToLatin1 [line 7574]

    @@ -17803,7 +17832,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 7530]

    +

    method UTF8ToUTF16BE [line 7558]

    @@ -17854,7 +17883,7 @@ $setbom = true])
    -

    method Write [line 4214]

    +

    method Write [line 4242]

    @@ -17950,7 +17979,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 12092]

    +

    method write1DBarcode [line 12120]

    @@ -18040,7 +18069,7 @@ $align = ''])
    -

    method write2DBarcode [line 12349]

    +

    method write2DBarcode [line 12377]

    @@ -18124,7 +18153,7 @@ $align = ''])
    -

    method writeBarcode [line 12299]

    +

    method writeBarcode [line 12327]

    @@ -18214,7 +18243,7 @@ $code)
    -

    method writeDiskCache [line 15367]

    +

    method writeDiskCache [line 15395]

    @@ -18271,7 +18300,7 @@ $file)
    -

    method writeHTML [line 13045]

    +

    method writeHTML [line 13073]

    @@ -18337,7 +18366,7 @@ $align = ''])
    -

    method writeHTMLCell [line 12593]

    +

    method writeHTMLCell [line 12621]

    @@ -18439,7 +18468,7 @@ $autopadding = true])
    -

    method _addfield [line 10055]

    +

    method _addfield [line 10083]

    @@ -18511,7 +18540,7 @@ $prop)
    -

    method _beginpage [line 7182]

    +

    method _beginpage [line 7210]

    @@ -18553,7 +18582,7 @@ $format = ''])
    -

    method _datastring [line 7318]

    +

    method _datastring [line 7346]

    @@ -18592,7 +18621,7 @@ $s)
    -

    method _datestring [line 7331]

    +

    method _datestring [line 7359]

    @@ -18623,7 +18652,7 @@ $s)
    -

    method _destroy [line 5448]

    +

    method _destroy [line 5476]

    @@ -18668,7 +18697,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 5476]

    +

    method _dochecks [line 5504]

    @@ -18693,7 +18722,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 7257]

    +

    method _dolinethrough [line 7285]

    @@ -18741,7 +18770,7 @@ $txt)
    -

    method _dolinethroughw [line 7284]

    +

    method _dolinethroughw [line 7312]

    @@ -18798,7 +18827,7 @@ $txt)
    -

    method _dounderline [line 7245]

    +

    method _dounderline [line 7273]

    @@ -18846,7 +18875,7 @@ $txt)
    -

    method _dounderlinew [line 7270]

    +

    method _dounderlinew [line 7298]

    @@ -18897,7 +18926,7 @@ $w)
    -

    method _enddoc [line 7065]

    +

    method _enddoc [line 7093]

    @@ -18922,7 +18951,7 @@ $w)
    -

    method _endpage [line 7221]

    +

    method _endpage [line 7249]

    @@ -18947,7 +18976,7 @@ $w)
    -

    method _escape [line 7307]

    +

    method _escape [line 7335]

    @@ -18986,7 +19015,7 @@ $s)
    -

    method _escapetext [line 7356]

    +

    method _escapetext [line 7384]

    @@ -19025,7 +19054,7 @@ $s)
    -

    method _freadint [line 7296]

    +

    method _freadint [line 7324]

    @@ -19064,7 +19093,7 @@ $f)
    -

    method _generateencryptionkey [line 7929]

    +

    method _generateencryptionkey [line 7957]

    @@ -19118,7 +19147,7 @@ $protection)
    -

    method _getfontpath [line 5492]

    +

    method _getfontpath [line 5520]

    @@ -19143,7 +19172,7 @@ $protection)
    -

    method _JScolor [line 10031]

    +

    method _JScolor [line 10059]

    @@ -19179,7 +19208,7 @@ $color)
    -

    method _md5_16 [line 7890]

    +

    method _md5_16 [line 7918]

    @@ -19224,7 +19253,7 @@ $str)
    -

    method _newobj [line 7231]

    +

    method _newobj [line 7259]

    @@ -19252,7 +19281,7 @@ $str)
    -

    method _objectkey [line 7822]

    +

    method _objectkey [line 7850]

    @@ -19291,7 +19320,7 @@ $n)
    -

    method _out [line 7387]

    +

    method _out [line 7415]

    @@ -19327,7 +19356,7 @@ $s)
    -

    method _outarc [line 11699]

    +

    method _outarc [line 11727]

    @@ -19399,7 +19428,7 @@ $y3)
    -

    method _outCurve [line 8457]

    +

    method _outCurve [line 8485]

    @@ -19465,7 +19494,7 @@ $y3)
    -

    method _outLine [line 8421]

    +

    method _outLine [line 8449]

    @@ -19507,7 +19536,7 @@ $y)
    -

    method _outPoint [line 8407]

    +

    method _outPoint [line 8435]

    @@ -19549,7 +19578,7 @@ $y)
    -

    method _outRect [line 8438]

    +

    method _outRect [line 8466]

    @@ -19612,7 +19641,7 @@ $op)
    -

    method _Ovalue [line 7903]

    +

    method _Ovalue [line 7931]

    @@ -19663,7 +19692,7 @@ $owner_pass)
    -

    method _parsejpeg [line 4928]

    +

    method _parsejpeg [line 4956]

    @@ -19702,7 +19731,7 @@ $file)
    -

    method _parsepng [line 4954]

    +

    method _parsepng [line 4982]

    @@ -19741,7 +19770,7 @@ $file)
    -

    method _putannotsobjs [line 5675]

    +

    method _putannotsobjs [line 5703]

    @@ -19772,7 +19801,7 @@ $file)
    -

    method _putannotsrefs [line 5644]

    +

    method _putannotsrefs [line 5672]

    @@ -19814,7 +19843,7 @@ $n)
    -

    method _putAPXObject [line 6282]

    +

    method _putAPXObject [line 6310]

    @@ -19868,7 +19897,7 @@ $stream = ''])
    -

    method _putbookmarks [line 9873]

    +

    method _putbookmarks [line 9901]

    @@ -19893,7 +19922,7 @@ $stream = ''])
    -

    method _putcatalog [line 6890]

    +

    method _putcatalog [line 6918]

    @@ -19918,7 +19947,7 @@ $stream = ''])
    -

    method _putcidfont0 [line 6633]

    +

    method _putcidfont0 [line 6661]

    @@ -19963,7 +19992,7 @@ $font)
    -

    method _putEmbeddedFiles [line 3511]

    +

    method _putEmbeddedFiles [line 3539]

    @@ -19994,7 +20023,7 @@ $font)
    -

    method _putencryption [line 7831]

    +

    method _putencryption [line 7859]

    @@ -20022,7 +20051,7 @@ $font)
    -

    method _putextgstates [line 11361]

    +

    method _putextgstates [line 11389]

    @@ -20047,7 +20076,7 @@ $font)
    -

    method _putfonts [line 6310]

    +

    method _putfonts [line 6338]

    @@ -20072,7 +20101,7 @@ $font)
    -

    method _putfontwidths [line 6445]

    +

    method _putfontwidths [line 6473]

    @@ -20120,7 +20149,7 @@ $cidoffset = 0])
    -

    method _putheader [line 7057]

    +

    method _putheader [line 7085]

    @@ -20145,7 +20174,7 @@ $cidoffset = 0])
    -

    method _putimages [line 6698]

    +

    method _putimages [line 6726]

    @@ -20170,7 +20199,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 6856]

    +

    method _putinfo [line 6884]

    @@ -20195,7 +20224,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 9971]

    +

    method _putjavascript [line 9999]

    @@ -20220,7 +20249,7 @@ $cidoffset = 0])
    -

    method _putocg [line 11282]

    +

    method _putocg [line 11310]

    @@ -20245,7 +20274,7 @@ $cidoffset = 0])
    -

    method _putpages [line 5503]

    +

    method _putpages [line 5531]

    @@ -20270,7 +20299,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 6781]

    +

    method _putresourcedict [line 6809]

    @@ -20295,7 +20324,7 @@ $cidoffset = 0])
    -

    method _putresources [line 6822]

    +

    method _putresources [line 6850]

    @@ -20320,7 +20349,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 11649]

    +

    method _putshaders [line 11677]

    @@ -20351,7 +20380,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 11003]

    +

    method _putsignature [line 11031]

    @@ -20376,7 +20405,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 6753]

    +

    method _putspotcolors [line 6781]

    @@ -20404,7 +20433,7 @@ $cidoffset = 0])
    -

    method _putstream [line 7373]

    +

    method _putstream [line 7401]

    @@ -20440,7 +20469,7 @@ $s)
    -

    method _puttrailer [line 7043]

    +

    method _puttrailer [line 7071]

    @@ -20465,7 +20494,7 @@ $s)
    -

    method _puttruetypeunicode [line 6544]

    +

    method _puttruetypeunicode [line 6572]

    diff --git a/tcpdf.php b/tcpdf.php index 908ca5b..cbed80c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-10-26 +// Last Update : 2009-11-04 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.013 +// Version : 4.8.014 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,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.8.013 + * @version 4.8.014 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.013 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.014 (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.8.013 + * @version 4.8.014 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1835,15 +1835,43 @@ if (!class_exists('TCPDF', false)) { * @since 2.1.000 (2008-01-09) */ public function setTempRTL($mode) { + $newmode = false; switch ($mode) { - case false: - case 'L': + case 'ltr': + case 'LTR': + case 'L': { + if ($this->rtl) { + $newmode = 'L'; + } + break; + } + case 'rtl': + case 'RTL': case 'R': { - $this->tmprtl = $mode; + if (!$this->rtl) { + $newmode = 'R'; + } + break; + } + case false: + default: { + $newmode = false; + break; } } + $this->tmprtl = $newmode; } + /** + * Return the current temporary RTL status + * @return boolean + * @access public + * @since 4.8.014 (2009-11-04) + */ + public function isRTLTextDir() { + return ($this->rtl OR ($this->tmprtl == 'R')); + } + /** * Set the last cell height. * @param float $h cell height. @@ -4224,7 +4252,7 @@ if (!class_exists('TCPDF', false)) { $arabic = false; } // check if string contains RTL text - if ($arabic OR $this->tmprtl OR preg_match(K_RE_PATTERN_RTL, $txt)) { + if ($arabic OR ($this->tmprtl == 'R') OR preg_match(K_RE_PATTERN_RTL, $txt)) { $rtlmode = true; } else { $rtlmode = false; @@ -9296,9 +9324,9 @@ if (!class_exists('TCPDF', false)) { $numchars = count($ta); if ($forcertl == 'R') { - $pel = 1; + $pel = 1; } elseif ($forcertl == 'L') { - $pel = 0; + $pel = 0; } else { // P2. In each paragraph, find the first character of type L, AL, or R. // P3. If a character is found in P2 and it is of type AL or R, then set the paragraph embedding level to one; otherwise, set it to zero. @@ -13351,7 +13379,7 @@ if (!class_exists('TCPDF', false)) { $t_x = -$mdiff; } elseif (($plalign == 'J') AND ($plalign == $lalign)) { // Justification - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $t_x = $this->lMargin - $this->endlinex; } $no = 0; @@ -13368,7 +13396,7 @@ if (!class_exists('TCPDF', false)) { $lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]); $lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]); if ($kk == $maxkk) { - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $tvalue = ltrim($lnstring[1][$kk]); } else { $tvalue = rtrim($lnstring[1][$kk]); @@ -13380,7 +13408,7 @@ if (!class_exists('TCPDF', false)) { $no += substr_count($lnstring[1][$kk], chr(32)); $ns += substr_count($tvalue, chr(32)); } - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $t_x = $this->lMargin - $this->endlinex - (($no - $ns - 1) * $this->GetStringWidth(chr(32))); } // calculate additional space to add to each space @@ -13408,7 +13436,7 @@ if (!class_exists('TCPDF', false)) { } continue; } - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $spacew = ($spacewidth * ($nsmax - $ns)); } else { $spacew = ($spacewidth * $ns); @@ -13441,7 +13469,7 @@ if (!class_exists('TCPDF', false)) { $currentxpos = $xmatches[1]; if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) { if ($strcount == $maxkk) { - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $tvalue = $lnstring[1][$strcount]; } else { $tvalue = rtrim($lnstring[1][$strcount]); @@ -13452,7 +13480,7 @@ if (!class_exists('TCPDF', false)) { $ns += substr_count($tvalue, chr(32)); ++$strcount; } - if ($this->rtl OR $this->tmprtl) { + if ($this->isRTLTextDir()) { $spacew = ($spacewidth * ($nsmax - $ns)); } // justify block @@ -13798,7 +13826,7 @@ if (!class_exists('TCPDF', false)) { } // text $this->htmlvspace = 0; - if ((!$this->premode) AND ($this->rtl OR $this->tmprtl)) { + if ((!$this->premode) AND $this->isRTLTextDir()) { // reverse spaces order $len1 = strlen($dom[$key]['value']); $lsp = $len1 - strlen(ltrim($dom[$key]['value'])); @@ -13815,7 +13843,7 @@ if (!class_exists('TCPDF', false)) { } if ($newline) { if (!$this->premode) { - if (($this->rtl OR $this->tmprtl)) { + if ($this->isRTLTextDir()) { $dom[$key]['value'] = rtrim($dom[$key]['value']); } else { $dom[$key]['value'] = ltrim($dom[$key]['value']); @@ -13984,7 +14012,7 @@ if (!class_exists('TCPDF', false)) { $firstorlast = ($key == 1); // check for text direction attribute if (isset($tag['attribute']['dir'])) { - $this->tmprtl = $tag['attribute']['dir'] == 'rtl' ? 'R' : 'L'; + $this->setTempRTL($tag['attribute']['dir']); } else { $this->tmprtl = false; }
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 6961d27..e0e6851 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.3

    - Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by phpDocumentor 1.4.3
    @@ -20510,7 +20539,7 @@ $font)
    -

    method _putviewerpreferences [line 6973]

    +

    method _putviewerpreferences [line 7001]

    diff --git a/doc/index.html b/doc/index.html index 6961d27..e0e6851 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.3

    - Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by phpDocumentor 1.4.3
    diff --git a/doc/errors.html b/doc/errors.html index c3e01c8..37b1a55 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

    - Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by phpDocumentor 1.4.3
    @@ -20541,7 +20570,7 @@ $font)
    -

    method _putxobjectdict [line 6770]

    +

    method _putxobjectdict [line 6798]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 28fe06e..8f61414 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -736,6 +736,8 @@
    in file tcpdf.php, method TCPDF::IncludeJS()
    intToRoman
    in file tcpdf.php, method TCPDF::intToRoman()
        Returns the Roman representation of an integer number
    +
    isRTLTextDir
    +
    in file tcpdf.php, method TCPDF::isRTLTextDir()
        Return the current temporary RTL status
    top
    @@ -1467,7 +1469,7 @@ top

    - Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index e3e7a29..32b798d 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -577,6 +577,8 @@
    in file tcpdf.php, method TCPDF::IncludeJS()
    intToRoman
    in file tcpdf.php, method TCPDF::intToRoman()
        Returns the Roman representation of an integer number
    +
    isRTLTextDir
    +
    in file tcpdf.php, method TCPDF::isRTLTextDir()
        Return the current temporary RTL status
    top
    @@ -1444,7 +1446,7 @@ top

    - Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:39 +0100 by phpDocumentor 1.4.3
    @@ -20566,7 +20595,7 @@ $font)
    -

    method _RC4 [line 7850]

    +

    method _RC4 [line 7878]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 2f488c2..2335990 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 Mon, 26 Oct 2009 13:05:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by phpDocumentor 1.4.3
    @@ -20617,7 +20646,7 @@ $text)
    -

    method _textstring [line 7342]

    +

    method _textstring [line 7370]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 16ac854..0b97c45 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 a28f55b..500ce76 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 Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3
    @@ -20656,7 +20685,7 @@ $s)
    -

    method _toJPEG [line 4912]

    +

    method _toJPEG [line 4940]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 71cf7d8..31ee775 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 Mon, 26 Oct 2009 13:05:30 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:46 +0100 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 58abd7b..62e2154 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 Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3
    @@ -20698,7 +20727,7 @@ $file)
    -

    method _Uvalue [line 7916]

    +

    method _Uvalue [line 7944]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index d5bb0e6..db8fe7d 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)

    - Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3
    @@ -20735,7 +20764,7 @@ $file)

    - Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3
    author:  Nicola Asuni
    version:  4.8.013version:  4.8.014
    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.8.013 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.014 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data


    - Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Nov 2009 09:57:40 +0100 by phpDocumentor 1.4.3