From 8f408ddb563656e318d6d14940496f199152999f Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 6 Apr 2010 19:43:49 +0200 Subject: [PATCH] 4.9.010 --- CHANGELOG.TXT | 5 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 632 ++++++++++-------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.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/_qrcode.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 +- examples/index.php | 1 + tcpdf.php | 268 +++++--- 21 files changed, 551 insertions(+), 395 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 2c93ebe..a0a025f 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +4.9.010 (2010-04-06) + - Signature of Cell() method now includes a new parameters for vertical alignment (see example n. 57). + - Text() method was extended to include all Cell() parameters. + - HTML line alignment procedure was changed to fix some bugs. + 4.9.009 (2010-04-05) - Text() method was fixed for backward compatibility. diff --git a/README.TXT b/README.TXT index 98d9e3e..2be6c4d 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.9.009 -Release date: 2010-04-05 +Version: 4.9.010 +Release date: 2010-04-06 Author: Nicola Asuni Copyright (c) 2001-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 8c5af5c..67b6ca0 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -55,7 +55,7 @@
- Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index b0c6c81..212bc77 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5548,7 +5548,7 @@ $frame)
- Documentation generated on Mon, 05 Apr 2010 20:45:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index a2d5f1a..f5d6a22 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -80,7 +80,7 @@ Source Location: /tcpdf.php

Version:

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

method AcceptPageBreak [line 3755]

+

method AcceptPageBreak [line 3764]

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

method addExtGState [line 11765]

+

method addExtGState [line 11823]

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

method addHtmlLink [line 8117]

+

method addHtmlLink [line 8175]

@@ -6579,18 +6579,16 @@ $firstblock = false])
-

method addHTMLVertSpace [line 15908]

+

method addHTMLVertSpace [line 16000]

void addHTMLVertSpace( -int -$n, [boolean -$cell = false], [string -$h = ''], [boolean -$firstorlast = false], [string -$tag = ''], [boolean -$closing = false]) +[string +$hbz = 0], [string +$hb = 0], [boolean +$cell = false], [boolean +$firstorlast = false])

@@ -6610,34 +6608,24 @@ $closing = false])
- - - + + + + + + + + - - - - - - - - - - - - - - -
int  $n  number of spaces to addstring  $hbz  Distance between current y and line bottom.
string  $hb  The height of the break.
boolean   $cell   if true add the default cMargin space to each new line (default false).
string  $h  The height of the break. By default, the value equals the height of the last printed cell.
boolean   $firstorlast   if true do not print additional empty lines.
string  $tag  HTML tag to which this space will be applied
boolean  $closing  true if this space will be applied to a closing tag, false otherwise

@@ -6645,7 +6633,7 @@ $closing = false])
-

method addJavascriptObject [line 10385]

+

method addJavascriptObject [line 10443]

@@ -6847,7 +6835,7 @@ $k)
-

method addTOC [line 16935]

+

method addTOC [line 17019]

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

method AliasNbPages [line 11573]

+

method AliasNbPages [line 11631]

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

method AliasNumPage [line 11600]

+

method AliasNumPage [line 11658]

@@ -7066,7 +7054,7 @@ $spaces = 0])
-

method Arrow [line 9610]

+

method Arrow [line 9668]

@@ -7144,7 +7132,7 @@ $arm_angle = 15])
-

method arrUTF8ToUTF16BE [line 8014]

+

method arrUTF8ToUTF16BE [line 8072]

@@ -7219,7 +7207,7 @@ $setbom = true])
-

method Bookmark [line 10271]

+

method Bookmark [line 10329]

@@ -7279,7 +7267,7 @@ $page = ''])
-

method Button [line 11279]

+

method Button [line 11337]

+ + + + + + + + + +
@@ -7375,7 +7363,7 @@ $js = false])
-

method Cell [line 3830]

+

method Cell [line 3841]

@@ -7390,7 +7378,9 @@ $align = ''], [int $fill = 0], [mixed $link = ''], [int $stretch = 0], [boolean -$ignore_min_height = false]) +$ignore_min_height = false], [string +$calign = 'T'], [string +$valign = 'M'])

@@ -7464,6 +7454,16 @@ $ignore_min_height = false])
boolean   $ignore_min_height   if true ignore automatic minimum height value.
string  $calign  cell vertical alignment relative to the specified Y value. Possible values are:
  • T : cell top
  • A : font top
  • L : font baseline
  • D : font bottom
  • B : cell bottom
string  $valign  text vertical alignment inside the cell. Possible values are:
  • T : top
  • C : center
  • B : bottom

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

method CheckBox [line 11209]

+

method CheckBox [line 11267]

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

method checkPageBreak [line 3782]

+

method checkPageBreak [line 3791]

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

method Circle [line 9244]

+

method Circle [line 9302]

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

method Clip [line 12220]

+

method Clip [line 12278]

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

method closeHTMLTagHandler [line 15532]

+

method closeHTMLTagHandler [line 15610]

@@ -7871,7 +7871,7 @@ $minstartliney)
-

method colorRegistrationBar [line 11901]

+

method colorRegistrationBar [line 11959]

@@ -7949,7 +7949,7 @@ $colors = 'A,R,G,B,C,M,Y,K'])
-

method ComboBox [line 11148]

+

method ComboBox [line 11206]

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

method commitTransaction [line 17094]

+

method commitTransaction [line 17178]

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

method convertHTMLColorToDec [line 8150]

+

method convertHTMLColorToDec [line 8208]

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

method CoonsPatchMesh [line 12140]

+

method CoonsPatchMesh [line 12198]

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

method cropMark [line 11999]

+

method cropMark [line 12057]

@@ -8280,7 +8280,7 @@ $color = array(0,0,0)])
-

method Curve [line 9019]

+

method Curve [line 9077]

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

method deletePage [line 16793]

+

method deletePage [line 16877]

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

method Ellipse [line 9140]

+

method Ellipse [line 9198]

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

method empty_string [line 17148]

+

method empty_string [line 17232]

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

method formatPageNumber [line 11677]

+

method formatPageNumber [line 11735]

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

method formatTOCPageNumber [line 11689]

+

method formatTOCPageNumber [line 11747]

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

