summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/lib/Roundcube/rcube_text2html.php27
-rw-r--r--tests/Framework/Text2Html.php2
3 files changed, 21 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 37c41b134..30edbdc39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ CHANGELOG Roundcube Webmail
- Fix so text/calendar parts are listed as attachments even if not marked as such (#1490325)
- Fix so unrecognized TNEF attachments are displayed on the list of attachments (#1490351)
- Fix lack of signature separator for plain text signatures in html mode (#1490352)
+- Fix font artifact in Google Chrome on Windows (#1490353)
RELEASE 1.1.1
-------------
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
index 1981b2f98..2ffe5301d 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -45,18 +45,22 @@ class rcube_text2html
*/
protected $config = array(
// non-breaking space
- 'space' => "\xC2\xA0",
+ 'space' => "\xC2\xA0",
+ // word-joiner (zero-width no-break space)
+ // 'wordjoiner' => "\xEF\xBB\xBF", // U+2060
+ // use deprecated U+FEFF character because of webkit issue with displaying U+2060 (#1490353)
+ 'wordjoiner' => "\xEF\xBB\xBF", // U+FEFF
// enables format=flowed parser
'flowed' => false,
// enables wrapping for non-flowed text
- 'wrap' => true,
+ 'wrap' => true,
// line-break tag
- 'break' => "<br>\n",
+ 'break' => "<br>\n",
// prefix and suffix (wrapper element)
- 'begin' => '<div class="pre">',
- 'end' => '</div>',
+ 'begin' => '<div class="pre">',
+ 'end' => '</div>',
// enables links replacement
- 'links' => true,
+ 'links' => true,
// string replacer class
'replacer' => 'rcube_string_replacer',
);
@@ -278,6 +282,7 @@ class rcube_text2html
$text = strtr($text, $table);
$nbsp = $this->config['space'];
+ $nobr = $this->config['wordjoiner'];
// replace some whitespace characters
$text = str_replace(array("\r", "\t"), array('', ' '), $text);
@@ -299,9 +304,15 @@ class rcube_text2html
$text = $copy;
}
+ // make the whole line non-breakable
else {
- // make the whole line non-breakable
- $text = str_replace(array(' ', '-', '/'), array($nbsp, '-&#8288;', '/&#8288;'), $text);
+ $repl = array(
+ ' ' => $nbsp,
+ '-' => $nobr . '-' . $nobr,
+ '/' => $nobr . '/',
+ );
+
+ $text = str_replace(array_keys($repl), array_values($repl), $text);
}
return $text;
diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2Html.php
index 8d1325dee..771e14703 100644
--- a/tests/Framework/Text2Html.php
+++ b/tests/Framework/Text2Html.php
@@ -41,7 +41,7 @@ class Framework_Text2Html extends PHPUnit_Framework_TestCase
$data[] = array(">aaaa \n>aaaa", "<blockquote>aaaa_<br>aaaa</blockquote>", $options);
$data[] = array(">aaaa\n>aaaa", "<blockquote>aaaa<br>aaaa</blockquote>", $options);
$data[] = array(">aaaa \n>bbbb\ncccc dddd", "<blockquote>aaaa_<br>bbbb</blockquote>cccc_dddd", $options);
- $data[] = array("aaaa-bbbb/cccc", "aaaa-&#8288;bbbb/&#8288;cccc", $options);
+ $data[] = array("aaaa-bbbb/cccc", "aaaa\xEF\xBB\xBF-\xEF\xBB\xBFbbbb\xEF\xBB\xBF/cccc", $options);
$options['flowed'] = true;