From 2a1846749fe47789ad77d1a2e68eba174200f67d Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sat, 21 Nov 2009 11:45:13 +0100 Subject: [PATCH] 4.8.016 --- CHANGELOG.TXT | 6 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 408 +++++++++--------- 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 | 4 +- doc/elementindex_com-tecnick-tcpdf.html | 4 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 115 +++-- 16 files changed, 319 insertions(+), 246 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 64b2d99..733a0ee 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,9 @@ +4.8.016 (2009-11-21) + - Document Information Dictionary was fixed. + - CSS attributes 'page-break-before', 'page-break-after' and 'page-break-inside' are now supported. + - Problem of unclosed last page was fixed. + - Problem of 'thead' unnecessarily repeated on the next page was fixed. + 4.8.015 (2009-11-20) - A problem with some PNG transparency images was fixed. - Bug #2900762 "Sort issues in Bookmarks" was fixed. diff --git a/README.TXT b/README.TXT index b45b784..1ed0c7a 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.015 -Release date: 2009-11-20 +Version: 4.8.016 +Release date: 2009-11-21 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 3eb2626..887bd4c 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Fri, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index bfa621a..856f83b 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

method addExtGState [line 11367]

+

method addExtGState [line 11374]

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

method addHtmlLink [line 7736]

+

method addHtmlLink [line 7743]

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

method addHTMLVertSpace [line 14921]

+

method addHTMLVertSpace [line 14988]

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

method addJavascriptObject [line 9987]

+

method addJavascriptObject [line 9994]

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

method addTOC [line 15944]

+

method addTOC [line 16011]

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

method AliasNbPages [line 11175]

+

method AliasNbPages [line 11182]

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

method AliasNumPage [line 11202]

+

method AliasNumPage [line 11209]

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

method Arrow [line 9229]

+

method Arrow [line 9236]

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

method arrUTF8ToUTF16BE [line 7634]

+

method arrUTF8ToUTF16BE [line 7641]

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

method Bookmark [line 9873]

+

method Bookmark [line 9880]

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

method Button [line 10881]

+

method Button [line 10888]

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

method CheckBox [line 10811]

+

method CheckBox [line 10818]

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

method Circle [line 8863]

+

method Circle [line 8870]

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

method Clip [line 11630]

+

method Clip [line 11637]

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

method closeHTMLTagHandler [line 14584]

+

method closeHTMLTagHandler [line 14636]

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

method ComboBox [line 10750]

+

method ComboBox [line 10757]

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

method commitTransaction [line 16103]

+

method commitTransaction [line 16170]

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

method convertHTMLColorToDec [line 7769]

+

method convertHTMLColorToDec [line 7776]

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

method CoonsPatchMesh [line 11550]

+

method CoonsPatchMesh [line 11557]

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

method Curve [line 8638]

+

method Curve [line 8645]

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

method deletePage [line 15803]

+

method deletePage [line 15870]

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

method Ellipse [line 8759]

+

method Ellipse [line 8766]

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

method empty_string [line 16157]

+

method empty_string [line 16224]

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

method formatPageNumber [line 11279]

+

method formatPageNumber [line 11286]

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

method formatTOCPageNumber [line 11291]

+

method formatTOCPageNumber [line 11298]

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

method getAliasNbPages [line 11187]

+

method getAliasNbPages [line 11194]

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

method getAliasNumPage [line 11215]

+

method getAliasNumPage [line 11222]

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

method getAnnotOptFromJSProp [line 10118]

+

method getAnnotOptFromJSProp [line 10125]

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

method getBarcode [line 12101]

+

method getBarcode [line 12108]

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

method getBuffer [line 15489]

+

method getBuffer [line 15556]

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

method getCellHeightRatio [line 11453]

+

method getCellHeightRatio [line 11460]

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

method getFontBuffer [line 15649]

+

method getFontBuffer [line 15716]

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

