diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 2535aeb..a0f037d 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,5 +1,9 @@ +4.6.017 (2009-07-05) + - Bug item #2816079 "Example 48 not working" was fixed. + - The signature of the checkPageBreak() was changed. The parameter $addpage was added to turn off the automatic page creation. + 4.6.016 (2009-06-16) - - Method setSpacesRE() was added to set the regular expression for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/'); + - Method setSpacesRE() was added to set the regular expression used for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/'); - The method _putinfo() now automatically fills the metadata with '?' in case of empty string. 4.6.015 (2009-06-11) diff --git a/README.TXT b/README.TXT index 2f58fb7..ad1c0a2 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.6.016 -Release date: 2009-06-15 +Version: 4.6.017 +Release date: 2009-07-05 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index d9af3cb..7be69ab 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 96f6818..60ab533 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -589,7 +589,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.016 + version:  4.6.017 link:  http://www.tcpdf.org @@ -5351,7 +5351,7 @@ $diskcache = false])
-

method addExtGState [line 9606]

+

method addExtGState [line 9609]

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

method addHtmlLink [line 6927]

+

method addHtmlLink [line 6930]

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

method addHTMLVertSpace [line 12742]

+

method addHTMLVertSpace [line 12745]

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

method addTOC [line 13764]

+

method addTOC [line 13767]

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

method AliasNbPages [line 9414]

+

method AliasNbPages [line 9417]

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

method AliasNumPage [line 9441]

+

method AliasNumPage [line 9444]

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

method arrUTF8ToUTF16BE [line 6829]

+

method arrUTF8ToUTF16BE [line 6832]

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

method Bookmark [line 8936]

+

method Bookmark [line 8939]

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

method Button [line 9218]

+

method Button [line 9221]

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

method Cell [line 3376]

+

method Cell [line 3379]

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

method CheckBox [line 9198]

+

method CheckBox [line 9201]

+ + + + + + + + + +
@@ -6282,14 +6282,16 @@ $prop = array()])
-

method checkPageBreak [line 3330]

+

method checkPageBreak [line 3331]

boolean checkPageBreak( [float $h = 0], [mixed -$y = '']) +$y = ''], [ +$addpage = true], boolean +$add_page)

@@ -6323,6 +6325,16 @@ $y = ''])
mixed   $y   starting y position, leave empty for current position.
boolean  $add_page  if true add a page, otherwise only return the true/false state
  $addpage  

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

method Circle [line 8042]

+

method Circle [line 8045]

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

method Clip [line 9869]

+

method Clip [line 9872]

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

method closeHTMLTagHandler [line 12411]

+

method closeHTMLTagHandler [line 12414]

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

method ComboBox [line 9179]

+

method ComboBox [line 9182]

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

method commitTransaction [line 13921]

+

method commitTransaction [line 13924]

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

method convertHTMLColorToDec [line 6960]

+

method convertHTMLColorToDec [line 6963]

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

method CoonsPatchMesh [line 9789]

+

method CoonsPatchMesh [line 9792]

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

method Curve [line 7817]

+

method Curve [line 7820]

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

method deletePage [line 13624]

+

method deletePage [line 13627]

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

method Ellipse [line 7938]

+

method Ellipse [line 7941]

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

method empty_string [line 13968]

+

method empty_string [line 13971]

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

method formatPageNumber [line 9518]

+

method formatPageNumber [line 9521]

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

method formatTOCPageNumber [line 9530]

+

method formatTOCPageNumber [line 9533]

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

method GetAbsX [line 4872]

+

method GetAbsX [line 4875]

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

method getAliasNbPages [line 9426]

+

method getAliasNbPages [line 9429]

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

method getAliasNumPage [line 9454]

+

method getAliasNumPage [line 9457]

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

method getBarcode [line 10334]

+

method getBarcode [line 10337]

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

method getBorderMode [line 3821]

+

method getBorderMode [line 3824]

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

method getBuffer [line 13310]

+

method getBuffer [line 13313]

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

method getCellCode [line 3428]

+

method getCellCode [line 3431]

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

method getCellHeightRatio [line 9692]

+

