From 737905fb5e1cfcd096938efb2b83b3f92e3ca3b6 Mon Sep 17 00:00:00 2001 From: LarsDW223 Date: Wed, 11 May 2016 20:29:06 +0200 Subject: [PATCH] Fixed ODT export for style=table: - Count table columns for table_open() - Open and close table row before table heading Fixes #21. --- syntax.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/syntax.php b/syntax.php index b7b5d8b..8d4c2cf 100644 --- a/syntax.php +++ b/syntax.php @@ -369,9 +369,27 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin { function _render_table($result, $params, $pos, Doku_Renderer $renderer) { global $conf; - $renderer->table_open(NULL, NULL, $pos); + if (!$this->is_odt_export) { + $renderer->table_open(NULL, NULL, $pos); + } else { + $columns = 1; + if ($params['tableshowsize'] || $params['showsize']) { + $columns++; + } + if ($params['tableshowdate'] || $params['showdate']) { + $columns++; + } + if ($params['preview']) { + $columns++; + } + $renderer->table_open($columns, NULL, $pos); + } if ($params['tableheader']) { + if ($this->is_odt_export) { + $renderer->tablerow_open(); + } + $renderer->tableheader_open(); $renderer->doc .= $this->getLang('filename'); $renderer->tableheader_close(); @@ -403,6 +421,10 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin { } $renderer->tableheader_close(); } + + if ($this->is_odt_export) { + $renderer->tablerow_close(); + } } foreach ($result['files'] as $file) {