function _b_($str) { return utf8_decode(dgettext('banana', utf8_encode($str))); }
function to_entities($str) {
- require_once 'banana/utf8.php';
+ require_once dirname(__FILE__).'/utf8.php';
return utf8entities(htmlentities($str, ENT_NOQUOTES, 'UTF-8'));
}
$res = preg_replace("/ (<|>|") /", "\\1", $res);
if ($format == 'html') {
- return $res;
+ $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br>)@", "\\1<br>-- \\2", $res);
+ $res = preg_replace("@<br>\n?-- \n?(<p[^>]*>)@", "<br>-- <br>\\2", $res);
+ $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br>)@", $res);
+ } else {
+ $parts = preg_split("/\n-- ?\n/", $res);
}
- $parts = preg_split("/\n-- ?\n/", $res);
-
if (count($parts) > 1) {
- $sign = "</pre><hr style='width: 100%; margin: 1em 0em; ' /><pre>" . array_pop($parts);
- return join("\n-- \n", $parts).$sign;
+ $sign = array_pop($parts);
+ if ($format == 'html') {
+ $res = join('<br/>-- <br/>', $parts);
+ $sign = '<hr style="width: 100%; margin: 1em 0em; " />'.$sign;
+ } else {
+ $res = join('\n-- \n', $parts);
+ $sign = '</pre><hr style="width: 100%; margin: 1em 0em; " /><pre>'.$sign;
+ }
+ return $res.$sign;
} else {
return $res;
}