method GetAbsX [line 5513]

+

method GetAbsX [line 5571]

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

method getAliasNbPages [line 11585]

+

method getAliasNbPages [line 11643]

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

method getAliasNumPage [line 11613]

+

method getAliasNumPage [line 11671]

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

method getAnnotOptFromJSProp [line 10516]

+

method getAnnotOptFromJSProp [line 10574]

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

method getBarcode [line 12719]

+

method getBarcode [line 12777]

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

method getBorderMode [line 4348]

+

method getBorderMode [line 4406]

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

method getBuffer [line 16479]

+

method getBuffer [line 16563]

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

method getCellCode [line 3883]

+

method getCellCode [line 3896]

@@ -9136,7 +9136,9 @@ $align = ''], [int $fill = 0], [mixed $link = ''], [int $stretch = 0], [boolean -$ignore_min_height = false]) +$ignore_min_height = false], [string +$calign = 'T'], [string +$valign = 'M'])

@@ -9210,6 +9212,16 @@ $ignore_min_height = false])
boolean   $ignore_min_height   if true ignore automatic minimum height value.
string  $calign  cell vertical alignment relative to the specified Y value. Possible values are:
  • T : cell top
  • A : font top
  • L : font baseline
  • D : font bottom
  • B : cell bottom
string  $valign  text vertical alignment inside the cell. Possible values are:
  • T : top
  • C : center
  • B : bottom

@@ -9217,7 +9229,7 @@ $ignore_min_height = false])
-

method getCellHeightRatio [line 11861]

+

method getCellHeightRatio [line 11919]

@@ -9344,7 +9356,7 @@ $size = 0])
-

method getFontBuffer [line 16639]

+

method getFontBuffer [line 16723]

@@ -9440,7 +9452,7 @@ $size = 0])
-

method getFontFamily [line 13205]

+

method getFontFamily [line 13263]

@@ -9471,7 +9483,7 @@ $size = 0])
-

method getFontSize [line 13185]

+

method getFontSize [line 13243]

@@ -9502,7 +9514,7 @@ $size = 0])
-

method getFontSizePt [line 13195]

+

method getFontSizePt [line 13253]

@@ -9561,7 +9573,7 @@ $size = 0])
-

method getFontStyle [line 13215]

+

method getFontStyle [line 13273]

@@ -9592,7 +9604,7 @@ $size = 0])
-

method getFooterFont [line 8075]

+

method getFooterFont [line 8133]

@@ -9648,7 +9660,7 @@ $size = 0])
-

method getFormDefaultProp [line 10891]

+

method getFormDefaultProp [line 10949]

@@ -9682,7 +9694,7 @@ $size = 0])
-

method getGDgamma [line 5453]

+

method getGDgamma [line 5511]

@@ -9721,7 +9733,7 @@ $v)
-

method getGraphicVars [line 16343]

+

method getGraphicVars [line 16427]

@@ -9752,7 +9764,7 @@ $v)
-

method getGroupPageNo [line 11626]

+

method getGroupPageNo [line 11684]

@@ -9783,7 +9795,7 @@ $v)
-

method getGroupPageNoFormatted [line 11636]

+

method getGroupPageNoFormatted [line 11694]

@@ -9842,7 +9854,7 @@ $v)
-

method getHeaderFont [line 8055]

+

method getHeaderFont [line 8113]

@@ -9898,7 +9910,7 @@ $v)
-

method getHtmlDomArray [line 13251]

+

method getHtmlDomArray [line 13309]

@@ -9937,7 +9949,7 @@ $html)
-

method getHTMLUnitToUnits [line 16062]

+

method getHTMLUnitToUnits [line 16146]

@@ -10003,7 +10015,7 @@ $point)
-

method getImageBuffer [line 16581]

+

method getImageBuffer [line 16665]

@@ -10045,7 +10057,7 @@ $image)
-

method getImageFileType [line 4918]

+

method getImageFileType [line 4976]

@@ -10202,7 +10214,7 @@ $imgfile)
-

method GetLineWidth [line 8733]

+

method GetLineWidth [line 8791]

@@ -10236,7 +10248,7 @@ $imgfile)
-

method getMargins [line 13148]

+

method getMargins [line 13206]

@@ -10309,7 +10321,7 @@ $s)
-

method getNumLines [line 4436]

+

method getNumLines [line 4494]

@@ -10396,7 +10408,7 @@ $w = 0])
-

method getObjFilename [line 16411]

+

method getObjFilename [line 16495]

@@ -10441,7 +10453,7 @@ $prefix)
-

method getOriginalMargins [line 13171]

+

method getOriginalMargins [line 13229]

@@ -10506,7 +10518,7 @@ $prefix)
-

method getPageBuffer [line 16522]

+

method getPageBuffer [line 16606]

@@ -10593,7 +10605,7 @@ $pagenum = ''])
-

method getPageGroupAlias [line 11648]

+

method getPageGroupAlias [line 11706]

@@ -10672,7 +10684,7 @@ $pagenum = ''])
-

method getPageNumGroupAlias [line 11663]

+

method getPageNumGroupAlias [line 11721]

@@ -10751,7 +10763,7 @@ $pagenum = ''])
-

method getPDFData [line 8098]

+

method getPDFData [line 8156]

@@ -10776,7 +10788,7 @@ $pagenum = ''])
-

method getRemainingWidth [line 4820]

+

method getRemainingWidth [line 4878]

@@ -10866,7 +10878,7 @@ $pagenum = ''])
-

method getSpaceString [line 13789]

+

method getSpaceString [line 13847]

@@ -10966,7 +10978,7 @@ $getarray = false])
-

method GetX [line 5497]

+

method GetX [line 5555]

@@ -10997,7 +11009,7 @@ $getarray = false])
-

method GetY [line 5524]

+

method GetY [line 5582]

@@ -11028,7 +11040,7 @@ $getarray = false])
-

method get_mqr [line 5213]

+

method get_mqr [line 5271]

@@ -11059,7 +11071,7 @@ $getarray = false])
-

method Gradient [line 12243]

+

method Gradient [line 12301]

@@ -11144,7 +11156,7 @@ $coords)
-

