diff options
| author | hubertp-lshift <hubertp@lshift.de> | 2016-11-26 21:45:56 +0100 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-11-26 21:45:56 +0100 |
| commit | 015dead0bb2bb5cea06a0fa366fdd651c8e07889 (patch) | |
| tree | ab88036f84b91ddd4009f63a1bd4f9e52ffafae0 /tests | |
| parent | baa25362a40fe905368f60222ebd8a533bcfe0f9 (diff) | |
| download | pandoc-015dead0bb2bb5cea06a0fa366fdd651c8e07889.tar.gz | |
[odt] Infer table's caption from the paragraph (#3224)
ODT's reader always put empty captions for the parsed
tables. This commit
1) checks paragraphs that follow the table definition
2) treats specially a paragraph with a style named 'Table'
3) does some postprocessing of the paragraphs that combines
tables followed immediately by captions
The ODT writer used 'TableCaption' style name for the caption
paragraph. This commit follows the open office approach which
allows for appending captions to table but uses a built-in style
named 'Table' instead of 'TableCaption'. Any users of odt format
(both writer and reader) are therefore required to change the
style's name to 'Table', if necessary.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Tests/Readers/Odt.hs | 1 | ||||
| -rw-r--r-- | tests/odt/native/simpleTableWithCaption.native | 1 | ||||
| -rw-r--r-- | tests/odt/odt/simpleTableWithCaption.odt | bin | 0 -> 10396 bytes | |||
| -rw-r--r-- | tests/tables.opendocument | 10 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/Tests/Readers/Odt.hs b/tests/Tests/Readers/Odt.hs index d6ed48f8d..cd764dd62 100644 --- a/tests/Tests/Readers/Odt.hs +++ b/tests/Tests/Readers/Odt.hs @@ -157,6 +157,7 @@ namesOfTestsComparingToNative = [ "blockquote" , "referenceToListItem" , "referenceToText" , "simpleTable" + , "simpleTableWithCaption" -- , "table" , "unicode" , "unorderedList" diff --git a/tests/odt/native/simpleTableWithCaption.native b/tests/odt/native/simpleTableWithCaption.native new file mode 100644 index 000000000..18d68b772 --- /dev/null +++ b/tests/odt/native/simpleTableWithCaption.native @@ -0,0 +1 @@ +[Table [Str "Table",Space,Str "1:",Space,Str "Some",Space,Str "caption",Space,Str "for",Space,Str "a",Space,Str "table"] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "Content"]],[Plain [Str "More",Space,Str "content"]]]],Para []] diff --git a/tests/odt/odt/simpleTableWithCaption.odt b/tests/odt/odt/simpleTableWithCaption.odt Binary files differnew file mode 100644 index 000000000..ec6fac894 --- /dev/null +++ b/tests/odt/odt/simpleTableWithCaption.odt diff --git a/tests/tables.opendocument b/tests/tables.opendocument index aa35abc91..0765bb783 100644 --- a/tests/tables.opendocument +++ b/tests/tables.opendocument @@ -63,8 +63,7 @@ </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="TableCaption">Demonstration of simple table -syntax.</text:p> +<text:p text:style-name="Table">Demonstration of simple table syntax.</text:p> <text:p text:style-name="First_20_paragraph">Simple table without caption:</text:p> <table:table table:name="Table2" table:style-name="Table2"> @@ -197,8 +196,7 @@ spaces:</text:p> </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="TableCaption">Demonstration of simple table -syntax.</text:p> +<text:p text:style-name="Table">Demonstration of simple table syntax.</text:p> <text:p text:style-name="First_20_paragraph">Multiline table with caption:</text:p> <table:table table:name="Table4" table:style-name="Table4"> @@ -253,8 +251,8 @@ caption:</text:p> </table:table-cell> </table:table-row> </table:table> -<text:p text:style-name="TableCaption">Here's the caption. It may span -multiple lines.</text:p> +<text:p text:style-name="Table">Here's the caption. It may span multiple +lines.</text:p> <text:p text:style-name="First_20_paragraph">Multiline table without caption:</text:p> <table:table table:name="Table5" table:style-name="Table5"> |