diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-22 15:18:45 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-23 09:05:02 +0100 |
commit | a54787669b9283efdfdd18b0cbafc3184cdde58f (patch) | |
tree | c64aac62a0c2d2e7baf1b5eddaba396270ec09d4 /writerperfect/qa/unit | |
parent | 75f5d70d5d9f58a76e42d151f187c50bad50378c (diff) |
EPUB export, fixed layout: add chapter names to the navigation document
Extend vcl::PDFExtOutDevData so that it's possible to use it outside the
PDF export; this way the EPUB export can know which chapters start on
which page.
This means fixed and reflowable layout has the same table of contents,
instead of just Page <N> in the fixed layout case.
Change-Id: I935fb23c66ec747431b91e83b0e677d4e5f704b9
Reviewed-on: https://gerrit.libreoffice.org/48332
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerperfect/qa/unit')
-rw-r--r-- | writerperfect/qa/unit/EPUBExportTest.cxx | 7 | ||||
-rw-r--r-- | writerperfect/qa/unit/data/writer/epubexport/fxl-2page.fodt | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 176324b0dff7..47e84ebf1bbc 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -348,6 +348,13 @@ void EPUBExportTest::testEPUBFixedLayoutImplicitBreak() // This was missing, implicit page break (as calculated by the layout) was lost on export. CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0002.xhtml")); CPPUNIT_ASSERT(!mxZipFile->hasByName("OEBPS/sections/section0003.xhtml")); + + // Make sure that fixed layout has chapter names in the navigation + // document. + mpXmlDoc = parseExport("OEBPS/toc.xhtml"); + // This was 'Page 1' instead. + assertXPathContent(mpXmlDoc, "//xhtml:li[1]/xhtml:a", "First chapter"); + assertXPathContent(mpXmlDoc, "//xhtml:li[2]/xhtml:a", "Second chapter"); } void EPUBExportTest::testPageBreakSplit() diff --git a/writerperfect/qa/unit/data/writer/epubexport/fxl-2page.fodt b/writerperfect/qa/unit/data/writer/epubexport/fxl-2page.fodt index 6a22acd0821f..40f628b5e646 100644 --- a/writerperfect/qa/unit/data/writer/epubexport/fxl-2page.fodt +++ b/writerperfect/qa/unit/data/writer/epubexport/fxl-2page.fodt @@ -44,6 +44,10 @@ <style:paragraph-properties text:number-lines="false" text:line-number="0"/> <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lucida Sans1" style:font-family-complex="'Lucida Sans'" style:font-family-generic-complex="swiss"/> </style:style> + <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="1" style:class="text"> + <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false"/> + <style:text-properties fo:font-size="130%" fo:font-weight="bold" style:font-size-asian="130%" style:font-weight-asian="bold" style:font-size-complex="130%" style:font-weight-complex="bold"/> + </style:style> </office:styles> <office:automatic-styles> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"> @@ -65,7 +69,10 @@ </office:master-styles> <office:body> <office:text text:use-soft-page-breaks="true"> + <text:h text:style-name="Heading_20_1" text:outline-level="1">First chapter</text:h> <text:p text:style-name="P1"><text:span text:style-name="T1">He heard quiet steps behind him. That didn't bode well. Who could be following him this late at night and in this deadbeat part of town? And at this particular moment, just after he pulled off the big time and was making off with the greenbacks. Was there another crook who'd had the same idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the steps behind him mean that one of many law officers in town was on to him and just waiting to pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the alley. Like lightning he darted off to the left and disappeared between the two warehouses almost falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap </text:span><text:soft-page-break/><text:span text:style-name="T1">his way along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the way he had come. The steps got louder and louder, he saw the black outline of a figure coming around the corner. Is this the end of the line?</text:span></text:p> + <text:h text:style-name="Heading_20_1" text:outline-level="1">Second chapter</text:h> + <text:p text:style-name="Standard">This is the end.</text:p> </office:text> </office:body> </office:document> |