diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 1f92121..423b606 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+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.
diff --git a/README.TXT b/README.TXT
index 6bf17a8..07192f8 100644
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
-Version: 6.0.083
-Release date: 2014-05-29
+Version: 6.0.084
+Release date: 2014-06-13
Author: Nicola Asuni
Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index 0d2426c..202b032 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "tecnick.com/tcpdf",
- "version": "6.0.083",
+ "version": "6.0.084",
"homepage": "http://www.tcpdf.org/",
"type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.",
diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
index 28c68b9..a4c5740 100644
--- a/include/tcpdf_static.php
+++ b/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
- private static $tcpdf_version = '6.0.083';
+ private static $tcpdf_version = '6.0.084';
/**
* String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 949459f..80b584c 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,7 +1,7 @@
* @package com.tecnick.tcpdf
* @author Nicola Asuni
- * @version 6.0.083
+ * @version 6.0.084
*/
// 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.
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.0.083
+ * @version 6.0.084
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
@@ -2036,35 +2036,35 @@ class TCPDF {
/**
* Change the format of the current page
- * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numners (width, height) or an array containing the following measures and options:
+ * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:
* - ['format'] = page format name (one of the above);
* - ['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
* - ['PZ'] : The page's preferred zoom (magnification) factor.
* - ['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:
- * - ['MediaBox']['llx'] : lower-left x coordinate in points
- * - ['MediaBox']['lly'] : lower-left y coordinate in points
- * - ['MediaBox']['urx'] : upper-right x coordinate in points
- * - ['MediaBox']['ury'] : upper-right y coordinate in points
+ * - ['MediaBox']['llx'] : lower-left x coordinate
+ * - ['MediaBox']['lly'] : lower-left y coordinate
+ * - ['MediaBox']['urx'] : upper-right x coordinate
+ * - ['MediaBox']['ury'] : upper-right y coordinate
* - ['CropBox'] : the visible region of default user space:
- * - ['CropBox']['llx'] : lower-left x coordinate in points
- * - ['CropBox']['lly'] : lower-left y coordinate in points
- * - ['CropBox']['urx'] : upper-right x coordinate in points
- * - ['CropBox']['ury'] : upper-right y coordinate in points
+ * - ['CropBox']['llx'] : lower-left x coordinate
+ * - ['CropBox']['lly'] : lower-left y coordinate
+ * - ['CropBox']['urx'] : upper-right x coordinate
+ * - ['CropBox']['ury'] : upper-right y coordinate
* - ['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:
- * - ['BleedBox']['llx'] : lower-left x coordinate in points
- * - ['BleedBox']['lly'] : lower-left y coordinate in points
- * - ['BleedBox']['urx'] : upper-right x coordinate in points
- * - ['BleedBox']['ury'] : upper-right y coordinate in points
+ * - ['BleedBox']['llx'] : lower-left x coordinate
+ * - ['BleedBox']['lly'] : lower-left y coordinate
+ * - ['BleedBox']['urx'] : upper-right x coordinate
+ * - ['BleedBox']['ury'] : upper-right y coordinate
* - ['TrimBox'] : the intended dimensions of the finished page after trimming:
- * - ['TrimBox']['llx'] : lower-left x coordinate in points
- * - ['TrimBox']['lly'] : lower-left y coordinate in points
- * - ['TrimBox']['urx'] : upper-right x coordinate in points
- * - ['TrimBox']['ury'] : upper-right y coordinate in points
+ * - ['TrimBox']['llx'] : lower-left x coordinate
+ * - ['TrimBox']['lly'] : lower-left y coordinate
+ * - ['TrimBox']['urx'] : upper-right x coordinate
+ * - ['TrimBox']['ury'] : upper-right y coordinate
* - ['ArtBox'] : the extent of the page's meaningful content:
- * - ['ArtBox']['llx'] : lower-left x coordinate in points
- * - ['ArtBox']['lly'] : lower-left y coordinate in points
- * - ['ArtBox']['urx'] : upper-right x coordinate in points
- * - ['ArtBox']['ury'] : upper-right y coordinate in points
+ * - ['ArtBox']['llx'] : lower-left x coordinate
+ * - ['ArtBox']['lly'] : lower-left y coordinate
+ * - ['ArtBox']['urx'] : upper-right x coordinate
+ * - ['ArtBox']['ury'] : upper-right y coordinate
* - ['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:
* - ['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.
* - ['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units
@@ -5858,7 +5858,7 @@ class TCPDF {
$fmin = 1;
$fmax = $this->FontSizePt;
$diff_epsilon = (1 / $this->k); // one point (min resolution)
- $maxit = ($fmax - $fmin); // max number of iterations
+ $maxit = (2 * intval($fmax)); // max number of iterations
while ($maxit > 0) {
$fmid = (($fmax + $fmin) / 2);
$this->SetFontSize($fmid, false);
@@ -5868,15 +5868,17 @@ class TCPDF {
if ($diff >= 0) {
if ($diff < $diff_epsilon) {
break;
- } else {
- $fmin = $fmid;
}
+ $fmin = $fmid;
} else {
$fmax = $fmid;
}
--$maxit;
}
- $this->SetFontSize($this->FontSizePt);
+ if ($maxit <= 0) {
+ $fmid = $fmin;
+ }
+ $this->SetFontSize($fmid);
}
if ($text_height < $maxh) {
if ($valign == 'M') {