diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-02-14 22:29:21 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-02-16 16:55:20 -0800 |
| commit | 967e7f5fb990b29de48b37be1db40fb149a8cf55 (patch) | |
| tree | b9f903a5f2af14f20e769903e80659b9bffd59ff /test | |
| parent | b5b576184c3c1668aad0c904e186136b81a0dd54 (diff) | |
| download | pandoc-967e7f5fb990b29de48b37be1db40fb149a8cf55.tar.gz | |
Rename Text.Pandoc.XMLParser -> Text.Pandoc.XML.Light...
..and add new definitions isomorphic to xml-light's, but with
Text instead of String. This allows us to keep most of the code in
existing readers that use xml-light, but avoid lots of unnecessary
allocation.
We also add versions of the functions from xml-light's
Text.XML.Light.Output and Text.XML.Light.Proc that operate
on our modified XML types, and functions that convert
xml-light types to our types (since some of our dependencies,
like texmath, use xml-light).
Update golden tests for docx and pptx.
OOXML test: Use `showContent` instead of `ppContent` in `displayDiff`.
Docx: Do a manual traversal to unwrap sdt and smartTag.
This is faster, and needed to pass the tests.
Benchmarks:
A = prior to 8ca191604dcd13af27c11d2da225da646ebce6fc (Feb 8)
B = as of 8ca191604dcd13af27c11d2da225da646ebce6fc (Feb 8)
C = this commit
| Reader | A | B | C |
| ------- | ----- | ------ | ----- |
| docbook | 18 ms | 12 ms | 10 ms |
| opml | 65 ms | 62 ms | 35 ms |
| jats | 15 ms | 11 ms | 9 ms |
| docx | 72 ms | 69 ms | 44 ms |
| odt | 78 ms | 41 ms | 28 ms |
| epub | 64 ms | 61 ms | 56 ms |
| fb2 | 14 ms | 5 ms | 4 ms |
Diffstat (limited to 'test')
76 files changed, 2 insertions, 1 deletions
diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs index 376f02c55..c1e47622d 100644 --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -43,7 +43,8 @@ compareXMLBool _ _ = False displayDiff :: Content -> Content -> String displayDiff elemA elemB = - showDiff (1,1) $ getDiff (lines $ ppContent elemA) (lines $ ppContent elemB) + showDiff (1,1) + (getDiff (lines $ showContent elemA) (lines $ showContent elemB)) goldenArchive :: FilePath -> IO Archive goldenArchive fp = toArchive . BL.fromStrict <$> BS.readFile fp diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx Binary files differindex d3b16d0f2..ed7d1165c 100644 --- a/test/docx/golden/block_quotes.docx +++ b/test/docx/golden/block_quotes.docx diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx Binary files differindex 6293ef493..07ae75676 100644 --- a/test/docx/golden/codeblock.docx +++ b/test/docx/golden/codeblock.docx diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx Binary files differindex 4205a1516..e5f034378 100644 --- a/test/docx/golden/comments.docx +++ b/test/docx/golden/comments.docx diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx Binary files differindex adb3f23db..174942135 100644 --- a/test/docx/golden/custom_style_no_reference.docx +++ b/test/docx/golden/custom_style_no_reference.docx diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx Binary files differindex 92c8137fe..b5c31a851 100644 --- a/test/docx/golden/custom_style_preserve.docx +++ b/test/docx/golden/custom_style_preserve.docx diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx Binary files differindex f53470617..c42ca1b05 100644 --- a/test/docx/golden/custom_style_reference.docx +++ b/test/docx/golden/custom_style_reference.docx diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx Binary files differindex d6af90a72..1cb4c1fd7 100644 --- a/test/docx/golden/definition_list.docx +++ b/test/docx/golden/definition_list.docx diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx Binary files differindex e18dbe853..7122456ea 100644 --- a/test/docx/golden/document-properties-short-desc.docx +++ b/test/docx/golden/document-properties-short-desc.docx diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx Binary files differindex 820299043..616ba0f81 100644 --- a/test/docx/golden/document-properties.docx +++ b/test/docx/golden/document-properties.docx diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx Binary files differindex ae0f41d12..c30dcdee9 100644 --- a/test/docx/golden/headers.docx +++ b/test/docx/golden/headers.docx diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx Binary files differindex 94cd35dfa..8a704b41e 100644 --- a/test/docx/golden/image.docx +++ b/test/docx/golden/image.docx diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx Binary files differindex 879f2a25b..b1906c8c4 100644 --- a/test/docx/golden/inline_code.docx +++ b/test/docx/golden/inline_code.docx diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx Binary files differindex 93f86478f..8adf1cf75 100644 --- a/test/docx/golden/inline_formatting.docx +++ b/test/docx/golden/inline_formatting.docx diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx Binary files differindex 967d297f2..584117503 100644 --- a/test/docx/golden/inline_images.docx +++ b/test/docx/golden/inline_images.docx diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx Binary files differindex c5614e2fa..8859fe55c 100644 --- a/test/docx/golden/link_in_notes.docx +++ b/test/docx/golden/link_in_notes.docx diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx Binary files differindex 0f39a831f..b80f3b3ba 100644 --- a/test/docx/golden/links.docx +++ b/test/docx/golden/links.docx diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx Binary files differindex 07046f223..35beed68a 100644 --- a/test/docx/golden/lists.docx +++ b/test/docx/golden/lists.docx diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx Binary files differindex 3656618e6..2c29fd674 100644 --- a/test/docx/golden/lists_continuing.docx +++ b/test/docx/golden/lists_continuing.docx diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx Binary files differindex 8798253d5..10a948886 100644 --- a/test/docx/golden/lists_multiple_initial.docx +++ b/test/docx/golden/lists_multiple_initial.docx diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx Binary files differindex 0a24d1840..5b90e74a0 100644 --- a/test/docx/golden/lists_restarting.docx +++ b/test/docx/golden/lists_restarting.docx diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx Binary files differindex 52bb7a217..cc81b46d1 100644 --- a/test/docx/golden/nested_anchors_in_header.docx +++ b/test/docx/golden/nested_anchors_in_header.docx diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx Binary files differindex 182c06c64..1394dc442 100644 --- a/test/docx/golden/notes.docx +++ b/test/docx/golden/notes.docx diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx Binary files differindex 7b69a56a3..0d1688694 100644 --- a/test/docx/golden/raw-blocks.docx +++ b/test/docx/golden/raw-blocks.docx diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx Binary files differindex 3d3a35701..be1caef2d 100644 --- a/test/docx/golden/raw-bookmarks.docx +++ b/test/docx/golden/raw-bookmarks.docx diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx Binary files differindex 5ae37b406..a1d2323c2 100644 --- a/test/docx/golden/table_one_row.docx +++ b/test/docx/golden/table_one_row.docx diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx Binary files differindex c29aa6716..2f3a831a7 100644 --- a/test/docx/golden/table_with_list_cell.docx +++ b/test/docx/golden/table_with_list_cell.docx diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx Binary files differindex 664493246..af066107c 100644 --- a/test/docx/golden/tables.docx +++ b/test/docx/golden/tables.docx diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx Binary files differindex b6d15340e..9cc7a075f 100644 --- a/test/docx/golden/track_changes_deletion.docx +++ b/test/docx/golden/track_changes_deletion.docx diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx Binary files differindex f8e1092d2..f8b8dcfde 100644 --- a/test/docx/golden/track_changes_insertion.docx +++ b/test/docx/golden/track_changes_insertion.docx diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx Binary files differindex b4cda82f2..1c3baf0bf 100644 --- a/test/docx/golden/track_changes_move.docx +++ b/test/docx/golden/track_changes_move.docx diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx Binary files differindex ee222efa0..28686970d 100644 --- a/test/docx/golden/track_changes_scrubbed_metadata.docx +++ b/test/docx/golden/track_changes_scrubbed_metadata.docx diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx Binary files differindex c6f8d9c96..7051cefbd 100644 --- a/test/docx/golden/unicode.docx +++ b/test/docx/golden/unicode.docx diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx Binary files differindex ea8146690..9df631640 100644 --- a/test/docx/golden/verbatim_subsuper.docx +++ b/test/docx/golden/verbatim_subsuper.docx diff --git a/test/pptx/code-custom.pptx b/test/pptx/code-custom.pptx Binary files differindex 58070eb3f..5e9c2c630 100644 --- a/test/pptx/code-custom.pptx +++ b/test/pptx/code-custom.pptx diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/code-custom_templated.pptx Binary files differindex db9b7e371..15232c32d 100644 --- a/test/pptx/code-custom_templated.pptx +++ b/test/pptx/code-custom_templated.pptx diff --git a/test/pptx/code.pptx b/test/pptx/code.pptx Binary files differindex c7b1ed7d5..aab0cc6f5 100644 --- a/test/pptx/code.pptx +++ b/test/pptx/code.pptx diff --git a/test/pptx/code_templated.pptx b/test/pptx/code_templated.pptx Binary files differindex 6944d92bf..fe5b675f3 100644 --- a/test/pptx/code_templated.pptx +++ b/test/pptx/code_templated.pptx diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc.pptx Binary files differindex ae0d28429..de5e68151 100644 --- a/test/pptx/document-properties-short-desc.pptx +++ b/test/pptx/document-properties-short-desc.pptx diff --git a/test/pptx/document-properties-short-desc_templated.pptx b/test/pptx/document-properties-short-desc_templated.pptx Binary files differindex 37c74c69a..89e6fbdf2 100644 --- a/test/pptx/document-properties-short-desc_templated.pptx +++ b/test/pptx/document-properties-short-desc_templated.pptx diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties.pptx Binary files differindex 324e443a1..6bcbd1b9c 100644 --- a/test/pptx/document-properties.pptx +++ b/test/pptx/document-properties.pptx diff --git a/test/pptx/document-properties_templated.pptx b/test/pptx/document-properties_templated.pptx Binary files differindex c81b983e3..79d48560b 100644 --- a/test/pptx/document-properties_templated.pptx +++ b/test/pptx/document-properties_templated.pptx diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes.pptx Binary files differindex 30ce33db6..9d46036fe 100644 --- a/test/pptx/endnotes.pptx +++ b/test/pptx/endnotes.pptx diff --git a/test/pptx/endnotes_templated.pptx b/test/pptx/endnotes_templated.pptx Binary files differindex d6c604968..54ec7f305 100644 --- a/test/pptx/endnotes_templated.pptx +++ b/test/pptx/endnotes_templated.pptx diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes_toc.pptx Binary files differindex 000e17ecd..a028b346f 100644 --- a/test/pptx/endnotes_toc.pptx +++ b/test/pptx/endnotes_toc.pptx diff --git a/test/pptx/endnotes_toc_templated.pptx b/test/pptx/endnotes_toc_templated.pptx Binary files differindex fdcd2e29b..1158c16fc 100644 --- a/test/pptx/endnotes_toc_templated.pptx +++ b/test/pptx/endnotes_toc_templated.pptx diff --git a/test/pptx/images.pptx b/test/pptx/images.pptx Binary files differindex e73126376..670a825de 100644 --- a/test/pptx/images.pptx +++ b/test/pptx/images.pptx diff --git a/test/pptx/images_templated.pptx b/test/pptx/images_templated.pptx Binary files differindex e3f968e9e..6d297ef11 100644 --- a/test/pptx/images_templated.pptx +++ b/test/pptx/images_templated.pptx diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline_formatting.pptx Binary files differindex eadb9372e..473b9498d 100644 --- a/test/pptx/inline_formatting.pptx +++ b/test/pptx/inline_formatting.pptx diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline_formatting_templated.pptx Binary files differindex 8ca6bab2b..2cdf54474 100644 --- a/test/pptx/inline_formatting_templated.pptx +++ b/test/pptx/inline_formatting_templated.pptx diff --git a/test/pptx/lists.pptx b/test/pptx/lists.pptx Binary files differindex ae188ee68..ffc2eb9f7 100644 --- a/test/pptx/lists.pptx +++ b/test/pptx/lists.pptx diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists_templated.pptx Binary files differindex 60301fa50..676954cb8 100644 --- a/test/pptx/lists_templated.pptx +++ b/test/pptx/lists_templated.pptx diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw_ooxml.pptx Binary files differindex 17124a50d..29164af15 100644 --- a/test/pptx/raw_ooxml.pptx +++ b/test/pptx/raw_ooxml.pptx diff --git a/test/pptx/raw_ooxml_templated.pptx b/test/pptx/raw_ooxml_templated.pptx Binary files differindex 19ae7dd4e..1742b3296 100644 --- a/test/pptx/raw_ooxml_templated.pptx +++ b/test/pptx/raw_ooxml_templated.pptx diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/remove_empty_slides.pptx Binary files differindex b650b7585..c6df8e18e 100644 --- a/test/pptx/remove_empty_slides.pptx +++ b/test/pptx/remove_empty_slides.pptx diff --git a/test/pptx/remove_empty_slides_templated.pptx b/test/pptx/remove_empty_slides_templated.pptx Binary files differindex 0ab029614..cf6e52eef 100644 --- a/test/pptx/remove_empty_slides_templated.pptx +++ b/test/pptx/remove_empty_slides_templated.pptx diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide_breaks.pptx Binary files differindex 2a6e35080..e06d9079d 100644 --- a/test/pptx/slide_breaks.pptx +++ b/test/pptx/slide_breaks.pptx diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide_breaks_slide_level_1.pptx Binary files differindex a7bcf6a4b..449339778 100644 --- a/test/pptx/slide_breaks_slide_level_1.pptx +++ b/test/pptx/slide_breaks_slide_level_1.pptx diff --git a/test/pptx/slide_breaks_slide_level_1_templated.pptx b/test/pptx/slide_breaks_slide_level_1_templated.pptx Binary files differindex 21b018c25..258098082 100644 --- a/test/pptx/slide_breaks_slide_level_1_templated.pptx +++ b/test/pptx/slide_breaks_slide_level_1_templated.pptx diff --git a/test/pptx/slide_breaks_templated.pptx b/test/pptx/slide_breaks_templated.pptx Binary files differindex 4ec4772a4..2f0213919 100644 --- a/test/pptx/slide_breaks_templated.pptx +++ b/test/pptx/slide_breaks_templated.pptx diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide_breaks_toc.pptx Binary files differindex 5983657b6..9dbfa41a0 100644 --- a/test/pptx/slide_breaks_toc.pptx +++ b/test/pptx/slide_breaks_toc.pptx diff --git a/test/pptx/slide_breaks_toc_templated.pptx b/test/pptx/slide_breaks_toc_templated.pptx Binary files differindex dd54c7082..f288dde14 100644 --- a/test/pptx/slide_breaks_toc_templated.pptx +++ b/test/pptx/slide_breaks_toc_templated.pptx diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker_notes.pptx Binary files differindex b3e5ed5b9..0ab1302da 100644 --- a/test/pptx/speaker_notes.pptx +++ b/test/pptx/speaker_notes.pptx diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker_notes_after_metadata.pptx Binary files differindex 1078854bb..6343bffe4 100644 --- a/test/pptx/speaker_notes_after_metadata.pptx +++ b/test/pptx/speaker_notes_after_metadata.pptx diff --git a/test/pptx/speaker_notes_after_metadata_templated.pptx b/test/pptx/speaker_notes_after_metadata_templated.pptx Binary files differindex 5116c6c4e..5d4465f64 100644 --- a/test/pptx/speaker_notes_after_metadata_templated.pptx +++ b/test/pptx/speaker_notes_after_metadata_templated.pptx diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker_notes_afterheader.pptx Binary files differindex 0c8e49bd9..d581681aa 100644 --- a/test/pptx/speaker_notes_afterheader.pptx +++ b/test/pptx/speaker_notes_afterheader.pptx diff --git a/test/pptx/speaker_notes_afterheader_templated.pptx b/test/pptx/speaker_notes_afterheader_templated.pptx Binary files differindex 68695939d..c922df3a8 100644 --- a/test/pptx/speaker_notes_afterheader_templated.pptx +++ b/test/pptx/speaker_notes_afterheader_templated.pptx diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker_notes_afterseps.pptx Binary files differindex 7ed9b946d..13f564bf0 100644 --- a/test/pptx/speaker_notes_afterseps.pptx +++ b/test/pptx/speaker_notes_afterseps.pptx diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker_notes_afterseps_templated.pptx Binary files differindex 79fc82345..f0b302738 100644 --- a/test/pptx/speaker_notes_afterseps_templated.pptx +++ b/test/pptx/speaker_notes_afterseps_templated.pptx diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker_notes_templated.pptx Binary files differindex 9f943c279..2d8d00242 100644 --- a/test/pptx/speaker_notes_templated.pptx +++ b/test/pptx/speaker_notes_templated.pptx diff --git a/test/pptx/start_numbering_at.pptx b/test/pptx/start_numbering_at.pptx Binary files differindex ac72d8ced..4320128b3 100644 --- a/test/pptx/start_numbering_at.pptx +++ b/test/pptx/start_numbering_at.pptx diff --git a/test/pptx/start_numbering_at_templated.pptx b/test/pptx/start_numbering_at_templated.pptx Binary files differindex 15c7b5469..0a3f6e56d 100644 --- a/test/pptx/start_numbering_at_templated.pptx +++ b/test/pptx/start_numbering_at_templated.pptx diff --git a/test/pptx/tables.pptx b/test/pptx/tables.pptx Binary files differindex 926c5e699..e41219844 100644 --- a/test/pptx/tables.pptx +++ b/test/pptx/tables.pptx diff --git a/test/pptx/tables_templated.pptx b/test/pptx/tables_templated.pptx Binary files differindex a37e72d2c..82b8aa13d 100644 --- a/test/pptx/tables_templated.pptx +++ b/test/pptx/tables_templated.pptx diff --git a/test/pptx/two_column.pptx b/test/pptx/two_column.pptx Binary files differindex 7f86533fe..270a7eeac 100644 --- a/test/pptx/two_column.pptx +++ b/test/pptx/two_column.pptx diff --git a/test/pptx/two_column_templated.pptx b/test/pptx/two_column_templated.pptx Binary files differindex 89e3db0ab..44985d701 100644 --- a/test/pptx/two_column_templated.pptx +++ b/test/pptx/two_column_templated.pptx |