Changeset 8698
- Timestamp:
- Oct 26, 2009, 6:34:53 PM (14 years ago)
- Location:
- trunk/trac/wiki
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/trac/wiki/formatter.py
r8697 r8698 747 747 self.open_table() 748 748 self.open_table_row() 749 colspan = len(match)/2 750 if colspan > 1: 751 td = '<td colspan="%d">' % int(colspan) 752 else: 753 td = '<td>' 749 754 if self.in_table_cell: 750 return '</td> <td>'755 return '</td>'+td 751 756 else: 752 757 self.in_table_cell = 1 753 return '<td>'758 return td 754 759 755 760 def open_table(self): -
trunk/trac/wiki/parser.py
r8697 r8698 112 112 # || table || 113 113 r"(?P<last_table_cell>\|\|\s*$)", 114 r"(?P<table_cell>!? \|\|)"]114 r"(?P<table_cell>!?(?:\|\|)+)"] 115 115 116 116 _processor_re = re.compile('#\!([\w+-][\w+-/]*)') -
trunk/trac/wiki/tests/wiki-tests.txt
r8697 r8698 1231 1231 || RPC# || parameter len || ..... parameter ..... || 1232 1232 ---- 1233 ============================== Simple Table with colspan 1234 in: 1235 || name |||| parameter info || 1236 || RPC# || parameter len || ..... parameter ..... || 1237 |||||| end || 1238 ---- 1239 ------------------------------ 1240 <p> 1241 in: 1242 </p> 1243 <table class="wiki"> 1244 <tr><td> name </td><td colspan="2"> parameter info 1245 </td></tr><tr><td> RPC# </td><td> parameter len </td><td> ..... parameter ..... 1246 </td></tr><tr><td colspan="3"> end 1247 </td></tr></table> 1248 <hr /> 1249 ------------------------------ 1250 in: 1251 || name |||| parameter info || 1252 || RPC# || parameter len || ..... parameter ..... || 1253 |||||| end || 1254 ---- 1233 1255 ============================== Indented tables, multiple columns 1234 1256 || a || b ||
Note:
See TracChangeset
for help on using the changeset viewer.