32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-10-31 18:52:35 +00:00
This commit is contained in:
nicolaasuni 2012-03-16 19:15:42 +00:00
parent e9ebd692d5
commit fee4fc56a2
3 changed files with 20 additions and 9 deletions

View File

@ -1,3 +1,6 @@
5.9.150 (2012-03-16)
- A bug related to form fields in PDF/A mode was fixed.
5.9.149 (2012-02-21) 5.9.149 (2012-02-21)
- Bug item #3489933 "SVG Parser treats tspan like text" was fixed. - Bug item #3489933 "SVG Parser treats tspan like text" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.149 Version: 5.9.150
Release date: 2012-02-21 Release date: 2012-03-16
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2012: Copyright (c) 2002-2012:

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.149 // Version : 5.9.150
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2012-02-21 // Last Update : 2012-03-16
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // 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 // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -137,7 +137,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p> * Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @author Nicola Asuni * @author Nicola Asuni
* @version 5.9.149 * @version 5.9.150
*/ */
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@ -149,7 +149,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> * 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 * @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions. * @brief PHP class for generating PDF documents without requiring external extensions.
* @version 5.9.149 * @version 5.9.150
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -160,7 +160,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.149'; private $tcpdf_version = '5.9.150';
// Protected properties // Protected properties
@ -15381,7 +15381,7 @@ class TCPDF {
* @param $w (float) Width. * @param $w (float) Width.
* @param $h (float) Height. * @param $h (float) Height.
* @param $r (float) the radius of the circle used to round off the corners of the rectangle. * @param $r (float) the radius of the circle used to round off the corners of the rectangle.
* @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 left, top right, bottom right and bottom left. Default value: all rounded corner ("1111"). * @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 $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 $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). Default value: default color (empty array).
@ -15400,7 +15400,7 @@ class TCPDF {
* @param $h (float) Height. * @param $h (float) Height.
* @param $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle. * @param $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
* @param $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle. * @param $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
* @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 left, top right, bottom right and bottom left. Default value: all rounded corner ("1111"). * @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 $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 $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). Default value: default color (empty array).
@ -17046,6 +17046,10 @@ class TCPDF {
} }
// set font // set font
$font = 'zapfdingbats'; $font = 'zapfdingbats';
if ($this->pdfa_mode) {
// all fonts must be embedded
$font = 'pdfa'.$font;
}
$this->AddFont($font); $this->AddFont($font);
$tmpfont = $this->getFontBuffer($font); $tmpfont = $this->getFontBuffer($font);
// set data for parent group // set data for parent group
@ -17301,6 +17305,10 @@ class TCPDF {
$popt = $this->getAnnotOptFromJSProp($prop); $popt = $this->getAnnotOptFromJSProp($prop);
// set additional default options // set additional default options
$font = 'zapfdingbats'; $font = 'zapfdingbats';
if ($this->pdfa_mode) {
// all fonts must be embedded
$font = 'pdfa'.$font;
}
$this->AddFont($font); $this->AddFont($font);
$tmpfont = $this->getFontBuffer($font); $tmpfont = $this->getFontBuffer($font);
$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i']; $this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];