method getFontFamily [line 12587]

+

method getFontFamily [line 12594]

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

method getFontSize [line 12567]

+

method getFontSize [line 12574]

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

method getFontSizePt [line 12577]

+

method getFontSizePt [line 12584]

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

method getFontStyle [line 12597]

+

method getFontStyle [line 12604]

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

method getFooterFont [line 7695]

+

method getFooterFont [line 7702]

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

method getFormDefaultProp [line 10493]

+

method getFormDefaultProp [line 10500]

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

method getGraphicVars [line 15357]

+

method getGraphicVars [line 15424]

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

method getGroupPageNo [line 11228]

+

method getGroupPageNo [line 11235]

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

method getGroupPageNoFormatted [line 11238]

+

method getGroupPageNoFormatted [line 11245]

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

method getHeaderFont [line 7675]

+

method getHeaderFont [line 7682]

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

method getHtmlDomArray [line 12633]

+

method getHtmlDomArray [line 12640]

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

method getHTMLUnitToUnits [line 15076]

+

method getHTMLUnitToUnits [line 15143]

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

method getImageBuffer [line 15591]

+

method getImageBuffer [line 15658]

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

method GetLineWidth [line 8352]

+

method GetLineWidth [line 8359]

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

method getMargins [line 12530]

+

method getMargins [line 12537]

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

method getObjFilename [line 15421]

+

method getObjFilename [line 15488]

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

method getOriginalMargins [line 12553]

+

method getOriginalMargins [line 12560]

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

method getPageBuffer [line 15532]

+

method getPageBuffer [line 15599]

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

method getPageGroupAlias [line 11250]

+

method getPageGroupAlias [line 11257]

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

method getPageNumGroupAlias [line 11265]

+

method getPageNumGroupAlias [line 11272]

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

method getPDFData [line 7718]

+

method getPDFData [line 7725]

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

method Gradient [line 11653]

+

method Gradient [line 11660]

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

method ImageEps [line 11825]

+

method ImageEps [line 11832]

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

method IncludeJS [line 9974]

+

method IncludeJS [line 9981]

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

method intToRoman [line 15150]

+

method intToRoman [line 15217]

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

method Line [line 8505]

+

method Line [line 8512]

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

method LinearGradient [line 11510]

+

method LinearGradient [line 11517]

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

method ListBox [line 10690]

+

method ListBox [line 10697]

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

method MirrorH [line 8124]

+

method MirrorH [line 8131]

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

method MirrorL [line 8160]

+

method MirrorL [line 8167]

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

method MirrorP [line 8147]

+

method MirrorP [line 8154]

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

method MirrorV [line 8135]

+

method MirrorV [line 8142]

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

method movePage [line 15666]

+

method movePage [line 15733]

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

method objclone [line 16146]

+

method objclone [line 16213]

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

method openHTMLTagHandler [line 14047]

+

method openHTMLTagHandler [line 14088]

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

method PageNoFormatted [line 11301]

+

method PageNoFormatted [line 11308]

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

method PieSector [line 11747]

+

method PieSector [line 11754]

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

method pixelsToUnits [line 7826]

+

method pixelsToUnits [line 7833]

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

method Polycurve [line 8695]

+

method Polycurve [line 8702]

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

method Polygon [line 8915]

+

method Polygon [line 8922]

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

method PolyLine [line 8889]

+

method PolyLine [line 8896]

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

method putHtmlListBullet [line 15215]

+

method putHtmlListBullet [line 15282]

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

method RadialGradient [line 11528]

+

method RadialGradient [line 11535]

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

method RadioButton [line 10602]

+

method RadioButton [line 10609]

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

method readDiskCache [line 15461]

+

method readDiskCache [line 15528]

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

method Rect [line 8540]

+

method Rect [line 8547]

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

method RegularPolygon [line 9040]

+

method RegularPolygon [line 9047]

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

method rollbackTransaction [line 16117]

