Changeset 132

Timestamp:

06/21/2006 06:24:34 AM (3 years ago)

Author:

DarTar

Message:

formatters/wakka.php - Adding thead/tbody/tfoot support to table formatter and relative stylesheet selectors. Credits: Tormod Haugen - #230

Location:

trunk

Files:

• css/wikka.css (modified) (2 diffs)
• formatters/wakka.php (modified) (3 diffs)

trunk/css/wikka.css

@@ -447 +447 @@
 }
 
-table.wikka caption{
-        border: 1px dotted #BBB;
-        font-size: 90%;
+table.wikka caption {
+        border: 1px solid #CCC;
+        font-size: 95%;
         color: #666;
         margin:5px 0;
@@ -455 +455 @@
 }
 
+table.wikka thead {
+        background-color: #DDD;
+}
+
+table.wikka tfoot {
+        background-color: #DDD;
+}
+
 table.wikka th {
         border: 1px solid #CCC;
         padding: .1em .25em;
+}
+
+table.wikka thead th {
+        background-color: #DDD;
+}
+
+table.wikka tfoot th {
+        background-color: #DDD;
+}
+
+table.wikka tbody th {
+        background-color: #EEE;
+}
+
+table.wikka tbody tr:hover {
         background-color: #EEE;
 }

trunk/formatters/wakka.php

@@ -46 +46 @@
                 static $br = 1;
                 static $trigger_table = 0;
+                static $trigger_rowgroup = 0;
                 static $trigger_bold = 0;
                 static $trigger_italic = 0;
@@ -70 +71 @@
                         if (2 < $trigger_table) echo ('</th></tr>');
                         else if (1 < $trigger_table) echo ('</td></tr>');
+                        if (2 < $trigger_rowgroup) echo ('</tbody>');
+                        else if (1 < $trigger_rowgroup) echo ('</tfoot>');
+                        else if (0 < $trigger_rowgroup) echo ('</thead>');
                         if (0 < $trigger_table) echo ('</table>');
                         if ($trigger_strike % 2) echo ('</span>');
@@ -87 +91 @@
                         return;
                 }