method getCellHeightRatio [line 9695]

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

method getFontBuffer [line 13470]

+

method getFontBuffer [line 13473]

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

method getFontFamily [line 10810]

+

method getFontFamily [line 10813]

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

method getFontSize [line 10790]

+

method getFontSize [line 10793]

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

method getFontSizePt [line 10800]

+

method getFontSizePt [line 10803]

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

method getFontStyle [line 10820]

+

method getFontStyle [line 10823]

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

method getFooterFont [line 6890]

+

method getFooterFont [line 6893]

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

method getGDgamma [line 4815]

+

method getGDgamma [line 4818]

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

method getGraphicVars [line 13178]

+

method getGraphicVars [line 13181]

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

method getGroupPageNo [line 9467]

+

method getGroupPageNo [line 9470]

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

method getGroupPageNoFormatted [line 9477]

+

method getGroupPageNoFormatted [line 9480]

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

method getHeaderFont [line 6870]

+

method getHeaderFont [line 6873]

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

method getHtmlDomArray [line 10856]

+

method getHtmlDomArray [line 10859]

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

method getHTMLUnitToUnits [line 12897]

+

method getHTMLUnitToUnits [line 12900]

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

method getImageBuffer [line 13412]

+

method getImageBuffer [line 13415]

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

method GetLineWidth [line 7534]

+

method GetLineWidth [line 7537]

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

method getMargins [line 10753]

+

method getMargins [line 10756]

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

method getNumLines [line 3900]

+

method getNumLines [line 3903]

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

method getObjFilename [line 13242]

+

method getObjFilename [line 13245]

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

method getOriginalMargins [line 10776]

+

method getOriginalMargins [line 10779]

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

method getPageBuffer [line 13353]

+

method getPageBuffer [line 13356]

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

method getPageGroupAlias [line 9489]

+

method getPageGroupAlias [line 9492]

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

method getPageNumGroupAlias [line 9504]

+

method getPageNumGroupAlias [line 9507]

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

method getPDFData [line 6909]

+

method getPDFData [line 6912]

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

method getRemainingWidth [line 4261]

+

method getRemainingWidth [line 4264]

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

method GetX [line 4856]

+

method GetX [line 4859]

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

method GetY [line 4883]

+

method GetY [line 4886]

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

method Gradient [line 9892]

+

method Gradient [line 9895]

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

method Image [line 4383]

+

method Image [line 4386]

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

method ImageEps [line 10064]

+

method ImageEps [line 10067]

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

method ImagePngAlpha [line 4771]

+

method ImagePngAlpha [line 4774]

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

method IncludeJS [line 9028]

+

method IncludeJS [line 9031]

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

method intToRoman [line 12971]

+

method intToRoman [line 12974]

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

method Line [line 7684]

+

method Line [line 7687]

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

method LinearGradient [line 9749]

+

method LinearGradient [line 9752]

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

method ListBox [line 9156]

+

method ListBox [line 9159]

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

method Ln [line 4828]

+

method Ln [line 4831]

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

method MirrorH [line 7308]

+

method MirrorH [line 7311]

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

method MirrorL [line 7344]

+

method MirrorL [line 7347]

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

method MirrorP [line 7331]

+

method MirrorP [line 7334]

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

method MirrorV [line 7319]

+

method MirrorV [line 7322]

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

method movePage [line 13487]

+

method movePage [line 13490]

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

method MultiCell [line 3663]

+

method MultiCell [line 3666]

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

method objclone [line 13957]

+

method objclone [line 13960]

@@ -10361,8 +10373,8 @@ $txt, [mixed $border = 0], [string $align = 'J'], [int $fill = 0], [int -$ln = 1], [int -$x = ''], [int +$ln = 1], [float +$x = ''], [float $y = ''], [boolean $reseth = true], [int $stretch = 0], [boolean @@ -10435,12 +10447,12 @@ $maxh = 0]) Indicates where the current position should go after the call. Possible values are:
  • 0: to the right
  • 1: to the beginning of the next line [DEFAULT]
  • 2: below
int  float   $x   x position in user units
int  float   $y   y position in user units
@@ -10548,7 +10560,7 @@ $object)
-

