From 09c2403d044e08560a1746ea67fe31233a65defd Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Wed, 27 Jan 2010 23:41:32 +0100 Subject: [PATCH] 4.8.030 --- CHANGELOG.TXT | 3 + README.TXT | 2 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 464 +++++++++--------- 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 | 34 +- 16 files changed, 270 insertions(+), 261 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index fccdd5d..73cfa61 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +4.8.030 (2010-01-27) + - Some text alignment cases were fixed. + 4.8.029 (2010-01-27) - Bug item #2941057 "TOC Error in PDF File Output" was fixed. - Some text alignment cases were fixed. diff --git a/README.TXT b/README.TXT index 2a5756e..1fc60e1 100755 --- a/README.TXT +++ b/README.TXT @@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.8.029 +Version: 4.8.030 Release date: 2010-01-27 Author: Nicola Asuni diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 7903845..90b4214 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Wed, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 41c25f5..6bc110a 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

method addExtGState [line 11462]

+

method addExtGState [line 11470]

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

method addHtmlLink [line 7831]

+

method addHtmlLink [line 7839]

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

method addHTMLVertSpace [line 15100]

+

method addHTMLVertSpace [line 15106]

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

method addJavascriptObject [line 10082]

+

method addJavascriptObject [line 10090]

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

method addTOC [line 16124]

+

method addTOC [line 16130]

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

method AliasNbPages [line 11270]

+

method AliasNbPages [line 11278]

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

method AliasNumPage [line 11297]

+

method AliasNumPage [line 11305]

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

method Arrow [line 9324]

+

method Arrow [line 9332]

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

method arrUTF8ToUTF16BE [line 7729]

+

method arrUTF8ToUTF16BE [line 7737]

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

method Bookmark [line 9968]

+

method Bookmark [line 9976]

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

method Button [line 10976]

+

method Button [line 10984]

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

method CheckBox [line 10906]

+

method CheckBox [line 10914]

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

method Circle [line 8958]

+

method Circle [line 8966]

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

method Clip [line 11715]

+

method Clip [line 11723]

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

method closeHTMLTagHandler [line 14747]

+

method closeHTMLTagHandler [line 14753]

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

method ComboBox [line 10845]

+

method ComboBox [line 10853]

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

method commitTransaction [line 16282]

+

method commitTransaction [line 16288]

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

method convertHTMLColorToDec [line 7864]

+

method convertHTMLColorToDec [line 7872]

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

method CoonsPatchMesh [line 11635]

+

method CoonsPatchMesh [line 11643]

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

method Curve [line 8733]

+

method Curve [line 8741]

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

method deletePage [line 15982]

+

method deletePage [line 15988]

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

method Ellipse [line 8854]

+

method Ellipse [line 8862]

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

method empty_string [line 16336]

+

method empty_string [line 16342]

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

method formatPageNumber [line 11374]

+

method formatPageNumber [line 11382]

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

method formatTOCPageNumber [line 11386]

+

method formatTOCPageNumber [line 11394]

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

method GetAbsX [line 5278]

+

method GetAbsX [line 5286]

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

method getAliasNbPages [line 11282]

+

method getAliasNbPages [line 11290]

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

method getAliasNumPage [line 11310]

+

method getAliasNumPage [line 11318]

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

method getAnnotOptFromJSProp [line 10213]

+

method getAnnotOptFromJSProp [line 10221]

@@ -8517,7 +8517,7 @@ $getarray = false])
-

method getBarcode [line 12186]

+

method getBarcode [line 12194]

@@ -8545,7 +8545,7 @@ $getarray = false])
-

method getBorderMode [line 4154]

+

method getBorderMode [line 4150]

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

method getBuffer [line 15668]

+

method getBuffer [line 15674]

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

method getCellHeightRatio [line 11555]

+

method getCellHeightRatio [line 11563]

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

method getFontBuffer [line 15828]

+

method getFontBuffer [line 15834]

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

method getFontFamily [line 12672]

+

method getFontFamily [line 12680]

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

method getFontSize [line 12652]

+

method getFontSize [line 12660]

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

method getFontSizePt [line 12662]

+

method getFontSizePt [line 12670]

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

method getFontStyle [line 12682]

+

method getFontStyle [line 12690]

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

method getFooterFont [line 7790]

