From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 22 Sep 2011 14:55:28 +0000 (+0200)
Subject: Adds tables in MiniWiki (Closes #773).
X-Git-Tag: core/1.1.6~5
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=51e3a45835c2e74d2ceb8ed123385267d2de38d8;p=platal.git

Adds tables in MiniWiki (Closes #773).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 2c92e7c..c643246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ================================================================================
 VERSION 1.1.6                                                         XX XX XXXX
 
+New:
+
+    * #773: Adds tables in MiniWiki                                         -JAC
+
 ================================================================================
 VERSION 1.1.5                                                         28 06 2011
 
diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index ab547e0..d33fc05 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -32,6 +32,14 @@ class MiniWiki
         // retours à la ligne avec \\
         MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('<br />\n',mb_strlen('$1'))", "str_repeat('\n',mb_strlen('$1'))", "ligne1\\\\\nligne2");
 
+        // || Tables
+        MiniWiki::Markup("/((^|\n)\|\|(([^\n]*(\n|$))(\|\|[^\n]*(\n|$))*))/se",
+                         "'</p><table class=\"tinybicol\">'
+                         . str_replace(\"\n\", '', str_replace('||', '</td><td>', preg_replace(\"/\|\|($|\\n)/\", '</td></tr>\n', preg_replace(\"/(^|\\n)\|\|/\", '\n<tr><td>', '$1'))))
+                         . '</table><p>'",
+                         "str_replace('||', '|', '$1')",
+                         "||ligne1 colonne1||ligne1 colonne2||\n||ligne2 colonne1||ligne2 colonne2||");
+
         // * unordered list
         MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se",
                          "'</p><ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul><p>'",