method openHTMLTagHandler [line 12081]

+

method openHTMLTagHandler [line 12084]

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

method Output [line 4975]

+

method Output [line 4978]

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

method PageNoFormatted [line 9540]

+

method PageNoFormatted [line 9543]

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

method PieSector [line 9986]

+

method PieSector [line 9989]

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

method pixelsToUnits [line 7013]

+

method pixelsToUnits [line 7016]

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

method Polycurve [line 7874]

+

method Polycurve [line 7877]

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

method Polygon [line 8067]

+

method Polygon [line 8070]

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

method putHtmlListBullet [line 13036]

+

method putHtmlListBullet [line 13039]

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

method RadialGradient [line 9767]

+

method RadialGradient [line 9770]

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

method RadioButton [line 9138]

+

method RadioButton [line 9141]

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

method readDiskCache [line 13282]

+

method readDiskCache [line 13285]

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

method Rect [line 7719]

+

method Rect [line 7722]

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

method RegularPolygon [line 8166]

+

method RegularPolygon [line 8169]

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

method removeSHY [line 3393]

+

method removeSHY [line 3396]

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

method rfread [line 4741]

+

method rfread [line 4744]

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

method rollbackTransaction [line 13934]

+

method rollbackTransaction [line 13937]

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

method Rotate [line 7403]

+

method Rotate [line 7406]

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

method RoundedRect [line 8270]

+

method RoundedRect [line 8273]

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

method Scale [line 7273]

+

method Scale [line 7276]

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

method ScaleX [line 7233]

+

method ScaleX [line 7236]

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

method ScaleXY [line 7259]

+

method ScaleXY [line 7262]

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

method ScaleY [line 7246]

+

method ScaleY [line 7249]

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

method setAlpha [line 9649]

+

method setAlpha [line 9652]

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

method setBarcode [line 10324]

+

method setBarcode [line 10327]

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

method SetBooklet [line 12811]

+

method SetBooklet [line 12814]

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

method setBuffer [line 13292]

+

method setBuffer [line 13295]

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

method setCellHeightRatio [line 9683]

+

method setCellHeightRatio [line 9686]

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

method setDefaultTableColumns [line 9673]

+

method setDefaultTableColumns [line 9676]

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

method setExtGState [line 9618]

+

method setExtGState [line 9621]

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

method setFontBuffer [line 13428]

+

method setFontBuffer [line 13431]

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

method setFontSubBuffer [line 13450]

+

method setFontSubBuffer [line 13453]

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

method setFooterFont [line 6880]

+

method setFooterFont [line 6883]

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

method setGraphicVars [line 13209]

+

method setGraphicVars [line 13212]

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

method setHeaderFont [line 6860]

+

method setHeaderFont [line 6863]

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

method setHtmlLinksStyle [line 12882]

+

method setHtmlLinksStyle [line 12885]

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

method setHtmlVSpace [line 12851]

+

method setHtmlVSpace [line 12854]

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

method setImageBuffer [line 13369]

+

method setImageBuffer [line 13372]

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

method setImageSubBuffer [line 13392]

+

method setImageSubBuffer [line 13395]

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

method setJPEGQuality [line 9660]

+

method setJPEGQuality [line 9663]

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

method setLanguageArray [line 6900]

+

method setLanguageArray [line 6903]

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

method SetLineStyle [line 7559]

+

method SetLineStyle [line 7562]

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

method SetLineWidth [line 7520]

+

method SetLineWidth [line 7523]

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

method setListIndentWidth [line 12861]

+

method setListIndentWidth [line 12864]

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

method setLIsymbol [line 12771]

+

method setLIsymbol [line 12774]

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

method setOpenCell [line 12871]

+

method setOpenCell [line 12874]

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

method setPageBuffer [line 13326]

+

method setPageBuffer [line 13329]

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

method setPDFVersion [line 9702]

+

method setPDFVersion [line 9705]

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

method SetProtection [line 7176]

+

method SetProtection [line 7179]

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

method setSignature [line 9374]

+

method setSignature [line 9377]

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

method setUserRights [line 9348]