method Image [line 4961]

+

method Image [line 5019]

@@ -11276,7 +11288,7 @@ $hidden = false])
-

method ImageEps [line 12430]

+

method ImageEps [line 12488]

@@ -11372,7 +11384,7 @@ $border = 0])
-

method ImagePngAlpha [line 5409]

+

method ImagePngAlpha [line 5467]

@@ -11477,7 +11489,7 @@ $palign = ''])
-

method IncludeJS [line 10372]

+

method IncludeJS [line 10430]

@@ -11519,7 +11531,7 @@ $script)
-

method intToRoman [line 16136]

+

method intToRoman [line 16220]

@@ -11631,7 +11643,7 @@ $resetmargins = false])
-

method Line [line 8886]

+

method Line [line 8944]

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

method LinearGradient [line 12100]

+

method LinearGradient [line 12158]

@@ -11847,7 +11859,7 @@ $spaces = 0])
-

method ListBox [line 11088]

+

method ListBox [line 11146]

@@ -11937,7 +11949,7 @@ $js = false])
-

method Ln [line 5466]

+

method Ln [line 5524]

@@ -11985,7 +11997,7 @@ $cell = false])
-

method MirrorH [line 8505]

+

method MirrorH [line 8563]

@@ -12027,7 +12039,7 @@ $x = ''])
-

method MirrorL [line 8541]

+

method MirrorL [line 8599]

@@ -12081,7 +12093,7 @@ $y = ''])
-

method MirrorP [line 8528]

+

method MirrorP [line 8586]

@@ -12129,7 +12141,7 @@ $y = ''])
-

method MirrorV [line 8516]

+

method MirrorV [line 8574]

@@ -12171,7 +12183,7 @@ $y = ''])
-

method movePage [line 16656]

+

method movePage [line 16740]

@@ -12219,7 +12231,7 @@ $topage)
-

method MultiCell [line 4189]

+

method MultiCell [line 4247]

@@ -12345,7 +12357,7 @@ $maxh = 0])
-

method objclone [line 17137]

+

method objclone [line 17221]

@@ -12418,7 +12430,7 @@ $object)
-

method openHTMLTagHandler [line 14950]

+

method openHTMLTagHandler [line 15010]

@@ -12484,7 +12496,7 @@ $maxbottomliney)
-

method Output [line 5616]

+

method Output [line 5674]

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

method PageNoFormatted [line 11699]

+

method PageNoFormatted [line 11757]

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

method PieSector [line 12352]

+

method PieSector [line 12410]

@@ -12699,7 +12711,7 @@ $o:)
-

method pixelsToUnits [line 8207]

+

method pixelsToUnits [line 8265]

@@ -12741,7 +12753,7 @@ $px)
-

method Polycurve [line 9076]

+

method Polycurve [line 9134]

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

method Polygon [line 9296]

+

method Polygon [line 9354]

@@ -12876,7 +12888,7 @@ $closed = true])
-

method PolyLine [line 9270]

+

method PolyLine [line 9328]

@@ -12939,7 +12951,7 @@ $closed)
-

method putHtmlListBullet [line 16201]

+

method putHtmlListBullet [line 16285]

@@ -12990,7 +13002,7 @@ $size = 10])
-

method RadialGradient [line 12118]

+

method RadialGradient [line 12176]

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

method RadioButton [line 11000]

+

method RadioButton [line 11058]

@@ -13158,7 +13170,7 @@ $js = false])
-

method readDiskCache [line 16451]

+

method readDiskCache [line 16535]

@@ -13206,7 +13218,7 @@ $file)
-

method Rect [line 8921]

+

method Rect [line 8979]

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

method registrationMark [line 12069]

+

method registrationMark [line 12127]

@@ -13356,7 +13368,7 @@ $colb = array(255,255,255)])
-

method RegularPolygon [line 9421]

+

method RegularPolygon [line 9479]

@@ -13467,7 +13479,7 @@ $r:)
-

method removeSHY [line 3848]

+

method removeSHY [line 3859]

@@ -13509,7 +13521,7 @@ $txt = ''])
-

method revstrpos [line 17161]

+

method revstrpos [line 17245]

@@ -13563,7 +13575,7 @@ $offset = 0])
-

method rfread [line 5379]

+

method rfread [line 5437]

@@ -13614,7 +13626,7 @@ $length)
-

method rollbackTransaction [line 17108]

+

method rollbackTransaction [line 17192]

@@ -13656,7 +13668,7 @@ $self = false])
-

method Rotate [line 8600]

+

method Rotate [line 8658]

@@ -13710,7 +13722,7 @@ $y = ''])
-

method RoundedRect [line 9525]

+

method RoundedRect [line 9583]

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

method Scale [line 8470]

+

method Scale [line 8528]

@@ -13857,7 +13869,7 @@ $y = ''])
-

method ScaleX [line 8430]

+

method ScaleX [line 8488]

@@ -13911,7 +13923,7 @@ $y = ''])
-

method ScaleXY [line 8456]

+

method ScaleXY [line 8514]

@@ -13965,7 +13977,7 @@ $y = ''])
-

method ScaleY [line 8443]

+

method ScaleY [line 8501]

@@ -14019,7 +14031,7 @@ $y = ''])
-

method selectColumn [line 17223]

+

method selectColumn [line 17307]

@@ -14058,7 +14070,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 17270]

+

method serializeTCPDFtagParameters [line 17354]

@@ -14100,7 +14112,7 @@ $pararray)
-

method setAlpha [line 11818]

+

method setAlpha [line 11876]

@@ -14235,7 +14247,7 @@ $margin = 0])
-

method setBarcode [line 12709]

+

method setBarcode [line 12767]

@@ -14271,7 +14283,7 @@ $bc = ''])
-

method SetBooklet [line 15976]

+

method SetBooklet [line 16060]

@@ -14322,7 +14334,7 @@ $outer = -1])
-

method setBuffer [line 16461]

+

method setBuffer [line 16545]

@@ -14361,7 +14373,7 @@ $data)
-

method setCellHeightRatio [line 11852]

+

method setCellHeightRatio [line 11910]

@@ -14442,7 +14454,7 @@ $pad)
-

