From 916ee439b935a8d5373eb5fd60ee2bd2b673dce4 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 22 Sep 2011 09:40:33 +0200 Subject: [PATCH] 5.9.120 --- CHANGELOG.TXT | 5 ++++- README.TXT | 4 ++-- examples/example_027.php | 13 +++++++++++-- examples/example_050.php | 11 +++++++++-- examples/index.php | 4 ++-- tcpdf.php | 11 ++++++----- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 17a2d87..38052cf 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.120 (2011-09-22) + - This version includes a fix for _getTrueTypeFontSubset() method. + 5.9.119 (2011-09-19) - This version includes a fix for extra page numbering on TOC. @@ -11,7 +14,7 @@ - Datamatrix class was improved and documentation was fixed. 5.9.115 (2011-09-13) - - Datamatrix barcode support was added (a new datamatrix.php file was added) - check example n. 50. + - Datamatrix ECC200 barcode support was added (a new datamatrix.php file was added) - check example n. 50. - getBarcodeHTML() method was added on TCPDFBarcode and TCPDF2DBarcode classes to return an HTML representation of the barcode. - cURL options on Image() method were improved. - A bug on write2DBarcode() was fixed. diff --git a/README.TXT b/README.TXT index 0ddcb99..c8f11a9 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.119 -Release date: 2011-09-19 +Version: 5.9.120 +Release date: 2011-09-22 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/examples/example_027.php b/examples/example_027.php index 28132e5..5157abc 100755 --- a/examples/example_027.php +++ b/examples/example_027.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_027.php // Begin : 2008-03-04 -// Last Update : 2011-05-12 +// Last Update : 2011-09-22 // // Description : Example 027 for TCPDF class // 1D Barcodes @@ -70,11 +70,20 @@ $pdf->setLanguageArray($l); $pdf->setBarcode(date('Y-m-d H:i:s')); // set font -$pdf->SetFont('helvetica', '', 10); +$pdf->SetFont('helvetica', '', 11); // add a page $pdf->AddPage(); +// print a message +$txt = "You can also export 1D barcodes in other formats (PNG, SVG, HTML). Check the source code documentation of TCPDFBarcode class for further information."; +$pdf->MultiCell(70, 50, $txt, 0, 'J', false, 1, 125, 30, true, 0, false, true, 0, 'T', false); +$pdf->SetY(30); + +// ----------------------------------------------------------------------------- + +$pdf->SetFont('helvetica', '', 10); + // define barcode style $style = array( 'position' => '', diff --git a/examples/example_050.php b/examples/example_050.php index b7fb501..a6f4d50 100755 --- a/examples/example_050.php +++ b/examples/example_050.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_050.php // Begin : 2009-04-09 -// Last Update : 2010-09-13 +// Last Update : 2011-09-22 // // Description : Example 050 for TCPDF class // 2D Barcodes @@ -69,11 +69,18 @@ $pdf->setLanguageArray($l); // NOTE: 2D barcode algorithms must be implemented on 2dbarcode.php class file. // set font -$pdf->SetFont('helvetica', '', 10); +$pdf->SetFont('helvetica', '', 11); // add a page $pdf->AddPage(); +// print a message +$txt = "You can also export 2D barcodes in other formats (PNG, SVG, HTML). Check the source code documentation of TCPDF2DBarcode class for further information."; +$pdf->MultiCell(70, 50, $txt, 0, 'J', false, 1, 125, 30, true, 0, false, true, 0, 'T', false); + + +$pdf->SetFont('helvetica', '', 10); + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // set style for barcode diff --git a/examples/index.php b/examples/index.php index 81ee89c..803ffd6 100755 --- a/examples/index.php +++ b/examples/index.php @@ -44,7 +44,7 @@ echo '<'.'?'.'xml version="1.0" encoding="UTF-8"'.'?'.'>';
  • Object Visibility and Layers: [PDF]
  • Object Transparency: [PDF]
  • Text Rendering Modes and Text Clipping: [PDF]
    • -
  • Barcodes: [PDF]
    • +
  • 1D Barcodes: [PDF]
  • Multiple page formats: [PDF]
  • Set PDF viewer display preferences: [PDF]
  • Colour gradients: [PDF]
    • @@ -67,7 +67,7 @@ echo '<'.'?'.'xml version="1.0" encoding="UTF-8"'.'?'.'>';
  • Transactions and UNDO: [PDF]
  • Table header and rowspan: [PDF]
  • TCPDF methods in HTML: [PDF]
    • -
  • 2D Barcode (QR-Code AND PDF417): [PDF]
    • +
  • 2D Barcode (QR-Code, Datamatrix ECC200 and PDF417): [PDF]
  • Full page background: [PDF]
  • Digital Signature Certification: [PDF]
  • Javascript functions: [PDF]
    • diff --git a/tcpdf.php b/tcpdf.php index 9478c13..0ab4ac7 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.119 + * @version 5.9.120 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -148,7 +148,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.119 + * @version 5.9.120 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -159,7 +159,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.119'; + private $tcpdf_version = '5.9.120'; // Protected properties @@ -9734,6 +9734,7 @@ class TCPDF { ++$numSubHeaders; // read subHeader structures $subHeaders = array(); + $numGlyphIndexArray = 0; for ($k = 0; $k < $numSubHeaders; ++$k) { $subHeaders[$k]['firstCode'] = $this->_getUSHORT($font, $offset); $offset += 2;