X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=ab547e0510a2d8507030f3835891f9ccbdf6e242;hb=4d1c62e006bc896e9ddb59d15dc7a7e30f9eb48e;hp=49abc2ba8ad7758060e792a269c75b59859824a4;hpb=cac862a17dc45de9557c37404e0ffe34b475be10;p=platal.git
diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 49abc2b..ab547e0 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -21,25 +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',mb_strlen('$1'))", "str_repeat('\n',mb_strlen('$1'))", "ligne1\\\\\nligne2");
-
- // * unordered list
+
+ // * unordered list
MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se",
"'
'", - "'$0'", - "* 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"); + + // french typo rules, unbreakable spaces + MiniWiki::Markup("/ +([!?:;])/", " $1", "$0"); } public static function WikiToHTML($wiki, $title = false) @@ -95,7 +103,7 @@ class MiniWiki } return $html; } - + private static function justify($text, $n) { $arr = explode("\n", wordwrap($text, $n)); @@ -106,28 +114,28 @@ class MiniWiki $nxl_split = preg_split('! +!u', $nxl); $nxw_len = count($nxl_split) ? mb_strlen($nxl_split[0]) : 0; $line = trim($line); - + if (mb_strlen($line)+1+$nxw_len < $n) { $res .= "$line\n"; continue; } - + if (preg_match('![.:;]$!u',$line)) { $res .= "$line\n"; continue; } - + $tmp = preg_split('! +!u', trim($line)); $words = count($tmp); if ($words <= 1) { $res .= "$line\n"; continue; } - + $len = array_sum(array_map('mb_strlen', $tmp)); $empty = $n - $len; $sw = floatval($empty) / floatval($words-1); - + $cur = 0; $l = ''; foreach ($tmp as $word) { @@ -140,7 +148,7 @@ class MiniWiki } return trim($res); } - + public static function WikiToText($wiki, $just=false, $indent=0, $width=68, $title=false) {