joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-12-22 16:38:55 +00:00
Code Issues Releases Activity

4.6.027

Browse Source
This commit is contained in:
nicolaasuni 2009-08-24 17:52:35 +02:00
parent 9391acc0e5
commit f0d036e555
17 changed files with 300 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.TXT
View File

@ -1,3 +1,6 @@
4.6.027 (2009-08-24)
- TCPDF now supports unembedded TrueTypeUnicode Fonts (just comment the $file entry on the fonts' php file.
4.6.026 (2009-08-21)
- Bug #2841693 "Problem with MultiCell and ishtml and justification" was fixed.
- Signature functions were improved but not yet fixed (tcpdf.crt and example n. 52 were updated).

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 4.6.026
Release date: 2009-08-21
Version: 4.6.027
Release date: 2009-08-24
Author: Nicola Asuni
Copyright (c) 2001-2009:

2
doc/classtrees_com-tecnick-tcpdf.html
View File

@ -45,7 +45,7 @@
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

470
doc/com-tecnick-tcpdf/TCPDF.html
View File

File diff suppressed because it is too large Load Diff

2
doc/com-tecnick-tcpdf/TCPDFBarcode.html
View File

@ -1368,7 +1368,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/com-tecnick-tcpdf/_barcodes.php.html
View File

@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
View File

@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/com-tecnick-tcpdf/_htmlcolors.php.html
View File

@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:22 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

6
doc/com-tecnick-tcpdf/_tcpdf.php.html
View File

@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.026</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>4.6.027</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@ -104,7 +104,7 @@ unicode data<br /><br /></div>
<div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 4.6.026 (http://www.tcpdf.org)'</code>
<code>PDF_PRODUCER = 'TCPDF 4.6.027 (http://www.tcpdf.org)'</code>
</td></tr></table>
</td></tr></table>
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:22 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/com-tecnick-tcpdf/_unicode_data.php.html
View File

@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/elementindex.html
View File

@ -1378,7 +1378,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/elementindex_com-tecnick-tcpdf.html
View File

@ -1401,7 +1401,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/errors.html
View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br>
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:28 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/index.html
View File

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

2
doc/li_com-tecnick-tcpdf.html
View File

@ -58,7 +58,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
<div class="credit">
<hr />
Documentation generated on Fri, 21 Aug 2009 17:30:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
Documentation generated on Mon, 24 Aug 2009 17:52:21 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
</div>
</td></tr></table>
</td>

1
fonts/utils/README.TXT
View File

@ -95,6 +95,7 @@ Setting up a font for usage with TCPDF requires the following steps:
4. Edit and copy resulting files by case:
* For embedded fonts: copy the resulting .php, .z and .ctg.z (if available) files to the TCPDF fonts directory.
* For not-embedding the font, edit the .php file and comment the $file entry.
* For CID-0 fonts (not embeddeed) you have to edit the .php file:
o change the font type to: $type='cidfont0';
o set the default font width by adding the line: $dw=1000;

66
tcpdf.php
View File

@ -2,9 +2,9 @@
//============================================================+
// File name : tcpdf.php
// Begin : 2002-08-03
// Last Update : 2009-08-21
// Last Update : 2009-08-24
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
// Version : 4.6.026
// Version : 4.6.027
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ----------------------------------------------------------------------------
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
@ -126,7 +126,7 @@
* @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 4.6.026
* @version 4.6.027
*/
/**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
define('PDF_PRODUCER', 'TCPDF 4.6.026 (http://www.tcpdf.org)');
define('PDF_PRODUCER', 'TCPDF 4.6.027 (http://www.tcpdf.org)');
/**
* This is a PHP class for generating PDF documents without requiring external extensions.<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>
* @name TCPDF
* @package com.tecnick.tcpdf
* @version 4.6.026
* @version 4.6.027
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -3047,12 +3047,32 @@ if (!class_exists('TCPDF', false)) {
if ((!isset($type)) OR (!isset($cw))) {
$this->Error('The font definition file has a bad format: '.$fontfile.'');
}
if (!isset($file)) {
// SET default parameters
if (!isset($file) OR $this->empty_string($file)) {
$file = '';
}
if (!isset($enc)) {
if (!isset($enc) OR $this->empty_string($enc)) {
$enc = '';
}
if (!isset($cidinfo) OR $this->empty_string($cidinfo)) {
$cidinfo = array('Registry'=>'Adobe','Ordering'=>'Identity','Supplement'=>0);
$cidinfo['uni2cid'] = array();
}
if (!isset($ctg) OR $this->empty_string($ctg)) {
$ctg = '';
}
if (!isset($desc) OR $this->empty_string($desc)) {
$desc = array();
}
if (!isset($up) OR $this->empty_string($up)) {
$up = -100;
}
if (!isset($ut) OR $this->empty_string($ut)) {
$ut = 50;
}
if (!isset($cw) OR $this->empty_string($cw)) {
$cw = array();
}
if (!isset($dw) OR $this->empty_string($dw)) {
// set default width
if (isset($desc['MissingWidth']) AND ($desc['MissingWidth'] > 0)) {
@ -3064,24 +3084,23 @@ if (!class_exists('TCPDF', false)) {
}
}
++$this->numfonts;
// register CID font (all styles at once)
if ($type == 'cidfont0') {
$file = ''; // not embedded
// register CID font (all styles at once)
$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
$sname = $name.$styles[$bistyle];
if ((strpos($bistyle, 'B') !== false) AND (isset($desc['StemV'])) AND ($desc['StemV'] == 70)) {
$desc['StemV'] = 120;
}
$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => $type, 'name' => $sname, 'desc' => $desc, 'cidinfo' => $cidinfo, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc));
} elseif ($type == 'core') {
$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => 'core', 'name' => $this->CoreFonts[$fontkey], 'up' => -100, 'ut' => 50, 'cw' => $cw, 'dw' => $dw));
$name = $this->CoreFonts[$fontkey];
} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => $type, 'name' => $name, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'file' => $file, 'enc' => $enc, 'desc' => $desc));
// ...
} elseif ($type == 'TrueTypeUnicode') {
$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'file' => $file, 'ctg' => $ctg));
$enc = 'Identity-H';
} else {
$this->Error('Unknow font type: '.$type.'');
}
$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg));
if (isset($diff) AND (!empty($diff))) {
//Search existing encodings
$d = 0;
@ -5831,8 +5850,9 @@ if (!class_exists('TCPDF', false)) {
//Standard font
$this->_newobj();
$this->_out('<</Type /Font');
$this->_out('/BaseFont /'.$name);
$this->_out('/Subtype /Type1');
$this->_out('/BaseFont /'.$name);
$this->_out('/Name /F'.$font['i']);
if (($name != 'symbol') AND ($name != 'zapfdingbats')) {
$this->_out('/Encoding /WinAnsiEncoding');
}
@ -5842,8 +5862,9 @@ if (!class_exists('TCPDF', false)) {
//Additional Type1 or TrueType font
$this->_newobj();
$this->_out('<</Type /Font');
$this->_out('/BaseFont /'.$name);
$this->_out('/Subtype /'.$type);
$this->_out('/BaseFont /'.$name);
$this->_out('/Name /F'.$font['i']);
$this->_out('/FirstChar 32 /LastChar 255');
$this->_out('/Widths '.($this->n + 1).' 0 R');
$this->_out('/FontDescriptor '.($this->n + 2).' 0 R');
@ -6000,7 +6021,8 @@ if (!class_exists('TCPDF', false)) {
$this->_out('<</Type /Font');
$this->_out('/Subtype /Type0');
$this->_out('/BaseFont /'.$font['name'].'');
$this->_out('/Encoding /Identity-H'); //The horizontal identity mapping for 2-byte CIDs; may be used with CIDFonts using any Registry, Ordering, and Supplement values.
$this->_out('/Name /F'.$font['i']);
$this->_out('/Encoding /'.$font['enc']);
$this->_out('/ToUnicode /Identity-H');
$this->_out('/DescendantFonts ['.($this->n + 1).' 0 R]');
$this->_out('>>');
@ -6012,9 +6034,9 @@ if (!class_exists('TCPDF', false)) {
$this->_out('/Subtype /CIDFontType2');
$this->_out('/BaseFont /'.$font['name'].'');
// A dictionary containing entries that define the character collection of the CIDFont.
$cidinfo = '/Registry '.$this->_datastring('Adobe');
$cidinfo .= ' /Ordering '.$this->_datastring('Identity');
$cidinfo .= ' /Supplement 0';
$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry']);
$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']);
$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
$this->_out('/CIDSystemInfo <<'.$cidinfo.'>>');
$this->_out('/FontDescriptor '.($this->n + 1).' 0 R');
$this->_out('/DW '.$font['dw'].''); // default width
@ -6073,6 +6095,7 @@ if (!class_exists('TCPDF', false)) {
/**
* Output CID-0 fonts.
* A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
* @param array $font font data
* @access protected
* @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
@ -6102,8 +6125,9 @@ if (!class_exists('TCPDF', false)) {
}
$this->_newobj();
$this->_out('<</Type /Font');
$this->_out('/BaseFont /'.$longname);
$this->_out('/Subtype /Type0');
$this->_out('/BaseFont /'.$longname);
$this->_out('/Name /F'.$font['i']);
if ($enc) {
$this->_out('/Encoding /'.$enc);
}
@ -6112,8 +6136,8 @@ if (!class_exists('TCPDF', false)) {
$this->_out('endobj');
$this->_newobj();
$this->_out('<</Type /Font');
$this->_out('/BaseFont /'.$name);
$this->_out('/Subtype /CIDFontType0');
$this->_out('/BaseFont /'.$name);
$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry']);
$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']);
$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];