+

method getFooterFont [line 7798]

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

method getFormDefaultProp [line 10588]

+

method getFormDefaultProp [line 10596]

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

method getGDgamma [line 5221]

+

method getGDgamma [line 5229]

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

method getGraphicVars [line 15536]

+

method getGraphicVars [line 15542]

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

method getGroupPageNo [line 11323]

+

method getGroupPageNo [line 11331]

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

method getGroupPageNoFormatted [line 11333]

+

method getGroupPageNoFormatted [line 11341]

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

method getHeaderFont [line 7770]

+

method getHeaderFont [line 7778]

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

method getHtmlDomArray [line 12718]

+

method getHtmlDomArray [line 12726]

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

method getHTMLUnitToUnits [line 15255]

+

method getHTMLUnitToUnits [line 15261]

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

method getImageBuffer [line 15770]

+

method getImageBuffer [line 15776]

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

method getImageFileType [line 4703]

+

method getImageFileType [line 4711]

@@ -9645,7 +9645,7 @@ $imgfile)
-

method GetLineWidth [line 8447]

+

method GetLineWidth [line 8455]

@@ -9679,7 +9679,7 @@ $imgfile)
-

method getMargins [line 12615]

+

method getMargins [line 12623]

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

method getNumLines [line 4233]

+

method getNumLines [line 4229]

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

method getObjFilename [line 15600]

+

method getObjFilename [line 15606]

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

method getOriginalMargins [line 12638]

+

method getOriginalMargins [line 12646]

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

method getPageBuffer [line 15711]

+

method getPageBuffer [line 15717]

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

method getPageGroupAlias [line 11345]

+

method getPageGroupAlias [line 11353]

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

method getPageNumGroupAlias [line 11360]

+

method getPageNumGroupAlias [line 11368]

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

method getPDFData [line 7813]

+

method getPDFData [line 7821]

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

method getRemainingWidth [line 4605]

+

method getRemainingWidth [line 4613]

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

method getSpaceString [line 13186]

+

method getSpaceString [line 13194]

@@ -10404,7 +10404,7 @@ $getarray = false])
-

method GetX [line 5262]

+

method GetX [line 5270]

@@ -10435,7 +10435,7 @@ $getarray = false])
-

method GetY [line 5289]

+

method GetY [line 5297]

@@ -10466,7 +10466,7 @@ $getarray = false])
-

method get_mqr [line 4981]

+

method get_mqr [line 4989]

@@ -10497,7 +10497,7 @@ $getarray = false])
-

method Gradient [line 11738]

+

method Gradient [line 11746]

@@ -10582,7 +10582,7 @@ $coords)
-

method Image [line 4746]

+

method Image [line 4754]

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

method ImageEps [line 11910]

+

method ImageEps [line 11918]

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

method ImagePngAlpha [line 5177]

+

method ImagePngAlpha [line 5185]

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

method IncludeJS [line 10069]

+

method IncludeJS [line 10077]

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

method intToRoman [line 15329]

+

method intToRoman [line 15335]

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

method Line [line 8600]

+

method Line [line 8608]

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

method LinearGradient [line 11595]

+

method LinearGradient [line 11603]

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

method ListBox [line 10785]

+

method ListBox [line 10793]

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

method Ln [line 5234]

+

method Ln [line 5242]

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

method MirrorH [line 8219]

+

method MirrorH [line 8227]

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

method MirrorL [line 8255]

+

method MirrorL [line 8263]

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

method MirrorP [line 8242]

+

method MirrorP [line 8250]

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

method MirrorV [line 8230]

+

method MirrorV [line 8238]

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

method movePage [line 15845]

+

method movePage [line 15851]

@@ -11657,7 +11657,7 @@ $topage)
-

method MultiCell [line 3995]

+

method MultiCell [line 3991]

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

method objclone [line 16325]

+

method objclone [line 16331]

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

method openHTMLTagHandler [line 14202]

+

method openHTMLTagHandler [line 14208]

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

method Output [line 5381]

+

method Output [line 5389]

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

method PageNoFormatted [line 11396]

+

method PageNoFormatted [line 11404]

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

method PieSector [line 11832]

+

method PieSector [line 11840]

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

method pixelsToUnits [line 7921]

+

method pixelsToUnits [line 7929]

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

