From f6f2bef5bc0cc10d8aec7eac389023f69cd6804d Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 1 Apr 2010 20:40:11 +0200 Subject: [PATCH] 4.9.005 --- CHANGELOG.TXT | 7 + README.TXT | 4 +- config/tcpdf_config.php | 11 +- config/tcpdf_config_alt.php | 13 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 558 ++++++++++-------- 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 | 19 +- 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 | 6 +- doc/elementindex_com-tecnick-tcpdf.html | 6 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 161 +++-- 22 files changed, 478 insertions(+), 337 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 482c81f..6e6a666 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,10 @@ +4.9.005 (2010-04-01) + - Bug# 2980354 "Wrong File attachment description with security" was fixed. + - Several problems with HTML line alignment were fixed. + - The constant K_THAI_TOPCHAR was added on configuration file to enable/disable the special procedure used to avoid the overlappind of symbols on Thai language. + - A problem with font name directory was fixed. + - A bug on _destroy() method was fixed. + 4.9.004 (2010-03-31) - Patch #979681 "GetCharWidth - default character width" was applied (bugfix). diff --git a/README.TXT b/README.TXT index 0b2394a..19ebb22 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.004 -Release date: 2010-03-31 +Version: 4.9.005 +Release date: 2010-04-01 Author: Nicola Asuni Copyright (c) 2001-2010: diff --git a/config/tcpdf_config.php b/config/tcpdf_config.php index 8c550b4..1aea31b 100755 --- a/config/tcpdf_config.php +++ b/config/tcpdf_config.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2010-03-30 +// Last Update : 2010-04-01 // // Description : Configuration file for TCPDF. // @@ -21,9 +21,9 @@ /** * Configuration file for TCPDF. * @author Nicola Asuni - * @copyright 2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com + * @copyright 2004-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 * @package com.tecnick.tcpdf - * @version 4.0.014 + * @version 4.9.005 * @link http://tcpdf.sourceforge.net * @license http://www.gnu.org/copyleft/lesser.html LGPL * @since 2004-10-27 @@ -225,6 +225,11 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { * reduction factor for small font */ define('K_SMALL_RATIO', 2/3); + + /** + * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language + */ + define('K_THAI_TOPCHARS', true); } //============================================================+ diff --git a/config/tcpdf_config_alt.php b/config/tcpdf_config_alt.php index 5d2825e..ce63b66 100755 --- a/config/tcpdf_config_alt.php +++ b/config/tcpdf_config_alt.php @@ -2,7 +2,7 @@ //============================================================+ // File name : tcpdf_config.php // Begin : 2004-06-11 -// Last Update : 2009-09-30 +// Last Update : 2010-04-01 // // Description : Alternative configuration file for TCPDF. // @@ -21,9 +21,9 @@ /** * Alternative configuration file for TCPDF. * @author Nicola Asuni - * @copyright 2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com + * @copyright 2004-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 * @package com.tecnick.tcpdf - * @version 4.0.014 + * @version 4.9.005 * @link http://tcpdf.sourceforge.net * @license http://www.gnu.org/copyleft/lesser.html LGPL * @since 2004-10-27 @@ -221,7 +221,12 @@ define('K_TITLE_MAGNIFICATION', 1.3); */ define('K_SMALL_RATIO', 2/3); +/** + * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language + */ +define('K_THAI_TOPCHARS', true); + //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ ?> diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index b058501..cf4b30a 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -55,7 +55,7 @@
- Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index afa29ac..b7c6090 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5548,7 +5548,7 @@ $frame)
- Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index a00bdcc..c7253b5 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -80,7 +80,7 @@ Source Location: /tcpdf.php

