From 9d1aafa9d47a0929b149b34f087e4e09197ed4b5 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Mon, 26 Oct 2009 13:05:38 +0100 Subject: [PATCH] 4.8.013 --- CHANGELOG.TXT | 3 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 450 +++++++++--------- 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 | 28 +- 16 files changed, 263 insertions(+), 250 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 02ac106..ed250e0 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +4.8.013 (2009-10-26) + - Bug item #2884729 "Problem with word-wrap and hyphen" was fixed. + 4.8.012 (2009-10-23) - Table cell alignments for RTL booklet mode were fixed. - Images and barcode alignments for booklet mode were fixed. diff --git a/README.TXT b/README.TXT index a738419..0b98d21 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.012 -Release date: 2009-10-23 +Version: 4.8.013 +Release date: 2009-10-26 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index c0409b4..14ee60f 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index b7af5ac..39443d2 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.012 + version:  4.8.013 link:  http://www.tcpdf.org @@ -6089,7 +6089,7 @@ $diskcache = false])
-

method addExtGState [line 11329]

+

method addExtGState [line 11339]

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

method addHtmlLink [line 7698]

+

method addHtmlLink [line 7708]

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

method addHTMLVertSpace [line 14845]

+

method addHTMLVertSpace [line 14855]

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

method addJavascriptObject [line 9949]

+

method addJavascriptObject [line 9959]

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

method addTOC [line 15868]

+

method addTOC [line 15878]

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

method AliasNbPages [line 11137]

+

method AliasNbPages [line 11147]

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

method AliasNumPage [line 11164]

+

method AliasNumPage [line 11174]

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

method Arrow [line 9191]

+

method Arrow [line 9201]

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

method arrUTF8ToUTF16BE [line 7596]

+

method arrUTF8ToUTF16BE [line 7606]

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

method Bookmark [line 9835]

+

method Bookmark [line 9845]

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

method Button [line 10843]

+

method Button [line 10853]

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

method CheckBox [line 10773]

+

method CheckBox [line 10783]

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

method Circle [line 8825]

+

method Circle [line 8835]

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

method Clip [line 11592]

+

method Clip [line 11602]

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

method closeHTMLTagHandler [line 14508]

+

method closeHTMLTagHandler [line 14518]

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

method ComboBox [line 10712]

+

method ComboBox [line 10722]

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

method commitTransaction [line 16027]

+

method commitTransaction [line 16037]

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

method convertHTMLColorToDec [line 7731]

+

method convertHTMLColorToDec [line 7741]

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

method CoonsPatchMesh [line 11512]

+

method CoonsPatchMesh [line 11522]

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

method Curve [line 8600]

+

method Curve [line 8610]

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

method deletePage [line 15727]

+

method deletePage [line 15737]

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

method Ellipse [line 8721]

+

method Ellipse [line 8731]

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

method empty_string [line 16081]

+

method empty_string [line 16091]

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

method formatPageNumber [line 11241]

+

method formatPageNumber [line 11251]

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

method formatTOCPageNumber [line 11253]

+

method formatTOCPageNumber [line 11263]

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

method GetAbsX [line 5180]

+

method GetAbsX [line 5190]

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

method getAliasNbPages [line 11149]

+

method getAliasNbPages [line 11159]

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

method getAliasNumPage [line 11177]

+

method getAliasNumPage [line 11187]

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

method getAnnotOptFromJSProp [line 10080]

+

method getAnnotOptFromJSProp [line 10090]

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

method getBarcode [line 12063]

+

method getBarcode [line 12073]

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

method getBuffer [line 15413]

+

method getBuffer [line 15423]

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

method getCellHeightRatio [line 11415]

+

method getCellHeightRatio [line 11425]

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

method getFontBuffer [line 15573]

+

method getFontBuffer [line 15583]

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

method getFontFamily [line 12549]

+

method getFontFamily [line 12559]

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

method getFontSize [line 12529]

+

method getFontSize [line 12539]

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

method getFontSizePt [line 12539]

+

method getFontSizePt [line 12549]

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

method getFontStyle [line 12559]

+

method getFontStyle [line 12569]

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

method getFooterFont [line 7657]

+

method getFooterFont [line 7667]

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

method getFormDefaultProp [line 10455]

+

method getFormDefaultProp [line 10465]

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

method getGDgamma [line 5123]

+

method getGDgamma [line 5133]

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

method getGraphicVars [line 15281]

+

method getGraphicVars [line 15291]

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

method getGroupPageNo [line 11190]

+

method getGroupPageNo [line 11200]

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