method setColumnsArray [line 17210]

+

method setColumnsArray [line 17294]

@@ -14640,7 +14652,7 @@ $font)
-

method setDefaultTableColumns [line 11842]

+

method setDefaultTableColumns [line 11900]

@@ -14880,7 +14892,7 @@ $tint = 100])
-

method setEqualColumns [line 17178]

+

method setEqualColumns [line 17262]

@@ -14931,7 +14943,7 @@ $y = ''])
-

method setExtGState [line 11784]

+

method setExtGState [line 11842]

@@ -15180,7 +15192,7 @@ $fontfile = ''])
-

method setFontBuffer [line 16597]

+

method setFontBuffer [line 16681]

@@ -15267,7 +15279,7 @@ $size)
-

method setFontSubBuffer [line 16619]

+

method setFontSubBuffer [line 16703]

@@ -15346,7 +15358,7 @@ $data)
-

method setFooterFont [line 8065]

+

method setFooterFont [line 8123]

@@ -15421,7 +15433,7 @@ $fm = 10])
-

method setFormDefaultProp [line 10880]

+

method setFormDefaultProp [line 10938]

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

method setGraphicVars [line 16376]

+

method setGraphicVars [line 16460]

@@ -15584,7 +15596,7 @@ $hs = ''])
-

method setHeaderFont [line 8045]

+

method setHeaderFont [line 8103]

@@ -15659,7 +15671,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 16047]

+

method setHtmlLinksStyle [line 16131]

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

method setHtmlVSpace [line 16016]

+

method setHtmlVSpace [line 16100]

@@ -15743,7 +15755,7 @@ $tagvs)
-

method setImageBuffer [line 16538]

+

method setImageBuffer [line 16622]

@@ -15830,7 +15842,7 @@ $scale)
-

method setImageSubBuffer [line 16561]

+

method setImageSubBuffer [line 16645]

@@ -15881,7 +15893,7 @@ $data)
-

method setJPEGQuality [line 11829]

+

method setJPEGQuality [line 11887]

@@ -15962,7 +15974,7 @@ $keywords)
-

method setLanguageArray [line 8085]

+

method setLanguageArray [line 8143]

@@ -16085,7 +16097,7 @@ $margin)
-

method SetLineStyle [line 8758]

+

method SetLineStyle [line 8816]

@@ -16131,7 +16143,7 @@ $style)
-

method SetLineWidth [line 8717]

+

method SetLineWidth [line 8775]

@@ -16227,7 +16239,7 @@ $page = -1])
-

method setListIndentWidth [line 16026]

+

method setListIndentWidth [line 16110]

@@ -16266,7 +16278,7 @@ $width)
-

method setLIsymbol [line 15937]

+

method setLIsymbol [line 16021]

@@ -16365,7 +16377,7 @@ $keepmargins = false])
-

method setOpenCell [line 16036]

+

method setOpenCell [line 16120]

@@ -16452,7 +16464,7 @@ $resetmargins = false])
-

method setPageBuffer [line 16495]

+

method setPageBuffer [line 16579]

@@ -16666,7 +16678,7 @@ $unit)
-

method setPDFVersion [line 11871]

+

method setPDFVersion [line 11929]

@@ -16783,7 +16795,7 @@ $val = true])
-

method SetProtection [line 8370]

+

method SetProtection [line 8428]

@@ -16924,7 +16936,7 @@ $resetx = true])
-

method setSignature [line 11530]

+

method setSignature [line 11588]

@@ -17246,7 +17258,7 @@ $color)
-

method setTextRenderingMode [line 17282]

+

method setTextRenderingMode [line 17366]

@@ -17429,7 +17441,7 @@ $margin)
-

method setUserRights [line 11500]

+

method setUserRights [line 11558]

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

method setViewerPreferences [line 11884]

+

method setViewerPreferences [line 11942]

@@ -17537,7 +17549,7 @@ $preferences)
-

method setVisibility [line 11729]

+

method setVisibility [line 11787]

@@ -17576,7 +17588,7 @@ $v)
-

method SetX [line 5537]

+

method SetX [line 5595]

@@ -17618,7 +17630,7 @@ $x)
-

method SetXY [line 5600]

+

method SetXY [line 5658]

@@ -17666,7 +17678,7 @@ $y)
-

method SetY [line 5569]

+

method SetY [line 5627]

@@ -17714,7 +17726,7 @@ $resetx = true])
-

method set_mqr [line 5198]

+

method set_mqr [line 5256]

@@ -17753,7 +17765,7 @@ $mqr)
-

method Skew [line 8660]

+

method Skew [line 8718]

@@ -17813,7 +17825,7 @@ $y = ''])
-

method SkewX [line 8633]

+

method SkewX [line 8691]

@@ -17867,7 +17879,7 @@ $y = ''])
-

method SkewY [line 8646]

+

method SkewY [line 8704]

@@ -17921,7 +17933,7 @@ $y = ''])
-

method StarPolygon [line 9476]

+

method StarPolygon [line 9534]

@@ -18093,7 +18105,7 @@ $format = ''])
-

method startPageGroup [line 11558]

+

method startPageGroup [line 11616]

@@ -18132,7 +18144,7 @@ $page = ''])
-

method startTransaction [line 17077]

+

method startTransaction [line 17161]

@@ -18160,7 +18172,7 @@ $page = ''])
-

method StartTransform [line 8398]

+

method StartTransform [line 8456]

@@ -18191,7 +18203,7 @@ $page = ''])
-

method StopTransform [line 8413]

+

method StopTransform [line 8471]

@@ -18222,7 +18234,7 @@ $page = ''])
-

method swapMargins [line 15992]

+

method swapMargins [line 16076]

- + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -18261,7 +18273,7 @@ $reverse = true])
-

method Text [line 3735]

+

method Text [line 3744]

@@ -18270,9 +18282,18 @@ float $x, float $y, string $txt, [int -$stroke = false], [boolean -$clip = false], [boolean -$fill = true]) +$fstroke = false], [boolean +$fclip = false], [boolean +$ffill = true], [mixed +$border = 0], [int +$ln = 0], [string +$align = ''], [int +$fill = 0], [mixed +$link = ''], [int +$stretch = 0], [boolean +$ignore_min_height = false], [string +$calign = 'T'], [string +$valign = 'M'])

