From ee80691065274d177607297d52e3104cbb90c342 Mon Sep 17 00:00:00 2001
From: nicolaasuni
Date: Tue, 15 Dec 2009 19:01:00 +0100
Subject: [PATCH] 4.8.018
---
2dbarcodes.php | 11 ++++------
CHANGELOG.TXT | 3 +++
README.TXT | 4 ++--
doc/classtrees_com-tecnick-tcpdf.html | 2 +-
doc/com-tecnick-tcpdf/TCPDF.html | 6 ++---
doc/com-tecnick-tcpdf/TCPDFBarcode.html | 2 +-
doc/com-tecnick-tcpdf/_barcodes.php.html | 2 +-
.../_config---tcpdf_config.php.html | 2 +-
doc/com-tecnick-tcpdf/_htmlcolors.php.html | 2 +-
doc/com-tecnick-tcpdf/_tcpdf.php.html | 8 +++----
doc/com-tecnick-tcpdf/_unicode_data.php.html | 2 +-
doc/elementindex.html | 2 +-
doc/elementindex_com-tecnick-tcpdf.html | 2 +-
doc/errors.html | 2 +-
doc/index.html | 2 +-
doc/li_com-tecnick-tcpdf.html | 2 +-
examples/example_050.php | 8 +++----
tcpdf.php | 22 +++++++++----------
18 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/2dbarcodes.php b/2dbarcodes.php
index dae9cca..0bc24fb 100644
--- a/2dbarcodes.php
+++ b/2dbarcodes.php
@@ -2,8 +2,8 @@
//============================================================+
// File name : 2dbarcodes.php
// Begin : 2009-04-07
-// Last Update : 2009-08-17
-// Version : 1.0.000
+// Last Update : 2009-12-15
+// Version : 1.0.001
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ----------------------------------------------------------------------------
// Copyright (C) 2008-2009 Nicola Asuni - Tecnick.com S.r.l.
@@ -47,14 +47,14 @@
* @copyright 2008-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 1.0.000
+ * @version 1.0.001
*/
/**
* PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).
* @name TCPDFBarcode
* @package com.tecnick.tcpdf
- * @version 1.0.000
+ * @version 1.0.001
* @author Nicola Asuni
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@@ -110,9 +110,6 @@ class TCPDF2DBarcode {
);
break;
}
-
- // ... Add here real 2D barcodes ...
-
default: {
$this->barcode_array = false;
}
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index b001d63..cc3b2f0 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+4.8.018 (2009-12-15)
+ - Bug item #2914352 "write error" was fixed.
+
4.8.017 (2009-11-27)
- THEAD problem when table is used on header/footer was fixed.
- A first line alignment on HTML justification was fixed.
diff --git a/README.TXT b/README.TXT
index ec4fba3..b9870cf 100755
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
-Version: 4.8.017
-Release date: 2009-11-27
+Version: 4.8.018
+Release date: 2009-12-15
Author: Nicola Asuni
Copyright (c) 2001-2009:
diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html
index f91e522..512961f 100644
--- a/doc/classtrees_com-tecnick-tcpdf.html
+++ b/doc/classtrees_com-tecnick-tcpdf.html
@@ -45,7 +45,7 @@
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html
index 883ac71..9426804 100644
--- a/doc/com-tecnick-tcpdf/TCPDF.html
+++ b/doc/com-tecnick-tcpdf/TCPDF.html
@@ -74,7 +74,7 @@ Source Location: /tcpdf.php
Version:
@@ -630,7 +630,7 @@ This is a PHP class for generating PDF documents without requiring external exte
author: | Nicola Asuni - info@tecnick.com |
- version: | 4.8.017 |
+ version: | 4.8.018 |
link: | http://www.tcpdf.org |
@@ -20807,7 +20807,7 @@ $file)
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
index 1695897..c3a462c 100644
--- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html
+++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
@@ -1368,7 +1368,7 @@ $type)
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html
index 22bca67..862eb28 100644
--- a/doc/com-tecnick-tcpdf/_barcodes.php.html
+++ b/doc/com-tecnick-tcpdf/_barcodes.php.html
@@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
index 8e754e1..deb3ab2 100644
--- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
+++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
@@ -507,7 +507,7 @@ Configuration file for TCPDF.
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
index 632709e..f51a2a2 100644
--- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html
+++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
@@ -88,7 +88,7 @@ Array of WEB safe colors.
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html
index 243f8d4..acccee4 100644
--- a/doc/com-tecnick-tcpdf/_tcpdf.php.html
+++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html
@@ -65,7 +65,7 @@ Source Location: /tcpdf.php
Page Details:
-This is a PHP class for generating PDF documents without requiring external extensions.
TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
<h3>TCPDF main features are:</h3>
- no external libraries are required for the basic functions;
- supports all ISO page formats;
- supports custom page formats, margins and units of measure;
- supports UTF-8 Unicode and Right-To-Left languages;
- supports TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
- supports document encryption;
- includes methods to publish some XHTML code, including forms;
- includes graphic (geometric) and transformation methods;
- includes Javascript and Forms support;
- includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS;
- includes methods to set Bookmarks and print a Table of Content;
- includes methods to move and delete pages;
- includes methods for automatic page header and footer management;
- supports automatic page break;
- supports automatic page numbering and page groups;
- supports automatic line break and text justification;
- supports JPEG and PNG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
- supports stroke and clipping mode for text;
- supports clipping masks;
- supports Grayscale, RGB, CMYK, Spot Colors and Transparencies;
- supports several annotations, including links, text and file attachments;
- supports page compression (requires zlib extension);
- supports text hyphenation.
- supports transactions to UNDO commands.
- supports signature certifications.
Tools to encode your unicode fonts are on fonts/utils directory.</p>
+This is a PHP class for generating PDF documents without requiring external extensions.
TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.
<h3>TCPDF main features are:</h3>
- no external libraries are required for the basic functions;
- supports all ISO page formats;
- supports custom page formats, margins and units of measure;
- supports UTF-8 Unicode and Right-To-Left languages;
- supports TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
- supports document encryption;
- includes methods to publish some XHTML code, including forms;
- includes graphic (geometric) and transformation methods;
- includes Javascript and Forms support;
- includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS
- includes methods to set Bookmarks and print a Table of Content;
- includes methods to move and delete pages;
- includes methods for automatic page header and footer management;
- supports automatic page break;
- supports automatic page numbering and page groups;
- supports automatic line break and text justification;
- supports JPEG and PNG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
- supports stroke and clipping mode for text;
- supports clipping masks;
- supports Grayscale, RGB, CMYK, Spot Colors and Transparencies;
- supports several annotations, including links, text and file attachments;
- supports page compression (requires zlib extension);
- supports text hyphenation.
- supports transactions to UNDO commands.
- supports signature certifications.
Tools to encode your unicode fonts are on fonts/utils directory.</p>
Tags:
@@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
author: | Nicola Asuni |
- version: | 4.8.017 |
+ version: | 4.8.018 |
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 |
@@ -104,7 +104,7 @@ unicode data
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html
index df3be52..354f73c 100644
--- a/doc/com-tecnick-tcpdf/_unicode_data.php.html
+++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html
@@ -237,7 +237,7 @@ Unicode Include file for TCPDF.
diff --git a/doc/elementindex.html b/doc/elementindex.html
index 42d8483..9f1fbae 100644
--- a/doc/elementindex.html
+++ b/doc/elementindex.html
@@ -1448,7 +1448,7 @@
top
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html
index 7f7abf0..8bf96b9 100644
--- a/doc/elementindex_com-tecnick-tcpdf.html
+++ b/doc/elementindex_com-tecnick-tcpdf.html
@@ -1471,7 +1471,7 @@
top
diff --git a/doc/errors.html b/doc/errors.html
index 94cca09..e310bd8 100644
--- a/doc/errors.html
+++ b/doc/errors.html
@@ -35,7 +35,7 @@
Post-parsing
diff --git a/doc/index.html b/doc/index.html
index e2a71c3..5af5e2b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -58,7 +58,7 @@
This documentation was generated by
phpDocumentor v1.4.3
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html
index e2a71c3..5af5e2b 100644
--- a/doc/li_com-tecnick-tcpdf.html
+++ b/doc/li_com-tecnick-tcpdf.html
@@ -58,7 +58,7 @@
This documentation was generated by
phpDocumentor v1.4.3
diff --git a/examples/example_050.php b/examples/example_050.php
index 4a75232..b6cd7d7 100644
--- 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 : 2009-09-30
+// Last Update : 2009-12-15
//
// Description : Example 050 for TCPDF class
// 2D Barcodes
@@ -82,10 +82,10 @@ $style = array(
'bgcolor' => false, //array(255,255,255)
);
-// write 2D Barcode
-$pdf->write2DBarcode('X', 'TEST', '', '', 30, 20, $style, 'N');
+// NOTE: 2D barcode algorithms must be implemented on 2dbarcode.php class file.
-// NOTE: This is just experimental. 2D barcodes must be implemented on 2dbarcode.php class file.
+// write TEST 2D Barcode
+$pdf->write2DBarcode('X', 'TEST', '', '', 30, 20, $style, 'N');
// ---------------------------------------------------------
diff --git a/tcpdf.php b/tcpdf.php
index 59201ee..dc77bda 100755
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -2,9 +2,9 @@
//============================================================+
// File name : tcpdf.php
// Begin : 2002-08-03
-// Last Update : 2009-11-27
+// Last Update : 2009-12-15
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
-// Version : 4.8.017
+// Version : 4.8.018
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
// ----------------------------------------------------------------------------
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
@@ -104,7 +104,7 @@
*
includes methods to publish some XHTML code, including forms;
*
includes graphic (geometric) and transformation methods;
*
includes Javascript and Forms support;
-*
includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS;
+*
includes a method to print various barcode formats: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS
*
includes methods to set Bookmarks and print a Table of Content;
*
includes methods to move and delete pages;
*
includes methods for automatic page header and footer management;
@@ -128,7 +128,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.8.017
+ * @version 4.8.018
*/
/**
@@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
- define('PDF_PRODUCER', 'TCPDF 4.8.017 (http://www.tcpdf.org)');
+ define('PDF_PRODUCER', 'TCPDF 4.8.018 (http://www.tcpdf.org)');
/**
* This is a PHP class for generating PDF documents without requiring external extensions.
* 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.
* @name TCPDF
* @package com.tecnick.tcpdf
- * @version 4.8.017
+ * @version 4.8.018
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@@ -4324,7 +4324,7 @@ if (!class_exists('TCPDF', false)) {
$tmpstr = $this->UniArrSubString($uchars, $j, $i);
if ($firstline) {
$startx = $this->x;
- $tmparr = array_slice($chars, $j, $i);
+ $tmparr = array_slice($chars, $j, ($i - $j));
if ($rtlmode) {
$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
}
@@ -4386,7 +4386,7 @@ if (!class_exists('TCPDF', false)) {
if ((($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) AND ($arabic)) {
// with bidirectional algorithm some chars may be changed affecting the line length
// *** very slow ***
- $l = $this->GetArrStringWidth($this->utf8Bidi(array_slice($chars, $j, $i-$j+1), '', $this->tmprtl));
+ $l = $this->GetArrStringWidth($this->utf8Bidi(array_slice($chars, $j, ($i - $j)), '', $this->tmprtl));
} else {
$l += $this->GetCharWidth($c);
}
@@ -4407,7 +4407,7 @@ if (!class_exists('TCPDF', false)) {
$tmpstr = $this->UniArrSubString($uchars, $j, $i);
if ($firstline) {
$startx = $this->x;
- $tmparr = array_slice($chars, $j, $i);
+ $tmparr = array_slice($chars, $j, ($i - $j));
if ($rtlmode) {
$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
}
@@ -4458,7 +4458,7 @@ if (!class_exists('TCPDF', false)) {
$tmpstr = $this->UniArrSubString($uchars, $j, ($sep + $endspace));
if ($firstline) {
$startx = $this->x;
- $tmparr = array_slice($chars, $j, ($sep + $endspace));
+ $tmparr = array_slice($chars, $j, (($sep + $endspace) - $j));
if ($rtlmode) {
$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
}
@@ -4539,7 +4539,7 @@ if (!class_exists('TCPDF', false)) {
$tmpstr = $this->UniArrSubString($uchars, $j, $nb);
if ($firstline) {
$startx = $this->x;
- $tmparr = array_slice($chars, $j, $nb);
+ $tmparr = array_slice($chars, $j, ($nb - $j));
if ($rtlmode) {
$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
}