From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Tue, 5 Jun 2007 20:56:04 +0000 (+0000)
Subject: MiniWiki improvements:
X-Git-Tag: xorg/0.9.15~265
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2d7e0ded1f95a095454414a0a9a3059eae0271f0;p=platal.git

MiniWiki improvements:
-> use "-" instead of "*" for plain/text list items because "*" is already
used for bold and titles
-> many fixes in url in plain/text

 miniwiki.php |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)



git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1856 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 49abc2b..eb5e94e 100644
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -35,7 +35,7 @@ class MiniWiki
         // * unordered list 
         MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se",
                          "'</p><ul><li>'.str_replace(\"\\n*\",'</li><li>','$2').'</li></ul><p>'",
-                         "'$0'",
+                         "'$1 -' . str_replace(\"\\n*\", \"\\n -\", '$2')",
                          "* element1\n* element2\n* element3"); 
         // # unordered list 
         MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'<ol><li>'.str_replace(\"\\n#\",'</li><li>','$2').'</li></ol>'", "'$0'", "# element1\n# element2\n# element3"); 
@@ -66,14 +66,19 @@ class MiniWiki
         // ----- <hr/>
         MiniWiki::Markup("/(\n|^)--(--+| \n)/s", '$1<hr/>', '$1-- '."\n", "----\n");
         // titles
-        MiniWiki::$title_index = MiniWiki::Markup('/(\n|^)(!+)([^\n]*)/se', "'$1<h'.mb_strlen('$2').'>$3</h'.mb_strlen('$2').'>'",
+        MiniWiki::$title_index = MiniWiki::Markup('/(\n|^)(!+)([^\n]*)/se',
+                                                  "'$1<h'.mb_strlen('$2').'>$3</h'.mb_strlen('$2').'>'",
                                                   "'$1$3'", "!titre1\n\n!!titre2\n\n!!!titre3");
         
         // links
-        MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui', '<a href="\\0">\\0</a>', '<\\0>');
-        MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu', '\\1<a href="http://www.\\2">www.\\2</a>', '<http://www.\\2>');
+        MiniWiki::Markup('/((?:https?|ftp):\/\/(?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/ui',
+                         '<a href="\\0">\\0</a>', '<\\0>');
+        MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:[\.\,\;\!\:]*[\w@~%$£µ&i#\-+=_\/\?])*)/iu',
+                         '\\1<a href="http://www.\\2">www.\\2</a>', '\\1<http://www.\\2>');
         MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '<a href="mailto:\\0">\\0</a>', '<\\0>');
-        MiniWiki::Markup('/\\[\\[\\s*<a href="([^>]*)">.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '<a href="\\1">\\2</a>', '\\2 <\\1>', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com");
+        MiniWiki::Markup('/\\[\\[\\s*<(?:a href=")?([^>]*)(?:">.*<\/a)?>\\s*\|([^\\]]+)\\]\\]/i',
+                         '<a href="\\1">\\2</a>', '\\2 <\\1>',
+                         "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com");
         
         // paragraphs and empty lines
         MiniWiki::Markup("/\n\n/", '</p><p>', "\n\n", "paragraphe1\n\nparagraphe2");