mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-05-31 21:30:47 +00:00
5.9.077
This commit is contained in:
nicolaasuni
parent
93e096d631
commit
d308da169c
|
|
@ -1,3 +1,7 @@
|
|||
5.9.077 (2011-05-07)
|
||||
- Bug item #3298591 "error code93" was fixed.
|
||||
- SetLineStyle() function was improved.
|
||||
|
||||
5.9.076 (2011-05-06)
|
||||
- Bug item #3298264 "codebar 93 error" was fixed.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
|||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 5.9.076
|
||||
Release date: 2011-05-06
|
||||
Version: 5.9.077
|
||||
Release date: 2011-05-07
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2011:
|
||||
|
|
|
|||
10
barcodes.php
10
barcodes.php
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
//============================================================+
|
||||
// File name : barcodes.php
|
||||
// Version : 1.0.013
|
||||
// Version : 1.0.014
|
||||
// Begin : 2008-06-09
|
||||
// Last Update : 2011-05-06
|
||||
// Last Update : 2011-05-07
|
||||
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
* PHP class to creates array representations for common 1D barcodes to be used with TCPDF.
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 1.0.013
|
||||
* @version 1.0.014
|
||||
*/
|
||||
|
||||
/**
|
||||
* @class TCPDFBarcode
|
||||
* PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 1.0.013
|
||||
* @version 1.0.014
|
||||
* @author Nicola Asuni
|
||||
*/
|
||||
class TCPDFBarcode {
|
||||
|
|
@ -410,7 +410,7 @@ class TCPDFBarcode {
|
|||
$chr[70] = '231111'; // F
|
||||
$chr[71] = '112113'; // G
|
||||
$chr[72] = '112212'; // H
|
||||
$chr[72] = '112311'; // I
|
||||
$chr[73] = '112311'; // I
|
||||
$chr[74] = '122112'; // J
|
||||
$chr[75] = '132111'; // K
|
||||
$chr[76] = '111123'; // L
|
||||
|
|
|
|||
49
tcpdf.php
49
tcpdf.php
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 5.9.076
|
||||
// Version : 5.9.077
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2011-05-06
|
||||
// Last Update : 2011-05-07
|
||||
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
|
||||
// -------------------------------------------------------------------
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 5.9.076
|
||||
* @version 5.9.077
|
||||
*/
|
||||
|
||||
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
|
||||
|
|
@ -146,7 +146,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.076
|
||||
* @version 5.9.077
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
|
|
@ -157,7 +157,7 @@ class TCPDF {
|
|||
* Current TCPDF version.
|
||||
* @private
|
||||
*/
|
||||
private $tcpdf_version = '5.9.076';
|
||||
private $tcpdf_version = '5.9.077';
|
||||
|
||||
// Protected properties
|
||||
|
||||
|
|
@ -12897,33 +12897,32 @@ class TCPDF {
|
|||
if (!is_array($style)) {
|
||||
return;
|
||||
}
|
||||
extract($style);
|
||||
if (isset($width)) {
|
||||
$this->LineWidth = $width;
|
||||
$this->linestyleWidth = sprintf('%.2F w', ($width * $this->k));
|
||||
if (isset($style['width'])) {
|
||||
$this->LineWidth = $style['width'];
|
||||
$this->linestyleWidth = sprintf('%.2F w', ($style['width'] * $this->k));
|
||||
$s .= $this->linestyleWidth.' ';
|
||||
}
|
||||
if (isset($cap)) {
|
||||
if (isset($style['cap'])) {
|
||||
$ca = array('butt' => 0, 'round'=> 1, 'square' => 2);
|
||||
if (isset($ca[$cap])) {
|
||||
$this->linestyleCap = $ca[$cap].' J';
|
||||
if (isset($ca[$style['cap']])) {
|
||||
$this->linestyleCap = $ca[$style['cap']].' J';
|
||||
$s .= $this->linestyleCap.' ';
|
||||
}
|
||||
}
|
||||
if (isset($join)) {
|
||||
if (isset($style['join'])) {
|
||||
$ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
|
||||
if (isset($ja[$join])) {
|
||||
$this->linestyleJoin = $ja[$join].' j';
|
||||
if (isset($ja[$style['join']])) {
|
||||
$this->linestyleJoin = $ja[$style['join']].' j';
|
||||
$s .= $this->linestyleJoin.' ';
|
||||
}
|
||||
}
|
||||
if (isset($dash)) {
|
||||
if (isset($style['dash'])) {
|
||||
$dash_string = '';
|
||||
if ($dash) {
|
||||
if (preg_match('/^.+,/', $dash) > 0) {
|
||||
$tab = explode(',', $dash);
|
||||
if ($style['dash']) {
|
||||
if (preg_match('/^.+,/', $style['dash']) > 0) {
|
||||
$tab = explode(',', $style['dash']);
|
||||
} else {
|
||||
$tab = array($dash);
|
||||
$tab = array($style['dash']);
|
||||
}
|
||||
$dash_string = '';
|
||||
foreach ($tab as $i => $v) {
|
||||
|
|
@ -12933,14 +12932,14 @@ class TCPDF {
|
|||
$dash_string .= sprintf('%.2F', $v);
|
||||
}
|
||||
}
|
||||
if (!isset($phase) OR !$dash) {
|
||||
$phase = 0;
|
||||
if (!isset($style['phase']) OR !$style['dash']) {
|
||||
$style['phase'] = 0;
|
||||
}
|
||||
$this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $phase);
|
||||
$this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $style['phase']);
|
||||
$s .= $this->linestyleDash.' ';
|
||||
}
|
||||
if (isset($color)) {
|
||||
$s .= $this->SetDrawColorArray($color, true).' ';
|
||||
if (isset($style['color'])) {
|
||||
$s .= $this->SetDrawColorArray($style['color'], true).' ';
|
||||
}
|
||||
if (!$ret) {
|
||||
$this->_out($s);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user