+

method rollbackTransaction [line 16184]

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

method Rotate [line 8219]

+

method Rotate [line 8226]

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

method RoundedRect [line 9144]

+

method RoundedRect [line 9151]

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

method Scale [line 8089]

+

method Scale [line 8096]

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

method ScaleX [line 8049]

+

method ScaleX [line 8056]

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

method ScaleXY [line 8075]

+

method ScaleXY [line 8082]

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

method ScaleY [line 8062]

+

method ScaleY [line 8069]

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

method setAlpha [line 11410]

+

method setAlpha [line 11417]

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

method setBarcode [line 12091]

+

method setBarcode [line 12098]

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

method SetBooklet [line 14990]

+

method SetBooklet [line 15057]

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

method setBuffer [line 15471]

+

method setBuffer [line 15538]

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

method setCellHeightRatio [line 11444]

+

method setCellHeightRatio [line 11451]

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

method setDefaultTableColumns [line 11434]

+

method setDefaultTableColumns [line 11441]

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

method setExtGState [line 11379]

+

method setExtGState [line 11386]

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

method setFontBuffer [line 15607]

+

method setFontBuffer [line 15674]

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

method setFontSubBuffer [line 15629]

+

method setFontSubBuffer [line 15696]

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

method setFooterFont [line 7685]

+

method setFooterFont [line 7692]

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

method setFormDefaultProp [line 10482]

+

method setFormDefaultProp [line 10489]

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

method setGraphicVars [line 15388]

+

method setGraphicVars [line 15455]

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

method setHeaderFont [line 7665]

+

method setHeaderFont [line 7672]

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

method setHtmlLinksStyle [line 15061]

+

method setHtmlLinksStyle [line 15128]

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

method setHtmlVSpace [line 15030]

+

method setHtmlVSpace [line 15097]

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

method setImageBuffer [line 15548]

+

method setImageBuffer [line 15615]

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

method setImageSubBuffer [line 15571]

+

method setImageSubBuffer [line 15638]

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

method setJPEGQuality [line 11421]

+

method setJPEGQuality [line 11428]

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

method setLanguageArray [line 7705]

+

method setLanguageArray [line 7712]

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

method SetLineStyle [line 8377]

+

method SetLineStyle [line 8384]

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

method SetLineWidth [line 8336]

+

method SetLineWidth [line 8343]

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

method setListIndentWidth [line 15040]

+

method setListIndentWidth [line 15107]

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

method setLIsymbol [line 14950]

+

method setLIsymbol [line 15017]

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

method setOpenCell [line 15050]

+

method setOpenCell [line 15117]

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

method setPageBuffer [line 15505]

+

method setPageBuffer [line 15572]

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

method setPDFVersion [line 11463]

+

method setPDFVersion [line 11470]

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

method SetProtection [line 7989]

+

method SetProtection [line 7996]

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

method setSignature [line 11132]

+

method setSignature [line 11139]

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

method setUserRights [line 11102]

+

method setUserRights [line 11109]

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

method setViewerPreferences [line 11493]

+

method setViewerPreferences [line 11500]

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

method setVisibility [line 11331]

+

method setVisibility [line 11338]

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

method Skew [line 8279]

+

method Skew [line 8286]

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

method SkewX [line 8252]

+

method SkewX [line 8259]

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

method SkewY [line 8265]

+

method SkewY [line 8272]

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

method StarPolygon [line 9095]

+

method StarPolygon [line 9102]

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

method startPageGroup [line 11160]

+

method startPageGroup [line 11167]

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

method startTransaction [line 16087]

+

method startTransaction [line 16154]

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

method StartTransform [line 8017]

+

method StartTransform [line 8024]

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

method StopTransform [line 8032]

+

method StopTransform [line 8039]

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

method swapMargins [line 15006]

+

method swapMargins [line 15073]

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

method TextField [line 10511]

+

method TextField [line 10518]

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

