From 15ae4c9cb10ddb14b2ed5dc693a19686f268292e Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Tue, 17 Aug 2010 13:12:11 +0200 Subject: [PATCH] 5.8.004 --- CHANGELOG.TXT | 4 + README.TXT | 4 +- doc/classtrees_com-tecnick-tcpdf.html | 2 +- doc/com-tecnick-tcpdf/PDF417.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 | 2 +- doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +- doc/com-tecnick-tcpdf/_pdf417.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 | 8 +- doc/elementindex_com-tecnick-tcpdf.html | 8 +- doc/errors.html | 2 +- doc/index.html | 2 +- doc/li_com-tecnick-tcpdf.html | 2 +- tcpdf.php | 111 ++-- 22 files changed, 408 insertions(+), 317 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e9e90f6..c5d6d76 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.8.004 (2010-08-17) + - Better support for HTML and SVG "font-family" property. + - A bug related to HTML multicolumn was fixed. + 5.8.003 (2010-08-16) - Better support for HTML "font-family" property. diff --git a/README.TXT b/README.TXT index 8ef6775..ed8af32 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.8.003 -Release date: 2010-08-16 +Version: 5.8.004 +Release date: 2010-08-17 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index 826fbf9..b8dd4ef 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 15f6180..b7525d0 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 0f1f0c1..6a7e060 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 53791aa..8bc9432 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -391,6 +391,7 @@ Source Location: /tcpdf.php

  • getFontBuffer
  • getFontDescent
  • getFontFamily
    • +
  • getFontFamilyName
  • getFontSize
  • getFontSizePt
  • getFontsList
    • @@ -6886,7 +6887,7 @@ $diskcache = false])
    -

    method AcceptPageBreak [line 4845]

    +

    method AcceptPageBreak [line 4855]

    @@ -6917,7 +6918,7 @@ $diskcache = false])
    -

    method addExtGState [line 14702]

    +

    method addExtGState [line 14712]

    @@ -7028,7 +7029,7 @@ $subset = 'default'])
    -

    method addHtmlLink [line 10732]

    +

    method addHtmlLink [line 10742]

    @@ -7220,7 +7221,7 @@ $firstorlast = false])
    -

    method addJavascriptObject [line 13299]

    +

    method addJavascriptObject [line 13309]

    @@ -7271,7 +7272,7 @@ $onload = false])
    -

    method AddLink [line 4645]

    +

    method AddLink [line 4655]

    @@ -7545,7 +7546,7 @@ $keepmargins = false])
    -

    method AliasNbPages [line 14516]

    +

    method AliasNbPages [line 14526]

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

    method AliasNumPage [line 14543]

    +

    method AliasNumPage [line 14553]

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

    method Annotation [line 4701]

    +

    method Annotation [line 4711]

    @@ -7704,7 +7705,7 @@ $spaces = 0])
    -

    method Arrow [line 12503]

    +

    method Arrow [line 12513]

    @@ -7782,7 +7783,7 @@ $arm_angle = 15])
    -

    method arrUTF8ToUTF16BE [line 10627]

    +

    method arrUTF8ToUTF16BE [line 10637]

    @@ -7857,7 +7858,7 @@ $setbom = true])
    -

    method Bookmark [line 13171]

    +

    method Bookmark [line 13181]

    @@ -7917,7 +7918,7 @@ $page = ''])
    -

    method Button [line 14189]

    +

    method Button [line 14199]

    @@ -8013,7 +8014,7 @@ $js = false])
    -

    method Cell [line 4952]

    +

    method Cell [line 4962]

    @@ -8121,7 +8122,7 @@ $valign = 'M'])
    -

    method CheckBox [line 14119]

    +

    method CheckBox [line 14129]

    @@ -8211,7 +8212,7 @@ $js = false])
    -

    method checkPageBreak [line 4872]

    +

    method checkPageBreak [line 4882]

    @@ -8265,7 +8266,7 @@ $addpage = true])
    -

    method Circle [line 12191]

    +

    method Circle [line 12201]

    @@ -8364,7 +8365,7 @@ $angend:)
    -

    method Clip [line 15163]

    +

    method Clip [line 15173]

    @@ -8515,7 +8516,7 @@ $dom)
    -

    method colorRegistrationBar [line 14838]

    +

    method colorRegistrationBar [line 14848]

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

    method ComboBox [line 14058]

    +

    method ComboBox [line 14068]

    @@ -8711,7 +8712,7 @@ $js = false])
    -

    method convertHexStringToString [line 11354]

    +

    method convertHexStringToString [line 11364]

    @@ -8753,7 +8754,7 @@ $bs)
    -

    method convertHTMLColorToDec [line 10765]

    +

    method convertHTMLColorToDec [line 10775]

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

    method convertStringToHexString [line 11376]

    +

    method convertStringToHexString [line 11386]

    @@ -8837,7 +8838,7 @@ $s)
    -

    method convertSVGtMatrix [line 22487]

    +

    method convertSVGtMatrix [line 22524]

    @@ -8879,7 +8880,7 @@ $tm)
    -

    method CoonsPatchMesh [line 15078]

    +

    method CoonsPatchMesh [line 15088]

    @@ -9029,7 +9030,7 @@ $page = 0])
    -

    method cropMark [line 14936]

    +

    method cropMark [line 14946]

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

    method Curve [line 11996]

    +

    method Curve [line 12006]

    @@ -9290,7 +9291,7 @@ $xmax)
    -

    method Ellipse [line 12060]

    +

    method Ellipse [line 12070]

    @@ -9494,7 +9495,7 @@ $tocpage = false])
    -

    method endSVGElementHandler [line 23513]

    +

    method endSVGElementHandler [line 23550]

    @@ -9612,7 +9613,7 @@ $msg)
    -

    method extractCSSproperties [line 16351]

    +

    method extractCSSproperties [line 16361]

    @@ -9657,7 +9658,7 @@ $cssdata)
    -

    method fitBlock [line 6512]

    +

    method fitBlock [line 6522]

    @@ -9769,7 +9770,7 @@ $y)
    -

    method formatPageNumber [line 14620]

    +

    method formatPageNumber [line 14630]

    @@ -9808,7 +9809,7 @@ $num)
    -

    method formatTOCPageNumber [line 14632]

    +

    method formatTOCPageNumber [line 14642]

    @@ -9850,7 +9851,7 @@ $num)
    -

    method GetAbsX [line 7244]

    +

    method GetAbsX [line 7254]

    @@ -9881,7 +9882,7 @@ $num)
    -

    method getAliasNbPages [line 14528]

    +

    method getAliasNbPages [line 14538]

    @@ -9912,7 +9913,7 @@ $num)
    -

    method getAliasNumPage [line 14556]

    +

    method getAliasNumPage [line 14566]

    @@ -9943,7 +9944,7 @@ $num)
    -

    method getAnnotOptFromJSProp [line 13425]

    +

    method getAnnotOptFromJSProp [line 13435]

    @@ -10057,7 +10058,7 @@ $getarray = false])
    -

    method getBarcode [line 15800]

    +

    method getBarcode [line 15810]

    @@ -10085,7 +10086,7 @@ $getarray = false])
    -

    method getBorderMode [line 5823]

    +

    method getBorderMode [line 5833]

    @@ -10243,7 +10244,7 @@ $pagenum = ''])
    -

    method getCellBorder [line 5350]

    +

    method getCellBorder [line 5360]

    @@ -10318,7 +10319,7 @@ $mode)
    -

    method getCellCode [line 4983]

    +

    method getCellCode [line 4993]

    @@ -10429,7 +10430,7 @@ $valign = 'M'])
    -

    method getCellHeightRatio [line 14798]

    +

    method getCellHeightRatio [line 14808]

    @@ -10533,7 +10534,7 @@ $char)
    -

    method getCSSBorderDashStyle [line 16646]

    +

    method getCSSBorderDashStyle [line 16656]

    @@ -10575,7 +10576,7 @@ $style)
    -

    method getCSSBorderStyle [line 16682]

    +

    method getCSSBorderStyle [line 16692]

    @@ -10617,7 +10618,7 @@ $cssborder)
    -

    method getCSSBorderWidth [line 16626]

    +

    method getCSSBorderWidth [line 16636]

    @@ -10659,7 +10660,7 @@ $width)
    -

    method getEncPermissionsString [line 11393]

    +

    method getEncPermissionsString [line 11403]

    @@ -10701,7 +10702,7 @@ $protection)
    -

    method getFontAscent [line 4615]

    +

    method getFontAscent [line 4625]

    @@ -10800,7 +10801,7 @@ $font)
    -

    method getFontDescent [line 4592]

    +

    method getFontDescent [line 4602]

    @@ -10857,7 +10858,7 @@ $size = 0])
    -

    method getFontFamily [line 16329]

    +

    method getFontFamily [line 16339]

    @@ -10886,9 +10887,54 @@ $size = 0])
    [ Top ]
    +
    + +

    method getFontFamilyName [line 22081]

    +
    +
    +
    + string getFontFamilyName( +string +$fontfamily) +
    +

    + + Return normalized font name



    +

    Tags:

    +
    + + + + + + + + + + + + + +
    return:  normalized font name
    author:  Nicola Asuni
    since:  5.8.004 (2010-08-17)
    access:  public
    +
    +

    + + +

    Parameters:

    +
    + + + + + + +
    string  $fontfamily  property string containing font family names
    +

    +
    [ Top ]
    +
    -

    method getFontSize [line 16309]

    +

    method getFontSize [line 16319]

    @@ -10919,7 +10965,7 @@ $size = 0])
    -

    method getFontSizePt [line 16319]

    +

    method getFontSizePt [line 16329]

    @@ -10978,7 +11024,7 @@ $size = 0])
    -

    method getFontStyle [line 16339]

    +

    method getFontStyle [line 16349]

    @@ -11043,7 +11089,7 @@ $size = 0])
    -

    method getFooterFont [line 10690]

    +

    method getFooterFont [line 10700]

    @@ -11099,7 +11145,7 @@ $size = 0])
    -

    method getFormDefaultProp [line 13800]

    +

    method getFormDefaultProp [line 13810]

    @@ -11133,7 +11179,7 @@ $size = 0])
    -

    method getGDgamma [line 7184]

    +

    method getGDgamma [line 7194]

    @@ -11203,7 +11249,7 @@ $v)
    -

    method getGroupPageNo [line 14569]

    +

    method getGroupPageNo [line 14579]

    @@ -11234,7 +11280,7 @@ $v)
    -

    method getGroupPageNoFormatted [line 14579]

    +

    method getGroupPageNoFormatted [line 14589]

    @@ -11293,7 +11339,7 @@ $v)
    -

    method getHeaderFont [line 10670]

    +

    method getHeaderFont [line 10680]

    @@ -11349,7 +11395,7 @@ $v)
    -

    method getHtmlDomArray [line 16730]

    +

    method getHtmlDomArray [line 16740]

    @@ -11541,7 +11587,7 @@ $image)
    -

    method getImageFileType [line 6482]

    +

    method getImageFileType [line 6492]

    @@ -11704,7 +11750,7 @@ $iminfo = array()])
    -

    method GetLineWidth [line 11736]

    +

    method GetLineWidth [line 11746]

    @@ -11738,7 +11784,7 @@ $iminfo = array()])
    -

    method getMargins [line 16272]

    +

    method getMargins [line 16282]

    @@ -11811,7 +11857,7 @@ $s)
    -

    method getNumLines [line 5901]

    +

    method getNumLines [line 5911]

    @@ -11965,7 +12011,7 @@ $prefix)
    -

    method getOriginalMargins [line 16295]

    +

    method getOriginalMargins [line 16305]

    @@ -12117,7 +12163,7 @@ $pagenum = ''])
    -

    method getPageGroupAlias [line 14591]

    +

    method getPageGroupAlias [line 14601]

    @@ -12196,7 +12242,7 @@ $pagenum = ''])
    -

    method getPageNumGroupAlias [line 14606]

    +

    method getPageNumGroupAlias [line 14616]

    @@ -12371,7 +12417,7 @@ $mode)
    -

    method getPDFData [line 10713]

    +

    method getPDFData [line 10723]

    @@ -12396,7 +12442,7 @@ $mode)
    -

    method getRemainingWidth [line 6383]

    +

    method getRemainingWidth [line 6393]

    @@ -12486,7 +12532,7 @@ $mode)
    -

    method getSpaceString [line 17437]

    +

    method getSpaceString [line 17433]

    @@ -12517,7 +12563,7 @@ $mode)
    -

    method getStringHeight [line 6002]

    +

    method getStringHeight [line 6012]

    @@ -12689,7 +12735,7 @@ $getarray = false])
    -

    method getSVGTransformMatrix [line 22365]

    +

    method getSVGTransformMatrix [line 22402]

    @@ -12734,7 +12780,7 @@ $attribute)
    -

    method getTagStyleFromCSS [line 16598]

    +

    method getTagStyleFromCSS [line 16608]

    @@ -12788,7 +12834,7 @@ $css)
    -

    method getTransformationMatrixProduct [line 22469]

    +

    method getTransformationMatrixProduct [line 22506]

    @@ -12839,7 +12885,7 @@ $tb)
    -

    method getUserPermissionCode [line 11233]

    +

    method getUserPermissionCode [line 11243]

    @@ -12887,7 +12933,7 @@ $mode = 0])
    -

    method getVectorsAngle [line 23099]

    +

    method getVectorsAngle [line 23136]

    @@ -12947,7 +12993,7 @@ $y2)
    -

    method GetX [line 7228]

    +

    method GetX [line 7238]

    @@ -12978,7 +13024,7 @@ $y2)
    -

    method GetY [line 7255]

    +

    method GetY [line 7265]

    @@ -13009,7 +13055,7 @@ $y2)
    -

    method get_mqr [line 6900]

    +

    method get_mqr [line 6910]

    @@ -13040,7 +13086,7 @@ $y2)
    -

    method Gradient [line 15187]

    +

    method Gradient [line 15197]

    @@ -13293,7 +13339,7 @@ $charmax = 8])
    -

    method Image [line 6589]

    +

    method Image [line 6599]

    @@ -13431,7 +13477,7 @@ $fitonpage = false])
    -

    method ImageEps [line 15533]

    +

    method ImageEps [line 15543]

    @@ -13533,7 +13579,7 @@ $fitonpage = false])
    -

    method ImagePngAlpha [line 7140]

    +

    method ImagePngAlpha [line 7150]

    @@ -13650,7 +13696,7 @@ $palign)
    -

    method ImageSVG [line 22094]

    +

    method ImageSVG [line 22131]

    @@ -13746,7 +13792,7 @@ $fitonpage = false])
    -

    method IncludeJS [line 13286]

    +

    method IncludeJS [line 13296]

    @@ -13892,7 +13938,7 @@ $number)
    -

    method isValidCSSSelectorForTag [line 16439]

    +

    method isValidCSSSelectorForTag [line 16449]

    @@ -13988,7 +14034,7 @@ $resetmargins = false])
    -

    method Line [line 11913]

    +

    method Line [line 11923]

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

    method LinearGradient [line 15037]

    +

    method LinearGradient [line 15047]

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

    method Link [line 4684]

    +

    method Link [line 4694]

    @@ -14204,7 +14250,7 @@ $spaces = 0])
    -

    method ListBox [line 13998]

    +

    method ListBox [line 14008]

    @@ -14294,7 +14340,7 @@ $js = false])
    -

    method Ln [line 7197]

    +

    method Ln [line 7207]

    @@ -14342,7 +14388,7 @@ $cell = false])
    -

    method MirrorH [line 11518]

    +

    method MirrorH [line 11528]

    @@ -14384,7 +14430,7 @@ $x = ''])
    -

    method MirrorL [line 11554]

    +

    method MirrorL [line 11564]

    @@ -14438,7 +14484,7 @@ $y = ''])
    -

    method MirrorP [line 11541]

    +

    method MirrorP [line 11551]

    @@ -14486,7 +14532,7 @@ $y = ''])
    -

    method MirrorV [line 11529]

    +

    method MirrorV [line 11539]

    @@ -14576,7 +14622,7 @@ $topage)
    -

    method MultiCell [line 5553]

    +

    method MultiCell [line 5563]

    @@ -14841,7 +14887,7 @@ $dom)
    -

    method Output [line 7347]

    +

    method Output [line 7357]

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

    method PageNoFormatted [line 14642]

    +

    method PageNoFormatted [line 14652]

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

    method PieSector [line 15472]

    +

    method PieSector [line 15482]

    @@ -15050,7 +15096,7 @@ $o:)
    -

    method PieSectorXY [line 15493]

    +

    method PieSectorXY [line 15503]

    @@ -15158,7 +15204,7 @@ $o:)
    -

    method pixelsToUnits [line 10832]

    +

    method pixelsToUnits [line 10842]

    @@ -15200,7 +15246,7 @@ $px)
    -

    method Polycurve [line 12023]

    +

    method Polycurve [line 12033]

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

    method Polygon [line 12229]

    +

    method Polygon [line 12239]

    @@ -15335,7 +15381,7 @@ $closed = true])
    -

    method PolyLine [line 12210]

    +

    method PolyLine [line 12220]

    @@ -15449,7 +15495,7 @@ $size = 10])
    -

    method RadialGradient [line 15055]

    +

    method RadialGradient [line 15065]

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

    method RadioButton [line 13909]

    +

    method RadioButton [line 13919]

    @@ -15665,7 +15711,7 @@ $file)
    -

    method Rect [line 11941]

    +

    method Rect [line 11951]

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

    method registrationMark [line 15006]

    +

    method registrationMark [line 15016]

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

    method RegularPolygon [line 12327]

    +

    method RegularPolygon [line 12337]

    @@ -15926,7 +15972,7 @@ $r:)
    -

    method removeSHY [line 4925]

    +

    method removeSHY [line 4935]

    @@ -16061,7 +16107,7 @@ $offset = 0])
    -

    method rfread [line 7108]

    +

    method rfread [line 7118]

    @@ -16154,7 +16200,7 @@ $self = false])
    -

    method Rotate [line 11610]

    +

    method Rotate [line 11620]

    @@ -16208,7 +16254,7 @@ $y = ''])
    -

    method RoundedRect [line 12417]

    +

    method RoundedRect [line 12427]

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

    method RoundedRectXY [line 12436]

    +

    method RoundedRectXY [line 12446]

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

    method Scale [line 11486]

    +

    method Scale [line 11496]

    @@ -16448,7 +16494,7 @@ $y = ''])
    -

    method ScaleX [line 11446]

    +

    method ScaleX [line 11456]

    @@ -16502,7 +16548,7 @@ $y = ''])
    -

    method ScaleXY [line 11472]

    +

    method ScaleXY [line 11482]

    @@ -16556,7 +16602,7 @@ $y = ''])
    -

    method ScaleY [line 11459]

    +

    method ScaleY [line 11469]

    @@ -16610,7 +16656,7 @@ $y = ''])
    -

    method segSVGContentHandler [line 23552]

    +

    method segSVGContentHandler [line 23589]

    @@ -16739,7 +16785,7 @@ $pararray)
    -

    method setAlpha [line 14755]

    +

    method setAlpha [line 14765]

    @@ -16874,7 +16920,7 @@ $margin = 0])
    -

    method setBarcode [line 15790]

    +

    method setBarcode [line 15800]

    @@ -17000,7 +17046,7 @@ $data)
    -

    method setCellHeightRatio [line 14789]

    +

    method setCellHeightRatio [line 14799]

    @@ -17240,7 +17286,7 @@ $creator)
    -

    method SetDefaultMonospacedFont [line 4634]

    +

    method SetDefaultMonospacedFont [line 4644]

    @@ -17279,7 +17325,7 @@ $font)
    -

    method setDefaultTableColumns [line 14779]

    +

    method setDefaultTableColumns [line 14789]

    @@ -17588,7 +17634,7 @@ $y = ''])
    -

    method setExtGState [line 14721]

    +

    method setExtGState [line 14731]

    @@ -17777,7 +17823,7 @@ $tint = 100])
    -

    method SetFont [line 4542]

    +

    method SetFont [line 4552]

    @@ -17891,7 +17937,7 @@ $data)
    -

    method SetFontSize [line 4563]

    +

    method SetFontSize [line 4573]

    @@ -18060,7 +18106,7 @@ $enable = true])
    -

    method setFooterFont [line 10680]

    +

    method setFooterFont [line 10690]

    @@ -18135,7 +18181,7 @@ $fm = 10])
    -

    method setFormDefaultProp [line 13789]

    +

    method setFormDefaultProp [line 13799]

    @@ -18298,7 +18344,7 @@ $hs = ''])
    -

    method setHeaderFont [line 10660]

    +

    method setHeaderFont [line 10670]

    @@ -18595,7 +18641,7 @@ $data)
    -

    method setJPEGQuality [line 14766]

    +

    method setJPEGQuality [line 14776]

    @@ -18676,7 +18722,7 @@ $keywords)
    -

    method setLanguageArray [line 10700]

    +

    method setLanguageArray [line 10710]

    @@ -18799,7 +18845,7 @@ $margin)
    -

    method SetLineStyle [line 11763]

    +

    method SetLineStyle [line 11773]

    @@ -18854,7 +18900,7 @@ $ret = false])
    -

    method SetLineWidth [line 11720]

    +

    method SetLineWidth [line 11730]

    @@ -18896,7 +18942,7 @@ $width)
    -

    method SetLink [line 4661]

    +

    method SetLink [line 4671]

    @@ -19467,7 +19513,7 @@ $unit)
    -

    method setPDFVersion [line 14808]

    +

    method setPDFVersion [line 14818]

    @@ -19584,7 +19630,7 @@ $val = true])
    -

    method SetProtection [line 11277]

    +

    method SetProtection [line 11287]

    @@ -19776,7 +19822,7 @@ $resetx = true])
    -

    method setSignature [line 14448]

    +

    method setSignature [line 14458]

    @@ -19848,7 +19894,7 @@ $info = array()])
    -

    method setSignatureAppearance [line 14481]

    +

    method setSignatureAppearance [line 14491]

    @@ -20001,7 +20047,7 @@ $subject)
    -

    method setSVGStyles [line 22526]

    +

    method setSVGStyles [line 22563]

    @@ -20437,7 +20483,7 @@ $margin)
    -

    method setUserRights [line 14415]

    +

    method setUserRights [line 14425]

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

    method setViewerPreferences [line 14821]

    +

    method setViewerPreferences [line 14831]

    @@ -20545,7 +20591,7 @@ $preferences)
    -

    method setVisibility [line 14666]

    +

    method setVisibility [line 14676]

    @@ -20584,7 +20630,7 @@ $v)
    -

    method SetX [line 7268]

    +

    method SetX [line 7278]

    @@ -20632,7 +20678,7 @@ $rtloff = false])
    -

    method SetXY [line 7332]

    +

    method SetXY [line 7342]

    @@ -20686,7 +20732,7 @@ $rtloff = false])
    -

    method SetY [line 7300]

    +

    method SetY [line 7310]

    @@ -20740,7 +20786,7 @@ $rtloff = false])
    -

    method set_mqr [line 6885]

    +

    method set_mqr [line 6895]

    @@ -20779,7 +20825,7 @@ $mqr)
    -

    method Skew [line 11666]

    +

    method Skew [line 11676]

    @@ -20839,7 +20885,7 @@ $y = ''])
    -

    method SkewX [line 11639]

    +

    method SkewX [line 11649]

    @@ -20893,7 +20939,7 @@ $y = ''])
    -

    method SkewY [line 11652]

    +

    method SkewY [line 11662]

    @@ -20947,7 +20993,7 @@ $y = ''])
    -

    method StarPolygon [line 12375]

    +

    method StarPolygon [line 12385]

    @@ -21125,7 +21171,7 @@ $tocpage = false])
    -

    method startPageGroup [line 14501]

    +

    method startPageGroup [line 14511]

    @@ -21164,7 +21210,7 @@ $page = ''])
    -

    method startSVGElementHandler [line 23122]

    +

    method startSVGElementHandler [line 23159]

    @@ -21246,7 +21292,7 @@ $attribs)
    -

    method StartTransform [line 11414]

    +

    method StartTransform [line 11424]

    @@ -21277,7 +21323,7 @@ $attribs)
    -

    method StopTransform [line 11429]

    +

    method StopTransform [line 11439]

    @@ -21461,7 +21507,7 @@ $replace = ''])
    -

    method SVGPath [line 22781]

    +

    method SVGPath [line 22818]

    @@ -21512,7 +21558,7 @@ $style = ''])
    -

    method SVGTransform [line 22507]

    +

    method SVGTransform [line 22544]

    @@ -21629,7 +21675,7 @@ $page)
    -

    method Text [line 4825]

    +

    method Text [line 4835]

    @@ -21761,7 +21807,7 @@ $rtloff = false])
    -

    method TextField [line 13818]

    +

    method TextField [line 13828]

    @@ -21845,7 +21891,7 @@ $js = false])
    -

    method Transform [line 11696]

    +

    method Transform [line 11706]

    @@ -21887,7 +21933,7 @@ $tm)
    -

    method Translate [line 11589]

    +

    method Translate [line 11599]

    @@ -21935,7 +21981,7 @@ $t_y)
    -

    method TranslateX [line 11566]

    +

    method TranslateX [line 11576]

    @@ -21977,7 +22023,7 @@ $t_x)
    -

    method TranslateY [line 11577]

    +

    method TranslateY [line 11587]

    @@ -22019,7 +22065,7 @@ $t_y)
    -

    method unhtmlentities [line 10843]

    +

    method unhtmlentities [line 10853]

    @@ -22058,7 +22104,7 @@ $text_to_convert)
    -

    method UniArrSubString [line 6422]

    +

    method UniArrSubString [line 6432]

    @@ -22112,7 +22158,7 @@ $end = ''])
    -

    method unichr [line 6455]

    +

    method unichr [line 6465]

    @@ -22157,7 +22203,7 @@ $c)
    -

    method UTF8ArrayToUniArray [line 6443]

    +

    method UTF8ArrayToUniArray [line 6453]

    @@ -22199,7 +22245,7 @@ $ta)
    -

    method UTF8ArrSubString [line 6399]

    +

    method UTF8ArrSubString [line 6409]

    @@ -22250,7 +22296,7 @@ $end = ''])
    -

    method UTF8ArrToLatin1 [line 10568]

    +

    method UTF8ArrToLatin1 [line 10578]

    @@ -22292,7 +22338,7 @@ $unicode)
    -

    method utf8Bidi [line 12597]

    +

    method utf8Bidi [line 12607]

    @@ -22349,7 +22395,7 @@ $forcertl = false])
    -

    method utf8StrArrRev [line 12583]

    +

    method utf8StrArrRev [line 12593]

    @@ -22409,7 +22455,7 @@ $forcertl = false])
    -

    method UTF8StringToArray [line 10403]

    +

    method UTF8StringToArray [line 10413]

    @@ -22475,7 +22521,7 @@ $str)
    -

    method utf8StrRev [line 12568]

    +

    method utf8StrRev [line 12578]

    @@ -22529,7 +22575,7 @@ $forcertl = false])
    -

    method UTF8ToLatin1 [line 10538]

    +

    method UTF8ToLatin1 [line 10548]

    @@ -22571,7 +22617,7 @@ $str)
    -

    method UTF8ToUTF16BE [line 10522]

    +

    method UTF8ToUTF16BE [line 10532]

    @@ -22622,7 +22668,7 @@ $setbom = true])
    -

    method Write [line 6042]

    +

    method Write [line 6052]

    @@ -22718,7 +22764,7 @@ $maxh = 0])
    -

    method write1DBarcode [line 15819]

    +

    method write1DBarcode [line 15829]

    @@ -22808,7 +22854,7 @@ $align = ''])
    -

    method write2DBarcode [line 16055]

    +

    method write2DBarcode [line 16065]

    @@ -22898,7 +22944,7 @@ $distort = false])
    -

    method writeBarcode [line 16004]

    +

    method writeBarcode [line 16014]

    @@ -23045,7 +23091,7 @@ $file)
    -

    method writeHTML [line 17481]

    +

    method writeHTML [line 17477]

    @@ -23111,7 +23157,7 @@ $align = ''])
    -

    method writeHTMLCell [line 17465]

    +

    method writeHTMLCell [line 17461]

    @@ -23213,7 +23259,7 @@ $autopadding = true])
    -

    method _addfield [line 13390]

    +

    method _addfield [line 13400]

    @@ -23291,7 +23337,7 @@ $prop)
    -

    method _AES [line 11065]

    +

    method _AES [line 11075]

    @@ -23342,7 +23388,7 @@ $text)
    -

    method _beginpage [line 10089]

    +

    method _beginpage [line 10099]

    @@ -23387,7 +23433,7 @@ $format = ''])
    -

    method _datastring [line 10256]

    +

    method _datastring [line 10266]

    @@ -23432,7 +23478,7 @@ $n = 0])
    -

    method _datestring [line 10270]

    +

    method _datestring [line 10280]

    @@ -23463,7 +23509,7 @@ $n = 0])
    -

    method _destroy [line 7541]

    +

    method _destroy [line 7551]

    @@ -23508,7 +23554,7 @@ $preserve_objcopy = false])
    -

    method _dochecks [line 7569]

    +

    method _dochecks [line 7579]

    @@ -23533,7 +23579,7 @@ $preserve_objcopy = false])
    -

    method _dolinethrough [line 10182]

    +

    method _dolinethrough [line 10192]

    @@ -23581,7 +23627,7 @@ $txt)
    -

    method _dolinethroughw [line 10195]

    +

    method _dolinethroughw [line 10205]

    @@ -23638,7 +23684,7 @@ $txt)
    -

    method _dooverline [line 10208]

    +

    method _dooverline [line 10218]

    @@ -23689,7 +23735,7 @@ $txt)
    -

    method _dooverlinew [line 10221]

    +

    method _dooverlinew [line 10231]

    @@ -23740,7 +23786,7 @@ $w)
    -

    method _dounderline [line 10157]

    +

    method _dounderline [line 10167]

    @@ -23788,7 +23834,7 @@ $txt)
    -

    method _dounderlinew [line 10170]

    +

    method _dounderlinew [line 10180]

    @@ -23839,7 +23885,7 @@ $w)
    -

    method _encrypt_data [line 10876]

    +

    method _encrypt_data [line 10886]

    @@ -23887,7 +23933,7 @@ $s)
    -

    method _enddoc [line 10001]

    +

    method _enddoc [line 10011]

    @@ -23912,7 +23958,7 @@ $s)
    -

    method _endpage [line 10133]

    +

    method _endpage [line 10143]

    @@ -23937,7 +23983,7 @@ $s)
    -

    method _escape [line 10244]

    +

    method _escape [line 10254]

    @@ -23976,7 +24022,7 @@ $s)
    -

    method _escapetext [line 10296]

    +

    method _escapetext [line 10306]

    @@ -24015,7 +24061,7 @@ $s)
    -

    method _freadint [line 10233]

    +

    method _freadint [line 10243]

    @@ -24054,7 +24100,7 @@ $f)
    -

    method _generateencryptionkey [line 11152]

    +

    method _generateencryptionkey [line 11162]

    @@ -24108,7 +24154,7 @@ $protection)
    -

    method _getannotsrefs [line 7818]

    +

    method _getannotsrefs [line 7828]

    @@ -24150,7 +24196,7 @@ $n)
    -

    method _getBYTE [line 8539]

    +

    method _getBYTE [line 8549]

    @@ -24213,7 +24259,7 @@ $offset)
    -

    method _getfontpath [line 7585]

    +

    method _getfontpath [line 7595]

    @@ -24238,7 +24284,7 @@ $offset)
    -

    method _getrawstream [line 10316]

    +

    method _getrawstream [line 10326]

    @@ -24286,7 +24332,7 @@ $n = 0])
    -

    method _getSHORT [line 8524]

    +

    method _getSHORT [line 8534]

    @@ -24349,7 +24395,7 @@ $offset)
    -

    method _getstream [line 10331]

    +

    method _getstream [line 10341]

    @@ -24394,7 +24440,7 @@ $n = 0])
    -

    method _getTrueTypeFontSubset [line 8554]

    +

    method _getTrueTypeFontSubset [line 8564]

    @@ -24445,7 +24491,7 @@ $subsetchars)
    -

    method _getTTFtableChecksum [line 8885]

    +

    method _getTTFtableChecksum [line 8895]

    @@ -24496,7 +24542,7 @@ $length)
    -

    method _getULONG [line 8494]

    +

    method _getULONG [line 8504]

    @@ -24559,7 +24605,7 @@ $offset)
    -

    method _getUSHORT [line 8509]

    +

    method _getUSHORT [line 8519]

    @@ -24622,7 +24668,7 @@ $offset)
    -

    method _JScolor [line 13366]

    +

    method _JScolor [line 13376]

    @@ -24664,7 +24710,7 @@ $color)
    -

    method _md5_16 [line 11083]

    +

    method _md5_16 [line 11093]

    @@ -24709,7 +24755,7 @@ $str)
    -

    method _newobj [line 10143]

    +

    method _newobj [line 10153]

    @@ -24737,7 +24783,7 @@ $str)
    -

    method _objectkey [line 10857]

    +

    method _objectkey [line 10867]

    @@ -24779,7 +24825,7 @@ $n)
    -

    method _out [line 10351]

    +

    method _out [line 10361]

    @@ -24815,7 +24861,7 @@ $s)
    -

    method _outCurve [line 11868]

    +

    method _outCurve [line 11878]

    @@ -24884,7 +24930,7 @@ $y3)
    -

    method _outCurveV [line 11882]

    +

    method _outCurveV [line 11892]

    @@ -24941,7 +24987,7 @@ $y3)
    -

    method _outCurveY [line 11898]

    +

    method _outCurveY [line 11908]

    @@ -25010,7 +25056,7 @@ $y2)
    -

    method _outellipticalarc [line 12094]

    +

    method _outellipticalarc [line 12104]

    @@ -25118,7 +25164,7 @@ $angf:)
    -

    method _outLine [line 11838]

    +

    method _outLine [line 11848]

    @@ -25163,7 +25209,7 @@ $y)
    -

    method _outPoint [line 11826]

    +

    method _outPoint [line 11836]

    @@ -25208,7 +25254,7 @@ $y)
    -

    method _outRect [line 11852]

    +

    method _outRect [line 11862]

    @@ -25271,7 +25317,7 @@ $op)
    -

    method _Ovalue [line 11096]

    +

    method _Ovalue [line 11106]

    @@ -25322,7 +25368,7 @@ $owner_pass)
    -

    method _parsejpeg [line 6977]

    +

    method _parsejpeg [line 6987]

    @@ -25361,7 +25407,7 @@ $file)
    -

    method _parsepng [line 7003]

    +

    method _parsepng [line 7013]

    @@ -25400,7 +25446,7 @@ $file)
    -

    method _putannotsobjs [line 7846]

    +

    method _putannotsobjs [line 7856]

    @@ -25431,7 +25477,7 @@ $file)
    -

    method _putannotsrefs [line 7806]

    +

    method _putannotsrefs [line 7816]

    @@ -25476,7 +25522,7 @@ $n)
    -

    method _putAPXObject [line 8459]

    +

    method _putAPXObject [line 8469]

    @@ -25530,7 +25576,7 @@ $stream = ''])
    -

    method _putbookmarks [line 13202]

    +

    method _putbookmarks [line 13212]

    @@ -25561,7 +25607,7 @@ $stream = ''])
    -

    method _putcatalog [line 9832]

    +

    method _putcatalog [line 9842]

    @@ -25589,7 +25635,7 @@ $stream = ''])
    -

    method _putcidfont0 [line 9555]

    +

    method _putcidfont0 [line 9565]

    @@ -25634,7 +25680,7 @@ $font)
    -

    method _putEmbeddedFiles [line 4782]

    +

    method _putEmbeddedFiles [line 4792]

    @@ -25665,7 +25711,7 @@ $font)
    -

    method _putencryption [line 10900]

    +

    method _putencryption [line 10910]

    @@ -25696,7 +25742,7 @@ $font)
    -

    method _putextgstates [line 14731]

    +

    method _putextgstates [line 14741]

    @@ -25735,7 +25781,7 @@ $gs)
    -

    method _putfonts [line 9006]

    +

    method _putfonts [line 9016]

    @@ -25763,7 +25809,7 @@ $gs)
    -

    method _putfontwidths [line 8907]

    +

    method _putfontwidths [line 8917]

    @@ -25814,7 +25860,7 @@ $cidoffset = 0])
    -

    method _putheader [line 9993]

    +

    method _putheader [line 10003]

    @@ -25839,7 +25885,7 @@ $cidoffset = 0])
    -

    method _putimages [line 9626]

    +

    method _putimages [line 9636]

    @@ -25864,7 +25910,7 @@ $cidoffset = 0])
    -

    method _putinfo [line 9785]

    +

    method _putinfo [line 9795]

    @@ -25892,7 +25938,7 @@ $cidoffset = 0])
    -

    method _putjavascript [line 13311]

    +

    method _putjavascript [line 13321]

    @@ -25923,7 +25969,7 @@ $cidoffset = 0])
    -

    method _putocg [line 14651]

    +

    method _putocg [line 14661]

    @@ -25951,7 +25997,7 @@ $cidoffset = 0])
    -

    method _putpages [line 7596]

    +

    method _putpages [line 7606]

    @@ -25976,7 +26022,7 @@ $cidoffset = 0])
    -

    method _putresourcedict [line 9700]

    +

    method _putresourcedict [line 9710]

    @@ -26001,7 +26047,7 @@ $cidoffset = 0])
    -

    method _putresources [line 9761]

    +

    method _putresources [line 9771]

    @@ -26026,7 +26072,7 @@ $cidoffset = 0])
    -

    method _putshaders [line 15285]

    +

    method _putshaders [line 15295]

    @@ -26057,7 +26103,7 @@ $cidoffset = 0])
    -

    method _putsignature [line 14339]

    +

    method _putsignature [line 14349]

    @@ -26088,7 +26134,7 @@ $cidoffset = 0])
    -

    method _putspotcolors [line 9682]

    +

    method _putspotcolors [line 9692]

    @@ -26116,7 +26162,7 @@ $cidoffset = 0])
    -

    method _putstream [line 10342]

    +

    method _putstream [line 10352]

    diff --git a/tcpdf.php b/tcpdf.php index 2c0c580..67dac12 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ Error('Empty font family'); } } + // move embedded styles on $style + if (substr($family, -1) == 'I') { + $style .= 'I'; + $family = substr($family, 0, -1); + } + if (substr($family, -1) == 'B') { + $style .= 'B'; + $family = substr($family, 0, -1); + } + // normalize family name $family = strtolower($family); if ((!$this->isunicode) AND ($family == 'arial')) { $family = 'helvetica'; @@ -17015,14 +17025,7 @@ if (!class_exists('TCPDF', false)) { if (isset($dom[$key]['style']['font-family'])) { // font family if (isset($dom[$key]['style']['font-family'])) { - $fontslist = preg_split('/[,]/', $dom[$key]['style']['font-family']); - foreach ($fontslist as $font) { - $font = preg_replace('/[\s\'\"]/', '', strtolower($font)); - if (in_array($font, $this->fontlist) OR in_array($font, $this->fontkeys)) { - $dom[$key]['fontname'] = $font; - break; - } - } + $dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['style']['font-family']); } } // list-style-type @@ -17272,14 +17275,7 @@ if (!class_exists('TCPDF', false)) { if ($dom[$key]['value'] == 'font') { // font family if (isset($dom[$key]['attribute']['face'])) { - $fontslist = preg_split('/[,]/', $dom[$key]['attribute']['face']); - foreach ($fontslist as $font) { - $font = preg_replace('/[\s\'\"]/', '', strtolower($font)); - if (in_array($font, $this->fontlist) OR in_array($font, $this->fontkeys)) { - $dom[$key]['fontname'] = $font; - break; - } - } + $dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['attribute']['face']); } // font size if (isset($dom[$key]['attribute']['size'])) { @@ -18276,23 +18272,6 @@ if (!class_exists('TCPDF', false)) { $currentcmargin = 0; } $this->cMargin = $currentcmargin; - if (isset($dom[$key]['width'])) { - // user specified width - $cellw = $this->getHTMLUnitToUnits($dom[$key]['width'], $table_columns_width, 'px'); - $tmpcw = ($cellw / $colspan); - for ($i = 0; $i < $colspan; ++$i) { - $table_colwidths[($colid + $i)] = $tmpcw; - } - } else { - // inherit column width - $cellw = 0; - for ($i = 0; $i < $colspan; ++$i) { - $cellw += $table_colwidths[($colid + $i)]; - } - } - $cellw += (($colspan - 1) * $cellspacing); - // increment column indicator - $colid += $colspan; if (isset($dom[$key]['height'])) { // minimum cell height $cellh = $this->getHTMLUnitToUnits($dom[$key]['height'], 0, 'px'); @@ -18364,6 +18343,8 @@ if (!class_exists('TCPDF', false)) { AND (($trwsp['starty'] < ($this->y - $this->feps)) OR ($trwsp['startpage'] < $this->page) OR ($trwsp['startcolumn'] < $this->current_column))) { // set the starting X position of the current cell $this->x = $rsendx + $cellspacingx; + // increment column indicator + $colid += $trwsp['colspan']; if (($trwsp['rowspan'] == 1) AND (isset($dom[$trid]['endy'])) AND (isset($dom[$trid]['endpage'])) @@ -18380,6 +18361,23 @@ if (!class_exists('TCPDF', false)) { } } } + if (isset($dom[$parentid]['width'])) { + // user specified width + $cellw = $this->getHTMLUnitToUnits($dom[$parentid]['width'], $table_columns_width, 'px'); + $tmpcw = ($cellw / $colspan); + for ($i = 0; $i < $colspan; ++$i) { + $table_colwidths[($colid + $i)] = $tmpcw; + } + } else { + // inherit column width + $cellw = 0; + for ($i = 0; $i < $colspan; ++$i) { + $cellw += $table_colwidths[($colid + $i)]; + } + } + $cellw += (($colspan - 1) * $cellspacing); + // increment column indicator + $colid += $colspan; // add rowspan information to table element if ($rowspan > 1) { $trsid = array_push($dom[$table_el]['rowspans'], array('trid' => $trid, 'rowspan' => $rowspan, 'mrowspan' => $rowspan, 'colspan' => $colspan, 'startpage' => $this->page, 'startcolumn' => $this->current_column, 'startx' => $this->x, 'starty' => $this->y)); @@ -18719,7 +18717,9 @@ if (!class_exists('TCPDF', false)) { } // restore previous values $this->setGraphicVars($gvars); - if ($this->page > $prevPage) { + if ($this->num_columns > 1) { + $this->selectColumn(); + } elseif ($this->page > $prevPage) { $this->lMargin = $this->pagedim[$this->page]['olm']; $this->rMargin = $this->pagedim[$this->page]['orm']; } @@ -22070,6 +22070,43 @@ if (!class_exists('TCPDF', false)) { return (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')); } + /** + * Return normalized font name + * @param string $fontfamily property string containing font family names + * @return string normalized font name + * @author Nicola Asuni + * @access public + * @since 5.8.004 (2010-08-17) + */ + public function getFontFamilyName($fontfamily) { + // remove spaces and symbols + $fontfamily = preg_replace('/[^a-z0-9\,]/', '', strtolower($fontfamily)); + // extract all font names + $fontslist = preg_split('/[,]/', $fontfamily); + // find first valid font name + foreach ($fontslist as $font) { + // replace font variations + $font = preg_replace('/italic$/', 'I', $font); + $font = preg_replace('/oblique$/', 'I', $font); + $font = preg_replace('/bold([I]?)$/', 'B\\1', $font); + // replace common family names and core fonts + $pattern = array(); + $replacement = array(); + $pattern[] = '/^serif|^cursive|^fantasy|^timesnewroman/'; + $replacement[] = 'times'; + $pattern[] = '/^sansserif/'; + $replacement[] = 'helvetica'; + $pattern[] = '/^monospace/'; + $replacement[] = 'courier'; + $font = preg_replace($pattern, $replacement, $font); + if (in_array(strtolower($font), $this->fontlist) OR in_array($font, $this->fontkeys)) { + return $font; + } + } + // return current font as default + return $this->CurrentFont['fontkey']; + } + // -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- // SVG METHODS // -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- @@ -22690,7 +22727,7 @@ if (!class_exists('TCPDF', false)) { $regs = array(); if (!empty($svgstyle['font'])) { if (preg_match('/font-family[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) { - $font_family = trim($regs[1]); + $font_family = $this->getFontFamilyName($regs[1]); } else { $font_family = $svgstyle['font-family']; }
    @@ -26161,7 +26207,7 @@ $n = 0])
    -

    method _puttruetypeunicode [line 9166]

    +

    method _puttruetypeunicode [line 9176]

    diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 31e86e7..dc8bf38 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/index.html b/doc/index.html index 31e86e7..dc8bf38 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    @@ -26206,7 +26252,7 @@ $font)
    -

    method _putviewerpreferences [line 9922]

    +

    method _putviewerpreferences [line 9932]

    diff --git a/doc/errors.html b/doc/errors.html index 50028ef..79c4ce5 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -35,7 +35,7 @@ Post-parsing
    - Documentation generated on Mon, 16 Aug 2010 12:57:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:12:04 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index b213e77..ae25018 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -748,13 +748,13 @@
    getBarcode
    in file tcpdf.php, method TCPDF::getBarcode()
        Get current barcode.
    getBarcodeArray
    +
    in file barcodes.php, method TCPDFBarcode::getBarcodeArray()
        Return an array representations of barcode.
    +
    getBarcodeArray
    in file qrcode.php, method QRcode::getBarcodeArray()
        Returns a barcode array which is readable by TCPDF
    getBarcodeArray
    in file 2dbarcodes.php, method TCPDF2DBarcode::getBarcodeArray()
        Return an array representations of barcode.
    getBarcodeArray
    in file pdf417.php, method PDF417::getBarcodeArray()
        Returns a barcode array which is readable by TCPDF
    -
    getBarcodeArray
    -
    in file barcodes.php, method TCPDFBarcode::getBarcodeArray()
        Return an array representations of barcode.
    getBitStream
    in file qrcode.php, method QRcode::getBitStream()
        Returns a stream of bits.
    getBorderMode
    @@ -807,6 +807,8 @@
    in file tcpdf.php, method TCPDF::getFontDescent()
        Return the font descent value
    getFontFamily
    in file tcpdf.php, method TCPDF::getFontFamily()
        Returns the current font family name.
    +
    getFontFamilyName
    +
    in file tcpdf.php, method TCPDF::getFontFamilyName()
        Return normalized font name
    getFontSize
    in file tcpdf.php, method TCPDF::getFontSize()
        Returns the current font size.
    getFontSizePt
    @@ -2072,7 +2074,7 @@ top
    - Documentation generated on Mon, 16 Aug 2010 12:57:48 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    @@ -26240,7 +26286,7 @@ $font)
    -

    method _RC4 [line 11019]

    +

    method _RC4 [line 11029]

    diff --git a/doc/elementindex.html b/doc/elementindex.html index 2af4cca..c09f926 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -554,13 +554,13 @@
    getBarcode
    in file tcpdf.php, method TCPDF::getBarcode()
        Get current barcode.
    getBarcodeArray
    +
    in file barcodes.php, method TCPDFBarcode::getBarcodeArray()
        Return an array representations of barcode.
    +
    getBarcodeArray
    in file qrcode.php, method QRcode::getBarcodeArray()
        Returns a barcode array which is readable by TCPDF
    getBarcodeArray
    in file 2dbarcodes.php, method TCPDF2DBarcode::getBarcodeArray()
        Return an array representations of barcode.
    getBarcodeArray
    in file pdf417.php, method PDF417::getBarcodeArray()
        Returns a barcode array which is readable by TCPDF
    -
    getBarcodeArray
    -
    in file barcodes.php, method TCPDFBarcode::getBarcodeArray()
        Return an array representations of barcode.
    getBitStream
    in file qrcode.php, method QRcode::getBitStream()
        Returns a stream of bits.
    getBorderMode
    @@ -613,6 +613,8 @@
    in file tcpdf.php, method TCPDF::getFontDescent()
        Return the font descent value
    getFontFamily
    in file tcpdf.php, method TCPDF::getFontFamily()
        Returns the current font family name.
    +
    getFontFamilyName
    +
    in file tcpdf.php, method TCPDF::getFontFamilyName()
        Return normalized font name
    getFontSize
    in file tcpdf.php, method TCPDF::getFontSize()
        Returns the current font size.
    getFontSizePt
    @@ -2040,7 +2042,7 @@ top
    - Documentation generated on Mon, 16 Aug 2010 12:57:48 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index e337440..e3c71ef 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.



    - Documentation generated on Mon, 16 Aug 2010 12:57:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:12:04 +0200 by phpDocumentor 1.4.3
    @@ -26291,7 +26337,7 @@ $text)
    -

    method _setGDImageTransparency [line 6956]

    +

    method _setGDImageTransparency [line 6966]

    diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index cc11e41..4073f08 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -124,7 +124,7 @@ unicode data

    - Documentation generated on Mon, 16 Aug 2010 12:57:50 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:12:00 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index 037740e..314bc1c 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
    @@ -26336,7 +26382,7 @@ $image)
    -

    method _textstring [line 10282]

    +

    method _textstring [line 10292]

    diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index bc68bd5..365fa67 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

    PDF417 (ISO

    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index 92512ff..9aab3c0 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
    @@ -26381,7 +26427,7 @@ $n = 0])
    -

    method _toJPEG [line 6919]

    +

    method _toJPEG [line 6929]

    diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index c657090..6b30f9f 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.



    - Documentation generated on Mon, 16 Aug 2010 12:57:55 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:12:04 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 893ccb3..97dbd08 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
    @@ -26423,7 +26469,7 @@ $file)
    -

    method _toPNG [line 6938]

    +

    method _toPNG [line 6948]

    diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 3d1c4a0..67e2f04 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index 0ba72ce..f0c1b0b 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:59 +0200 by phpDocumentor 1.4.3
    @@ -26468,7 +26514,7 @@ $file)
    -

    method _Uvalue [line 11125]

    +

    method _Uvalue [line 11135]

    diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index 0a34388..01ab54a 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
    - Documentation generated on Mon, 16 Aug 2010 12:57:49 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:11:58 +0200 by phpDocumentor 1.4.3
    @@ -26505,7 +26551,7 @@ $file)
    - Documentation generated on Mon, 16 Aug 2010 12:57:50 +0200 by phpDocumentor 1.4.3 + Documentation generated on Tue, 17 Aug 2010 13:12:00 +0200 by phpDocumentor 1.4.3