From b87d6bbf631090db585a3509f38ad936f3e80ed0 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Tue, 6 Apr 2004 21:01:33 +0000
Subject: [PATCH] =?UTF-8?q?typographie=20:=20ne=20plus=20d=C3=A9janter=20s?=
 =?UTF-8?q?ur=20!!=3F=3F=20ou=20sur=20les=20commentaires=20html=20<!--...!?=
 =?UTF-8?q?>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/inc_texte.php3 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ecrire/inc_texte.php3 b/ecrire/inc_texte.php3
index be7cdc5ef3..ea9ec860ab 100644
--- a/ecrire/inc_texte.php3
+++ b/ecrire/inc_texte.php3
@@ -427,14 +427,16 @@ function typo_fr($letexte) {
 	$cherche1 = array(
 		/* 1		'/{([^}]+)}/',  */
 		/* 2 */ 	'/((^|[^\#0-9a-zA-Z\&])[\#0-9a-zA-Z]*)\;/',
-		/* 3 */		'/&#187;|[!?]| -,|:([^0-9]|$)/',
-		/* 4 */		'/&#171;|(M(M?\.|mes?|r\.?)|[MnN]&#176;) /'
+		/* 3 */		'/&#187;| -,|:([^0-9]|$)/',
+		/* 4 */		'/([^<!?])([!?])/',
+		/* 5 */		'/&#171;|(M(M?\.|mes?|r\.?)|[MnN]&#176;) /'
 	);
 	$remplace1 = array(
 		/* 1		'<i class="spip">\1</i>', */
 		/* 2 */		'\1~;',
 		/* 3 */		'~\0',
-		/* 4 */		'\0~'
+		/* 4 */		'\1~\2',
+		/* 5 */		'\0~'
 	);
 	$letexte = ereg_remplace($cherche1, $remplace1, $letexte);
 	$letexte = ereg_replace(" *~+ *", "~", $letexte);
-- 
GitLab