From 83e7c1d8798846c2463734554756bd03259b65fd Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sat, 27 Mar 2010 19:29:49 +0100 Subject: [PATCH] 4.9.000 --- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/QRcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDF.html | 472 +++++++++--------- doc/com-tecnick-tcpdf/TCPDF2DBarcode.html | 2 +- doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +- doc/com-tecnick-tcpdf/_2dbarcodes.php.html | 2 +- doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +- .../_config---tcpdf_config.php.html | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_qrcode.php.html | 2 +- doc/com-tecnick-tcpdf/_tcpdf.php.html | 2 +- doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +- doc/elementindex.html | 2 +- doc/elementindex_com-tecnick-tcpdf.html | 2 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 19 +- 18 files changed, 267 insertions(+), 256 deletions(-) diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 327cb48..4b4da87 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -55,7 +55,7 @@

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 3c9d07b..0700e30 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5548,7 +5548,7 @@ $frame)

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:44 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 28f62e0..f22b85b 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -6136,7 +6136,7 @@ $diskcache = false])
-

method addExtGState [line 11590]

+

method addExtGState [line 11601]

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

method addHtmlLink [line 7942]

+

method addHtmlLink [line 7953]

@@ -6316,7 +6316,7 @@ $firstblock = false])
-

method addHTMLVertSpace [line 15601]

+

method addHTMLVertSpace [line 15612]

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

method addJavascriptObject [line 10210]

+

method addJavascriptObject [line 10221]

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

method addTOC [line 16624]

+

method addTOC [line 16635]

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

method AliasNbPages [line 11398]

+

method AliasNbPages [line 11409]

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

method AliasNumPage [line 11425]

+

method AliasNumPage [line 11436]

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

method Arrow [line 9435]

+

method Arrow [line 9446]

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

method arrUTF8ToUTF16BE [line 7839]

+

method arrUTF8ToUTF16BE [line 7850]

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

method Bookmark [line 10096]

+

method Bookmark [line 10107]

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

method Button [line 11104]

+

method Button [line 11115]

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

method CheckBox [line 11034]

+

method CheckBox [line 11045]

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

method Circle [line 9069]

+

method Circle [line 9080]

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

method Clip [line 12045]

+

method Clip [line 12056]

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

method closeHTMLTagHandler [line 15246]

+

method closeHTMLTagHandler [line 15257]

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

method colorRegistrationBar [line 11726]

+

method colorRegistrationBar [line 11737]

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

method ComboBox [line 10973]

+

method ComboBox [line 10984]

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

method commitTransaction [line 16782]

+

method commitTransaction [line 16793]

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

method convertHTMLColorToDec [line 7975]

+

method convertHTMLColorToDec [line 7986]

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

method CoonsPatchMesh [line 11965]

+

method CoonsPatchMesh [line 11976]

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

method cropMark [line 11824]

+

method cropMark [line 11835]

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

method Curve [line 8844]

+

method Curve [line 8855]

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

method deletePage [line 16482]

+

method deletePage [line 16493]

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

method Ellipse [line 8965]

+

method Ellipse [line 8976]

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

method empty_string [line 16836]

+

method empty_string [line 16847]

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

method formatPageNumber [line 11502]

+

method formatPageNumber [line 11513]

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

method formatTOCPageNumber [line 11514]

+

method formatTOCPageNumber [line 11525]

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

method GetAbsX [line 5352]

+

method GetAbsX [line 5363]

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

method getAliasNbPages [line 11410]

+

method getAliasNbPages [line 11421]

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

method getAliasNumPage [line 11438]

+

method getAliasNumPage [line 11449]

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

method getAnnotOptFromJSProp [line 10341]

+

method getAnnotOptFromJSProp [line 10352]

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

method getBarcode [line 12544]

+

method getBarcode [line 12555]

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

method getBorderMode [line 4190]

+

method getBorderMode [line 4201]

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

method getBuffer [line 16168]

+

method getBuffer [line 16179]

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

method getCellHeightRatio [line 11686]

+

method getCellHeightRatio [line 11697]

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

method getFontBuffer [line 16328]

+

method getFontBuffer [line 16339]

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

method getFontFamily [line 13030]

+

method getFontFamily [line 13041]

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