method Transform [line 8312]

+

method Transform [line 8319]

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

method Translate [line 8195]

+

method Translate [line 8202]

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

method TranslateX [line 8172]

+

method TranslateX [line 8179]

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

method TranslateY [line 8183]

+

method TranslateY [line 8190]

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

method unhtmlentities [line 7837]

+

method unhtmlentities [line 7844]

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

method utf8Bidi [line 9302]

+

method utf8Bidi [line 9309]

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

method UTF8StringToArray [line 7467]

+

method UTF8StringToArray [line 7474]

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

method utf8StrRev [line 9288]

+

method utf8StrRev [line 9295]

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

method UTF8ToLatin1 [line 7574]

+

method UTF8ToLatin1 [line 7581]

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

method UTF8ToUTF16BE [line 7558]

+

method UTF8ToUTF16BE [line 7565]

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

method write1DBarcode [line 12120]

+

method write1DBarcode [line 12127]

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

method write2DBarcode [line 12377]

+

method write2DBarcode [line 12384]

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

method writeBarcode [line 12327]

+

method writeBarcode [line 12334]

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

method writeDiskCache [line 15433]

+

method writeDiskCache [line 15500]

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

method writeHTML [line 13073]

+

method writeHTML [line 13104]

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

method writeHTMLCell [line 12621]

+

method writeHTMLCell [line 12628]

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

method _addfield [line 10083]

+

method _addfield [line 10090]

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

method _beginpage [line 7210]

+

method _beginpage [line 7217]

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

method _datastring [line 7346]

+

method _datastring [line 7353]

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

method _datestring [line 7359]

+

method _datestring [line 7366]

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

method _destroy [line 5476]

+

method _destroy [line 5477]

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

method _dochecks [line 5504]

+

method _dochecks [line 5505]

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

method _dolinethrough [line 7285]

+

method _dolinethrough [line 7292]

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

method _dolinethroughw [line 7312]

+

method _dolinethroughw [line 7319]

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

method _dounderline [line 7273]

+

method _dounderline [line 7280]

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

method _dounderlinew [line 7298]

+

method _dounderlinew [line 7305]

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

method _enddoc [line 7093]

+

method _enddoc [line 7100]

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

method _endpage [line 7249]

+

method _endpage [line 7256]

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

method _escape [line 7335]

+

method _escape [line 7342]

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

method _escapetext [line 7384]

+

method _escapetext [line 7391]

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

method _freadint [line 7324]

+

method _freadint [line 7331]

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

method _generateencryptionkey [line 7957]

+

method _generateencryptionkey [line 7964]

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

method _getfontpath [line 5520]

+

method _getfontpath [line 5521]

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

method _JScolor [line 10059]

+

method _JScolor [line 10066]

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

method _md5_16 [line 7918]

+

method _md5_16 [line 7925]

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

method _newobj [line 7259]

+

method _newobj [line 7266]

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

method _objectkey [line 7850]

+

method _objectkey [line 7857]

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

method _out [line 7415]

+

method _out [line 7422]

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

method _outarc [line 11727]

+

method _outarc [line 11734]

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

method _outCurve [line 8485]

+

method _outCurve [line 8492]

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

method _outLine [line 8449]

+

method _outLine [line 8456]

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

method _outPoint [line 8435]

+

method _outPoint [line 8442]

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

method _outRect [line 8466]

+

method _outRect [line 8473]

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

method _Ovalue [line 7931]

+

method _Ovalue [line 7938]

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

method _putannotsobjs [line 5703]

+

method _putannotsobjs [line 5704]

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

method _putannotsrefs [line 5672]

+

method _putannotsrefs [line 5673]

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

method _putAPXObject [line 6310]

+

method _putAPXObject [line 6311]

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

method _putbookmarks [line 9901]

+

method _putbookmarks [line 9908]

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

method _putcatalog [line 6918]

+

