From 25b97867c7d50ea2cbce4db0662c278b135db5a6 Mon Sep 17 00:00:00 2001
From: "hakan.sandell" <hakan.sandell@mydata.se>
Date: Tue, 3 Nov 2009 17:10:02 +0100
Subject: rowspan with ::: implemented in parser/handler

darcs-hash:20091103161002-9a5f4-2114938a7e62a924b9fe424b63584a4747286563.gz
---
 inc/parser/xhtml.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'inc/parser/xhtml.php')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index e68df6709..d2669a39c 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -948,7 +948,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= DOKU_LF . DOKU_TAB . '</tr>' . DOKU_LF;
     }
 
-    function tableheader_open($colspan = 1, $align = NULL){
+    function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){
         $class = 'class="col' . $this->_counter['cell_counter']++;
         if ( !is_null($align) ) {
             $class .= ' '.$align.'align';
@@ -959,6 +959,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $this->_counter['cell_counter'] += $colspan-1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
         $this->doc .= '>';
     }
 
@@ -966,7 +969,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= '</th>';
     }
 
-    function tablecell_open($colspan = 1, $align = NULL){
+    function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){
         $class = 'class="col' . $this->_counter['cell_counter']++;
         if ( !is_null($align) ) {
             $class .= ' '.$align.'align';
@@ -977,6 +980,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $this->_counter['cell_counter'] += $colspan-1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
         $this->doc .= '>';
     }
 
-- 
cgit v1.2.3