method getFontSize [line 13010]

+

method getFontSize [line 13021]

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

method getFontSizePt [line 13020]

+

method getFontSizePt [line 13031]

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

method getFontStyle [line 13040]

+

method getFontStyle [line 13051]

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

method getFooterFont [line 7900]

+

method getFooterFont [line 7911]

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

method getFormDefaultProp [line 10716]

+

method getFormDefaultProp [line 10727]

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

method getGDgamma [line 5295]

+

method getGDgamma [line 5306]

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

method getGraphicVars [line 16036]

+

method getGraphicVars [line 16047]

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

method getGroupPageNo [line 11451]

+

method getGroupPageNo [line 11462]

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

method getGroupPageNoFormatted [line 11461]

+

method getGroupPageNoFormatted [line 11472]

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

method getHeaderFont [line 7880]

+

method getHeaderFont [line 7891]

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

method getHtmlDomArray [line 13076]

+

method getHtmlDomArray [line 13087]

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

method getHTMLUnitToUnits [line 15755]

+

method getHTMLUnitToUnits [line 15766]

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

method getImageBuffer [line 16270]

+

method getImageBuffer [line 16281]

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

method getImageFileType [line 4760]

+

method getImageFileType [line 4771]

@@ -9819,7 +9819,7 @@ $imgfile)
-

method GetLineWidth [line 8558]

+

method GetLineWidth [line 8569]

@@ -9853,7 +9853,7 @@ $imgfile)
-

method getMargins [line 12973]

+

method getMargins [line 12984]

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

method getNumLines [line 4278]

+

method getNumLines [line 4289]

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

method getObjFilename [line 16100]

+

method getObjFilename [line 16111]

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

method getOriginalMargins [line 12996]

+

method getOriginalMargins [line 13007]

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

method getPageBuffer [line 16211]

+

method getPageBuffer [line 16222]

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

method getPageGroupAlias [line 11473]

+

method getPageGroupAlias [line 11484]

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

method getPageNumGroupAlias [line 11488]

+

method getPageNumGroupAlias [line 11499]

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

method getPDFData [line 7923]

+

method getPDFData [line 7934]

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

method getRemainingWidth [line 4662]

+

method getRemainingWidth [line 4673]

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

method getSpaceString [line 13568]

+

method getSpaceString [line 13579]

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

method GetX [line 5336]

+

method GetX [line 5347]

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

method GetY [line 5363]

+

method GetY [line 5374]

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

method get_mqr [line 5055]

+

method get_mqr [line 5066]

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

method Gradient [line 12068]

+

method Gradient [line 12079]

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

method Image [line 4803]

+

method Image [line 4814]

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

method ImageEps [line 12255]

+

method ImageEps [line 12266]

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

method ImagePngAlpha [line 5251]

+

method ImagePngAlpha [line 5262]

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

method IncludeJS [line 10197]

+

method IncludeJS [line 10208]

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

method intToRoman [line 15829]

+

method intToRoman [line 15840]

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

method Line [line 8711]

+

method Line [line 8722]

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

method LinearGradient [line 11925]

+

method LinearGradient [line 11936]

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

method ListBox [line 10913]

+

method ListBox [line 10924]

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

method Ln [line 5308]

+

method Ln [line 5319]

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

method MirrorH [line 8330]

+

method MirrorH [line 8341]

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

method MirrorL [line 8366]

+

method MirrorL [line 8377]

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

method MirrorP [line 8353]

+

method MirrorP [line 8364]

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

method MirrorV [line 8341]

+

method MirrorV [line 8352]

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

method movePage [line 16345]

+

method movePage [line 16356]

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

method MultiCell [line 4031]

+

method MultiCell [line 4042]

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

method objclone [line 16825]

+

method objclone [line 16836]

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

method openHTMLTagHandler [line 14692]

+

method openHTMLTagHandler [line 14703]

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

method Output [line 5455]

+

method Output [line 5466]

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

method PageNoFormatted [line 11524]

+

method PageNoFormatted [line 11535]

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

method PieSector [line 12177]

+

method PieSector [line 12188]

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

method pixelsToUnits [line 8032]

+

method pixelsToUnits [line 8043]

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

method Polycurve [line 8901]

