Ticket #8204: span-blocks-r9193.patch

trac/wiki/formatter.py

@@ -153 +153 @@
                                     '"--" in htmlcomment wiki code block'))
         return Markup('<!--\n%s-->\n' % text)
         
-    def _elt_processor(self, eltname, format_to, text, args):
-        # Note: as long as _processor_param_re is not re.UNICODE, **args is OK
-        elt = getattr(tag, eltname)(**(args or {}))
+    def _elt_processor(self, eltname, format_to, text):
+        # Note: as long as _processor_param_re is not re.UNICODE, **args is OK.
+        # Also, parse_args is using strict mode when processing [[span(...)]].
+        elt = getattr(tag, eltname)(**(self.args or {}))
         if not WikiSystem(self.env).render_unsafe_content:
             sanitized_elt = getattr(tag, eltname)
             for (k, data, pos) in (Stream(elt) | self._sanitizer):
@@ -170 +171 @@
             self.args = {}
         if 'class' not in self.args:
             self.args['class'] = 'wikipage'
-        return self._elt_processor('div', format_to_html, text, self.args)
+        return self._elt_processor('div', format_to_html, text)
     
     def _span_processor(self, text):
-        args, kwargs = parse_args(text, strict=True)
-        return self._elt_processor('span', format_to_oneliner, ', '.join(args),
-                                   kwargs)
+        if self.args is None:
+            args, self.args = parse_args(text, strict=True)
+            text = ', '.join(args)
+        return self._elt_processor('span', format_to_oneliner, text)
 
     def _td_processor(self, text):
         return self._tablecell_processor('td', text)
@@ -185 +187 @@
     
     def _tr_processor(self, text):
         try:
-            elt = self._elt_processor('tr', self._format_row, text, self.args)
+            elt = self._elt_processor('tr', self._format_row, text)
             self.formatter.open_table()
             return elt
         except ProcessorError, e:
@@ -197 +199 @@
         if 'class' not in self.args:
             self.args['class'] = 'wiki'
         try:
-            return self._elt_processor('table', self._format_table, text,
-                                       self.args)
+            return self._elt_processor('table', self._format_table, text)
         except ProcessorError, e:
             return system_message(e)
     
     def _tablecell_processor(self, eltname, text):
         self.formatter.open_table_row()
-        return self._elt_processor(eltname, format_to_html, text, self.args)
+        return self._elt_processor(eltname, format_to_html, text)
 
     _has_multiple_tables_re = re.compile(r"</table>.*?<table",
                                          re.MULTILINE | re.DOTALL)

trac/wiki/tests/wiki-tests.txt

@@ -750 +750 @@
 ------------------------------
  […]
 Done.
+============================== span wiki processor
+{{{
+#!span style="background: #ffd"
+This is a multiline span
+ - only ''inline'' wiki formatting here, of course
+ - this is only a span after all!
+}}}
+TODO: should be expanded in inline mode
+------------------------------
+<span style="background: #ffd">This is a multiline span
+ - only <i>inline</i> wiki formatting here, of course
+ - this is only a span after all!</span><p>
+TODO: should be expanded in inline mode
+</p>
+------------------------------
+ […]
+TODO: should be expanded in inline mode
 ============================== div and Span wiki processors
 {{{
 #!div ; style="background: #aeaeae"