diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php index bcd6ad015d027dca5441a8d833c98336dc3a983d..1fbed17e8e928e15f3611e6f7235cd7bcd0df2d9 100644 --- a/ecrire/inc/texte.php +++ b/ecrire/inc/texte.php @@ -1076,9 +1076,9 @@ function traiter_raccourcis($letexte) { /* 1 */ "/\n-- */", /* 2 */ "/\n- */", /* 3 */ "/\n_ +/", - /* 4 */ "/[{][{][{]/", - /* 5 */ "/[}][}][}]/", - /* 6 */ "/(( *)\n){2,}(<br[[:space:]]*\/?".">)?/", + /* 4 */ "/(^|[^{])[{][{][{]/", + /* 5 */ "/[}][}][}]($|[^}])/", + /* 6 */ "/(( *)\n){2,}(<br[[:space:]]*\/?".">)?/", /* 7 */ "/[{][{]/", /* 8 */ "/[}][}]/", /* 9 */ "/[{]/", @@ -1093,8 +1093,8 @@ function traiter_raccourcis($letexte) { /* 1 */ "\n<br />— ", /* 2 */ "\n<br />$puce ", /* 3 */ "\n<br />", - /* 4 */ "\n\n$debut_intertitre", - /* 5 */ "$fin_intertitre\n\n", + /* 4 */ "\$1\n\n$debut_intertitre", + /* 5 */ "$fin_intertitre\n\n\$1", /* 6 */ "<p>", /* 7 */ "<strong class=\"spip\">", /* 8 */ "</strong>",