X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=02f1ca4503aff66251e0b51740f2fb2ff4ed4bc7;hb=df87518a87c3ca82890789fce59e5f13b6921093;hp=f41dfa3d9af7b03231da10b23ba8a143fd96cea0;hpb=72b2f8bb79c0fd2d6e073084697fbe0aa126f956;p=platal.git
diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index f41dfa3..02f1ca4 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -7,16 +7,19 @@ class MiniWiki
private static $replacementHTML = array();
private static $replacementText = array();
+ private static $title_index = -1;
private static $info = array();
- public static function Markup($id, $pattern, $replacement, $replacementTxt, $info = null)
+ public static function Markup($pattern, $replacement, $replacementTxt, $info = null)
{
+ $id = count(MiniWiki::$patternsWiki);
MiniWiki::$patternsWiki[$id] = $pattern;
MiniWiki::$replacementHTML[$id] = $replacement;
MiniWiki::$replacementText[$id] = $replacementTxt;
if ($info) {
MiniWiki::$info[$id] = $info;
}
+ return $id;
}
public static function init()
@@ -24,63 +27,68 @@ class MiniWiki
if (isset(MiniWiki::$patternsWiki[0])) {
return;
}
- MiniWiki::Markup(0, "/(\r\n|\r([^\n]))/", "\n$2", "\n$2");
+ MiniWiki::Markup("/(\r\n|\r([^\n]))/", "\n$2", "\n$2");
// retours à la ligne avec \\
- MiniWiki::Markup(1, "/\\\\(?>(\\\\*))\n/e", "str_repeat('
\n',strlen('$1'))", "str_repeat('\n',strlen('$1'))", "ligne1\\\\\nligne2");
+ MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('
\n',strlen('$1'))", "str_repeat('\n',strlen('$1'))", "ligne1\\\\\nligne2");
// bold, italic and others
// ''' bold '''
- MiniWiki::Markup(2, "/'''(.*?)'''/",'$1','*$1*', "'''gras'''");
+ MiniWiki::Markup("/'''(.*?)'''/",'$1','*$1*', "'''gras'''");
// '' italic ''
- MiniWiki::Markup(3, "/''(.*?)''/",'$1','/$1/', "''italique''");
+ MiniWiki::Markup("/''(.*?)''/",'$1','/$1/', "''italique''");
// '+ big +'
- MiniWiki::Markup(4, "/'\\+(.*?)\\+'/",'$1','*$1*', "'+grand+'");
+ MiniWiki::Markup("/'\\+(.*?)\\+'/",'$1','*$1*', "'+grand+'");
// '- small -'
- MiniWiki::Markup(5, "/'\\-(.*?)\\-'/",'$1','$1', "'-petit-'");
+ MiniWiki::Markup("/'\\-(.*?)\\-'/",'$1','$1', "'-petit-'");
// '^superscript^'
- MiniWiki::Markup(6, "/'\\^(.*?)\\^'/",'$1','$1', "^exposant^");
+ MiniWiki::Markup("/'\\^(.*?)\\^'/",'$1','$1', "'^exposant^'");
// '_subscript_'
- MiniWiki::Markup(7, "/'_(.*?)_'/",'$1','$1', "_indice_");
+ MiniWiki::Markup("/'_(.*?)_'/",'$1','$1', "'_indice_'");
// {+ underline +}
- MiniWiki::Markup(8, "/\\{\\+(.*?)\\+\\}/",'$1','_$1_', "{+insertion+}");
+ MiniWiki::Markup("/\\{\\+(.*?)\\+\\}/",'$1','_$1_', "{+insertion+}");
// {- strikeout -}
- MiniWiki::Markup(9, "/\\{-(.*?)-\\}/",'$1','-$1-', "{-suppression-}");
+ MiniWiki::Markup("/\\{-(.*?)-\\}/",'$1','-$1-', "{-suppression-}");
+ // {color| colored text |}
+ MiniWiki::Markup("/%([a-z]+|\#[0-9a-f]{3,6})%(.*?)%%/i", "$2", "$2",
+ "%red% texte en rouge %%\\\\\n%#ff0% texte en jaune %%\\\\\n%#0000ff% texte en bleu %%");
// [+ big +] [++ bigger ++] [+++ even bigger +++] ...
- MiniWiki::Markup(10, "/\\[(([-+])+)(.*?)\\1\\]/e","'$3'", "'$3'", "[+ grand +]\n\n[++ plus gros ++]\n\n[+++ encore plus gros +++]");
+ MiniWiki::Markup("/\\[(([-+])+)(.*?)\\1\\]/e","'$3'", "'$3'", "[+ grand +]\n\n[++ plus grand ++]\n\n[+++ encore plus grand +++]");
// -----
', "\n\n", "paragraphe1\n\nparagraphe2"); - MiniWiki::Markup(20, "/\n/", ' ', "\n"); - MiniWiki::Markup(21, "/^.*<\/p>
.*$/s", "
$0
", "$0"); + MiniWiki::Markup("/\n\n/", '', "\n\n", "paragraphe1\n\nparagraphe2"); + MiniWiki::Markup("/\n/", ' ', "\n"); + MiniWiki::Markup("/^.*<\/p>
.*$/s", "
$0
", "$0"); } public static function WikiToHTML($wiki, $title = false) { if (!$title) { - $oldrule12 = MiniWiki::$replacementHTML[12]; - MiniWiki::$replacementHTML[12] = "'$0'"; + $oldrule12 = MiniWiki::$replacementHTML[MiniWiki::$title_index]; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = "'$0'"; } - $html = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementHTML, utf8_encode(htmlentities(utf8_decode(trim($wiki))))); + $html = preg_replace(MiniWiki::$patternsWiki, + MiniWiki::$replacementHTML, + htmlentities(trim($wiki), ENT_COMPAT, 'UTF-8')); if (!$title) { - MiniWiki::$replacementHTML[12] = $oldrule12; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = $oldrule12; } return $html; } @@ -133,12 +141,12 @@ class MiniWiki public static function WikiToText($wiki, $just=false, $indent=0, $width=68, $title=false) { if (!$title) { - $oldrule12 = MiniWiki::$replacementHTML[12]; - MiniWiki::$replacementHTML[12] = "'$0'"; + $oldrule12 = MiniWiki::$replacementHTML[MiniWiki::$title_index]; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = "'$0'"; } $text = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementText, trim($wiki)); if (!$title) { - MiniWiki::$replacementHTML[12] = $oldrule12; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = $oldrule12; } $text = $just ? MiniWiki::justify($text,$width-$indent) : wordwrap($text,$width-$indent); if($indent) { @@ -151,24 +159,17 @@ class MiniWiki static public function help($with_title = false) { if (!$with_title) { - $info12 = MiniWiki::$info[12]; - unset(MiniWiki::$info[12]); + $info12 = MiniWiki::$info[MiniWiki::$title_index]; + unset(MiniWiki::$info[MiniWiki::$title_index]); } - $i = 0; - $res = 'Syntaxe | Apparence |
---|---|
' . nl2br(htmlentities($value)) . ' | '; - $res .= '' . MiniWiki::wikiToHtml($value, true) . ' | '; - $res .= "