summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_test/cases/inc/parser/parser_footnote.test.php2
-rw-r--r--_test/cases/inc/parser/parser_i18n.test.php3
-rw-r--r--_test/cases/inc/parser/parser_table.test.php32
-rw-r--r--inc/parser/handler.php2
4 files changed, 19 insertions, 20 deletions
diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index 2b00a0b2e..08d199182 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -282,7 +282,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(8, 123)),
array('cdata',array(' ')),
array('footnote_close',array()),
))),
diff --git a/_test/cases/inc/parser/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index 8d587fe0e..e97a0cf51 100644
--- a/_test/cases/inc/parser/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
@@ -110,13 +110,12 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 153)),
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);
}
diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index f84923dfd..981f85217 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -42,7 +42,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 121)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -82,7 +82,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 121)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -106,13 +106,13 @@ def');
array('table_open',array(0,1)),
array('tablerow_open',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 7)),
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);
}
@@ -140,13 +140,13 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 19)),
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);
}
@@ -175,13 +175,13 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 23)),
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);
}
@@ -218,7 +218,7 @@ def');
array('tablerow_close',array()),
array('tablerow_open',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 31)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -266,7 +266,7 @@ def');
array('cdata',array(':::f')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 51)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -304,7 +304,7 @@ def');
array('cdata',array(' Z ')),
array('tableheader_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 27)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -351,7 +351,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 121)),
array('p_open',array()),
array('cdata',array('def'.DOKU_PARSER_EOL)),
array('p_close',array()),
@@ -403,7 +403,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 129)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -451,7 +451,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 155)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -498,7 +498,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 123)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
@@ -555,7 +555,7 @@ def');
array('cdata',array(' Row 1 Col 3 ')),
array('tablecell_close',array()),
array('tablerow_close',array()),
- array('table_close',array()),
+ array('table_close',array(6, 129)),
array('p_open',array()),
array('cdata',array('def'."\n")),
array('p_close',array()),
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index ea5a69b35..141cbcaf0 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1205,7 +1205,7 @@ class Doku_Handler_Table {
$this->tableCell($call);
break;
case 'table_end':
- $this->tableRowClose(array('tablerow_close',$call[1],$call[2]));
+ $this->tableRowClose(array('tablerow_close', array()));
$this->tableEnd($call);
break;
default: