From 1d945cdd81ba0352a2c3d026e1be1e2300494810 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Fri, 23 Oct 2009 15:46:24 +0200 Subject: [PATCH] 4.8.012 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 438 +++++++++--------- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 46 +- 16 files changed, 274 insertions(+), 246 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index bebef47..02ac106 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.8.012 (2009-10-23) + - Table cell alignments for RTL booklet mode were fixed. + - Images and barcode alignments for booklet mode were fixed. + 4.8.011 (2009-10-22) - DejaVu fonts were updated to latest version. diff --git a/README.TXT b/README.TXT index b92b7cf..a738419 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.011 -Release date: 2009-10-22 +Version: 4.8.012 +Release date: 2009-10-23 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index ab1401a..c0409b4 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@

- Documentation generated on Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index ca69c8f..b7af5ac 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

method addExtGState [line 11323]

+

method addExtGState [line 11329]

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

method addHtmlLink [line 7692]

+

method addHtmlLink [line 7698]

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

method addHTMLVertSpace [line 14821]

+

method addHTMLVertSpace [line 14845]

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

method addJavascriptObject [line 9943]

+

method addJavascriptObject [line 9949]

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

method addTOC [line 15844]

+

method addTOC [line 15868]

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

method AliasNbPages [line 11131]

+

method AliasNbPages [line 11137]

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

method AliasNumPage [line 11158]

+

method AliasNumPage [line 11164]

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

method Arrow [line 9185]

+

method Arrow [line 9191]

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

method arrUTF8ToUTF16BE [line 7590]

+

method arrUTF8ToUTF16BE [line 7596]

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

method Bookmark [line 9829]

+

method Bookmark [line 9835]

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

method Button [line 10837]

+

method Button [line 10843]

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

method CheckBox [line 10767]

+

method CheckBox [line 10773]

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

method Circle [line 8819]

+

method Circle [line 8825]

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

method Clip [line 11586]

+

method Clip [line 11592]

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

method closeHTMLTagHandler [line 14484]

+

method closeHTMLTagHandler [line 14508]

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

method ComboBox [line 10706]

+

method ComboBox [line 10712]

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

method commitTransaction [line 16003]

+

method commitTransaction [line 16027]

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

method convertHTMLColorToDec [line 7725]

+

method convertHTMLColorToDec [line 7731]

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

method CoonsPatchMesh [line 11506]

+

method CoonsPatchMesh [line 11512]

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

method Curve [line 8594]

+

method Curve [line 8600]

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

method deletePage [line 15703]

+

method deletePage [line 15727]

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

method Ellipse [line 8715]

+

method Ellipse [line 8721]

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

method empty_string [line 16057]

+

method empty_string [line 16081]

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

method formatPageNumber [line 11235]

+

method formatPageNumber [line 11241]

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

method formatTOCPageNumber [line 11247]

+

method formatTOCPageNumber [line 11253]

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

method GetAbsX [line 5174]

+

method GetAbsX [line 5180]

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

method getAliasNbPages [line 11143]

+

method getAliasNbPages [line 11149]

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

method getAliasNumPage [line 11171]

+

method getAliasNumPage [line 11177]

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

method getAnnotOptFromJSProp [line 10074]

+

method getAnnotOptFromJSProp [line 10080]

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

method getBarcode [line 12051]

+

method getBarcode [line 12063]

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

method getBuffer [line 15389]

+

method getBuffer [line 15413]

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

method getCellHeightRatio [line 11409]

+

method getCellHeightRatio [line 11415]

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

method getFontBuffer [line 15549]

+

method getFontBuffer [line 15573]

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

method getFontFamily [line 12525]

+

method getFontFamily [line 12549]

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

method getFontSize [line 12505]

+

method getFontSize [line 12529]

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

method getFontSizePt [line 12515]

+

method getFontSizePt [line 12539]

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

method getFontStyle [line 12535]

+

method getFontStyle [line 12559]

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

method getFooterFont [line 7651]

+

method getFooterFont [line 7657]

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

method getFormDefaultProp [line 10449]

+

method getFormDefaultProp [line 10455]

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

method getGDgamma [line 5117]

+

method getGDgamma [line 5123]

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

method getGraphicVars [line 15257]

+

method getGraphicVars [line 15281]

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

method getGroupPageNo [line 11184]

+

method getGroupPageNo [line 11190]

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

method getGroupPageNoFormatted [line 11194]

+

