Wikiformatting tables used in ticket has a extra column

[Maxwell]

||Cell 1||Cell 2||Cell 3||
||Cell 4||Cell 5||Cell 6||

Cell 1	Cell 2	Cell 3
Cell 4	Cell 5	Cell 6

in python2.5.2

[Maxwell]

in trac0.11stable and trac0.11 tables in ticket has a extra column

[Remy Blank <remy.blank@…>]

This is a duplicate of #7327, which was closed as worksforme.

Could you please provide some more information:

• Installed Trac plugins
• Browser version (and plugins if applicable)
• Operating system

Could you also please attach the HTML source of the page that you used to make the screenshot above?

[Maxwell]

Plugin: AccountManagerPlugin export from trunk(version tracaccountmanager 0.2.1dev )
Browser: IE6, firefox3.0.1, IE7
OS: WinXP SP2, win2003server SP2
DB: sqlite(follow in trac0.11)

The HTML source

<div class="searchable">
                <table class="wiki">
<tr><td>Cell 1</td><td>Cell 2</td><td>Cell 3</td><td> <br />
</td></tr><tr><td>Cell 4</td><td>Cell 5</td><td>Cell 6</td><td> <br />
</td></tr></table>

              </div>

[Remy Blank <remy.blank@…>]

Thanks for the info, but I still can't reproduce the problem, even with AccountManagerPlugin installed. Is the table in the description of this ticket formatted correctly for you, or does it show the extra column?

Could you please create a wiki page on your Trac instance that shows the problem, download it as plain text (the link is at the bottom of the page) and attach it to this ticket?

The extra column contains a space and a <br /> tag. The only location where this tag is generated in code is in trac/wiki/formatter.py, and only in response to a [[BR]] macro.

[Maxwell]

This problem is not exists in wiki page. The table in the description of this ticket formatted correctly for me.

In my trac instance if I use this formatting, the table formatted correctly.

||Cell 1||Cell 2||Cell 3
||Cell 4||Cell 5||Cell 6

[Christian Boos]

Oh, I see, it's happening for Trac environments where [ticket] preserve_newlines is set (TracIni#ticket-section). Verified.

[Christian Boos]

trac/wiki/formatter.py

@@ -854 +854 @@
             if not line.startswith(' '):
                 self._tabstops = []
 
-            if escape_newlines:
-                line += ' [[BR]]'
             self.in_list_item = False
             self.in_quote = False
             # Throw a bunch of regexps on the problem
@@ -873 +871 @@
             if self.in_table and line.strip()[0:2] != '||':
                 self.close_table()
 
-            if len(result) and not self.in_list_item and not self.in_def_list \
-                    and not self.in_table:
-                self.open_paragraph()
-            self.out.write(result + os.linesep)
+            sep = os.linesep
+            if not(self.in_list_item or self.in_def_list or self.in_table):
+                if len(result):
+                    self.open_paragraph()
+                if escape_newlines:
+                    sep = '<br />' + sep
+            self.out.write(result + sep)
             self.close_table_row()
 
         self.close_table()

It seems to work fine and to not have adverse side-effects.

[Maxwell]

In my trac instance it works fine.

[Christian Boos]

Applied in r7398. Thanks Maxwell for having persisted on this one, showing us the HTML did the trick ;-)