diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index fd913c7..d10ac5e 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.122 (2011-09-29) + - PDF/A-1b compliance was improved to pass some online testing. + 5.9.121 (2011-09-28) - This version includes support for PDF/A-1b format (the class constructor signature was changed - see example n. 65). - Method setSRGBmode() was added to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document (file sRGB.icc was added). diff --git a/README.TXT b/README.TXT index 7b21f6a..da859ce 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.121 -Release date: 2011-09-28 +Version: 5.9.122 +Release date: 2011-09-29 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index ca70bf4..5220f00 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.121 + * @version 5.9.122 */ // 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.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 5.9.121 + * @version 5.9.122 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -161,7 +161,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.121'; + private $tcpdf_version = '5.9.122'; // Protected properties @@ -8850,7 +8850,9 @@ class TCPDF { } $out .= ' /Contents '.($this->n + 1).' 0 R'; $out .= ' /Rotate '.$this->pagedim[$n]['Rotate']; - $out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>'; + if (!$this->pdfa_mode) { + $out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>'; + } if (isset($this->pagedim[$n]['trans']) AND !empty($this->pagedim[$n]['trans'])) { // page transitions if (isset($this->pagedim[$n]['trans']['Dur'])) { @@ -11276,7 +11278,6 @@ class TCPDF { $xmp .= "\t\t".''."\n"; $xmp .= "\t\t\t".''.$this->_escapeXML($this->keywords).' TCPDF'."\n"; $xmp .= "\t\t\t".''.$this->_escapeXML("\x54\x43\x50\x44\x46\x20".$this->tcpdf_version."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29").''."\n"; - $xmp .= "\t\t\t".'False'."\n"; $xmp .= "\t\t".''."\n"; $xmp .= "\t\t".''."\n"; $uuid = 'uuid:'.substr($this->file_id, 0, 8).'-'.substr($this->file_id, 8, 4).'-'.substr($this->file_id, 12, 4).'-'.substr($this->file_id, 16, 4).'-'.substr($this->file_id, 20, 12); @@ -11297,16 +11298,6 @@ class TCPDF { $xmp .= "\t\t\t\t\t\t".'http://ns.adobe.com/pdf/1.3/'."\n"; $xmp .= "\t\t\t\t\t\t".'pdf'."\n"; $xmp .= "\t\t\t\t\t\t".'Adobe PDF Schema'."\n"; - $xmp .= "\t\t\t\t\t\t".''."\n"; - $xmp .= "\t\t\t\t\t\t\t".''."\n"; - $xmp .= "\t\t\t\t\t\t\t\t".''."\n"; - $xmp .= "\t\t\t\t\t\t\t\t\t".'internal'."\n"; - $xmp .= "\t\t\t\t\t\t\t\t\t".'A name object indicating whether the document has been modified to include trapping information'."\n"; - $xmp .= "\t\t\t\t\t\t\t\t\t".'Trapped'."\n"; - $xmp .= "\t\t\t\t\t\t\t\t\t".'Text'."\n"; - $xmp .= "\t\t\t\t\t\t\t\t".''."\n"; - $xmp .= "\t\t\t\t\t\t\t".''."\n"; - $xmp .= "\t\t\t\t\t\t".''."\n"; $xmp .= "\t\t\t\t\t".''."\n"; $xmp .= "\t\t\t\t\t".''."\n"; $xmp .= "\t\t\t\t\t\t".'http://ns.adobe.com/xap/1.0/mm/'."\n"; @@ -11382,7 +11373,7 @@ class TCPDF { $icc = gzcompress($icc); } $icc = $this->_getrawstream($icc); - $this->_out('<> stream'."\n".$icc."\n".'endstream'."\n".'endobj'); + $this->_out('<> stream'."\n".$icc."\n".'endstream'."\n".'endobj'); } // start catalog $oid = $this->_newobj();