method getGroupPageNoFormatted [line 11200]

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

method getHeaderFont [line 7631]

+

method getHeaderFont [line 7637]

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

method getHtmlDomArray [line 12571]

+

method getHtmlDomArray [line 12595]

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

method getHTMLUnitToUnits [line 14976]

+

method getHTMLUnitToUnits [line 15000]

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

method getImageBuffer [line 15491]

+

method getImageBuffer [line 15515]

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

method GetLineWidth [line 8308]

+

method GetLineWidth [line 8314]

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

method getMargins [line 12468]

+

method getMargins [line 12492]

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

method getObjFilename [line 15321]

+

method getObjFilename [line 15345]

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

method getOriginalMargins [line 12491]

+

method getOriginalMargins [line 12515]

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

method getPageBuffer [line 15432]

+

method getPageBuffer [line 15456]

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

method getPageGroupAlias [line 11206]

+

method getPageGroupAlias [line 11212]

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

method getPageNumGroupAlias [line 11221]

+

method getPageNumGroupAlias [line 11227]

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

method getPDFData [line 7674]

+

method getPDFData [line 7680]

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

method GetX [line 5158]

+

method GetX [line 5164]

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

method GetY [line 5185]

+

method GetY [line 5191]

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

method get_mqr [line 4877]

+

method get_mqr [line 4883]

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

method Gradient [line 11609]

+

method Gradient [line 11615]

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

method ImageEps [line 11781]

+

method ImageEps [line 11787]

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

method ImagePngAlpha [line 5073]

+

method ImagePngAlpha [line 5079]

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

method IncludeJS [line 9930]

+

method IncludeJS [line 9936]

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

method intToRoman [line 15050]

+

method intToRoman [line 15074]

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

method Line [line 8461]

+

method Line [line 8467]

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

method LinearGradient [line 11466]

+

method LinearGradient [line 11472]

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

method ListBox [line 10646]

+

method ListBox [line 10652]

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

method Ln [line 5130]

+

method Ln [line 5136]

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

method MirrorH [line 8080]

+

method MirrorH [line 8086]

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

method MirrorL [line 8116]

+

method MirrorL [line 8122]

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

method MirrorP [line 8103]

+

method MirrorP [line 8109]

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

method MirrorV [line 8091]

+

method MirrorV [line 8097]

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

method movePage [line 15566]

+

method movePage [line 15590]

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

method objclone [line 16046]

+

method objclone [line 16070]

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

method openHTMLTagHandler [line 13947]

+

method openHTMLTagHandler [line 13971]

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

method Output [line 5277]

+

method Output [line 5283]

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

method PageNoFormatted [line 11257]

+

method PageNoFormatted [line 11263]

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

method PieSector [line 11703]

+

method PieSector [line 11709]

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

method pixelsToUnits [line 7782]

+

method pixelsToUnits [line 7788]

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

method Polycurve [line 8651]

+

method Polycurve [line 8657]

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

method Polygon [line 8871]

+

method Polygon [line 8877]

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

method PolyLine [line 8845]

+

method PolyLine [line 8851]

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

method putHtmlListBullet [line 15115]

+

method putHtmlListBullet [line 15139]

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

method RadialGradient [line 11484]

+

method RadialGradient [line 11490]

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

method RadioButton [line 10558]

+

method RadioButton [line 10564]

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

method readDiskCache [line 15361]

+

method readDiskCache [line 15385]

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

method Rect [line 8496]

+

method Rect [line 8502]

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

method RegularPolygon [line 8996]

+

method RegularPolygon [line 9002]

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

method rfread [line 5043]

+

method rfread [line 5049]

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

method rollbackTransaction [line 16017]

+

method rollbackTransaction [line 16041]

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

method Rotate [line 8175]

+

method Rotate [line 8181]

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

method RoundedRect [line 9100]

+

method RoundedRect [line 9106]

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

method Scale [line 8045]

+

method Scale [line 8051]

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

method ScaleX [line 8005]

+

method ScaleX [line 8011]

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

method ScaleXY [line 8031]

+

method ScaleXY [line 8037]

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

method ScaleY [line 8018]

+

method ScaleY [line 8024]

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

method setAlpha [line 11366]

+

method setAlpha [line 11372]

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

method setBarcode [line 12041]

+

method setBarcode [line 12053]

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

method SetBooklet [line 14890]

+

method SetBooklet [line 14914]

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

method setBuffer [line 15371]

+

method setBuffer [line 15395]

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