method Polycurve [line 8790]

+

method Polycurve [line 8798]

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

method Polygon [line 9010]

+

method Polygon [line 9018]

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

method PolyLine [line 8984]

+

method PolyLine [line 8992]

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

method putHtmlListBullet [line 15394]

+

method putHtmlListBullet [line 15400]

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

method RadialGradient [line 11613]

+

method RadialGradient [line 11621]

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

method RadioButton [line 10697]

+

method RadioButton [line 10705]

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

method readDiskCache [line 15640]

+

method readDiskCache [line 15646]

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

method Rect [line 8635]

+

method Rect [line 8643]

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

method RegularPolygon [line 9135]

+

method RegularPolygon [line 9143]

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

method rfread [line 5147]

+

method rfread [line 5155]

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

method rollbackTransaction [line 16296]

+

method rollbackTransaction [line 16302]

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

method Rotate [line 8314]

+

method Rotate [line 8322]

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

method RoundedRect [line 9239]

+

method RoundedRect [line 9247]

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

method Scale [line 8184]

+

method Scale [line 8192]

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

method ScaleX [line 8144]

+

method ScaleX [line 8152]

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

method ScaleXY [line 8170]

+

method ScaleXY [line 8178]

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

method ScaleY [line 8157]

+

method ScaleY [line 8165]

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

method setAlpha [line 11512]

+

method setAlpha [line 11520]

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

method setBarcode [line 12176]

+

method setBarcode [line 12184]

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

method SetBooklet [line 15169]

+

method SetBooklet [line 15175]

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

method setBuffer [line 15650]

+

method setBuffer [line 15656]

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

method setCellHeightRatio [line 11546]

+

method setCellHeightRatio [line 11554]

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

method setDefaultTableColumns [line 11536]

+

method setDefaultTableColumns [line 11544]

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

method setExtGState [line 11481]

+

method setExtGState [line 11489]

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

method setFontBuffer [line 15786]

+

method setFontBuffer [line 15792]

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

method setFontSubBuffer [line 15808]

+

method setFontSubBuffer [line 15814]

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

method setFooterFont [line 7780]

+

method setFooterFont [line 7788]

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

method setFormDefaultProp [line 10577]

+

method setFormDefaultProp [line 10585]

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

method setGraphicVars [line 15567]

+

method setGraphicVars [line 15573]

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

method setHeaderFont [line 7760]

+

method setHeaderFont [line 7768]

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

method setHtmlLinksStyle [line 15240]

+

method setHtmlLinksStyle [line 15246]

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

method setHtmlVSpace [line 15209]

+

method setHtmlVSpace [line 15215]

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

method setImageBuffer [line 15727]

+

method setImageBuffer [line 15733]

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

method setImageSubBuffer [line 15750]

+

method setImageSubBuffer [line 15756]

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

method setJPEGQuality [line 11523]

+

method setJPEGQuality [line 11531]

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

method setLanguageArray [line 7800]

+

method setLanguageArray [line 7808]

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

method SetLineStyle [line 8472]

+

method SetLineStyle [line 8480]

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

method SetLineWidth [line 8431]

+

method SetLineWidth [line 8439]

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

method setListIndentWidth [line 15219]

+

method setListIndentWidth [line 15225]

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

method setLIsymbol [line 15129]

+

method setLIsymbol [line 15135]

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

method setOpenCell [line 15229]

+

method setOpenCell [line 15235]

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

method setPageBuffer [line 15684]

+

method setPageBuffer [line 15690]

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

method setPDFVersion [line 11565]

+

method setPDFVersion [line 11573]

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

method SetProtection [line 8084]

+

method SetProtection [line 8092]

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

method setSignature [line 11227]

+

method setSignature [line 11235]

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

method setUserRights [line 11197]

+

method setUserRights [line 11205]

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

method setViewerPreferences [line 11578]

+

method setViewerPreferences [line 11586]

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

method setVisibility [line 11426]

+

method setVisibility [line 11434]

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

method SetX [line 5302]

+

method SetX [line 5310]

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

method SetXY [line 5365]

+

method SetXY [line 5373]

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

method SetY [line 5334]

+

method SetY [line 5342]

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

method set_mqr [line 4966]

+

method set_mqr [line 4974]

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

method Skew [line 8374]