+

method setUserRights [line 9351]

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

method setViewerPreferences [line 9732]

+

method setViewerPreferences [line 9735]

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

method setVisibility [line 9570]

+

method setVisibility [line 9573]

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

method SetX [line 4896]

+

method SetX [line 4899]

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

method SetXY [line 4959]

+

method SetXY [line 4962]

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

method SetY [line 4928]

+

method SetY [line 4931]

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

method Skew [line 7463]

+

method Skew [line 7466]

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

method SkewX [line 7436]

+

method SkewX [line 7439]

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

method SkewY [line 7449]

+

method SkewY [line 7452]

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

method StarPolygon [line 8221]

+

method StarPolygon [line 8224]

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

method startPageGroup [line 9399]

+

method startPageGroup [line 9402]

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

method startTransaction [line 13907]

+

method startTransaction [line 13910]

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

method StartTransform [line 7204]

+

method StartTransform [line 7207]

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

method StopTransform [line 7217]

+

method StopTransform [line 7220]

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

method swapMargins [line 12827]

+

method swapMargins [line 12830]

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

method TextField [line 9125]

+

method TextField [line 9128]

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

method Transform [line 7496]

+

method Transform [line 7499]

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

method Translate [line 7379]

+

method Translate [line 7382]

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

method TranslateX [line 7356]

+

method TranslateX [line 7359]

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

method TranslateY [line 7367]

+

method TranslateY [line 7370]

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

method unhtmlentities [line 7024]

+

method unhtmlentities [line 7027]

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

method UniArrSubString [line 4300]

+

method UniArrSubString [line 4303]

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

method unichr [line 4333]

+

method unichr [line 4336]

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

method UTF8ArrayToUniArray [line 4321]

+

method UTF8ArrayToUniArray [line 4324]

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

method UTF8ArrSubString [line 4277]

+

method UTF8ArrSubString [line 4280]

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

method utf8Bidi [line 8369]

+

method utf8Bidi [line 8372]

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

method UTF8StringToArray [line 6662]

+

method UTF8StringToArray [line 6665]

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

method utf8StrRev [line 8355]

+

method utf8StrRev [line 8358]

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

method UTF8ToLatin1 [line 6769]

+

method UTF8ToLatin1 [line 6772]

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

method UTF8ToUTF16BE [line 6753]

+

method UTF8ToUTF16BE [line 6756]

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

method Write [line 3943]

+

method Write [line 3946]

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

method write1DBarcode [line 10353]

+

method write1DBarcode [line 10356]

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

method write2DBarcode [line 10606]

+

method write2DBarcode [line 10609]

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

method writeBarcode [line 10556]

+

method writeBarcode [line 10559]

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

method writeDiskCache [line 13254]

+

method writeDiskCache [line 13257]

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

method writeHTML [line 11256]

+

method writeHTML [line 11259]

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

method writeHTMLCell [line 10844]

+

method writeHTMLCell [line 10847]

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

method _addfield [line 9090]

+

method _addfield [line 9093]

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

method _beginpage [line 6442]

+

method _beginpage [line 6445]

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

method _datastring [line 6552]

+

method _datastring [line 6555]

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

method _destroy [line 5130]

+

method _destroy [line 5133]

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

method _dochecks [line 5157]

+

method _dochecks [line 5160]

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

method _dolinethrough [line 6517]

+

method _dolinethrough [line 6520]

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

method _dounderline [line 6503]

+

method _dounderline [line 6506]

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

method _enddoc [line 6381]

+

method _enddoc [line 6384]

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

method _endpage [line 6481]

+

method _endpage [line 6484]

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

method _escape [line 6541]

+

method _escape [line 6544]

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

method _escapetext [line 6579]

+

method _escapetext [line 6582]

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

method _freadint [line 6530]

+

method _freadint [line 6533]

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

method _generateencryptionkey [line 7144]

+

method _generateencryptionkey [line 7147]

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

method _getfontpath [line 5173]

+

method _getfontpath [line 5176]

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

method _JScolor [line 9066]

+

method _JScolor [line 9069]

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

method _md5_16 [line 7105]

+