method setCellHeightRatio [line 11400]

+

method setCellHeightRatio [line 11406]

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

method setDefaultTableColumns [line 11390]

+

method setDefaultTableColumns [line 11396]

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

method setExtGState [line 11335]

+

method setExtGState [line 11341]

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

method setFontBuffer [line 15507]

+

method setFontBuffer [line 15531]

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

method setFontSubBuffer [line 15529]

+

method setFontSubBuffer [line 15553]

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

method setFooterFont [line 7641]

+

method setFooterFont [line 7647]

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

method setFormDefaultProp [line 10438]

+

method setFormDefaultProp [line 10444]

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

method setGraphicVars [line 15288]

+

method setGraphicVars [line 15312]

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

method setHeaderFont [line 7621]

+

method setHeaderFont [line 7627]

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

method setHtmlLinksStyle [line 14961]

+

method setHtmlLinksStyle [line 14985]

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

method setHtmlVSpace [line 14930]

+

method setHtmlVSpace [line 14954]

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

method setImageBuffer [line 15448]

+

method setImageBuffer [line 15472]

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

method setImageSubBuffer [line 15471]

+

method setImageSubBuffer [line 15495]

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

method setJPEGQuality [line 11377]

+

method setJPEGQuality [line 11383]

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

method setLanguageArray [line 7661]

+

method setLanguageArray [line 7667]

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

method SetLineStyle [line 8333]

+

method SetLineStyle [line 8339]

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

method SetLineWidth [line 8292]

+

method SetLineWidth [line 8298]

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

method setListIndentWidth [line 14940]

+

method setListIndentWidth [line 14964]

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

method setLIsymbol [line 14850]

+

method setLIsymbol [line 14874]

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

method setOpenCell [line 14950]

+

method setOpenCell [line 14974]

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

method setPageBuffer [line 15405]

+

method setPageBuffer [line 15429]

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

method setPDFVersion [line 11419]

+

method setPDFVersion [line 11425]

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

method SetProtection [line 7945]

+

method SetProtection [line 7951]

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

method setSignature [line 11088]

+

method setSignature [line 11094]

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

method setUserRights [line 11058]

+

method setUserRights [line 11064]

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

method setViewerPreferences [line 11449]

+

method setViewerPreferences [line 11455]

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

method setVisibility [line 11287]

+

method setVisibility [line 11293]

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

method SetX [line 5198]

+

method SetX [line 5204]

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

method SetXY [line 5261]

+

method SetXY [line 5267]

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

method SetY [line 5230]

+

method SetY [line 5236]

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

method set_mqr [line 4862]

+

method set_mqr [line 4868]

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

method Skew [line 8235]

+

method Skew [line 8241]

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

method SkewX [line 8208]

+

method SkewX [line 8214]

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

method SkewY [line 8221]

+

method SkewY [line 8227]

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

method StarPolygon [line 9051]

+

method StarPolygon [line 9057]

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

method startPageGroup [line 11116]

+

method startPageGroup [line 11122]

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

method startTransaction [line 15987]

+

method startTransaction [line 16011]

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

method StartTransform [line 7973]

+

method StartTransform [line 7979]

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

method StopTransform [line 7988]

+

method StopTransform [line 7994]

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

method swapMargins [line 14906]

+

method swapMargins [line 14930]

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

method TextField [line 10467]

+

method TextField [line 10473]

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

method Transform [line 8268]

+

method Transform [line 8274]

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

method Translate [line 8151]

+

method Translate [line 8157]

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

method TranslateX [line 8128]

+

method TranslateX [line 8134]

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

method TranslateY [line 8139]

+

method TranslateY [line 8145]

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

method unhtmlentities [line 7793]

+

method unhtmlentities [line 7799]

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

method utf8Bidi [line 9258]

+

method utf8Bidi [line 9264]

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

method UTF8StringToArray [line 7423]

+

method UTF8StringToArray [line 7429]

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

method utf8StrRev [line 9244]

+

method utf8StrRev [line 9250]

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

method UTF8ToLatin1 [line 7530]

+

method UTF8ToLatin1 [line 7536]

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

method UTF8ToUTF16BE [line 7514]

+

method UTF8ToUTF16BE [line 7520]

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

method write1DBarcode [line 12070]

+

method write1DBarcode [line 12082]

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

method write2DBarcode [line 12321]

+

method write2DBarcode [line 12339]

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

method writeBarcode [line 12271]

+