method getGroupPageNoFormatted [line 11200]

+

method getGroupPageNoFormatted [line 11210]

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

method getHeaderFont [line 7637]

+

method getHeaderFont [line 7647]

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

method getHtmlDomArray [line 12595]

+

method getHtmlDomArray [line 12605]

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

method getHTMLUnitToUnits [line 15000]

+

method getHTMLUnitToUnits [line 15010]

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

method getImageBuffer [line 15515]

+

method getImageBuffer [line 15525]

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

method GetLineWidth [line 8314]

+

method GetLineWidth [line 8324]

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

method getMargins [line 12492]

+

method getMargins [line 12502]

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

method getObjFilename [line 15345]

+

method getObjFilename [line 15355]

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

method getOriginalMargins [line 12515]

+

method getOriginalMargins [line 12525]

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

method getPageBuffer [line 15456]

+

method getPageBuffer [line 15466]

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

method getPageGroupAlias [line 11212]

+

method getPageGroupAlias [line 11222]

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

method getPageNumGroupAlias [line 11227]

+

method getPageNumGroupAlias [line 11237]

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

method getPDFData [line 7680]

+

method getPDFData [line 7690]

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

method getRemainingWidth [line 4532]

+

method getRemainingWidth [line 4542]

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

method GetX [line 5164]

+

method GetX [line 5174]

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

method GetY [line 5191]

+

method GetY [line 5201]

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

method get_mqr [line 4883]

+

method get_mqr [line 4893]

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

method Gradient [line 11615]

+

method Gradient [line 11625]

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

method Image [line 4655]

+

method Image [line 4665]

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

method ImageEps [line 11787]

+

method ImageEps [line 11797]

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

method ImagePngAlpha [line 5079]

+

method ImagePngAlpha [line 5089]

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

method IncludeJS [line 9936]

+

method IncludeJS [line 9946]

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

method intToRoman [line 15074]

+

method intToRoman [line 15084]

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

method Line [line 8467]

+

method Line [line 8477]

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

method LinearGradient [line 11472]

+

method LinearGradient [line 11482]

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

method ListBox [line 10652]

+

method ListBox [line 10662]

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

method Ln [line 5136]

+

method Ln [line 5146]

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

method MirrorH [line 8086]

+

method MirrorH [line 8096]

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

method MirrorL [line 8122]

+

method MirrorL [line 8132]

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

method MirrorP [line 8109]

+

method MirrorP [line 8119]

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

method MirrorV [line 8097]

+

method MirrorV [line 8107]

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

method movePage [line 15590]

+

method movePage [line 15600]

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

method objclone [line 16070]

+

method objclone [line 16080]

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

method openHTMLTagHandler [line 13971]

+

method openHTMLTagHandler [line 13981]

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

method Output [line 5283]

+

method Output [line 5293]

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

method PageNoFormatted [line 11263]

+

method PageNoFormatted [line 11273]

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

method PieSector [line 11709]

+

method PieSector [line 11719]

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

method pixelsToUnits [line 7788]

+

method pixelsToUnits [line 7798]

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

method Polycurve [line 8657]

+

method Polycurve [line 8667]

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

method Polygon [line 8877]

+

method Polygon [line 8887]

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

method PolyLine [line 8851]

+

method PolyLine [line 8861]

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

method putHtmlListBullet [line 15139]

+

method putHtmlListBullet [line 15149]

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

method RadialGradient [line 11490]

+

method RadialGradient [line 11500]

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

method RadioButton [line 10564]

+

method RadioButton [line 10574]

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

method readDiskCache [line 15385]

+

method readDiskCache [line 15395]

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

method Rect [line 8502]

+

method Rect [line 8512]

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

method RegularPolygon [line 9002]

+

method RegularPolygon [line 9012]

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

method rfread [line 5049]

+

method rfread [line 5059]

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

method rollbackTransaction [line 16041]

+

method rollbackTransaction [line 16051]

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

method Rotate [line 8181]

+

method Rotate [line 8191]

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

method RoundedRect [line 9106]

+

method RoundedRect [line 9116]

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

method Scale [line 8051]

+

method Scale [line 8061]

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

method ScaleX [line 8011]

+

method ScaleX [line 8021]

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

method ScaleXY [line 8037]

+

method ScaleXY [line 8047]

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

method ScaleY [line 8024]

+

method ScaleY [line 8034]

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

method setAlpha [line 11372]

+

method setAlpha [line 11382]

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

method setBarcode [line 12053]

+

method setBarcode [line 12063]

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

method SetBooklet [line 14914]

+

method SetBooklet [line 14924]

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