+

method Polycurve [line 8912]

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

method Polygon [line 9121]

+

method Polygon [line 9132]

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

method PolyLine [line 9095]

+

method PolyLine [line 9106]

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

method putHtmlListBullet [line 15894]

+

method putHtmlListBullet [line 15905]

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

method RadialGradient [line 11943]

+

method RadialGradient [line 11954]

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

method RadioButton [line 10825]

+

method RadioButton [line 10836]

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

method readDiskCache [line 16140]

+

method readDiskCache [line 16151]

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

method Rect [line 8746]

+

method Rect [line 8757]

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

method registrationMark [line 11894]

+

method registrationMark [line 11905]

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

method RegularPolygon [line 9246]

+

method RegularPolygon [line 9257]

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

method revstrpos [line 16849]

+

method revstrpos [line 16860]

@@ -13168,7 +13168,7 @@ $offset = 0])
-

method rfread [line 5221]

+

method rfread [line 5232]

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

method rollbackTransaction [line 16796]

+

method rollbackTransaction [line 16807]

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

method Rotate [line 8425]

+

method Rotate [line 8436]

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

method RoundedRect [line 9350]

+

method RoundedRect [line 9361]

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

method Scale [line 8295]

+

method Scale [line 8306]

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

method ScaleX [line 8255]

+

method ScaleX [line 8266]

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

method ScaleXY [line 8281]

+

method ScaleXY [line 8292]

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

method ScaleY [line 8268]

+

method ScaleY [line 8279]

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

method setAlpha [line 11643]

+

method setAlpha [line 11654]

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

method setBarcode [line 12534]

+

method setBarcode [line 12545]

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

method SetBooklet [line 15669]

+

method SetBooklet [line 15680]

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

method setBuffer [line 16150]

+

method setBuffer [line 16161]

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

method setCellHeightRatio [line 11677]

+

method setCellHeightRatio [line 11688]

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

method setDefaultTableColumns [line 11667]

+

method setDefaultTableColumns [line 11678]

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

method setExtGState [line 11609]

+

method setExtGState [line 11620]

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

method setFontBuffer [line 16286]

+

method setFontBuffer [line 16297]

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

method setFontSubBuffer [line 16308]

+

method setFontSubBuffer [line 16319]

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

method setFooterFont [line 7890]

+

method setFooterFont [line 7901]

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

method setFormDefaultProp [line 10705]

+

method setFormDefaultProp [line 10716]

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

method setGraphicVars [line 16067]

+

method setGraphicVars [line 16078]

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

method setHeaderFont [line 7870]

+

method setHeaderFont [line 7881]

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

method setHtmlLinksStyle [line 15740]

+

method setHtmlLinksStyle [line 15751]

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

method setHtmlVSpace [line 15709]

+

method setHtmlVSpace [line 15720]

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

method setImageBuffer [line 16227]

+

method setImageBuffer [line 16238]

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

method setImageSubBuffer [line 16250]

+

method setImageSubBuffer [line 16261]

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

method setJPEGQuality [line 11654]

+

method setJPEGQuality [line 11665]

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

method setLanguageArray [line 7910]

+

method setLanguageArray [line 7921]

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

method SetLineStyle [line 8583]

+

method SetLineStyle [line 8594]

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

method SetLineWidth [line 8542]

+

method SetLineWidth [line 8553]

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

method setListIndentWidth [line 15719]

+

method setListIndentWidth [line 15730]

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

method setLIsymbol [line 15630]

+

method setLIsymbol [line 15641]

@@ -15799,7 +15799,7 @@ $keepmargins = false])
-

method setOpenCell [line 15729]

+

method setOpenCell [line 15740]

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

method setPageBuffer [line 16184]

+

method setPageBuffer [line 16195]

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

method setPDFVersion [line 11696]

+

method setPDFVersion [line 11707]

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

method SetProtection [line 8195]

+

method SetProtection [line 8206]

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

method setSignature [line 11355]

+

method setSignature [line 11366]

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

method setUserRights [line 11325]

+

method setUserRights [line 11336]

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

method setViewerPreferences [line 11709]

+

method setViewerPreferences [line 11720]

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

method setVisibility [line 11554]

+