@@ -18314,18 +18335,63 @@ $fill = true])
int  $stroke  $fstroke   outline size in user units (false = disable)
boolean  $clip  $fclip   if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
boolean  $fill  $ffill   if true fills the text
mixed  $border  Indicates if borders must be drawn around the cell. The value can be either a number:
  • 0: no border (default)
  • 1: frame
or a string containing some or all of the following characters (in any order):
  • L: left
  • T: top
  • R: right
  • B: bottom
int  $ln  Indicates where the current position should go after the call. Possible values are:
  • 0: to the right (or left for RTL languages)
  • 1: to the beginning of the next line
  • 2: below
Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
string  $align  Allows to center or align the text. Possible values are:
  • L or empty string: left align (default value)
  • C: center
  • R: right align
  • J: justify
int  $fill  Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
mixed  $link  URL or identifier returned by AddLink().
int  $stretch  stretch carachter mode:
  • 0 = disabled
  • 1 = horizontal scaling only if necessary
  • 2 = forced horizontal scaling
  • 3 = character spacing only if necessary
  • 4 = forced character spacing
boolean  $ignore_min_height  if true ignore automatic minimum height value.
string  $calign  cell vertical alignment relative to the specified Y value. Possible values are:
  • T : cell top
  • A : font top
  • L : font baseline
  • D : font bottom
  • B : cell bottom
string  $valign  text vertical alignment inside the cell. Possible values are:
  • T : top
  • C : center
  • B : bottom

@@ -18333,7 +18399,7 @@ $fill = true])
-

method TextField [line 10909]

+

method TextField [line 10967]

@@ -18417,7 +18483,7 @@ $js = false])
-

method Transform [line 8693]

+

method Transform [line 8751]

@@ -18459,7 +18525,7 @@ $tm)
-

method Translate [line 8576]

+

method Translate [line 8634]

@@ -18507,7 +18573,7 @@ $t_y)
-

method TranslateX [line 8553]

+

method TranslateX [line 8611]

@@ -18549,7 +18615,7 @@ $t_x)
-

method TranslateY [line 8564]

+

method TranslateY [line 8622]

@@ -18591,7 +18657,7 @@ $t_y)
-

method unhtmlentities [line 8218]

+

method unhtmlentities [line 8276]

@@ -18630,7 +18696,7 @@ $text_to_convert)
-

method UniArrSubString [line 4859]

+

method UniArrSubString [line 4917]

@@ -18684,7 +18750,7 @@ $end = ''])
-

method unichr [line 4892]

+

method unichr [line 4950]

@@ -18729,7 +18795,7 @@ $c)
-

method UTF8ArrayToUniArray [line 4880]

+

method UTF8ArrayToUniArray [line 4938]

@@ -18771,7 +18837,7 @@ $ta)
-

method UTF8ArrSubString [line 4836]

+

method UTF8ArrSubString [line 4894]

@@ -18822,7 +18888,7 @@ $end = ''])
-

method UTF8ArrToLatin1 [line 7955]

+

method UTF8ArrToLatin1 [line 8013]

@@ -18864,7 +18930,7 @@ $unicode)
-

method utf8Bidi [line 9700]

+

method utf8Bidi [line 9758]

@@ -18921,7 +18987,7 @@ $forcertl = false])
-

method utf8StrArrRev [line 9686]

+

method utf8StrArrRev [line 9744]

@@ -18981,7 +19047,7 @@ $forcertl = false])
-

method UTF8StringToArray [line 7818]

+

method UTF8StringToArray [line 7876]

@@ -19047,7 +19113,7 @@ $str)
-

method utf8StrRev [line 9671]

+

method utf8StrRev [line 9729]

@@ -19101,7 +19167,7 @@ $forcertl = false])
-

method UTF8ToLatin1 [line 7925]

+

method UTF8ToLatin1 [line 7983]

@@ -19143,7 +19209,7 @@ $str)
-

method UTF8ToUTF16BE [line 7909]

+

method UTF8ToUTF16BE [line 7967]

@@ -19194,7 +19260,7 @@ $setbom = true])
-

method Write [line 4480]

+

method Write [line 4538]

@@ -19290,7 +19356,7 @@ $maxh = 0])
-

method write1DBarcode [line 12738]

+

method write1DBarcode [line 12796]

@@ -19380,7 +19446,7 @@ $align = ''])
-

method write2DBarcode [line 12995]

+

method write2DBarcode [line 13053]

@@ -19464,7 +19530,7 @@ $align = ''])
-

method writeBarcode [line 12945]

+

method writeBarcode [line 13003]

@@ -19554,7 +19620,7 @@ $code)
-

method writeDiskCache [line 16423]

+

method writeDiskCache [line 16507]

@@ -19611,7 +19677,7 @@ $file)
-

method writeHTML [line 13809]

+

method writeHTML [line 13867]

@@ -19677,7 +19743,7 @@ $align = ''])
-

method writeHTMLCell [line 13239]

+

method writeHTMLCell [line 13297]

@@ -19779,7 +19845,7 @@ $autopadding = true])
-

method _addfield [line 10481]

+

method _addfield [line 10539]

@@ -19857,7 +19923,7 @@ $prop)
-

method _beginpage [line 7529]

+

method _beginpage [line 7587]

@@ -19899,7 +19965,7 @@ $format = ''])
-

method _dataannobjstring [line 7678]

+

method _dataannobjstring [line 7736]

@@ -19938,7 +20004,7 @@ $s)
-

method _datastring [line 7665]

+

method _datastring [line 7723]

@@ -19977,7 +20043,7 @@ $s)
-

method _datestring [line 7691]

+

method _datestring [line 7749]

@@ -20008,7 +20074,7 @@ $s)
-

method _destroy [line 5772]

+

method _destroy [line 5830]

@@ -20053,7 +20119,7 @@ $preserve_objcopy = false])
-

method _dochecks [line 5800]

+

method _dochecks [line 5858]

@@ -20078,7 +20144,7 @@ $preserve_objcopy = false])
-