method _putcatalog [line 6925]

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

method _putcidfont0 [line 6661]

+

method _putcidfont0 [line 6662]

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

method _putencryption [line 7859]

+

method _putencryption [line 7866]

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

method _putextgstates [line 11389]

+

method _putextgstates [line 11396]

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

method _putfonts [line 6338]

+

method _putfonts [line 6339]

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

method _putfontwidths [line 6473]

+

method _putfontwidths [line 6474]

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

method _putheader [line 7085]

+

method _putheader [line 7092]

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

method _putimages [line 6726]

+

method _putimages [line 6727]

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

method _putinfo [line 6884]

+

method _putinfo [line 6885]

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

- Adds some Metadata information

(see Chapter 10.2 of PDF Reference)




+ Adds some Metadata information (Document Information Dictionary)

(see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference)




Tags:

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

method _putjavascript [line 9999]

+

method _putjavascript [line 10006]

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

method _putocg [line 11310]

+

method _putocg [line 11317]

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

method _putpages [line 5531]

+

method _putpages [line 5532]

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

method _putresourcedict [line 6809]

+

method _putresourcedict [line 6810]

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

method _putresources [line 6850]

+

method _putresources [line 6851]

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

method _putshaders [line 11677]

+

method _putshaders [line 11684]

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

method _putsignature [line 11031]

+

method _putsignature [line 11038]

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

method _putspotcolors [line 6781]

+

method _putspotcolors [line 6782]

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

method _putstream [line 7401]

+

method _putstream [line 7408]

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

method _puttrailer [line 7071]

+

method _puttrailer [line 7078]