+

method Skew [line 8382]

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

method SkewX [line 8347]

+

method SkewX [line 8355]

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

method SkewY [line 8360]

+

method SkewY [line 8368]

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

method StarPolygon [line 9190]

+

method StarPolygon [line 9198]

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

method startPageGroup [line 11255]

+

method startPageGroup [line 11263]

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

method startTransaction [line 16266]

+

method startTransaction [line 16272]

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

method StartTransform [line 8112]

+

method StartTransform [line 8120]

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

method StopTransform [line 8127]

+

method StopTransform [line 8135]

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

method swapMargins [line 15185]

+

method swapMargins [line 15191]

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

method TextField [line 10606]

+

method TextField [line 10614]

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

method Transform [line 8407]

+

method Transform [line 8415]

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

method Translate [line 8290]

+

method Translate [line 8298]

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

method TranslateX [line 8267]

+

method TranslateX [line 8275]

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

method TranslateY [line 8278]

+

method TranslateY [line 8286]

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

method unhtmlentities [line 7932]

+

method unhtmlentities [line 7940]

@@ -17699,7 +17699,7 @@ $text_to_convert)
-

method UniArrSubString [line 4644]

+

method UniArrSubString [line 4652]

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

method unichr [line 4677]

+

method unichr [line 4685]

@@ -17798,7 +17798,7 @@ $c)
-

method UTF8ArrayToUniArray [line 4665]

+

method UTF8ArrayToUniArray [line 4673]

@@ -17840,7 +17840,7 @@ $ta)
-

method UTF8ArrSubString [line 4621]

+

method UTF8ArrSubString [line 4629]

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

method UTF8ArrToLatin1 [line 7670]

+

method UTF8ArrToLatin1 [line 7678]

@@ -17933,7 +17933,7 @@ $unicode)
-

method utf8Bidi [line 9397]

+

method utf8Bidi [line 9405]

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

method UTF8StringToArray [line 7533]

+

method UTF8StringToArray [line 7541]

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

method utf8StrRev [line 9383]

+

method utf8StrRev [line 9391]

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

method UTF8ToLatin1 [line 7640]

+

method UTF8ToLatin1 [line 7648]

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

method UTF8ToUTF16BE [line 7624]

+

method UTF8ToUTF16BE [line 7632]

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

method Write [line 4277]

+

method Write [line 4273]

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

method write1DBarcode [line 12205]

+

method write1DBarcode [line 12213]

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

method write2DBarcode [line 12462]

+

method write2DBarcode [line 12470]

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

method writeBarcode [line 12412]

+

method writeBarcode [line 12420]

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

method writeDiskCache [line 15612]

+

method writeDiskCache [line 15618]

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

method writeHTML [line 13206]

+

method writeHTML [line 13214]

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

method writeHTMLCell [line 12706]

+

method writeHTMLCell [line 12714]

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

method _addfield [line 10178]

+

method _addfield [line 10186]

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

method _beginpage [line 7276]

+

method _beginpage [line 7284]

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

method _datastring [line 7412]

+

method _datastring [line 7420]

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

method _datestring [line 7425]

+

method _datestring [line 7433]

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

method _destroy [line 5537]

+

method _destroy [line 5545]

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

method _dochecks [line 5565]

+

method _dochecks [line 5573]

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

method _dolinethrough [line 7351]

+

method _dolinethrough [line 7359]

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

method _dolinethroughw [line 7378]

+

method _dolinethroughw [line 7386]

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

method _dounderline [line 7339]

+

method _dounderline [line 7347]

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

method _dounderlinew [line 7364]

+

method _dounderlinew [line 7372]

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

method _enddoc [line 7159]

+

method _enddoc [line 7167]

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

method _endpage [line 7315]

+

method _endpage [line 7323]

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

method _escape [line 7401]

+

method _escape [line 7409]

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

method _escapetext [line 7450]

+

method _escapetext [line 7458]

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

method _freadint [line 7390]

+

method _freadint [line 7398]

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

method _generateencryptionkey [line 8052]

+

method _generateencryptionkey [line 8060]

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

method _getfontpath [line 5581]

+

method _getfontpath [line 5589]

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

method _JScolor [line 10154]

+

method _JScolor [line 10162]

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

method _md5_16 [line 8013]

