rowspan with ::: implemented in parser/handler

darcs-hash:20091103161002-9a5f4-2114938a7e62a924b9fe424b63584a4747286563.gz

1 files changed, 100 insertions, 52 deletions

diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 5b8b363f8..f84923dfd 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -21,24 +21,24 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -61,24 +61,24 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -130,13 +130,13 @@ def');
             array('p_close',array()),
             array('table_open',array(3,1)),
             array('tablerow_open',array()),
-            array('tableheader_open',array(1,NULL)),
+            array('tableheader_open',array(1,NULL,1)),
             array('cdata',array(' X ')),
             array('tableheader_close',array()),
-            array('tablecell_open',array(1,NULL)),
+            array('tablecell_open',array(1,NULL,1)),
             array('cdata',array(' Y ')),
             array('tablecell_close',array()),
-            array('tableheader_open',array(1,NULL)),
+            array('tableheader_open',array(1,NULL,1)),
             array('cdata',array(' Z ')),
             array('tableheader_close',array()),
             array('tablerow_close',array()),
@@ -165,13 +165,13 @@ def');
             array('p_close',array()),
             array('table_open',array(3,1)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'right')),
+            array('tablecell_open',array(1,'right',1)),
             array('cdata',array('  X ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Y  ')),
             array('tablecell_close',array()),
-            array('tableheader_open',array(1,'center')),
+            array('tableheader_open',array(1,'center',1)),
             array('cdata',array('  Z  ')),
             array('tableheader_close',array()),
             array('tablerow_close',array()),
@@ -201,18 +201,18 @@ def');
             array('p_close',array()),
             array('table_open',array(3,3)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(2,'right')),
+            array('tablecell_open',array(2,'right',1)),
             array('cdata',array('  d ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,NULL)),
+            array('tablecell_open',array(1,NULL,1)),
             array('cdata',array(' e ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,NULL)),
+            array('tablecell_open',array(1,NULL,1)),
             array('cdata',array(' f ')),
             array('tablecell_close',array()),
-            array('tableheader_open',array(2,NULL)),
+            array('tableheader_open',array(2,NULL,1)),
             array('cdata',array(' ')),
             array('tableheader_close',array()),
             array('tablerow_close',array()),
@@ -227,6 +227,54 @@ def');
         $this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
     }
     
+    function testCellRowSpan() {
+        $this->P->addMode('table',new Doku_Parser_Mode_Table());
+        $this->P->parse('
+abc
+| a |  c:::||
+|:::^ d  | e|
+|b  ^  ::: |:::f|
+def');
+        
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('cdata',array("\n\nabc")),
+            array('p_close',array()),
+            array('table_open',array(3,3)),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,NULL,2)),
+            array('cdata',array(' a ')),
+            array('tablecell_close',array()),
+            array('tablecell_open',array(2,'right',1)),
+            array('cdata',array('  c:::')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tableheader_open',array(1,'left',2)),
+            array('cdata',array(' d  ')),
+            array('tableheader_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' e')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,'left',1)),
+            array('cdata',array('b  ')),
+            array('tablecell_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(':::f')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('table_close',array()),
+            array('p_open',array()),
+            array('cdata',array('def'."\n")),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEqual(array_map('stripbyteindex',$this->H->calls),$calls);
+    }
+    
     function testCellAlignmentFormatting() {
         $this->P->addMode('table',new Doku_Parser_Mode_Table());
         $this->P->addMode('strong',new Doku_Parser_Mode_Formatting('strong'));
@@ -242,17 +290,17 @@ def');
             array('p_close',array()),
             array('table_open',array(3,1)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'right')),
+            array('tablecell_open',array(1,'right',1)),
             array('cdata',array('  ')),
             array('strong_open',array()),
             array('cdata',array('X')),
             array('strong_close',array()),
             array('cdata',array(' ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Y  ')),
             array('tablecell_close',array()),
-            array('tableheader_open',array(1,'center')),
+            array('tableheader_open',array(1,'center',1)),
             array('cdata',array('  Z  ')),
             array('tableheader_close',array()),
             array('tablerow_close',array()),
@@ -282,24 +330,24 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -329,14 +377,14 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('strong_open',array()),
             array('cdata',array('Row 0 Col 1')),
             array('strong_close',array()),
             array('cdata',array('    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('strong_open',array()),
             array('cdata',array('Row 0 Col 2     | Row 0 Col 3')),
@@ -345,13 +393,13 @@ def');
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -381,25 +429,25 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('unformatted',array('Row 0 Col 1')),
             array('cdata',array('    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('unformatted',array('Row 0 Col 2     | Row 0 Col 3')),
             array('cdata',array('        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -427,26 +475,26 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0')),
             array('linebreak',array()),
             array('cdata',array('Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 0 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),
@@ -477,7 +525,7 @@ def');
             array('p_close',array()),
             array('table_open',array(3,2)),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('nest', array ( array (
               array('footnote_open',array()),
@@ -486,7 +534,7 @@ def');
             ))),
             array('cdata',array('    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' ')),
             array('nest', array ( array (
               array('footnote_open',array()),
@@ -497,13 +545,13 @@ def');
             array('tablecell_close',array()),
             array('tablerow_close',array()),
             array('tablerow_open',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 1    ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 2     ')),
             array('tablecell_close',array()),
-            array('tablecell_open',array(1,'left')),
+            array('tablecell_open',array(1,'left',1)),
             array('cdata',array(' Row 1 Col 3        ')),
             array('tablecell_close',array()),
             array('tablerow_close',array()),