method writeBarcode [line 12289]

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

method writeDiskCache [line 15333]

+

method writeDiskCache [line 15357]

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

method writeHTML [line 13011]

+

method writeHTML [line 13035]

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

method writeHTMLCell [line 12559]

+

method writeHTMLCell [line 12583]

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

method _addfield [line 10039]

+

method _addfield [line 10045]

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

method _beginpage [line 7166]

+

method _beginpage [line 7172]

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

method _datastring [line 7302]

+

method _datastring [line 7308]

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

method _datestring [line 7315]

+

method _datestring [line 7321]

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

method _destroy [line 5432]

+

method _destroy [line 5438]

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

method _dochecks [line 5460]

+

method _dochecks [line 5466]

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

method _dolinethrough [line 7241]

+

method _dolinethrough [line 7247]

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

method _dolinethroughw [line 7268]

+

method _dolinethroughw [line 7274]

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

method _dounderline [line 7229]

+

method _dounderline [line 7235]

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

method _dounderlinew [line 7254]

+

method _dounderlinew [line 7260]

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

method _enddoc [line 7049]

+

method _enddoc [line 7055]

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

method _endpage [line 7205]

+

method _endpage [line 7211]

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

method _escape [line 7291]

+

method _escape [line 7297]

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

method _escapetext [line 7340]

+

method _escapetext [line 7346]

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

method _freadint [line 7280]

+

method _freadint [line 7286]

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

method _generateencryptionkey [line 7913]

+

method _generateencryptionkey [line 7919]

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

method _getfontpath [line 5476]

+

method _getfontpath [line 5482]

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

method _JScolor [line 10015]

+

method _JScolor [line 10021]

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

method _md5_16 [line 7874]

+

method _md5_16 [line 7880]

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

method _newobj [line 7215]

+

method _newobj [line 7221]

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

method _objectkey [line 7806]

+

method _objectkey [line 7812]

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

method _out [line 7371]

+

method _out [line 7377]

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

method _outarc [line 11683]

+

method _outarc [line 11689]

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

method _outCurve [line 8441]

+

method _outCurve [line 8447]

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

method _outLine [line 8405]

+

method _outLine [line 8411]

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

method _outPoint [line 8391]

+

method _outPoint [line 8397]

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

method _outRect [line 8422]

+

method _outRect [line 8428]

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

method _Ovalue [line 7887]

+

method _Ovalue [line 7893]

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

method _parsejpeg [line 4912]

+

method _parsejpeg [line 4918]

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

method _parsepng [line 4938]

+

method _parsepng [line 4944]

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

method _putannotsobjs [line 5659]

+

method _putannotsobjs [line 5665]

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

method _putannotsrefs [line 5628]

+

method _putannotsrefs [line 5634]

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

method _putAPXObject [line 6266]

+

method _putAPXObject [line 6272]

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

method _putbookmarks [line 9857]

+

method _putbookmarks [line 9863]

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

method _putcatalog [line 6874]

+

method _putcatalog [line 6880]

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

method _putcidfont0 [line 6617]

+

method _putcidfont0 [line 6623]

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

method _putencryption [line 7815]

+

method _putencryption [line 7821]

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

method _putextgstates [line 11345]

+

method _putextgstates [line 11351]

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

method _putfonts [line 6294]

+

method _putfonts [line 6300]

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

method _putfontwidths [line 6429]

+

method _putfontwidths [line 6435]

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

method _putheader [line 7041]

+

method _putheader [line 7047]

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

method _putimages [line 6682]

+

method _putimages [line 6688]

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

method _putinfo [line 6840]

+

method _putinfo [line 6846]

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

method _putjavascript [line 9955]

+

method _putjavascript [line 9961]

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

method _putocg [line 11266]

+

method _putocg [line 11272]

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

method _putpages [line 5487]

+

method _putpages [line 5493]

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

method _putresourcedict [line 6765]

+

method _putresourcedict [line 6771]

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

method _putresources [line 6806]

+

method _putresources [line 6812]

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

method _putshaders [line 11633]

+

method _putshaders [line 11639]

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

method _putsignature [line 10987]

+

method _putsignature [line 10993]

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

method _putspotcolors [line 6737]

+

method _putspotcolors [line 6743]

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

method _putstream [line 7357]

+

method _putstream [line 7363]

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

method _puttrailer [line 7027]

+

method _puttrailer [line 7033]

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

method _puttruetypeunicode [line 6528]

