X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=ab547e0510a2d8507030f3835891f9ccbdf6e242;hb=4d1c62e006bc896e9ddb59d15dc7a7e30f9eb48e;hp=f41dfa3d9af7b03231da10b23ba8a143fd96cea0;hpb=72b2f8bb79c0fd2d6e073084697fbe0aa126f956;p=platal.git diff --git a/classes/miniwiki.php b/classes/miniwiki.php index f41dfa3..ab547e0 100644 --- a/classes/miniwiki.php +++ b/classes/miniwiki.php @@ -7,140 +7,165 @@ 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() { 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',mb_strlen('$1'))", "str_repeat('\n',mb_strlen('$1'))", "ligne1\\\\\nligne2"); + + // * unordered list + MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", + "'

'", + "'$1 -' . str_replace(\"\\n*\", \"\\n -\", '$2')", + "* element1\n* element2\n* element3"); + // # unordered list + MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'

  1. '.str_replace(\"\\n#\",'
  2. ','$2').'
'", "'$0'", "# element1\n# element2\n# element3"); + // 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 +++]"); + // -----
- MiniWiki::Markup(11, "/(\n|^)--(--+| \n)/s", '$1
', '$1-- '."\n", "----\n"); + MiniWiki::Markup("/(\n|^)--(--+| \n)/s", '$1
', '$1-- '."\n", "----\n"); // titles - MiniWiki::Markup(12, '/(\n|^)(!+)([^\n]*)/se', "'$1$3'", "'$1$3'", - "!titre1\n\n!!titre2\n\n!!!titre3"); - - // * unordered list - MiniWiki::Markup(13, "/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", "''", "$0", "* element1\n* element2\n* element3"); - // # unordered list - MiniWiki::Markup(14, "/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'
  1. '.str_replace(\"\\n#\",'
  2. ','$2').'
'", "$0", "# element1\n# element2\n# element3"); - + MiniWiki::$title_index = MiniWiki::Markup('/(\n|^)(!+)([^\n]*)/se', + "'$1$3'", + "'$1$3'", "!titre1\n\n!!titre2\n\n!!!titre3"); + // links - MiniWiki::Markup(15, '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', '\\0', '[\\0]'); - MiniWiki::Markup(16, '/(\s|^|\\[\\[)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', '\\1www.\\2', '[http://www.\\2]'); - MiniWiki::Markup(17, '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '[mailto:\\0]'); - MiniWiki::Markup(18, '/\\[\\[\\s*.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '\\2', '\\2 [\\1]', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); - + MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui', + '\\0', '<\\0>'); + MiniWiki::Markup('/(\s|^|\[\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu', + '\\1www.\\2', '\\1'); + MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '<\\0>'); + MiniWiki::Markup('/\[\[\s*<(?:a href=")?([^">]*?)(?:">.*?<\/a)?>\s*\|([^\]]+)\]\]/i', + '\\2', '\\2 <\\1>', + "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); + // paragraphs and empty lines - MiniWiki::Markup(19, "/\n\n/", '

', "\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"); + + // french typo rules, unbreakable spaces + MiniWiki::Markup("/ +([!?:;])/", " $1", "$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; } - - private static function justify($text,$n) + + private static function justify($text, $n) { - $arr = explode("\n",wordwrap($text,$n)); - $arr = array_map('trim',$arr); + $arr = explode("\n", wordwrap($text, $n)); + $arr = array_map('trim', $arr); $res = ''; foreach ($arr as $key => $line) { $nxl = isset($arr[$key+1]) ? trim($arr[$key+1]) : ''; - $nxl_split = preg_split('! +!',$nxl); - $nxw_len = count($nxl_split) ? strlen($nxl_split[0]) : 0; + $nxl_split = preg_split('! +!u', $nxl); + $nxw_len = count($nxl_split) ? mb_strlen($nxl_split[0]) : 0; $line = trim($line); - - if (strlen($line)+1+$nxw_len < $n) { + + if (mb_strlen($line)+1+$nxw_len < $n) { $res .= "$line\n"; continue; } - - if (preg_match('![.:;]$!',$line)) { + + if (preg_match('![.:;]$!u',$line)) { $res .= "$line\n"; continue; } - - $tmp = preg_split('! +!',trim($line)); + + $tmp = preg_split('! +!u', trim($line)); $words = count($tmp); if ($words <= 1) { $res .= "$line\n"; continue; } - - $len = array_sum(array_map('strlen',$tmp)); + + $len = array_sum(array_map('mb_strlen', $tmp)); $empty = $n - $len; $sw = floatval($empty) / floatval($words-1); - + $cur = 0; $l = ''; foreach ($tmp as $word) { $l .= $word; - $cur += $sw + strlen($word); - $l = str_pad($l,intval($cur+0.5)); + $cur += $sw + strlen($word); // Use strlen here instead of mb_strlen because it is used by str_pad + // which is not multibyte compatible + $l = str_pad($l, intval($cur + 0.5)); } $res .= trim($l)."\n"; } return trim($res); } - + 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 = trim($wiki); + //foreach (MiniWiki::$patternsWiki as $key=>$pattern) { + // echo $key . " - " . $pattern . "\n"; + // $text = preg_replace($pattern, MiniWiki::$replacementText[$key], $text); + //} $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); + $text = $just ? MiniWiki::justify($text, $width - $indent) : wordwrap($text, $width - $indent); if($indent) { $ind = str_pad('',$indent); $text = $ind.str_replace("\n","\n$ind",$text); @@ -151,24 +176,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 = '' . "\n"; - $res .= "\n"; + $res = array(); foreach (MiniWiki::$info as $value) { - $i++; - $res .= ''; - $res .= ''; - $res .= ''; - $res .= "\n"; + $res[$value] = MiniWiki::wikiToHtml($value, true); } - $res .= '
SyntaxeApparence
' . nl2br(htmlentities($value)) . '' . MiniWiki::wikiToHtml($value, true) . '
'; if (!$with_title) { - MiniWiki::$info[12] = $info12; + MiniWiki::$info[MiniWiki::$title_index] = $info12; } return $res; }