method setBuffer [line 15395]

+

method setBuffer [line 15405]

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

method setCellHeightRatio [line 11406]

+

method setCellHeightRatio [line 11416]

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

method setDefaultTableColumns [line 11396]

+

method setDefaultTableColumns [line 11406]

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

method setExtGState [line 11341]

+

method setExtGState [line 11351]

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

method setFontBuffer [line 15531]

+

method setFontBuffer [line 15541]

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

method setFontSubBuffer [line 15553]

+

method setFontSubBuffer [line 15563]

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

method setFooterFont [line 7647]

+

method setFooterFont [line 7657]

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

method setFormDefaultProp [line 10444]

+

method setFormDefaultProp [line 10454]

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

method setGraphicVars [line 15312]

+

method setGraphicVars [line 15322]

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

method setHeaderFont [line 7627]

+

method setHeaderFont [line 7637]

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

method setHtmlLinksStyle [line 14985]

+

method setHtmlLinksStyle [line 14995]

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

method setHtmlVSpace [line 14954]

+

method setHtmlVSpace [line 14964]

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

method setImageBuffer [line 15472]

+

method setImageBuffer [line 15482]

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

method setImageSubBuffer [line 15495]

+

method setImageSubBuffer [line 15505]

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

method setJPEGQuality [line 11383]

+

method setJPEGQuality [line 11393]

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

method setLanguageArray [line 7667]

+

method setLanguageArray [line 7677]

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

method SetLineStyle [line 8339]

+

method SetLineStyle [line 8349]

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

method SetLineWidth [line 8298]

+

method SetLineWidth [line 8308]

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

method setListIndentWidth [line 14964]

+

method setListIndentWidth [line 14974]

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

method setLIsymbol [line 14874]

+

method setLIsymbol [line 14884]

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

method setOpenCell [line 14974]

+

method setOpenCell [line 14984]

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

method setPageBuffer [line 15429]

+

method setPageBuffer [line 15439]

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

method setPDFVersion [line 11425]

+

method setPDFVersion [line 11435]

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

method SetProtection [line 7951]

+

method SetProtection [line 7961]

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

method setSignature [line 11094]

+

method setSignature [line 11104]

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

method setUserRights [line 11064]

+

method setUserRights [line 11074]

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

method setViewerPreferences [line 11455]

+

method setViewerPreferences [line 11465]

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

method setVisibility [line 11293]

+

method setVisibility [line 11303]

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

method SetX [line 5204]

+

method SetX [line 5214]

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

method SetXY [line 5267]

+

method SetXY [line 5277]

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

method SetY [line 5236]

+

method SetY [line 5246]

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

method set_mqr [line 4868]

+

method set_mqr [line 4878]

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

method Skew [line 8241]

+

method Skew [line 8251]

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

method SkewX [line 8214]

+

method SkewX [line 8224]

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

method SkewY [line 8227]

+

method SkewY [line 8237]

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

method StarPolygon [line 9057]

+

method StarPolygon [line 9067]

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

method startPageGroup [line 11122]

+

method startPageGroup [line 11132]

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

method startTransaction [line 16011]

+

method startTransaction [line 16021]

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

method StartTransform [line 7979]

+

method StartTransform [line 7989]

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

method StopTransform [line 7994]

+

method StopTransform [line 8004]

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

method swapMargins [line 14930]

+

method swapMargins [line 14940]

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

method TextField [line 10473]

+

method TextField [line 10483]

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

method Transform [line 8274]

+

method Transform [line 8284]

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

method Translate [line 8157]

+

method Translate [line 8167]

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

method TranslateX [line 8134]

+

method TranslateX [line 8144]

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

method TranslateY [line 8145]

+

method TranslateY [line 8155]

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

method unhtmlentities [line 7799]

+

method unhtmlentities [line 7809]

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

method UniArrSubString [line 4571]

+

method UniArrSubString [line 4581]

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

method unichr [line 4604]

+

method unichr [line 4614]

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

method UTF8ArrayToUniArray [line 4592]

+

method UTF8ArrayToUniArray [line 4602]

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

method UTF8ArrSubString [line 4548]

+

method UTF8ArrSubString [line 4558]

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

method utf8Bidi [line 9264]

+

method utf8Bidi [line 9274]

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

method UTF8StringToArray [line 7429]

+

method UTF8StringToArray [line 7439]

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

method utf8StrRev [line 9250]

+

method utf8StrRev [line 9260]

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

method UTF8ToLatin1 [line 7536]

+

method UTF8ToLatin1 [line 7546]

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