method setVisibility [line 11565]

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

method SetX [line 5376]

+

method SetX [line 5387]

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

method SetXY [line 5439]

+

method SetXY [line 5450]

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

method SetY [line 5408]

+

method SetY [line 5419]

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

method set_mqr [line 5040]

+

method set_mqr [line 5051]

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

method Skew [line 8485]

+

method Skew [line 8496]

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

method SkewX [line 8458]

+

method SkewX [line 8469]

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

method SkewY [line 8471]

+

method SkewY [line 8482]

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

method StarPolygon [line 9301]

+

method StarPolygon [line 9312]

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

method startPageGroup [line 11383]

+

method startPageGroup [line 11394]

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

method startTransaction [line 16766]

+

method startTransaction [line 16777]

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

method StartTransform [line 8223]

+

method StartTransform [line 8234]

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

method StopTransform [line 8238]

+

method StopTransform [line 8249]

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

method swapMargins [line 15685]

+

method swapMargins [line 15696]

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

method TextField [line 10734]

+

method TextField [line 10745]

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

method Transform [line 8518]

+

method Transform [line 8529]

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

method Translate [line 8401]

+

method Translate [line 8412]

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

method TranslateX [line 8378]

+

method TranslateX [line 8389]

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

method TranslateY [line 8389]

+

method TranslateY [line 8400]

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

method unhtmlentities [line 8043]

+

method unhtmlentities [line 8054]

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

method UniArrSubString [line 4701]

+

method UniArrSubString [line 4712]

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

method unichr [line 4734]

+

method unichr [line 4745]

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

method UTF8ArrayToUniArray [line 4722]

+

method UTF8ArrayToUniArray [line 4733]

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

method UTF8ArrSubString [line 4678]

+

method UTF8ArrSubString [line 4689]

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

method UTF8ArrToLatin1 [line 7780]

+

method UTF8ArrToLatin1 [line 7791]

@@ -18244,7 +18244,7 @@ $unicode)
-

method utf8Bidi [line 9525]

+

method utf8Bidi [line 9536]

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

method utf8StrArrRev [line 9511]

+

method utf8StrArrRev [line 9522]

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

method UTF8StringToArray [line 7643]

+

method UTF8StringToArray [line 7654]

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

method utf8StrRev [line 9496]

+

method utf8StrRev [line 9507]

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

method UTF8ToLatin1 [line 7750]

+

method UTF8ToLatin1 [line 7761]

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

method UTF8ToUTF16BE [line 7734]

+

method UTF8ToUTF16BE [line 7745]

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

method Write [line 4322]

+

method Write [line 4333]

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

method write1DBarcode [line 12563]

+

method write1DBarcode [line 12574]

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

method write2DBarcode [line 12820]

+

method write2DBarcode [line 12831]

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

method writeBarcode [line 12770]

+

method writeBarcode [line 12781]

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

method writeDiskCache [line 16112]

+

method writeDiskCache [line 16123]

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

method writeHTML [line 13588]

+

method writeHTML [line 13599]

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

method writeHTMLCell [line 13064]

+

method writeHTMLCell [line 13075]

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

method _addfield [line 10306]

+

method _addfield [line 10317]

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

method _beginpage [line 7368]

+

method _beginpage [line 7379]

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

method _dataannobjstring [line 7517]

+

method _dataannobjstring [line 7528]

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

method _datastring [line 7504]

+

method _datastring [line 7515]

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

method _datestring [line 7530]

+

method _datestring [line 7541]

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

method _destroy [line 5611]

+

method _destroy [line 5622]

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

method _dochecks [line 5639]

+

method _dochecks [line 5650]

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

method _dolinethrough [line 7443]

+

method _dolinethrough [line 7454]

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

method _dolinethroughw [line 7470]

+

method _dolinethroughw [line 7481]

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

method _dounderline [line 7431]

+

method _dounderline [line 7442]

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

method _dounderlinew [line 7456]

+

method _dounderlinew [line 7467]

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

method _enddoc [line 7251]

+

method _enddoc [line 7262]

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

method _endpage [line 7407]

+

method _endpage [line 7418]

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

method _escape [line 7493]

+

method _escape [line 7504]

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

method _escapetext [line 7555]

+

