mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-21 20:35:13 +00:00
6.0.092 (2014-09-01)
- Bug item #956 "Monospaced fonts are not alignd at the baseline" was fixed. - Bug item #964 "Problem when changing font size" was fixed. - Bug item #969 "ImageSVG with radialGradient problem" was fixed. - sRGB.icc file was replaced with the one from the Debian package icc-profiles-free (2.0.1+dfsg-1)
This commit is contained in:
parent
5252fd2e96
commit
8debbff6b4
@ -1,3 +1,9 @@
|
||||
6.0.092 (2014-09-01)
|
||||
- Bug item #956 "Monospaced fonts are not alignd at the baseline" was fixed.
|
||||
- Bug item #964 "Problem when changing font size" was fixed.
|
||||
- Bug item #969 "ImageSVG with radialGradient problem" was fixed.
|
||||
- sRGB.icc file was replaced with the one from the Debian package icc-profiles-free (2.0.1+dfsg-1)
|
||||
|
||||
6.0.091 (2014-08-13)
|
||||
- Issue #325"Division by zero when css fontsize equals 0" was fixed.
|
||||
|
||||
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 6.0.091
|
||||
Release date: 2014-08-13
|
||||
Version: 6.0.092
|
||||
Release date: 2014-09-01
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2014:
|
||||
@ -107,5 +107,9 @@ Third party fonts:
|
||||
The binary files (.z) that begins with the prefix "ae" have been extracted from the Arabeyes.org collection (GNU-GPLv2).
|
||||
Link : http://projects.arabeyes.org/
|
||||
|
||||
ICC profile:
|
||||
TCPDF includes the sRGB.icc profile from the icc-profiles-free Debian package:
|
||||
https://packages.debian.org/source/stable/icc-profiles-free
|
||||
|
||||
|
||||
============================================================
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tecnick.com/tcpdf",
|
||||
"version": "6.0.091",
|
||||
"version": "6.0.092",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"type": "library",
|
||||
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
||||
|
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
||||
* Current TCPDF version.
|
||||
* @private static
|
||||
*/
|
||||
private static $tcpdf_version = '6.0.091';
|
||||
private static $tcpdf_version = '6.0.092';
|
||||
|
||||
/**
|
||||
* String alias for total number of pages.
|
||||
|
22
tcpdf.php
22
tcpdf.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.0.091
|
||||
// Version : 6.0.092
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2014-08-13
|
||||
// Last Update : 2014-09-01
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
@ -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.091
|
||||
* @version 6.0.092
|
||||
*/
|
||||
|
||||
// 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.091
|
||||
* @version 6.0.092
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -6343,8 +6343,6 @@ class TCPDF {
|
||||
$shy_replacement_char = TCPDF_FONTS::unichr($shy_replacement, $this->isunicode);
|
||||
// widht for SHY replacement
|
||||
$shy_replacement_width = $this->GetCharWidth($shy_replacement);
|
||||
// max Y
|
||||
$maxy = $this->y + $maxh - $h - $this->cell_padding['T'] - $this->cell_padding['B'];
|
||||
// page width
|
||||
$pw = $w = $this->w - $this->lMargin - $this->rMargin;
|
||||
// calculate remaining line width ($w)
|
||||
@ -6364,6 +6362,8 @@ class TCPDF {
|
||||
}
|
||||
// minimum row height
|
||||
$row_height = max($h, $this->getCellHeight($this->FontSize));
|
||||
// max Y
|
||||
$maxy = $this->y + $maxh - max($row_height, $h);
|
||||
$start_page = $this->page;
|
||||
$i = 0; // character position
|
||||
$j = 0; // current starting position
|
||||
@ -6377,7 +6377,7 @@ class TCPDF {
|
||||
$pc = 0; // previous character
|
||||
// for each character
|
||||
while ($i < $nb) {
|
||||
if (($maxh > 0) AND ($this->y >= $maxy) ) {
|
||||
if (($maxh > 0) AND ($this->y > $maxy) ) {
|
||||
break;
|
||||
}
|
||||
//Get the current character
|
||||
@ -17533,7 +17533,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
if (($key < ($maxel - 1)) AND (
|
||||
($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li'))
|
||||
OR ($this->cell_height_ratio != $dom[$key]['line-height'])
|
||||
OR (!$this->newline AND is_numeric($fontsize) AND is_numeric($curfontsize) AND ($fontsize >= 0) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize))
|
||||
OR (!$this->newline AND is_numeric($fontsize) AND is_numeric($curfontsize)
|
||||
AND ($fontsize >= 0) AND ($curfontsize >= 0)
|
||||
AND (($fontsize != $curfontsize) OR ($fontstyle != $curfontstyle) OR ($fontname != $curfontname)))
|
||||
)) {
|
||||
if ($this->page > $startlinepage) {
|
||||
// fix lines splitted over two pages
|
||||
@ -24050,8 +24052,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
//$attribs['spreadMethod']
|
||||
if (((!isset($attribs['cx'])) AND (!isset($attribs['cy'])))
|
||||
OR ((isset($attribs['cx']) AND (substr($attribs['cx'], -1) == '%'))
|
||||
OR (isset($attribs['cy']) AND (substr($attribs['cy'], -1) == '%')) )) {
|
||||
OR (isset($attribs['cy']) AND (substr($attribs['cy'], -1) == '%')))) {
|
||||
$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
|
||||
} elseif (isset($attribs['r']) AND is_numeric($attribs['r']) AND ($attribs['r']) <= 1) {
|
||||
$this->svggradients[$this->svggradientid]['mode'] = 'ratio';
|
||||
} else {
|
||||
$this->svggradients[$this->svggradientid]['mode'] = 'measure';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user