From 07c2b1c7ce9255456bf19c45cf9d34452cec2af1 Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Thu, 19 Nov 2009 15:06:19 +0100
Subject: Add TABLE range marker for table editing

darcs-hash:20091119140619-e4919-15efddc768526a6c1f6472f83ede17019144ffa3.gz
---
 inc/parser/renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 6082e935d..65dcaf8a1 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -233,7 +233,7 @@ class Doku_Renderer extends DokuWiki_Plugin {
 
     function table_open($maxcols = NULL, $numrows = NULL){}
 
-    function table_close(){}
+    function table_close($begin, $end){}
 
     function tablerow_open(){}
 
-- 
cgit v1.2.3


From 90df9a4d69a2e467433b419b94fe799d11590539 Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Thu, 4 Feb 2010 14:50:10 +0100
Subject: Rewrite section edit handling according to #1860

---
 inc/parser/renderer.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 65dcaf8a1..393099003 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -85,8 +85,6 @@ class Doku_Renderer extends DokuWiki_Plugin {
 
     function header($text, $level, $pos) {}
 
-    function section_edit($start, $end, $level, $name) {}
-
     function section_open($level) {}
 
     function section_close() {}
@@ -231,9 +229,9 @@ class Doku_Renderer extends DokuWiki_Plugin {
         $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
         ) {}
 
-    function table_open($maxcols = NULL, $numrows = NULL){}
+    function table_open($maxcols = NULL, $numrows = NULL, $pos){}
 
-    function table_close($begin, $end){}
+    function table_close($pos){}
 
     function tablerow_open(){}
 
-- 
cgit v1.2.3


From f6ec8df813b28547ca3b04bb39f0ce670a6bb990 Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Mon, 29 Mar 2010 12:00:30 +0200
Subject: Allow plugins to specify that they have to be instantiated

Plugins may return false in isSingleton to let plugin_load return a new
instance every time it is called.
Renderer plugins are not loaded with $new set to true, but instead specify
themself that they are not singletons. This behaviour allows the odt renderer
to keep working (see #1598).
---
 inc/parser/renderer.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 393099003..4dac75d21 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -49,6 +49,15 @@ class Doku_Renderer extends DokuWiki_Plugin {
         trigger_error('getFormat() not implemented in '.get_class($this), E_USER_WARNING);
     }
 
+    /**
+     * Allow the plugin to prevent DokuWiki from reusing an instance
+     *
+     * @return bool   false if the plugin has to be instantiated
+     */
+    function isSingleton() {
+        return false;
+    }
+
 
     //handle plugin rendering
     function plugin($name,$data){
-- 
cgit v1.2.3


From 9708106bad6f238d9aeaccc35258350a66604a6c Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Thu, 1 Jul 2010 13:02:28 +0200
Subject: Fix ns: and ns:start handling

---
 inc/parser/renderer.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 4dac75d21..7e52cfce2 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -271,20 +271,12 @@ class Doku_Renderer extends DokuWiki_Plugin {
         list($name,$hash) = explode('#',$name,2);
         if($hash) return $hash;
 
-        //trim colons or slash of a namespace link
-        $name = rtrim($name,':');
-        if($conf['useslash'])
-          $name = rtrim($name,'/');
-
+        $name = strtr($name,';',':');
         if($conf['useslash']){
-            $nssep = '[:;/]';
-        }else{
-            $nssep = '[:;]';
+            $name = strtr($name,'/',':');
         }
-        $name = preg_replace('!.*'.$nssep.'!','',$name);
 
-        if(!$name) return $this->_simpleTitle($conf['start']);
-        return $name;
+        return noNSorNS($name);
     }
 
     /**
-- 
cgit v1.2.3