dépôts
/
lhc
/
web
/
www.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPIP][PLUGINS] v3.0-->v3.2
[lhc/web/www.git]
/
www
/
plugins-dist
/
textwheel
/
typographie
/
en.php
diff --git
a/www/plugins-dist/textwheel/typographie/en.php
b/www/plugins-dist/textwheel/typographie/en.php
index
1525ca6
..
be0ad59
100644
(file)
--- a/
www/plugins-dist/textwheel/typographie/en.php
+++ b/
www/plugins-dist/textwheel/typographie/en.php
@@
-10,7
+10,9
@@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-if (!defined("_ECRIRE_INC_VERSION")) return;
+if (!defined("_ECRIRE_INC_VERSION")) {
+ return;
+}
// Correction typographique anglaise
// Correction typographique anglaise
@@
-19,10
+21,11
@@
function typographie_en($t) {
if (!isset($trans)) {
$trans = array(
if (!isset($trans)) {
$trans = array(
- " " => '~',
- "'" => '’'
+
" " => '~',
+
"'" => '’'
);
);
- switch ($GLOBALS['meta']['charset']) {
+ $charset = isset($GLOBALS['meta']['charset']) ? $GLOBALS['meta']['charset'] : '';
+ switch ($charset) {
case 'utf-8':
$trans["\xc2\xa0"] = '~';
break;
case 'utf-8':
$trans["\xc2\xa0"] = '~';
break;
@@
-44,8
+47,13
@@
function typographie_en($t) {
/* 4 */
$t = preg_replace('/Mr\.? /S', '$0~', $t);
/* 4 */
$t = preg_replace('/Mr\.? /S', '$0~', $t);
- if (strpos($t, '~') !== false)
+ if (strpos($t, '\~') !== false) {
+ $t = str_replace('\~', "\x1\x14", $t);
+ }
+
+ if (strpos($t, '~') !== false) {
$t = preg_replace("/ *~+ */S", "~", $t);
$t = preg_replace("/ *~+ */S", "~", $t);
+ }
$t = preg_replace("/--([^-]|$)/S", "$pro—$1", $t, -1, $c);
if ($c) {
$t = preg_replace("/--([^-]|$)/S", "$pro—$1", $t, -1, $c);
if ($c) {
@@
-55,5
+63,9
@@
function typographie_en($t) {
$t = str_replace('~', ' ', $t);
$t = str_replace('~', ' ', $t);
+ if (strpos($t, "\x1") !== false) {
+ $t = str_replace("\x1\x14", '~', $t);
+ }
+
return $t;
}
return $t;
}