upgrade to Creole 1.0 specs

git-svn-id: https://svn.php.net/repository/pear/packages/Text_Wiki/trunk@240476 c90b9560-bf6c-de11-be94-00142212c4b1
horde · Jul 30, 2007 · 8f37ef2 · 8f37ef2
1 parent 3588e17
commit 8f37ef2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Text/Wiki/Parse/Creole/Center.php b/Text/Wiki/Parse/Creole/Center.php
@@ -38,7 +38,7 @@ class Text_Wiki_Parse_Center extends Text_Wiki_Parse {
      *
      */
 
-    var $regex = '/\n\n\|(.*?)\n\n/';
+    var $regex = '/^! *(.*?)$/m';
 
     /**
      *

diff --git a/Text/Wiki/Parse/Creole/Image.php b/Text/Wiki/Parse/Creole/Image.php
@@ -32,7 +32,7 @@ class Text_Wiki_Parse_Image extends Text_Wiki_Parse {
      *
      */
 
-    var $regex = '/{{ *(.*)(\ *| *(.*))? *}}/U';
+    var $regex = '/{{(.*)(\|(.*))?}}/U';
 
 
     /**
@@ -50,6 +50,7 @@ class Text_Wiki_Parse_Image extends Text_Wiki_Parse {
     function process(&$matches)
     {
         $src = trim($matches[1]);
+		$src = ltrim($src, '/');
         $alt = trim($matches[3]);
         if (! $alt) $alt = $src;
 

diff --git a/Text/Wiki/Parse/Creole/Trim.php b/Text/Wiki/Parse/Creole/Trim.php
@@ -63,11 +63,6 @@ function parse()
         $replace = "\n\n----\n\n$2";
         $this->wiki->source = preg_replace($find, $replace, $this->wiki->source);
 
-        // change dash for ndash
-        $find = "/ \- /";
-        $replace = " -- ";
-        $this->wiki->source = preg_replace($find, $replace, $this->wiki->source);
-
     }
 
 }