method _md5_16 [line 7108]

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

method _newobj [line 6490]

+

method _newobj [line 6493]

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

method _objectkey [line 7037]

+

method _objectkey [line 7040]

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

method _out [line 6610]

+

method _out [line 6613]

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

method _outarc [line 9966]

+

method _outarc [line 9969]

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

method _outCurve [line 7664]

+

method _outCurve [line 7667]

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

method _outLine [line 7628]

+

method _outLine [line 7631]

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

method _outPoint [line 7614]

+

method _outPoint [line 7617]

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

method _outRect [line 7645]

+

method _outRect [line 7648]

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

method _Ovalue [line 7118]

+

method _Ovalue [line 7121]

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

method _parsejpeg [line 4610]

+

method _parsejpeg [line 4613]

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

method _parsepng [line 4636]

+

method _parsepng [line 4639]

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

method _putannots [line 5329]

+

method _putannots [line 5332]

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

method _putbookmarks [line 8964]

+

method _putbookmarks [line 8967]

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

method _putcatalog [line 6246]

+

method _putcatalog [line 6249]

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

method _putcertification [line 9291]

+

method _putcertification [line 9294]

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

method _putcidfont0 [line 5995]

+

method _putcidfont0 [line 5998]

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

method _putencryption [line 7046]

+

method _putencryption [line 7049]

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

method _putextgstates [line 9628]

+

method _putextgstates [line 9631]

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

method _putfonts [line 5685]

+

method _putfonts [line 5688]

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

method _putfontwidths [line 5812]

+

method _putfontwidths [line 5815]

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

method _putheader [line 6373]

+

method _putheader [line 6376]

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

method _putimages [line 6055]

+

method _putimages [line 6058]

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

method _putinfo [line 6212]

+

method _putinfo [line 6215]

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

method _putjavascript [line 9038]

+

method _putjavascript [line 9041]

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

method _putocg [line 9549]

+

method _putocg [line 9552]

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

method _putpages [line 5184]

+

method _putpages [line 5187]

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

method _putresourcedict [line 6138]

+

method _putresourcedict [line 6141]

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

method _putresources [line 6179]

+

method _putresources [line 6182]

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

method _putshaders [line 9916]

+

method _putshaders [line 9919]

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

method _putspotcolors [line 6110]

+

method _putspotcolors [line 6113]

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

method _putstream [line 6596]

+

method _putstream [line 6599]

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

method _puttrailer [line 6359]

+

method _puttrailer [line 6362]

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

method _puttruetypeunicode [line 5910]

+

method _puttruetypeunicode [line 5913]

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

method _putuserrights [line 9241]

+

method _putuserrights [line 9244]

diff --git a/tcpdf.php b/tcpdf.php index 5c6e651..90114cd 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-06-15 +// Last Update : 2009-07-05 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.016 +// Version : 4.6.017 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -126,7 +126,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.6.016 + * @version 4.6.017 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.016 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.017 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 4.6.016 + * @version 4.6.017 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3323,31 +3323,34 @@ if (!class_exists('TCPDF', false)) { * Add page if needed. * @param float $h Cell height. Default value: 0. * @param mixed $y starting y position, leave empty for current position. + * @param boolean $add_page if true add a page, otherwise only return the true/false state * @return boolean true in case of page break, false otherwise. * @since 3.2.000 (2008-07-01) * @access protected */ - protected function checkPageBreak($h=0, $y='') { + protected function checkPageBreak($h=0, $y='', $addpage=true) { if ($this->empty_string($y)) { $y = $this->y; } if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) { - //Automatic page break - $x = $this->x; - $this->AddPage($this->CurOrientation); - $this->y = $this->tMargin; - $oldpage = $this->page - 1; - if ($this->rtl) { - if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) { - $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']); + if ($add_page) { + //Automatic page break + $x = $this->x; + $this->AddPage($this->CurOrientation); + $this->y = $this->tMargin; + $oldpage = $this->page - 1; + if ($this->rtl) { + if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) { + $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']); + } else { + $this->x = $x; + } } else { - $this->x = $x; - } - } else { - if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) { - $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']); - } else { - $this->x = $x; + if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) { + $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']); + } else { + $this->x = $x; + } } } return true; @@ -3648,8 +3651,8 @@ if (!class_exists('TCPDF', false)) { * @param string $align Allows to center or align the text. Possible values are:
  • L or empty string: left align
  • C: center
  • R: right align
  • J: justification (default value when $ishtml=false)