diff --git a/tcpdf.php b/tcpdf.php index 57cd1b0..5ef7478 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-11-20 +// Last Update : 2009-11-21 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.015 +// Version : 4.8.016 // 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.015 + * @version 4.8.016 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.015 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.016 (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.015 + * @version 4.8.016 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -5321,6 +5321,7 @@ if (!class_exists('TCPDF', false)) { public function Output($name='doc.pdf', $dest='I') { //Output PDF to some destination //Finish document if necessary + $this->lastpage(); if ($this->state < 3) { $this->Close(); } @@ -6877,38 +6878,44 @@ if (!class_exists('TCPDF', false)) { } /** - * Adds some Metadata information - * (see Chapter 10.2 of PDF Reference) + * Adds some Metadata information (Document Information Dictionary) + * (see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference) * @access protected */ protected function _putinfo() { - if ($this->empty_string($this->title)) { - $this->title = '?'; + if (!$this->empty_string($this->title)) { + // The document's title. + $this->_out('/Title '.$this->_textstring($this->title)); } - $this->_out('/Title '.$this->_textstring($this->title)); - if ($this->empty_string($this->author)) { - $this->author = '?'; + if (!$this->empty_string($this->author)) { + // The name of the person who created the document. + $this->_out('/Author '.$this->_textstring($this->author)); } - $this->_out('/Author '.$this->_textstring($this->author)); - if ($this->empty_string($this->subject)) { - $this->subject = '?'; + if (!$this->empty_string($this->subject)) { + // The subject of the document. + $this->_out('/Subject '.$this->_textstring($this->subject)); } - $this->_out('/Subject '.$this->_textstring($this->subject)); - if ($this->empty_string($this->keywords)) { - $this->keywords = '?'; + if (!$this->empty_string($this->keywords)) { + // Keywords associated with the document. + $this->_out('/Keywords '.$this->_textstring($this->keywords)); } - $this->_out('/Keywords '.$this->_textstring($this->keywords)); - if ($this->empty_string($this->creator)) { - $this->creator = '?'; + if (!$this->empty_string($this->creator)) { + // If the document was converted to PDF from another format, the name of the conforming product that created the original document from which it was converted. + $this->_out('/Creator '.$this->_textstring($this->creator)); } - $this->_out('/Creator '.$this->_textstring($this->creator)); if (defined('PDF_PRODUCER')) { + // If the document was converted to PDF from another format, the name of the conforming product that converted it to PDF. $this->_out('/Producer '.$this->_textstring(PDF_PRODUCER)); } else { + // default producer $this->_out('/Producer '.$this->_textstring('TCPDF')); } + // The date and time the document was created, in human-readable form $this->_out('/CreationDate '.$this->_datestring()); - $this->_out('/ModDate '.$this->_datestring()); + // The date and time the document was most recently modified, in human-readable form + $this->_out('/ModDate '.$this->_datestring()); + // A name object indicating whether the document has been modified to include trapping information + //$this->_out('/Trapped /False'); } /** @@ -12938,6 +12945,30 @@ if (!class_exists('TCPDF', false)) { if (isset($dom[$key]['style']['border'])) { $dom[$key]['attribute']['border'] = $dom[$key]['style']['border']; } + // page-break-inside + if (isset($dom[$key]['style']['page-break-inside']) AND ($dom[$key]['style']['page-break-inside'] == 'avoid')) { + $dom[$key]['attribute']['nobr'] = 'true'; + } + // page-break-before + if (isset($dom[$key]['style']['page-break-before'])) { + if ($dom[$key]['style']['page-break-before'] == 'always') { + $dom[$key]['attribute']['pagebreak'] = 'true'; + } elseif ($dom[$key]['style']['page-break-before'] == 'left') { + $dom[$key]['attribute']['pagebreak'] = 'left'; + } elseif ($dom[$key]['style']['page-break-before'] == 'right') { + $dom[$key]['attribute']['pagebreak'] = 'right'; + } + } + // page-break-after + if (isset($dom[$key]['style']['page-break-after'])) { + if ($dom[$key]['style']['page-break-after'] == 'always') { + $dom[$key]['attribute']['pagebreakafter'] = 'true'; + } elseif ($dom[$key]['style']['page-break-after'] == 'left') { + $dom[$key]['attribute']['pagebreakafter'] = 'left'; + } elseif ($dom[$key]['style']['page-break-after'] == 'right') { + $dom[$key]['attribute']['pagebreakafter'] = 'right'; + } + } } // check for font tag if ($dom[$key]['value'] == 'font') { @@ -13140,6 +13171,16 @@ if (!class_exists('TCPDF', false)) { $maxel = count($dom); $key = 0; while ($key < $maxel) { + if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) { + // check for pagebreak + if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) { + $this->AddPage(); + } + if ((($dom[$key]['attribute']['pagebreak'] == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0)))) + OR (($dom[$key]['attribute']['pagebreak'] == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) { + $this->AddPage(); + } + } if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND isset($dom[$key]['attribute']['nobr']) AND ($dom[$key]['attribute']['nobr'] == 'true')) { if (isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) { $dom[$key]['attribute']['nobr'] = false; @@ -14572,6 +14613,17 @@ if (!class_exists('TCPDF', false)) { break; } } + if ($dom[$key]['self'] AND isset($dom[$key]['attribute']['pagebreakafter'])) { + $pba = $dom[$key]['attribute']['pagebreakafter']; + // check for pagebreak + if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) { + $this->AddPage(); + } + if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0)))) + OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) { + $this->AddPage(); + } + } } /** @@ -14650,8 +14702,8 @@ if (!class_exists('TCPDF', false)) { // closing tag used for the thead part $in_table_head = true; case 'table': { - // draw borders $table_el = $parent; + // draw borders if ((isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) OR (isset($table_el['style']['border']) AND ($table_el['style']['border'] > 0))) { $border = 1; @@ -14798,6 +14850,10 @@ if (!class_exists('TCPDF', false)) { } $this->lasth = $this->FontSize * $this->cell_height_ratio; if (isset($this->theadMargins['top'])) { + if (($this->theadMargins['top'] == $this->tMargin) AND ($this->page == ($this->numpages - 1))) { + // remove last page containing only THEAD + $this->deletePage($this->numpages); + } // restore top margin $this->tMargin = $this->theadMargins['top']; $this->pagedim[$this->page]['tm'] = $this->tMargin; @@ -14905,6 +14961,17 @@ if (!class_exists('TCPDF', false)) { break; } } + if (isset($dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'])) { + $pba = $dom[($dom[$key]['parent'])]['attribute']['pagebreakafter']; + // check for pagebreak + if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) { + $this->AddPage(); + } + if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0)))) + OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) { + $this->AddPage(); + } + } $this->tmprtl = false; }
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 1b3617f..58a8ba6 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, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
@@ -20494,7 +20494,7 @@ $s)
-