+

method _md5_16 [line 8021]

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

method _newobj [line 7325]

+

method _newobj [line 7333]

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

method _objectkey [line 7945]

+

method _objectkey [line 7953]

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

method _out [line 7481]

+

method _out [line 7489]

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

method _outarc [line 11812]

+

method _outarc [line 11820]

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

method _outCurve [line 8580]

+

method _outCurve [line 8588]

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

method _outLine [line 8544]

+

method _outLine [line 8552]

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

method _outPoint [line 8530]

+

method _outPoint [line 8538]

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

method _outRect [line 8561]

+

method _outRect [line 8569]

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

method _Ovalue [line 8026]

+

method _Ovalue [line 8034]

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

method _parsejpeg [line 5016]

+

method _parsejpeg [line 5024]

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

method _parsepng [line 5042]

+

method _parsepng [line 5050]

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

method _putannotsobjs [line 5764]

+

method _putannotsobjs [line 5772]

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

method _putannotsrefs [line 5733]

+

method _putannotsrefs [line 5741]

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

method _putAPXObject [line 6370]

+

method _putAPXObject [line 6378]

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

method _putbookmarks [line 9996]

+

method _putbookmarks [line 10004]

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

method _putcatalog [line 6984]

+

method _putcatalog [line 6992]

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

method _putcidfont0 [line 6721]

+

method _putcidfont0 [line 6729]

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

method _putencryption [line 7954]

+

method _putencryption [line 7962]

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

method _putextgstates [line 11491]

+

method _putextgstates [line 11499]

@@ -20434,7 +20434,7 @@ $gs)
-

method _putfonts [line 6398]

+

method _putfonts [line 6406]

@@ -20459,7 +20459,7 @@ $gs)
-

method _putfontwidths [line 6533]

+

method _putfontwidths [line 6541]

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

method _putheader [line 7151]

+

method _putheader [line 7159]

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

method _putimages [line 6786]

+

method _putimages [line 6794]

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

method _putinfo [line 6944]

+

method _putinfo [line 6952]

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

method _putjavascript [line 10094]

+

method _putjavascript [line 10102]

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

method _putocg [line 11405]

+

method _putocg [line 11413]

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

method _putpages [line 5592]

+

method _putpages [line 5600]

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

method _putresourcedict [line 6869]

+

method _putresourcedict [line 6877]

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

method _putresources [line 6910]

+

method _putresources [line 6918]

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

method _putshaders [line 11762]

+

method _putshaders [line 11770]

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

method _putsignature [line 11126]

+

method _putsignature [line 11134]

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

method _putspotcolors [line 6841]

+

method _putspotcolors [line 6849]

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

method _putstream [line 7467]

+

method _putstream [line 7475]

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

method _puttrailer [line 7137]

+

method _puttrailer [line 7145]

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

method _puttruetypeunicode [line 6632]

+

method _puttruetypeunicode [line 6640]