+

method _puttruetypeunicode [line 6534]

diff --git a/tcpdf.php b/tcpdf.php index 71f5279..93c286e 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-10-22 +// Last Update : 2009-10-23 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.011 +// Version : 4.8.012 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.8.011 + * @version 4.8.012 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.011 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.012 (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.011 + * @version 4.8.012 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -4772,8 +4772,14 @@ if (!class_exists('TCPDF', false)) { $info = $this->getImageBuffer($file); } // 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; @@ -11849,8 +11855,14 @@ if (!class_exists('TCPDF', false)) { } } // 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; @@ -12140,8 +12152,14 @@ if (!class_exists('TCPDF', false)) { if ($this->empty_string($h) OR ($h <= 0)) { $h = 10 + $extraspace; } - if ($this->checkPageBreak($h)) { - $y = $this->y; + $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); + } } // maximum bar heigth $barh = $h - $extraspace; @@ -12366,8 +12384,14 @@ if (!class_exists('TCPDF', false)) { // 2d barcodes are square by default $h = $w; } - if ($this->checkPageBreak($h)) { - $y = $this->y; + $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); + } } // calculate barcode size (excluding padding) $bw = $w - (2 * $style['padding']); @@ -12625,7 +12649,7 @@ if (!class_exists('TCPDF', false)) { $html = preg_replace('/<\/(td|th)>/', '', $html); $html = preg_replace('/<\/table>([\s]*)/', '
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 1fcb431..f91dee9 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 Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
@@ -20510,7 +20510,7 @@ $font)
-

method _putviewerpreferences [line 6957]

+

method _putviewerpreferences [line 6963]

diff --git a/doc/index.html b/doc/index.html index 1fcb431..f91dee9 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 Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 6631092..fab6276 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Thu, 22 Oct 2009 18:06:44 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:16 +0200 by phpDocumentor 1.4.3
@@ -20541,7 +20541,7 @@ $font)
-

method _putxobjectdict [line 6754]

+

method _putxobjectdict [line 6760]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 83bceb4..4366bd2 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1467,7 +1467,7 @@ top

- Documentation generated on Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 22d4eae..a874b09 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1444,7 +1444,7 @@ top

- Documentation generated on Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
@@ -20566,7 +20566,7 @@ $font)
-

method _RC4 [line 7834]

+

method _RC4 [line 7840]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 0edbd77..459f16c 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.




- Documentation generated on Thu, 22 Oct 2009 18:06:44 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:15 +0200 by phpDocumentor 1.4.3
@@ -20617,7 +20617,7 @@ $text)
-

method _textstring [line 7326]

+

method _textstring [line 7332]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index d0715e6..d46301b 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 36aef60..b15be63 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.




- Documentation generated on Thu, 22 Oct 2009 18:06:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3
@@ -20656,7 +20656,7 @@ $s)
-

method _toJPEG [line 4896]

+

method _toJPEG [line 4902]

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




- Documentation generated on Thu, 22 Oct 2009 18:06:44 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:15 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index c4ef243..eca3b76 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit

- Documentation generated on Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
@@ -20698,7 +20698,7 @@ $file)
-

method _Uvalue [line 7900]

+

method _Uvalue [line 7906]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 6983c8b..79e2d5f 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)

- Documentation generated on Thu, 22 Oct 2009 18:06:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3
@@ -20735,7 +20735,7 @@ $file)

- Documentation generated on Thu, 22 Oct 2009 18:06:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  4.8.011version:  4.8.012
copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- PDF_PRODUCER = 'TCPDF 4.8.011 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.012 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data


- Documentation generated on Thu, 22 Oct 2009 18:06:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3
', $html); $html = preg_replace('/]*)>/xi', '', $html); + $html = preg_replace('/]*)>/xi', '', $html); $html = preg_replace('/]*)>/xi', '', $html); @@ -14539,7 +14563,7 @@ if (!class_exists('TCPDF', false)) { // account for booklet mode if ($this->page > $parent['startpage']) { if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$parent['startpage']]['orm'])) { - $this->x += ($this->pagedim[$this->page]['orm'] - $this->pagedim[$parent['startpage']]['orm']); + $this->x -= ($this->pagedim[$this->page]['orm'] - $this->pagedim[$parent['startpage']]['orm']); } elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$parent['startpage']]['olm'])) { $this->x += ($this->pagedim[$this->page]['olm'] - $this->pagedim[$parent['startpage']]['olm']); }