Version:

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

  • _putviewerpreferences
  • _putxobjectdict
  • _RC4
    • +
  • _textannobjstring
  • _textstring
  • _toJPEG
  • _Uvalue
    • @@ -655,7 +656,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  4.9.004 + version:  4.9.005 link:  http://www.tcpdf.org @@ -6281,7 +6282,7 @@ $diskcache = false])
    -

    method addExtGState [line 11733]

    +

    method addExtGState [line 11749]

    @@ -6386,7 +6387,7 @@ $fontfile = ''])
    -

    method addHtmlLink [line 8085]

    +

    method addHtmlLink [line 8101]

    @@ -6461,7 +6462,7 @@ $firstblock = false])
    -

    method addHTMLVertSpace [line 15798]

    +

    method addHTMLVertSpace [line 15837]

    @@ -6527,7 +6528,7 @@ $closing = false])
    -

    method addJavascriptObject [line 10353]

    +

    method addJavascriptObject [line 10369]

    @@ -6729,7 +6730,7 @@ $k)
    -

    method addTOC [line 16821]

    +

    method addTOC [line 16860]

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

    method AliasNbPages [line 11541]

    +

    method AliasNbPages [line 11557]

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

    method AliasNumPage [line 11568]

    +

    method AliasNumPage [line 11584]

    @@ -6948,7 +6949,7 @@ $spaces = 0])
    -

    method Arrow [line 9578]

    +

    method Arrow [line 9594]

    @@ -7026,7 +7027,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 7982]

    +

    method arrUTF8ToUTF16BE [line 7998]

    @@ -7101,7 +7102,7 @@ $setbom = true])
    -

    method Bookmark [line 10239]

    +

    method Bookmark [line 10255]

    @@ -7161,7 +7162,7 @@ $page = ''])
    -

    method Button [line 11247]

    +

    method Button [line 11263]

    @@ -7353,7 +7354,7 @@ $ignore_min_height = false])
    -

    method CheckBox [line 11177]

    +

    method CheckBox [line 11193]

    @@ -7497,7 +7498,7 @@ $addpage = true])
    -

    method Circle [line 9212]

    +

    method Circle [line 9228]

    @@ -7596,7 +7597,7 @@ $afinish:)
    -

    method Clip [line 12188]

    +

    method Clip [line 12204]

    + + + + + + + + + + @@ -7741,7 +7754,7 @@ $dom)
    -

    method colorRegistrationBar [line 11869]

    +

    method colorRegistrationBar [line 11885]

    @@ -7687,16 +7688,18 @@ $h)
    -

    method closeHTMLTagHandler [line 15428]

    +

    method closeHTMLTagHandler [line 15464]

    void closeHTMLTagHandler( &$dom, int -$key, [boolean -$cell = false], array -$dom) +$key, boolean +$cell, [int +$maxbottomliney = 0], array +$dom, int +$minstartliney)

    @@ -7724,6 +7727,16 @@ $dom)
    		int   $key   current element id
    int  $minstartliney  minimum y value of current line
    int  $maxbottomliney  maximum y value of current line
    boolean  
    @@ -7819,7 +7832,7 @@ $colors = 'A,R,G,B,C,M,Y,K'])
    -

    method ComboBox [line 11116]

    +

    method ComboBox [line 11132]

    @@ -7909,7 +7922,7 @@ $js = false])
    -

    method commitTransaction [line 16980]

    +

    method commitTransaction [line 17019]

    @@ -7937,7 +7950,7 @@ $js = false])
    -

    method convertHTMLColorToDec [line 8118]

    +

    method convertHTMLColorToDec [line 8134]

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

    method CoonsPatchMesh [line 12108]

    +

    method CoonsPatchMesh [line 12124]

    @@ -8078,7 +8091,7 @@ $coords_max = 1])
    -

    method cropMark [line 11967]

    +

    method cropMark [line 11983]

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

    method Curve [line 8987]

    +

    method Curve [line 9003]

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

    method deletePage [line 16679]

    +

    method deletePage [line 16718]

    @@ -8294,7 +8307,7 @@ $page)
    -

    method Ellipse [line 9108]

    +

    method Ellipse [line 9124]

    @@ -8411,7 +8424,7 @@ $afinish:)
    -

    method empty_string [line 17034]

    +

    method empty_string [line 17073]

    @@ -8548,7 +8561,7 @@ $msg)
    -

    method formatPageNumber [line 11645]

    +

    method formatPageNumber [line 11661]

    @@ -8587,7 +8600,7 @@ $num)
    -

    method formatTOCPageNumber [line 11657]

    +

    method formatTOCPageNumber [line 11673]

    @@ -8629,7 +8642,7 @@ $num)
    -

    method GetAbsX [line 5495]

    +

    method GetAbsX [line 5497]

    @@ -8660,7 +8673,7 @@ $num)
    -

    method getAliasNbPages [line 11553]

    +

    method getAliasNbPages [line 11569]

    @@ -8691,7 +8704,7 @@ $num)
    -

    method getAliasNumPage [line 11581]

    +

    method getAliasNumPage [line 11597]

    @@ -8722,7 +8735,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 10484]

    +

    method getAnnotOptFromJSProp [line 10500]

    @@ -8836,7 +8849,7 @@ $getarray = false])
    -

    method getBarcode [line 12687]

    +

    method getBarcode [line 12703]

    @@ -8864,7 +8877,7 @@ $getarray = false])
    -

    method getBorderMode [line 4330]

    +

    method getBorderMode [line 4332]

    @@ -8960,7 +8973,7 @@ $pagenum = ''])
    -

    method getBuffer [line 16365]

    +

    method getBuffer [line 16404]

    @@ -9087,7 +9100,7 @@ $ignore_min_height = false])
    -

    method getCellHeightRatio [line 11829]

    +

    method getCellHeightRatio [line 11845]

    @@ -9214,7 +9227,7 @@ $size = 0])
    -

    method getFontBuffer [line 16525]

    +

    method getFontBuffer [line 16564]

    @@ -9310,7 +9323,7 @@ $size = 0])
    -

    method getFontFamily [line 13173]

    +

    method getFontFamily [line 13189]

    @@ -9341,7 +9354,7 @@ $size = 0])
    -

    method getFontSize [line 13153]

    +

    method getFontSize [line 13169]

    @@ -9372,7 +9385,7 @@ $size = 0])
    -

    method getFontSizePt [line 13163]

    +

    method getFontSizePt [line 13179]

    @@ -9431,7 +9444,7 @@ $size = 0])
    -

    method getFontStyle [line 13183]

    +

    method getFontStyle [line 13199]

    @@ -9462,7 +9475,7 @@ $size = 0])
    -

    method getFooterFont [line 8043]

    +

    method getFooterFont [line 8059]

    @@ -9518,7 +9531,7 @@ $size = 0])
    -

    method getFormDefaultProp [line 10859]

    +

    method getFormDefaultProp [line 10875]

    @@ -9552,7 +9565,7 @@ $size = 0])
    -

    method getGDgamma [line 5435]

    +

    method getGDgamma [line 5437]

    @@ -9591,7 +9604,7 @@ $v)
    -

    method getGraphicVars [line 16233]

    +

    method getGraphicVars [line 16272]

    @@ -9622,7 +9635,7 @@ $v)
    -

    method getGroupPageNo [line 11594]

    +

    method getGroupPageNo [line 11610]

    @@ -9653,7 +9666,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 11604]

    +

    method getGroupPageNoFormatted [line 11620]

    @@ -9712,7 +9725,7 @@ $v)
    -

    method getHeaderFont [line 8023]

    +

    method getHeaderFont [line 8039]

    @@ -9768,7 +9781,7 @@ $v)
    -

    method getHtmlDomArray [line 13219]

    +

    method getHtmlDomArray [line 13235]

    @@ -9807,7 +9820,7 @@ $html)
    -

    method getHTMLUnitToUnits [line 15952]

    +

    method getHTMLUnitToUnits [line 15991]

    @@ -9873,7 +9886,7 @@ $point)
    -

    method getImageBuffer [line 16467]

    +

    method getImageBuffer [line 16506]

    @@ -9915,7 +9928,7 @@ $image)
    -

    method getImageFileType [line 4900]

    +

    method getImageFileType [line 4902]

    @@ -10072,7 +10085,7 @@ $imgfile)
    -

    method GetLineWidth [line 8701]

    +

    method GetLineWidth [line 8717]

    @@ -10106,7 +10119,7 @@ $imgfile)
    -

    method getMargins [line 13116]

    +

    method getMargins [line 13132]

    @@ -10179,7 +10192,7 @@ $s)
    -

    method getNumLines [line 4418]

    +

    method getNumLines [line 4420]

    @@ -10266,7 +10279,7 @@ $w = 0])
    -

    method getObjFilename [line 16297]

    +

    method getObjFilename [line 16336]

    @@ -10311,7 +10324,7 @@ $prefix)
    -

    method getOriginalMargins [line 13139]

    +

    method getOriginalMargins [line 13155]

    @@ -10376,7 +10389,7 @@ $prefix)
    -

    method getPageBuffer [line 16408]

    +

    method getPageBuffer [line 16447]

    @@ -10463,7 +10476,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 11616]

    +

    method getPageGroupAlias [line 11632]

    @@ -10542,7 +10555,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 11631]

    +

    method getPageNumGroupAlias [line 11647]

    @@ -10621,7 +10634,7 @@ $pagenum = ''])
    -

    method getPDFData [line 8066]

    +

    method getPDFData [line 8082]

    @@ -10646,7 +10659,7 @@ $pagenum = ''])
    -

    method getRemainingWidth [line 4802]

    +

    method getRemainingWidth [line 4804]

    @@ -10736,7 +10749,7 @@ $pagenum = ''])
    -

    method getSpaceString [line 13720]

    +

    method getSpaceString [line 13736]

    @@ -10836,7 +10849,7 @@ $getarray = false])
    -

    method GetX [line 5479]

    +

    method GetX [line 5481]

    @@ -10867,7 +10880,7 @@ $getarray = false])
    -

    method GetY [line 5506]

    +

    method GetY [line 5508]

    @@ -10898,7 +10911,7 @@ $getarray = false])
    -

    method get_mqr [line 5195]

    +

    method get_mqr [line 5197]

    @@ -10929,7 +10942,7 @@ $getarray = false])
    -

    method Gradient [line 12211]

    +

    method Gradient [line 12227]

    @@ -11014,7 +11027,7 @@ $coords)
    -

    method Image [line 4943]

    +

    method Image [line 4945]

    @@ -11146,7 +11159,7 @@ $hidden = false])
    -

    method ImageEps [line 12398]

    +

    method ImageEps [line 12414]

    @@ -11242,7 +11255,7 @@ $border = 0])
    -

    method ImagePngAlpha [line 5391]

    +

    method ImagePngAlpha [line 5393]

    @@ -11347,7 +11360,7 @@ $palign = ''])
    -

    method IncludeJS [line 10340]

    +

    method IncludeJS [line 10356]

    @@ -11389,7 +11402,7 @@ $script)
    -

    method intToRoman [line 16026]

    +

    method intToRoman [line 16065]

    @@ -11501,7 +11514,7 @@ $resetmargins = false])
    -

    method Line [line 8854]

    +

    method Line [line 8870]

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

    method LinearGradient [line 12068]

    +

    method LinearGradient [line 12084]

    @@ -11717,7 +11730,7 @@ $spaces = 0])
    -

    method ListBox [line 11056]

    +

    method ListBox [line 11072]

    @@ -11807,7 +11820,7 @@ $js = false])
    -

    method Ln [line 5448]

    +

    method Ln [line 5450]

    @@ -11855,7 +11868,7 @@ $cell = false])
    -

    method MirrorH [line 8473]

    +

    method MirrorH [line 8489]

    @@ -11897,7 +11910,7 @@ $x = ''])
    -

    method MirrorL [line 8509]

    +

    method MirrorL [line 8525]

    @@ -11951,7 +11964,7 @@ $y = ''])
    -

    method MirrorP [line 8496]

    +

    method MirrorP [line 8512]

    @@ -11999,7 +12012,7 @@ $y = ''])
    -

    method MirrorV [line 8484]

    +

    method MirrorV [line 8500]

    @@ -12041,7 +12054,7 @@ $y = ''])
    -

    method movePage [line 16542]

    +

    method movePage [line 16581]

    @@ -12089,7 +12102,7 @@ $topage)
    -

    method MultiCell [line 4171]

    +

    method MultiCell [line 4173]

    @@ -12215,7 +12228,7 @@ $maxh = 0])
    -

    method objclone [line 17023]

    +

    method objclone [line 17062]

    + + + + + + + + + + @@ -12342,7 +12367,7 @@ $dom)
    -

    method Output [line 5598]

    +

    method Output [line 5600]

    @@ -12288,16 +12301,18 @@ $object)
    -

    method openHTMLTagHandler [line 14854]

    +

    method openHTMLTagHandler [line 14888]

    void openHTMLTagHandler( &$dom, int -$key, [boolean -$cell = false], array -$dom) +$key, boolean +$cell, array +$dom, int +$minstartliney, int +$maxbottomliney)

    @@ -12325,6 +12340,16 @@ $dom)
    		int   $key   current element id
    int  $minstartliney  minimum y value of current line
    int  $maxbottomliney  maximum y value of current line
    boolean  
    @@ -12424,7 +12449,7 @@ $dest = 'I'])
    -

    method PageNoFormatted [line 11667]

    +

    method PageNoFormatted [line 11683]

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

    method PieSector [line 12320]

    +

    method PieSector [line 12336]

    @@ -12557,7 +12582,7 @@ $o:)
    -

    method pixelsToUnits [line 8175]

    +

    method pixelsToUnits [line 8191]

    @@ -12599,7 +12624,7 @@ $px)
    -

    method Polycurve [line 9044]

    +

    method Polycurve [line 9060]

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

    method Polygon [line 9264]

    +

    method Polygon [line 9280]

    @@ -12734,7 +12759,7 @@ $closed = true])
    -

    method PolyLine [line 9238]

    +

    method PolyLine [line 9254]

    @@ -12797,7 +12822,7 @@ $closed)
    -

    method putHtmlListBullet [line 16091]

    +

    method putHtmlListBullet [line 16130]

    @@ -12848,7 +12873,7 @@ $size = 10])
    -

    method RadialGradient [line 12086]

    +

    method RadialGradient [line 12102]

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

    method RadioButton [line 10968]

    +

    method RadioButton [line 10984]

    @@ -13016,7 +13041,7 @@ $js = false])
    -

    method readDiskCache [line 16337]

    +

    method readDiskCache [line 16376]

    @@ -13064,7 +13089,7 @@ $file)
    -

    method Rect [line 8889]

    +

    method Rect [line 8905]

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

    method registrationMark [line 12037]

    +

    method registrationMark [line 12053]

    @@ -13214,7 +13239,7 @@ $colb = array(255,255,255)])
    -

    method RegularPolygon [line 9389]

    +

    method RegularPolygon [line 9405]

    @@ -13367,7 +13392,7 @@ $txt = ''])
    -

    method revstrpos [line 17047]

    +

    method revstrpos [line 17086]

    @@ -13421,7 +13446,7 @@ $offset = 0])
    -

    method rfread [line 5361]

    +

    method rfread [line 5363]

    @@ -13472,7 +13497,7 @@ $length)
    -

    method rollbackTransaction [line 16994]

    +

    method rollbackTransaction [line 17033]

    @@ -13514,7 +13539,7 @@ $self = false])
    -

    method Rotate [line 8568]

    +

    method Rotate [line 8584]

    @@ -13568,7 +13593,7 @@ $y = ''])
    -

    method RoundedRect [line 9493]

    +

    method RoundedRect [line 9509]

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

    method Scale [line 8438]

    +

    method Scale [line 8454]

    @@ -13715,7 +13740,7 @@ $y = ''])
    -

    method ScaleX [line 8398]

    +

    method ScaleX [line 8414]

    @@ -13769,7 +13794,7 @@ $y = ''])
    -

    method ScaleXY [line 8424]

    +

    method ScaleXY [line 8440]

    @@ -13823,7 +13848,7 @@ $y = ''])
    -

    method ScaleY [line 8411]

    +

    method ScaleY [line 8427]

    @@ -13877,7 +13902,7 @@ $y = ''])
    -

    method selectColumn [line 17109]

    +

    method selectColumn [line 17148]

    @@ -13916,7 +13941,7 @@ $col = ''])
    -

    method setAlpha [line 11786]

    +

    method setAlpha [line 11802]

    @@ -14051,7 +14076,7 @@ $margin = 0])
    -

    method setBarcode [line 12677]

    +

    method setBarcode [line 12693]

    @@ -14087,7 +14112,7 @@ $bc = ''])
    -

    method SetBooklet [line 15866]

    +

    method SetBooklet [line 15905]

    @@ -14138,7 +14163,7 @@ $outer = -1])
    -

    method setBuffer [line 16347]

    +

    method setBuffer [line 16386]

    @@ -14177,7 +14202,7 @@ $data)
    -

    method setCellHeightRatio [line 11820]

    +

    method setCellHeightRatio [line 11836]

    @@ -14258,7 +14283,7 @@ $pad)
    -

    method setColumnsArray [line 17096]

    +

    method setColumnsArray [line 17135]

    @@ -14456,7 +14481,7 @@ $font)
    -

    method setDefaultTableColumns [line 11810]

    +

    method setDefaultTableColumns [line 11826]

    @@ -14696,7 +14721,7 @@ $tint = 100])
    -

    method setEqualColumns [line 17064]

    +

    method setEqualColumns [line 17103]

    @@ -14747,7 +14772,7 @@ $y = ''])
    -

    method setExtGState [line 11752]

    +

    method setExtGState [line 11768]

    @@ -14996,7 +15021,7 @@ $fontfile = ''])
    -

    method setFontBuffer [line 16483]

    +

    method setFontBuffer [line 16522]

    @@ -15083,7 +15108,7 @@ $size)
    -

    method setFontSubBuffer [line 16505]

    +

    method setFontSubBuffer [line 16544]

    @@ -15162,7 +15187,7 @@ $data)
    -

    method setFooterFont [line 8033]

    +

    method setFooterFont [line 8049]

    @@ -15237,7 +15262,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 10848]

    +

    method setFormDefaultProp [line 10864]

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

    method setGraphicVars [line 16264]

    +

    method setGraphicVars [line 16303]

    @@ -15400,7 +15425,7 @@ $hs = ''])
    -

    method setHeaderFont [line 8013]

    +

    method setHeaderFont [line 8029]

    @@ -15475,7 +15500,7 @@ $hm = 10])
    -

    method setHtmlLinksStyle [line 15937]

    +

    method setHtmlLinksStyle [line 15976]

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

    method setHtmlVSpace [line 15906]

    +

    method setHtmlVSpace [line 15945]

    @@ -15559,7 +15584,7 @@ $tagvs)
    -

    method setImageBuffer [line 16424]

    +

    method setImageBuffer [line 16463]

    @@ -15646,7 +15671,7 @@ $scale)
    -

    method setImageSubBuffer [line 16447]

    +

    method setImageSubBuffer [line 16486]

    @@ -15697,7 +15722,7 @@ $data)
    -

    method setJPEGQuality [line 11797]

    +

    method setJPEGQuality [line 11813]

    @@ -15778,7 +15803,7 @@ $keywords)
    -

    method setLanguageArray [line 8053]

    +

    method setLanguageArray [line 8069]

    @@ -15901,7 +15926,7 @@ $margin)
    -

    method SetLineStyle [line 8726]

    +

    method SetLineStyle [line 8742]

    @@ -15947,7 +15972,7 @@ $style)
    -

    method SetLineWidth [line 8685]

    +

    method SetLineWidth [line 8701]

    @@ -16043,7 +16068,7 @@ $page = -1])
    -

    method setListIndentWidth [line 15916]

    +

    method setListIndentWidth [line 15955]

    @@ -16082,7 +16107,7 @@ $width)
    -

    method setLIsymbol [line 15827]

    +

    method setLIsymbol [line 15866]

    @@ -16181,7 +16206,7 @@ $keepmargins = false])
    -

    method setOpenCell [line 15926]

    +

    method setOpenCell [line 15965]

    @@ -16268,7 +16293,7 @@ $resetmargins = false])
    -

    method setPageBuffer [line 16381]

    +

    method setPageBuffer [line 16420]

    @@ -16482,7 +16507,7 @@ $unit)
    -

    method setPDFVersion [line 11839]

    +

    method setPDFVersion [line 11855]

    @@ -16599,7 +16624,7 @@ $val = true])
    -

    method SetProtection [line 8338]

    +

    method SetProtection [line 8354]

    @@ -16740,7 +16765,7 @@ $resetx = true])
    -

    method setSignature [line 11498]

    +

    method setSignature [line 11514]

    @@ -17194,7 +17219,7 @@ $margin)
    -

    method setUserRights [line 11468]

    +

    method setUserRights [line 11484]

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

    method setViewerPreferences [line 11852]

    +

    method setViewerPreferences [line 11868]

    @@ -17302,7 +17327,7 @@ $preferences)
    -

    method setVisibility [line 11697]

    +

    method setVisibility [line 11713]

    @@ -17341,7 +17366,7 @@ $v)
    -

    method SetX [line 5519]

    +

    method SetX [line 5521]

    @@ -17383,7 +17408,7 @@ $x)
    -

    method SetXY [line 5582]

    +

    method SetXY [line 5584]

    @@ -17431,7 +17456,7 @@ $y)
    -

    method SetY [line 5551]

    +

    method SetY [line 5553]

    @@ -17479,7 +17504,7 @@ $resetx = true])
    -

    method set_mqr [line 5180]

    +

    method set_mqr [line 5182]

    @@ -17518,7 +17543,7 @@ $mqr)
    -

    method Skew [line 8628]

    +

    method Skew [line 8644]

    @@ -17578,7 +17603,7 @@ $y = ''])
    -

    method SkewX [line 8601]

    +

    method SkewX [line 8617]

    @@ -17632,7 +17657,7 @@ $y = ''])
    -

    method SkewY [line 8614]

    +

    method SkewY [line 8630]

    @@ -17686,7 +17711,7 @@ $y = ''])
    -

    method StarPolygon [line 9444]

    +

    method StarPolygon [line 9460]

    @@ -17858,7 +17883,7 @@ $format = ''])
    -

    method startPageGroup [line 11526]

    +

    method startPageGroup [line 11542]

    @@ -17897,7 +17922,7 @@ $page = ''])
    -

    method startTransaction [line 16963]

    +

    method startTransaction [line 17002]

    @@ -17925,7 +17950,7 @@ $page = ''])
    -

    method StartTransform [line 8366]

    +

    method StartTransform [line 8382]

    @@ -17956,7 +17981,7 @@ $page = ''])
    -

    method StopTransform [line 8381]

    +

    method StopTransform [line 8397]

    @@ -17987,7 +18012,7 @@ $page = ''])
    -

    method swapMargins [line 15882]

    +

    method swapMargins [line 15921]

    @@ -18095,7 +18120,7 @@ $clip = false])
    -

    method TextField [line 10877]

    +

    method TextField [line 10893]

    @@ -18179,7 +18204,7 @@ $js = false])
    -

    method Transform [line 8661]

    +

    method Transform [line 8677]

    @@ -18221,7 +18246,7 @@ $tm)
    -

    method Translate [line 8544]

    +

    method Translate [line 8560]

    @@ -18269,7 +18294,7 @@ $t_y)
    -

    method TranslateX [line 8521]

    +

    method TranslateX [line 8537]

    @@ -18311,7 +18336,7 @@ $t_x)
    -

    method TranslateY [line 8532]

    +

    method TranslateY [line 8548]

    @@ -18353,7 +18378,7 @@ $t_y)
    -

    method unhtmlentities [line 8186]

    +

    method unhtmlentities [line 8202]

    @@ -18392,7 +18417,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 4841]

    +

    method UniArrSubString [line 4843]

    @@ -18446,7 +18471,7 @@ $end = ''])
    -

    method unichr [line 4874]

    +

    method unichr [line 4876]

    @@ -18491,7 +18516,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 4862]

    +

    method UTF8ArrayToUniArray [line 4864]

    @@ -18533,7 +18558,7 @@ $ta)
    -

    method UTF8ArrSubString [line 4818]

    +

    method UTF8ArrSubString [line 4820]

    @@ -18584,7 +18609,7 @@ $end = ''])
    -

    method UTF8ArrToLatin1 [line 7923]

    +

    method UTF8ArrToLatin1 [line 7939]

    @@ -18626,7 +18651,7 @@ $unicode)
    -

    method utf8Bidi [line 9668]

    +

    method utf8Bidi [line 9684]

    @@ -18683,7 +18708,7 @@ $forcertl = false])
    -

    method utf8StrArrRev [line 9654]

    +

    method utf8StrArrRev [line 9670]

    @@ -18743,7 +18768,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 7786]

    +

    method UTF8StringToArray [line 7802]

    @@ -18809,7 +18834,7 @@ $str)
    -

    method utf8StrRev [line 9639]

    +

    method utf8StrRev [line 9655]

    @@ -18863,7 +18888,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 7893]

    +

    method UTF8ToLatin1 [line 7909]

    @@ -18905,7 +18930,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 7877]

    +

    method UTF8ToUTF16BE [line 7893]

    @@ -18956,7 +18981,7 @@ $setbom = true])
    -

    method Write [line 4462]

    +

    method Write [line 4464]

    @@ -19052,7 +19077,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 12706]

    +

    method write1DBarcode [line 12722]

    @@ -19142,7 +19167,7 @@ $align = ''])
    -

    method write2DBarcode [line 12963]

    +

    method write2DBarcode [line 12979]

    @@ -19226,7 +19251,7 @@ $align = ''])
    -

    method writeBarcode [line 12913]

    +

    method writeBarcode [line 12929]

    @@ -19316,7 +19341,7 @@ $code)
    -

    method writeDiskCache [line 16309]

    +

    method writeDiskCache [line 16348]

    @@ -19373,7 +19398,7 @@ $file)
    -

    method writeHTML [line 13740]

    +

    method writeHTML [line 13756]

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

    method writeHTMLCell [line 13207]

    +

    method writeHTMLCell [line 13223]

    @@ -19541,7 +19566,7 @@ $autopadding = true])
    -

    method _addfield [line 10449]

    +

    method _addfield [line 10465]

    @@ -19619,7 +19644,7 @@ $prop)
    -

    method _beginpage [line 7511]

    +

    method _beginpage [line 7513]

    @@ -19661,7 +19686,7 @@ $format = ''])
    -

    method _dataannobjstring [line 7660]

    +

    method _dataannobjstring [line 7662]

    @@ -19700,7 +19725,7 @@ $s)
    -

    method _datastring [line 7647]

    +

    method _datastring [line 7649]

    @@ -19739,7 +19764,7 @@ $s)
    -

    method _datestring [line 7673]

    +

    method _datestring [line 7675]

    @@ -19770,7 +19795,7 @@ $s)
    -

    method _destroy [line 5754]

    +

    method _destroy [line 5756]

    @@ -19815,7 +19840,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 5782]

    +

    method _dochecks [line 5784]

    @@ -19840,7 +19865,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 7586]

    +

    method _dolinethrough [line 7588]

    @@ -19888,7 +19913,7 @@ $txt)
    -

    method _dolinethroughw [line 7613]

    +

    method _dolinethroughw [line 7615]

    @@ -19945,7 +19970,7 @@ $txt)
    -

    method _dounderline [line 7574]

    +

    method _dounderline [line 7576]

    @@ -19993,7 +20018,7 @@ $txt)
    -

    method _dounderlinew [line 7599]

    +

    method _dounderlinew [line 7601]

    @@ -20044,7 +20069,7 @@ $w)
    -

    method _enddoc [line 7394]

    +

    method _enddoc [line 7396]

    @@ -20069,7 +20094,7 @@ $w)
    -

    method _endpage [line 7550]

    +

    method _endpage [line 7552]

    @@ -20094,7 +20119,7 @@ $w)
    -

    method _escape [line 7636]

    +

    method _escape [line 7638]

    @@ -20133,7 +20158,7 @@ $s)
    -

    method _escapetext [line 7698]

    +

    method _escapetext [line 7714]

    @@ -20172,7 +20197,7 @@ $s)
    -

    method _freadint [line 7625]

    +

    method _freadint [line 7627]

    @@ -20211,7 +20236,7 @@ $f)
    -

    method _generateencryptionkey [line 8306]

    +

    method _generateencryptionkey [line 8322]

    @@ -20265,7 +20290,7 @@ $protection)
    -

    method _getfontpath [line 5798]

    +

    method _getfontpath [line 5800]

    @@ -20290,7 +20315,7 @@ $protection)
    -

    method _JScolor [line 10425]

    +

    method _JScolor [line 10441]

    @@ -20332,7 +20357,7 @@ $color)
    -

    method _md5_16 [line 8267]

    +

    method _md5_16 [line 8283]

    @@ -20377,7 +20402,7 @@ $str)
    -

    method _newobj [line 7560]

    +

    method _newobj [line 7562]

    @@ -20405,7 +20430,7 @@ $str)
    -

    method _objectkey [line 8199]

    +

    method _objectkey [line 8215]

    @@ -20444,7 +20469,7 @@ $n)
    -

    method _out [line 7734]

    +

    method _out [line 7750]

    @@ -20480,7 +20505,7 @@ $s)
    -

    method _outarc [line 12300]

    +

    method _outarc [line 12316]

    @@ -20552,7 +20577,7 @@ $y3)
    -

    method _outCurve [line 8834]

    +

    method _outCurve [line 8850]

    @@ -20621,7 +20646,7 @@ $y3)
    -

    method _outLine [line 8798]

    +

    method _outLine [line 8814]

    @@ -20666,7 +20691,7 @@ $y)
    -

    method _outPoint [line 8784]

    +

    method _outPoint [line 8800]

    @@ -20711,7 +20736,7 @@ $y)
    -

    method _outRect [line 8815]

    +

    method _outRect [line 8831]

    @@ -20774,7 +20799,7 @@ $op)
    -

    method _Ovalue [line 8280]

    +

    method _Ovalue [line 8296]

    @@ -20825,7 +20850,7 @@ $owner_pass)
    -

    method _parsejpeg [line 5230]

    +

    method _parsejpeg [line 5232]

    @@ -20864,7 +20889,7 @@ $file)
    -

    method _parsepng [line 5256]

    +

    method _parsepng [line 5258]

    @@ -20903,7 +20928,7 @@ $file)
    -

    method _putannotsobjs [line 5981]

    +

    method _putannotsobjs [line 5983]

    @@ -20934,7 +20959,7 @@ $file)
    -

    method _putannotsrefs [line 5950]

    +

    method _putannotsrefs [line 5952]

    @@ -20976,7 +21001,7 @@ $n)
    -

    method _putAPXObject [line 6596]

    +

    method _putAPXObject [line 6598]

    @@ -21030,7 +21055,7 @@ $stream = ''])
    -

    method _putbookmarks [line 10267]

    +

    method _putbookmarks [line 10283]

    @@ -21061,7 +21086,7 @@ $stream = ''])
    -

    method _putcatalog [line 7219]

    +

    method _putcatalog [line 7221]

    @@ -21086,7 +21111,7 @@ $stream = ''])
    -

    method _putcidfont0 [line 6953]

    +

    method _putcidfont0 [line 6955]

    @@ -21162,7 +21187,7 @@ $font)
    -

    method _putencryption [line 8208]

    +

    method _putencryption [line 8224]

    @@ -21190,7 +21215,7 @@ $font)
    -

    method _putextgstates [line 11762]

    +

    method _putextgstates [line 11778]

    @@ -21229,7 +21254,7 @@ $gs)
    -

    method _putfonts [line 6624]

    +

    method _putfonts [line 6626]

    @@ -21254,7 +21279,7 @@ $gs)
    -

    method _putfontwidths [line 6762]

    +

    method _putfontwidths [line 6764]

    @@ -21302,7 +21327,7 @@ $cidoffset = 0])
    -

    method _putheader [line 7386]

    +

    method _putheader [line 7388]

    @@ -21327,7 +21352,7 @@ $cidoffset = 0])
    -

    method _putimages [line 7021]

    +

    method _putimages [line 7023]

    @@ -21352,7 +21377,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 7179]

    +

    method _putinfo [line 7181]

    @@ -21377,7 +21402,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 10365]

    +

    method _putjavascript [line 10381]

    @@ -21408,7 +21433,7 @@ $cidoffset = 0])
    -

    method _putocg [line 11676]

    +

    method _putocg [line 11692]

    @@ -21436,7 +21461,7 @@ $cidoffset = 0])
    -

    method _putpages [line 5809]

    +

    method _putpages [line 5811]

    @@ -21461,7 +21486,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 7104]

    +

    method _putresourcedict [line 7106]

    @@ -21486,7 +21511,7 @@ $cidoffset = 0])
    -

    method _putresources [line 7145]

    +

    method _putresources [line 7147]

    @@ -21511,7 +21536,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 12246]

    +

    method _putshaders [line 12262]

    @@ -21542,7 +21567,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 11397]

    +

    method _putsignature [line 11413]

    @@ -21573,7 +21598,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 7076]

    +

    method _putspotcolors [line 7078]

    @@ -21601,7 +21626,7 @@ $cidoffset = 0])
    -

    method _putstream [line 7716]

    +

    method _putstream [line 7732]

    diff --git a/tcpdf.php b/tcpdf.php index ba9bb77..13ec38c 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -2,9 +2,9 @@ //============================================================+ // File name : tcpdf.php // Begin : 2002-08-03 -// Last Update : 2010-03-31 +// Last Update : 2010-04-01 // Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org -// Version : 4.9.004 +// Version : 4.9.005 // 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.004 + * @version 4.9.005 */ /** @@ -155,14 +155,14 @@ if (!class_exists('TCPDF', false)) { /** * define default PDF document producer */ - define('PDF_PRODUCER', 'TCPDF 4.9.004 (http://www.tcpdf.org)'); + define('PDF_PRODUCER', 'TCPDF 4.9.005 (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.004 + * @version 4.9.005 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3289,7 +3289,7 @@ if (!class_exists('TCPDF', false)) { unset($cw); } // get specified font directory (if any) - $fontdir = ''; + $fontdir = false; if (!$this->empty_string($fontfile)) { $fontdir = dirname($fontfile); if ($this->empty_string($fontdir) OR ($fontdir == '.')) { @@ -3304,13 +3304,13 @@ if (!class_exists('TCPDF', false)) { $fontfile1 = str_replace(' ', '', $family).strtolower($style).'.php'; $fontfile2 = str_replace(' ', '', $family).'.php'; // search files on various directories - if (file_exists($fontdir.$fontfile1)) { + if (($fontdir !== false) AND file_exists($fontdir.$fontfile1)) { $fontfile = $fontdir.$fontfile1; } elseif (file_exists($this->_getfontpath().$fontfile1)) { $fontfile = $this->_getfontpath().$fontfile1; } elseif (file_exists($fontfile1)) { $fontfile = $fontfile1; - } elseif (file_exists($fontdir.$fontfile2)) { + } elseif (($fontdir !== false) AND file_exists($fontdir.$fontfile2)) { $fontfile = $fontdir.$fontfile2; } elseif (file_exists($this->_getfontpath().$fontfile2)) { $fontfile = $this->_getfontpath().$fontfile2; @@ -3513,7 +3513,7 @@ if (!class_exists('TCPDF', false)) { } return $ascent; } - + /** * Defines the default monospaced font. * @param string $font Font name. @@ -3947,32 +3947,34 @@ if (!class_exists('TCPDF', false)) { } else { $unicode = $this->UTF8StringToArray($txt); // array of UTF-8 unicode values $unicode = $this->utf8Bidi($unicode, '', $this->tmprtl); - // ---- Fix for bug #2977340 "Incorrect Thai characters position arrangement" ---- - // NOTE: this doesn't work with HTML justification - // Symbols that could overlap on the font top (only works in LTR) - $topchar = array(3611, 3613, 3615, 3650, 3651, 3652); // chars that extends on top - $topsym = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // symbols with top position - $numchars = count($unicode); // number of chars - $unik = 0; - $uniblock = array(); - $uniblock[$unik] = array(); - $uniblock[$unik][] = $unicode[0]; - // resolve overlapping conflicts by splitting the string in several parts - for ($i = 1; $i < $numchars; ++$i) { - // check if symbols overlaps at top - if (in_array($unicode[$i], $topsym) AND (in_array($unicode[($i - 1)], $topsym) OR in_array($unicode[($i - 1)], $topchar))) { - // move symbols to another array - ++$unik; - $uniblock[$unik] = array(); - $uniblock[$unik][] = $unicode[$i]; - ++$unik; - $uniblock[$unik] = array(); - $unicode[$i] = 8203; // Unicode Character 'ZERO WIDTH SPACE' (U+200B) - } else { - $uniblock[$unik][] = $unicode[$i]; + if (defined('K_THAI_TOPCHARS') AND (K_THAI_TOPCHARS == true)) { + // ---- Fix for bug #2977340 "Incorrect Thai characters position arrangement" ---- + // NOTE: this doesn't work with HTML justification + // Symbols that could overlap on the font top (only works in LTR) + $topchar = array(3611, 3613, 3615, 3650, 3651, 3652); // chars that extends on top + $topsym = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // symbols with top position + $numchars = count($unicode); // number of chars + $unik = 0; + $uniblock = array(); + $uniblock[$unik] = array(); + $uniblock[$unik][] = $unicode[0]; + // resolve overlapping conflicts by splitting the string in several parts + for ($i = 1; $i < $numchars; ++$i) { + // check if symbols overlaps at top + if (in_array($unicode[$i], $topsym) AND (in_array($unicode[($i - 1)], $topsym) OR in_array($unicode[($i - 1)], $topchar))) { + // move symbols to another array + ++$unik; + $uniblock[$unik] = array(); + $uniblock[$unik][] = $unicode[$i]; + ++$unik; + $uniblock[$unik] = array(); + $unicode[$i] = 8203; // Unicode Character 'ZERO WIDTH SPACE' (U+200B) + } else { + $uniblock[$unik][] = $unicode[$i]; + } } + // ---- END OF Fix for bug #2977340 } - // ---- END OF Fix for bug #2977340 $txt2 = $this->arrUTF8ToUTF16BE($unicode, false); } } @@ -5768,7 +5770,7 @@ if (!class_exists('TCPDF', false)) { AND ($val != 'signature_max_length') AND ($val != 'byterange_string') )) { - if (!$preserve_objcopy OR ($val != 'objcopy')) { + if ((!$preserve_objcopy OR ($val != 'objcopy')) AND isset($this->$val)) { unset($this->$val); } } @@ -6030,7 +6032,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' /FT /'.$pl['opt']['ft']; $formfield = true; } - $annots .= ' /Contents '.$this->_textstring($pl['txt']); + $annots .= ' /Contents '.$this->_textannobjstring($pl['txt']); $annots .= ' /P '.$this->page_obj_id[$n].' 0 R'; $annots .= ' /NM '.$this->_dataannobjstring(sprintf('%04u-%04u', $n, $key)); $annots .= ' /M '.$this->_datestring(); @@ -6182,19 +6184,19 @@ if (!class_exists('TCPDF', false)) { if (in_array(strtolower($pl['opt']['subtype']), $markups)) { // this is a markup type if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) { - $annots .= ' /T '.$this->_textstring($pl['opt']['t']); + $annots .= ' /T '.$this->_textannobjstring($pl['opt']['t']); } //$annots .= ' /Popup '; if (isset($pl['opt']['ca'])) { $annots .= ' /CA '.sprintf('%.4F', floatval($pl['opt']['ca'])); } if (isset($pl['opt']['rc'])) { - $annots .= ' /RC '.$this->_textstring($pl['opt']['rc']); + $annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']); } $annots .= ' /CreationDate '.$this->_datestring(); //$annots .= ' /IRT '; if (isset($pl['opt']['subj'])) { - $annots .= ' /Subj '.$this->_textstring($pl['opt']['subj']); + $annots .= ' /Subj '.$this->_textannobjstring($pl['opt']['subj']); } //$annots .= ' /RT '; //$annots .= ' /IT '; @@ -6262,10 +6264,10 @@ if (!class_exists('TCPDF', false)) { $annots .= ' /Q '.intval($pl['opt']['q']); } if (isset($pl['opt']['rc'])) { - $annots .= ' /RC '.$this->_textstring($pl['opt']['rc']); + $annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']); } if (isset($pl['opt']['ds'])) { - $annots .= ' /DS '.$this->_textstring($pl['opt']['ds']); + $annots .= ' /DS '.$this->_textannobjstring($pl['opt']['ds']); } if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) { $annots .= ' /CL ['; @@ -6485,7 +6487,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' '.$optval; } } else { - $annots .= ' '.$this->_textstring($pl['opt']['v']); + $annots .= ' '.$this->_textannobjstring($pl['opt']['v']); } } if (isset($pl['opt']['dv'])) { @@ -6498,7 +6500,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' '.$optval; } } else { - $annots .= ' '.$this->_textstring($pl['opt']['dv']); + $annots .= ' '.$this->_textannobjstring($pl['opt']['dv']); } } if (isset($pl['opt']['rv'])) { @@ -6511,7 +6513,7 @@ if (!class_exists('TCPDF', false)) { $annots .= ' '.$optval; } } else { - $annots .= ' '.$this->_textstring($pl['opt']['rv']); + $annots .= ' '.$this->_textannobjstring($pl['opt']['rv']); } } if (isset($pl['opt']['a']) AND !empty($pl['opt']['a'])) { @@ -6530,9 +6532,9 @@ if (!class_exists('TCPDF', false)) { $annots .= ' /Opt ['; foreach($pl['opt']['opt'] AS $copt) { if (is_array($copt)) { - $annots .= ' ['.$this->_textstring($copt[0]).' '.$this->_textstring($copt[1]).']'; + $annots .= ' ['.$this->_textannobjstring($copt[0]).' '.$this->_textannobjstring($copt[1]).']'; } else { - $annots .= ' '.$this->_textstring($copt); + $annots .= ' '.$this->_textannobjstring($copt); } } $annots .= ']'; @@ -6637,7 +6639,7 @@ if (!class_exists('TCPDF', false)) { $file = strtolower($file); $fontfile = ''; // search files on various directories - if (file_exists($fontdir.$file)) { + if (($fontdir !== false) AND file_exists($fontdir.$file)) { $fontfile = $fontdir.$file; } elseif (file_exists($this->_getfontpath().$file)) { $fontfile = $this->_getfontpath().$file; @@ -6899,7 +6901,7 @@ if (!class_exists('TCPDF', false)) { } $this->_out('/'.$key.' '.$value.''); } - $fontdir = ''; + $fontdir = false; if (!$this->empty_string($font['file'])) { // A stream containing a TrueType font $this->_out('/FontFile2 '.$this->FontFiles[$font['file']]['n'].' 0 R'); @@ -6916,7 +6918,7 @@ if (!class_exists('TCPDF', false)) { // search and get ctg font file to embedd $fontfile = ''; // search files on various directories - if (file_exists($fontdir.$ctgfile)) { + if (($fontdir !== false) AND file_exists($fontdir.$ctgfile)) { $fontfile = $fontdir.$ctgfile; } elseif (file_exists($this->_getfontpath().$ctgfile)) { $fontfile = $this->_getfontpath().$ctgfile; @@ -7689,6 +7691,20 @@ if (!class_exists('TCPDF', false)) { return $this->_datastring($s); } + /** + * Format a UTF-8 text string for meta information on annotations + * @param string $s string to escape. + * @return string escaped string. + * @access protected + */ + protected function _textannobjstring($s) { + if ($this->isunicode) { + //Convert string to UTF-16BE + $s = $this->UTF8ToUTF16BE($s, true); + } + return $this->_dataannobjstring($s); + } + /** * Format a text string * @param string $s string to escape. @@ -13218,7 +13234,7 @@ 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'); + $blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','ul','tcpdf','table','tr','td'); // 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 8a61c82..707dfcd 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21643,7 +21668,7 @@ $n = 0])
    -

    method _puttrailer [line 7372]

    +

    method _puttrailer [line 7374]

    diff --git a/doc/index.html b/doc/index.html index 8a61c82..707dfcd 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/errors.html b/doc/errors.html index 28a7d74..539b160 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Wed, 31 Mar 2010 01:13:41 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:07 +0200 by phpDocumentor 1.4.3
    @@ -21668,7 +21693,7 @@ $n = 0])
    -

    method _puttruetypeunicode [line 6861]

    +

    method _puttruetypeunicode [line 6863]

    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index e443dc9..f82a81f 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -212,6 +212,8 @@
    in file tcpdf.php, method TCPDF::_putxobjectdict()
        Output object dictionary for images.
    _RC4
    in file tcpdf.php, method TCPDF::_RC4()
        Returns the input text exrypted using RC4 algorithm and the specified key.
    +
    _textannobjstring
    +
    in file tcpdf.php, method TCPDF::_textannobjstring()
        Format a UTF-8 text string for meta information on annotations
    _textstring
    in file tcpdf.php, method TCPDF::_textstring()
        Format a text string for meta information
    _toJPEG
    @@ -1004,6 +1006,8 @@
    in file unicode_data.php, constant K_RLO
        Right-to-Left Override
    K_SMALL_RATIO
    in file tcpdf_config.php, constant K_SMALL_RATIO
        reduction factor for small font
    +
    K_THAI_TOPCHARS
    +
    in file tcpdf_config.php, constant K_THAI_TOPCHARS
        set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
    K_TITLE_MAGNIFICATION
    in file tcpdf_config.php, constant K_TITLE_MAGNIFICATION
        title magnification respect main font size
    @@ -1865,7 +1869,7 @@ top
    - Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:03 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex.html b/doc/elementindex.html index 316ea85..5fe38ae 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -843,6 +843,8 @@
    in file unicode_data.php, constant K_RLO
        Right-to-Left Override
    K_SMALL_RATIO
    in file tcpdf_config.php, constant K_SMALL_RATIO
        reduction factor for small font
    +
    K_THAI_TOPCHARS
    +
    in file tcpdf_config.php, constant K_THAI_TOPCHARS
        set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
    K_TITLE_MAGNIFICATION
    in file tcpdf_config.php, constant K_TITLE_MAGNIFICATION
        title magnification respect main font size
    @@ -1815,6 +1817,8 @@
    in file tcpdf.php, method TCPDF::_putxobjectdict()
        Output object dictionary for images.
    _RC4
    in file tcpdf.php, method TCPDF::_RC4()
        Returns the input text exrypted using RC4 algorithm and the specified key.
    +
    _textannobjstring
    +
    in file tcpdf.php, method TCPDF::_textannobjstring()
        Format a UTF-8 text string for meta information on annotations
    _textstring
    in file tcpdf.php, method TCPDF::_textstring()
        Format a text string for meta information
    _toJPEG
    @@ -1836,7 +1840,7 @@ top
    - Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21713,7 +21738,7 @@ $font)
    -

    method _putviewerpreferences [line 7302]

    +

    method _putviewerpreferences [line 7304]

    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index d745344..5727e7c 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 Wed, 31 Mar 2010 01:13:41 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:07 +0200 by phpDocumentor 1.4.3
    @@ -21744,7 +21769,7 @@ $font)
    -

    method _putxobjectdict [line 7093]

    +

    method _putxobjectdict [line 7095]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 34897d3..47f038e 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

    diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index d59c96c..3a85463 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21769,7 +21794,7 @@ $font)
    -

    method _RC4 [line 8227]

    +

    method _RC4 [line 8243]

    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 75c314e..1437df4 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21818,9 +21843,48 @@ $text)
    [ Top ]
    +
    + +

    method _textannobjstring [line 7700]

    +
    +
    +
    + string _textannobjstring( +string +$s) +
    +

    + + Format a UTF-8 text string for meta information on annotations



    +

    Tags:

    +
    + + + + + + + +
    return:  escaped string.
    access:  protected
    +
    +

    + + +

    Parameters:

    +
    + + + + + + +
    string  $s  string to escape.
    +

    +
    [ Top ]
    +
    -

    method _textstring [line 7684]

    +

    method _textstring [line 7686]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 597f2c0..357ed6b 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -74,10 +74,10 @@ Configuration file for TCPDF.



    - + - + @@ -223,6 +223,19 @@ Configuration file for TCPDF.



    reduction factor for small font


    [ Top ]


    +
    + +

    K_THAI_TOPCHARS [line 232]

    +
    +
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 5c31ccf..cefb64d 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21859,7 +21923,7 @@ $s)
    -

    method _toJPEG [line 5214]

    +

    method _toJPEG [line 5216]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 800ae4b..a2a3f28 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 Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 56b3a3e..6d58fae 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1374,7 +1374,7 @@ $type)
    - Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21901,7 +21965,7 @@ $file)
    -

    method _Uvalue [line 8293]

    +

    method _Uvalue [line 8309]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index ade6b14..a2c97c2 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -296,7 +296,7 @@ $type)
    - Documentation generated on Wed, 31 Mar 2010 01:13:38 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:04 +0200 by phpDocumentor 1.4.3
    @@ -21938,7 +22002,7 @@ $file)
    - Documentation generated on Wed, 31 Mar 2010 01:13:39 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:05 +0200 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  4.0.014version:  4.9.005
    copyright:  2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.comcopyright:  2004-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://tcpdf.sourceforge.net
    +
    + K_THAI_TOPCHARS = true +
    +
    + + set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language


    +
    +
    [ Top ]


    K_TITLE_MAGNIFICATION [line 222]

    @@ -513,7 +526,7 @@ Configuration file for TCPDF.



    - Documentation generated on Wed, 31 Mar 2010 01:13:41 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:07 +0200 by phpDocumentor 1.4.3
    		author:  Nicola Asuni
    version:  4.9.004version:  4.9.005
    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.004 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 4.9.005 (http://www.tcpdf.org)'
    @@ -121,7 +121,7 @@ unicode data

    - Documentation generated on Wed, 31 Mar 2010 01:13:39 +0200 by phpDocumentor 1.4.3 + Documentation generated on Thu, 01 Apr 2010 20:40:05 +0200 by phpDocumentor 1.4.3