diff --git a/ecrire/inc_texte.php3 b/ecrire/inc_texte.php3 index 7d317ce571d949b62b2da4a7800778bde1ca4ef5..7370e783d0ab201803ae8c94250ded82ef3c5d5d 100644 --- a/ecrire/inc_texte.php3 +++ b/ecrire/inc_texte.php3 @@ -322,11 +322,13 @@ function typo_fr($letexte) { } $cherche1 = array( + /* 1 */ '/{([^}]+)}/', /* 2 */ '/((^|[^\#0-9a-zA-Z\&])[\#0-9a-zA-Z]*)\;/', /* 3 */ '/»|[!?]| -,|:([^0-9]|$)/', /* 4 */ '/«|(M(M?\.|mes?|r\.?)|[MnN]°) /' ); $remplace1 = array( + /* 1 */ '<i class="spip">\1</i>', /* 2 */ '\1~;', /* 3 */ '~\0', /* 4 */ '\0~' @@ -347,9 +349,17 @@ function typo_fr($letexte) { return $letexte; } -// rien sauf les ~ +// rien sauf les ~ {} function typo_en($letexte) { + $cherche1 = array( + /* 1 */ '/{([^}]+)}/' + ); + $remplace1 = array( + /* 1 */ '<i class="spip">\1</i>' + ); + $letexte = ereg_remplace($cherche1, $remplace1, $letexte); $letexte = str_replace(" ", "~", $letexte); + return ereg_replace(" *~+ *", " ", $letexte); }