[TWiki-Dev] [SVN] ThomasWeigert r13332 - in twiki/branches/MAIN/twikiplugins/MultiEditPlugin: data/TWiki lib/TWiki/Plugins

[<de...@de...>]

Author: ThomasWeigert
Date: 2007-04-08 23:07:59 -0500 (Sun, 08 Apr 2007)
New Revision: 13332

Modified:
   twiki/branches/MAIN/twikiplugins/MultiEditPlugin/data/TWiki/MultiEditPlugin.txt
   twiki/branches/MAIN/twikiplugins/MultiEditPlugin/lib/TWiki/Plugins/MultiEditPlugin.pm
Log:
Item2870: Handling verbatim in MultiEditPlugin.

Modified: twiki/branches/MAIN/twikiplugins/MultiEditPlugin/data/TWiki/MultiEditPlugin.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/MultiEditPlugin/data/TWiki/MultiEditPlugin.txt	2007-04-09 03:24:20 UTC (rev 13331)
+++ twiki/branches/MAIN/twikiplugins/MultiEditPlugin/data/TWiki/MultiEditPlugin.txt	2007-04-09 04:07:59 UTC (rev 13332)
@@ -61,6 +61,8 @@
 
 It is not possible based on the current TWiki rendering model to make this feature work when only part of a topic is included. If there are sections identified in an included topic which are before the %<nop>STARTINCLUDE% marker, then the sections in the included topic cannot be properly edited.
 
+Text within &lt;pre&gt; tags placed in sections is not correctly rendered, albeit the text is in the topic and is not lost.
+
 ---++ Plugin Installation Instructions
 
 __Note:__ You do not need to install anything on the browser to use this plugin. The following instructions are for the administrator who installs the plugin on the server where TWiki is running. 
@@ -99,9 +101,9 @@
 ---++ Plugin Info
 
 |  Plugin Author: | TWiki:Main/ThomasWeigert |
-|  Plugin Version: | 10 Dec 2006 |
+|  Plugin Version: | 08 Apr 2007 |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  08 Apr 2006: | Update by TWiki:Main.MichaelDaum. Fix for Bugs:Item3847.  |
+|  08 Apr 2006: | Update by TWiki:Main.MichaelDaum. Fix for Bugs:Item3847. Handle verbatim in sections. |
 |  10 Dec 2006: | Fix for unnamed sections. |
 |  19 Nov 2006: | Support editing of sections from included topics. Use =strict=. |
 |  09 Sep 2006: | Bug (disabled SectionalEditPlugin) fixed. |

Modified: twiki/branches/MAIN/twikiplugins/MultiEditPlugin/lib/TWiki/Plugins/MultiEditPlugin.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/MultiEditPlugin/lib/TWiki/Plugins/MultiEditPlugin.pm	2007-04-09 03:24:20 UTC (rev 13331)
+++ twiki/branches/MAIN/twikiplugins/MultiEditPlugin/lib/TWiki/Plugins/MultiEditPlugin.pm	2007-04-09 04:07:59 UTC (rev 13332)
@@ -105,13 +105,17 @@
 
 ##SMELL: Need to make sure the section attribute is given, even if
 ##topic was passed already
-  $posattr =~ s/label\s*="(.*?)"//o;
-  my $label = $1;
+##SMELL: Not sure what the label="..." parameter is all about but it
+##does not allow editing later as the edit does not find the prefixed section
+  my $seclabel = '';
+  if ( $posattr =~ s/label\s*=\"(.*?)\"//o ) {
+    $seclabel = $1;
+  }
   if ($posattr =~ / topic=/o) {
     return "<section$posattr>";
   } else {
     $_[3]++;
-    return "<section$posattr topic=\"$topic\" web=\"$web\" section=\"$label$_[3]\">";
+    return "<section$posattr topic=\"$topic\" web=\"$web\" section=\"$seclabel$_[3]\">";
   }
 }
 
@@ -206,14 +210,20 @@
 }
 
 # =========================
-sub postRenderingHandler
+# Need to use this deprecated plugin, as otherwise the verbatim does not
+# get put back in. Eventually, add verbatim etc. insertion back into her
+# from TWiki::Render::getRenderedVersion.
+# Note that the current version does not handle pre sections correctly,
+# as this handler runs after the pre is restored.
+# TODO: move to postRenderingHandler, but restore verbatim and pre.
+sub endRenderingHandler
 {
 ### my ( $text ) = @_;   # do not uncomment, use $_[0] instead
 
     return if ($_[0] =~ m/\<\/?body[^>]*\>/o);
 
     my $session = $TWiki::Plugins::SESSION;
-    TWiki::Func::writeDebug( "- ${pluginName}::postRenderingHandler( $session->{webName}.$session->{topicName} )" ) if $debug;
+    TWiki::Func::writeDebug( "- ${pluginName}::endRenderingHandler( $session->{webName}.$session->{topicName} )" ) if $debug;
 
     while ($_[0] =~ s/$prefix(.*?)$prefix/$renderedText{$1}/e) {}
 }