diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e168a5a..a581f2e 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.6.014 (2009-06-04) + - Bug #2800931 "Table thead tag bug" was fixed. + - A bug related to
 tag was fixed.
+
 4.6.013 (2009-05-28)
 	- List bullets position was fixed for RTL languages.
 
diff --git a/README.TXT b/README.TXT
index e4dd378..8e4b9f3 100755
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 4.6.013
-Release date: 2009-05-28
+Version: 4.6.014
+Release date: 2009-06-04
 Author:	Nicola Asuni 
 	
 Copyright (c) 2001-2009:
@@ -57,7 +57,7 @@ Main Features:
 Installation (full instructions on http://www.tcpdf.org):
 	1. copy the folder on your Web server
 	2. set your installation path and other parameters on the config/tcpdf_config.php
-	3. call the example/example_001.php page with your browser to see an example
+	3. call the examples/example_001.php page with your browser to see an example
 
 Source Code Documentation:
 	doc/index.html
diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html
index 6342f2c..d3211cc 100644
--- a/doc/classtrees_com-tecnick-tcpdf.html
+++ b/doc/classtrees_com-tecnick-tcpdf.html
@@ -45,7 +45,7 @@
 
         

- Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 783d88d..646e86e 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

@@ -232,7 +232,7 @@ Source Location: /tcpdf.php

  • $tempfontsize
  • $TextColor
  • $thead
  • -
  • $theadMargin
  • +
  • $theadMargins
  • $title
  • $tMargin
  • $tmprtl
  • @@ -588,7 +588,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.6.013 + version:  4.6.014 link:  http://www.tcpdf.org @@ -4673,11 +4673,11 @@ This is a PHP class for generating PDF documents without requiring external exte

    [ Top ]

    - +

    -

    $theadMargin =  ''

    +

    $theadMargins = array()

    [line 1246]

    - Distance between the top of page and end of table headers on a new page.



    + Margins used for table header.



    Tags:

    @@ -5319,7 +5319,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 3298]

    +

    method AcceptPageBreak [line 3303]

    @@ -5350,7 +5350,7 @@ $diskcache = false])
    -

    method addExtGState [line 9579]

    +

    method addExtGState [line 9584]

    @@ -5386,7 +5386,7 @@ $parms)
    -

    method AddFont [line 2896]

    +

    method AddFont [line 2901]

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

    method addHtmlLink [line 6900]

    +

    method addHtmlLink [line 6905]

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

    method addHTMLVertSpace [line 12697]

    +

    method addHTMLVertSpace [line 12720]

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

    method AddLink [line 3118]

    +

    method AddLink [line 3123]

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

    method AddSpotColor [line 2529]

    +

    method AddSpotColor [line 2534]

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

    method addTOC [line 13719]

    +

    method addTOC [line 13742]

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

    method AliasNbPages [line 9387]

    +

    method AliasNbPages [line 9392]

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

    method AliasNumPage [line 9414]

    +

    method AliasNumPage [line 9419]

    @@ -5861,7 +5861,7 @@ $alias = '{pnb}'])
    -

    method Annotation [line 3174]

    +

    method Annotation [line 3179]

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

    method arrUTF8ToUTF16BE [line 6802]

    +

    method arrUTF8ToUTF16BE [line 6807]

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

    method Bookmark [line 8909]

    +

    method Bookmark [line 8914]

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

    method Button [line 9191]

    +

    method Button [line 9196]

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

    method Cell [line 3356]

    +

    method Cell [line 3361]

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

    method CheckBox [line 9171]

    +

    method CheckBox [line 9176]

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

    method checkPageBreak [line 3310]

    +

    method checkPageBreak [line 3315]

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

    method Circle [line 8015]

    +

    method Circle [line 8020]

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

    method Clip [line 9842]

    +

    method Clip [line 9847]

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

    method closeHTMLTagHandler [line 12373]

    +

    method closeHTMLTagHandler [line 12389]

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

    method ComboBox [line 9152]

    +

    method ComboBox [line 9157]

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

    method commitTransaction [line 13876]

    +

    method commitTransaction [line 13899]

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

    method convertHTMLColorToDec [line 6933]

    +

    method convertHTMLColorToDec [line 6938]

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

    method CoonsPatchMesh [line 9762]

    +

    method CoonsPatchMesh [line 9767]

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

    method Curve [line 7790]

    +

    method Curve [line 7795]

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

    method deletePage [line 13579]

    +

    method deletePage [line 13602]

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

    method Ellipse [line 7911]

    +

    method Ellipse [line 7916]

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

    method empty_string [line 13923]

    +

    method empty_string [line 13946]

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

    method formatPageNumber [line 9491]

    +

    method formatPageNumber [line 9496]

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

    method formatTOCPageNumber [line 9503]

    +

    method formatTOCPageNumber [line 9508]

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

    method GetAbsX [line 4852]

    +

    method GetAbsX [line 4857]

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

    method getAliasNbPages [line 9399]

    +

    method getAliasNbPages [line 9404]

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

    method getAliasNumPage [line 9427]

    +

    method getAliasNumPage [line 9432]

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

    method GetArrStringWidth [line 2808]

    +

    method GetArrStringWidth [line 2813]

    @@ -7443,7 +7443,7 @@ $arr)
    -

    method getBarcode [line 10307]

    +

    method getBarcode [line 10312]

    @@ -7471,7 +7471,7 @@ $arr)
    -

    method getBorderMode [line 3801]

    +

    method getBorderMode [line 3806]

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

    method getBuffer [line 13265]

    +

    method getBuffer [line 13288]

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

    method getCellCode [line 3408]

    +

    method getCellCode [line 3413]

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

    method getCellHeightRatio [line 9665]

    +

    method getCellHeightRatio [line 9670]

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

    method GetCharWidth [line 2835]

    +

    method GetCharWidth [line 2840]

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

    method getFontBuffer [line 13425]

    +

    method getFontBuffer [line 13448]

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

    method getFontFamily [line 10783]

    +

    method getFontFamily [line 10788]

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

    method getFontSize [line 10763]

    +

    method getFontSize [line 10768]

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

    method getFontSizePt [line 10773]

    +

    method getFontSizePt [line 10778]

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

    method getFontsList [line 2874]

    +

    method getFontsList [line 2879]

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

    method getFontStyle [line 10793]

    +

    method getFontStyle [line 10798]

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

    method getFooterFont [line 6863]

    +

    method getFooterFont [line 6868]

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

    method getGDgamma [line 4795]

    +

    method getGDgamma [line 4800]

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

    method getGraphicVars [line 13133]

    +

    method getGraphicVars [line 13156]

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

    method getGroupPageNo [line 9440]

    +

    method getGroupPageNo [line 9445]

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

    method getGroupPageNoFormatted [line 9450]

    +

    method getGroupPageNoFormatted [line 9455]

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

    method getHeaderFont [line 6843]

    +

    method getHeaderFont [line 6848]

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

    method getHtmlDomArray [line 10829]

    +

    method getHtmlDomArray [line 10834]

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

    method getHTMLUnitToUnits [line 12852]

    +

    method getHTMLUnitToUnits [line 12875]

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

    method getImageBuffer [line 13367]

    +

    method getImageBuffer [line 13390]

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

    method GetLineWidth [line 7507]

    +

    method GetLineWidth [line 7512]

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

    method getMargins [line 10726]

    +

    method getMargins [line 10731]

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

    method GetNumChars [line 2862]

    +

    method GetNumChars [line 2867]

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

    method getNumLines [line 3880]

    +

    method getNumLines [line 3885]

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

    method getObjFilename [line 13197]

    +

    method getObjFilename [line 13220]

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

    method getOriginalMargins [line 10749]

    +

    method getOriginalMargins [line 10754]

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

    method getPageBuffer [line 13308]

    +

    method getPageBuffer [line 13331]

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

    method getPageGroupAlias [line 9462]

    +

    method getPageGroupAlias [line 9467]

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

    method getPageNumGroupAlias [line 9477]

    +

    method getPageNumGroupAlias [line 9482]

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

    method getPDFData [line 6882]

    +

    method getPDFData [line 6887]

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

    method getRemainingWidth [line 4241]

    +

    method getRemainingWidth [line 4246]

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

    method GetStringWidth [line 2793]

    +

    method GetStringWidth [line 2798]

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

    method GetX [line 4836]

    +

    method GetX [line 4841]

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

    method GetY [line 4863]

    +

    method GetY [line 4868]

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

    method Gradient [line 9865]

    +

    method Gradient [line 9870]

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

    method Image [line 4363]

    +

    method Image [line 4368]

    @@ -9469,7 +9469,7 @@ $fitbox = false])
    -

    method ImageEps [line 10037]

    +

    method ImageEps [line 10042]

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

    method ImagePngAlpha [line 4751]

    +

    method ImagePngAlpha [line 4756]

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

    method IncludeJS [line 9001]

    +

    method IncludeJS [line 9006]

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

    method intToRoman [line 12926]

    +

    method intToRoman [line 12949]

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

    method Line [line 7657]

    +

    method Line [line 7662]

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

    method LinearGradient [line 9722]

    +

    method LinearGradient [line 9727]

    @@ -9934,7 +9934,7 @@ $coords = array(0,0,1,0)])
    -

    method Link [line 3157]

    +

    method Link [line 3162]

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

    method ListBox [line 9129]

    +

    method ListBox [line 9134]

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

    method Ln [line 4808]

    +

    method Ln [line 4813]

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

    method MirrorH [line 7281]

    +

    method MirrorH [line 7286]

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

    method MirrorL [line 7317]

    +

    method MirrorL [line 7322]

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

    method MirrorP [line 7304]

    +

    method MirrorP [line 7309]

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

    method MirrorV [line 7292]

    +

    method MirrorV [line 7297]

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

    method movePage [line 13442]

    +

    method movePage [line 13465]

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

    method MultiCell [line 3643]

    +

    method MultiCell [line 3648]

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

    method objclone [line 13912]

    +

    method objclone [line 13935]

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

    method openHTMLTagHandler [line 12047]

    +

    method openHTMLTagHandler [line 12059]

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

    method Output [line 4955]

    +

    method Output [line 4960]

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

    method PageNo [line 2513]

    +

    method PageNo [line 2518]

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

    method PageNoFormatted [line 9513]

    +

    method PageNoFormatted [line 9518]

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

    method PieSector [line 9959]

    +

    method PieSector [line 9964]

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

    method pixelsToUnits [line 6986]

    +

    method pixelsToUnits [line 6991]

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

    method Polycurve [line 7847]

    +

    method Polycurve [line 7852]

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

    method Polygon [line 8040]

    +

    method Polygon [line 8045]

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

    method putHtmlListBullet [line 12991]

    +

    method putHtmlListBullet [line 13014]

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

    method RadialGradient [line 9740]

    +

    method RadialGradient [line 9745]

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

    method RadioButton [line 9111]

    +

    method RadioButton [line 9116]

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

    method readDiskCache [line 13237]

    +

    method readDiskCache [line 13260]

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

    method Rect [line 7692]

    +

    method Rect [line 7697]

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

    method RegularPolygon [line 8139]

    +

    method RegularPolygon [line 8144]

    @@ -11401,7 +11401,7 @@ $r:)
    -

    method removeSHY [line 3373]

    +

    method removeSHY [line 3378]

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

    method rfread [line 4721]

    +

    method rfread [line 4726]

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

    method rollbackTransaction [line 13889]

    +

    method rollbackTransaction [line 13912]

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

    method Rotate [line 7376]

    +

    method Rotate [line 7381]

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

    method RoundedRect [line 8243]

    +

    method RoundedRect [line 8248]

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

    method Scale [line 7246]

    +

    method Scale [line 7251]

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

    method ScaleX [line 7206]

    +

    method ScaleX [line 7211]

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

    method ScaleXY [line 7232]

    +

    method ScaleXY [line 7237]

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

    method ScaleY [line 7219]

    +

    method ScaleY [line 7224]

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

    method setAlpha [line 9622]

    +

    method setAlpha [line 9627]

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

    method setBarcode [line 10297]

    +

    method setBarcode [line 10302]

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

    method SetBooklet [line 12766]

    +

    method SetBooklet [line 12789]

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

    method setBuffer [line 13247]

    +

    method setBuffer [line 13270]

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

    method setCellHeightRatio [line 9656]

    +

    method setCellHeightRatio [line 9661]

    @@ -12305,7 +12305,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 3107]

    +

    method SetDefaultMonospacedFont [line 3112]

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

    method setDefaultTableColumns [line 9646]

    +

    method setDefaultTableColumns [line 9651]

    @@ -12431,7 +12431,7 @@ $mode = 'UseNone'])
    -

    method SetDrawColor [line 2568]

    +

    method SetDrawColor [line 2573]

    @@ -12491,7 +12491,7 @@ $col4 = -1])
    -

    method SetDrawColorArray [line 2545]

    +

    method SetDrawColorArray [line 2550]

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

    method SetDrawSpotColor [line 2606]

    +

    method SetDrawSpotColor [line 2611]

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

    method setExtGState [line 9591]

    +

    method setExtGState [line 9596]

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

    method SetFillColor [line 2648]

    +

    method SetFillColor [line 2653]

    @@ -12677,7 +12677,7 @@ $col4 = -1])
    -

    method SetFillColorArray [line 2625]

    +

    method SetFillColorArray [line 2630]

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

    method SetFillSpotColor [line 2690]

    +

    method SetFillSpotColor [line 2695]

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

    method SetFont [line 3062]

    +

    method SetFont [line 3067]

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

    method setFontBuffer [line 13383]

    +

    method setFontBuffer [line 13406]

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

    method SetFontSize [line 3082]

    +

    method SetFontSize [line 3087]

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

    method setFontSubBuffer [line 13405]

    +

    method setFontSubBuffer [line 13428]

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

    method setFooterFont [line 6853]

    +

    method setFooterFont [line 6858]

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

    method setGraphicVars [line 13164]

    +

    method setGraphicVars [line 13187]

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

    method setHeaderFont [line 6833]

    +

    method setHeaderFont [line 6838]

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

    method setHtmlLinksStyle [line 12837]

    +

    method setHtmlLinksStyle [line 12860]

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

    method setHtmlVSpace [line 12806]

    +

    method setHtmlVSpace [line 12829]

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

    method setImageBuffer [line 13324]

    +

    method setImageBuffer [line 13347]

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

    method setImageSubBuffer [line 13347]

    +

    method setImageSubBuffer [line 13370]

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

    method setJPEGQuality [line 9633]

    +

    method setJPEGQuality [line 9638]

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

    method setLanguageArray [line 6873]

    +

    method setLanguageArray [line 6878]

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

    method SetLineStyle [line 7532]

    +

    method SetLineStyle [line 7537]

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

    method SetLineWidth [line 7493]

    +

    method SetLineWidth [line 7498]

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

    method SetLink [line 3134]

    +

    method SetLink [line 3139]

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

    method setListIndentWidth [line 12816]

    +

    method setListIndentWidth [line 12839]

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

    method setLIsymbol [line 12726]

    +

    method setLIsymbol [line 12749]

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

    method setOpenCell [line 12826]

    +

    method setOpenCell [line 12849]

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

    method setPageBuffer [line 13281]

    +

    method setPageBuffer [line 13304]

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

    method setPDFVersion [line 9675]

    +

    method setPDFVersion [line 9680]

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

    method SetProtection [line 7149]

    +

    method SetProtection [line 7154]

    @@ -14511,7 +14511,7 @@ $enable)
    -

    method setSignature [line 9347]

    +

    method setSignature [line 9352]

    @@ -14686,7 +14686,7 @@ $mode)
    -

    method SetTextColor [line 2732]

    +

    method SetTextColor [line 2737]

    @@ -14746,7 +14746,7 @@ $col4 = -1])
    -

    method SetTextColorArray [line 2709]

    +

    method SetTextColorArray [line 2714]

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

    method SetTextSpotColor [line 2771]

    +

    method SetTextSpotColor [line 2776]

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

    method setUserRights [line 9321]

    +

    method setUserRights [line 9326]

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

    method setViewerPreferences [line 9705]

    +

    method setViewerPreferences [line 9710]

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

    method setVisibility [line 9543]

    +

    method setVisibility [line 9548]

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

    method SetX [line 4876]

    +

    method SetX [line 4881]

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

    method SetXY [line 4939]

    +

    method SetXY [line 4944]

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

    method SetY [line 4908]

    +

    method SetY [line 4913]

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

    method Skew [line 7436]

    +

    method Skew [line 7441]

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

    method SkewX [line 7409]

    +

    method SkewX [line 7414]

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

    method SkewY [line 7422]

    +

    method SkewY [line 7427]

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

    method StarPolygon [line 8194]

    +

    method StarPolygon [line 8199]

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

    method startPageGroup [line 9372]

    +

    method startPageGroup [line 9377]

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

    method startTransaction [line 13862]

    +

    method startTransaction [line 13885]

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

    method StartTransform [line 7177]

    +

    method StartTransform [line 7182]

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

    method StopTransform [line 7190]

    +

    method StopTransform [line 7195]

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

    method swapMargins [line 12782]

    +

    method swapMargins [line 12805]

    @@ -15695,7 +15695,7 @@ $reverse = true])
    -

    method Text [line 3258]

    +

    method Text [line 3263]

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

    method TextField [line 9098]

    +

    method TextField [line 9103]

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

    method Transform [line 7469]

    +

    method Transform [line 7474]

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

    method Translate [line 7352]

    +

    method Translate [line 7357]

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

    method TranslateX [line 7329]

    +

    method TranslateX [line 7334]

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

    method TranslateY [line 7340]

    +

    method TranslateY [line 7345]

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

    method unhtmlentities [line 6997]

    +

    method unhtmlentities [line 7002]

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

    method UniArrSubString [line 4280]

    +

    method UniArrSubString [line 4285]

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

    method unichr [line 4313]

    +

    method unichr [line 4318]

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

    method UTF8ArrayToUniArray [line 4301]

    +

    method UTF8ArrayToUniArray [line 4306]

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

    method UTF8ArrSubString [line 4257]

    +

    method UTF8ArrSubString [line 4262]

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

    method utf8Bidi [line 8342]

    +

    method utf8Bidi [line 8347]

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

    method UTF8StringToArray [line 6635]

    +

    method UTF8StringToArray [line 6640]

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

    method utf8StrRev [line 8328]

    +

    method utf8StrRev [line 8333]

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

    method UTF8ToLatin1 [line 6742]

    +

    method UTF8ToLatin1 [line 6747]

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

    method UTF8ToUTF16BE [line 6726]

    +

    method UTF8ToUTF16BE [line 6731]

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

    method Write [line 3923]

    +

    method Write [line 3928]

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

    method write1DBarcode [line 10326]

    +

    method write1DBarcode [line 10331]

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

    method write2DBarcode [line 10579]

    +

    method write2DBarcode [line 10584]

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

    method writeBarcode [line 10529]

    +

    method writeBarcode [line 10534]

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

    method writeDiskCache [line 13209]

    +

    method writeDiskCache [line 13232]

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

    method writeHTML [line 11222]

    +

    method writeHTML [line 11234]

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

    method writeHTMLCell [line 10817]

    +

    method writeHTMLCell [line 10822]

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

    method _addfield [line 9063]

    +

    method _addfield [line 9068]

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

    method _beginpage [line 6415]

    +

    method _beginpage [line 6420]

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

    method _datastring [line 6525]

    +

    method _datastring [line 6530]

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

    method _destroy [line 5110]

    +

    method _destroy [line 5115]

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

    method _dochecks [line 5137]

    +

    method _dochecks [line 5142]

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

    method _dolinethrough [line 6490]

    +

    method _dolinethrough [line 6495]

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

    method _dounderline [line 6476]

    +

    method _dounderline [line 6481]

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

    method _enddoc [line 6354]

    +

    method _enddoc [line 6359]

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

    method _endpage [line 6454]

    +

    method _endpage [line 6459]

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

    method _escape [line 6514]

    +

    method _escape [line 6519]

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

    method _escapetext [line 6552]

    +

    method _escapetext [line 6557]

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

    method _freadint [line 6503]

    +

    method _freadint [line 6508]

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

    method _generateencryptionkey [line 7117]

    +

    method _generateencryptionkey [line 7122]

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

    method _getfontpath [line 5153]

    +

    method _getfontpath [line 5158]

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

    method _JScolor [line 9039]

    +

    method _JScolor [line 9044]

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

    method _md5_16 [line 7078]

    +

    method _md5_16 [line 7083]

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

    method _newobj [line 6463]

    +

    method _newobj [line 6468]

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

    method _objectkey [line 7010]

    +

    method _objectkey [line 7015]

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

    method _out [line 6583]

    +

    method _out [line 6588]

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

    method _outarc [line 9939]

    +

    method _outarc [line 9944]

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

    method _outCurve [line 7637]

    +

    method _outCurve [line 7642]

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

    method _outLine [line 7601]

    +

    method _outLine [line 7606]

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

    method _outPoint [line 7587]

    +

    method _outPoint [line 7592]

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

    method _outRect [line 7618]

    +

    method _outRect [line 7623]

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

    method _Ovalue [line 7091]

    +

    method _Ovalue [line 7096]

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

    method _parsejpeg [line 4590]

    +

    method _parsejpeg [line 4595]

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

    method _parsepng [line 4616]

    +

    method _parsepng [line 4621]

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

    method _putannots [line 5309]

    +

    method _putannots [line 5314]

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

    method _putbookmarks [line 8937]

    +

    method _putbookmarks [line 8942]

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

    method _putcatalog [line 6219]

    +

    method _putcatalog [line 6224]

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

    method _putcertification [line 9264]

    +

    method _putcertification [line 9269]

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

    method _putcidfont0 [line 5975]

    +

    method _putcidfont0 [line 5980]

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

    method _putEmbeddedFiles [line 3227]

    +

    method _putEmbeddedFiles [line 3232]

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

    method _putencryption [line 7019]

    +

    method _putencryption [line 7024]

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

    method _putextgstates [line 9601]

    +

    method _putextgstates [line 9606]

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

    method _putfonts [line 5665]

    +

    method _putfonts [line 5670]

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

    method _putfontwidths [line 5792]

    +

    method _putfontwidths [line 5797]

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

    method _putheader [line 6346]

    +

    method _putheader [line 6351]

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

    method _putimages [line 6035]

    +

    method _putimages [line 6040]

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

    method _putinfo [line 6192]

    +

    method _putinfo [line 6197]

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

    method _putjavascript [line 9011]

    +

    method _putjavascript [line 9016]

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

    method _putocg [line 9522]

    +

    method _putocg [line 9527]

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

    method _putpages [line 5164]

    +

    method _putpages [line 5169]

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

    method _putresourcedict [line 6118]

    +

    method _putresourcedict [line 6123]

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

    method _putresources [line 6159]

    +

    method _putresources [line 6164]

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

    method _putshaders [line 9889]

    +

    method _putshaders [line 9894]

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

    method _putspotcolors [line 6090]

    +

    method _putspotcolors [line 6095]

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

    method _putstream [line 6569]

    +

    method _putstream [line 6574]

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

    method _puttrailer [line 6332]

    +

    method _puttrailer [line 6337]

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

    method _puttruetypeunicode [line 5890]

    +

    method _puttruetypeunicode [line 5895]

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

    method _putuserrights [line 9214]

    +

    method _putuserrights [line 9219]

    diff --git a/tcpdf.php b/tcpdf.php index c3b7161..d2fe9fd 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-05-28 +// Last Update : 2009-06-04 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.6.013 +// Version : 4.6.014 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -126,7 +126,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.6.013 + * @version 4.6.014 */ /** @@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.6.013 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.6.014 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
    * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
    * @name TCPDF * @package com.tecnick.tcpdf - * @version 4.6.013 + * @version 4.6.014 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -1239,11 +1239,11 @@ if (!class_exists('TCPDF', false)) { protected $thead = ''; /** - * Distance between the top of page and end of table headers on a new page. + * Margins used for table header. * @access protected * @since 4.5.030 (2009-03-20) */ - protected $theadMargin = ''; + protected $theadMargins = array(); /** * Cache array for UTF8StringToArray() method. @@ -2485,21 +2485,26 @@ if (!class_exists('TCPDF', false)) { * @since 4.5.030 (2009-03-25) */ protected function setTableHeader() { - if (!$this->empty_string($this->theadMargin)) { + if (isset($this->theadMargins['top'])) { // restore the original top-margin - $this->tMargin = $this->theadMargin; - $this->pagedim[$this->page]['tm'] = $this->theadMargin; - $this->y = $this->theadMargin; + $this->tMargin = $this->theadMargins['top']; + $this->pagedim[$this->page]['tm'] = $this->tMargin; + $this->y = $this->tMargin; } - if (!$this->empty_string($this->thead)) { + if (!$this->empty_string($this->thead)) { + // set margins + $this->lMargin = $this->pagedim[$this->page]['olm']; + $this->rMargin = $this->pagedim[$this->page]['orm']; + $this->cMargin = $this->theadMargins['cmargin']; // print table header $this->writeHTML($this->thead, false, false, false, false, ''); // set new top margin to skip the table headers - if (!isset($this->theadMargin) OR ($this->empty_string($this->theadMargin))) { - $this->theadMargin = $this->tMargin; + if (!isset($this->theadMargins['top'])) { + $this->theadMargins['top'] = $this->tMargin; } $this->tMargin = $this->y; $this->pagedim[$this->page]['tm'] = $this->tMargin; + $this->lasth = 0; } } @@ -3964,7 +3969,7 @@ if (!class_exists('TCPDF', false)) { } // max column width $wmax = $w - (2 * $this->cMargin); - if ($chrwidth > $wmax) { + if (($chrwidth > $wmax) OR ($this->GetCharWidth($chars[0]) > $wmax)) { // a single character do not fit on column return ''; } @@ -10828,16 +10833,23 @@ if (!class_exists('TCPDF', false)) { */ protected function getHtmlDomArray($html) { // remove all unsupported tags (the line below lists all supported tags) - $html = strip_tags($html, '



  • diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 413cec8..3b4c102 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    @@ -18938,7 +18938,7 @@ $font)
    -

    method _putviewerpreferences [line 6262]

    +

    method _putviewerpreferences [line 6267]

    diff --git a/doc/index.html b/doc/index.html index 413cec8..3b4c102 100644 --- a/doc/index.html +++ b/doc/index.html @@ -58,7 +58,7 @@ This documentation was generated by phpDocumentor v1.4.1

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/errors.html b/doc/errors.html index ab5d51d..e8129e2 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

    - Documentation generated on Thu, 28 May 2009 19:14:15 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:45 +0200 by phpDocumentor 1.4.1
    @@ -18969,7 +18969,7 @@ $font)
    -

    method _putxobjectdict [line 6107]

    +

    method _putxobjectdict [line 6112]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 2d5f794..46eb13d 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1238,8 +1238,8 @@
    in file tcpdf.php, variable TCPDF::$TextColor
    $thead
    in file tcpdf.php, variable TCPDF::$thead
        Table header content to be repeated on each new page
    -
    $theadMargin
    -
    in file tcpdf.php, variable TCPDF::$theadMargin
        Distance between the top of page and end of table headers on a new page.
    +
    $theadMargins
    +
    in file tcpdf.php, variable TCPDF::$theadMargins
        Margins used for table header.
    $title
    in file tcpdf.php, variable TCPDF::$title
    $tMargin
    @@ -1387,7 +1387,7 @@ top

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:38 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/elementindex.html b/doc/elementindex.html index aad08d6..35035bf 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1087,8 +1087,8 @@
    in file tcpdf.php, variable TCPDF::$TextColor
    $thead
    in file tcpdf.php, variable TCPDF::$thead
        Table header content to be repeated on each new page
    -
    $theadMargin
    -
    in file tcpdf.php, variable TCPDF::$theadMargin
        Distance between the top of page and end of table headers on a new page.
    +
    $theadMargins
    +
    in file tcpdf.php, variable TCPDF::$theadMargins
        Margins used for table header.
    $title
    in file tcpdf.php, variable TCPDF::$title
    $tMargin
    @@ -1364,7 +1364,7 @@ top

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    @@ -18994,7 +18994,7 @@ $font)
    -

    method _RC4 [line 7038]

    +

    method _RC4 [line 7043]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 04bd2c4..5a6f9dc 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.




    - Documentation generated on Thu, 28 May 2009 19:14:15 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:45 +0200 by phpDocumentor 1.4.1
    @@ -19045,7 +19045,7 @@ $text)
    -

    method _textstring [line 6538]

    +

    method _textstring [line 6543]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 442d243..2ad7ae6 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 4e0143a..4c130b8 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.




    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    @@ -19084,7 +19084,7 @@ $s)
    -

    method _toJPEG [line 4574]

    +

    method _toJPEG [line 4579]

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




    - Documentation generated on Thu, 28 May 2009 19:14:15 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:45 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 943574a..2482da8 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    @@ -19126,7 +19126,7 @@ $file)
    -

    method _Uvalue [line 7104]

    +

    method _Uvalue [line 7109]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index c8904cb..95672bc 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    @@ -19163,7 +19163,7 @@ $file)

    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
    author:  Nicola Asuni
    version:  4.6.013version:  4.6.014
    copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
    - PDF_PRODUCER = 'TCPDF 4.6.013 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.6.014 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data


    - Documentation generated on Thu, 28 May 2009 19:14:09 +0200 by phpDocumentor 1.4.1 + Documentation generated on Thu, 04 Jun 2009 14:29:39 +0200 by phpDocumentor 1.4.1
      '); //replace some blank characters $html = preg_replace('/
      ]*)>[\n\r\t]+/', '<\\1\\2>', $html);
       			$html = preg_replace('@(\r\n|\r)@', "\n", $html);
       			$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
       			$html = strtr($html, $repTable);
      -			while (preg_match("']*)>(.*?)\n(.*?)
      'si", $html)) { - // preserve newlines on
       tag
      -				$html = preg_replace("']*)>(.*?)\n(.*?)
      'si", "\\2
      \\3", $html); + $offset = 0; + while (($offset < strlen($html)) AND ($pos = strpos($html, '', $offset)) !== false) { + $html_a = substr($html, 0, $offset); + $html_b = substr($html, $offset, ($pos - $offset + 6)); + while (preg_match("']*)>(.*?)\n(.*?)'si", $html_b)) { + // preserve newlines on
       tag
      +					$html_b = preg_replace("']*)>(.*?)\n(.*?)
      'si", "\\2
      \\3", $html_b); + } + $html = $html_a.$html_b.substr($html, $pos + 6); + $offset = strlen($html_a.$html_b); } $html = str_replace("\n", ' ', $html); // remove extra spaces from code @@ -10935,7 +10947,7 @@ if (!class_exists('TCPDF', false)) { } } if (($dom[$key]['value'] == 'table') AND (!$this->empty_string($dom[($dom[$key]['parent'])]['thead']))) { - $dom[($dom[$key]['parent'])]['thead'] .= '
    '; + $dom[($dom[$key]['parent'])]['thead'] .= ''; } } else { // opening html tag @@ -12063,7 +12075,11 @@ if (!class_exists('TCPDF', false)) { if (!$this->empty_string($dom[$key]['thead'])) { // set table header $this->thead = $dom[$key]['thead']; - } + if (!isset($this->theadMargins) OR (empty($this->theadMargins))) { + $this->theadMargins = array(); + $this->theadMargins['cmargin'] = $this->cMargin; + } + } if (isset($tag['attribute']['cellpadding'])) { $cp = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px'); $this->oldcMargin = $this->cMargin; @@ -12373,7 +12389,8 @@ if (!class_exists('TCPDF', false)) { protected function closeHTMLTagHandler(&$dom, $key, $cell=false) { $tag = $dom[$key]; $parent = $dom[($dom[$key]['parent'])]; - $firstorlast = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker'))); + $firstorlast = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker'))); + $in_table_head = false; //Closing tag switch($tag['value']) { case 'tr': { @@ -12433,7 +12450,10 @@ if (!class_exists('TCPDF', false)) { } } break; - } + } + case 'tablehead': + // closing tag used for the thead part + $in_table_head = true; case 'table': { // draw borders $table_el = $parent; @@ -12576,18 +12596,21 @@ if (!class_exists('TCPDF', false)) { } } } - if (isset($parent['cellpadding'])) { - $this->cMargin = $this->oldcMargin; - } - $this->lasth = $this->FontSize * $this->cell_height_ratio; - if (!$this->empty_string($this->theadMargin)) { - // restore top margin - $this->tMargin = $this->theadMargin; - $this->pagedim[$this->page]['tm'] = $this->theadMargin; - } - // reset table header - $this->thead = ''; - $this->theadMargin = ''; + if (!$in_table_head) { + // we are not inside a thead section + if (isset($parent['cellpadding'])) { + $this->cMargin = $this->oldcMargin; + } + $this->lasth = $this->FontSize * $this->cell_height_ratio; + if (!empty($this->theadMargins)) { + // restore top margin + $this->tMargin = $this->theadMargins['top']; + $this->pagedim[$this->page]['tm'] = $this->tMargin; + } + // reset table header + $this->thead = ''; + $this->theadMargins = array(); + } break; } case 'a': {