From: x2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Wed, 28 Mar 2007 17:21:32 +0000 (+0000)
Subject: miniwiki syntax for color is now compatible with pmwiki syntax
X-Git-Tag: xorg/0.9.14~157
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=80714a6a11346c1687bafb454afe906e9526339d;p=platal.git

miniwiki syntax for color is now compatible with pmwiki syntax

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1629 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 5b7bdbc..02f1ca4 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -50,8 +50,8 @@ class MiniWiki
         // {- strikeout -}
         MiniWiki::Markup("/\\{-(.*?)-\\}/",'<del>$1</del>','-$1-', "{-suppression-}");
         // {color| colored text |}
-        MiniWiki::Markup("/\{([a-z]+|\#[0-9a-f]{3,6})\|(.*?)\|\}/i", "<span style='color: $1;'>$2</span>", "$2",
-                         "{red|rouge|} {#ff0|jaune|} {#0000ff|bleu|}");
+        MiniWiki::Markup("/%([a-z]+|\#[0-9a-f]{3,6})%(.*?)%%/i", "<span style='color: $1;'>$2</span>", "$2",
+                         "%red% texte en rouge %%\\\\\n%#ff0% texte en jaune %%\\\\\n%#0000ff% texte en bleu %%");
         // [+ big +] [++ bigger ++] [+++ even bigger +++] ...
         MiniWiki::Markup("/\\[(([-+])+)(.*?)\\1\\]/e","'<span style=\'font-size:'.(round(pow(6/5,$2strlen('$1'))*100,0)).'%\'>$3</span>'", "'$3'", "[+ grand +]\n\n[++ plus grand ++]\n\n[+++ encore plus grand +++]");