mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-25 05:57:32 +00:00
5.9.183 (2012-09-07)
- A problem with font names normalization was fixed.
This commit is contained in:
Nicola Asuni
parent
c8d1393d6a
commit
d4b1c84b49
@ -1,3 +1,6 @@
|
||||
5.9.183 (2012-09-07)
|
||||
- A problem with font names normalization was fixed.
|
||||
|
||||
5.9.182 (2012-09-05)
|
||||
- Bug item #3564982 "Infinite loop in Write() method" was fixed.
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 5.9.182
|
||||
Release date: 2012-09-05
|
||||
Version: 5.9.183
|
||||
Release date: 2012-09-07
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2012:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tcpdf/tcpdf",
|
||||
"version": "5.9.182",
|
||||
"version": "5.9.183",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"type": "library",
|
||||
"description": "TCPDF is a PHP class for generating PDF files on-the-fly without requiring external extensions.",
|
||||
|
||||
31
tcpdf.php
31
tcpdf.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 5.9.182
|
||||
// Version : 5.9.183
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2012-09-05
|
||||
// Last Update : 2012-09-07
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
|
||||
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
|
||||
// -------------------------------------------------------------------
|
||||
@ -138,7 +138,7 @@
|
||||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 5.9.182
|
||||
* @version 5.9.183
|
||||
*/
|
||||
|
||||
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
|
||||
@ -150,7 +150,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
|
||||
* 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.<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 5.9.182
|
||||
* @version 5.9.183
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -161,7 +161,7 @@ class TCPDF {
|
||||
* Current TCPDF version.
|
||||
* @private
|
||||
*/
|
||||
private $tcpdf_version = '5.9.182';
|
||||
private $tcpdf_version = '5.9.183';
|
||||
|
||||
// Protected properties
|
||||
|
||||
@ -15174,7 +15174,7 @@ class TCPDF {
|
||||
* 1 off, 2 on, 1 off, ...</li>
|
||||
* <li>phase (integer): Modifier on the dash pattern which is used to shift
|
||||
* the point at which the pattern starts.</li>
|
||||
* <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K).</li>
|
||||
* <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).</li>
|
||||
* </ul>
|
||||
* @param $ret (boolean) if true do not send the command.
|
||||
* @return string the PDF command
|
||||
@ -15350,8 +15350,7 @@ class TCPDF {
|
||||
* <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().</li>
|
||||
* </ul>
|
||||
* If a key is not present or is null, not draws the border. Default value: default line style (empty array).
|
||||
* @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @public
|
||||
* @since 1.0
|
||||
* @see SetLineStyle()
|
||||
@ -15406,7 +15405,7 @@ class TCPDF {
|
||||
* @param $y3 (float) Ordinate of end point.
|
||||
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
|
||||
* @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @public
|
||||
* @see SetLineStyle()
|
||||
* @since 2.1.000 (2008-01-08)
|
||||
@ -15433,7 +15432,7 @@ class TCPDF {
|
||||
* @param $segments (float) An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
|
||||
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
|
||||
* @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @public
|
||||
* @see SetLineStyle()
|
||||
* @since 3.0008 (2008-05-12)
|
||||
@ -15469,7 +15468,7 @@ class TCPDF {
|
||||
* @param $afinish: (float) Angle finish of draw line. Default value: 360.
|
||||
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
|
||||
* @param $line_style (array) Line style of ellipse. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @param $nc (integer) Number of curves used to draw a 90 degrees portion of ellipse.
|
||||
* @author Nicola Asuni
|
||||
* @public
|
||||
@ -15655,7 +15654,7 @@ class TCPDF {
|
||||
* <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
|
||||
* </ul>
|
||||
* If a key is not present or is null, not draws the line. Default value is default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @since 4.8.003 (2009-09-15)
|
||||
* @public
|
||||
*/
|
||||
@ -15673,7 +15672,7 @@ class TCPDF {
|
||||
* <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
|
||||
* </ul>
|
||||
* If a key is not present or is null, not draws the line. Default value is default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @param $closed (boolean) if true the polygon is closes, otherwise will remain open
|
||||
* @public
|
||||
* @since 2.1.000 (2008-01-08)
|
||||
@ -15862,7 +15861,7 @@ class TCPDF {
|
||||
* @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
|
||||
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
|
||||
* @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @public
|
||||
* @since 2.1.000 (2008-01-08)
|
||||
*/
|
||||
@ -15881,7 +15880,7 @@ class TCPDF {
|
||||
* @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
|
||||
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
|
||||
* @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
|
||||
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
|
||||
* @public
|
||||
* @since 4.9.019 (2010-04-22)
|
||||
*/
|
||||
@ -27397,7 +27396,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
*/
|
||||
public function getFontFamilyName($fontfamily) {
|
||||
// remove spaces and symbols
|
||||
$fontfamily = preg_replace('/[^a-z0-9\,]/', '', strtolower($fontfamily));
|
||||
$fontfamily = preg_replace('/[^a-z0-9_\,]/', '', strtolower($fontfamily));
|
||||
// extract all font names
|
||||
$fontslist = preg_split('/[,]/', $fontfamily);
|
||||
// find first valid font name
|
||||
|
||||
Loading…
Reference in New Issue
Block a user