Ticket #3347: 3347_TableHeaders.diff

trac/htdocs/css/trac.css

@@ -346 +346 @@
  border-collapse: collapse;
  border-spacing: 0;
 }
-table.wiki td { border: 1px solid #ccc;  padding: .1em .25em; }
+table.wiki th { color: #fff; background-color: #000 }
+table.wiki td, table.wiki th { border: 1px solid #ccc;  padding: .1em .25em; }
 
 .wikitoolbar {
  border: solid #d7d7d7;

trac/wiki/parser.py

@@ -105 +105 @@
         r"(?P<indent>^(?P<idepth>\s+)(?=\S))",
         # || table ||
         r"(?P<last_table_cell>\|\|\s*$)",
+        r"(?P<table_header>\|\|\|)",
         r"(?P<table_cell>\|\|)"]
 
     _processor_re = re.compile('#\!([\w+-][\w+-/]*)')

trac/wiki/formatter.py

@@ -689 +689 @@
     def _last_table_cell_formatter(self, match, fullmatch):
         return ''
 
+    def close_table_cell_or_header(self):
+        if self.in_table_header: self.out.write('</th>')
+        elif self.in_table_cell: self.out.write('</td>')
+        self.in_table_cell = self.in_table_header = 0
+
+    def open_table_cell_or_header(self):
+         self.close_table_cell_or_header()
+         self.open_table()
+         self.open_table_row()
+
+    def _table_header_formatter(self, match, fullmatch):
+         self.open_table_cell_or_header()
+         self.in_table_header = 1
+         return '<th>'
+
     def _table_cell_formatter(self, match, fullmatch):
-        self.open_table()
-        self.open_table_row()
-        if self.in_table_cell:
-            return '</td><td>'
-        else:
-            self.in_table_cell = 1
-            return '<td>'
+         self.open_table_cell_or_header()
+         self.in_table_cell = 1
+         return '<td>'
 
     def open_table(self):
         if not self.in_table:
@@ -715 +726 @@
     def close_table_row(self):
         if self.in_table_row:
             self.in_table_row = 0
-            if self.in_table_cell:
-                self.in_table_cell = 0
-                self.out.write('</td>')
-
+            self.close_table_cell_or_header()
             self.out.write('</tr>')
 
     def close_table(self):
@@ -823 +831 @@
         self.in_def_list = 0
         self.in_table_row = 0
         self.in_table_cell = 0
+        self.in_table_header = 0
         self.paragraph_open = 0
 
     def format(self, text, out=None, escape_newlines=False):