method _escapetext [line 7566]

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

method _freadint [line 7482]

+

method _freadint [line 7493]

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

method _generateencryptionkey [line 8163]

+

method _generateencryptionkey [line 8174]

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

method _getfontpath [line 5655]

+

method _getfontpath [line 5666]

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

method _JScolor [line 10282]

+

method _JScolor [line 10293]

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

method _md5_16 [line 8124]

+

method _md5_16 [line 8135]

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

method _newobj [line 7417]

+

method _newobj [line 7428]

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

method _objectkey [line 8056]

+

method _objectkey [line 8067]

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

method _out [line 7591]

+

method _out [line 7602]

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

method _outarc [line 12157]

+

method _outarc [line 12168]

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

method _outCurve [line 8691]

+

method _outCurve [line 8702]

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

method _outLine [line 8655]

+

method _outLine [line 8666]

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

method _outPoint [line 8641]

+

method _outPoint [line 8652]

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

method _outRect [line 8672]

+

method _outRect [line 8683]

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

method _Ovalue [line 8137]

+

method _Ovalue [line 8148]

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

method _parsejpeg [line 5090]

+

method _parsejpeg [line 5101]

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

method _parsepng [line 5116]

+

method _parsepng [line 5127]

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

method _putannotsobjs [line 5838]

+

method _putannotsobjs [line 5849]

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

method _putannotsrefs [line 5807]

+

method _putannotsrefs [line 5818]

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

method _putAPXObject [line 6453]

+

method _putAPXObject [line 6464]

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

method _putbookmarks [line 10124]

+

method _putbookmarks [line 10135]

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

method _putcatalog [line 7076]

+

method _putcatalog [line 7087]

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

method _putcidfont0 [line 6810]

+

method _putcidfont0 [line 6821]

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

method _putencryption [line 8065]

+

method _putencryption [line 8076]

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

method _putextgstates [line 11619]

+

method _putextgstates [line 11630]

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

method _putfonts [line 6481]

+

method _putfonts [line 6492]

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

method _putfontwidths [line 6619]

+

method _putfontwidths [line 6630]

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

method _putheader [line 7243]

+

method _putheader [line 7254]

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

method _putimages [line 6878]

+

method _putimages [line 6889]

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

method _putinfo [line 7036]

+

method _putinfo [line 7047]

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

method _putjavascript [line 10222]

+

method _putjavascript [line 10233]

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

method _putocg [line 11533]

+

method _putocg [line 11544]

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

method _putpages [line 5666]

+

method _putpages [line 5677]

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

method _putresourcedict [line 6961]

+

method _putresourcedict [line 6972]

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

method _putresources [line 7002]

+

method _putresources [line 7013]

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

method _putshaders [line 12103]

+

method _putshaders [line 12114]

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

method _putsignature [line 11254]

+

method _putsignature [line 11265]

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

method _putspotcolors [line 6933]

+

method _putspotcolors [line 6944]

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

method _putstream [line 7573]

+

method _putstream [line 7584]

@@ -21261,7 +21261,7 @@ $n = 0])
-

method _puttrailer [line 7229]

+

method _puttrailer [line 7240]

