X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=ab547e0510a2d8507030f3835891f9ccbdf6e242;hb=aacc771b2867676ec50dfea7817384d0acf7cd55;hp=43a228153fa109b9bfaface7f26735a79224fa50;hpb=6c49e229103128b29bcc10194f70e96e02cadb1a;p=platal.git
diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 43a2281..ab547e0 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -21,22 +21,25 @@ class MiniWiki
}
return $id;
}
-
+
public static function init()
{
if (isset(MiniWiki::$patternsWiki[0])) {
return;
}
MiniWiki::Markup("/(\r\n|\r([^\n]))/", "\n$2", "\n$2");
-
+
// retours à la ligne avec \\
- MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('
\n',strlen('$1'))", "str_repeat('\n',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", "'
', "\n\n", "paragraphe1\n\nparagraphe2"); MiniWiki::Markup("/\n/", ' ', "\n"); - MiniWiki::Markup("/^.*<\/p>
.*$/s", "
$0
", "$0"); + MiniWiki::Markup("/^.*<\/p>.*.*$/s", "
$0
", "$0"); + + // french typo rules, unbreakable spaces + MiniWiki::Markup("/ +([!?:;])/", " $1", "$0"); } public static function WikiToHTML($wiki, $title = false) @@ -92,51 +103,52 @@ class MiniWiki } 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) { @@ -144,11 +156,16 @@ class MiniWiki $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[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);