Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2014-09-28 19:34:18
|
Revision: 12802
http://sourceforge.net/p/xoops/svn/12802
Author: beckmi
Date: 2014-09-28 19:34:11 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
Upgrade from montuy337513 (alias black_beard)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/config/tcpdf_config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.ctg.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/fonts/dejavusans.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/pdf417.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_colors.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_filters.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_font_data.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_images.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_static.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_autoconfig.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/format.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/pdf_data.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/index.html
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/LICENSE.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/README.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/cache/
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/composer.json
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/config/lang/
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/README.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/tcpdf_logo.jpg
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/images/tcpdf_signature.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tools/
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT 2014-09-28 13:38:38 UTC (rev 12801)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/CHANGELOG.TXT 2014-09-28 19:34:11 UTC (rev 12802)
@@ -1,2823 +0,0 @@
-6.0.084 (2014-06-13)
- - A bug related to MultiCell fitcell feature was fixed.
- - Bug item #931 "Documentation error for setPageFormat()" was fixed.
-
-6.0.083 (2014-05-29)
- - Bug item #928 "setHtmlVSpace with HR element" was fixed.
-
-6.0.082 (2014-05-23)
- - Bug item #926 "test statement instead of assignment used in tcpdf_fonts.php" was fixed.
- - Bug item #925 "924 transparent images bug" was fixed.
-
-6.0.081 (2014-05-22)
- - Bug item #922 "writehtml tables thead repeating" was fixed.
- - Patch #71 "External and internal links, local and remote" wa applied.
-
-6.0.080 (2014-05-20)
- - Bug item #921 "Fatal error in hyphenateText() function" was fixed.
- - Bug item #923 "Automatic Hyphenation error" was fixed.
- - Patch #70 "Augument TCPDFBarcode classes with ability to return raw png image data" was applied.
-
-6.0.079 (2014-05-19)
- - Patch item #69 "Named destinations, HTML internal and external links" was merged.
- - Bug item #920 "hyphenateText() should not hyphenate the content of style-tags in HTML mode" was fixed.
- - Image method now trigs an error in case the cache is now writeable.
- - Fixed issue with layer default status.
-
-6.0.078 (2014-05-12)
- - A warning issue in addTTFfont() method was fixed.
- - Fonts were updated to include cbbox metrics.
-
-6.0.077 (2014-05-06)
- - A Datamatrix barcode bug was fixed.
-
-6.0.076 (2014-05-06)
- - A bug in Datamatrix Base256 encoding was fixed.
- - Merged fix for SVG use/clip-gradient.
- - Now it is possible to prefix a page number in Link methods with the * character to avoid been changed when adding/deleting/moving pages (see example_045.php).
-
-6.0.075 (2014-05-05)
- - Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
-
-6.0.074 (2014-05-03)
- - Part of Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
- - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.
-
-6.0.073 (2014-04-29)
- - Bug #913 "Possible bug with line-height" was fixed.
- - Bug #914 "MultiCell and FitCell" was fixed.
- - Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.
-
-6.0.072 (2014-04-27)
- - Deprecated curly braces substring syntax was replaced with square braces.
-
-6.0.071 (2014-04-25)
- - Bug #911 "error with buffered png pics" was fixed.
-
-6.0.070 (2014-04-24)
- - Bug #910 "An SVG image is being cut off (with clipping mask) when you use align options" was fixed.
-
-6.0.069 (2014-04-24)
- - Datamatrix Base256 encoding was fixed.
-
-6.0.068 (2014-04-22)
- - Some Datamatrix barcode bugs were fixed.
-
-6.0.067 (2014-04-21)
- - startLayer() method signature was changed to include a new "lock" parameter.
-
-6.0.066 (2014-04-20)
- - Bug #908 "Linebreak is not considered when getting length of the next string" was fixed.
-
-6.0.065 (2014-04-10)
- - Bug #905 "RGB percentage color bug in convertHTMLColorToDec()" was fixed.
-
-6.0.064 (2014-04-07)
- - Header and Footer fonts are now set by default.
- - Bug #904 "PDF corrupted" was fixed.
-
-6.0.063 (2014-04-03)
- - Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.
-
-6.0.062 (2014-03-02)
- - The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.
-
-6.0.061 (2014-02-18)
- - Bug #893 "Parsing error on streamed xref for secured pdf" was fixed.
-
-6.0.060 (2014-02-16)
- - Bug #891 "Error on parsing hexa fields" was fixed.
- - Bug #892 "Parsing pdf with trailing space at start" was fixed.
-
-6.0.059 (2014-02-03)
- - SVG 'use' support was imporved.
-
-6.0.058 (2014-01-31)
- - Bug #886 "Bugs with SVG using <defs> and <use>" was fixed.
-
-6.0.057 (2014-01-26)
- - Bug #883 "Parsing error" was fixed.
-
-6.0.056 (2014-01-25)
- - The automatic cache folder selection now works also with some restricted hosting environments.
- - CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz).
- - Bug #884 "Parsing error prev tag looking for" was fixed.
-
-6.0.055 (2014-01-15)
- - Bug #880 "Error detecting hX tags (h1,h2..)" was fixed
- - Bug #879 "Thead on the second page inherits style of previous tr" was fixed
-
-6.0.054 (2014-01-13)
- - Bug #877 "Parenteses causing corrupt text" was fixed.
-
-6.0.053 (2014-01-03)
- - Bug #876 "Cell padding should not be multiplied with number of lines in getStringHeight" was fixed.
- - Patch #68 "Empty img src attribute leads to access of uninitialized string offset" was applied.
-
-6.0.052 (2013-12-12)
- - Bug #871 "Datamatrix coding" was fixed.
-
-6.0.051 (2013-12-02)
- - cbbox array values in addTTFfont() were converted to integers.
-
-6.0.050 (2013-12-01)
- - The method getNumLines() was extended to support hyphenation.
- - The CSS property line-height now supports non percentage values.
-
-6.0.050 (2013-11-27)
- - A bug related to PNG images was fixed.
-
-6.0.048 (2013-11-24)
- - SVG vars are now reset in ImageSVG() method.
-
-6.0.047 (2013-11-19)
- - SVG support was extended to support some nested defs.
-
-6.0.046 (2013-11-17)
- - preg_replace_callback functions were replaced to improve memory performances.
-
-6.0.045 (2013-11-17)
- - Bug #862 "Parsing error on flate filter" was fixed.
-
-6.0.044 (2013-11-10)
- - Bug #857 "Undefined offset error" was fixed.
- - The uniord method now uses a static cache to improve performances (thanks to Mathieu Masseboeuf for the sugegstion).
- - Two bugs in the TCPDF_FONTS class were fixed.
-
-6.0.043 (2013-10-29)
- - Bug #854 "CSS instruction display" was fixed.
-
-6.0.042 (2013-10-25)
- - Bug #852 "CMYK Colors Bug" was fixed.
-
-6.0.041 (2013-10-21)
- - Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
-
-6.0.040 (2013-10-20)
- - Bug #849 "SVG import bug" was fixed.
-
-6.0.039 (2013-10-13)
- - Bug #843 "Wrong call in parser" was fixed.
- - Bug #844 "Wrong object type named" was fixed.
- - Bug #845 "Parsing error on obj ref prefixed by '000000'" was fixed.
-
-6.0.038 (2013-10-06)
- - Bug #841 "Division by zero warning at writeHTML a <li> tag" was fixed.
-
-6.0.037 (2013-09-30)
- - Method getAllSpotColors() was added to return all spot colors.
- - Method colorRegistrationBar() was extended to automatically print all spot colors and support individual spot colors.
- - The method registrationMarkCMYK() was added to print a registration mark for CMYK colors.
- - A bug related to page groups was fixed.
- - Gradient() method now supports CMYK equivalents of spot colors.
- - Example n. 56 was updated.
-
-6.0.036 (2013-09-29)
- - Methods for registration bars and crop marks were extended to support registration color (see example n. 56).
- - New default spot colors were added to tcpdf_colors.php, including the 'All' and 'None' special registration colors.
-
-6.0.035 (2013-09-25)
- - TCPDF_PARSER class was improved.
-
-6.0.034 (2013-09-24)
- - Bug #839 "Error in xref parsing in mixed newline chars" was fixed.
-
-6.0.033 (2013-09-23)
- - Bug fix related to PNG image transparency using GD library.
-
-6.0.032 (2013-09-23)
- - Bug #838 "Fatal error when imagick cannot handle the image, even though GD is available and can" was fixed.
-
-6.0.031 (2013-09-18)
- - Bug #836 "Optional EOL marker before endstream" was fixed.
- - Some additional controls were added to avoid "division by zero" error with badly formatted input.
-
-6.0.030 (2013-09-17)
- - Bug #835 "PDF417 and Cyrilic simbols" was fixed.
-
-6.0.029 (2013-09-15)
- - Constants K_TCPDF_PARSER_THROW_EXCEPTION_ERROR and K_TCPDF_PARSER_IGNORE_DECODING_ERRORS where removed in favor of a new configuration array in the TCPDF_PARSER class.
- - The TCPDF_PARSER class can now be configured using the new $cfg parameter.
-
-6.0.028 (2013-09-15)
- - A debug print_r was removed form tcpdf_parser.php.
- - TCPDF_FILTERS class now throws an exception in case of error.
- - TCPDF_PARSER class now throws an exception in case of error unless you define the constant K_TCPDF_PARSER_THROW_EXCEPTION_ERROR to false.
- - The constant K_TCPDF_PARSER_IGNORE_DECODING_ERRORS can be set to tru eto ignore decoding errors on TCPDF_PARSER.
-
-6.0.027 (2013-09-14)
- - A bug in tcpdf_parser wen parsing hexadecimal strings was fixed.
- - A bug in tcpdf_parser wen looking for statxref was fixed.
- - A bug on RC4 encryption was fixed.
-
-6.0.026 (2013-09-14)
- - A bug in tcpdf_parser wen decoding streams was fixed.
-
-6.0.025 (2013-09-04)
- - A pregSplit() bug was fixed.
- - Improved content loading from URLs.
- - Improved font path loading.
-
-6.0.024 (2013-09-02)
- - Bug #826 "addEmptySignatureAppearance issue" was fixed.
-
-6.0.023 (2013-08-05)
- - GNU Freefont fonts were updated.
- - Licensing and copyright information about fonts were improved.
- - PNG image support was improved.
-
-6.0.022 (2013-08-02)
- - fixing initialization problem for signature_appearance property.
-
-6.0.021 (2013-07-18)
- - The bug caused by the preg_split function on some PHP 5.2.x versions was fixed.
-
-6.0.020 (2013-06-04)
- - The method addTTFfont() was fixed (Bug item #813 Undefined offset).
-
-6.0.019 (2013-06-04)
- - The magic constant __DIR__ was replaced with dirname(__FILE__) for php 5.2 compatibility.
- - The exceptions raised by file_exists() function were suppressed.
-
-6.0.018 (2013-05-19)
- - The barcode examples were changed to automatically search for the barcode class path (in case the examples directory is not installed under the TCPDF root).
-
-6.0.017 (2013-05-16)
- - The command line tool tcpdf_addfont.php was improved.
- - The php logic was removed from configuration files that now contains only constant defines.
- - The tcpdf_autoconfig.php file was added to automatically set missing configuration values.
-
-6.0.016 (2013-05-15)
- - The tcpdf_addfont.php tool was improved (thanks to Remi Collet).
- - Constant K_PATH_IMAGES is now automatically set in configuration file.
-
-6.0.015 (2013-05-14)
- - Some unused vars were removed from AddFont() method.
- - Some directories were moved inside the examples directory.
- - All examples were updated to reflect the new default structure.
- - Source code were clean-up up to be more compatible with system packaging.
- - Files encodings and permissions were reset.
- - The command line tool tcpdf_addfont.php was added on the tools directory.
-
-6.0.014 (2013-04-13)
- - The signature of addTTFfont() method includes a new parameter to link existing fonts instead of copying and compressing them.
-
-6.0.013 (2013-04-10)
- - Add support for SVG dx and dy text/tspan attributes.
- - replace require() with require_once().
- - fix some minor typos on documentation.
- - fix a problem when deleting all pages.
-
-6.0.012 (2013-04-24)
- - An error condition in addHtmlLink() method was fixed (bug #799).
-
-6.0.011 (2013-04-22)
- - Minor documentation changes.
-
-6.0.010 (2013-04-03)
- - The method Rect() was fixed to print borders correctly.
-
-6.0.009 (2013-04-02)
- - Adding back some files that were not properly committed on the latest release.
-
-6.0.008 (2013-04-01)
- - Duplicated encoding maps was removed from tcpdf_font_data.php.
- - Fixing bug on AddTTFFont().
-
-6.0.007 (2013-03-29)
- - HTML/CSS font size conversion were improved.
-
-6.0.006 (2013-03-27)
- - Bug related to SVG and EPS files on xobjects were fixed.
-
-6.0.005 (2013-03-26)
- - Default font path was fixed.
-
-6.0.004 (2013-03-21)
- - Return value of addTTFfont() method was fixed.
-
-6.0.003 (2013-03-20)
- - A bug related to non-unicode mode was fixed.
-
-6.0.002 (2013-03-18)
- - _getFIXED call on tcpdf_fonts.php was fixed.
-
-6.0.001 (2013-03-18)
- - Fixed $uni_type call on tcpdf.php.
-
-6.0.000 (2013-03-17)
- - IMPORTANT: PHP4 support has been removed starting from this version.
- - Several TCPDF methods and vars were moved to new class files: tcpdf_static.php, tcpdf_colors.php, tcpdf_images.php, tcpdf_font_data.php, tcpdf_fonts.php.
- - Files htmlcolors.php, spotcolors.php, unicode_data.php and ecodings_maps.php were removed.
- - Barcode classes were renamed and new barcode examples were added.
- - Class TCPDF_PARSER was improved.
-
-********************************************************************************
-
-5.9.209 (2013-03-15)
- - Image method was improved.
-
-5.9.208 (2013-03-15)
- - objclone fuction was patched to support old imagick extensions.
- - tcpdf_parser was improved to support Cross-Reference Streams and large streams.
-
-5.9.207 (2013-03-04)
- - Datamatrix class was fixed (a debug echo was removed).
-
-5.9.206 (2013-02-22)
- - Bug item #754 "PNG with alpha channel becomes gray scale" was fixed.
- - Minor documentation fixes.
-
-5.9.205 (2013-02-06)
- - The constant K_TCPDF_THROW_EXCEPTION_ERROR was added on configuration file to change the behavior of Error() method.
- - PDF417 barcode bug was fixed.
-
-5.9.204 (2013-01-23)
- - The method Bookmark() was extended to include named destinations, URLs, internal links or embedded files (see example n. 15).
- - automatic path calculation on configuration file was fixed.
- - Error() method was extended to throw new Exception if PHP > 5.
-
-5.9.203 (2013-01-22)
- - Horizontal position of radiobuttons and checkboxes was adjusted.
-
-5.9.202 (2012-12-16)
- - Vertical space problem after table was fixed.
-
-5.9.201 (2012-12-10)
- - First 256 chars are now always included on font subset to overcome a problem reported on the forum.
-
-5.9.200 (2012-12-05)
- - Bug item #768 "Rowspan with Pagebreak error" was fixed.
- - Page regions now works also with limited MultiCell() cells.
-
-5.9.199 (2012-11-29)
- - Internal setImageBuffer() method was improved.
-
-5.9.198 (2012-11-19)
- - Datamatrix EDIFACT mode was fixed.
-
-5.9.197 (2012-11-06)
- - Bug item #756 "TCPDF 5.9.196 shows line on top of all PDFs" was fixed.
-
-5.9.196 (2012-11-02)
- - Several methods were improved to avoid output when the context is out of page.
- - Bug item #755 "remove cached files before unsetting" was fixed.
-
-5.9.195 (2012-10-24)
- - Method _putfonts() was improved.
-
-5.9.194 (2012-10-23)
- - Text alignment on TextField() method was fixed.
-
-5.9.193 (2012-09-25)
- - Support for named destinations on HTML links was added (i.e.: <a href="#destinationname">link to named destination</a>).
-
-5.9.192 (2012-09-24)
- - A problem on the releasing process was fixed.
-
-5.9.191 (2012-09-24)
- - SVG image naow support svg and eps images.
-
-5.9.190 (2012-09-23)
- - "page" word translation is now set to empty if not defined.
- - Tooltip feature was added on the radiobutton annotation.
-
-5.9.189 (2012-09-18)
- - Bug item #3568969 "ini_get safe_mode error" was fixed.
-
-5.9.188 (2012-09-15)
- - A datamatrix barcode bug was fixed.
-
-5.9.187 (2012-09-14)
- - Subset feature was extended to include the first 256 characters.
-
-5.9.186 (2012-09-13)
- - barcodes.php file was resynced.
- - Methods SetAbsX, SetAbsY, SetAbsXY where added to set the absolute pointer coordinates.
- - Method getCharBBox were added to get single character bounding box.
- - Signature of addTTFfont method was changed ($addcbbox paramter was added).
-
-5.9.185 (2012-09-12)
- - Method _putfontwidths() was fixed.
-
-5.9.184 (2012-09-11)
- - A problem with EAN barcodes was fixed.
-
-5.9.183 (2012-09-07)
- - A problem with font names normalization was fixed.
-
-5.9.182 (2012-09-05)
- - Bug item #3564982 "Infinite loop in Write() method" was fixed.
-
-5.9.181 (2012-08-31)
- - composer.json file was added.
- - Bug item #3563369 "Cached images are not unlinked some time" was fixed.
-
-5.9.180 (2012-08-22)
- - Bug item #3560493 "Problems with nested cells in HTML" was fixed.
-
-5.9.179 (2012-08-04)
- - SVG 'use' tag was fixed for 'circle' and 'ellipse' shift problem.
- - Alpha status is now correctly stored and restored by getGraphicVars() and SetGraphicVars() methods.
-
-5.9.178 (2012-08-02)
- - SVG 'use' tag was fixed for 'circle' and 'ellipse'.
-
-5.9.177 (2012-08-02)
- - An additional control on annotations was fixed.
-
-5.9.176 (2012-07-25)
- - A bug related to stroke width was fixed.
- - A problem related to font spacing in HTML was fixed.
-
-5.9.175 (2012-07-25)
- - The problem of missing letter on hyphen break was fixed.
-
-5.9.174 (2012-07-25)
- - The problem of wrong filename when downloading PDF from an Android device was fixed.
- - The method setHeaderData() was extended to set text and line color for header (see example n. 1).
- - The method setFooterData() was added to set text and line color for footer (see example n. 1).
- - The methods setTextShadow() and getTextShadow() were added to set text shadows (see example n. 1).
- - The GetCharWidth() method was fixed for negative character spacing.
- - A 'none' border mode is now correctly recognized.
- - Break on hyphen problem was fixed.
-
-5.9.173 (2012-07-23)
- - Some additional control wher added on barcode methods.
- - The option CURLOPT_FOLLOWLOCATION on Image method is now disabled if PHP safe_mode is on or open_basedir is set.
- - Method Bookmark() was extended to include X parameter.
- - Method setDestination() was extended to include X parameter.
- - A problem with Thai language was fixed.
-
-5.9.172 (2012-07-02)
- - A PNG color profile issue was fixed.
-
-5.9.171 (2012-07-01)
- - Some SVG rendering problems were fixed.
-
-5.9.170 (2012-06-27)
- - Bug #3538227 "Numerous errors inserting shared images" was fixed.
-
-5.9.169 (2012-06-25)
- - Some SVG rendering problems were fixed.
-
-5.9.168 (2012-06-22)
- - Thai language rendering was fixed.
-
-5.9.167 (2012-06-22)
- - Thai language rendering was fixed and improved.
- - Method isCharDefined() was improved.
- - Protected method replaceChar() was added.
- - Font "kerning" word was corrected to "tracking".
-
-5.9.166 (2012-06-21)
- - Array to string conversion on file_id creation was fixed.
- - Thai language rendering was fixed (thanks to Atsawin Chaowanakritsanakul).
-
-5.9.165 (2012-06-07)
- - Some HTML form related bugs were fixed.
-
-5.9.164 (2012-06-06)
- - A bug introduced on the latest release was fixed.
-
-5.9.163 (2012-06-05)
- - Method getGDgamma() was changed.
- - Rendering performances of PNG images with alpha channel were improved.
-
-5.9.162 (2012-05-11)
- - A bug related to long text on TD cells was fixed.
-
-5.9.161 (2012-05-09)
- - A bug on XREF table was fixed (Bug ID: 3525051).
- - Deprecated Imagick:clone was replaced.
- - Method objclone() was fixed for PHP4.
-
-5.9.160 (2012-05-03)
- - A bug on tcpdf_parser.php was fixed.
-
-5.9.159 (2012-04-30)
- - Barcode classes were updated to fix PNG export Bug (ID: 3522291).
-
-5.9.158 (2012-04-22)
- - Some SVG-related bugs were fixed.
-
-5.9.157 (2012-04-16)
- - Some SVG-related bugs were fixed.
-
-5.9.156 (2012-04-10)
- - Bug item #3515885 "TOC and booklet: left and right page exchanged".
- - SetAutoPageBreak(false) now works also in multicolumn mode.
-
-5.9.155 (2012-04-02)
- - Bug item #3512596 "font import problems" was fixed.
- - Method addTTFfont() was modified to extract only specified Platform ID and Encoding ID (check the source code documentation).
- - All fonts were updated.
- - Bug item #3513867 "booklet and setHeaderTemplateAutoreset: header shifted left" was fixed.
- - Bug item #3513749 "TCPDF Superscript/Subscript" was fixed.
-
-5.9.154 (2012-03-29)
- - A debug echo was removed.
-
-5.9.153 (2012-03-28)
- - A bug on font conversion was fixed.
- - All fonts were updated.
- - Method isCharDefined() was added to find if a character is defined on the selected font.
- - Method replaceMissingChars() was added to automatically replace missing chars on selected font.
- - SetFont() method was fixed.
-
-5.9.152 (2012-03-23)
- - The following overprint methods were added: setOverprint(), getOverprint().
- - Signature of setAlpha() method was changed and method getAlpha() was added.
- - stroke-opacity support was added on SVG.
- - The following date methods were added: setDocCreationTimestamp(), setDocModificationTimestamp(), getDocCreationTimestamp(), getDocModificationTimestamp(), getFormattedDate(), getTimestamp().
- - Signature of _datestring() method was changed.
- - Method getFontBBox() was added.
- - Method setPageBoxTypes() was aded.
-
-5.9.151 (2012-03-22)
- - Bug item #3509889 "Transform() distorts PDF" was fixed.
- - Precision of real number were extended.
- - ComboBox and ListBox methods were fixed.
- - Bulgarian language file was added.
- - addTOC() method was improved to include bookmark color and font style.
-
-5.9.150 (2012-03-16)
- - A bug related to form fields in PDF/A mode was fixed.
-
-5.9.149 (2012-02-21)
- - Bug item #3489933 "SVG Parser treats tspan like text" was fixed.
-
-5.9.148 (2012-02-17)
- - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed.
-
-5.9.147 (2012-02-14)
- - A problem with SVG gradients has been fixed.
-
-5.9.146 (2012-02-12)
- - Bug item #3486880 "$filehash undefine error" was fixed.
- - The default font is now the one specified at PDF_FONT_NAME_MAIN constant.
-
-5.9.145 (2012-01-28)
- - Japanese language file was added.
- - TCPDF license and README.TXT files were updated.
-
-5.9.144 (2012-01-12)
- - HTML output on barcode classes was improved.
-
-5.9.143 (2012-01-08)
- - Bug item #3471057 "setCreator() has no effect" was fixed.
-
-5.9.142 (2011-12-23)
- - Source code documentation was updated.
-
-5.9.141 (2011-12-14)
- - Some minor bugs were fixed.
-
-5.9.140 (2011-12-13)
- - SVG now supports embedded images encoded as base64.
-
-5.9.139 (2011-12-11)
- - Spot color methods were fixed.
-
-5.9.138 (2011-12-10)
- - cropMark() method was improved (check source code documentation).
- - Example n. 56 was updated.
- - Bug item #3452390 "Check Box still not ticked when set to true" was fixed.
-
-5.9.137 (2011-12-01)
- - Bug item #3447005 "Background color and border of Form Elements is printed" was fixed.
- - Color support for Form elements was improved.
-
-5.9.136 (2011-11-27)
- - Bug item #3443387 "SetMargins with keep option does not work for top margin" was fixed.
-
-5.9.135 (2011-11-04)
- - Bug item #3433406 "Double keywords in description" was fixed.
-
-5.9.134 (2011-10-29)
- - The default value for $defcol parameter on convertHTMLColorToDec() method was fixed.
- - Deafult HTTP headers were changed to avoid browser caching.
- - Some deprecated syntax were replaced.
-
-5.9.133 (2011-10-26)
- - Bug item #3428446 "copyPage method not working when diskcache enabled" was fixed.
-
-5.9.132 (2011-10-20)
- - Bug item #3426167 "bug in function convertHTMLColorToDec()" was fixed.
-
-5.9.131 (2011-10-13)
- - An error message was added to ImagePngAlpha() method.
-
-5.9.130 (2011-10-12)
- - Now you can set image data strings on HTML img tag by encoding the image binary data in this way: $imgsrc = '@'.base64_encode($imgdata);
-
-5.9.129 (2011-10-07)
- - Core fonts metrics was fixed (replace all helvetica and times php files on fonts folder).
- - Form fields support was improved and some problems were fixed (check the example n. 14).
- - Bug item #3420249 "Issue with booklet and MultiCell" was fixed.
-
-5.9.128 (2011-10-06)
- - Method addTTFfont() was improved (check the source code documentation).
- - Method setExtraXMP() to set custom XMP data was added.
-
-5.9.127 (2011-10-04)
- - Readonly mode option was activated for radiobuttons.
-
-5.9.126 (2011-10-03)
- - Bug item #3417989 "Graphics State operator in form XObject fails to render" was fixed.
- - Xobjects problems with transparency, gradients and spot colors were fixed.
-
-5.9.125 (2011-10-03)
- - Support for 8-digit CMYK hexadecimal color representation was added (to be used with XHTML and SVG).
- - Spot colors support was improved (check example n. 37).
- - Color methods were improved.
-
-5.9.124 (2011-10-02)
- - Core fonts were updated.
-
-5.9.123 (2011-10-02)
- - The method addTTFfont() wad added to automatically convert TTF fonts (check the new fonts guide at http://www.tcpdf.org).
- - Old font utils were removed.
- - All fonts were updated and new arabic fonts were added (almohanad were removed and replaced by aefurat and aealarabiya).
- - The file unicode_data.php was updated.
- - The file encodings_maps.php was added.
- - PDF/A files are now compressed to save space.
- - XHTML input form fields now support text-alignment attribute.
-
-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).
- - 14 new fonts were added to allow embedding core fonts (for PDF/A compliance).
- - Font utils were fixed.
-
-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.
-
-5.9.118 (2011-09-17)
- - This version includes some changes that allows you to add a bookmark for a page that do not exist.
-
-5.9.117 (2011-09-15)
- - TCPDFBarcode and TCPDF2DBarcode classes were extended to include a method for exporting barcodes as PNG images.
-
-5.9.116 (2011-09-14)
- - Datamatrix class was improved and documentation was fixed.
-
-5.9.115 (2011-09-13)
- - 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.
-
-5.9.114 (2011-09-04)
- - A bug related to column position was fixed.
-
-5.9.113 (2011-08-24)
- - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under d...
[truncated message content] |
|
From: <be...@us...> - 2014-10-19 04:35:34
|
Revision: 12816
http://sourceforge.net/p/xoops/svn/12816
Author: beckmi
Date: 2014-10-19 04:35:29 +0000 (Sun, 19 Oct 2014)
Log Message:
-----------
Cosmetic changes
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,48 +0,0 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
-
-1. Author(s)
---------------------------------
-Initial author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
-Initial TCPDF version : 6.0.093
-Programmers having been adaptation and optimization for Xoops
-- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
-- Philodenelle - www.chg-web.org - phi...@ch...
-
-2. Minimum required
---------------------------------
-- Xoops 2.5.7
-- PHP 5.3.17
-
-3. Installing TCPDF_for_Xoops
---------------------------------
-Xoops 2.5.7 and higher
-- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
-- Check the following directories have write access
- * ./xoops_lib/vendor/tcpdf/fonts
- * ./xoops_lib/vendor/tcpdf/cache
- * ./xoops_lib/vendor/tcpdf/images
-- For specifics characters (japanese, korean, chinese, taiwanese) download
- the specific font (see below) and copy the directory ./Frameworks/tcpdf/fonts or ./language/fonts
- * For Chinese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_simplified_font_tcpdf_for_xoops.zip/download
- * For Taiwan character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/chinese_taiwan_font_tcpdf_for_xoops.zip/download
- * For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
- * For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-
-4. Update TCPDF_for_xoops
---------------------------------
-Xoops 2.5.0 - 2.5.6
-- This version
-
-Xoops 2.5.7 and higher
-- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-
-
-5. Convert a font for TCPDF_for_Xoops
---------------------------------
-- Using the addTTFfont() method you can directly create a TCPDF font starting
- from a TrueType, OpenType or Type1 font.
- NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
-
- For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/READ_ME.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,4 +1,4 @@
-TCPDF_for_Xoops Version 2.01 - 2014-09-13
+TCPDF_for_XOOPS Version 2.01 - 2014-09-13
1. Author(s)
--------------------------------
@@ -13,11 +13,11 @@
- Xoops 2.5.7
- PHP 5.3.17
-3. Installing TCPDF_for_Xoops
+3. Installing TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.7 and higher
- unzip the file and copy the directory TCPDF to the directory ./xoops_lib/vendor/
-- replace files makepdf.php modules you need
+- replace files makepdf.php for modules you need
- Check the following directories have write access
* ./xoops_lib/vendor/tcpdf/fonts
* ./xoops_lib/vendor/tcpdf/cache
@@ -29,7 +29,7 @@
* For Korean character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/korean_font_tcpdf_for_xoops.zip/download
* For Japonese character download : http://sourceforge.net/projects/chgxoops/files/Frameworks/japonese_font_tcpdf_for_xoops.zip/download
-4. Update TCPDF_for_xoops
+4. Update TCPDF_for_XOOPS
--------------------------------
Xoops 2.5.0 - 2.5.6
- This version
@@ -38,11 +38,11 @@
- Overwrite existing files with new files in directory ./xoops_lib/vendor/tcpdf
-5. Convert a font for TCPDF_for_Xoops
+5. Convert a font for TCPDF_for_XOOPS
--------------------------------
- Using the addTTFfont() method you can directly create a TCPDF font starting
from a TrueType, OpenType or Type1 font.
NOTE: The './Frameworks/tcpdf/fonts' directory must be writeable by the webserver.
For example:
- $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
\ No newline at end of file
+ $fontname = $pdf->addTTFfont('/path-to-font/DejaVuSans.ttf', 'TrueTypeUnicode', '', 32);
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/credits.txt 2014-10-19 04:35:29 UTC (rev 12816)
@@ -0,0 +1,10 @@
+CREDITS
+===============
+
+The TCPDF Library is developed by Nicola Asuni - Tecnick.com LTD - www.tecnick.com - in...@te...
+
+The adaptation and optimization for XOOPS have been done by:
+- montuy337513 (alias black_beard on xoops.org) - Administrator frxoops.org - www.chg-web.org - mon...@ch...
+- Philodenelle - www.chg-web.org - phi...@ch...
+
+For changes: please see changelog.txt
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/datamatrix.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -323,7 +323,7 @@
}
// get char
$chr = ord($data[$pos + $charscount]);
- $charscount++;
+ ++$charscount;
// STEP L
if ($this->isCharMode($chr, ENC_ASCII_NUM)) {
$numch[ENC_ASCII] += (1 / 2);
@@ -636,17 +636,17 @@
$tcw = (($temp_cw[0] & 0x3F) << 2) + (($temp_cw[1] & 0x30) >> 4);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw= (($temp_cw[1] & 0x0F) << 4) + (($temp_cw[2] & 0x3C) >> 2);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$tcw = (($temp_cw[2] & 0x03) << 6) + ($temp_cw[3] & 0x3F);
if ($tcw > 0) {
$cw[] = $tcw;
- $cw_num++;
+ ++$cw_num;
}
$temp_cw = array();
$pos = $epos;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/barcodes/qrcode.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -214,7 +214,7 @@
$len = count($frame);
// the frame is square (width = height)
foreach ($frame as &$frameLine) {
- for ($i=0; $i<$len; $i++) {
+ for ($i=0; $i<$len; ++$i) {
$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
}
}
@@ -247,10 +247,10 @@
$this->dir = -1;
$this->bit = -1;
// inteleaved data and ecc codes
- for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+ for ($i=0; $i < ($this->dataLength + $this->eccLength); ++$i) {
$code = $this->getCode();
$bit = 0x80;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
$bit = $bit >> 1;
@@ -258,7 +258,7 @@
}
// remainder bits
$j = $this->getRemainder($this->version);
- for ($i=0; $i<$j; $i++) {
+ for ($i=0; $i<$j; ++$i) {
$addr = $this->getNextPosition();
$this->setFrameAt($addr, 0x02);
}
@@ -295,7 +295,7 @@
$x--;
$this->bit++;
} else {
- $x++;
+ ++$x;
$y += $this->dir;
$this->bit--;
}
@@ -345,7 +345,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
if ($this->rsBlockNum2($spec) == 0) return 0;
$dl = $this->rsDataCodes2($spec);
@@ -364,7 +364,7 @@
$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
$dataPos += $dl;
$eccPos += $el;
- $blockNo++;
+ ++$blockNo;
}
return 0;
}
@@ -525,7 +525,7 @@
$this->runLength[$head] = 1;
} elseif ($x > 0) {
if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -544,7 +544,7 @@
$this->runLength[$head] = 1;
} elseif ($y > 0) {
if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
- $head++;
+ ++$head;
$this->runLength[$head] = 1;
} else {
$this->runLength[$head]++;
@@ -614,7 +614,7 @@
$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
$p = 0;
while($this->isdigitat($this->dataStr, $p)) {
- $p++;
+ ++$p;
}
$run = $p;
$mode = $this->identifyMode($p);
@@ -641,7 +641,7 @@
if ($this->isdigitat($this->dataStr, $p)) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsModeAn($p) // + 4 + la
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -652,7 +652,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -685,7 +685,7 @@
if ($mode == QR_MODE_NM) {
$q = $p;
while($this->isdigitat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
@@ -698,7 +698,7 @@
} elseif ($mode == QR_MODE_AN) {
$q = $p;
while($this->isalnumat($this->dataStr, $q)) {
- $q++;
+ ++$q;
}
$dif = $this->estimateBitsMode8($p) // + 4 + l8
+ $this->estimateBitsModeAn($q - $p) + 4 + $la
@@ -709,7 +709,7 @@
$p = $q;
}
} else {
- $p++;
+ ++$p;
}
}
$run = $p;
@@ -756,7 +756,7 @@
$p += 2;
} else {
if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
- $p++;
+ ++$p;
}
}
return $this->dataStr;
@@ -1167,7 +1167,7 @@
} else {
$bstream[$p] = 0;
}
- $p++;
+ ++$p;
$mask = $mask >> 1;
}
}
@@ -1195,21 +1195,21 @@
$data = array_fill(0, (int)(($size + 7) / 8), 0);
$bytes = (int)($size / 8);
$p = 0;
- for ($i=0; $i<$bytes; $i++) {
+ for ($i=0; $i<$bytes; ++$i) {
$v = 0;
- for ($j=0; $j<8; $j++) {
+ for ($j=0; $j<8; ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$i] = $v;
}
if ($size & 7) {
$v = 0;
- for ($j=0; $j<($size & 7); $j++) {
+ for ($j=0; $j<($size & 7); ++$j) {
$v = $v << 1;
$v |= $bstream[$p];
- $p++;
+ ++$p;
}
$data[$bytes] = $v;
}
@@ -1295,7 +1295,7 @@
);
$yStart = $oy - 2;
$xStart = $ox - 2;
- for ($y=0; $y < 5; $y++) {
+ for ($y=0; $y < 5; ++$y) {
$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
}
return $frame;
@@ -1351,7 +1351,7 @@
"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
);
- for ($y=0; $y < 7; $y++) {
+ for ($y=0; $y < 7; ++$y) {
$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
}
return $frame;
@@ -1509,7 +1509,7 @@
}
$rs['iprim'] = (int)($iprim / $prim);
$rs['genpoly'][0] = 1;
- for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
+ for ($i = 0,$root=$fcr*$prim; $i < $nroots; ++$i, $root += $prim) {
$rs['genpoly'][$i+1] = 1;
// Multiply rs->genpoly[] by @**(root + x)
for ($j = $i; $j > 0; --$j) {
@@ -1541,7 +1541,7 @@
$PAD =& $rs['pad']; // the number of pad symbols in a block
$A0 =& $NN;
$parity = array_fill(0, $NROOTS, 0);
- for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+ for ($i=0; $i < ($NN - $NROOTS - $PAD); ++$i) {
$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
if ($feedback != $A0) {
// feedback term is non-zero
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/include/tcpdf_fonts.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -726,21 +726,21 @@
$pfile .= '// Japanese'."\n";
$pfile .= '$enc=\'UniJIS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Japan1\',\'Supplement\'=>5);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
case 'CID0KR': {
$pfile .= '// Korean'."\n";
$pfile .= '$enc=\'UniKS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Korea1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ak12.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ak12.php\');'."\n";
break;
}
case 'CID0CS': {
$pfile .= '// Chinese Simplified'."\n";
$pfile .= '$enc=\'UniGB-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'GB1\',\'Supplement\'=>2);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ag15.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_ag15.php\');'."\n";
break;
}
case 'CID0CT':
@@ -748,7 +748,7 @@
$pfile .= '// Chinese Traditional'."\n";
$pfile .= '$enc=\'UniCNS-UTF16-H\';'."\n";
$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'CNS1\',\'Supplement\'=>0);'."\n";
- $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ $pfile .= 'include(__DIR__.\'/uni2cid_aj16.php\');'."\n";
break;
}
}
@@ -997,7 +997,7 @@
$subsetglyphs[$g] = true;
}
}
- }
+ }
break;
}
case 6: { // Format 6: Trimmed table mapping
@@ -1393,7 +1393,7 @@
return $map;
}
public static function _getfontpath() {
- if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
+ if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(__DIR__.'/../fonts'))) {
if (substr($fdir, -1) != '/') $fdir .= '/';
define('K_PATH_FONTS', $fdir);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -2486,7 +2486,7 @@
// sara u, sara uu, pinthu
$lowvowel = array(0x0e38, 0x0e39, 0x0e3a);
$output = array();
- for ($i = 0; $i < $numchars; $i++) {
+ for ($i = 0; $i < $numchars; ++$i) {
if (($unicode[$i] >= 0x0e00) && ($unicode[$i] <= 0x0e5b)) {
$ch0 = $unicode[$i];
$ch1 = ($i > 0) ? $unicode[($i - 1)] : 0;
@@ -3862,7 +3862,7 @@
if (in_array($file, $this->imagekeys)) {
// get existing image data
$info = $this->getImageBuffer($file);
- $imsize = array($info['w'], $info['h']);
+ $imsize = array($info['w'], $info['h']);
} elseif (strpos($file, '__tcpdf_img') === FALSE) {
$imgdata = TCPDF_STATIC::fileGetContents($file);
}
@@ -6388,7 +6388,7 @@
// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
if ($this->pdfa_mode OR $this->force_srgb) {
$iccobj = $this->_newobj();
- $icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
+ $icc = file_get_contents(__DIR__.'/include/sRGB.icc');
$filter = '';
if ($this->compress) {
$filter = ' /Filter /FlateDecode';
@@ -6543,7 +6543,7 @@
//$out .= ' /XFA ';
$out .= ' >>';
// signatures
- if ($this->sign AND isset($this->signature_data['cert_type'])
+ if ($this->sign AND isset($this->signature_data['cert_type'])
AND (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A'))) {
if ($this->signature_data['cert_type'] > 0) {
$out .= ' /Perms << /DocMDP '.($this->sig_obj_id + 1).' 0 R >>';
@@ -10330,7 +10330,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_1d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -10624,7 +10624,7 @@
if (TCPDF_STATIC::empty_string(trim($code))) {
return'';
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
+ require_once(__DIR__.'/tcpdf_barcodes_2d.php');
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -12599,7 +12599,7 @@
$spacew = ($spacewidth * $ns);
}
$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
- $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
+ $epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);
if ($epsposend !== null) {
$epsposend += strlen($this->epsmarker.'Q');
$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -668,7 +668,7 @@
// create a bar-space sequence
$seq = '';
$chrlen = strlen($chr[$char_bar]);
- for ($s = 0; $s < $chrlen; $s++){
+ for ($s = 0; $s < $chrlen; ++$s){
$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
}
$seqlen = strlen($seq);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_2d.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -135,14 +135,14 @@
$qrtype = strtoupper($mode[0]);
switch ($qrtype) {
case 'DATAMATRIX': { // DATAMATRIX (ISO/IEC 16022)
- require_once(dirname(__FILE__).'/include/barcodes/datamatrix.php');
+ require_once(__DIR__.'/include/barcodes/datamatrix.php');
$qrcode = new Datamatrix($code);
$this->barcode_array = $qrcode->getBarcodeArray();
$this->barcode_array['code'] = $code;
break;
}
case 'PDF417': { // PDF417 (ISO/IEC 15438:2006)
- require_once(dirname(__FILE__).'/include/barcodes/pdf417.php');
+ require_once(__DIR__.'/include/barcodes/pdf417.php');
if (!isset($mode[1]) OR ($mode[1] === '')) {
$aspectratio = 2; // default aspect ratio (width / height)
} else {
@@ -173,7 +173,7 @@
break;
}
case 'QRCODE': { // QR-CODE
- require_once(dirname(__FILE__).'/include/barcodes/qrcode.php');
+ require_once(__DIR__.'/include/barcodes/qrcode.php');
if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
$mode[1] = 'L'; // Ddefault: Low error correction
}
@@ -223,4 +223,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-13 19:09:46 UTC (rev 12815)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php 2014-10-19 04:35:29 UTC (rev 12816)
@@ -1,6 +1,6 @@
<?php
if (!defined('XOOPS_ROOT_PATH')) die('XOOPS root path not defined');
-require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
+require_once(__DIR__.'/include/tcpdf_filters.php');
class TCPDF_PARSER {
private $pdfdata = '';
protected $xref = array();
@@ -595,4 +595,4 @@
}
}
-}
\ No newline at end of file
+}
|
|
From: <be...@us...> - 2015-09-02 17:42:05
|
Revision: 13145
http://sourceforge.net/p/xoops/svn/13145
Author: beckmi
Date: 2015-09-02 17:42:02 +0000 (Wed, 02 Sep 2015)
Log Message:
-----------
TCPDF 6.2.11
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_autoconfig.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_barcodes_1d.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf_parser.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt 2015-08-28 10:38:37 UTC (rev 13144)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/docs/changelog.txt 2015-09-02 17:42:02 UTC (rev 13145)
@@ -1,8 +1,14 @@
=======================
-Changelog TCPDF_for_Xoops
+Changelog TCPDF_for_XOOPS
=======================
=======================
+Version 2.02 2015-09-02
+=======================
+- PHP TCPDF class has been updated (6.0.093 => 6.2.11) (mamba)
+ * see the TCPDF changelog for changes
+
+=======================
Version 2.01 2014-09-13
=======================
- PHP TCPDF class has been optmized and lightened (montuy337513/black_beard - Philodenelle)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2015-08-28 10:38:37 UTC (rev 13144)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/xoops_lib/vendor/tcpdf/tcpdf.php 2015-09-02 17:42:02 UTC (rev 13145)
@@ -1,5 +1,5 @@
<?php
-if (!defined('XOOPS_ROOT_PATH')) die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
$DirTcpdf = __DIR__;
require_once($DirTcpdf.'/tcpdf_autoconfig.php');
require_once($DirTcpdf.'/include/tcpdf_font_data.php');
@@ -42,7 +42,7 @@
protected $FontFiles = array();
protected $diffs = array();
protected $images = array();
- protected $cached_files = array();
+ protected $svg_tag_depth = 0;
protected $PageAnnots = array();
protected $links = array();
protected $FontFamily;
@@ -168,7 +168,7 @@
protected $numimages = 0;
protected $imagekeys = array();
protected $bufferlen = 0;
- protected $diskcache = false;
+
protected $numfonts = 0;
protected $fontkeys = array();
protected $font_obj_ids = array();
@@ -320,15 +320,21 @@
$this->internal_encoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
}
+ // set file ID for trailer
+ $serformat = (is_array($format) ? json_encode($format) : $format);
+ $this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
$this->font_obj_ids = array();
$this->page_obj_id = array();
$this->form_obj_id = array();
+ // set pdf/a mode
$this->pdfa_mode = $pdfa;
$this->force_srgb = false;
- $this->diskcache = $diskcache ? true : false;
+ // set language direction
$this->rtl = false;
$this->tmprtl = false;
+ // some checks
$this->_dochecks();
+ // initialization of properties
$this->isunicode = $unicode;
$this->page = 0;
$this->transfmrk[0] = array();
@@ -356,8 +362,10 @@
$this->TextColor = '0 g';
$this->ColorFlag = false;
$this->pdflayers = array();
+ // encryption values
$this->encrypted = false;
$this->last_enc_key = '';
+ // standard Unicode fonts
$this->CoreFonts = array(
'courier'=>'Courier',
'courierB'=>'Courier-Bold',
@@ -374,23 +382,33 @@
'symbol'=>'Symbol',
'zapfdingbats'=>'ZapfDingbats'
);
+ // set scale factor
$this->setPageUnit($unit);
+ // set page format and orientation
$this->setPageFormat($format, $orientation);
+ // page margins (1 cm)
$margin = 28.35 / $this->k;
$this->SetMargins($margin, $margin);
$this->clMargin = $this->lMargin;
$this->crMargin = $this->rMargin;
+ // internal cell padding
$cpadding = $margin / 10;
$this->setCellPaddings($cpadding, 0, $cpadding, 0);
+ // cell margins
$this->setCellMargins(0, 0, 0, 0);
+ // line width (0.2 mm)
$this->LineWidth = 0.57 / $this->k;
$this->linestyleWidth = sprintf('%F w', ($this->LineWidth * $this->k));
$this->linestyleCap = '0 J';
$this->linestyleJoin = '0 j';
$this->linestyleDash = '[] 0 d';
+ // automatic page break
$this->SetAutoPageBreak(true, (2 * $margin));
+ // full width display mode
$this->SetDisplayMode('fullwidth');
+ // compression
$this->SetCompression();
+ // set default PDF version number
$this->setPDFVersion();
$this->tcpdflink = true;
$this->encoding = $encoding;
@@ -401,11 +419,13 @@
$this->bgcolor = array('R' => 255, 'G' => 255, 'B' => 255);
$this->extgstates = array();
$this->setTextShadow();
+ // signature
$this->sign = false;
$this->tsa_timestamp = false;
$this->tsa_data = array();
$this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0', 'name' => 'Signature');
$this->empty_signature_appearance = array();
+ // user's rights
$this->ur['enabled'] = false;
$this->ur['document'] = '/FullSave';
$this->ur['annots'] = '/Create/Delete/Modify/Copy/Import/Export';
@@ -413,11 +433,15 @@
$this->ur['signature'] = '/Modify';
$this->ur['ef'] = '/Create/Delete/Modify/Import';
$this->ur['formex'] = '';
+ // set default JPEG quality
$this->jpeg_quality = 75;
+ // initialize some settings
TCPDF_FONTS::utf8Bidi(array(''), '', false, $this->isunicode, $this->CurrentFont);
+ // set default font
$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
$this->setHeaderFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
$this->setFooterFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
+ // check if PCRE Unicode support is enabled
if ($this->isunicode AND (@preg_match('/\pL/u', 'a') == 1)) {
// PCRE unicode support is turned ON
// \s : any whitespace character
@@ -431,18 +455,23 @@
$this->setSpacesRE('/[^\S\xa0]/');
}
$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
- $serformat = (is_array($format) ? serialize($format) : $format);
- $this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
+ // set document creation and modification timestamp
$this->doc_creation_timestamp = time();
$this->doc_modification_timestamp = $this->doc_creation_timestamp;
+ // get default graphic vars
$this->default_graphic_vars = $this->getGraphicVars();
$this->header_xobj_autoreset = false;
$this->custom_xmp = '';
+ // Call cleanup method after script execution finishes or exit() is called.
+ // NOTE: This will not be executed if the process is killed with a SIGTERM or SIGKILL signal.
+ register_shutdown_function(array($this, '_destroy'), true);
}
public function __destruct() {
+ // restore internal encoding
if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
mb_internal_encoding($this->internal_encoding);
}
+ // cleanup
$this->_destroy(true);
}
public function setPageUnit($unit) {
@@ -979,8 +1008,12 @@
$this->state = 1;
}
public function Close() {
- if ($this->state == 3) return'';
- if ($this->page == 0) $this->AddPage();
+ if ($this->state == 3) {
+ return;
+ }
+ if ($this->page == 0) {
+ $this->AddPage();
+ }
$this->endLayer();
if ($this->tcpdflink) {
// save current graphic settings
@@ -1011,7 +1044,9 @@
return '';
}
public function setPage($pnum, $resetmargins=false) {
- if (($pnum == $this->page) AND ($this->state == 2)) return;
+ if (($pnum == $this->page) AND ($this->state == 2)) {
+ return;
+ }
if (($pnum > 0) AND ($pnum <= $this->numpages)) {
$this->state = 2;
// save current graphic settings
@@ -1063,9 +1098,16 @@
$this->endPage(true);
}
public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
- if ($this->inxobj) return;
- if (!isset($this->original_lMargin) OR $keepmargins) $this->original_lMargin = $this->lMargin;
- if (!isset($this->original_rMargin) OR $keepmargins) $this->original_rMargin = $this->rMargin;
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ return '';
+ }
+ if (!isset($this->original_lMargin) OR $keepmargins) {
+ $this->original_lMargin = $this->lMargin;
+ }
+ if (!isset($this->original_rMargin) OR $keepmargins) {
+ $this->original_rMargin = $this->rMargin;
+ }
// terminate previous page
$this->endPage();
// start new page
@@ -1073,34 +1115,46 @@
}
public function endPage($tocpage=false) {
// check if page is already closed
- if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) return;
+ if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
+ return '';
+ }
// print page footer
$this->setFooter();
// close page
$this->_endpage();
// mark page as closed
$this->pageopen[$this->page] = false;
- if ($tocpage) $this->tocpage = false;
+ if ($tocpage) {
+ $this->tocpage = false;
+ }
}
public function startPage($orientation='', $format='', $tocpage=false) {
- if ($tocpage) $this->tocpage = true;
+ if ($tocpage) {
+ $this->tocpage = true;
+ }
// move page numbers of documents to be attached
if ($this->tocpage) {
// move reference to unexistent pages (used for page attachments)
// adjust outlines
$tmpoutlines = $this->outlines;
foreach ($tmpoutlines as $key => $outline) {
- if (!$outline['f'] AND ($outline['p'] > $this->numpages)) $this->outlines[$key]['p'] = ($outline['p'] + 1);
+ if (!$outline['f'] AND ($outline['p'] > $this->numpages)) {
+ $this->outlines[$key]['p'] = ($outline['p'] + 1);
+ }
}
// adjust dests
$tmpdests = $this->dests;
foreach ($tmpdests as $key => $dest) {
- if (!$dest['f'] AND ($dest['p'] > $this->numpages)) $this->dests[$key]['p'] = ($dest['p'] + 1);
+ if (!$dest['f'] AND ($dest['p'] > $this->numpages)) {
+ $this->dests[$key]['p'] = ($dest['p'] + 1);
+ }
}
// adjust links
$tmplinks = $this->links;
foreach ($tmplinks as $key => $link) {
- if (!$link['f'] AND ($link['p'] > $this->numpages)) $this->links[$key]['p'] = ($link['p'] + 1);
+ if (!$link['f'] AND ($link['p'] > $this->numpages)) {
+ $this->links[$key]['p'] = ($link['p'] + 1);
+ }
}
}
if ($this->numpages > $this->page) {
@@ -1110,7 +1164,9 @@
return'';
}
// start a new page
- if ($this->state == 0) $this->Open();
+ if ($this->state == 0) {
+ $this->Open();
+ }
++$this->numpages;
$this->swapMargins($this->booklet);
// save current graphic settings
@@ -1142,7 +1198,9 @@
return '';
}
protected function setContentMark($page=0) {
- if ($page <= 0) $page = $this->page;
+ if ($page <= 0) {
+ $page = $this->page;
+ }
if (isset($this->footerlen[$page])) {
$this->cntmrk[$page] = $this->pagelen[$page] - $this->footerlen[$page];
} else {
@@ -1176,7 +1234,7 @@
}
public function setHeaderMargin($hm=10) {
$this->header_margin = $hm;
- return'';
+ return '';
}
public function getHeaderMargin() {
return $this->header_margin;
@@ -1324,7 +1382,9 @@
}
}
protected function setHeader() {
- if (!$this->print_header OR ($this->state != 2)) return'';
+ if (!$this->print_header OR ($this->state != 2)) {
+ return'';
+ }
$this->InHeader = true;
$this->setGraphicVars($this->default_graphic_vars);
$temp_thead = $this->thead;
@@ -1358,7 +1418,9 @@
return '';
}
protected function setFooter() {
- if ($this->state != 2) return'';
+ if ($this->state != 2) {
+ return'';
+ }
$this->InFooter = true;
// save current graphic settings
$gvars = $this->getGraphicVars();
@@ -1409,7 +1471,10 @@
return (($this->InHeader === false) AND ($this->InFooter === false));
}
protected function setTableHeader() {
- if ($this->num_columns > 1) return'';
+ if ($this->num_columns > 1) {
+ // multi column mode
+ return'';
+ }
if (isset($this->theadMargins['top'])) {
// restore the original top-margin
$this->tMargin = $this->theadMargins['top'];
@@ -1448,9 +1513,13 @@
$this->writeHTML($this->thead, false, false, false, false, '');
$this->setGraphicVars($gvars);
// set new top margin to skip the table headers
- if (!isset($this->theadMargins['top'])) $this->theadMargins['top'] = $this->tMargin;
+ if (!isset($this->theadMargins['top'])) {
+ $this->theadMargins['top'] = $this->tMargin;
+ }
// store end of header position
- if (!isset($this->columns[0]['th'])) $this->columns[0]['th'] = array();
+ if (!isset($this->columns[0]['th'])) {
+ $this->columns[0]['th'] = array();
+ }
$this->columns[0]['th']['\''.$this->page.'\''] = $this->y;
$this->tMargin = $this->y;
$this->pagedim[$this->page]['tm'] = $this->tMargin;
@@ -1535,7 +1604,9 @@
$k = isset($color[3]) ? $color[3] : -1;
// color name
$name = isset($color[4]) ? $color[4] : '';
- if ($c >= 0) return $this->setColor($type, $c, $m, $y, $k, $ret, $name);
+ if ($c >= 0) {
+ return $this->setColor($type, $c, $m, $y, $k, $ret, $name);
+ }
}
return '';
}
@@ -1550,10 +1621,18 @@
}
public function setColor($type, $col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
// set default values
- if (!is_numeric($col1)) $col1 = 0;
- if (!is_numeric($col2)) $col2 = -1;
- if (!is_numeric($col3)) $col3 = -1;
- if (!is_numeric($col4)) $col4 = -1;
+ if (!is_numeric($col1)) {
+ $col1 = 0;
+ }
+ if (!is_numeric($col2)) {
+ $col2 = -1;
+ }
+ if (!is_numeric($col3)) {
+ $col3 = -1;
+ }
+ if (!is_numeric($col4)) {
+ $col4 = -1;
+ }
// set color by case
$suffix = '';
if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
@@ -1609,7 +1688,9 @@
}
$this->ColorFlag = ($this->FillColor != $this->TextColor);
if (($type != 'text') AND ($this->state == 2)) {
- if (!$ret) $this->_out($pdfcolor);
+ if (!$ret) {
+ $this->_out($pdfcolor);
+ }
return $pdfcolor;
}
return '';
@@ -1638,7 +1719,9 @@
$this->SetFont($fontname, $fontstyle, $fontsize, '', 'default', false);
}
// convert UTF-8 array to Latin1 if required
- if ($this->isunicode AND (!$this->isUnicodeFont())) $sa = TCPDF_FONTS::UTF8ArrToLatin1Arr($sa);
+ if ($this->isunicode AND (!$this->isUnicodeFont())) {
+ $sa = TCPDF_FONTS::UTF8ArrToLatin1Arr($sa);
+ }
$w = 0; // total width
$wa = array(); // array of characters widths
foreach ($sa as $ck => $char) {
@@ -1648,19 +1731,32 @@
$w += $cw;
}
// restore previous values
- if (!TCPDF_STATIC::empty_string($fontname)) $this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
- if ($getarray) return $wa;
+ if (!TCPDF_STATIC::empty_string($fontname)) {
+ $this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
+ }
+ if ($getarray) {
+ return $wa;
+ }
return $w;
}
public function GetCharWidth($char, $notlast=true) {
// get raw width
$chw = $this->getRawCharWidth($char);
- if (($this->font_spacing < 0) OR (($this->font_spacing > 0) AND $notlast)) $chw += $this->font_spacing;
- if ($this->font_stretching != 100) $chw *= ($this->font_stretching / 100);
+ if (($this->font_spacing < 0) OR (($this->font_spacing > 0) AND $notlast)) {
+ // increase/decrease font spacing
+ $chw += $this->font_spacing;
+ }
+ if ($this->font_stretching != 100) {
+ // fixed stretching mode
+ $chw *= ($this->font_stretching / 100);
+ }
return $chw;
}
public function getRawCharWidth($char) {
- if ($char == 173) return (0);
+ if ($char == 173) {
+ // SHY character will not be printed
+ return (0);
+ }
if (isset($this->CurrentFont['cw'][$char])) {
$w = $this->CurrentFont['cw'][$char];
} elseif (isset($this->CurrentFont['dw'])) {
@@ -1675,27 +1771,30 @@
return $this->getAbsFontMeasure($w);
}
public function GetNumChars($s) {
- if ($this->isUnicodeFont()) return count(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont));
+ if ($this->isUnicodeFont()) {
+ return count(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont));
+ }
return strlen($s);
}
protected function getFontsList() {
if (($fontsdir = opendir(TCPDF_FONTS::_getfontpath())) !== false) {
while (($file = readdir($fontsdir)) !== false) {
- if (substr($file, -4) == '.php') array_push($this->fontlist, strtolower(basename($file, '.php')));
+ if (substr($file, -4) == '.php') {
+ array_push($this->fontlist, strtolower(basename($file, '.php')));
+ }
}
closedir($fontsdir);
}
}
- public function unichr($c) {
- return TCPDF_FONTS::unichr($c, $this->isunicode);
- }
- public function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false) {
- return TCPDF_FONTS::addTTFfont($fontfile, $fonttype, $enc, $flags, $outpath, $platid, $encid, $addcbbox);
- }
+
public function AddFont($family, $style='', $fontfile='', $subset='default') {
$originalsize = $size1 = $size2 = 8;
- if ($subset === 'default') $subset = $this->font_subsetting;
- if ($this->pdfa_mode) $subset = false;
+ if ($subset === 'default') {
+ $subset = $this->font_subsetting;
+ }
+ if ($this->pdfa_mode) {
+ $subset = false;
+ }
if (TCPDF_STATIC::empty_string($family)) {
if (!TCPDF_STATIC::empty_string($this->FontFamily)) {
$family = $this->FontFamily;
@@ -1714,9 +1813,16 @@
}
// normalize family name
$family = strtolower($family);
- if ((!$this->isunicode) AND ($family == 'arial')) $family = 'helvetica';
- if (($family == 'symbol') OR ($family == 'zapfdingbats')) $style = '';
- if ($this->pdfa_mode AND (isset($this->CoreFonts[$family]))) $family = 'pdfa'.$family;
+ if ((!$this->isunicode) AND ($family == 'arial')) {
+ $family = 'helvetica';
+ }
+ if (($family == 'symbol') OR ($family == 'zapfdingbats')) {
+ $style = '';
+ }
+ if ($this->pdfa_mode AND (isset($this->CoreFonts[$family]))) {
+ // all fonts must be embedded
+ $family = 'pdfa'.$family;
+ }
$tempstyle = strtoupper($style);
$style = '';
// underline
@@ -1738,9 +1844,13 @@
$this->overline = false;
}
// bold
- if (strpos($tempstyle, 'B') !== false) $style .= 'B';
+ if (strpos($tempstyle, 'B') !== false) {
+ $style .= 'B';
+ }
// oblique
- if (strpos($tempstyle, 'I') !== false) $style .= 'I';
+ if (strpos($tempstyle, 'I') !== false) {
+ $style .= 'I';
+ }
$bistyle = $style;
$fontkey = $family.$style;
$font_style = $style.($this->underline ? 'U' : '').($this->linethrough ? 'D' : '').($this->overline ? 'O' : '');
@@ -1748,7 +1858,10 @@
// check if the font has been already added
$fb = $this->getFontBuffer($fontkey);
if ($fb !== false) {
- if ($this->inxobj) $this->xobjects[$this->xobjid]['fonts'][$fontkey] = $fb['i'];
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['fonts'][$fontkey] = $fb['i'];
+ }
return $fontdata;
}
// get specified font directory (if any)
@@ -1779,23 +1892,39 @@
if (!TCPDF_STATIC::empty_string($fontfile) AND (@file_exists($fontfile))) {
include($fontfile);
} else {
- var_dump($fontfile);
+ //var_dump($fontfile);
$this->Error('Could not include font definition file: '.$family.'');
}
// check font parameters
- if ((!isset($type)) OR (!isset($cw)))$this->Error('The font definition file has a bad format: '.$fontfile.'');
+ if ((!isset($type)) OR (!isset($cw))) {
+ $this->Error('The font definition file has a bad format: '.$fontfile.'');
+ }
// SET default parameters
- if (!isset($file) OR TCPDF_STATIC::empty_string($file)) $file = '';
- if (!isset($enc) OR TCPDF_STATIC::empty_string($enc)) $enc = '';
+ if (!isset($file) OR TCPDF_STATIC::empty_string($file)) {
+ $file = '';
+ }
+ if (!isset($enc) OR TCPDF_STATIC::empty_string($enc)) {
+ $enc = '';
+ }
if (!isset($cidinfo) OR TCPDF_STATIC::empty_string($cidinfo)) {
$cidinfo = array('Registry'=>'Adobe', 'Ordering'=>'Identity', 'Supplement'=>0);
$cidinfo['uni2cid'] = array();
}
- if (!isset($ctg) OR TCPDF_STATIC::empty_string($ctg)) $ctg = '';
- if (!isset($desc) OR TCPDF_STATIC::empty_string($desc)) $desc = array();
- if (!isset($up) OR TCPDF_STATIC::empty_string($up)) $up = -100;
- if (!isset($ut) OR TCPDF_STATIC::empty_string($ut)) $ut = 50;
- if (!isset($cw) OR TCPDF_STATIC::empty_string($cw)) $cw = array();
+ if (!isset($ctg) OR TCPDF_STATIC::empty_string($ctg)) {
+ $ctg = '';
+ }
+ if (!isset($desc) OR TCPDF_STATIC::empty_string($desc)) {
+ $desc = array();
+ }
+ if (!isset($up) OR TCPDF_STATIC::empty_string($up)) {
+ $up = -100;
+ }
+ if (!isset($ut) OR TCPDF_STATIC::empty_string($ut)) {
+ $ut = 50;
+ }
+ if (!isset($cw) OR TCPDF_STATIC::empty_string($cw)) {
+ $cw = array();
+ }
if (!isset($dw) OR TCPDF_STATIC::empty_string($dw)) {
// set default width
if (isset($desc['MissingWidth']) AND ($desc['MissingWidth'] > 0)) {
@@ -1822,7 +1951,9 @@
$this->Error('Unknow font type: '.$type.'');
}
// set name if unset
- if (!isset($name) OR empty($name)) $name = $fontkey;
+ if (!isset($name) OR empty($name)) {
+ $name = $fontkey;
+ }
// create artificial font style variations if missing (only works with non-embedded fonts)
if (($type != 'core') AND $missing_style) {
// style variations
@@ -1853,11 +1984,16 @@
}
}
// check if the array of characters bounding boxes is defined
- if (!isset($cbbox)) $cbbox = array();
+ if (!isset($cbbox)) {
+ $cbbox = array();
+ }
// initialize subsetchars
$subsetchars = array_fill(0, 255, true);
$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'cbbox' => $cbbox, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
- if ($this->inxobj) $this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
+ }
if (isset($diff) AND (!empty($diff))) {
//Search existing encodings
$d = 0;
@@ -1896,7 +2032,9 @@
if ($size === null) {
$size = $this->FontSizePt;
}
- if ($size < 0) $size = 0;
+ if ($size < 0) {
+ $size = 0;
+ }
// try to add font (if not already added)
$fontdata = $this->AddFont($family, $style, $fontfile, $subset);
$this->FontFamily = $fontdata['family'];
@@ -1942,7 +2080,7 @@
}
}
public function getFontBBox() {
- //$fbbox = array();
+ $fbbox = array();
if (isset($this->CurrentFont['desc']['FontBBox'])) {
$tmpbbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
$fbbox = array_map(array($this,'getAbsFontMeasure'), $tmpbbox);
@@ -1961,7 +2099,7 @@
if (isset($this->CurrentFont['dw'])) {
$maxw = max($maxw, $this->CurrentFont['dw']);
}
- foreach ($this->CurrentFont['cw'] as $w) {
+ foreach ($this->CurrentFont['cw'] as $char => $w) {
$maxw = max($maxw, $w);
}
if ($maxw == 0) {
@@ -1977,8 +2115,14 @@
return ($s * $this->FontSize / 1000);
}
public function getCharBBox($char) {
- if (isset($this->CurrentFont['cbbox'][$char])) {
- return array_map(array($this,'getAbsFontMeasure'), $this->CurrentFont['cbbox'][intval($char)]);
+ $c = intval($char);
+ if (isset($this->CurrentFont['cw'][$c])) {
+ // glyph is defined ... use zero width & height for glyphs without outlines
+ $result = array(0,0,0,0);
+ if (isset($this->CurrentFont['cbbox'][$c])) {
+ $result = $this->CurrentFont['cbbox'][$c];
+ }
+ return array_map(array($this,'getAbsFontMeasure'), $result);
}
return false;
}
@@ -2084,8 +2228,12 @@
$this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces);
return'';
}
- if ($x === '') $x = $this->x;
- if ($y === '') $y = $this->y;
+ if ($x === '') {
+ $x = $this->x;
+ }
+ if ($y === '') {
+ $y = $this->y;
+ }
// check page for no-write regions and adapt page margins if necessary
list($x, $y) = $this->checkPageRegions($h, $x, $y);
// recalculate coordinates to account for graphic transformations
@@ -2135,7 +2283,9 @@
} else {
$page = $this->page;
}
- if (!isset($this->PageAnnots[$page])) $this->PageAnnots[$page] = array();
+ if (!isset($this->PageAnnots[$page])) {
+ $this->PageAnnots[$page] = array();
+ }
$this->PageAnnots[$page][] = array('n' => ++$this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
if (!$this->pdfa_mode) {
if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!TCPDF_STATIC::empty_string($opt['FS']))
@@ -2486,7 +2636,7 @@
// sara u, sara uu, pinthu
$lowvowel = array(0x0e38, 0x0e39, 0x0e3a);
$output = array();
- for ($i = 0; $i < $numchars; ++$i) {
+ for ($i = 0; $i < $numchars; $i++) {
if (($unicode[$i] >= 0x0e00) && ($unicode[$i] <= 0x0e5b)) {
$ch0 = $unicode[$i];
$ch1 = ($i > 0) ? $unicode[($i - 1)] : 0;
@@ -2593,9 +2743,17 @@
$align = '';
}
}
- if ($this->font_stretching != 100) $rs .= sprintf('BT %F Tz ET ', $this->font_stretching);
- if ($this->font_spacing != 0) $rs .= sprintf('BT %F Tc ET ', ($this->font_spacing * $this->k));
- if ($this->ColorFlag AND ($this->textrendermode < 4)) $s .= 'q '.$this->TextColor.' ';
+ if ($this->font_stretching != 100) {
+ // apply font stretching
+ $rs .= sprintf('BT %F Tz ET ', $this->font_stretching);
+ }
+ if ($this->font_spacing != 0) {
+ // increase/decrease font spacing
+ $rs .= sprintf('BT %F Tc ET ', ($this->font_spacing * $this->k));
+ }
+ if ($this->ColorFlag AND ($this->textrendermode < 4)) {
+ $s .= 'q '.$this->TextColor.' ';
+ }
// rendering mode
$s .= sprintf('BT %d Tr %F w ET ', $this->textrendermode, ($this->textstrokewidth * $this->k));
// count number of spaces
@@ -2608,16 +2766,22 @@
$width = $this->GetStringWidth(str_replace(' ', '', $txt));
// calculate average space width
$spacewidth = -1000 * ($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1) / ($this->FontSize?$this->FontSize:1);
- if ($this->font_stretching != 100) $spacewidth /= ($this->font_stretching / 100);
+ if ($this->font_stretching != 100) {
+ // word spacing is affected by stretching
+ $spacewidth /= ($this->font_stretching / 100);
+ }
// set word position to be used with TJ operator
$txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacewidth).' (', $txt2);
- //$unicode_justification = true;
+ $unicode_justification = true;
} else {
// get string width
$width = $txwidth;
// new space width
$spacewidth = (($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1)) * $this->k;
- if ($this->font_stretching != 100) $spacewidth /= ($this->font_stretching / 100);
+ if ($this->font_stretching != 100) {
+ // word spacing (Tw) is affected by stretching
+ $spacewidth /= ($this->font_stretching / 100);
+ }
// set word spacing
$rs .= sprintf('BT %F Tw ET ', $spacewidth);
}
@@ -2685,21 +2849,39 @@
}
}
}
- if ($this->underline)$s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
- if ($this->linethrough) $s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
- if ($this->overline) $s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
- if ($this->ColorFlag AND ($this->textrendermode < 4)) $s .= ' Q';
- if ($link) $this->Link($xdx, $yt, $width, ($this->FontAscent + $this->FontDescent), $link, $ns);
+ if ($this->underline) {
+ $s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
+ }
+ if ($this->linethrough) {
+ $s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
+ }
+ if ($this->overline) {
+ $s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
+ }
+ if ($this->ColorFlag AND ($this->textrendermode < 4)) {
+ $s .= ' Q';
+ }
+ if ($link) {
+ $this->Link($xdx, $yt, $width, ($this->FontAscent + $this->FontDescent), $link, $ns);
+ }
}
// output cell
if ($s) {
// output cell
$rs .= $s;
- if ($this->font_spacing != 0) $rs .= ' BT 0 Tc ET';
- if ($this->font_stretching != 100) $rs .= ' BT 100 Tz ET';
+ if ($this->font_spacing != 0) {
+ // reset font spacing mode
+ $rs .= ' BT 0 Tc ET';
+ }
+ if ($this->font_stretching != 100) {
+ // reset font stretching mode
+ $rs .= ' BT 100 Tz ET';
+ }
}
// reset word spacing
- if (!$this->isUnicodeFont() AND ($align == 'J')) $rs .= ' BT 0 Tw ET';
+ if (!$this->isUnicodeFont() AND ($align == 'J')) {
+ $rs .= ' BT 0 Tw ET';
+ }
// reset stretching and spacing
$this->font_stretching = $prev_font_stretching;
$this->font_spacing = $prev_font_spacing;
@@ -2740,8 +2922,12 @@
}
protected function getCellBorder($x, $y, $w, $h, $brd) {
$s = ''; // string to be returned
- if (empty($brd)) return $s;
- if ($brd == 1) $brd = array('LRTB' => true);
+ if (empty($brd)) {
+ return $s;
+ }
+ if ($brd == 1) {
+ $brd = array('LRTB' => true);
+ }
// calculate coordinates for border
$k = $this->k;
if ($this->rtl) {
@@ -3263,13 +3449,19 @@
return $nl;
}
public function getNumLines($txt, $w=0, $reseth=false, $autop...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X