method _dolinethrough [line 7604]

+

method _dolinethrough [line 7662]

@@ -20126,7 +20192,7 @@ $txt)
-

method _dolinethroughw [line 7631]

+

method _dolinethroughw [line 7689]

@@ -20183,7 +20249,7 @@ $txt)
-

method _dounderline [line 7592]

+

method _dounderline [line 7650]

@@ -20231,7 +20297,7 @@ $txt)
-

method _dounderlinew [line 7617]

+

method _dounderlinew [line 7675]

@@ -20282,7 +20348,7 @@ $w)
-

method _enddoc [line 7412]

+

method _enddoc [line 7470]

@@ -20307,7 +20373,7 @@ $w)
-

method _endpage [line 7568]

+

method _endpage [line 7626]

@@ -20332,7 +20398,7 @@ $w)
-

method _escape [line 7654]

+

method _escape [line 7712]

@@ -20371,7 +20437,7 @@ $s)
-

method _escapetext [line 7730]

+

method _escapetext [line 7788]

@@ -20410,7 +20476,7 @@ $s)
-

method _freadint [line 7643]

+

method _freadint [line 7701]

@@ -20449,7 +20515,7 @@ $f)
-

method _generateencryptionkey [line 8338]

+

method _generateencryptionkey [line 8396]

@@ -20503,7 +20569,7 @@ $protection)
-

method _getfontpath [line 5816]

+

method _getfontpath [line 5874]

@@ -20528,7 +20594,7 @@ $protection)
-

method _JScolor [line 10457]

+

method _JScolor [line 10515]

@@ -20570,7 +20636,7 @@ $color)
-

method _md5_16 [line 8299]

+

method _md5_16 [line 8357]

@@ -20615,7 +20681,7 @@ $str)
-

method _newobj [line 7578]

+

method _newobj [line 7636]

@@ -20643,7 +20709,7 @@ $str)
-

method _objectkey [line 8231]

+

method _objectkey [line 8289]

@@ -20682,7 +20748,7 @@ $n)
-

method _out [line 7766]

+

method _out [line 7824]

@@ -20718,7 +20784,7 @@ $s)
-

method _outarc [line 12332]

+

method _outarc [line 12390]

@@ -20790,7 +20856,7 @@ $y3)
-

method _outCurve [line 8866]

+

method _outCurve [line 8924]

@@ -20859,7 +20925,7 @@ $y3)
-

method _outLine [line 8830]

+

method _outLine [line 8888]

@@ -20904,7 +20970,7 @@ $y)
-

method _outPoint [line 8816]

+

method _outPoint [line 8874]

@@ -20949,7 +21015,7 @@ $y)
-

method _outRect [line 8847]

+

method _outRect [line 8905]

@@ -21012,7 +21078,7 @@ $op)
-

method _Ovalue [line 8312]

+

method _Ovalue [line 8370]

@@ -21063,7 +21129,7 @@ $owner_pass)
-

method _parsejpeg [line 5248]

+

method _parsejpeg [line 5306]

@@ -21102,7 +21168,7 @@ $file)
-

method _parsepng [line 5274]

+

method _parsepng [line 5332]

@@ -21141,7 +21207,7 @@ $file)
-

method _putannotsobjs [line 5999]

+

method _putannotsobjs [line 6057]

@@ -21172,7 +21238,7 @@ $file)
-

method _putannotsrefs [line 5968]

+

method _putannotsrefs [line 6026]

@@ -21214,7 +21280,7 @@ $n)
-

method _putAPXObject [line 6614]

+

method _putAPXObject [line 6672]

@@ -21268,7 +21334,7 @@ $stream = ''])
-

method _putbookmarks [line 10299]

+

method _putbookmarks [line 10357]

@@ -21299,7 +21365,7 @@ $stream = ''])
-

method _putcatalog [line 7237]

+

method _putcatalog [line 7295]

@@ -21324,7 +21390,7 @@ $stream = ''])
-

method _putcidfont0 [line 6971]

+

method _putcidfont0 [line 7029]

@@ -21400,7 +21466,7 @@ $font)
-

method _putencryption [line 8240]

+

method _putencryption [line 8298]

@@ -21428,7 +21494,7 @@ $font)
-

method _putextgstates [line 11794]

+

method _putextgstates [line 11852]

@@ -21467,7 +21533,7 @@ $gs)
-

method _putfonts [line 6642]

+

method _putfonts [line 6700]

@@ -21492,7 +21558,7 @@ $gs)
-

method _putfontwidths [line 6780]

+

method _putfontwidths [line 6838]

@@ -21540,7 +21606,7 @@ $cidoffset = 0])
-

method _putheader [line 7404]

+

method _putheader [line 7462]

@@ -21565,7 +21631,7 @@ $cidoffset = 0])
-

method _putimages [line 7039]

+

method _putimages [line 7097]

@@ -21590,7 +21656,7 @@ $cidoffset = 0])
-

method _putinfo [line 7197]

+

method _putinfo [line 7255]

@@ -21615,7 +21681,7 @@ $cidoffset = 0])
-

method _putjavascript [line 10397]

+

method _putjavascript [line 10455]

@@ -21646,7 +21712,7 @@ $cidoffset = 0])
-

method _putocg [line 11708]

+

method _putocg [line 11766]

@@ -21674,7 +21740,7 @@ $cidoffset = 0])
-

method _putpages [line 5827]

+

method _putpages [line 5885]

@@ -21699,7 +21765,7 @@ $cidoffset = 0])
-

method _putresourcedict [line 7122]

+

method _putresourcedict [line 7180]

@@ -21724,7 +21790,7 @@ $cidoffset = 0])
-

method _putresources [line 7163]

+

method _putresources [line 7221]

@@ -21749,7 +21815,7 @@ $cidoffset = 0])
-

method _putshaders [line 12278]

+

method _putshaders [line 12336]

@@ -21780,7 +21846,7 @@ $cidoffset = 0])
-

method _putsignature [line 11429]

+

method _putsignature [line 11487]

@@ -21811,7 +21877,7 @@ $cidoffset = 0])
-

method _putspotcolors [line 7094]

+

method _putspotcolors [line 7152]