diff --git a/tcpdf.php b/tcpdf.php index 1656aff..5a6997e 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -3840,22 +3840,33 @@ if (!class_exists('TCPDF', false)) { $txt2 = $this->_escape($txt2); // ---- Fix for bug #2977340 "Incorrect Thai characters position arrangement" ---- // Symbols that could overlap on the font top (only works in LTR) - $overtop = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // Thai + $topchar = array(3611, 3613, 3615, 3650, 3651, 3652); // chars that extends on top + $btmchar = array(); // chars that extends on bottom + $topsym = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // symbols with top position + $btmsym = array(); // symbols with bottom position $uniblock = array(); $numchars = count($unicode); // number of chars $shift = 0; - $vh = (0.13 * $this->FontSize * $this->k); // vertical shift to avoid overlapping + $vh = (0.2 * $this->FontSize * $this->k); // vertical shift to avoid overlapping // resolve overlapping conflicts by splitting the string in several parts for ($i = 1; $i < $numchars; ++$i) { $uniblock[] = $unicode[$i]; - // check if symbols overlaps - if (in_array($unicode[$i], $overtop) AND in_array($unicode[($i - 1)], $overtop)) { + // 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))) { // get postion on string $overpos = strlen($this->_escape($this->arrUTF8ToUTF16BE($uniblock, false))); $txt2 = substr($txt2, 0, ($overpos + $shift)).') Tj '.sprintf('%05.2F', $vh).' Ts ('.substr($txt2, ($overpos + $shift), 2).') Tj 0 Ts ('.substr($txt2, ($overpos + $shift + 2)); $shift += ($overpos + 26); $uniblock = array(); } + // check if symbols overlaps at bottom + if (in_array($unicode[$i], $btmsym) AND (in_array($unicode[($i - 1)], $btmsym) OR in_array($unicode[($i - 1)], $btmchar))) { + // get postion on string + $overpos = strlen($this->_escape($this->arrUTF8ToUTF16BE($uniblock, false))); + $txt2 = substr($txt2, 0, ($overpos + $shift)).') Tj -'.sprintf('%05.2F', $vh).' Ts ('.substr($txt2, ($overpos + $shift), 2).') Tj 0 Ts ('.substr($txt2, ($overpos + $shift + 2)); + $shift += ($overpos + 27); + $uniblock = array(); + } } // ---- END OF Fix for bug #2977340 "Incorrect Thai characters position arrangement" ---- }
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 8895aff..97077d6 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
@@ -21286,7 +21286,7 @@ $n = 0])
-

method _puttruetypeunicode [line 6718]

+

method _puttruetypeunicode [line 6729]

diff --git a/doc/index.html b/doc/index.html index 8895aff..97077d6 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
diff --git a/doc/errors.html b/doc/errors.html index 22edb05..2f09812 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing

- Documentation generated on Sat, 27 Mar 2010 18:54:43 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:46 +0100 by phpDocumentor 1.4.3
@@ -21331,7 +21331,7 @@ $font)
-

method _putviewerpreferences [line 7159]

+

method _putviewerpreferences [line 7170]

diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 5009560..22c717e 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -1845,7 +1845,7 @@ top

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
diff --git a/doc/elementindex.html b/doc/elementindex.html index a548525..2b73580 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -1816,7 +1816,7 @@ top

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
@@ -21362,7 +21362,7 @@ $font)
-

method _putxobjectdict [line 6950]

+

method _putxobjectdict [line 6961]

diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index 248b9ad..98ae723 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 Sat, 27 Mar 2010 18:54:43 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:46 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 8791980..a75779e 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -121,7 +121,7 @@ unicode data


- Documentation generated on Sat, 27 Mar 2010 18:54:41 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:44 +0100 by phpDocumentor 1.4.3
@@ -21387,7 +21387,7 @@ $font)
-

method _RC4 [line 8084]

+

method _RC4 [line 8095]

diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 8009e23..d86a6c5 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:44 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 48e4911..a4cf60c 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:44 +0100 by phpDocumentor 1.4.3
@@ -21438,7 +21438,7 @@ $text)
-

method _textstring [line 7541]

+

method _textstring [line 7552]

diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index 91b0031..6c63ffd 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -513,7 +513,7 @@ Configuration file for TCPDF.




- Documentation generated on Sat, 27 Mar 2010 18:54:43 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:46 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 868396b..1d0ac49 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
@@ -21477,7 +21477,7 @@ $s)
-

method _toJPEG [line 5074]

+

method _toJPEG [line 5085]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 23dbdd0..c5d29b3 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 Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 3c9109d..355e2a4 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1374,7 +1374,7 @@ $type)

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
@@ -21519,7 +21519,7 @@ $file)
-

method _Uvalue [line 8150]

+

method _Uvalue [line 8161]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 47044d4..cd8a4e6 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -296,7 +296,7 @@ $type)

- Documentation generated on Sat, 27 Mar 2010 18:54:40 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:43 +0100 by phpDocumentor 1.4.3
@@ -21556,7 +21556,7 @@ $file)

- Documentation generated on Sat, 27 Mar 2010 18:54:41 +0100 by phpDocumentor 1.4.3 + Documentation generated on Sat, 27 Mar 2010 19:29:44 +0100 by phpDocumentor 1.4.3