method _puttruetypeunicode [line 6572]

+

method _puttruetypeunicode [line 6573]

diff --git a/doc/index.html b/doc/index.html index 1b3617f..58a8ba6 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, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index f7f5e65..750101d 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
- Documentation generated on Fri, 20 Nov 2009 18:42:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:45:06 +0100 by phpDocumentor 1.4.3
@@ -20539,7 +20539,7 @@ $font)
-

method _putviewerpreferences [line 7001]

+

method _putviewerpreferences [line 7008]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 774fbbc..a8d48d1 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -173,7 +173,7 @@
_putimages
in file tcpdf.php, method TCPDF::_putimages()
    Output images.
_putinfo
-
in file tcpdf.php, method TCPDF::_putinfo()
    Adds some Metadata information
+
in file tcpdf.php, method TCPDF::_putinfo()
    Adds some Metadata information (Document Information Dictionary)
_putjavascript
in file tcpdf.php, method TCPDF::_putjavascript()
_putocg
@@ -1469,7 +1469,7 @@ top
- Documentation generated on Fri, 20 Nov 2009 18:42:28 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:58 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index 3342f51..91599a1 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1400,7 +1400,7 @@
_putimages
in file tcpdf.php, method TCPDF::_putimages()
    Output images.
_putinfo
-
in file tcpdf.php, method TCPDF::_putinfo()
    Adds some Metadata information
+
in file tcpdf.php, method TCPDF::_putinfo()
    Adds some Metadata information (Document Information Dictionary)
_putjavascript
in file tcpdf.php, method TCPDF::_putjavascript()
_putocg
@@ -1446,7 +1446,7 @@ top
- Documentation generated on Fri, 20 Nov 2009 18:42:28 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
@@ -20570,7 +20570,7 @@ $font)
-

method _putxobjectdict [line 6798]

+

method _putxobjectdict [line 6799]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 428c334..8724079 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, 20 Nov 2009 18:42:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:45:06 +0100 by phpDocumentor 1.4.3
@@ -20595,7 +20595,7 @@ $font)
-

method _RC4 [line 7878]

+

method _RC4 [line 7885]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 0ec3b01..42a409e 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 b10b65d..dfc1dd4 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, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
@@ -20646,7 +20646,7 @@ $text)
-

method _textstring [line 7370]

+

method _textstring [line 7377]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 8777138..39a1977 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, 20 Nov 2009 18:42:36 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:45:06 +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 59cb2c8..21cded1 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, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
@@ -20727,7 +20727,7 @@ $file)
-

method _Uvalue [line 7944]

+

method _Uvalue [line 7951]

diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 5c7eca7..b108e8b 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
- Documentation generated on Fri, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
@@ -20764,7 +20764,7 @@ $file)
- Documentation generated on Fri, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3
author:  Nicola Asuni
version:  4.8.015version:  4.8.016
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.015 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.016 (http://www.tcpdf.org)'
@@ -115,7 +115,7 @@ unicode data

- Documentation generated on Fri, 20 Nov 2009 18:42:29 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Nov 2009 11:44:59 +0100 by phpDocumentor 1.4.3