-                if ( preg_match("/^\|(\?)(.*?)?\|(\n)?$/", $thing, $matches) ) {
-                        if ( $trigger_table == 0 ) {
+
+                if ( preg_match("/^\|(\?)(.*?)\|\n$/", $thing, $matches) )
+                {
+                        if ( $trigger_table == 0 )
+                        {
                                 $trigger_table = 1;
-                                //TODO escape text for safety
                                 return '<table class="wikka" summary="'.$matches[2].'">'."\n";
                         }
                 }
                 // table. trigger means: 0==no table, 1==in table no cell, 2==in table data cell, 3==in table header cell
-                else if ( preg_match("/^\|(=|!)?(c|r)?(\d*)?(?:,)?(\d*)?\|(\n)?$/", $thing, $matches) ) {
-                        //First catch is header|caption|summary, second is colspan, third is rowspan, fourth is linebreak.
-                        if ( $trigger_table == 4 ) {
+                else if ( preg_match("/^\|(=|!|#)?(c|r|h|f|b)?(\d*)?(?:,)?(\d*)?\|(\n)?$/", $thing, $matches) )
+                {
+                        //Set up the two variables that will aggregate the html markup
+                        $close_part = '';
+                        $open_part  = '';
+                        //First catch is header|caption|rowgroup, second is attribute, third is colspan, fourth is rowspan, fifth is linebreak.
+                        if ( $trigger_table == 4 )
+                        {
                                 $trigger_table = 1;
                                 return '</caption>'."\n"; //Can return here, it is closed.
                         }
-                        else if ( $trigger_table == 3 ) $close_part = '</th>';
-                        else if ( $trigger_table == 2 ) $close_part = '</td>';
-                        else if ( $trigger_table == 1 ) $close_part = '';
-                        else $close_part = '<table class="wikka">'."\n";
+                        else if ( $trigger_table == 3 )
+                        {
+                                $close_part = '</th>';
+                        }
+                        else if ( $trigger_table == 2 )
+                        {
+                                $close_part = '</td>';
+                        }
+                        else if ( $trigger_table == 1 )
+                        {
+                                $close_part = '';
+                        }
+                        else
+                        {
+                                //This is actually opening the table (i.e. nothing at all to close).
+                                $close_part = '<table class="wikka">'."\n";
+                        }
                         
-                        if ( $trigger_table > 1 && $matches[5] == "\n" ) {
+                        if ( $trigger_table > 1 && $matches[5] == "\n" )
+                        {
                                 $trigger_table = 1;
                                 return $close_part .= '</tr>'."\n"; //Can return here, it is closed-
                         }
 
-                        if ( $matches[1] == '!' ) {
+                        if ( $matches[1] == '!' )
+                        {
                                 $trigger_table = 4;
                                 $open_part = '<caption>';
-                        } else {
-                                if ( $trigger_table == 1 ) $open_part = '<tr>';
-                                else $open_part = '';
-
-                                if ( $matches[1] == '=' ) {
+                        }
+                        else if ( $matches[1] == '#' )
+                        {
+                                //If we're here, we want to close any open rowgroup.
+                                if (2 < $trigger_rowgroup)
+                                {
+                                        $close_part .= '</tbody>'."\n";
+                                }
+                                else if (1 < $trigger_rowgroup)
+                                {
+                                        $close_part .= '</tfoot>'."\n";
+                                }
+                                else if (0 < $trigger_rowgroup)
+                                {
+                                        $close_part .= '</thead>'."\n";
+                                }
+
+                                if ($matches[2] && ($matches[2] == 'h' || $matches[2] == 'f') )
+                                {
+                                        //thead or tfoot
+                                        if ($matches[2] == 'h')
+                                        {
+                                                $open_part .= '<thead>'."\n";
+                                                $trigger_rowgroup = 1;
+                                        }
+                                        else if ($matches[2] == 'f')
+                                        {
+                                                $open_part .= '<tfoot>'."\n";
+                                                $trigger_rowgroup = 2;
+                                        }
+                                }
+                                else
+                                {
+                                        //tbody
+                                        $open_part .= '<tbody>'."\n";
+                                        $trigger_rowgroup = 3;
+                                }
+                        }
+                        else
+                        {
+                                $open_part = '';
+                                if ($trigger_rowgroup == 0)
+                                {
+                                        $open_part .= '<tbody>'."\n";
+                                        $trigger_rowgroup = 3;
+                                }
+
+                                if ( $trigger_table == 1 )
+                                {
+                                        $open_part .= '<tr>';
+                                }
+
+                                if ( $matches[1] == '=' )
+                                {
                                         $trigger_table = 3;
                                         $open_part .= '<th';
-                                        if ( $matches[2] ) {
-                                                if ( $matches[2] == 'c' ) $open_part .= ' scope="col"';
-                                                else if ( $matches[2] == 'r' ) $open_part .= ' scope="row"';
+                                        if ( $matches[2] )
+                                        {
+                                                if ( $matches[2] == 'c' )
+                                                {
+                                                        $open_part .= ' scope="col"';
+                                                }
+                                                else if ( $matches[2] == 'r' )
+                                                {
+                                                        $open_part .= ' scope="row"';
                                         }
-                                } else {
+                                        }
+                                }
+                                else
+                                {
                                         $trigger_table = 2;
                                         $open_part .= '<td';
                                 }
                                 
-                                if ( $matches[3] && $matches[3] > 1 ) $open_part .= ' colspan="'.$matches[3].'"';
-                                if ( $matches[4] && $matches[4] > 1 ) $open_part .= ' rowspan="'.$matches[4].'"';
-
+                                if ( $matches[3] && $matches[3] > 1 )
+                                {
+                                        $open_part .= ' colspan="'.$matches[3].'"';
+                                }
+
+                                if ( $matches[4] && $matches[4] > 1 )
+                                {
+                                        $open_part .= ' rowspan="'.$matches[4].'"';
+                                }
                                 $open_part .= '>';
                         }
-
                         return $close_part . $open_part;
+                }
+                else if ( $trigger_table == 1 )
+                {
+                        //Are in table, no cell - but not asked to open new: please close and parse again. ;)
+                        $close_part = '';
+                        if (2 < $trigger_rowgroup)
+                        {
+                                $close_part .= '</tbody>'."\n";
+                        }
+                        else if (1 < $trigger_rowgroup)
+                        {
+                                $close_part .= '</tfoot>'."\n";
+                        }
+                        else if (0 < $trigger_rowgroup)
+                        {
+                                $close_part .= '</thead>'."\n";
+                        }
                         
-                } else if ( $trigger_table == 1 ) {
-                        //Are in table, no cell - but not asked to open new: please close and parse again. ;)
-                        $trigger_table = 0;
-                        return "</table>\n".wakka2callback($things);
+                        $close_part .= '</table>'."\n";
+                        
+                        $trigger_table = $trigger_rowgroup = 0;
+                        
+                        return $close_part.wakka2callback($things);
                 }
                 // convert HTML thingies