method UTF8ToUTF16BE [line 7520]

+

method UTF8ToUTF16BE [line 7530]

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

method write1DBarcode [line 12082]

+

method write1DBarcode [line 12092]

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

method write2DBarcode [line 12339]

+

method write2DBarcode [line 12349]

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

method writeBarcode [line 12289]

+

method writeBarcode [line 12299]

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

method writeDiskCache [line 15357]

+

method writeDiskCache [line 15367]

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

method writeHTML [line 13035]

+

method writeHTML [line 13045]

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

method writeHTMLCell [line 12583]

+

method writeHTMLCell [line 12593]

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

method _addfield [line 10045]

+

method _addfield [line 10055]

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

method _beginpage [line 7172]

+

method _beginpage [line 7182]

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

method _datastring [line 7308]

+

method _datastring [line 7318]

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

method _datestring [line 7321]

+

method _datestring [line 7331]

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

method _destroy [line 5438]

+

method _destroy [line 5448]

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

method _dochecks [line 5466]

+

method _dochecks [line 5476]

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

method _dolinethrough [line 7247]

+

method _dolinethrough [line 7257]

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

method _dolinethroughw [line 7274]

+

method _dolinethroughw [line 7284]

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

method _dounderline [line 7235]

+

method _dounderline [line 7245]

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

method _dounderlinew [line 7260]

+

method _dounderlinew [line 7270]

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

method _enddoc [line 7055]

+

method _enddoc [line 7065]

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

method _endpage [line 7211]

+

method _endpage [line 7221]

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

method _escape [line 7297]

+

method _escape [line 7307]

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

method _escapetext [line 7346]

+

method _escapetext [line 7356]

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

method _freadint [line 7286]

+

method _freadint [line 7296]

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

method _generateencryptionkey [line 7919]

+

method _generateencryptionkey [line 7929]

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

method _getfontpath [line 5482]

+

method _getfontpath [line 5492]

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

method _JScolor [line 10021]

+

method _JScolor [line 10031]

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

method _md5_16 [line 7880]

+

method _md5_16 [line 7890]

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

method _newobj [line 7221]

+

method _newobj [line 7231]

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

method _objectkey [line 7812]

+

method _objectkey [line 7822]

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

method _out [line 7377]

+

method _out [line 7387]

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

method _outarc [line 11689]

+

method _outarc [line 11699]

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

method _outCurve [line 8447]

+

method _outCurve [line 8457]

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

method _outLine [line 8411]

+

method _outLine [line 8421]

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

method _outPoint [line 8397]

+

method _outPoint [line 8407]

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

method _outRect [line 8428]

+

method _outRect [line 8438]

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

method _Ovalue [line 7893]

+

method _Ovalue [line 7903]

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

method _parsejpeg [line 4918]

+

method _parsejpeg [line 4928]

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

method _parsepng [line 4944]

+

method _parsepng [line 4954]

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

method _putannotsobjs [line 5665]

+

method _putannotsobjs [line 5675]

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

method _putannotsrefs [line 5634]

+

method _putannotsrefs [line 5644]

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

method _putAPXObject [line 6272]

+

method _putAPXObject [line 6282]

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

method _putbookmarks [line 9863]

+

method _putbookmarks [line 9873]

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

method _putcatalog [line 6880]

+

method _putcatalog [line 6890]

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

method _putcidfont0 [line 6623]

+

method _putcidfont0 [line 6633]

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

method _putencryption [line 7821]

+

method _putencryption [line 7831]

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

method _putextgstates [line 11351]

+

method _putextgstates [line 11361]

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

method _putfonts [line 6300]

+

method _putfonts [line 6310]

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

method _putfontwidths [line 6435]

+

method _putfontwidths [line 6445]

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

method _putheader [line 7047]

+

method _putheader [line 7057]

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

method _putimages [line 6688]

+

method _putimages [line 6698]

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

method _putinfo [line 6846]

+

method _putinfo [line 6856]

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

method _putjavascript [line 9961]

+

method _putjavascript [line 9971]

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

method _putocg [line 11272]

+

method _putocg [line 11282]

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

method _putpages [line 5493]

+

method _putpages [line 5503]

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

method _putresourcedict [line 6771]

+

method _putresourcedict [line 6781]

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

method _putresources [line 6812]

+

method _putresources [line 6822]

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

method _putshaders [line 11639]

+

method _putshaders [line 11649]

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

method _putsignature [line 10993]

+

method _putsignature [line 11003]

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

method _putspotcolors [line 6743]

+

method _putspotcolors [line 6753]

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

method _putstream [line 7363]

