diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-10-24 10:20:17 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-10-24 10:25:07 +0100 |
| commit | 88816ef580938257bf94537ffb701c20f4e3aaab (patch) | |
| tree | 2309f4586fdb7c5d1c1a0a028a8d2dc84e3fbca0 /library | |
| parent | 65a37686c97b39af4af94a3998a4acd717ab5056 (diff) | |
| download | webtrees-88816ef580938257bf94537ffb701c20f4e3aaab.tar.gz webtrees-88816ef580938257bf94537ffb701c20f4e3aaab.tar.bz2 webtrees-88816ef580938257bf94537ffb701c20f4e3aaab.zip | |
Upgrade tcpdf from 6.0.94 to 6.0.97
Diffstat (limited to 'library')
| -rw-r--r-- | library/autoload.php | 2 | ||||
| -rw-r--r-- | library/composer/autoload_classmap.php | 4 | ||||
| -rw-r--r-- | library/composer/autoload_real.php | 10 | ||||
| -rw-r--r-- | library/composer/installed.json | 308 | ||||
| -rwxr-xr-x[-rw-r--r--] | library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | library/ezyang/htmlpurifier/tests/HTMLPurifier/Injector/RemoveSpansWithoutAttributesTest.php | 0 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/CHANGELOG.TXT | 10 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/README.TXT | 4 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/composer.json | 2 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/include/tcpdf_images.php | 8 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/include/tcpdf_static.php | 2 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/tcpdf.php | 33 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/tcpdf_autoconfig.php | 1 | ||||
| -rw-r--r-- | library/tecnick.com/tcpdf/tcpdf_barcodes_1d.php | 66 |
14 files changed, 256 insertions, 194 deletions
diff --git a/library/autoload.php b/library/autoload.php index a429d310dc..3ff1ca7cc1 100644 --- a/library/autoload.php +++ b/library/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f::getLoader(); +return ComposerAutoloaderInit16bc56ac9c2be4ae1a51fd6dd49604ae::getLoader(); diff --git a/library/composer/autoload_classmap.php b/library/composer/autoload_classmap.php index 763f3c0e27..11487797e5 100644 --- a/library/composer/autoload_classmap.php +++ b/library/composer/autoload_classmap.php @@ -2419,10 +2419,10 @@ return array( 'Zend_Tag_Taggable' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Tag/Taggable.php', 'Zend_Test_DbAdapter' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/DbAdapter.php', 'Zend_Test_DbStatement' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/DbStatement.php', - 'Zend_Test_PHPUnit_Constraint_DomQuery' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php', + 'Zend_Test_PHPUnit_Constraint_DomQuery' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php', 'Zend_Test_PHPUnit_Constraint_Exception' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/Exception.php', 'Zend_Test_PHPUnit_Constraint_Redirect' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/Redirect34.php', - 'Zend_Test_PHPUnit_Constraint_ResponseHeader' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php', + 'Zend_Test_PHPUnit_Constraint_ResponseHeader' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php', 'Zend_Test_PHPUnit_ControllerTestCase' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/ControllerTestCase.php', 'Zend_Test_PHPUnit_DatabaseTestCase' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/DatabaseTestCase.php', 'Zend_Test_PHPUnit_Db_Connection' => $vendorDir . '/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Db/Connection.php', diff --git a/library/composer/autoload_real.php b/library/composer/autoload_real.php index 68ffbeea41..e569818ee0 100644 --- a/library/composer/autoload_real.php +++ b/library/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f +class ComposerAutoloaderInit16bc56ac9c2be4ae1a51fd6dd49604ae { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit16bc56ac9c2be4ae1a51fd6dd49604ae', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit16bc56ac9c2be4ae1a51fd6dd49604ae', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; array_push($includePaths, get_include_path()); @@ -46,14 +46,14 @@ class ComposerAutoloaderInitcecc323105e12e5c649bf24af473df2f $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequirececc323105e12e5c649bf24af473df2f($file); + composerRequire16bc56ac9c2be4ae1a51fd6dd49604ae($file); } return $loader; } } -function composerRequirececc323105e12e5c649bf24af473df2f($file) +function composerRequire16bc56ac9c2be4ae1a51fd6dd49604ae($file) { require $file; } diff --git a/library/composer/installed.json b/library/composer/installed.json index a9186e8ef6..3bd77511c6 100644 --- a/library/composer/installed.json +++ b/library/composer/installed.json @@ -1,5 +1,58 @@ [ { + "name": "bombayworks/zendframework1", + "version": "v1.12.9", + "version_normalized": "1.12.9.0", + "source": { + "type": "git", + "url": "https://github.com/bombayworks/zendframework1.git", + "reference": "4bce65c9427866dc62e9ea9ab511f0edffa49f85" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/4bce65c9427866dc62e9ea9ab511f0edffa49f85", + "reference": "4bce65c9427866dc62e9ea9ab511f0edffa49f85", + "shasum": "" + }, + "require": { + "php": ">=5.2.11" + }, + "require-dev": { + "phpunit/dbunit": "1.3.*", + "phpunit/phpunit": "3.7.*" + }, + "time": "2014-09-17 15:01:24", + "bin": [ + "bin/zf.sh", + "bin/zf.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Zend_": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "library/" + ], + "license": [ + "BSD-3-Clause" + ], + "description": "Zend Framework 1", + "homepage": "http://framework.zend.com/", + "keywords": [ + "ZF1", + "framework" + ] + }, + { "name": "ezyang/htmlpurifier", "version": "v4.6.0", "version_normalized": "4.6.0.0", @@ -47,6 +100,66 @@ ] }, { + "name": "fisharebest/ext-calendar", + "version": "1.2.0", + "version_normalized": "1.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/fisharebest/ext-calendar.git", + "reference": "e73e382d347440c9ea6ac8abc658cc4405c9250d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/e73e382d347440c9ea6ac8abc658cc4405c9250d", + "reference": "e73e382d347440c9ea6ac8abc658cc4405c9250d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "dev-master" + }, + "time": "2014-09-27 08:43:30", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "Fisharebest\\ExtCalendar\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0+" + ], + "authors": [ + { + "name": "Greg Roach", + "email": "fisharebest@gmail.com", + "role": "Developer" + } + ], + "description": "Implementation of the Arabic (Hijri), French, Gregorian, Jewish, Julian and Persian (Jalali) calendars. PHP shims for the ext/calendar extension.", + "homepage": "https://github.com/fisharebest/ext-calendar", + "keywords": [ + "Jalali", + "arabic", + "calendar", + "ext-calendar", + "french", + "gregorian", + "hebrew", + "hijri", + "jewish", + "julian", + "julian day", + "julian day number", + "persian", + "shamsi" + ] + }, + { "name": "ircmaxell/password-compat", "version": "1.0.3", "version_normalized": "1.0.3.0", @@ -76,7 +189,7 @@ "authors": [ { "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", + "email": "ircmaxell@ircmaxell.com", "homepage": "http://blog.ircmaxell.com" } ], @@ -141,74 +254,6 @@ ] }, { - "name": "rhumsaa/uuid", - "version": "2.7.3", - "version_normalized": "2.7.3.0", - "source": { - "type": "git", - "url": "https://github.com/ramsey/uuid.git", - "reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/b976326ca5977d7333f34e3c828ae7c22a49a65a", - "reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "doctrine/dbal": ">=2.3", - "moontoast/math": "~1.1", - "phpunit/phpunit": "~4.1", - "satooshi/php-coveralls": "~0.6", - "symfony/console": "~2.3" - }, - "suggest": { - "doctrine/dbal": "Allow the use of a UUID as doctrine field type.", - "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).", - "symfony/console": "Support for use of the bin/uuid command line tool." - }, - "time": "2014-08-27 22:39:41", - "bin": [ - "bin/uuid" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Rhumsaa\\Uuid\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marijn Huizendveld", - "email": "marijn.huizendveld@gmail.com" - }, - { - "name": "Ben Ramsey", - "homepage": "http://benramsey.com" - } - ], - "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", - "homepage": "https://github.com/ramsey/uuid", - "keywords": [ - "guid", - "identifier", - "uuid" - ] - }, - { "name": "patchwork/utf8", "version": "v1.1.25", "version_normalized": "1.1.25.0", @@ -268,23 +313,23 @@ }, { "name": "tecnick.com/tcpdf", - "version": "6.0.093", - "version_normalized": "6.0.093.0", + "version": "6.0.097", + "version_normalized": "6.0.097.0", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "8ec040b3ccedc2a0150a7b6b46c18c59d932ad59" + "reference": "73b436e180d91cb0e9897242ccfb4b49fc498901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/8ec040b3ccedc2a0150a7b6b46c18c59d932ad59", - "reference": "8ec040b3ccedc2a0150a7b6b46c18c59d932ad59", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/73b436e180d91cb0e9897242ccfb4b49fc498901", + "reference": "73b436e180d91cb0e9897242ccfb4b49fc498901", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2014-09-02 19:31:33", + "time": "2014-10-20 20:02:38", "type": "library", "installation-source": "dist", "autoload": { @@ -332,116 +377,71 @@ ] }, { - "name": "bombayworks/zendframework1", - "version": "v1.12.9", - "version_normalized": "1.12.9.0", + "name": "rhumsaa/uuid", + "version": "2.7.3", + "version_normalized": "2.7.3.0", "source": { "type": "git", - "url": "https://github.com/bombayworks/zendframework1.git", - "reference": "4bce65c9427866dc62e9ea9ab511f0edffa49f85" + "url": "https://github.com/ramsey/uuid.git", + "reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/4bce65c9427866dc62e9ea9ab511f0edffa49f85", - "reference": "4bce65c9427866dc62e9ea9ab511f0edffa49f85", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/b976326ca5977d7333f34e3c828ae7c22a49a65a", + "reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a", "shasum": "" }, "require": { - "php": ">=5.2.11" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/dbunit": "1.3.*", - "phpunit/phpunit": "3.7.*" + "doctrine/dbal": ">=2.3", + "moontoast/math": "~1.1", + "phpunit/phpunit": "~4.1", + "satooshi/php-coveralls": "~0.6", + "symfony/console": "~2.3" }, - "time": "2014-09-17 15:01:24", + "suggest": { + "doctrine/dbal": "Allow the use of a UUID as doctrine field type.", + "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).", + "symfony/console": "Support for use of the bin/uuid command line tool." + }, + "time": "2014-08-27 22:39:41", "bin": [ - "bin/zf.sh", - "bin/zf.php" + "bin/uuid" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Zend_": "library/" + "dev-master": "2.7.x-dev" } }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "library/" - ], - "license": [ - "BSD-3-Clause" - ], - "description": "Zend Framework 1", - "homepage": "http://framework.zend.com/", - "keywords": [ - "ZF1", - "framework" - ] - }, - { - "name": "fisharebest/ext-calendar", - "version": "1.2.0", - "version_normalized": "1.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/fisharebest/ext-calendar.git", - "reference": "e73e382d347440c9ea6ac8abc658cc4405c9250d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/e73e382d347440c9ea6ac8abc658cc4405c9250d", - "reference": "e73e382d347440c9ea6ac8abc658cc4405c9250d", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "*", - "satooshi/php-coveralls": "dev-master" - }, - "time": "2014-09-27 08:43:30", - "type": "library", "installation-source": "dist", "autoload": { "psr-4": { - "Fisharebest\\ExtCalendar\\": "src/" + "Rhumsaa\\Uuid\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-3.0+" + "MIT" ], "authors": [ { - "name": "Greg Roach", - "email": "fisharebest@gmail.com", - "role": "Developer" + "name": "Marijn Huizendveld", + "email": "marijn.huizendveld@gmail.com" + }, + { + "name": "Ben Ramsey", + "homepage": "http://benramsey.com" } ], - "description": "Implementation of the Arabic (Hijri), French, Gregorian, Jewish, Julian and Persian (Jalali) calendars. PHP shims for the ext/calendar extension.", - "homepage": "https://github.com/fisharebest/ext-calendar", + "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "homepage": "https://github.com/ramsey/uuid", "keywords": [ - "Jalali", - "arabic", - "calendar", - "ext-calendar", - "french", - "gregorian", - "hebrew", - "hijri", - "jewish", - "julian", - "julian day", - "julian day number", - "persian", - "shamsi" + "guid", + "identifier", + "uuid" ] } ] diff --git a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README index 2e35c1c3d0..2e35c1c3d0 100644..100755 --- a/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README +++ b/library/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/ezyang/htmlpurifier/tests/HTMLPurifier/Injector/RemoveSpansWithoutAttributesTest.php b/library/ezyang/htmlpurifier/tests/HTMLPurifier/Injector/RemoveSpansWithoutAttributesTest.php index 841b0351f7..841b0351f7 100644..100755 --- a/library/ezyang/htmlpurifier/tests/HTMLPurifier/Injector/RemoveSpansWithoutAttributesTest.php +++ b/library/ezyang/htmlpurifier/tests/HTMLPurifier/Injector/RemoveSpansWithoutAttributesTest.php diff --git a/library/tecnick.com/tcpdf/CHANGELOG.TXT b/library/tecnick.com/tcpdf/CHANGELOG.TXT index c3c91a0ea1..672f1a5776 100644 --- a/library/tecnick.com/tcpdf/CHANGELOG.TXT +++ b/library/tecnick.com/tcpdf/CHANGELOG.TXT @@ -1,3 +1,13 @@ +6.0.097 (2014-10-20) + - Bug item #988 "hyphenateText - charmin parameter not work" was fixed. + +6.0.096 (2014-10-06) + - Bug item #982 "Display style is not inherited in SVG" was fixed. + - Bug item #984 "Double quote url in CSS" was fixed. + +6.0.095 (2014-10-02) + - Bug item #979 "New Timezone option overwriting current timezone" was fixed. + 6.0.094 (2014-09-30) - Bug item #978 "Variable Undefined: $cborder" was fixed. diff --git a/library/tecnick.com/tcpdf/README.TXT b/library/tecnick.com/tcpdf/README.TXT index 0a7f054333..030c990f69 100644 --- a/library/tecnick.com/tcpdf/README.TXT +++ b/library/tecnick.com/tcpdf/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.094 -Release date: 2014-09-30 +Version: 6.0.097 +Release date: 2014-10-20 Author: Nicola Asuni Copyright (c) 2002-2014: diff --git a/library/tecnick.com/tcpdf/composer.json b/library/tecnick.com/tcpdf/composer.json index b70c775d05..61984e5911 100644 --- a/library/tecnick.com/tcpdf/composer.json +++ b/library/tecnick.com/tcpdf/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.094", + "version": "6.0.097", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", diff --git a/library/tecnick.com/tcpdf/include/tcpdf_images.php b/library/tecnick.com/tcpdf/include/tcpdf_images.php index 150832ef16..3e13d9d795 100644 --- a/library/tecnick.com/tcpdf/include/tcpdf_images.php +++ b/library/tecnick.com/tcpdf/include/tcpdf_images.php @@ -3,7 +3,7 @@ // File name : tcpdf_images.php // Version : 1.0.003 // Begin : 2002-08-03 -// Last Update : 2014-04-03 +// Last Update : 2014-10-06 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -38,7 +38,7 @@ * This is a PHP class that contains static image methods for the TCPDF class.<br> * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 1.0.003 + * @version 1.0.004 */ /** @@ -46,7 +46,7 @@ * Static image methods used by the TCPDF class. * @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 1.0.003 + * @version 1.0.004 * @author Nicola Asuni - info@tecnick.com */ class TCPDF_IMAGES { @@ -56,7 +56,7 @@ class TCPDF_IMAGES { * @since 5.0.000 (2010-05-02) * @public static */ - public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode'); + public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/tecnick.com/tcpdf/include/tcpdf_static.php b/library/tecnick.com/tcpdf/include/tcpdf_static.php index 2c32f89939..feb4c154e5 100644 --- a/library/tecnick.com/tcpdf/include/tcpdf_static.php +++ b/library/tecnick.com/tcpdf/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.094'; + private static $tcpdf_version = '6.0.097'; /** * String alias for total number of pages. diff --git a/library/tecnick.com/tcpdf/tcpdf.php b/library/tecnick.com/tcpdf/tcpdf.php index c55c94f947..6b926d5540 100644 --- a/library/tecnick.com/tcpdf/tcpdf.php +++ b/library/tecnick.com/tcpdf/tcpdf.php @@ -1,9 +1,9 @@ <?php //============================================================+ // File name : tcpdf.php -// Version : 6.0.094 +// Version : 6.0.097 // Begin : 2002-08-03 -// Last Update : 2014-09-30 +// Last Update : 2014-10-20 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -11,7 +11,7 @@ // // This file is part of TCPDF software library. // -// TCPDF is free software: you can ioredistribute it and/or modify it +// TCPDF is free software: you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as // published by the Free Software Foundation, either version 3 of the // License, or (at your option) any later version. @@ -104,7 +104,7 @@ * Tools to encode your unicode fonts are on fonts/utils directory.</p> * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.094 + * @version 6.0.097 */ // TCPDF configuration @@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.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 6.0.094 + * @version 6.0.097 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -4199,7 +4199,7 @@ class TCPDF { * The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by K_PATH_FONTS if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated. * @param $family (string) Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font. * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul> - * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces. + * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces. * @return array containing the font data, or false in case of error. * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font. * @public @@ -4454,7 +4454,7 @@ class TCPDF { * @param $family (string) Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained. * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined. * @param $size (float) Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12 - * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces. + * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces. * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font. * @param $out (boolean) if true output the font size command, otherwise only set the font properties. * @author Nicola Asuni @@ -7411,10 +7411,9 @@ class TCPDF { $this->x = $this->lMargin + $cellpadding; } if (is_string($h)) { - $this->y += $this->lasth; - } else { - $this->y += $h; + $h = $this->lasth; } + $this->y += $h; $this->newline = true; } @@ -18187,7 +18186,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: $cellh = 0; } if (isset($dom[$key]['content'])) { - $cell_content = stripslashes($dom[$key]['content']); + $cell_content = $dom[$key]['content']; } else { $cell_content = ' '; } @@ -22150,10 +22149,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: * Returns an array of chars containing soft hyphens. * @param $word (array) array of chars * @param $patterns (array) Array of hypenation patterns. - * @param $dictionary (array) Array of words to be returned without applying the hyphenation algoritm. + * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm. * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens. * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens. - * @param $charmin (int) Minimum word length to apply the hyphenation algoritm. + * @param $charmin (int) Minimum word length to apply the hyphenation algorithm. * @param $charmax (int) Maximum length of broken piece of word. * @return array text with soft hyphens * @author Nicola Asuni @@ -22184,10 +22183,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: // surround word with '_' characters $tmpword = array_merge(array(46), $word, array(46)); $tmpnumchars = $numchars + 2; - $maxpos = $tmpnumchars - $charmin; + $maxpos = $tmpnumchars - 1; for ($pos = 0; $pos < $maxpos; ++$pos) { $imax = min(($tmpnumchars - $pos), $charmax); - for ($i = $charmin; $i <= $imax; ++$i) { + for ($i = 1; $i <= $imax; ++$i) { $subword = strtolower(TCPDF_FONTS::UTF8ArrSubString($tmpword, $pos, ($pos + $i), $this->isunicode)); if (isset($patterns[$subword])) { $pattern = TCPDF_FONTS::UTF8StringToArray($patterns[$subword], $this->isunicode, $this->CurrentFont); @@ -22230,10 +22229,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: * Returns text with soft hyphens. * @param $text (string) text to process * @param $patterns (mixed) Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/ - * @param $dictionary (array) Array of words to be returned without applying the hyphenation algoritm. + * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm. * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens. * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens. - * @param $charmin (int) Minimum word length to apply the hyphenation algoritm. + * @param $charmin (int) Minimum word length to apply the hyphenation algorithm. * @param $charmax (int) Maximum length of broken piece of word. * @return array text with soft hyphens * @author Nicola Asuni diff --git a/library/tecnick.com/tcpdf/tcpdf_autoconfig.php b/library/tecnick.com/tcpdf/tcpdf_autoconfig.php index 951c0b0fb0..7dc2d47af3 100644 --- a/library/tecnick.com/tcpdf/tcpdf_autoconfig.php +++ b/library/tecnick.com/tcpdf/tcpdf_autoconfig.php @@ -235,7 +235,6 @@ if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) { if (!defined('K_TIMEZONE')) { define('K_TIMEZONE', @date_default_timezone_get()); } -date_default_timezone_set(K_TIMEZONE); //============================================================+ // END OF FILE diff --git a/library/tecnick.com/tcpdf/tcpdf_barcodes_1d.php b/library/tecnick.com/tcpdf/tcpdf_barcodes_1d.php index 09dfaf4d16..c3f3f8b03c 100644 --- a/library/tecnick.com/tcpdf/tcpdf_barcodes_1d.php +++ b/library/tecnick.com/tcpdf/tcpdf_barcodes_1d.php @@ -1,9 +1,9 @@ <?php //============================================================+ // File name : tcpdf_barcodes_1d.php -// Version : 1.0.026 +// Version : 1.0.027 // Begin : 2008-06-09 -// Last Update : 2014-05-20 +// Last Update : 2014-10-20 // Author : Nicola Asuni - Tecnick.com LTD - 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.026 + * @version 1.0.027 */ /** * @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.026 + * @version 1.0.027 * @author Nicola Asuni */ class TCPDFBarcode { @@ -242,7 +242,7 @@ class TCPDFBarcode { /** * Set the barcode. * @param $code (string) code to print - * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul> + * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>IMBPRE: Pre-processed Intelligent Mail Barcode - Onecode - USPS-B-3200, using only F,A,D,T letters</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul> * @return array barcode array * @public */ @@ -352,6 +352,10 @@ class TCPDFBarcode { $arrcode = $this->barcode_imb($code); break; } + case 'IMBPRE': { // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200- pre-processed + $arrcode = $this->barcode_imb_pre($code); + break; + } case 'CODABAR': { // CODABAR $arrcode = $this->barcode_codabar($code); break; @@ -2038,7 +2042,6 @@ class TCPDFBarcode { return $bararray; } - /** * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200 * (requires PHP bcmath extension) @@ -2167,6 +2170,57 @@ class TCPDFBarcode { } /** + * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200 + * + * @param $code (string) pre-formatted IMB barcode (65 chars "FADT") + * @return array barcode representation. + * @protected + */ + protected function barcode_imb_pre($code) { + if (!preg_match('/^[fadtFADT]{65}$/', $code) == 1) { + return false; + } + $characters = str_split(strtolower($code), 1); + // build bars + $k = 0; + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 3, 'bcode' => array()); + for ($i = 0; $i < 65; ++$i) { + switch($characters[$i]) { + case 'f': { + // full bar + $p = 0; + $h = 3; + break; + } + case 'a': { + // ascender + $p = 0; + $h = 2; + break; + } + case 'd': { + // descender + $p = 1; + $h = 2; + break; + } + case 't': { + // tracker (short) + $p = 1; + $h = 1; + break; + } + } + $bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p); + $bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0); + $bararray['maxw'] += 2; + } + unset($bararray['bcode'][($k - 1)]); + --$bararray['maxw']; + return $bararray; + } + + /** * Convert large integer number to hexadecimal representation. * (requires PHP bcmath extension) * @param $number (string) number to convert specified as a string |
