From ab5c701343744b89e329184890774256d0081447 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Fri, 5 Apr 2019 07:49:27 -0400 Subject: PowerPoint writer: expand builtin reference doc to model all layouts The previous built-in reference doc had only title and content layouts. Add in a section-header slide and a two-content slide, so users can more easily modify it to build their own templates. Golden files needed to be regenerated. Checked on MS PowerPoint 2013. --- data/pptx/[Content_Types].xml | 2 +- data/pptx/docProps/app.xml | 2 +- data/pptx/docProps/core.xml | 2 +- data/pptx/ppt/_rels/presentation.xml.rels | 2 +- data/pptx/ppt/notesMasters/notesMaster1.xml | 2 +- data/pptx/ppt/presentation.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout1.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout10.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout11.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout2.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout3.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout4.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout5.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout6.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout7.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout8.xml | 2 +- data/pptx/ppt/slideLayouts/slideLayout9.xml | 2 +- data/pptx/ppt/slideMasters/slideMaster1.xml | 2 +- data/pptx/ppt/slides/_rels/slide3.xml.rels | 2 ++ data/pptx/ppt/slides/_rels/slide4.xml.rels | 2 ++ data/pptx/ppt/slides/slide1.xml | 2 +- data/pptx/ppt/slides/slide3.xml | 2 ++ data/pptx/ppt/slides/slide4.xml | 2 ++ data/pptx/ppt/viewProps.xml | 2 +- src/Text/Pandoc/Class.hs | 4 ++++ test/pptx/document-properties-short-desc.pptx | Bin 26986 -> 27012 bytes test/pptx/document-properties.pptx | Bin 27391 -> 27417 bytes test/pptx/endnotes.pptx | Bin 26944 -> 26969 bytes test/pptx/endnotes_toc.pptx | Bin 27868 -> 27892 bytes test/pptx/images.pptx | Bin 44602 -> 44626 bytes test/pptx/inline_formatting.pptx | Bin 26142 -> 26166 bytes test/pptx/lists.pptx | Bin 27032 -> 27056 bytes test/pptx/raw_ooxml.pptx | Bin 26922 -> 26948 bytes test/pptx/remove_empty_slides.pptx | Bin 44048 -> 44073 bytes test/pptx/slide_breaks.pptx | Bin 28557 -> 28582 bytes test/pptx/slide_breaks_slide_level_1.pptx | Bin 27728 -> 27751 bytes test/pptx/slide_breaks_toc.pptx | Bin 29514 -> 29539 bytes test/pptx/speaker_notes.pptx | Bin 35420 -> 35444 bytes test/pptx/speaker_notes_after_metadata.pptx | Bin 31660 -> 31683 bytes .../speaker_notes_after_metadata_templated.pptx | Bin 398965 -> 398964 bytes test/pptx/speaker_notes_afterheader.pptx | Bin 30676 -> 30700 bytes test/pptx/speaker_notes_afterheader_templated.pptx | Bin 397989 -> 397988 bytes test/pptx/speaker_notes_afterseps.pptx | Bin 51588 -> 51612 bytes test/pptx/speaker_notes_afterseps_templated.pptx | Bin 418904 -> 418903 bytes test/pptx/speaker_notes_templated.pptx | Bin 402737 -> 402736 bytes test/pptx/tables.pptx | Bin 27549 -> 27573 bytes test/pptx/two_column.pptx | Bin 26050 -> 26075 bytes 47 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 data/pptx/ppt/slides/_rels/slide3.xml.rels create mode 100644 data/pptx/ppt/slides/_rels/slide4.xml.rels create mode 100644 data/pptx/ppt/slides/slide3.xml create mode 100644 data/pptx/ppt/slides/slide4.xml diff --git a/data/pptx/[Content_Types].xml b/data/pptx/[Content_Types].xml index 8a33c28c1..282ab2073 100644 --- a/data/pptx/[Content_Types].xml +++ b/data/pptx/[Content_Types].xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/pptx/docProps/app.xml b/data/pptx/docProps/app.xml index e052fdfaf..01884ea18 100644 --- a/data/pptx/docProps/app.xml +++ b/data/pptx/docProps/app.xml @@ -1,2 +1,2 @@ -126Microsoft Office PowerPointOn-screen Show (4:3)102200falseFonts Used2Theme1Slide Titles2ArialCalibriOffice ThemeTitleSlide Titlefalsefalsefalse15.0000 \ No newline at end of file +249Microsoft Office PowerPointOn-screen Show (4:3)154200falseFonts Used2Theme1Slide Titles4ArialCalibriOffice ThemePresentation TitleSlide TitleSection headerSlide Title for Two-Contentfalsefalsefalse15.0000 \ No newline at end of file diff --git a/data/pptx/docProps/core.xml b/data/pptx/docProps/core.xml index f7a0a8ace..ddeeda513 100644 --- a/data/pptx/docProps/core.xml +++ b/data/pptx/docProps/core.xml @@ -1,2 +1,2 @@ -TitleJesse RosenthalKSAS-IT32017-06-05T14:10:58Z2018-02-17T16:21:08Z \ No newline at end of file +TitleJesse RosenthalJesse Rosenthal42017-06-05T14:10:58Z2019-04-05T11:11:56Z \ No newline at end of file diff --git a/data/pptx/ppt/_rels/presentation.xml.rels b/data/pptx/ppt/_rels/presentation.xml.rels index 4c297d869..53eecc2bd 100644 --- a/data/pptx/ppt/_rels/presentation.xml.rels +++ b/data/pptx/ppt/_rels/presentation.xml.rels @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/pptx/ppt/notesMasters/notesMaster1.xml b/data/pptx/ppt/notesMasters/notesMaster1.xml index 9b72dd7a3..371f78049 100644 --- a/data/pptx/ppt/notesMasters/notesMaster1.xml +++ b/data/pptx/ppt/notesMasters/notesMaster1.xml @@ -1,2 +1,2 @@ -2/17/2018Click to edit Master text stylesSecond levelThird levelFourth levelFifth level‹#› \ No newline at end of file +4/5/2019Click to edit Master text stylesSecond levelThird levelFourth levelFifth level‹#› \ No newline at end of file diff --git a/data/pptx/ppt/presentation.xml b/data/pptx/ppt/presentation.xml index a07ea53e5..5c2199616 100644 --- a/data/pptx/ppt/presentation.xml +++ b/data/pptx/ppt/presentation.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout1.xml b/data/pptx/ppt/slideLayouts/slideLayout1.xml index c70a75bf9..62e6a1d1f 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout1.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout1.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master subtitle style2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master subtitle style4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout10.xml b/data/pptx/ppt/slideLayouts/slideLayout10.xml index e07b6ec38..26078e130 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout10.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout10.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout11.xml b/data/pptx/ppt/slideLayouts/slideLayout11.xml index aa98083cd..0c7ff9683 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout11.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout11.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout2.xml b/data/pptx/ppt/slideLayouts/slideLayout2.xml index b44d10c54..c56cb4794 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout2.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout2.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout3.xml b/data/pptx/ppt/slideLayouts/slideLayout3.xml index f8b39fc3d..e00c16204 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout3.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout3.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text styles2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text styles4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout4.xml b/data/pptx/ppt/slideLayouts/slideLayout4.xml index e2179e2fa..5281677f8 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout4.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout4.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout5.xml b/data/pptx/ppt/slideLayouts/slideLayout5.xml index 118704803..89311b044 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout5.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout5.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout6.xml b/data/pptx/ppt/slideLayouts/slideLayout6.xml index 3edced81e..a1fc4fb41 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout6.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout6.xml @@ -1,2 +1,2 @@ -Click to edit Master title style2/17/2018‹#› \ No newline at end of file +Click to edit Master title style4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout7.xml b/data/pptx/ppt/slideLayouts/slideLayout7.xml index b4d3bc475..e0ff5033a 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout7.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout7.xml @@ -1,2 +1,2 @@ -2/17/2018‹#› \ No newline at end of file +4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout8.xml b/data/pptx/ppt/slideLayouts/slideLayout8.xml index 7a8457653..51c85eeb4 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout8.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout8.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text styles2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text styles4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideLayouts/slideLayout9.xml b/data/pptx/ppt/slideLayouts/slideLayout9.xml index 34a172ae3..f46d3277a 100644 --- a/data/pptx/ppt/slideLayouts/slideLayout9.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout9.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text styles2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text styles4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slideMasters/slideMaster1.xml b/data/pptx/ppt/slideMasters/slideMaster1.xml index 1eb3595f6..69f0af019 100644 --- a/data/pptx/ppt/slideMasters/slideMaster1.xml +++ b/data/pptx/ppt/slideMasters/slideMaster1.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level2/17/2018‹#› \ No newline at end of file +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level4/5/2019‹#› \ No newline at end of file diff --git a/data/pptx/ppt/slides/_rels/slide3.xml.rels b/data/pptx/ppt/slides/_rels/slide3.xml.rels new file mode 100644 index 000000000..1067c1d2f --- /dev/null +++ b/data/pptx/ppt/slides/_rels/slide3.xml.rels @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/pptx/ppt/slides/_rels/slide4.xml.rels b/data/pptx/ppt/slides/_rels/slide4.xml.rels new file mode 100644 index 000000000..c5401b56b --- /dev/null +++ b/data/pptx/ppt/slides/_rels/slide4.xml.rels @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/data/pptx/ppt/slides/slide1.xml b/data/pptx/ppt/slides/slide1.xml index 2d1863312..1fb86efd3 100644 --- a/data/pptx/ppt/slides/slide1.xml +++ b/data/pptx/ppt/slides/slide1.xml @@ -1,2 +1,2 @@ -TitleSubtitle \ No newline at end of file +Presentation TitlePresentation Subtitle \ No newline at end of file diff --git a/data/pptx/ppt/slides/slide3.xml b/data/pptx/ppt/slides/slide3.xml new file mode 100644 index 000000000..8e0a09800 --- /dev/null +++ b/data/pptx/ppt/slides/slide3.xml @@ -0,0 +1,2 @@ + +Section headerSome explanatory text \ No newline at end of file diff --git a/data/pptx/ppt/slides/slide4.xml b/data/pptx/ppt/slides/slide4.xml new file mode 100644 index 000000000..118db30ee --- /dev/null +++ b/data/pptx/ppt/slides/slide4.xml @@ -0,0 +1,2 @@ + +Slide Title for Two-ContentSome content on the left.Some content on the right. \ No newline at end of file diff --git a/data/pptx/ppt/viewProps.xml b/data/pptx/ppt/viewProps.xml index 932dcd50d..ac9343474 100644 --- a/data/pptx/ppt/viewProps.xml +++ b/data/pptx/ppt/viewProps.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs index 1a2b00b26..fb3cfa72a 100644 --- a/src/Text/Pandoc/Class.hs +++ b/src/Text/Pandoc/Class.hs @@ -703,6 +703,10 @@ getDefaultReferencePptx = do , "ppt/slides/slide1.xml" , "ppt/slides/_rels/slide2.xml.rels" , "ppt/slides/slide2.xml" + , "ppt/slides/_rels/slide3.xml.rels" + , "ppt/slides/slide3.xml" + , "ppt/slides/_rels/slide4.xml.rels" + , "ppt/slides/slide4.xml" , "ppt/tableStyles.xml" , "ppt/theme/theme1.xml" , "ppt/viewProps.xml" diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc.pptx index 036d899aa..961c31020 100644 Binary files a/test/pptx/document-properties-short-desc.pptx and b/test/pptx/document-properties-short-desc.pptx differ diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties.pptx index 9d6097c5e..188e8d826 100644 Binary files a/test/pptx/document-properties.pptx and b/test/pptx/document-properties.pptx differ diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes.pptx index 45b217aa7..e230420d2 100644 Binary files a/test/pptx/endnotes.pptx and b/test/pptx/endnotes.pptx differ diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes_toc.pptx index b69a17fff..cdf1be4ad 100644 Binary files a/test/pptx/endnotes_toc.pptx and b/test/pptx/endnotes_toc.pptx differ diff --git a/test/pptx/images.pptx b/test/pptx/images.pptx index 1462bc0c9..4a13b5b7f 100644 Binary files a/test/pptx/images.pptx and b/test/pptx/images.pptx differ diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline_formatting.pptx index 476f8efd1..bbe525cd8 100644 Binary files a/test/pptx/inline_formatting.pptx and b/test/pptx/inline_formatting.pptx differ diff --git a/test/pptx/lists.pptx b/test/pptx/lists.pptx index 8d94229d9..f47b17a74 100644 Binary files a/test/pptx/lists.pptx and b/test/pptx/lists.pptx differ diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw_ooxml.pptx index be1c4aefc..84020708f 100644 Binary files a/test/pptx/raw_ooxml.pptx and b/test/pptx/raw_ooxml.pptx differ diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/remove_empty_slides.pptx index b46e05e1c..48bf7bc8a 100644 Binary files a/test/pptx/remove_empty_slides.pptx and b/test/pptx/remove_empty_slides.pptx differ diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide_breaks.pptx index b7064a161..d6eebeffb 100644 Binary files a/test/pptx/slide_breaks.pptx and b/test/pptx/slide_breaks.pptx differ diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide_breaks_slide_level_1.pptx index a8d275b9a..a6c76a187 100644 Binary files a/test/pptx/slide_breaks_slide_level_1.pptx and b/test/pptx/slide_breaks_slide_level_1.pptx differ diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide_breaks_toc.pptx index 69e7c5196..dff386885 100644 Binary files a/test/pptx/slide_breaks_toc.pptx and b/test/pptx/slide_breaks_toc.pptx differ diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker_notes.pptx index e11784680..3314a1c65 100644 Binary files a/test/pptx/speaker_notes.pptx and b/test/pptx/speaker_notes.pptx differ diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker_notes_after_metadata.pptx index 65370e486..27a136838 100644 Binary files a/test/pptx/speaker_notes_after_metadata.pptx and b/test/pptx/speaker_notes_after_metadata.pptx differ diff --git a/test/pptx/speaker_notes_after_metadata_templated.pptx b/test/pptx/speaker_notes_after_metadata_templated.pptx index 581188461..7aa3b6a87 100644 Binary files a/test/pptx/speaker_notes_after_metadata_templated.pptx and b/test/pptx/speaker_notes_after_metadata_templated.pptx differ diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker_notes_afterheader.pptx index 9baede429..d43709ca7 100644 Binary files a/test/pptx/speaker_notes_afterheader.pptx and b/test/pptx/speaker_notes_afterheader.pptx differ diff --git a/test/pptx/speaker_notes_afterheader_templated.pptx b/test/pptx/speaker_notes_afterheader_templated.pptx index e5fc43394..793ea10f6 100644 Binary files a/test/pptx/speaker_notes_afterheader_templated.pptx and b/test/pptx/speaker_notes_afterheader_templated.pptx differ diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker_notes_afterseps.pptx index d8571e380..2f4d3b820 100644 Binary files a/test/pptx/speaker_notes_afterseps.pptx and b/test/pptx/speaker_notes_afterseps.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker_notes_afterseps_templated.pptx index f907d4e22..94a221398 100644 Binary files a/test/pptx/speaker_notes_afterseps_templated.pptx and b/test/pptx/speaker_notes_afterseps_templated.pptx differ diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker_notes_templated.pptx index ba1aa7c65..22040c88c 100644 Binary files a/test/pptx/speaker_notes_templated.pptx and b/test/pptx/speaker_notes_templated.pptx differ diff --git a/test/pptx/tables.pptx b/test/pptx/tables.pptx index 25f31f1e4..1c5b54185 100644 Binary files a/test/pptx/tables.pptx and b/test/pptx/tables.pptx differ diff --git a/test/pptx/two_column.pptx b/test/pptx/two_column.pptx index f20f64f9a..9018be36e 100644 Binary files a/test/pptx/two_column.pptx and b/test/pptx/two_column.pptx differ -- cgit v1.2.3