+

method _putstream [line 7373]

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

method _puttrailer [line 7033]

+

method _puttrailer [line 7043]

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

method _puttruetypeunicode [line 6534]

+

method _puttruetypeunicode [line 6544]

diff --git a/tcpdf.php b/tcpdf.php index 93c286e..908ca5b 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-10-23 +// Last Update : 2009-10-26 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.012 +// Version : 4.8.013 // 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.012 + * @version 4.8.013 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.012 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.013 (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.012 + * @version 4.8.013 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -4266,6 +4266,7 @@ if (!class_exists('TCPDF', false)) { $l = 0; // current string lenght $nl = 0; //number of lines $linebreak = false; + $pc = 0; // previous character // for each character while ($i < $nb) { if (($maxh > 0) AND ($this->y >= $maxy) ) { @@ -4334,6 +4335,13 @@ if (!class_exists('TCPDF', false)) { // check if is a SHY if ($c == 173) { $shy = true; + if ($pc == 45) { + $tmp_shy_replacement_width = 0; + $tmp_shy_replacement_char = ''; + } else { + $tmp_shy_replacement_width = $shy_replacement_width; + $tmp_shy_replacement_char = $shy_replacement_char; + } } else { $shy = false; } @@ -4346,7 +4354,7 @@ if (!class_exists('TCPDF', false)) { } else { $l += $this->GetCharWidth($c); } - if (($l > $wmax) OR ($shy AND (($l + $shy_replacement_width) > $wmax)) ) { + if (($l > $wmax) OR ($shy AND (($l + $tmp_shy_replacement_width) > $wmax)) ) { // we have reached the end of column if ($sep == -1) { // check if the line was already started @@ -4398,13 +4406,13 @@ if (!class_exists('TCPDF', false)) { } if ($shy) { // add hypen (minus symbol) at the end of the line - $shy_width = $shy_replacement_width; + $shy_width = $tmp_shy_replacement_width; if ($this->rtl) { - $shy_char_left = $shy_replacement_char; + $shy_char_left = $tmp_shy_replacement_char; $shy_char_right = ''; } else { $shy_char_left = ''; - $shy_char_right = $shy_replacement_char; + $shy_char_right = $tmp_shy_replacement_char; } } else { $shy_width = 0; @@ -4459,6 +4467,8 @@ if (!class_exists('TCPDF', false)) { } } } + // save last character + $pc = $c; ++$i; } // end while i < nb // print last substring (if any)
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index f91dee9..6961d27 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 Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
@@ -20510,7 +20510,7 @@ $font)
-

method _putviewerpreferences [line 6963]

+

method _putviewerpreferences [line 6973]

diff --git a/doc/index.html b/doc/index.html index f91dee9..6961d27 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 Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index fab6276..c3e01c8 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Fri, 23 Oct 2009 15:46:16 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by phpDocumentor 1.4.3
@@ -20541,7 +20541,7 @@ $font)
-

method _putxobjectdict [line 6760]

+

method _putxobjectdict [line 6770]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 4366bd2..28fe06e 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1467,7 +1467,7 @@ top
- Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index a874b09..e3e7a29 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1444,7 +1444,7 @@ top
- Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
@@ -20566,7 +20566,7 @@ $font)
-

method _RC4 [line 7840]

+

method _RC4 [line 7850]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 459f16c..2f488c2 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 Fri, 23 Oct 2009 15:46:15 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:30 +0100 by phpDocumentor 1.4.3
@@ -20617,7 +20617,7 @@ $text)
-

method _textstring [line 7332]

+

method _textstring [line 7342]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index d46301b..16ac854 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 b15be63..a28f55b 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 Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3
@@ -20656,7 +20656,7 @@ $s)
-

method _toJPEG [line 4902]

+

method _toJPEG [line 4912]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index a3a8963..71cf7d8 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 Fri, 23 Oct 2009 15:46:15 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:30 +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 eca3b76..58abd7b 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 Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
@@ -20698,7 +20698,7 @@ $file)
-

method _Uvalue [line 7906]

+

method _Uvalue [line 7916]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 79e2d5f..d5bb0e6 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Fri, 23 Oct 2009 15:46:06 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:23 +0100 by phpDocumentor 1.4.3
@@ -20735,7 +20735,7 @@ $file)
- Documentation generated on Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  4.8.012version:  4.8.013
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.012 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.013 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Fri, 23 Oct 2009 15:46:07 +0200 by phpDocumentor 1.4.3 + Documentation generated on Mon, 26 Oct 2009 13:05:24 +0100 by phpDocumentor 1.4.3