From 816c00b2a3b769478611323b4b6460f9ba9590e7 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 29 Sep 2009 13:19:41 +0200 Subject: [PATCH] 4.8.008 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 460 +++++++++++------- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 6 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 6 +- doc/elementindex_com-tecnick-tcpdf.html | 6 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- examples/example_049.php | 20 +- tcpdf.php | 48 +- 17 files changed, 368 insertions(+), 204 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index c1ac9cf..4e4c1bb 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +4.8.008 (2009-09-29) + - Example 49 was updated. + - Underline and linethrough now works with cell stretching mode. + 4.8.007 (2009-09-23) - Infinite loop problem caused by nobr attribute was fixed. diff --git a/README.TXT b/README.TXT index 7eab38a..3707d1d 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 4.8.007 -Release date: 2009-09-23 +Version: 4.8.008 +Release date: 2009-09-29 Author: Nicola Asuni Copyright (c) 2001-2009: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 3fe1559..a748078 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -45,7 +45,7 @@
- Documentation generated on Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 5256498..d2611a1 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -74,7 +74,7 @@ Source Location: /tcpdf.php

Version:

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

  • _destroy
  • _dochecks
  • _dolinethrough
    • +
  • _dolinethroughw
  • _dounderline
    • +
  • _dounderlinew
  • _enddoc
  • _endpage
  • _escape
    • @@ -626,7 +628,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.8.007 + version:  4.8.008 link:  http://www.tcpdf.org @@ -6087,7 +6089,7 @@ $diskcache = false])
    -

    method addExtGState [line 11283]

    +

    method addExtGState [line 11307]

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

    method addHtmlLink [line 7660]

    +

    method addHtmlLink [line 7684]

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

    method addHTMLVertSpace [line 14781]

    +

    method addHTMLVertSpace [line 14805]

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

    method addJavascriptObject [line 9903]

    +

    method addJavascriptObject [line 9927]

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

    method addTOC [line 15803]

    +

    method addTOC [line 15827]

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

    method AliasNbPages [line 11091]

    +

    method AliasNbPages [line 11115]

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

    method AliasNumPage [line 11118]

    +

    method AliasNumPage [line 11142]

    @@ -6715,7 +6717,7 @@ $spaces = 0])
    -

    method Arrow [line 9153]

    +

    method Arrow [line 9177]

    @@ -6793,7 +6795,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 7558]

    +

    method arrUTF8ToUTF16BE [line 7582]

    @@ -6868,7 +6870,7 @@ $setbom = true])
    -

    method Bookmark [line 9797]

    +

    method Bookmark [line 9821]

    @@ -6922,7 +6924,7 @@ $page = ''])
    -

    method Button [line 10797]

    +

    method Button [line 10821]

    @@ -7108,7 +7110,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 10727]

    +

    method CheckBox [line 10751]

    @@ -7246,7 +7248,7 @@ $addpage = true])
    -

    method Circle [line 8787]

    +

    method Circle [line 8811]

    @@ -7345,7 +7347,7 @@ $afinish:)
    -

    method Clip [line 11546]

    +

    method Clip [line 11570]

    @@ -7436,7 +7438,7 @@ $h)
    -

    method closeHTMLTagHandler [line 14444]

    +

    method closeHTMLTagHandler [line 14468]

    @@ -7490,7 +7492,7 @@ $dom)
    -

    method ComboBox [line 10666]

    +

    method ComboBox [line 10690]

    @@ -7574,7 +7576,7 @@ $js = false])
    -

    method commitTransaction [line 15962]

    +

    method commitTransaction [line 15986]

    @@ -7602,7 +7604,7 @@ $js = false])
    -

    method convertHTMLColorToDec [line 7693]

    +

    method convertHTMLColorToDec [line 7717]

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

    method CoonsPatchMesh [line 11466]

    +

    method CoonsPatchMesh [line 11490]

    @@ -7743,7 +7745,7 @@ $coords_max = 1])
    -

    method Curve [line 8562]

    +

    method Curve [line 8586]

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

    method deletePage [line 15663]

    +

    method deletePage [line 15687]

    @@ -7887,7 +7889,7 @@ $page)
    -

    method Ellipse [line 8683]

    +

    method Ellipse [line 8707]

    @@ -8004,7 +8006,7 @@ $afinish:)
    -

    method empty_string [line 16016]

    +

    method empty_string [line 16040]

    @@ -8141,7 +8143,7 @@ $msg)
    -

    method formatPageNumber [line 11195]

    +

    method formatPageNumber [line 11219]

    @@ -8180,7 +8182,7 @@ $num)
    -

    method formatTOCPageNumber [line 11207]

    +

    method formatTOCPageNumber [line 11231]

    @@ -8253,7 +8255,7 @@ $num)
    -

    method getAliasNbPages [line 11103]

    +

    method getAliasNbPages [line 11127]

    @@ -8284,7 +8286,7 @@ $num)
    -

    method getAliasNumPage [line 11131]

    +

    method getAliasNumPage [line 11155]

    @@ -8315,7 +8317,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 10034]

    +

    method getAnnotOptFromJSProp [line 10058]

    @@ -8414,7 +8416,7 @@ $fontsize = 0])
    -

    method getBarcode [line 12011]

    +

    method getBarcode [line 12035]

    @@ -8538,7 +8540,7 @@ $pagenum = ''])
    -

    method getBuffer [line 15349]

    +

    method getBuffer [line 15373]

    @@ -8665,7 +8667,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 11369]

    +

    method getCellHeightRatio [line 11393]

    @@ -8735,7 +8737,7 @@ $char)
    -

    method getFontBuffer [line 15509]

    +

    method getFontBuffer [line 15533]

    @@ -8777,7 +8779,7 @@ $font)
    -

    method getFontFamily [line 12485]

    +

    method getFontFamily [line 12509]

    @@ -8808,7 +8810,7 @@ $font)
    -

    method getFontSize [line 12465]

    +

    method getFontSize [line 12489]

    @@ -8839,7 +8841,7 @@ $font)
    -

    method getFontSizePt [line 12475]

    +

    method getFontSizePt [line 12499]

    @@ -8898,7 +8900,7 @@ $font)
    -

    method getFontStyle [line 12495]

    +

    method getFontStyle [line 12519]

    @@ -8929,7 +8931,7 @@ $font)
    -

    method getFooterFont [line 7619]

    +

    method getFooterFont [line 7643]

    @@ -8985,7 +8987,7 @@ $font)
    -

    method getFormDefaultProp [line 10409]

    +

    method getFormDefaultProp [line 10433]

    @@ -9049,7 +9051,7 @@ $v)
    -

    method getGraphicVars [line 15217]

    +

    method getGraphicVars [line 15241]

    @@ -9080,7 +9082,7 @@ $v)
    -

    method getGroupPageNo [line 11144]

    +

    method getGroupPageNo [line 11168]

    @@ -9105,7 +9107,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 11154]

    +

    method getGroupPageNoFormatted [line 11178]

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

    method getHeaderFont [line 7599]

    +

    method getHeaderFont [line 7623]

    @@ -9220,7 +9222,7 @@ $v)
    -

    method getHtmlDomArray [line 12531]

    +

    method getHtmlDomArray [line 12555]

    @@ -9259,7 +9261,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 14936]

    +

    method getHTMLUnitToUnits [line 14960]

    @@ -9325,7 +9327,7 @@ $point)
    -

    method getImageBuffer [line 15451]

    +

    method getImageBuffer [line 15475]

    @@ -9482,7 +9484,7 @@ $image)
    -

    method GetLineWidth [line 8276]

    +

    method GetLineWidth [line 8300]

    @@ -9516,7 +9518,7 @@ $image)
    -

    method getMargins [line 12428]

    +

    method getMargins [line 12452]

    @@ -9671,7 +9673,7 @@ $w = 0])
    -

    method getObjFilename [line 15281]

    +

    method getObjFilename [line 15305]

    @@ -9716,7 +9718,7 @@ $prefix)
    -

    method getOriginalMargins [line 12451]

    +

    method getOriginalMargins [line 12475]

    @@ -9781,7 +9783,7 @@ $prefix)
    -

    method getPageBuffer [line 15392]

    +

    method getPageBuffer [line 15416]

    @@ -9868,7 +9870,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 11166]

    +

    method getPageGroupAlias [line 11190]

    @@ -9941,7 +9943,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 11181]

    +

    method getPageNumGroupAlias [line 11205]

    @@ -10014,7 +10016,7 @@ $pagenum = ''])
    -

    method getPDFData [line 7642]

    +

    method getPDFData [line 7666]

    @@ -10285,7 +10287,7 @@ $fontsize = 0])
    -

    method Gradient [line 11569]

    +

    method Gradient [line 11593]

    @@ -10502,7 +10504,7 @@ $hidden = false])
    -

    method ImageEps [line 11741]

    +

    method ImageEps [line 11765]

    @@ -10703,7 +10705,7 @@ $palign = ''])
    -

    method IncludeJS [line 9890]

    +

    method IncludeJS [line 9914]

    @@ -10739,7 +10741,7 @@ $script)
    -

    method intToRoman [line 15010]

    +

    method intToRoman [line 15034]

    @@ -10823,7 +10825,7 @@ $resetmargins = false])
    -

    method Line [line 8429]

    +

    method Line [line 8453]

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

    method LinearGradient [line 11426]

    +

    method LinearGradient [line 11450]

    @@ -11039,7 +11041,7 @@ $spaces = 0])
    -

    method ListBox [line 10606]

    +

    method ListBox [line 10630]

    @@ -11171,7 +11173,7 @@ $cell = false])
    -

    method MirrorH [line 8048]

    +

    method MirrorH [line 8072]

    @@ -11213,7 +11215,7 @@ $x = ''])
    -

    method MirrorL [line 8084]

    +

    method MirrorL [line 8108]

    @@ -11267,7 +11269,7 @@ $y = ''])
    -

    method MirrorP [line 8071]

    +

    method MirrorP [line 8095]

    @@ -11315,7 +11317,7 @@ $y = ''])
    -

    method MirrorV [line 8059]

    +

    method MirrorV [line 8083]

    @@ -11357,7 +11359,7 @@ $y = ''])
    -

    method movePage [line 15526]

    +

    method movePage [line 15550]

    @@ -11531,7 +11533,7 @@ $maxh = 0])
    -

    method objclone [line 16005]

    +

    method objclone [line 16029]

    @@ -11604,7 +11606,7 @@ $object)
    -

    method openHTMLTagHandler [line 13907]

    +

    method openHTMLTagHandler [line 13931]

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

    method PageNoFormatted [line 11217]

    +

    method PageNoFormatted [line 11241]

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

    method PieSector [line 11663]

    +

    method PieSector [line 11687]

    @@ -11873,7 +11875,7 @@ $o:)
    -

    method pixelsToUnits [line 7750]

    +

    method pixelsToUnits [line 7774]

    @@ -11915,7 +11917,7 @@ $px)
    -

    method Polycurve [line 8619]

    +

    method Polycurve [line 8643]

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

    method Polygon [line 8839]

    +

    method Polygon [line 8863]

    @@ -12050,7 +12052,7 @@ $closed = true])
    -

    method PolyLine [line 8813]

    +

    method PolyLine [line 8837]

    @@ -12113,7 +12115,7 @@ $closed)
    -

    method putHtmlListBullet [line 15075]

    +

    method putHtmlListBullet [line 15099]

    @@ -12164,7 +12166,7 @@ $size = 10])
    -

    method RadialGradient [line 11444]

    +

    method RadialGradient [line 11468]

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

    method RadioButton [line 10518]

    +

    method RadioButton [line 10542]

    @@ -12326,7 +12328,7 @@ $js = false])
    -

    method readDiskCache [line 15321]

    +

    method readDiskCache [line 15345]

    @@ -12374,7 +12376,7 @@ $file)
    -

    method Rect [line 8464]

    +

    method Rect [line 8488]

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

    method RegularPolygon [line 8964]

    +

    method RegularPolygon [line 8988]

    @@ -12656,7 +12658,7 @@ $length)
    -

    method rollbackTransaction [line 15976]

    +

    method rollbackTransaction [line 16000]

    @@ -12698,7 +12700,7 @@ $self = false])
    -

    method Rotate [line 8143]

    +

    method Rotate [line 8167]

    @@ -12752,7 +12754,7 @@ $y = ''])
    -

    method RoundedRect [line 9068]

    +

    method RoundedRect [line 9092]

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

    method Scale [line 8013]

    +

    method Scale [line 8037]

    @@ -12899,7 +12901,7 @@ $y = ''])
    -

    method ScaleX [line 7973]

    +

    method ScaleX [line 7997]

    @@ -12953,7 +12955,7 @@ $y = ''])
    -

    method ScaleXY [line 7999]

    +

    method ScaleXY [line 8023]

    @@ -13007,7 +13009,7 @@ $y = ''])
    -

    method ScaleY [line 7986]

    +

    method ScaleY [line 8010]

    @@ -13061,7 +13063,7 @@ $y = ''])
    -

    method setAlpha [line 11326]

    +

    method setAlpha [line 11350]

    @@ -13193,7 +13195,7 @@ $margin = 0])
    -

    method setBarcode [line 12001]

    +

    method setBarcode [line 12025]

    @@ -13229,7 +13231,7 @@ $bc = ''])
    -

    method SetBooklet [line 14850]

    +

    method SetBooklet [line 14874]

    @@ -13280,7 +13282,7 @@ $outer = -1])
    -

    method setBuffer [line 15331]

    +

    method setBuffer [line 15355]

    @@ -13319,7 +13321,7 @@ $data)
    -

    method setCellHeightRatio [line 11360]

    +

    method setCellHeightRatio [line 11384]

    @@ -13556,7 +13558,7 @@ $font)
    -

    method setDefaultTableColumns [line 11350]

    +

    method setDefaultTableColumns [line 11374]

    @@ -13793,7 +13795,7 @@ $tint = 100])
    -

    method setExtGState [line 11295]

    +

    method setExtGState [line 11319]

    @@ -14039,7 +14041,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 15467]

    +

    method setFontBuffer [line 15491]

    @@ -14126,7 +14128,7 @@ $size)
    -

    method setFontSubBuffer [line 15489]

    +

    method setFontSubBuffer [line 15513]

    @@ -14205,7 +14207,7 @@ $data)
    -

    method setFooterFont [line 7609]

    +

    method setFooterFont [line 7633]

    @@ -14280,7 +14282,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 10398]

    +

    method setFormDefaultProp [line 10422]

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

    method setGraphicVars [line 15248]

    +

    method setGraphicVars [line 15272]

    @@ -14437,7 +14439,7 @@ $hs = ''])
    -

    method setHeaderFont [line 7589]

    +

    method setHeaderFont [line 7613]

    @@ -14512,7 +14514,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 14921]

    +

    method setHtmlLinksStyle [line 14945]

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

    method setHtmlVSpace [line 14890]

    +

    method setHtmlVSpace [line 14914]

    @@ -14596,7 +14598,7 @@ $tagvs)
    -

    method setImageBuffer [line 15408]

    +

    method setImageBuffer [line 15432]

    @@ -14683,7 +14685,7 @@ $scale)
    -

    method setImageSubBuffer [line 15431]

    +

    method setImageSubBuffer [line 15455]

    @@ -14734,7 +14736,7 @@ $data)
    -

    method setJPEGQuality [line 11337]

    +

    method setJPEGQuality [line 11361]

    @@ -14812,7 +14814,7 @@ $keywords)
    -

    method setLanguageArray [line 7629]

    +

    method setLanguageArray [line 7653]

    @@ -14935,7 +14937,7 @@ $margin)
    -

    method SetLineStyle [line 8301]

    +

    method SetLineStyle [line 8325]

    @@ -14981,7 +14983,7 @@ $style)
    -

    method SetLineWidth [line 8260]

    +

    method SetLineWidth [line 8284]

    @@ -15077,7 +15079,7 @@ $page = -1])
    -

    method setListIndentWidth [line 14900]

    +

    method setListIndentWidth [line 14924]

    @@ -15116,7 +15118,7 @@ $width)
    -

    method setLIsymbol [line 14810]

    +

    method setLIsymbol [line 14834]

    @@ -15209,7 +15211,7 @@ $right = -1])
    -

    method setOpenCell [line 14910]

    +

    method setOpenCell [line 14934]

    @@ -15296,7 +15298,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 15365]

    +

    method setPageBuffer [line 15389]

    @@ -15510,7 +15512,7 @@ $unit)
    -

    method setPDFVersion [line 11379]

    +

    method setPDFVersion [line 11403]

    @@ -15624,7 +15626,7 @@ $val = true])
    -

    method SetProtection [line 7913]

    +

    method SetProtection [line 7937]

    @@ -15765,7 +15767,7 @@ $resetx = true])
    -

    method setSignature [line 11048]

    +

    method setSignature [line 11072]

    @@ -16213,7 +16215,7 @@ $margin)
    -

    method setUserRights [line 11018]

    +

    method setUserRights [line 11042]

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

    method setViewerPreferences [line 11409]

    +

    method setViewerPreferences [line 11433]

    @@ -16309,7 +16311,7 @@ $preferences)
    -

    method setVisibility [line 11247]

    +

    method setVisibility [line 11271]

    @@ -16522,7 +16524,7 @@ $mqr)
    -

    method Skew [line 8203]

    +

    method Skew [line 8227]

    @@ -16582,7 +16584,7 @@ $y = ''])
    -

    method SkewX [line 8176]

    +

    method SkewX [line 8200]

    @@ -16636,7 +16638,7 @@ $y = ''])
    -

    method SkewY [line 8189]

    +

    method SkewY [line 8213]

    @@ -16690,7 +16692,7 @@ $y = ''])
    -

    method StarPolygon [line 9019]

    +

    method StarPolygon [line 9043]

    @@ -16862,7 +16864,7 @@ $format = ''])
    -

    method startPageGroup [line 11076]

    +

    method startPageGroup [line 11100]

    @@ -16898,7 +16900,7 @@ $page = ''])
    -

    method startTransaction [line 15946]

    +

    method startTransaction [line 15970]

    @@ -16926,7 +16928,7 @@ $page = ''])
    -

    method StartTransform [line 7941]

    +

    method StartTransform [line 7965]

    @@ -16957,7 +16959,7 @@ $page = ''])
    -

    method StopTransform [line 7956]

    +

    method StopTransform [line 7980]

    @@ -16988,7 +16990,7 @@ $page = ''])
    -

    method swapMargins [line 14866]

    +

    method swapMargins [line 14890]

    @@ -17096,7 +17098,7 @@ $clip = false])
    -

    method TextField [line 10427]

    +

    method TextField [line 10451]

    @@ -17174,7 +17176,7 @@ $js = false])
    -

    method Transform [line 8236]

    +

    method Transform [line 8260]

    @@ -17216,7 +17218,7 @@ $tm)
    -

    method Translate [line 8119]

    +

    method Translate [line 8143]

    @@ -17264,7 +17266,7 @@ $t_y)
    -

    method TranslateX [line 8096]

    +

    method TranslateX [line 8120]

    @@ -17306,7 +17308,7 @@ $t_x)
    -

    method TranslateY [line 8107]

    +

    method TranslateY [line 8131]

    @@ -17348,7 +17350,7 @@ $t_y)
    -

    method unhtmlentities [line 7761]

    +

    method unhtmlentities [line 7785]

    @@ -17579,7 +17581,7 @@ $end = ''])
    -

    method utf8Bidi [line 9226]

    +

    method utf8Bidi [line 9250]

    @@ -17633,7 +17635,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 7391]

    +

    method UTF8StringToArray [line 7415]

    @@ -17699,7 +17701,7 @@ $str)
    -

    method utf8StrRev [line 9212]

    +

    method utf8StrRev [line 9236]

    @@ -17753,7 +17755,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 7498]

    +

    method UTF8ToLatin1 [line 7522]

    @@ -17795,7 +17797,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 7482]

    +

    method UTF8ToUTF16BE [line 7506]

    @@ -17942,7 +17944,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 12030]

    +

    method write1DBarcode [line 12054]

    @@ -18032,7 +18034,7 @@ $align = ''])
    -

    method write2DBarcode [line 12281]

    +

    method write2DBarcode [line 12305]

    @@ -18116,7 +18118,7 @@ $align = ''])
    -

    method writeBarcode [line 12231]

    +

    method writeBarcode [line 12255]

    @@ -18206,7 +18208,7 @@ $code)
    -

    method writeDiskCache [line 15293]

    +

    method writeDiskCache [line 15317]

    @@ -18263,7 +18265,7 @@ $file)
    -

    method writeHTML [line 12971]

    +

    method writeHTML [line 12995]

    @@ -18329,7 +18331,7 @@ $align = ''])
    -

    method writeHTMLCell [line 12519]

    +

    method writeHTMLCell [line 12543]

    @@ -18431,7 +18433,7 @@ $autopadding = true])
    -

    method _addfield [line 9999]

    +

    method _addfield [line 10023]

    @@ -18545,7 +18547,7 @@ $format = ''])
    -

    method _datastring [line 7270]

    +

    method _datastring [line 7294]

    @@ -18584,7 +18586,7 @@ $s)
    -

    method _datestring [line 7283]

    +

    method _datestring [line 7307]

    @@ -18685,7 +18687,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 7235]

    +

    method _dolinethrough [line 7233]

    @@ -18731,6 +18733,63 @@ $txt)
    [ Top ]
    +
    + +

    method _dolinethroughw [line 7260]

    +
    +
    +
    + void _dolinethroughw( +int +$x, int +$y, +$w, string +$txt) +
    +

    + + Line through for rectangular text area.



    +

    Tags:

    +
    + + + + + + + +
    since:  4.8.008 (2009-09-29)
    access:  protected
    +
    +

    + + +

    Parameters:

    +
    + + + + + + + + + + + + + + + + + + + + + +
    int  $x  X coordinate
    int  $y  Y coordinate
    string  $txt  text to linethrough
      $w  
    +

    +
    [ Top ]
    +

    method _dounderline [line 7221]

    @@ -18779,6 +18838,57 @@ $txt)
    [ Top ]
    +
    + +

    method _dounderlinew [line 7246]

    +
    +
    +
    + void _dounderlinew( +int +$x, int +$y, int +$w) +
    +

    + + Underline for rectangular text area.



    +

    Tags:

    +
    + + + + + + + +
    since:  4.8.008 (2009-09-29)
    access:  protected
    +
    +

    + + +

    Parameters:

    +
    + + + + + + + + + + + + + + + + +
    int  $x  X coordinate
    int  $y  Y coordinate
    int  $w  width to underline
    +

    +
    [ Top ]
    +

    method _enddoc [line 7041]

    @@ -18831,7 +18941,7 @@ $txt)
    -

    method _escape [line 7259]

    +

    method _escape [line 7283]

    @@ -18870,7 +18980,7 @@ $s)
    -

    method _escapetext [line 7308]

    +

    method _escapetext [line 7332]

    @@ -18909,7 +19019,7 @@ $s)
    -

    method _freadint [line 7248]

    +

    method _freadint [line 7272]

    @@ -18948,7 +19058,7 @@ $f)
    -

    method _generateencryptionkey [line 7881]

    +

    method _generateencryptionkey [line 7905]

    @@ -19027,7 +19137,7 @@ $protection)
    -

    method _JScolor [line 9975]

    +

    method _JScolor [line 9999]

    @@ -19063,7 +19173,7 @@ $color)
    -

    method _md5_16 [line 7842]

    +

    method _md5_16 [line 7866]

    @@ -19136,7 +19246,7 @@ $str)
    -

    method _objectkey [line 7774]

    +

    method _objectkey [line 7798]

    @@ -19175,7 +19285,7 @@ $n)
    -

    method _out [line 7339]

    +

    method _out [line 7363]

    @@ -19211,7 +19321,7 @@ $s)
    -

    method _outarc [line 11643]

    +

    method _outarc [line 11667]

    @@ -19283,7 +19393,7 @@ $y3)
    -

    method _outCurve [line 8409]

    +

    method _outCurve [line 8433]

    @@ -19349,7 +19459,7 @@ $y3)
    -

    method _outLine [line 8373]

    +

    method _outLine [line 8397]

    @@ -19391,7 +19501,7 @@ $y)
    -

    method _outPoint [line 8359]

    +

    method _outPoint [line 8383]

    @@ -19433,7 +19543,7 @@ $y)
    -

    method _outRect [line 8390]

    +

    method _outRect [line 8414]

    @@ -19496,7 +19606,7 @@ $op)
    -

    method _Ovalue [line 7855]

    +

    method _Ovalue [line 7879]

    @@ -19752,7 +19862,7 @@ $stream = ''])
    -

    method _putbookmarks [line 9825]

    +

    method _putbookmarks [line 9849]

    @@ -19878,7 +19988,7 @@ $font)
    -

    method _putencryption [line 7783]

    +

    method _putencryption [line 7807]

    @@ -19906,7 +20016,7 @@ $font)
    -

    method _putextgstates [line 11305]

    +

    method _putextgstates [line 11329]

    @@ -20079,7 +20189,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 9915]

    +

    method _putjavascript [line 9939]

    @@ -20104,7 +20214,7 @@ $cidoffset = 0])
    -

    method _putocg [line 11226]

    +

    method _putocg [line 11250]

    diff --git a/examples/example_049.php b/examples/example_049.php index 6b5f0d9..2e1762b 100644 --- a/examples/example_049.php +++ b/examples/example_049.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_049.php // Begin : 2009-04-03 -// Last Update : 2009-04-03 +// Last Update : 2009-09-25 // // Description : Example 049 for TCPDF class // WriteHTML with TCPDF callback functions @@ -75,10 +75,28 @@ $pdf->SetFont('helvetica', '', 10); // add a page $pdf->AddPage(); +/* +NOTE: +When using TCPDF methods embedded on XHTML code, you have to escape special +characters with equivalent HTML entities: + +- replace double quotes with: " +- replace single quote with: \' +- replace > with: > +- replace < with: < + +Note that the single quote escape contains an additional back-slash character. +*/ + $htmlcontent = <<Test TCPDF Methods in HTML

    write1DBarcode method in HTML

    +

    Graphic Functions

    diff --git a/tcpdf.php b/tcpdf.php index d5f9c35..9549254 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2009-09-23 +// Last Update : 2009-09-29 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.8.007 +// Version : 4.8.008 // License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html) // ---------------------------------------------------------------------------- // Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l. @@ -128,7 +128,7 @@ * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL - * @version 4.8.007 + * @version 4.8.008 */ /** @@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.8.007 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.8.008 (http://www.tcpdf.org)'); /** * This is a PHP class for generating PDF documents without requiring external extensions.
    * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
    * @name TCPDF * @package com.tecnick.tcpdf - * @version 4.8.007 + * @version 4.8.008 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3545,7 +3545,7 @@ if (!class_exists('TCPDF', false)) { // bidirectional algorithm (some chars may be changed affecting the line length) $s = $this->utf8Bidi($this->UTF8StringToArray($txt), $txt, $this->tmprtl); $l = $this->GetArrStringWidth($s); - $xr = $this->w - $x - $this->GetArrStringWidth($s); + $xr = $this->w - $x - $l; } else { $xr = $x; } @@ -3854,10 +3854,10 @@ if (!class_exists('TCPDF', false)) { $xdx = $this->x + $dx; } if ($this->underline) { - $s .= ' '.$this->_dounderline($xdx, $basefonty, $txt); + $s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width); } if ($this->linethrough) { - $s .= ' '.$this->_dolinethrough($xdx, $basefonty, $txt); + $s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width); } if ($this->ColorFlag) { $s .= ' Q'; @@ -7219,10 +7219,8 @@ if (!class_exists('TCPDF', false)) { * @access protected */ protected function _dounderline($x, $y, $txt) { - $up = $this->CurrentFont['up']; - $ut = $this->CurrentFont['ut']; $w = $this->GetStringWidth($txt); - return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt); + return $this->_dounderlinew($x, $y, $w); } /** @@ -7233,9 +7231,35 @@ if (!class_exists('TCPDF', false)) { * @access protected */ protected function _dolinethrough($x, $y, $txt) { + $w = $this->GetStringWidth($txt); + return $this->_dolinethroughw($x, $y, $w); + } + + /** + * Underline for rectangular text area. + * @param int $x X coordinate + * @param int $y Y coordinate + * @param int $w width to underline + * @access protected + * @since 4.8.008 (2009-09-29) + */ + protected function _dounderlinew($x, $y, $w) { + $up = $this->CurrentFont['up']; + $ut = $this->CurrentFont['ut']; + return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt); + } + + /** + * Line through for rectangular text area. + * @param int $x X coordinate + * @param int $y Y coordinate + * @param string $txt text to linethrough + * @access protected + * @since 4.8.008 (2009-09-29) + */ + protected function _dolinethroughw($x, $y, $w) { $up = $this->CurrentFont['up']; $ut = $this->CurrentFont['ut']; - $w = $this->GetStringWidth($txt); return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - ($this->FontSize/2) - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt); }
    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index cb0870d..0281e3a 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 Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    @@ -20204,7 +20314,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 11593]

    +

    method _putshaders [line 11617]

    diff --git a/doc/index.html b/doc/index.html index cb0870d..0281e3a 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 Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/errors.html b/doc/errors.html index d9890e3..2bf1b2c 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Wed, 23 Sep 2009 20:02:55 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:33 +0200 by phpDocumentor 1.4.1
    @@ -20235,7 +20345,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 10947]

    +

    method _putsignature [line 10971]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 6e8bd8d..583e428 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -100,8 +100,12 @@
    in file tcpdf.php, method TCPDF::_dochecks()
        Check for locale-related bug
    _dolinethrough
    in file tcpdf.php, method TCPDF::_dolinethrough()
        Line through text.
    +
    _dolinethroughw
    +
    in file tcpdf.php, method TCPDF::_dolinethroughw()
        Line through for rectangular text area.
    _dounderline
    in file tcpdf.php, method TCPDF::_dounderline()
        Underline text.
    +
    _dounderlinew
    +
    in file tcpdf.php, method TCPDF::_dounderlinew()
        Underline for rectangular text area.
    _enddoc
    in file tcpdf.php, method TCPDF::_enddoc()
        Output end of document (EOF).
    _endpage
    @@ -1463,7 +1467,7 @@ top
    - Documentation generated on Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 59e4d86..c6327ca 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1325,8 +1325,12 @@
    in file tcpdf.php, method TCPDF::_dochecks()
        Check for locale-related bug
    _dolinethrough
    in file tcpdf.php, method TCPDF::_dolinethrough()
        Line through text.
    +
    _dolinethroughw
    +
    in file tcpdf.php, method TCPDF::_dolinethroughw()
        Line through for rectangular text area.
    _dounderline
    in file tcpdf.php, method TCPDF::_dounderline()
        Underline text.
    +
    _dounderlinew
    +
    in file tcpdf.php, method TCPDF::_dounderlinew()
        Underline for rectangular text area.
    _enddoc
    in file tcpdf.php, method TCPDF::_enddoc()
        Output end of document (EOF).
    _endpage
    @@ -1440,7 +1444,7 @@ top
    - Documentation generated on Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    @@ -20288,7 +20398,7 @@ $cidoffset = 0])
    -

    method _putstream [line 7325]

    +

    method _putstream [line 7349]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 4f09623..c65cd06 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -237,7 +237,7 @@ Unicode Include file for TCPDF.



    - Documentation generated on Wed, 23 Sep 2009 20:02:55 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:33 +0200 by phpDocumentor 1.4.1
    @@ -20450,7 +20560,7 @@ $font)
    -

    method _RC4 [line 7802]

    +

    method _RC4 [line 7826]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 0f90c8e..dbbf0e9 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 5d50cb6..23b4f98 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -88,7 +88,7 @@ Array of WEB safe colors.



    - Documentation generated on Wed, 23 Sep 2009 20:02:49 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:28 +0200 by phpDocumentor 1.4.1
    @@ -20501,7 +20611,7 @@ $text)
    -

    method _textstring [line 7294]

    +

    method _textstring [line 7318]

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



    - Documentation generated on Wed, 23 Sep 2009 20:02:55 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:33 +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 937e87f..b7935fe 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
    - Documentation generated on Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    @@ -20582,7 +20692,7 @@ $file)
    -

    method _Uvalue [line 7868]

    +

    method _Uvalue [line 7892]

    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index c00707d..498b9f9 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1368,7 +1368,7 @@ $type)
    - Documentation generated on Wed, 23 Sep 2009 20:02:48 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:27 +0200 by phpDocumentor 1.4.1
    @@ -20619,7 +20729,7 @@ $file)
    - Documentation generated on Wed, 23 Sep 2009 20:02:49 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:28 +0200 by phpDocumentor 1.4.1
    		author:  Nicola Asuni
    version:  4.8.007version:  4.8.008
    copyright:  2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
    - PDF_PRODUCER = 'TCPDF 4.8.007 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.8.008 (http://www.tcpdf.org)'
    @@ -115,7 +115,7 @@ unicode data

    - Documentation generated on Wed, 23 Sep 2009 20:02:49 +0200 by phpDocumentor 1.4.1 + Documentation generated on Tue, 29 Sep 2009 13:19:28 +0200 by phpDocumentor 1.4.1