@@ -21839,7 +21905,7 @@ $cidoffset = 0])
-

method _putstream [line 7748]

+

method _putstream [line 7806]

@@ -21881,7 +21947,7 @@ $n = 0])
-

method _puttrailer [line 7390]

+

method _puttrailer [line 7448]

diff --git a/examples/index.php b/examples/index.php index c63f38a..409e38d 100644 --- a/examples/index.php +++ b/examples/index.php @@ -75,6 +75,7 @@ echo '<'.'?'.'xml version="1.0" encoding="UTF-8"'.'?'.'>';
  • XHTML Form: [PDF]
  • Font Dump: [PDF]
  • Crop Marks and Registration Marks: [PDF]
    • +
  • Cell vertical alignments: [PDF]
    • diff --git a/tcpdf.php b/tcpdf.php index d820ce9..f619020 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2010-04-05 +// Last Update : 2010-04-06 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.9.009 +// Version : 4.9.010 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l. @@ -131,7 +131,7 @@ * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.9.009 + * @version 4.9.010 */ /** @@ -155,14 +155,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.9.009 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.9.010 (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.9.009 + * @version 4.9.010 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3725,19 +3725,28 @@ if (!class_exists('TCPDF', false)) { * @param float $x Abscissa of the cell origin * @param float $y Ordinate of the cell origin * @param string $txt String to print - * @param int $stroke outline size in user units (false = disable) - * @param boolean $clip if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation). - * @param boolean $fill if true fills the text + * @param int $fstroke outline size in user units (false = disable) + * @param boolean $fclip if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation). + * @param boolean $ffill if true fills the text + * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    + * @param int $ln Indicates where the current position should go after the call. Possible values are:
    • 0: to the right (or left for RTL languages)
    • 1: to the beginning of the next line
    • 2: below
    Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0. + * @param string $align Allows to center or align the text. Possible values are:
    • L or empty string: left align (default value)
    • C: center
    • R: right align
    • J: justify
    + * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0. + * @param mixed $link URL or identifier returned by AddLink(). + * @param int $stretch stretch carachter mode:
    • 0 = disabled
    • 1 = horizontal scaling only if necessary
    • 2 = forced horizontal scaling
    • 3 = character spacing only if necessary
    • 4 = forced character spacing
    + * @param boolean $ignore_min_height if true ignore automatic minimum height value. + * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:
    • T : cell top
    • A : font top
    • L : font baseline
    • D : font bottom
    • B : cell bottom
    + * @param string $valign text vertical alignment inside the cell. Possible values are:
    • T : top
    • C : center
    • B : bottom
    * @access public * @since 1.0 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell() */ - public function Text($x, $y, $txt, $stroke=false, $clip=false, $fill=true) { + public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') { $textrendermode = $this->textrendermode; $textstrokewidth = $this->textstrokewidth; - $this->setTextRenderingMode($stroke, $fill, $clip); + $this->setTextRenderingMode($fstroke, $ffill, $fclip); $this->SetXY($x, $y); - $this->Cell(0, 0, $txt, 0, 0, '', 0, '', 0, false); + $this->Cell(0, 0, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign); // restore previous rendering mode $this->textrendermode = $textrendermode; $this->textstrokewidth = $textstrokewidth; @@ -3823,11 +3832,13 @@ if (!class_exists('TCPDF', false)) { * @param mixed $link URL or identifier returned by AddLink(). * @param int $stretch stretch carachter mode:
    • 0 = disabled
    • 1 = horizontal scaling only if necessary
    • 2 = forced horizontal scaling
    • 3 = character spacing only if necessary
    • 4 = forced character spacing
    * @param boolean $ignore_min_height if true ignore automatic minimum height value. + * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:
    • T : cell top
    • A : font top
    • L : font baseline
    • D : font bottom
    • B : cell bottom
    + * @param string $valign text vertical alignment inside the cell. Possible values are:
    • T : top
    • C : center
    • B : bottom
    * @access public * @since 1.0 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak() */ - public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false) { + public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') { if (!$ignore_min_height) { $min_cell_height = $this->FontSize * $this->cell_height_ratio; if ($h < $min_cell_height) { @@ -3835,7 +3846,7 @@ if (!class_exists('TCPDF', false)) { } } $this->checkPageBreak($h); - $this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height)); + $this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign)); } /** @@ -3876,11 +3887,13 @@ if (!class_exists('TCPDF', false)) { * @param mixed $link URL or identifier returned by AddLink(). * @param int $stretch stretch carachter mode:
    • 0 = disabled
    • 1 = horizontal scaling only if necessary
    • 2 = forced horizontal scaling
    • 3 = character spacing only if necessary
    • 4 = forced character spacing
    * @param boolean $ignore_min_height if true ignore automatic minimum height value. + * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:
    • T : cell top
    • A : font top
    • L : font baseline
    • D : font bottom
    • B : cell bottom
    + * @param string $valign text vertical alignment inside the cell. Possible values are:
    • T : top
    • C : center
    • B : bottom
    * @access protected * @since 1.0 * @see Cell() */ - protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false) { + protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') { $txt = $this->removeSHY($txt); $rs = ''; //string to be returned if (!$ignore_min_height) { @@ -3890,11 +3903,60 @@ if (!class_exists('TCPDF', false)) { } } $k = $this->k; + $x = $this->x; + $y = $this->y; + // cell vertical alignment + switch ($calign) { + case 'A': { + // font top + $y -= (($h - $this->FontAscent - $this->FontDescent) / 2); + break; + } + case 'L': { + // font baseline + $y -= (($h + $this->FontAscent - $this->FontDescent) / 2); + break; + } + case 'D': { + // font bottom + $y -= (($h + $this->FontAscent + $this->FontDescent) / 2); + break; + } + case 'B': { + // cell bottom + $y -= $h; + break; + } + default: + case 'T': { + // cell top + break; + } + } + // text vertical alignment + switch ($valign) { + case 'T': { + // top + $basefonty = $y + $this->FontAscent + $this->LineWidth; + break; + } + case 'B': { + // bottom + $basefonty = $y + $h - $this->FontDescent - $this->LineWidth; + break; + } + default: + case 'M': { + // center + $basefonty = $y + (($h + $this->FontAscent - $this->FontDescent) / 2); + break; + } + } if ($this->empty_string($w) OR ($w <= 0)) { if ($this->rtl) { - $w = $this->x - $this->lMargin; + $w = $x - $this->lMargin; } else { - $w = $this->w - $this->rMargin - $this->x; + $w = $this->w - $this->rMargin - $x; } } $s = ''; @@ -3910,12 +3972,10 @@ if (!class_exists('TCPDF', false)) { } else { $xk = ($this->x * $k); } - $s .= sprintf('%.2F %.2F %.2F %.2F re %s ', $xk, (($this->h - $this->y) * $k), ($w * $k), (-$h * $k), $op); + $s .= sprintf('%.2F %.2F %.2F %.2F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op); } if (is_string($border)) { $lm = ($this->LineWidth / 2); - $x = $this->x; - $y = $this->y; if (strpos($border,'L') !== false) { if ($this->rtl) { $xk = ($x - $w) * $k; @@ -4084,8 +4144,6 @@ if (!class_exists('TCPDF', false)) { $xdx = $this->x + $dx; } $xdk = $xdx * $k; - // get position of the font base line - $basefonty = $this->y + (($h + $this->FontAscent - $this->FontDescent) / 2); // print text $s .= sprintf('BT %.2F %.2F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2); if (isset($uniblock)) { @@ -4119,7 +4177,7 @@ if (!class_exists('TCPDF', false)) { $s .= ' Q'; } if ($link) { - $this->Link($xdx, $this->y + (($h - $this->FontSize)/2), $width, $this->FontSize, $link, $ns); + $this->Link($xdx, $y + (($h - $this->FontSize)/2), $width, $this->FontSize, $link, $ns); } } // output cell @@ -4142,7 +4200,7 @@ if (!class_exists('TCPDF', false)) { $this->lasth = $h; if ($ln > 0) { //Go to the beginning of the next line - $this->y += $h; + $this->y = $y + $h; if ($ln == 1) { if ($this->rtl) { $this->x = $this->w - $this->rMargin; @@ -12817,7 +12875,7 @@ if (!class_exists('TCPDF', false)) { $x += ($this->x - $prev_x); } } - // maximum bar heigth + // maximum bar height $barh = $h - $extraspace; switch ($style['position']) { case 'L': { // left @@ -13250,12 +13308,12 @@ if (!class_exists('TCPDF', false)) { */ protected function getHtmlDomArray($html) { // define block tags - $blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf','table','tr','td'); + $blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td'); // remove all unsupported tags (the line below lists all supported tags) $html = strip_tags($html, '


    @@ -21906,7 +21972,7 @@ $n = 0])
    -

    method _puttruetypeunicode [line 6879]

    +

    method _puttruetypeunicode [line 6937]

    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index d1f60b3..6d8c295 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -64,7 +64,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/index.html b/doc/index.html index d1f60b3..6d8c295 100644 --- a/doc/index.html +++ b/doc/index.html @@ -64,7 +64,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -21951,7 +22017,7 @@ $font)
    -

    method _putviewerpreferences [line 7320]

    +

    method _putviewerpreferences [line 7378]

    diff --git a/doc/errors.html b/doc/errors.html index 185c24d..9ebd73e 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Mon, 05 Apr 2010 20:45:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:45 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index e5ce677..adf8d21 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1883,7 +1883,7 @@ top
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -21982,7 +22048,7 @@ $font)
    -

    method _putxobjectdict [line 7111]

    +

    method _putxobjectdict [line 7169]

    diff --git a/doc/elementindex.html b/doc/elementindex.html index 4d663a7..a130b36 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1854,7 +1854,7 @@ top
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 6faf094..1a52137 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -243,7 +243,7 @@ Unicode Include file for TCPDF.



    - Documentation generated on Mon, 05 Apr 2010 20:45:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:45 +0200 by phpDocumentor 1.4.3
    @@ -22007,7 +22073,7 @@ $font)
    -

    method _RC4 [line 8259]

    +

    method _RC4 [line 8317]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index c2d199e..f2c3119 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -79,7 +79,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -110,7 +110,7 @@ unicode data

    @@ -22058,7 +22124,7 @@ $text)
    -

    method _textannobjstring [line 7716]

    +

    method _textannobjstring [line 7774]

    diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 3bf262e..1c8c472 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -477,7 +477,7 @@ string $string, [int $split_length = 1])
    - Documentation generated on Mon, 05 Apr 2010 20:45:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 16b6a31..ceade39 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -94,7 +94,7 @@ Array of WEB safe colors.



    - Documentation generated on Mon, 05 Apr 2010 20:45:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -22097,7 +22163,7 @@ $s)
    -

    method _textstring [line 7702]

    +

    method _textstring [line 7760]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index e5fb45c..c30856b 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -539,7 +539,7 @@ Configuration file for TCPDF.



    - Documentation generated on Mon, 05 Apr 2010 20:45:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:45 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 7596345..35a5dff 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -22136,7 +22202,7 @@ $s)
    -

    method _toJPEG [line 5232]

    +

    method _toJPEG [line 5290]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index c92b289..4517a78 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index b003c4e..dfadedc 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1374,7 +1374,7 @@ $type)
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -22178,7 +22244,7 @@ $file)
    -

    method _Uvalue [line 8325]

    +

    method _Uvalue [line 8383]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 8a2e864..9661434 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -296,7 +296,7 @@ $type)
    - Documentation generated on Mon, 05 Apr 2010 20:45:28 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:42 +0200 by phpDocumentor 1.4.3
    @@ -22215,7 +22281,7 @@ $file)
    - Documentation generated on Mon, 05 Apr 2010 20:45:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:43 +0200 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  4.9.009version:  4.9.010
    copyright:  2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
    - PDF_PRODUCER = 'TCPDF 4.9.009 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.9.010 (http://www.tcpdf.org)'
    @@ -121,7 +121,7 @@ unicode data

    - Documentation generated on Mon, 05 Apr 2010 20:45:29 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 06 Apr 2010 19:43:43 +0200 by phpDocumentor 1.4.3