* @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. * @param int $ln Indicates where the current position should go after the call. Possible values are:
  • 0: to the right
  • 1: to the beginning of the next line [DEFAULT]
  • 2: below
- * @param int $x x position in user units - * @param int $y y position in user units + * @param float $x x position in user units + * @param float $y y position in user units * @param boolean $reseth if true reset the last cell height (default true). * @param int $stretch stretch carachter mode:
  • 0 = disabled
  • 1 = horizontal scaling only if necessary
  • 2 = forced horizontal scaling
  • 3 = character spacing only if necessary
  • 4 = forced character spacing
* @param boolean $ishtml set to true if $txt is HTML content (default = false). @@ -9675,7 +9678,7 @@ if (!class_exists('TCPDF', false)) { } /* - * Set the height of cell repect font height. + * Set the height of the cell (line height) respect the font height. * @param int $h cell proportion respect font height (typical value = 1.25). * @access public * @since 3.0.014 (2008-06-04) @@ -12624,7 +12627,7 @@ if (!class_exists('TCPDF', false)) { $this->cMargin = $this->oldcMargin; } $this->lasth = $this->FontSize * $this->cell_height_ratio; - if (!empty($this->theadMargins)) { + if (isset($this->theadMargins['top'])) { // restore top margin $this->tMargin = $this->theadMargins['top']; $this->pagedim[$this->page]['tm'] = $this->tMargin;
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 9d08f1c..bffd78e 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
@@ -18978,7 +18990,7 @@ $font)
-

method _putviewerpreferences [line 6289]

+

method _putviewerpreferences [line 6292]

diff --git a/doc/index.html b/doc/index.html index 9d08f1c..bffd78e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
diff --git a/doc/errors.html b/doc/errors.html index 00417ab..4d705cc 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Mon, 15 Jun 2009 14:18:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:11 +0200 by phpDocumentor 1.4.1
@@ -19009,7 +19021,7 @@ $font)
-

method _putxobjectdict [line 6127]

+

method _putxobjectdict [line 6130]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index bb37d8e..2131a24 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1389,7 +1389,7 @@ top

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:04 +0200 by phpDocumentor 1.4.1
diff --git a/doc/elementindex.html b/doc/elementindex.html index 0ad3134..347fca9 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1366,7 +1366,7 @@ top

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:04 +0200 by phpDocumentor 1.4.1
@@ -19034,7 +19046,7 @@ $font)
-

method _RC4 [line 7065]

+

method _RC4 [line 7068]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index ab5dbde..513ec07 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, 15 Jun 2009 14:18:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:11 +0200 by phpDocumentor 1.4.1
@@ -19085,7 +19097,7 @@ $text)
-

method _textstring [line 6565]

+

method _textstring [line 6568]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 0904e56..2dc6e86 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 97707e4..2a287de 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, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
@@ -19124,7 +19136,7 @@ $s)
-

method _toJPEG [line 4594]

+

method _toJPEG [line 4597]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 2218cf6..7ee3d7f 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, 15 Jun 2009 14:18:17 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:11 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index e0917df..885661b 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, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
@@ -19166,7 +19178,7 @@ $file)
-

method _Uvalue [line 7131]

+

method _Uvalue [line 7134]

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

- Documentation generated on Mon, 15 Jun 2009 14:18:11 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
@@ -19203,7 +19215,7 @@ $file)

- Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1
author:  Nicola Asuni
version:  4.6.016version:  4.6.017
copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- PDF_PRODUCER = 'TCPDF 4.6.016 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.017 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data


- Documentation generated on Mon, 15 Jun 2009 14:18:12 +0200 by phpDocumentor 1.4.1 + Documentation generated on Sun, 05 Jul 2009 22:00:05 +0200 by phpDocumentor 1.4.1