diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e7df9db..e3eaf65 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,12 @@ +4.8.038 (2010-03-13) + - Various bugs related to page-break in HTML mode were fixed. + - Bug item #2968974 "Another pagebreak problem" was fixed. + - Bug item #2969276 "justification problem" was fixed. + - Bug item #2969289 "bug when using justified text and custom headers" was fixed. + - Images are now automatically resized to be contained on the page. + - Some HTML line alignments were fixed. + - Signature of AddPage() and SetMargins() methods were changed to include an option to set default page margins. + 4.8.037 (2010-03-03) - Bug item #2962068 was fixed. - Bug item #2967017 "Problems with and pagebreaks" was fixed. diff --git a/README.TXT b/README.TXT index bbf8f0a..b803624 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.037 -Release date: 2010-03-10 +Version: 4.8.038 +Release date: 2010-03-13 Author: Nicola Asuni Copyright (c) 2001-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index bf52112..59064e0 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 8647941..33297ad 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

  • Rect
  • RegularPolygon
  • removeSHY
    • +
  • revstrpos
  • rfread
  • rollbackTransaction
  • Rotate
    • @@ -634,7 +635,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.8.037 + version:  4.8.038 link:  http://www.tcpdf.org @@ -6094,7 +6095,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 3636]

    +

    method AcceptPageBreak [line 3644]

    @@ -6125,7 +6126,7 @@ $diskcache = false])
    -

    method addExtGState [line 11483]

    +

    method addExtGState [line 11509]

    @@ -6173,7 +6174,7 @@ $params)
    -

    method AddFont [line 3188]

    +

    method AddFont [line 3196]

    + + + + +
    @@ -6230,7 +6231,7 @@ $fontfile = ''])
    -

    method addHtmlLink [line 7852]

    +

    method addHtmlLink [line 7878]

    @@ -6241,7 +6242,8 @@ $name, [int $fill = 0], [boolean $firstline = false], [array $color = ''], [string -$style = -1]) +$style = -1], [boolean +$firstblock = false])

    @@ -6292,6 +6294,11 @@ $style = -1])
    		string   $style   font style (U, D, B, I)
    boolean  $firstblock  if true the string is the starting of a line.

    @@ -6299,7 +6306,7 @@ $style = -1])
    -

    method addHTMLVertSpace [line 15182]

    +

    method addHTMLVertSpace [line 15270]

    @@ -6365,7 +6372,7 @@ $closing = false])
    -

    method addJavascriptObject [line 10103]

    +

    method addJavascriptObject [line 10129]

    @@ -6416,7 +6423,7 @@ $onload = false])
    -

    method AddLink [line 3429]

    +

    method AddLink [line 3437]

    + + + + +
    @@ -6447,14 +6454,15 @@ $onload = false])
    -

    method AddPage [line 2385]

    +

    method AddPage [line 2392]

    void AddPage( [string $orientation = ''], [mixed -$format = '']) +$format = ''], [boolean +$keepmargins = false])

    @@ -6488,6 +6496,11 @@ $format = ''])
    		mixed   $format   The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).
    • 4A0
    • 2A0
    • A0
    • A1
    • A2
    • A3
    • A4 (default)
    • A5
    • A6
    • A7
    • A8
    • A9
    • A10
    • B0
    • B1
    • B2
    • B3
    • B4
    • B5
    • B6
    • B7
    • B8
    • B9
    • B10
    • C0
    • C1
    • C2
    • C3
    • C4
    • C5
    • C6
    • C7
    • C8
    • C9
    • C10
    • RA0
    • RA1
    • RA2
    • RA3
    • RA4
    • SRA0
    • SRA1
    • SRA2
    • SRA3
    • SRA4
    • LETTER
    • LEGAL
    • EXECUTIVE
    • FOLIO
    boolean  $keepmargins  if true overwrites the default page margins with the current margins

    @@ -6495,7 +6508,7 @@ $format = ''])
    -

    method AddSpotColor [line 2810]

    +

    method AddSpotColor [line 2818]

    @@ -6561,7 +6574,7 @@ $k)
    -

    method addTOC [line 16206]

    +

    method addTOC [line 16294]

    @@ -6621,7 +6634,7 @@ $toc_name = 'TOC'])
    -

    method AliasNbPages [line 11291]

    +

    method AliasNbPages [line 11317]

    @@ -6663,7 +6676,7 @@ $alias = '{nb}'])
    -

    method AliasNumPage [line 11318]

    +

    method AliasNumPage [line 11344]

    @@ -6705,7 +6718,7 @@ $alias = '{pnb}'])
    -

    method Annotation [line 3485]

    +

    method Annotation [line 3493]

    @@ -6780,7 +6793,7 @@ $spaces = 0])
    -

    method Arrow [line 9345]

    +

    method Arrow [line 9371]

    @@ -6858,7 +6871,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 7750]

    +

    method arrUTF8ToUTF16BE [line 7775]

    @@ -6933,7 +6946,7 @@ $setbom = true])
    -

    method Bookmark [line 9989]

    +

    method Bookmark [line 10015]

    @@ -6993,7 +7006,7 @@ $page = ''])
    -

    method Button [line 10997]

    +

    method Button [line 11023]

    @@ -7089,7 +7102,7 @@ $js = false])
    -

    method Cell [line 3697]

    +

    method Cell [line 3705]

    @@ -7185,7 +7198,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 10927]

    +

    method CheckBox [line 10953]

    @@ -7275,7 +7288,7 @@ $js = false])
    -

    method checkPageBreak [line 3649]

    +

    method checkPageBreak [line 3657]

    @@ -7329,7 +7342,7 @@ $addpage = true])
    -

    method Circle [line 8979]

    +

    method Circle [line 9005]

    @@ -7428,7 +7441,7 @@ $afinish:)
    -

    method Clip [line 11736]

    +

    method Clip [line 11762]

    @@ -7488,7 +7501,7 @@ $h)
    -

    method Close [line 2279]

    +

    method Close [line 2285]

    @@ -7519,7 +7532,7 @@ $h)
    -

    method closeHTMLTagHandler [line 14827]

    +

    method closeHTMLTagHandler [line 14915]

    @@ -7573,7 +7586,7 @@ $dom)
    -

    method ComboBox [line 10866]

    +

    method ComboBox [line 10892]

    @@ -7663,7 +7676,7 @@ $js = false])
    -

    method commitTransaction [line 16364]

    +

    method commitTransaction [line 16452]

    @@ -7691,7 +7704,7 @@ $js = false])
    -

    method convertHTMLColorToDec [line 7885]

    +

    method convertHTMLColorToDec [line 7911]

    @@ -7730,7 +7743,7 @@ $color = '#FFFFFF'])
    -

    method CoonsPatchMesh [line 11656]

    +

    method CoonsPatchMesh [line 11682]

    @@ -7832,7 +7845,7 @@ $coords_max = 1])
    -

    method Curve [line 8754]

    +

    method Curve [line 8780]

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

    method deletePage [line 16064]

    +

    method deletePage [line 16152]

    @@ -7976,7 +7989,7 @@ $page)
    -

    method Ellipse [line 8875]

    +

    method Ellipse [line 8901]

    @@ -8093,12 +8106,12 @@ $afinish:)
    -

    method empty_string [line 16418]

    +

    method empty_string [line 16506]

    boolean empty_string( -srting +string $str)

    @@ -8125,7 +8138,7 @@ $str)
    - + @@ -8135,7 +8148,7 @@ $str)
    -

    method endPage [line 2404]

    +

    method endPage [line 2411]

    srting  string   $str   string to be checked
    @@ -8166,7 +8179,7 @@ $str)
    -

    method Error [line 2251]

    +

    method Error [line 2257]

    @@ -8205,7 +8218,7 @@ $msg)
    -

    method Footer [line 2643]

    +

    method Footer [line 2650]

    @@ -8230,7 +8243,7 @@ $msg)
    -

    method formatPageNumber [line 11395]

    +

    method formatPageNumber [line 11421]

    @@ -8269,7 +8282,7 @@ $num)
    -

    method formatTOCPageNumber [line 11407]

    +

    method formatTOCPageNumber [line 11433]

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

    method GetAbsX [line 5286]

    +

    method GetAbsX [line 5311]

    @@ -8342,7 +8355,7 @@ $num)
    -

    method getAliasNbPages [line 11303]

    +

    method getAliasNbPages [line 11329]

    @@ -8373,7 +8386,7 @@ $num)
    -

    method getAliasNumPage [line 11331]

    +

    method getAliasNumPage [line 11357]

    @@ -8404,7 +8417,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 10234]

    +

    method getAnnotOptFromJSProp [line 10260]

    @@ -8449,7 +8462,7 @@ $prop)
    -

    method GetArrStringWidth [line 3091]

    +

    method GetArrStringWidth [line 3099]

    @@ -8518,7 +8531,7 @@ $getarray = false])
    -

    method getBarcode [line 12207]

    +

    method getBarcode [line 12247]

    @@ -8546,7 +8559,7 @@ $getarray = false])
    -

    method getBorderMode [line 4150]

    +

    method getBorderMode [line 4158]

    @@ -8642,7 +8655,7 @@ $pagenum = ''])
    -

    method getBuffer [line 15750]

    +

    method getBuffer [line 15838]

    @@ -8673,7 +8686,7 @@ $pagenum = ''])
    -

    method getCellCode [line 3749]

    +

    method getCellCode [line 3757]

    @@ -8769,7 +8782,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 11576]

    +

    method getCellHeightRatio [line 11602]

    @@ -8797,7 +8810,7 @@ $ignore_min_height = false])
    -

    method GetCharWidth [line 3127]

    +

    method GetCharWidth [line 3135]

    @@ -8842,7 +8855,7 @@ $char)
    -

    method getFontBuffer [line 15910]

    +

    method getFontBuffer [line 15998]

    @@ -8884,7 +8897,7 @@ $font)
    -

    method getFontFamily [line 12693]

    +

    method getFontFamily [line 12733]

    @@ -8915,7 +8928,7 @@ $font)
    -

    method getFontSize [line 12673]

    +

    method getFontSize [line 12713]

    @@ -8946,7 +8959,7 @@ $font)
    -

    method getFontSizePt [line 12683]

    +

    method getFontSizePt [line 12723]

    @@ -8977,7 +8990,7 @@ $font)
    -

    method getFontsList [line 3166]

    +

    method getFontsList [line 3174]

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

    method getFontStyle [line 12703]

    +

    method getFontStyle [line 12743]

    @@ -9036,7 +9049,7 @@ $font)
    -

    method getFooterFont [line 7811]

    +

    method getFooterFont [line 7836]

    @@ -9064,7 +9077,7 @@ $font)
    -

    method getFooterMargin [line 2557]

    +

    method getFooterMargin [line 2564]

    @@ -9092,7 +9105,7 @@ $font)
    -

    method getFormDefaultProp [line 10609]

    +

    method getFormDefaultProp [line 10635]

    @@ -9126,7 +9139,7 @@ $font)
    -

    method getGDgamma [line 5229]

    +

    method getGDgamma [line 5254]

    @@ -9165,7 +9178,7 @@ $v)
    -

    method getGraphicVars [line 15618]

    +

    method getGraphicVars [line 15706]

    @@ -9196,7 +9209,7 @@ $v)
    -

    method getGroupPageNo [line 11344]

    +

    method getGroupPageNo [line 11370]

    @@ -9227,7 +9240,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 11354]

    +

    method getGroupPageNoFormatted [line 11380]

    @@ -9258,7 +9271,7 @@ $v)
    -

    method getHeaderData [line 2512]

    +

    method getHeaderData [line 2519]

    @@ -9286,7 +9299,7 @@ $v)
    -

    method getHeaderFont [line 7791]

    +

    method getHeaderFont [line 7816]

    @@ -9314,7 +9327,7 @@ $v)
    -

    method getHeaderMargin [line 2537]

    +

    method getHeaderMargin [line 2544]

    @@ -9342,7 +9355,7 @@ $v)
    -

    method getHtmlDomArray [line 12739]

    +

    method getHtmlDomArray [line 12779]

    @@ -9381,7 +9394,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 15337]

    +

    method getHTMLUnitToUnits [line 15425]

    @@ -9447,7 +9460,7 @@ $point)
    -

    method getImageBuffer [line 15852]

    +

    method getImageBuffer [line 15940]

    @@ -9489,7 +9502,7 @@ $image)
    -

    method getImageFileType [line 4711]

    +

    method getImageFileType [line 4719]

    @@ -9531,7 +9544,7 @@ $imgfile)
    -

    method getImageRBX [line 2583]

    +

    method getImageRBX [line 2590]

    @@ -9556,7 +9569,7 @@ $imgfile)
    -

    method getImageRBY [line 2592]

    +

    method getImageRBY [line 2599]

    @@ -9646,7 +9659,7 @@ $imgfile)
    -

    method GetLineWidth [line 8468]

    +

    method GetLineWidth [line 8494]

    @@ -9680,7 +9693,7 @@ $imgfile)
    -

    method getMargins [line 12636]

    +

    method getMargins [line 12676]

    @@ -9711,7 +9724,7 @@ $imgfile)
    -

    method GetNumChars [line 3154]

    +

    method GetNumChars [line 3162]

    @@ -9753,7 +9766,7 @@ $s)
    -

    method getNumLines [line 4229]

    +

    method getNumLines [line 4237]

    @@ -9801,7 +9814,7 @@ $w = 0])
    -

    method getNumPages [line 2372]

    +

    method getNumPages [line 2378]

    @@ -9835,7 +9848,7 @@ $w = 0])
    -

    method getObjFilename [line 15682]

    +

    method getObjFilename [line 15770]

    @@ -9880,7 +9893,7 @@ $prefix)
    -

    method getOriginalMargins [line 12659]

    +

    method getOriginalMargins [line 12699]

    @@ -9911,7 +9924,7 @@ $prefix)
    -

    method getPage [line 2360]

    +

    method getPage [line 2366]

    @@ -9945,7 +9958,7 @@ $prefix)
    -

    method getPageBuffer [line 15793]

    +

    method getPageBuffer [line 15881]

    @@ -10032,7 +10045,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 11366]

    +

    method getPageGroupAlias [line 11392]

    @@ -10111,7 +10124,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 11381]

    +

    method getPageNumGroupAlias [line 11407]

    @@ -10190,7 +10203,7 @@ $pagenum = ''])
    -

    method getPDFData [line 7834]

    +

    method getPDFData [line 7859]

    @@ -10215,7 +10228,7 @@ $pagenum = ''])
    -

    method getRemainingWidth [line 4613]

    +

    method getRemainingWidth [line 4621]

    @@ -10305,7 +10318,7 @@ $pagenum = ''])
    -

    method getSpaceString [line 13211]

    +

    method getSpaceString [line 13251]

    @@ -10336,7 +10349,7 @@ $pagenum = ''])
    -

    method GetStringWidth [line 3075]

    +

    method GetStringWidth [line 3083]

    @@ -10405,7 +10418,7 @@ $getarray = false])
    -

    method GetX [line 5270]

    +

    method GetX [line 5295]

    @@ -10436,7 +10449,7 @@ $getarray = false])
    -

    method GetY [line 5297]

    +

    method GetY [line 5322]

    @@ -10467,7 +10480,7 @@ $getarray = false])
    -

    method get_mqr [line 4989]

    +

    method get_mqr [line 5014]

    @@ -10498,7 +10511,7 @@ $getarray = false])
    -

    method Gradient [line 11759]

    +

    method Gradient [line 11785]

    @@ -10558,7 +10571,7 @@ $coords)
    -

    method Header [line 2601]

    +

    method Header [line 2608]

    @@ -10583,7 +10596,7 @@ $coords)
    -

    method Image [line 4754]

    +

    method Image [line 4762]

    @@ -10715,7 +10728,7 @@ $hidden = false])
    -

    method ImageEps [line 11931]

    +

    method ImageEps [line 11957]

    @@ -10811,7 +10824,7 @@ $border = 0])
    -

    method ImagePngAlpha [line 5185]

    +

    method ImagePngAlpha [line 5210]

    @@ -10916,7 +10929,7 @@ $palign = ''])
    -

    method IncludeJS [line 10090]

    +

    method IncludeJS [line 10116]

    @@ -10958,7 +10971,7 @@ $script)
    -

    method intToRoman [line 15411]

    +

    method intToRoman [line 15499]

    @@ -11028,7 +11041,7 @@ $number)
    -

    method lastPage [line 2349]

    +

    method lastPage [line 2355]

    @@ -11070,7 +11083,7 @@ $resetmargins = false])
    -

    method Line [line 8621]

    +

    method Line [line 8647]

    @@ -11136,7 +11149,7 @@ $style = array()])
    -

    method LinearGradient [line 11616]

    +

    method LinearGradient [line 11642]

    @@ -11214,7 +11227,7 @@ $coords = array(0,0,1,0)])
    -

    method Link [line 3468]

    +

    method Link [line 3476]

    @@ -11286,7 +11299,7 @@ $spaces = 0])
    -

    method ListBox [line 10806]

    +

    method ListBox [line 10832]

    @@ -11376,7 +11389,7 @@ $js = false])
    -

    method Ln [line 5242]

    +

    method Ln [line 5267]

    @@ -11424,7 +11437,7 @@ $cell = false])
    -

    method MirrorH [line 8240]

    +

    method MirrorH [line 8266]

    @@ -11466,7 +11479,7 @@ $x = ''])
    -

    method MirrorL [line 8276]

    +

    method MirrorL [line 8302]

    @@ -11520,7 +11533,7 @@ $y = ''])
    -

    method MirrorP [line 8263]

    +

    method MirrorP [line 8289]

    @@ -11568,7 +11581,7 @@ $y = ''])
    -

    method MirrorV [line 8251]

    +

    method MirrorV [line 8277]

    @@ -11610,7 +11623,7 @@ $y = ''])
    -

    method movePage [line 15927]

    +

    method movePage [line 16015]

    @@ -11658,7 +11671,7 @@ $topage)
    -

    method MultiCell [line 3991]

    +

    method MultiCell [line 3999]

    @@ -11784,7 +11797,7 @@ $maxh = 0])
    -

    method objclone [line 16407]

    +

    method objclone [line 16495]

    @@ -11826,7 +11839,7 @@ $object)
    -

    method Open [line 2266]

    +

    method Open [line 2272]

    @@ -11857,7 +11870,7 @@ $object)
    -

    method openHTMLTagHandler [line 14272]

    +

    method openHTMLTagHandler [line 14363]

    @@ -11911,7 +11924,7 @@ $dom)
    -

    method Output [line 5389]

    +

    method Output [line 5414]

    @@ -11959,7 +11972,7 @@ $dest = 'I'])
    -

    method PageNo [line 2794]

    +

    method PageNo [line 2802]

    @@ -11993,7 +12006,7 @@ $dest = 'I'])
    -

    method PageNoFormatted [line 11417]

    +

    method PageNoFormatted [line 11443]

    @@ -12024,7 +12037,7 @@ $dest = 'I'])
    -

    method PieSector [line 11853]

    +

    method PieSector [line 11879]

    @@ -12126,7 +12139,7 @@ $o:)
    -

    method pixelsToUnits [line 7942]

    +

    method pixelsToUnits [line 7968]

    @@ -12168,7 +12181,7 @@ $px)
    -

    method Polycurve [line 8811]

    +

    method Polycurve [line 8837]

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

    method Polygon [line 9031]

    +

    method Polygon [line 9057]

    @@ -12303,7 +12316,7 @@ $closed = true])
    -

    method PolyLine [line 9005]

    +

    method PolyLine [line 9031]

    @@ -12366,7 +12379,7 @@ $closed)
    -

    method putHtmlListBullet [line 15476]

    +

    method putHtmlListBullet [line 15564]

    @@ -12417,7 +12430,7 @@ $size = 10])
    -

    method RadialGradient [line 11634]

    +

    method RadialGradient [line 11660]

    @@ -12495,7 +12508,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])
    -

    method RadioButton [line 10718]

    +

    method RadioButton [line 10744]

    @@ -12585,7 +12598,7 @@ $js = false])
    -

    method readDiskCache [line 15722]

    +

    method readDiskCache [line 15810]

    @@ -12633,7 +12646,7 @@ $file)
    -

    method Rect [line 8656]

    +

    method Rect [line 8682]

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

    method RegularPolygon [line 9156]

    +

    method RegularPolygon [line 9182]

    @@ -12822,7 +12835,7 @@ $r:)
    -

    method removeSHY [line 3714]

    +

    method removeSHY [line 3722]

    @@ -12862,9 +12875,63 @@ $txt = ''])
    [ Top ]
    +
    + +

    method revstrpos [line 16519]

    +
    +
    +
    + Returns revstrpos( +string +$haystack, string +$needle, [int +$offset = 0]) +
    +

    + + Find position of last occurrence of a substring in a string



    +

    Tags:

    +
    + + + + + + + + + + +
    return:  the position where the needle exists. Returns FALSE if the needle was not found.
    since:  4.8.038 (2010-03-13)
    access:  public
    +
    +

    + + +

    Parameters:

    +
    + + + + + + + + + + + + + + + + +
    string  $haystack  The string to search in.
    string  $needle  substring to search.
    int  $offset  May be specified to begin searching an arbitrary number of characters into the string.
    +

    +
    [ Top ]
    +
    -

    method rfread [line 5155]

    +

    method rfread [line 5180]

    @@ -12915,7 +12982,7 @@ $length)
    -

    method rollbackTransaction [line 16378]

    +

    method rollbackTransaction [line 16466]

    @@ -12957,7 +13024,7 @@ $self = false])
    -

    method Rotate [line 8335]

    +

    method Rotate [line 8361]

    @@ -13011,7 +13078,7 @@ $y = ''])
    -

    method RoundedRect [line 9260]

    +

    method RoundedRect [line 9286]

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

    method Scale [line 8205]

    +

    method Scale [line 8231]

    @@ -13158,7 +13225,7 @@ $y = ''])
    -

    method ScaleX [line 8165]

    +

    method ScaleX [line 8191]

    @@ -13212,7 +13279,7 @@ $y = ''])
    -

    method ScaleXY [line 8191]

    +

    method ScaleXY [line 8217]

    @@ -13266,7 +13333,7 @@ $y = ''])
    -

    method ScaleY [line 8178]

    +

    method ScaleY [line 8204]

    @@ -13320,7 +13387,7 @@ $y = ''])
    -

    method setAlpha [line 11533]

    +

    method setAlpha [line 11559]

    @@ -13365,7 +13432,7 @@ $bm = 'Normal'])
    -

    method SetAuthor [line 2215]

    +

    method SetAuthor [line 2221]

    @@ -13407,7 +13474,7 @@ $author)
    -

    method SetAutoPageBreak [line 2082]

    +

    method SetAutoPageBreak [line 2088]

    @@ -13455,7 +13522,7 @@ $margin = 0])
    -

    method setBarcode [line 12197]

    +

    method setBarcode [line 12237]

    @@ -13491,7 +13558,7 @@ $bc = ''])
    -

    method SetBooklet [line 15251]

    +

    method SetBooklet [line 15339]

    @@ -13542,7 +13609,7 @@ $outer = -1])
    -

    method setBuffer [line 15732]

    +

    method setBuffer [line 15820]

    @@ -13581,7 +13648,7 @@ $data)
    -

    method setCellHeightRatio [line 11567]

    +

    method setCellHeightRatio [line 11593]

    @@ -13620,7 +13687,7 @@ $h)
    -

    method SetCellPadding [line 2070]

    +

    method SetCellPadding [line 2076]

    @@ -13662,7 +13729,7 @@ $pad)
    -

    method SetCompression [line 2175]

    +

    method SetCompression [line 2181]

    @@ -13701,7 +13768,7 @@ $compress)
    -

    method setContentMark [line 2479]

    +

    method setContentMark [line 2486]

    @@ -13740,7 +13807,7 @@ $page = 0])
    -

    method SetCreator [line 2239]

    +

    method SetCreator [line 2245]

    @@ -13782,7 +13849,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 3418]

    +

    method SetDefaultMonospacedFont [line 3426]

    @@ -13821,7 +13888,7 @@ $font)
    -

    method setDefaultTableColumns [line 11557]

    +

    method setDefaultTableColumns [line 11583]

    @@ -13860,7 +13927,7 @@ $cols = 4])
    -

    method SetDisplayMode [line 2097]

    +

    method SetDisplayMode [line 2103]

    @@ -13911,7 +13978,7 @@ $mode = 'UseNone'])
    -

    method SetDrawColor [line 2849]

    +

    method SetDrawColor [line 2857]

    @@ -13971,7 +14038,7 @@ $col4 = -1])
    -

    method SetDrawColorArray [line 2826]

    +

    method SetDrawColorArray [line 2834]

    @@ -14013,7 +14080,7 @@ $color)
    -

    method SetDrawSpotColor [line 2887]

    +

    method SetDrawSpotColor [line 2895]

    @@ -14061,7 +14128,7 @@ $tint = 100])
    -

    method setExtGState [line 11502]

    +

    method setExtGState [line 11528]

    @@ -14100,7 +14167,7 @@ $gs)
    -

    method SetFillColor [line 2929]

    +

    method SetFillColor [line 2937]

    @@ -14160,7 +14227,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 2906]

    +

    method SetFillColorArray [line 2914]

    @@ -14202,7 +14269,7 @@ $color)
    -

    method SetFillSpotColor [line 2971]

    +

    method SetFillSpotColor [line 2979]

    @@ -14250,7 +14317,7 @@ $tint = 100])
    -

    method SetFont [line 3373]

    +

    method SetFont [line 3381]

    @@ -14310,7 +14377,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 15868]

    +

    method setFontBuffer [line 15956]

    @@ -14355,7 +14422,7 @@ $data)
    -

    method SetFontSize [line 3393]

    +

    method SetFontSize [line 3401]

    @@ -14397,7 +14464,7 @@ $size)
    -

    method setFontSubBuffer [line 15890]

    +

    method setFontSubBuffer [line 15978]

    @@ -14448,7 +14515,7 @@ $data)
    -

    method setFooter [line 2713]

    +

    method setFooter [line 2721]

    @@ -14476,7 +14543,7 @@ $data)
    -

    method setFooterFont [line 7801]

    +

    method setFooterFont [line 7826]

    @@ -14515,7 +14582,7 @@ $font)
    -

    method setFooterMargin [line 2547]

    +

    method setFooterMargin [line 2554]

    @@ -14551,7 +14618,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 10598]

    +

    method setFormDefaultProp [line 10624]

    @@ -14593,7 +14660,7 @@ $prop = array()])
    -

    method setGraphicVars [line 15649]

    +

    method setGraphicVars [line 15737]

    @@ -14632,7 +14699,7 @@ $gvars)
    -

    method setHeader [line 2678]

    +

    method setHeader [line 2685]

    @@ -14660,7 +14727,7 @@ $gvars)
    -

    method setHeaderData [line 2498]

    +

    method setHeaderData [line 2505]

    @@ -14714,7 +14781,7 @@ $hs = ''])
    -

    method setHeaderFont [line 7781]

    +

    method setHeaderFont [line 7806]

    @@ -14753,7 +14820,7 @@ $font)
    -

    method setHeaderMargin [line 2527]

    +

    method setHeaderMargin [line 2534]

    @@ -14789,7 +14856,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 15322]

    +

    method setHtmlLinksStyle [line 15410]

    @@ -14834,7 +14901,7 @@ $fontstyle = 'U'])
    -

    method setHtmlVSpace [line 15291]

    +

    method setHtmlVSpace [line 15379]

    @@ -14873,7 +14940,7 @@ $tagvs)
    -

    method setImageBuffer [line 15809]

    +

    method setImageBuffer [line 15897]

    @@ -14960,7 +15027,7 @@ $scale)
    -

    method setImageSubBuffer [line 15832]

    +

    method setImageSubBuffer [line 15920]

    @@ -15011,7 +15078,7 @@ $data)
    -

    method setJPEGQuality [line 11544]

    +

    method setJPEGQuality [line 11570]

    @@ -15050,7 +15117,7 @@ $quality)
    -

    method SetKeywords [line 2227]

    +

    method SetKeywords [line 2233]

    @@ -15092,7 +15159,7 @@ $keywords)
    -

    method setLanguageArray [line 7821]

    +

    method setLanguageArray [line 7846]

    @@ -15173,7 +15240,7 @@ $h)
    -

    method SetLeftMargin [line 2026]

    +

    method SetLeftMargin [line 2032]

    @@ -15215,7 +15282,7 @@ $margin)
    -

    method SetLineStyle [line 8493]

    +

    method SetLineStyle [line 8519]

    @@ -15261,7 +15328,7 @@ $style)
    -

    method SetLineWidth [line 8452]

    +

    method SetLineWidth [line 8478]

    @@ -15303,7 +15370,7 @@ $width)
    -

    method SetLink [line 3445]

    +

    method SetLink [line 3453]

    @@ -15357,7 +15424,7 @@ $page = -1])
    -

    method setListIndentWidth [line 15301]

    +

    method setListIndentWidth [line 15389]

    @@ -15396,7 +15463,7 @@ $width)
    -

    method setLIsymbol [line 15211]

    +

    method setLIsymbol [line 15299]

    @@ -15435,7 +15502,7 @@ $symbol = '!'])
    -

    method SetMargins [line 2009]

    +

    method SetMargins [line 2010]

    @@ -15443,11 +15510,12 @@ $symbol = '!']) float $left, float $top, [float -$right = -1]) +$right = -1], [boolean +$keepmargins = false])

    - Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.



    + Defines the left, top and right margins.



    Tags:

    @@ -15482,6 +15550,11 @@ $right = -1]) + + + + +
    float   $right   Right margin. Default value is the left one.
    boolean  $keepmargins  if true overwrites the default page margins

    @@ -15489,7 +15562,7 @@ $right = -1])
    -

    method setOpenCell [line 15311]

    +

    method setOpenCell [line 15399]

    @@ -15528,7 +15601,7 @@ $isopen)
    -

    method setPage [line 2302]

    +

    method setPage [line 2308]

    @@ -15576,7 +15649,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 15766]

    +

    method setPageBuffer [line 15854]

    @@ -15672,7 +15745,7 @@ $orientation = 'P'])
    -

    method setPageMark [line 2468]

    +

    method setPageMark [line 2475]

    @@ -15790,7 +15863,7 @@ $unit)
    -

    method setPDFVersion [line 11586]

    +

    method setPDFVersion [line 11612]

    @@ -15829,7 +15902,7 @@ $version = '1.7'])
    -

    method setPrintFooter [line 2574]

    +

    method setPrintFooter [line 2581]

    @@ -15871,7 +15944,7 @@ $value)
    -

    method setPrintHeader [line 2565]

    +

    method setPrintHeader [line 2572]

    @@ -15907,7 +15980,7 @@ $val = true])
    -

    method SetProtection [line 8105]

    +

    method SetProtection [line 8131]

    @@ -15961,7 +16034,7 @@ $owner_pass = null])
    -

    method SetRightMargin [line 2056]

    +

    method SetRightMargin [line 2062]

    @@ -16048,7 +16121,7 @@ $resetx = true])
    -

    method setSignature [line 11248]

    +

    method setSignature [line 11274]

    @@ -16159,7 +16232,7 @@ $re = '/[\s]/'])
    -

    method SetSubject [line 2203]

    +

    method SetSubject [line 2209]

    @@ -16201,7 +16274,7 @@ $subject)
    -

    method setTableHeader [line 2759]

    +

    method setTableHeader [line 2767]

    @@ -16268,7 +16341,7 @@ $mode)
    -

    method SetTextColor [line 3013]

    +

    method SetTextColor [line 3021]

    @@ -16328,7 +16401,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 2990]

    +

    method SetTextColorArray [line 2998]

    @@ -16370,7 +16443,7 @@ $color)
    -

    method SetTextSpotColor [line 3052]

    +

    method SetTextSpotColor [line 3060]

    @@ -16418,7 +16491,7 @@ $tint = 100])
    -

    method SetTitle [line 2191]

    +

    method SetTitle [line 2197]

    @@ -16460,7 +16533,7 @@ $title)
    -

    method SetTopMargin [line 2041]

    +

    method SetTopMargin [line 2047]

    @@ -16502,7 +16575,7 @@ $margin)
    -

    method setUserRights [line 11218]

    +

    method setUserRights [line 11244]

    @@ -16568,7 +16641,7 @@ $signature = '/Modify'])
    -

    method setViewerPreferences [line 11599]

    +

    method setViewerPreferences [line 11625]

    @@ -16610,7 +16683,7 @@ $preferences)
    -

    method setVisibility [line 11447]

    +

    method setVisibility [line 11473]

    @@ -16649,7 +16722,7 @@ $v)
    -

    method SetX [line 5310]

    +

    method SetX [line 5335]

    @@ -16691,7 +16764,7 @@ $x)
    -

    method SetXY [line 5373]

    +

    method SetXY [line 5398]

    @@ -16739,7 +16812,7 @@ $y)
    -

    method SetY [line 5342]

    +

    method SetY [line 5367]

    @@ -16787,7 +16860,7 @@ $resetx = true])
    -

    method set_mqr [line 4974]

    +

    method set_mqr [line 4999]

    @@ -16826,7 +16899,7 @@ $mqr)
    -

    method Skew [line 8395]

    +

    method Skew [line 8421]

    @@ -16886,7 +16959,7 @@ $y = ''])
    -

    method SkewX [line 8368]

    +

    method SkewX [line 8394]

    @@ -16940,7 +17013,7 @@ $y = ''])
    -

    method SkewY [line 8381]

    +

    method SkewY [line 8407]

    @@ -16994,7 +17067,7 @@ $y = ''])
    -

    method StarPolygon [line 9211]

    +

    method StarPolygon [line 9237]

    @@ -17118,7 +17191,7 @@ $draw_circle:)
    -

    method startPage [line 2428]

    +

    method startPage [line 2435]

    @@ -17166,7 +17239,7 @@ $format = ''])
    -

    method startPageGroup [line 11276]

    +

    method startPageGroup [line 11302]

    @@ -17205,7 +17278,7 @@ $page = ''])
    -

    method startTransaction [line 16348]

    +

    method startTransaction [line 16436]

    @@ -17233,7 +17306,7 @@ $page = ''])
    -

    method StartTransform [line 8133]

    +

    method StartTransform [line 8159]

    @@ -17264,7 +17337,7 @@ $page = ''])
    -

    method StopTransform [line 8148]

    +

    method StopTransform [line 8174]

    @@ -17295,7 +17368,7 @@ $page = ''])
    -

    method swapMargins [line 15267]

    +

    method swapMargins [line 15355]

    @@ -17334,7 +17407,7 @@ $reverse = true])
    -

    method Text [line 3596]

    +

    method Text [line 3604]

    @@ -17403,7 +17476,7 @@ $clip = false])
    -

    method TextField [line 10627]

    +

    method TextField [line 10653]

    @@ -17487,7 +17560,7 @@ $js = false])
    -

    method Transform [line 8428]

    +

    method Transform [line 8454]

    @@ -17529,7 +17602,7 @@ $tm)
    -

    method Translate [line 8311]

    +

    method Translate [line 8337]

    @@ -17577,7 +17650,7 @@ $t_y)
    -

    method TranslateX [line 8288]

    +

    method TranslateX [line 8314]

    @@ -17619,7 +17692,7 @@ $t_x)
    -

    method TranslateY [line 8299]

    +

    method TranslateY [line 8325]

    @@ -17661,7 +17734,7 @@ $t_y)
    -

    method unhtmlentities [line 7953]

    +

    method unhtmlentities [line 7979]

    @@ -17700,7 +17773,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 4652]

    +

    method UniArrSubString [line 4660]

    @@ -17754,7 +17827,7 @@ $end = ''])
    -

    method unichr [line 4685]

    +

    method unichr [line 4693]

    @@ -17799,7 +17872,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 4673]

    +

    method UTF8ArrayToUniArray [line 4681]

    @@ -17841,7 +17914,7 @@ $ta)
    -

    method UTF8ArrSubString [line 4629]

    +

    method UTF8ArrSubString [line 4637]

    @@ -17892,7 +17965,7 @@ $end = ''])
    -

    method UTF8ArrToLatin1 [line 7691]

    +

    method UTF8ArrToLatin1 [line 7716]

    @@ -17934,7 +18007,7 @@ $unicode)
    -

    method utf8Bidi [line 9418]

    +

    method utf8Bidi [line 9444]

    @@ -17988,7 +18061,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 7554]

    +

    method UTF8StringToArray [line 7579]

    @@ -18054,7 +18127,7 @@ $str)
    -

    method utf8StrRev [line 9404]

    +

    method utf8StrRev [line 9430]

    @@ -18108,7 +18181,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 7661]

    +

    method UTF8ToLatin1 [line 7686]

    @@ -18150,7 +18223,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 7645]

    +

    method UTF8ToUTF16BE [line 7670]

    @@ -18201,7 +18274,7 @@ $setbom = true])
    -

    method Write [line 4273]

    +

    method Write [line 4281]

    @@ -18297,7 +18370,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 12226]

    +

    method write1DBarcode [line 12266]

    @@ -18387,7 +18460,7 @@ $align = ''])
    -

    method write2DBarcode [line 12483]

    +

    method write2DBarcode [line 12523]

    @@ -18471,7 +18544,7 @@ $align = ''])
    -

    method writeBarcode [line 12433]

    +

    method writeBarcode [line 12473]

    @@ -18561,7 +18634,7 @@ $code)
    -

    method writeDiskCache [line 15694]

    +

    method writeDiskCache [line 15782]

    @@ -18618,7 +18691,7 @@ $file)
    -

    method writeHTML [line 13231]

    +

    method writeHTML [line 13271]

    @@ -18684,7 +18757,7 @@ $align = ''])
    -

    method writeHTMLCell [line 12727]

    +

    method writeHTMLCell [line 12767]

    @@ -18786,7 +18859,7 @@ $autopadding = true])
    -

    method _addfield [line 10199]

    +

    method _addfield [line 10225]

    @@ -18864,7 +18937,7 @@ $prop)
    -

    method _beginpage [line 7284]

    +

    method _beginpage [line 7309]

    @@ -18906,7 +18979,7 @@ $format = ''])
    -

    method _dataannobjstring [line 7433]

    +

    method _dataannobjstring [line 7458]

    @@ -18945,7 +19018,7 @@ $s)
    -

    method _datastring [line 7420]

    +

    method _datastring [line 7445]

    @@ -18984,7 +19057,7 @@ $s)
    -

    method _datestring [line 7446]

    +

    method _datestring [line 7471]

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

    method _destroy [line 5545]

    +

    method _destroy [line 5570]

    @@ -19060,7 +19133,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 5573]

    +

    method _dochecks [line 5598]

    @@ -19085,7 +19158,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 7359]

    +

    method _dolinethrough [line 7384]

    @@ -19133,7 +19206,7 @@ $txt)
    -

    method _dolinethroughw [line 7386]

    +

    method _dolinethroughw [line 7411]

    @@ -19190,7 +19263,7 @@ $txt)
    -

    method _dounderline [line 7347]

    +

    method _dounderline [line 7372]

    @@ -19238,7 +19311,7 @@ $txt)
    -

    method _dounderlinew [line 7372]

    +

    method _dounderlinew [line 7397]

    @@ -19289,7 +19362,7 @@ $w)
    -

    method _enddoc [line 7167]

    +

    method _enddoc [line 7192]

    @@ -19314,7 +19387,7 @@ $w)
    -

    method _endpage [line 7323]

    +

    method _endpage [line 7348]

    @@ -19339,7 +19412,7 @@ $w)
    -

    method _escape [line 7409]

    +

    method _escape [line 7434]

    @@ -19378,7 +19451,7 @@ $s)
    -

    method _escapetext [line 7471]

    +

    method _escapetext [line 7496]

    @@ -19417,7 +19490,7 @@ $s)
    -

    method _freadint [line 7398]

    +

    method _freadint [line 7423]

    @@ -19456,7 +19529,7 @@ $f)
    -

    method _generateencryptionkey [line 8073]

    +

    method _generateencryptionkey [line 8099]

    @@ -19510,7 +19583,7 @@ $protection)
    -

    method _getfontpath [line 5589]

    +

    method _getfontpath [line 5614]

    @@ -19535,7 +19608,7 @@ $protection)
    -

    method _JScolor [line 10175]

    +

    method _JScolor [line 10201]

    @@ -19577,7 +19650,7 @@ $color)
    -

    method _md5_16 [line 8034]

    +

    method _md5_16 [line 8060]

    @@ -19622,7 +19695,7 @@ $str)
    -

    method _newobj [line 7333]

    +

    method _newobj [line 7358]

    @@ -19650,7 +19723,7 @@ $str)
    -

    method _objectkey [line 7966]

    +

    method _objectkey [line 7992]

    @@ -19689,7 +19762,7 @@ $n)
    -

    method _out [line 7502]

    +

    method _out [line 7527]

    @@ -19725,7 +19798,7 @@ $s)
    -

    method _outarc [line 11833]

    +

    method _outarc [line 11859]

    @@ -19797,7 +19870,7 @@ $y3)
    -

    method _outCurve [line 8601]

    +

    method _outCurve [line 8627]

    @@ -19866,7 +19939,7 @@ $y3)
    -

    method _outLine [line 8565]

    +

    method _outLine [line 8591]

    @@ -19911,7 +19984,7 @@ $y)
    -

    method _outPoint [line 8551]

    +

    method _outPoint [line 8577]

    @@ -19956,7 +20029,7 @@ $y)
    -

    method _outRect [line 8582]

    +

    method _outRect [line 8608]

    @@ -20019,7 +20092,7 @@ $op)
    -

    method _Ovalue [line 8047]

    +

    method _Ovalue [line 8073]

    @@ -20070,7 +20143,7 @@ $owner_pass)
    -

    method _parsejpeg [line 5024]

    +

    method _parsejpeg [line 5049]

    @@ -20109,7 +20182,7 @@ $file)
    -

    method _parsepng [line 5050]

    +

    method _parsepng [line 5075]

    @@ -20148,7 +20221,7 @@ $file)
    -

    method _putannotsobjs [line 5772]

    +

    method _putannotsobjs [line 5797]

    @@ -20179,7 +20252,7 @@ $file)
    -

    method _putannotsrefs [line 5741]

    +

    method _putannotsrefs [line 5766]

    @@ -20221,7 +20294,7 @@ $n)
    -

    method _putAPXObject [line 6378]

    +

    method _putAPXObject [line 6403]

    @@ -20275,7 +20348,7 @@ $stream = ''])
    -

    method _putbookmarks [line 10017]

    +

    method _putbookmarks [line 10043]

    @@ -20306,7 +20379,7 @@ $stream = ''])
    -

    method _putcatalog [line 6992]

    +

    method _putcatalog [line 7017]

    @@ -20331,7 +20404,7 @@ $stream = ''])
    -

    method _putcidfont0 [line 6729]

    +

    method _putcidfont0 [line 6754]

    @@ -20376,7 +20449,7 @@ $font)
    -

    method _putEmbeddedFiles [line 3565]

    +

    method _putEmbeddedFiles [line 3573]

    @@ -20407,7 +20480,7 @@ $font)
    -

    method _putencryption [line 7975]

    +

    method _putencryption [line 8001]

    @@ -20435,7 +20508,7 @@ $font)
    -

    method _putextgstates [line 11512]

    +

    method _putextgstates [line 11538]

    @@ -20474,7 +20547,7 @@ $gs)
    -

    method _putfonts [line 6406]

    +

    method _putfonts [line 6431]

    @@ -20499,7 +20572,7 @@ $gs)
    -

    method _putfontwidths [line 6541]

    +

    method _putfontwidths [line 6566]

    @@ -20547,7 +20620,7 @@ $cidoffset = 0])
    -

    method _putheader [line 7159]

    +

    method _putheader [line 7184]

    @@ -20572,7 +20645,7 @@ $cidoffset = 0])
    -

    method _putimages [line 6794]

    +

    method _putimages [line 6819]

    @@ -20597,7 +20670,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 6952]

    +

    method _putinfo [line 6977]

    @@ -20622,7 +20695,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 10115]

    +

    method _putjavascript [line 10141]

    @@ -20653,7 +20726,7 @@ $cidoffset = 0])
    -

    method _putocg [line 11426]

    +

    method _putocg [line 11452]

    @@ -20681,7 +20754,7 @@ $cidoffset = 0])
    -

    method _putpages [line 5600]

    +

    method _putpages [line 5625]

    @@ -20706,7 +20779,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 6877]

    +

    method _putresourcedict [line 6902]

    @@ -20731,7 +20804,7 @@ $cidoffset = 0])
    -

    method _putresources [line 6918]

    +

    method _putresources [line 6943]

    @@ -20756,7 +20829,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 11783]

    +

    method _putshaders [line 11809]

    @@ -20787,7 +20860,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 11147]

    +

    method _putsignature [line 11173]

    @@ -20818,7 +20891,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 6849]

    +

    method _putspotcolors [line 6874]

    @@ -20846,7 +20919,7 @@ $cidoffset = 0])
    -

    method _putstream [line 7488]

    +

    method _putstream [line 7513]

    @@ -20882,7 +20955,7 @@ $s)
    -

    method _puttrailer [line 7145]

    +

    method _puttrailer [line 7170]

    @@ -20907,7 +20980,7 @@ $s)
    -

    method _puttruetypeunicode [line 6640]

    +

    method _puttruetypeunicode [line 6665]

    diff --git a/tcpdf.php b/tcpdf.php index 5e498bf..73f57ca 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2010-03-10 +// Last Update : 2010-03-13 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.037 +// Version : 4.8.038 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,7 @@ * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.8.037 + * @version 4.8.038 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.037 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.038 (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.037 + * @version 4.8.038 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1998,15 +1998,16 @@ if (!class_exists('TCPDF', false)) { } /** - * Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them. + * Defines the left, top and right margins. * @param float $left Left margin. * @param float $top Top margin. * @param float $right Right margin. Default value is the left one. + * @param boolean $keepmargins if true overwrites the default page margins * @access public * @since 1.0 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak() */ - public function SetMargins($left, $top, $right=-1) { + public function SetMargins($left, $top, $right=-1, $keepmargins=false) { //Set left, top and right margins $this->lMargin = $left; $this->tMargin = $top; @@ -2014,6 +2015,11 @@ if (!class_exists('TCPDF', false)) { $right = $left; } $this->rMargin = $right; + if ($keepmargins) { + // overwrite original values + $this->original_lMargin = $this->lMargin; + $this->original_rMargin = $this->rMargin; + } } /** @@ -2378,15 +2384,16 @@ if (!class_exists('TCPDF', false)) { * The origin of the coordinate system is at the top-left corner (or top-right for RTL) and increasing ordinates go downwards. * @param string $orientation page orientation. Possible values are (case insensitive):
    • P or PORTRAIT (default)
    • L or LANDSCAPE
    * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).
    • 4A0
    • 2A0
    • A0
    • A1
    • A2
    • A3
    • A4 (default)
    • A5
    • A6
    • A7
    • A8
    • A9
    • A10
    • B0
    • B1
    • B2
    • B3
    • B4
    • B5
    • B6
    • B7
    • B8
    • B9
    • B10
    • C0
    • C1
    • C2
    • C3
    • C4
    • C5
    • C6
    • C7
    • C8
    • C9
    • C10
    • RA0
    • RA1
    • RA2
    • RA3
    • RA4
    • SRA0
    • SRA1
    • SRA2
    • SRA3
    • SRA4
    • LETTER
    • LEGAL
    • EXECUTIVE
    • FOLIO
    + * @param boolean $keepmargins if true overwrites the default page margins with the current margins * @access public * @since 1.0 * @see startPage(), endPage() */ - public function AddPage($orientation='', $format='') { - if (!isset($this->original_lMargin)) { + public function AddPage($orientation='', $format='', $keepmargins=false) { + if (!isset($this->original_lMargin) OR $keepmargins) { $this->original_lMargin = $this->lMargin; } - if (!isset($this->original_rMargin)) { + if (!isset($this->original_rMargin) OR $keepmargins) { $this->original_rMargin = $this->rMargin; } // terminate previous page @@ -2702,6 +2709,7 @@ if (!class_exists('TCPDF', false)) { $this->lasth = $lasth; $this->thead = $temp_thead; $this->theadMargins = $temp_theadMargins; + $this->newline = false; } } @@ -4483,7 +4491,7 @@ if (!class_exists('TCPDF', false)) { $shy_width = 0; $shy_char_left = ''; $shy_char_right = ''; - } + } $tmpstr = $this->UniArrSubString($uchars, $j, ($sep + $endspace)); if ($firstline) { $startx = $this->x; @@ -4787,6 +4795,33 @@ if (!class_exists('TCPDF', false)) { $w = $h * $pixw / $pixh; } } + // resize image proportionally to be contained on a single page + if ($h > $this->h) { + $h = $this->h; + $w = $h * $pixw / $pixh; + } + if ($w > $this->w) { + $w = $this->w; + $h = $w * $pixh / $pixw; + } + // Check whether we need a new page first as this does not fit + $prev_x = $this->x; + if ($this->checkPageBreak($h, $y)) { + // resize image to vertically fit the available space + $h = $this->PageBreakTrigger - $y; + $w = $h * $pixw / $pixh; + $y = $this->GetY();// + $this->cMargin; + if ($this->rtl) { + $x += ($prev_x - $this->x); + } else { + $x += ($this->x - $prev_x); + } + } + // resize image proportionally to be contained on a single page + if (($x + $w) > $this->w) { + $w = $this->w - $x; + $h = $w * $pixh / $pixw; + } // calculate new minimum dimensions in pixels $neww = round($w * $this->k * $dpi / $this->dpi); $newh = round($h * $this->k * $dpi / $this->dpi); @@ -4877,16 +4912,6 @@ if (!class_exists('TCPDF', false)) { // add image to document $this->setImageBuffer($file, $info); } - // Check whether we need a new page first as this does not fit - $prev_x = $this->x; - if ($this->checkPageBreak($h, $y)) { - $y = $this->GetY() + $this->cMargin; - if ($this->rtl) { - $x += ($prev_x - $this->x); - } else { - $x += ($this->x - $prev_x); - } - } // set bottomcoordinates $this->img_rb_y = $y + $h; // set alignment @@ -7846,10 +7871,11 @@ if (!class_exists('TCPDF', false)) { * @param boolean $firstline if true prints only the first line and return the remaining string. * @param array $color array of RGB text color * @param string $style font style (U, D, B, I) + * @param boolean $firstblock if true the string is the starting of a line. * @return the number of cells used or the remaining text if $firstline = true; * @access public */ - public function addHtmlLink($url, $name, $fill=0, $firstline=false, $color='', $style=-1) { + public function addHtmlLink($url, $name, $fill=0, $firstline=false, $color='', $style=-1, $firstblock=false) { if (!$this->empty_string($url) AND ($url{0} == '#')) { // convert url to internal link $page = intval(substr($url, 1)); @@ -7869,7 +7895,7 @@ if (!class_exists('TCPDF', false)) { } else { $this->SetFont('', $this->FontStyle.$style); } - $ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline); + $ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline, $firstblock, 0); // restore settings $this->SetFont('', $prevstyle); $this->SetTextColorArray($prevcolor); @@ -11980,34 +12006,48 @@ if (!class_exists('TCPDF', false)) { if ($end) { $data = substr($data, 0, $end); } - if ($w > 0) { - $scale_x = $w / (($x2 - $x1) / $k); - if ($h > 0) { - $scale_y = $h / (($y2 - $y1) / $k); - } else { - $scale_y = $scale_x; - $h = ($y2 - $y1) / $k * $scale_y; - } - } else { - if ($h > 0) { - $scale_y = $h / (($y2 - $y1) / $k); - $scale_x = $scale_y; - $w = ($x2-$x1) / $k * $scale_x; - } else { - $w = ($x2 - $x1) / $k; - $h = ($y2 - $y1) / $k; - } + // calculate image width and height on document + if (($w <= 0) AND ($h <= 0)) { + $w = ($x2 - $x1) / $k; + $h = ($y2 - $y1) / $k; + } elseif ($w <= 0) { + $w = ($x2-$x1) / $k * ($h / (($y2 - $y1) / $k)); + } elseif ($h <= 0) { + $h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k)); + } + // get image proportions + $woh = $w / $h; + $how = $h / $w; + // resize image proportionally to be contained on a single page + if ($h > $this->h) { + $h = $this->h; + $w = $h * $woh; + } + if ($w > $this->w) { + $w = $this->w; + $h = $w * $how; } // Check whether we need a new page first as this does not fit $prev_x = $this->x; if ($this->checkPageBreak($h, $y)) { - $y = $this->GetY() + $this->cMargin; + // resize image to vertically fit the available space + $h = $this->PageBreakTrigger - $y; + $w = $h * $woh; + $y = $this->GetY();// + $this->cMargin; if ($this->rtl) { $x += ($prev_x - $this->x); } else { $x += ($this->x - $prev_x); } } + // resize image proportionally to be contained on a single page + if (($x + $w) > $this->w) { + $w = $this->w - $x; + $h = $w * $how; + } + // set scaling factors + $scale_x = $w / (($x2 - $x1) / $k); + $scale_y = $h / (($y2 - $y1) / $k); // set bottomcoordinates $this->img_rb_y = $y + $h; // set alignment @@ -13248,6 +13288,7 @@ if (!class_exists('TCPDF', false)) { $curpos = 0; $this_method_vars = array(); $undo = false; + $fontaligned = false; $blocktags = array('blockquote','br','dd','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf'); $this->premode = false; if (isset($this->PageAnnots[$this->page])) { @@ -13345,32 +13386,34 @@ if (!class_exists('TCPDF', false)) { $this_method_vars['prev_listordered'] = $prev_listordered; $this_method_vars['prev_listcount'] = $prev_listcount; $this_method_vars['prev_lispacer'] = $prev_lispacer; + $this_method_vars['fontaligned'] = $fontaligned; $this_method_vars['key'] = $key; $this_method_vars['dom'] = $dom; } } // print THEAD block if (($dom[$key]['value'] == 'tr') AND isset($dom[$key]['thead']) AND $dom[$key]['thead']) { - while ( ($key < $maxel) AND (!( - ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'tr') AND (!isset($dom[$key]['thead']) OR !$dom[$key]['thead'])) - OR ($dom[$key]['tag'] AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == 'table'))) )) { - // move $key index forward - ++$key; - } - if (isset($dom[$dom[$key]['parent']]['thead']) AND !$this->empty_string($dom[$dom[$key]['parent']]['thead'])) { + if (isset($dom[$key]['parent']) AND isset($dom[$dom[$key]['parent']]['thead']) AND !$this->empty_string($dom[$dom[$key]['parent']]['thead'])) { + $this->inthead = true; // print table header (thead) $this->writeHTML($this->thead, false, false, false, false, ''); - if ($this->start_transaction_page == ($this->numpages - 1)) { + if (($this->start_transaction_page == ($this->numpages - 1)) OR ($this->checkPageBreak($this->lasth, '', false))) { // restore previous object $this->rollbackTransaction(true); // restore previous values foreach ($this_method_vars as $vkey => $vval) { $$vkey = $vval; } - $this->inthead = false; // add a page $this->AddPage(); - } + $this->start_transaction_page = $this->page; + } + } + // move $key index forward to skip THEAD block + while ( ($key < $maxel) AND (!( + ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'tr') AND (!isset($dom[$key]['thead']) OR !$dom[$key]['thead'])) + OR ($dom[$key]['tag'] AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == 'table'))) )) { + ++$key; } } if ($dom[$key]['tag'] OR ($key == 0)) { @@ -13378,18 +13421,16 @@ if (!class_exists('TCPDF', false)) { $dom[$key]['align'] = ($this->rtl) ? 'R' : 'L'; } // vertically align image in line - if ((!$this->newline) - AND ($dom[$key]['value'] == 'img') - AND (isset($dom[$key]['attribute']['height'])) - AND ($dom[$key]['attribute']['height'] > 0)) { + if ((!$this->newline) AND ($dom[$key]['value'] == 'img') + AND (isset($dom[$key]['attribute']['height'])) AND ($dom[$key]['attribute']['height'] > 0)) { // get image height $imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px'); // check for automatic line break $autolinebreak = false; if (isset($dom[$key]['attribute']['width']) AND ($dom[$key]['attribute']['width'] > 0)) { $imgw = $this->getHTMLUnitToUnits($dom[$key]['attribute']['width'], 1, 'px', false); - if (($this->rtl AND (($this->x - $imgw) < $this->lMargin)) - OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin)))) { + if (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cMargin))) + OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cMargin)))) { // add automatic line break $autolinebreak = true; $this->Ln('', $cell); @@ -13401,8 +13442,7 @@ if (!class_exists('TCPDF', false)) { if (!$this->InFooter) { $pre_y = $this->y; // check for page break - $this->checkPageBreak($imgh); - if ($this->y < $pre_y) { + if ((!$this->checkPageBreak($imgh)) AND ($this->y < $pre_y)) { // fix for multicolumn mode $startliney = $this->y; } @@ -13423,7 +13463,10 @@ if (!class_exists('TCPDF', false)) { $tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]); $tend = substr($pagebuff, $this->cntmrk[$this->page]); // add line start to current page - $yshift = $minstartliney - $this->y + ($curfontsize / $this->k); + $yshift = $minstartliney - $this->y; + if ($fontaligned) { + $yshift += ($curfontsize / $this->k); + } $try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k)); $this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend); // shift the annotations and links @@ -13441,13 +13484,12 @@ if (!class_exists('TCPDF', false)) { $this->PageAnnots[$this->page][$npak]['y'] -= $yshift; } } - } $pask = $next_pask; $startlinepos = $this->cntmrk[$this->page]; $startlinepage = $this->page; $startliney = $this->y; - } + } $this->y += (($curfontsize / $this->k) - $imgh); $minstartliney = min($this->y, $minstartliney); } @@ -13460,8 +13502,6 @@ if (!class_exists('TCPDF', false)) { $fontstyle = isset($dom[$key]['fontstyle']) ? $dom[$key]['fontstyle'] : $curfontstyle; $fontsize = isset($dom[$key]['fontsize']) ? $dom[$key]['fontsize'] : $curfontsize; if (($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize)) { - $this->SetFont($fontname, $fontstyle, $fontsize); - $this->lasth = $this->FontSize * $this->cell_height_ratio; if (is_numeric($fontsize) AND ($fontsize > 0) AND is_numeric($curfontsize) AND ($curfontsize > 0) AND ($fontsize != $curfontsize) AND (!$this->newline) @@ -13503,12 +13543,18 @@ if (!class_exists('TCPDF', false)) { } } $pask = $next_pask; + $startlinepos = $this->cntmrk[$this->page]; + $startlinepage = $this->page; + $startliney = $this->y; } if (($dom[$key]['value'] != 'tr') AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) { $this->y += (($curfontsize - $fontsize) / $this->k); } $minstartliney = min($this->y, $minstartliney); + $fontaligned = true; } + $this->SetFont($fontname, $fontstyle, $fontsize); + $this->lasth = $this->FontSize * $this->cell_height_ratio; $curfontname = $fontname; $curfontstyle = $fontstyle; $curfontsize = $fontsize; @@ -13538,34 +13584,36 @@ if (!class_exists('TCPDF', false)) { // align lines if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) { $newline = true; + $fontaligned = false; // we are at the beginning of a new line if (isset($startlinex)) { $yshift = $minstartliney - $startliney; if (($yshift > 0) OR ($this->page > $startlinepage)) { $yshift = 0; } + $t_x = 0; + // the last line must be shifted to be aligned as requested + $linew = abs($this->endlinex - $startlinex); + $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); + if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { + $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; + $midpos = min($opentagpos, $this->footerpos[$startlinepage]); + } elseif (isset($opentagpos)) { + $midpos = $opentagpos; + } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { + $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; + $midpos = $this->footerpos[$startlinepage]; + } else { + $midpos = 0; + } + if ($midpos > 0) { + $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos)); + $pend = substr($this->getPageBuffer($startlinepage), $midpos); + } else { + $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos); + $pend = ''; + } if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl))))) OR ($yshift < 0)) { - // the last line must be shifted to be aligned as requested - $linew = abs($this->endlinex - $startlinex); - $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); - if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { - $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; - $midpos = min($opentagpos, $this->footerpos[$startlinepage]); - } elseif (isset($opentagpos)) { - $midpos = $opentagpos; - } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { - $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; - $midpos = $this->footerpos[$startlinepage]; - } else { - $midpos = 0; - } - if ($midpos > 0) { - $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos)); - $pend = substr($this->getPageBuffer($startlinepage), $midpos); - } else { - $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos); - $pend = ''; - } // calculate shifting amount $tw = $w; if ($this->lMargin != $prevlMargin) { @@ -13574,8 +13622,8 @@ if (!class_exists('TCPDF', false)) { if ($this->rMargin != $prevrMargin) { $tw += ($prevrMargin - $this->rMargin); } + $one_space_width = $this->GetStringWidth(chr(32)); $mdiff = abs($tw - $linew); - $t_x = 0; if ($plalign == 'C') { if ($this->rtl) { $t_x = -($mdiff / 2); @@ -13584,16 +13632,32 @@ if (!class_exists('TCPDF', false)) { } } elseif (($plalign == 'R') AND (!$this->rtl)) { // right alignment on LTR document + if (intval($this->revstrpos($pmid, ')]')) == (intval($this->revstrpos($pmid, ' )]')) + 1)) { + // remove last space (if any) + $linew -= $one_space_width; + $mdiff = abs($tw - $linew); + } $t_x = $mdiff; } elseif (($plalign == 'L') AND ($this->rtl)) { // left alignment on RTL document + if ((intval($this->revstrpos($pmid, '[( ')) == intval($this->revstrpos($pmid, '[('))) OR (intval($this->revstrpos($pmid, '[('.chr(0).chr(32))) == intval($this->revstrpos($pmid, '[(')))) { + // remove first space (if any) + $linew -= $one_space_width; + } + if (intval(strpos($pmid, '[(')) == (intval($this->revstrpos($pmid, '[(')))) { + // remove last space (if any) + $linew -= $one_space_width; + if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { + $linew -= $one_space_width; + } + } + $mdiff = abs($tw - $linew); $t_x = -$mdiff; } elseif (($plalign == 'J') AND ($plalign == $lalign)) { // Justification if ($this->isRTLTextDir()) { $t_x = $this->lMargin - $this->endlinex + $this->cMargin; } - $one_space_width = $this->GetStringWidth(chr(32)); $no = 0; // spaces without trim $ns = 0; // spaces with trim $pmidtemp = $pmid; @@ -13632,7 +13696,7 @@ if (!class_exists('TCPDF', false)) { // calculate additional space to add to each space $spacelen = $one_space_width; $spacewidth = ((($tw - $linew) + (($no - $ns) * $spacelen)) / ($ns?$ns:1)) * $this->k; - $spacewidthu = -1000 * (($tw - $linew) + ($ns * $spacelen)) / ($ns?$ns:1) / $this->FontSize; + $spacewidthu = -1000 * (($tw - $linew) + ($no * $spacelen)) / ($ns?$ns:1) / $this->FontSize; $nsmax = $ns; $ns = 0; reset($lnstring); @@ -13677,6 +13741,7 @@ if (!class_exists('TCPDF', false)) { $pmid = $pmid_b."\nq\n".$trx."\n".$pmid_m."\nQ\n".$pmid_e; $offset = $epsposend; continue; + } $prev_epsposbeg = $epsposbeg; $currentxpos = 0; @@ -13767,10 +13832,17 @@ if (!class_exists('TCPDF', false)) { } // shift the annotations and links if (isset($this->PageAnnots[$this->page])) { + $cxpos = ($currentxpos / $this->k); + $lmpos = ($this->lMargin + $this->cMargin + $this->feps); + foreach ($this->PageAnnots[$this->page] as $pak => $pac) { if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) { - $this->PageAnnots[$this->page][$pak]['x'] += ($spacew / $this->k); - $this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k); + if ($cxpos > $lmpos) { + $this->PageAnnots[$this->page][$pak]['x'] += (($spacew - $one_space_width) / $this->k); + $this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k); + } else { + $this->PageAnnots[$this->page][$pak]['w'] += ((($spacewidth * $pac['numspaces']) - $one_space_width) / $this->k); + } break; } } @@ -13801,37 +13873,32 @@ if (!class_exists('TCPDF', false)) { } } } // end of J - if (($t_x != 0) OR ($yshift < 0)) { - // shift the line - $trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k)); - $this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend); - $endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n"); - // shift the annotations and links - if (isset($this->PageAnnots[$this->page])) { - foreach ($this->PageAnnots[$this->page] as $pak => $pac) { - if ($pak >= $pask) { - $this->PageAnnots[$this->page][$pak]['x'] += $t_x; - $this->PageAnnots[$this->page][$pak]['y'] -= $yshift; - } + } // end if $startlinex + if (($t_x != 0) OR ($yshift < 0)) { + // shift the line + $trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k)); + $this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend); + $endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n"); + // shift the annotations and links + if (isset($this->PageAnnots[$this->page])) { + foreach ($this->PageAnnots[$this->page] as $pak => $pac) { + if ($pak >= $pask) { + $this->PageAnnots[$this->page][$pak]['x'] += $t_x; + $this->PageAnnots[$this->page][$pak]['y'] -= $yshift; } } - $this->y -= $yshift; } + $this->y -= $yshift; } } $this->newline = false; - $pbrk = $this->checkPageBreak($this->lasth); - $this->SetFont($fontname, $fontstyle, $fontsize); - if ($wfill) { - $this->SetFillColorArray($this->bgcolor); - } + $pbrk = $this->checkPageBreak($this->lasth); $startlinex = $this->x; $startliney = $this->y; - $minstartliney = $this->y; + $minstartliney = $startliney; $startlinepage = $this->page; if (isset($endlinepos) AND (!$pbrk)) { $startlinepos = $endlinepos; - unset($endlinepos); } else { if (isset($this->footerlen[$this->page])) { $this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page]; @@ -13840,13 +13907,18 @@ if (!class_exists('TCPDF', false)) { } $startlinepos = $this->footerpos[$this->page]; } + unset($endlinepos); $plalign = $lalign; if (isset($this->PageAnnots[$this->page])) { $pask = count($this->PageAnnots[$this->page]); } else { $pask = 0; } - } + $this->SetFont($fontname, $fontstyle, $fontsize); + if ($wfill) { + $this->SetFillColorArray($this->bgcolor); + } + } // end newline if (isset($opentagpos)) { unset($opentagpos); } @@ -14099,7 +14171,7 @@ if (!class_exists('TCPDF', false)) { if (!$this->premode) { $prelen = strlen($dom[$key]['value']); if ($this->isRTLTextDir()) { - $dom[$key]['value'] = rtrim($dom[$key]['value']); + $dom[$key]['value'] = rtrim($dom[$key]['value']).chr(0); } else { $dom[$key]['value'] = ltrim($dom[$key]['value']); } @@ -14114,19 +14186,20 @@ if (!class_exists('TCPDF', false)) { $firstblock = false; } $strrest = ''; + if ($this->rtl) { + $this->x -= $this->textindent; + } else { + $this->x += $this->textindent; + } if (!empty($this->HREF) AND (isset($this->HREF['url']))) { // HTML Link - $strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $this->HREF['color'], $this->HREF['style']); + $strrest = $this->addHtmlLink($this->HREF['url'], trim($dom[$key]['value']), $wfill, true, $this->HREF['color'], $this->HREF['style'], true); } else { - if ($this->rtl) { - $this->x -= $this->textindent; - } else { - $this->x += $this->textindent; - } // ****** write only until the end of the line and get the rest ****** - $strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock); - $this->textindent = 0; + $strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0); } + $this->textindent = 0; + if (strlen($strrest) > 0) { // store the remaining string on the previous $key position $this->newline = true; @@ -14143,7 +14216,15 @@ if (!class_exists('TCPDF', false)) { } else { $loop = 0; } - $dom[$key]['value'] = ltrim($strrest); + if (!empty($this->HREF) AND (isset($this->HREF['url']))) { + $dom[$key]['value'] = trim($strrest); + } elseif ($this->premode) { + $dom[$key]['value'] = $strrest; + } elseif ($this->isRTLTextDir()) { + $dom[$key]['value'] = rtrim($strrest); + } else { + $dom[$key]['value'] = ltrim($strrest); + } if ($loop < 3) { --$key; } @@ -14154,25 +14235,17 @@ if (!class_exists('TCPDF', false)) { ++$key; if (isset($dom[$key]['tag']) AND $dom[$key]['tag'] AND (!isset($dom[$key]['opening']) OR !$dom[$key]['opening']) AND isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) { if ((!$undo) AND ($this->start_transaction_page == ($this->numpages - 1))) { - if (isset($dom[($dom[$key]['parent'])]['thead']) AND ($dom[($dom[$key]['parent'])]['thead'])) { - // we are inside a thead section - $inthead = true; - } else { - $inthead = false; - } // restore previous object $this->rollbackTransaction(true); // restore previous values foreach ($this_method_vars as $vkey => $vval) { $$vkey = $vval; } - $this->inthead = $inthead; // add a page $this->AddPage(); $undo = true; // avoid infinite loop } else { $undo = false; - } } } // end for each $key @@ -14182,28 +14255,29 @@ if (!class_exists('TCPDF', false)) { if (($yshift > 0) OR ($this->page > $startlinepage)) { $yshift = 0; } + $t_x = 0; + // the last line must be shifted to be aligned as requested + $linew = abs($this->endlinex - $startlinex); + $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); + if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { + $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; + $midpos = min($opentagpos, $this->footerpos[$startlinepage]); + } elseif (isset($opentagpos)) { + $midpos = $opentagpos; + } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { + $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; + $midpos = $this->footerpos[$startlinepage]; + } else { + $midpos = 0; + } + if ($midpos > 0) { + $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos)); + $pend = substr($this->getPageBuffer($startlinepage), $midpos); + } else { + $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos); + $pend = ''; + } if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl))))) OR ($yshift < 0)) { - // the last line must be shifted to be aligned as requested - $linew = abs($this->endlinex - $startlinex); - $pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos); - if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { - $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; - $midpos = min($opentagpos, $this->footerpos[$startlinepage]); - } elseif (isset($opentagpos)) { - $midpos = $opentagpos; - } elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) { - $this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage]; - $midpos = $this->footerpos[$startlinepage]; - } else { - $midpos = 0; - } - if ($midpos > 0) { - $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos)); - $pend = substr($this->getPageBuffer($startlinepage), $midpos); - } else { - $pmid = substr($this->getPageBuffer($startlinepage), $startlinepos); - $pend = ''; - } // calculate shifting amount $tw = $w; if ($this->lMargin != $prevlMargin) { @@ -14212,8 +14286,8 @@ if (!class_exists('TCPDF', false)) { if ($this->rMargin != $prevrMargin) { $tw += ($prevrMargin - $this->rMargin); } + $one_space_width = $this->GetStringWidth(chr(32)); $mdiff = abs($tw - $linew); - $t_x = 0; if ($plalign == 'C') { if ($this->rtl) { $t_x = -($mdiff / 2); @@ -14222,27 +14296,44 @@ if (!class_exists('TCPDF', false)) { } } elseif (($plalign == 'R') AND (!$this->rtl)) { // right alignment on LTR document + if (intval($this->revstrpos($pmid, ')]')) == (intval($this->revstrpos($pmid, ' )]')) + 1)) { + // remove last space (if any) + $linew -= $one_space_width; + $mdiff = abs($tw - $linew); + } $t_x = $mdiff; } elseif (($plalign == 'L') AND ($this->rtl)) { // left alignment on RTL document - $t_x = -$mdiff; - } - if (($t_x != 0) OR ($yshift < 0)) { - // shift the line - $trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k)); - $this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend); - $endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n"); - // shift the annotations and links - if (isset($this->PageAnnots[$this->page])) { - foreach ($this->PageAnnots[$this->page] as $pak => $pac) { - if ($pak >= $pask) { - $this->PageAnnots[$this->page][$pak]['x'] += $t_x; - $this->PageAnnots[$this->page][$pak]['y'] -= $yshift; - } + if ((intval($this->revstrpos($pmid, '[( ')) == intval($this->revstrpos($pmid, '[('))) OR (intval($this->revstrpos($pmid, '[('.chr(0).chr(32))) == intval($this->revstrpos($pmid, '[(')))) { + // remove first space (if any) + $linew -= $one_space_width; + } + if (intval(strpos($pmid, '[(')) == (intval($this->revstrpos($pmid, '[(')))) { + // remove last space (if any) + $linew -= $one_space_width; + if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) { + $linew -= $one_space_width; } } - $this->y -= $yshift; + $mdiff = abs($tw - $linew); + $t_x = -$mdiff; } + } // end if startlinex + if (($t_x != 0) OR ($yshift < 0)) { + // shift the line + $trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k)); + $this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend); + $endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n"); + // shift the annotations and links + if (isset($this->PageAnnots[$this->page])) { + foreach ($this->PageAnnots[$this->page] as $pak => $pac) { + if ($pak >= $pask) { + $this->PageAnnots[$this->page][$pak]['x'] += $t_x; + $this->PageAnnots[$this->page][$pak]['y'] -= $yshift; + } + } + } + $this->y -= $yshift; } } if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) { @@ -14294,7 +14385,6 @@ if (!class_exists('TCPDF', false)) { $this->theadMargins = array(); $this->theadMargins['cmargin'] = $this->cMargin; } - $this->inthead = true; } } if (isset($tag['attribute']['cellpadding'])) { @@ -14305,17 +14395,15 @@ if (!class_exists('TCPDF', false)) { if (isset($tag['attribute']['cellspacing'])) { $cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px'); } - $this->checkPageBreak((2 * $cp) + (2 * $cs) + $this->lasth); + if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false)) { + $this->inthead = true; + $this->AddPage(); + } break; } case 'tr': { // array of columns positions - $dom[$key]['cellpos'] = array(); - if (isset($tag['thead']) AND $tag['thead']) { - $this->inthead = true; - } else { - $this->inthead = false; - } + $dom[$key]['cellpos'] = array(); break; } case 'hr': { @@ -14443,7 +14531,7 @@ if (!class_exists('TCPDF', false)) { if (($type == 'eps') OR ($type == 'ai')) { $this->ImageEps($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, $imglink, true, $align, '', $border); } else { - $this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border); + $this->Image($tag['attribute']['src'], $xpos, $this->GetY(), $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false); } switch($align) { case 'T': { @@ -16410,7 +16498,7 @@ if (!class_exists('TCPDF', false)) { /** * Determine whether a string is empty. - * @param srting $str string to be checked + * @param string $str string to be checked * @return boolean true if string is empty * @access public * @since 4.5.044 (2009-04-16) @@ -16418,6 +16506,22 @@ if (!class_exists('TCPDF', false)) { public function empty_string($str) { return (is_null($str) OR (is_string($str) AND (strlen($str) == 0))); } + + /** + * Find position of last occurrence of a substring in a string + * @param string $haystack The string to search in. + * @param string $needle substring to search. + * @param int $offset May be specified to begin searching an arbitrary number of characters into the string. + * @return Returns the position where the needle exists. Returns FALSE if the needle was not found. + * @access public + * @since 4.8.038 (2010-03-13) + */ + public function revstrpos($haystack, $needle, $offset = 0) { + $length = strlen($haystack); + $offset = ($offset > 0)?($length - $offset):abs($offset); + $pos = strpos(strrev($haystack), strrev($needle), $offset); + return ($pos === false)?false:($length - $pos - strlen($needle)); + } } // END OF TCPDF CLASS }
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 0868aba..cda4a2e 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 Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    @@ -20952,7 +21025,7 @@ $font)
    -

    method _putviewerpreferences [line 7075]

    +

    method _putviewerpreferences [line 7100]

    diff --git a/doc/index.html b/doc/index.html index 0868aba..cda4a2e 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 Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    diff --git a/doc/errors.html b/doc/errors.html index 4bab459..a0773ce 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Wed, 10 Mar 2010 14:59:01 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:56 +0100 by phpDocumentor 1.4.3
    @@ -20983,7 +21056,7 @@ $font)
    -

    method _putxobjectdict [line 6866]

    +

    method _putxobjectdict [line 6891]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index b0c8e3d..2d1ff69 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1084,6 +1084,8 @@
    in file tcpdf.php, method TCPDF::RegularPolygon()
        Draws a regular polygon.
    removeSHY
    in file tcpdf.php, method TCPDF::removeSHY()
        Removes SHY characters from text.
    +
    revstrpos
    +
    in file tcpdf.php, method TCPDF::revstrpos()
        Find position of last occurrence of a substring in a string
    rfread
    in file tcpdf.php, method TCPDF::rfread()
        Binary-safe and URL-safe file read.
    rollbackTransaction
    @@ -1227,7 +1229,7 @@
    setLIsymbol
    in file tcpdf.php, method TCPDF::setLIsymbol()
        Set the default bullet to be used as LI bullet symbol
    SetMargins
    -
    in file tcpdf.php, method TCPDF::SetMargins()
        Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.
    +
    in file tcpdf.php, method TCPDF::SetMargins()
        Defines the left, top and right margins.
    setOpenCell
    in file tcpdf.php, method TCPDF::setOpenCell()
        Set the top/bottom cell sides to be open or closed when the cell cross the page.
    setPage
    @@ -1479,7 +1481,7 @@ top
    - Documentation generated on Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 11f85bd..5931c2b 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -923,6 +923,8 @@
    in file tcpdf.php, method TCPDF::RegularPolygon()
        Draws a regular polygon.
    removeSHY
    in file tcpdf.php, method TCPDF::removeSHY()
        Removes SHY characters from text.
    +
    revstrpos
    +
    in file tcpdf.php, method TCPDF::revstrpos()
        Find position of last occurrence of a substring in a string
    rfread
    in file tcpdf.php, method TCPDF::rfread()
        Binary-safe and URL-safe file read.
    rollbackTransaction
    @@ -1066,7 +1068,7 @@
    setLIsymbol
    in file tcpdf.php, method TCPDF::setLIsymbol()
        Set the default bullet to be used as LI bullet symbol
    SetMargins
    -
    in file tcpdf.php, method TCPDF::SetMargins()
        Defines the left, top and right margins. By default, they equal 1 cm. Call this method to change them.
    +
    in file tcpdf.php, method TCPDF::SetMargins()
        Defines the left, top and right margins.
    setOpenCell
    in file tcpdf.php, method TCPDF::setOpenCell()
        Set the top/bottom cell sides to be open or closed when the cell cross the page.
    setPage
    @@ -1456,7 +1458,7 @@ top
    - Documentation generated on Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    @@ -21008,7 +21081,7 @@ $font)
    -

    method _RC4 [line 7994]

    +

    method _RC4 [line 8020]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 0e8730b..8f85690 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 Wed, 10 Mar 2010 14:59:01 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:56 +0100 by phpDocumentor 1.4.3
    @@ -21059,7 +21132,7 @@ $text)
    -

    method _textstring [line 7457]

    +

    method _textstring [line 7482]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index fac65af..dc6b490 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 75668c2..46d809c 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 Wed, 10 Mar 2010 14:58:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    @@ -21098,7 +21171,7 @@ $s)
    -

    method _toJPEG [line 5008]

    +

    method _toJPEG [line 5033]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 5916162..5149e40 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 Wed, 10 Mar 2010 14:59:01 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:56 +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 8e1bb9b..fa9072b 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 Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    @@ -21140,7 +21213,7 @@ $file)
    -

    method _Uvalue [line 8060]

    +

    method _Uvalue [line 8086]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 79a1146..8c37b7d 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
    - Documentation generated on Wed, 10 Mar 2010 14:58:58 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    @@ -21177,7 +21250,7 @@ $file)
    - Documentation generated on Wed, 10 Mar 2010 14:58:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  4.8.037version:  4.8.038
    copyright:  2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
    - PDF_PRODUCER = 'TCPDF 4.8.037 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.038 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data

    - Documentation generated on Wed, 10 Mar 2010 14:58:59 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 13 Mar 2010 20:48:53 +0100 by phpDocumentor 1.4.3