diff --git a/tcpdf.php b/tcpdf.php index d43c563..2be1b19 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -4,7 +4,7 @@ // Begin : 2002-08-03 // Last Update : 2010-01-27 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.029 +// Version : 4.8.030 // 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.029 + * @version 4.8.030 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.029 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.030 (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.029 + * @version 4.8.030 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3748,10 +3748,6 @@ if (!class_exists('TCPDF', false)) { */ protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false) { $txt = $this->removeSHY($txt); - if ($this->rtl) { - // remove right spaces - $txt = rtrim($txt); - } $rs = ''; //string to be returned if (!$ignore_min_height) { $min_cell_height = $this->FontSize * $this->cell_height_ratio; @@ -4048,7 +4044,7 @@ if (!class_exists('TCPDF', false)) { $nl = 1; } else { // ******* Write text - $nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, false, $maxh); + $nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, true, $maxh); } if ($autopadding) { // add bottom padding @@ -4368,6 +4364,9 @@ if (!class_exists('TCPDF', false)) { $this->cMargin = 0; } } + if ($firstblock AND $this->isRTLTextDir()) { + $tmpstr = rtrim($tmpstr); + } $this->Cell($w, $h, $tmpstr, 0, 1, $talign, $fill, $link, $stretch); unset($tmpstr); if ($firstline) { @@ -4451,6 +4450,9 @@ if (!class_exists('TCPDF', false)) { $this->cMargin = 0; } } + if ($firstblock AND $this->isRTLTextDir()) { + $tmpstr = rtrim($tmpstr); + } $this->Cell($w, $h, $tmpstr, 0, 1, $align, $fill, $link, $stretch); unset($tmpstr); if ($firstline) { @@ -4503,6 +4505,9 @@ if (!class_exists('TCPDF', false)) { } } // print the line + if ($firstblock AND $this->isRTLTextDir()) { + $tmpstr = rtrim($tmpstr); + } $this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch); unset($tmpstr); if ($firstline) { @@ -4583,6 +4588,9 @@ if (!class_exists('TCPDF', false)) { $this->cMargin = 0; } } + if ($firstblock AND $this->isRTLTextDir()) { + $tmpstr = rtrim($tmpstr); + } $this->Cell($w, $h, $tmpstr, 0, $ln, $align, $fill, $link, $stretch); unset($tmpstr); if ($firstline) { @@ -13558,6 +13566,9 @@ if (!class_exists('TCPDF', false)) { $lnstring[4][$kk] = $no; $lnstring[5][$kk] = $ns; } + if ($this->isRTLTextDir()) { + $t_x = $this->lMargin - $this->endlinex + $this->cMargin - (($no - $ns) * $one_space_width); + } // calculate additional space to add to each space $spacelen = $one_space_width; $spacewidth = ((($tw - $linew) + (($no - $ns) * $spacelen)) / ($ns?$ns:1)) * $this->k; @@ -14151,11 +14162,6 @@ if (!class_exists('TCPDF', false)) { } elseif (($plalign == 'L') AND ($this->rtl)) { // left alignment on RTL document $t_x = -$mdiff; - } elseif (($plalign == 'J') AND ($plalign == $lalign)) { - // Justification - $t_x = 0; - } else { - $t_x = -$this->cMargin; } if (($t_x != 0) OR ($yshift < 0)) { // shift the line
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index d7480d3..fce98e9 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, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
@@ -20912,7 +20912,7 @@ $font)
-

method _putviewerpreferences [line 7067]

+

method _putviewerpreferences [line 7075]

diff --git a/doc/index.html b/doc/index.html index d7480d3..fce98e9 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, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 281fa0d..5acdd12 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Wed, 27 Jan 2010 20:23:35 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:23 +0100 by phpDocumentor 1.4.3
@@ -20943,7 +20943,7 @@ $font)
-

method _putxobjectdict [line 6858]

+

method _putxobjectdict [line 6866]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 1699761..927e706 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1477,7 +1477,7 @@ top
- Documentation generated on Wed, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index fc3d237..6f47ae2 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1454,7 +1454,7 @@ top
- Documentation generated on Wed, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
@@ -20968,7 +20968,7 @@ $font)
-

method _RC4 [line 7973]

+

method _RC4 [line 7981]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 20533d3..a47c6de 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, 27 Jan 2010 20:23:35 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:23 +0100 by phpDocumentor 1.4.3
@@ -21019,7 +21019,7 @@ $text)
-

method _textstring [line 7436]

+

method _textstring [line 7444]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 9178bfb..07ff678 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 b9943a1..78fde62 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, 27 Jan 2010 20:23:33 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:21 +0100 by phpDocumentor 1.4.3
@@ -21058,7 +21058,7 @@ $s)
-

method _toJPEG [line 5000]

+

method _toJPEG [line 5008]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index aadb79b..cc65d1e 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, 27 Jan 2010 20:23:35 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:23 +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 074781d..0dea06a 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, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
@@ -21100,7 +21100,7 @@ $file)
-

method _Uvalue [line 8039]

+

method _Uvalue [line 8047]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index a299bee..196f24c 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Wed, 27 Jan 2010 20:23:32 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:20 +0100 by phpDocumentor 1.4.3
@@ -21137,7 +21137,7 @@ $file)
- Documentation generated on Wed, 27 Jan 2010 20:23:33 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:21 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  4.8.029version:  4.8.030
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.029 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.030 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Wed, 27 Jan 2010 20:23:33 +0100 by phpDocumentor 1.4.3 + Documentation generated on Wed, 27 Jan 2010 23:41:21 +0100 by phpDocumentor 1.4.3