diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 0358b6f..d78a4ce 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+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.
diff --git a/README.TXT b/README.TXT
index 63f4cfa..297c770 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.065
-Release date: 2014-04-10
+Version: 6.0.066
+Release date: 2014-04-20
Author: Nicola Asuni
Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index 073e68e..f76e778 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "tecnick.com/tcpdf",
- "version": "6.0.065",
+ "version": "6.0.066",
"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 9c87ddf..e90ba5a 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.065';
+ private static $tcpdf_version = '6.0.066';
/**
* String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 87afbb1..9f7bc86 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
* @package com.tecnick.tcpdf
* @author Nicola Asuni
- * @version 6.0.065
+ * @version 6.0.066
*/
// 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.065
+ * @version 6.0.066
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
@@ -1954,11 +1954,12 @@ class TCPDF {
// check if PCRE Unicode support is enabled
if ($this->isunicode AND (@preg_match('/\pL/u', 'a') == 1)) {
// PCRE unicode support is turned ON
- // \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
- // \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
- // \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
- //$this->setSpacesRE('/[^\S\P{Z}\P{Lo}\xa0]/u');
- $this->setSpacesRE('/[^\S\P{Z}\xa0]/u');
+ // \s : any whitespace character
+ // \p{Z} : any separator
+ // \p{Lo} : Unicode letter or ideograph that does not have lowercase and uppercase variants. Is used to chunk chinese words.
+ // \xa0 : Unicode Character 'NO-BREAK SPACE' (U+00A0)
+ //$this->setSpacesRE('/(?!\xa0)[\s\p{Z}\p{Lo}]/u');
+ $this->setSpacesRE('/(?!\xa0)[\s\p{Z}]/u');
} else {
// PCRE unicode support is turned OFF
$this->setSpacesRE('/[^\S\xa0]/');
@@ -2296,12 +2297,13 @@ class TCPDF {
* Some example patterns are:
*
* Non-Unicode or missing PCRE unicode support: "/[^\S\xa0]/" - * Unicode and PCRE unicode support: "/[^\S\P{Z}\xa0]/u" - * Unicode and PCRE unicode support in Chinese mode: "/[^\S\P{Z}\P{Lo}\xa0]/u" + * Unicode and PCRE unicode support: "/(?!\xa0)[\s\p{Z}]/u" + * Unicode and PCRE unicode support in Chinese mode: "/(?!\xa0)[\s\p{Z}\p{Lo}]/u" * if PCRE unicode support is turned ON ("\P" is the negate class of "\p"): - * "\p{Z}" or "\p{Separator}": any kind of Unicode whitespace or invisible separator. - * "\p{Lo}" or "\p{Other_Letter}": a Unicode letter or ideograph that does not have lowercase and uppercase variants. - * "\p{Lo}" is needed for Chinese characters because are packed next to each other without spaces in between. + * \s : any whitespace character + * \p{Z} : any separator + * \p{Lo} : Unicode letter or ideograph that does not have lowercase and uppercase variants. Is used to chunk chinese words. + * \xa0 : Unicode Character 'NO-BREAK SPACE' (U+00A0) ** @param $re (string) regular expression (leave empty for default). * @public