From 89e7a00080aadeba08ee649877b2507dc312f9f8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 1 Dec 2017 10:56:03 +0100 Subject: EPUB export: handle page size in fixed layout Requires parsing master pages and page layouts. Change-Id: Ia8b9e59a9355396d3776af06e8e67ec88033754b Reviewed-on: https://gerrit.libreoffice.org/45645 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- writerperfect/qa/unit/EPUBExportTest.cxx | 16 +++++ writerperfect/source/writer/exp/txtparai.cxx | 7 ++ writerperfect/source/writer/exp/txtstyli.cxx | 96 ++++++++++++++++++++++++++++ writerperfect/source/writer/exp/txtstyli.hxx | 29 +++++++++ writerperfect/source/writer/exp/xmlfmt.cxx | 27 +++++--- writerperfect/source/writer/exp/xmlfmt.hxx | 13 +++- writerperfect/source/writer/exp/xmlimp.cxx | 31 ++++++++- writerperfect/source/writer/exp/xmlimp.hxx | 7 ++ 8 files changed, 214 insertions(+), 12 deletions(-) (limited to 'writerperfect') diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index a9692bc2c293..a9c3db57c299 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -92,6 +92,7 @@ public: void testFootnote(); void testPopup(); void testPopupAPI(); + void testPageSize(); CPPUNIT_TEST_SUITE(EPUBExportTest); CPPUNIT_TEST(testOutlineLevel); @@ -132,6 +133,7 @@ public: CPPUNIT_TEST(testFootnote); CPPUNIT_TEST(testPopup); CPPUNIT_TEST(testPopupAPI); + CPPUNIT_TEST(testPageSize); CPPUNIT_TEST_SUITE_END(); }; @@ -763,6 +765,20 @@ void EPUBExportTest::testPopupAPI() CPPUNIT_ASSERT(aAnchor != aData); } +void EPUBExportTest::testPageSize() +{ + uno::Sequence aFilterData(comphelper::InitPropertySequence( + { + {"EPUBLayoutMethod", uno::makeAny(static_cast(libepubgen::EPUB_LAYOUT_METHOD_FIXED))} + })); + createDoc("hello.fodt", aFilterData); + + // This failed, viewport was empty, so page size was lost. + mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); + // 21,59cm x 27.94cm (letter). + assertXPath(mpXmlDoc, "/xhtml:html/xhtml:head/xhtml:meta[@name='viewport']", "content", "width=816, height=1056"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest); } diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx index 309f80ce607a..95f85d86f454 100644 --- a/writerperfect/source/writer/exp/txtparai.cxx +++ b/writerperfect/source/writer/exp/txtparai.cxx @@ -397,6 +397,13 @@ void XMLParaContext::startElement(const OUString &/*rName*/, const css::uno::Ref } } + if (!mrImport.IsPageSpanOpened()) + { + auto it = mrImport.GetMasterPages().find("Standard"); + if (it != mrImport.GetMasterPages().end()) + mrImport.GetGenerator().openPageSpan(it->second); + mrImport.SetPageSpanOpened(true); + } mrImport.GetGenerator().openParagraph(aPropertyList); } diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx index e8fe1a43bea0..38b32768ddf0 100644 --- a/writerperfect/source/writer/exp/txtstyli.cxx +++ b/writerperfect/source/writer/exp/txtstyli.cxx @@ -320,6 +320,102 @@ librevenge::RVNGPropertyList &XMLStyleContext::GetGraphicPropertyList() return m_aGraphicPropertyList; } +XMLMasterPageContext::XMLMasterPageContext(XMLImport &rImport, XMLStylesContext &rStyles) + : XMLImportContext(rImport), + m_rStyles(rStyles) +{ + // I'll remove this in a follow-up commit. + (void)m_rStyles; +} + +void XMLMasterPageContext::startElement(const OUString &/*rName*/, const css::uno::Reference &xAttribs) +{ + OUString aName; + OUString aPageLayoutName; + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + const OUString &rAttributeName = xAttribs->getNameByIndex(i); + const OUString &rAttributeValue = xAttribs->getValueByIndex(i); + if (rAttributeName == "style:name") + aName = rAttributeValue; + else if (rAttributeName == "style:page-layout-name") + aPageLayoutName = rAttributeValue; + } + auto it = mrImport.GetPageLayouts().find(aPageLayoutName); + if (it == mrImport.GetPageLayouts().end()) + return; + + librevenge::RVNGPropertyList::Iter itProp(it->second); + librevenge::RVNGPropertyList aPropertyList; + for (itProp.rewind(); itProp.next();) + aPropertyList.insert(itProp.key(), itProp()->clone()); + mrImport.GetMasterPages()[aName] = aPropertyList; +} + +/// Handler for . +class XMLPageLayoutPropertiesContext : public XMLImportContext +{ +public: + XMLPageLayoutPropertiesContext(XMLImport &rImport, XMLPageLayoutContext &rStyle); + + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference &xAttribs) override; + +private: + XMLPageLayoutContext &m_rStyle; +}; + +XMLPageLayoutPropertiesContext::XMLPageLayoutPropertiesContext(XMLImport &rImport, XMLPageLayoutContext &rStyle) + : XMLImportContext(rImport) + , m_rStyle(rStyle) +{ +} + +void XMLPageLayoutPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference &xAttribs) +{ + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + OString sName = OUStringToOString(xAttribs->getNameByIndex(i), RTL_TEXTENCODING_UTF8); + OString sValue = OUStringToOString(xAttribs->getValueByIndex(i), RTL_TEXTENCODING_UTF8); + m_rStyle.GetPropertyList().insert(sName.getStr(), sValue.getStr()); + } +} + +XMLPageLayoutContext::XMLPageLayoutContext(XMLImport &rImport, XMLStylesContext &rStyles) + : XMLImportContext(rImport), + m_rStyles(rStyles) +{ +} + +void XMLPageLayoutContext::startElement(const OUString &/*rName*/, const css::uno::Reference &xAttribs) +{ + for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i) + { + const OUString &rAttributeName = xAttribs->getNameByIndex(i); + const OUString &rAttributeValue = xAttribs->getValueByIndex(i); + if (rAttributeName == "style:name") + m_aName = rAttributeValue; + } +} + +rtl::Reference XMLPageLayoutContext::CreateChildContext(const OUString &rName, const css::uno::Reference &/*xAttribs*/) +{ + if (rName == "style:page-layout-properties") + return new XMLPageLayoutPropertiesContext(mrImport, *this); + return nullptr; +} + +void XMLPageLayoutContext::endElement(const OUString &/*rName*/) +{ + if (m_aName.isEmpty()) + return; + + m_rStyles.GetCurrentPageLayouts()[m_aName] = m_aPropertyList; +} + +librevenge::RVNGPropertyList &XMLPageLayoutContext::GetPropertyList() +{ + return m_aPropertyList; +} } // namespace exp } // namespace writerperfect diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx index f3b3b6da38c9..06ae15e503f8 100644 --- a/writerperfect/source/writer/exp/txtstyli.hxx +++ b/writerperfect/source/writer/exp/txtstyli.hxx @@ -52,6 +52,35 @@ private: XMLStylesContext &m_rStyles; }; +/// Handler for . +class XMLMasterPageContext : public XMLImportContext +{ +public: + XMLMasterPageContext(XMLImport &rImport, XMLStylesContext &rStyles); + + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference &xAttribs) override; + +private: + XMLStylesContext &m_rStyles; +}; + +/// Handler for . +class XMLPageLayoutContext : public XMLImportContext +{ +public: + XMLPageLayoutContext(XMLImport &rImport, XMLStylesContext &rStyles); + + rtl::Reference CreateChildContext(const OUString &rName, const css::uno::Reference &xAttribs) override; + void SAL_CALL startElement(const OUString &rName, const css::uno::Reference &xAttribs) override; + void SAL_CALL endElement(const OUString &rName) override; + + librevenge::RVNGPropertyList &GetPropertyList(); +private: + OUString m_aName; + librevenge::RVNGPropertyList m_aPropertyList; + XMLStylesContext &m_rStyles; +}; + } // namespace exp } // namespace writerperfect diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx index abd6bb9a6a72..a4b0781c73f9 100644 --- a/writerperfect/source/writer/exp/xmlfmt.cxx +++ b/writerperfect/source/writer/exp/xmlfmt.cxx @@ -20,15 +20,17 @@ namespace writerperfect namespace exp { -XMLStylesContext::XMLStylesContext(XMLImport &rImport, bool bAutomatic) +XMLStylesContext::XMLStylesContext(XMLImport &rImport, StyleType eType) : XMLImportContext(rImport), - m_rParagraphStyles(bAutomatic ? mrImport.GetAutomaticParagraphStyles() : mrImport.GetParagraphStyles()), - m_rTextStyles(bAutomatic ? mrImport.GetAutomaticTextStyles() : mrImport.GetTextStyles()), - m_rCellStyles(bAutomatic ? mrImport.GetAutomaticCellStyles() : mrImport.GetCellStyles()), - m_rColumnStyles(bAutomatic ? mrImport.GetAutomaticColumnStyles() : mrImport.GetColumnStyles()), - m_rRowStyles(bAutomatic ? mrImport.GetAutomaticRowStyles() : mrImport.GetRowStyles()), - m_rTableStyles(bAutomatic ? mrImport.GetAutomaticTableStyles() : mrImport.GetTableStyles()), - m_rGraphicStyles(bAutomatic ? mrImport.GetAutomaticGraphicStyles() : mrImport.GetGraphicStyles()) + m_rParagraphStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticParagraphStyles() : mrImport.GetParagraphStyles()), + m_rTextStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTextStyles() : mrImport.GetTextStyles()), + m_rCellStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticCellStyles() : mrImport.GetCellStyles()), + m_rColumnStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticColumnStyles() : mrImport.GetColumnStyles()), + m_rRowStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticRowStyles() : mrImport.GetRowStyles()), + m_rTableStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTableStyles() : mrImport.GetTableStyles()), + m_rGraphicStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticGraphicStyles() : mrImport.GetGraphicStyles()), + m_rPageLayouts(mrImport.GetPageLayouts()), + m_eType(eType) { } @@ -36,6 +38,10 @@ rtl::Reference XMLStylesContext::CreateChildContext(const OUSt { if (rName == "style:style") return new XMLStyleContext(mrImport, *this); + if (m_eType == StyleType_MASTER && rName == "style:master-page") + return new XMLMasterPageContext(mrImport, *this); + if (m_eType == StyleType_AUTOMATIC && rName == "style:page-layout") + return new XMLPageLayoutContext(mrImport, *this); return nullptr; } @@ -74,6 +80,11 @@ std::map &XMLStylesContext::GetCurrentGr return m_rGraphicStyles; } +std::map &XMLStylesContext::GetCurrentPageLayouts() +{ + return m_rPageLayouts; +} + /// Handler for . class XMLFontFaceContext : public XMLImportContext { diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx index 3f609e98b000..24ee493cd660 100644 --- a/writerperfect/source/writer/exp/xmlfmt.hxx +++ b/writerperfect/source/writer/exp/xmlfmt.hxx @@ -21,11 +21,17 @@ namespace writerperfect namespace exp { -/// Handler for /. +/// Handler for //. class XMLStylesContext : public XMLImportContext { public: - XMLStylesContext(XMLImport &rImport, bool bAutomatic); + enum StyleType + { + StyleType_NONE, + StyleType_AUTOMATIC, + StyleType_MASTER + }; + XMLStylesContext(XMLImport &rImport, StyleType eType); rtl::Reference CreateChildContext(const OUString &rName, const css::uno::Reference &xAttribs) override; @@ -36,6 +42,7 @@ public: std::map &GetCurrentRowStyles(); std::map &GetCurrentTableStyles(); std::map &GetCurrentGraphicStyles(); + std::map &GetCurrentPageLayouts(); private: std::map &m_rParagraphStyles; std::map &m_rTextStyles; @@ -44,6 +51,8 @@ private: std::map &m_rRowStyles; std::map &m_rTableStyles; std::map &m_rGraphicStyles; + std::map &m_rPageLayouts; + StyleType m_eType; }; /// Handler for . diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx index 7b6cc2791459..1d245401aea6 100644 --- a/writerperfect/source/writer/exp/xmlimp.cxx +++ b/writerperfect/source/writer/exp/xmlimp.cxx @@ -246,11 +246,13 @@ rtl::Reference XMLOfficeDocContext::CreateChildContext(const O else if (rName == "office:meta") return new XMLMetaDocumentContext(mrImport); else if (rName == "office:automatic-styles") - return new XMLStylesContext(mrImport, /*bAutomatic=*/true); + return new XMLStylesContext(mrImport, XMLStylesContext::StyleType_AUTOMATIC); else if (rName == "office:styles") - return new XMLStylesContext(mrImport, /*bAutomatic=*/false); + return new XMLStylesContext(mrImport, XMLStylesContext::StyleType_NONE); else if (rName == "office:font-face-decls") return new XMLFontFaceDeclsContext(mrImport); + else if (rName == "office:master-styles") + return new XMLStylesContext(mrImport, XMLStylesContext::StyleType_MASTER); return nullptr; } @@ -339,6 +341,16 @@ bool XMLImport::FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList return false; } +void XMLImport::SetPageSpanOpened(bool bPageSpanOpened) +{ + mbPageSpanOpened = bPageSpanOpened; +} + +bool XMLImport::IsPageSpanOpened() const +{ + return mbPageSpanOpened; +} + rtl::Reference XMLImport::CreateContext(const OUString &rName, const css::uno::Reference &/*xAttribs*/) { if (rName == "office:document") @@ -421,6 +433,16 @@ std::map &XMLImport::GetGraphicStyles() return maGraphicStyles; } +std::map &XMLImport::GetPageLayouts() +{ + return maPageLayouts; +} + +std::map &XMLImport::GetMasterPages() +{ + return maMasterPages; +} + void XMLImport::startDocument() { mrGenerator.startDocument(librevenge::RVNGPropertyList()); @@ -428,6 +450,11 @@ void XMLImport::startDocument() void XMLImport::endDocument() { + if (mbPageSpanOpened) + { + mrGenerator.closePageSpan(); + mbPageSpanOpened = false; + } mrGenerator.endDocument(); } diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx index de9fa58d7e1f..aeec06bde727 100644 --- a/writerperfect/source/writer/exp/xmlimp.hxx +++ b/writerperfect/source/writer/exp/xmlimp.hxx @@ -52,12 +52,15 @@ class XMLImport : public cppu::WeakImplHelper std::map maTableStyles; std::map maAutomaticGraphicStyles; std::map maGraphicStyles; + std::map maPageLayouts; + std::map maMasterPages; librevenge::RVNGPropertyListVector maCoverImages; /// Author, date, etc -- overwrites what would be from the document out of the box. librevenge::RVNGPropertyList maMetaData; const css::uno::Reference &mxContext; css::uno::Reference mxUriReferenceFactory; OUString maMediaDir; + bool mbPageSpanOpened = false; public: XMLImport(const css::uno::Reference &xContext, librevenge::RVNGTextInterface &rGenerator, const OUString &rURL, const css::uno::Sequence &rDescriptor); @@ -79,9 +82,13 @@ public: std::map &GetRowStyles(); std::map &GetTableStyles(); std::map &GetGraphicStyles(); + std::map &GetPageLayouts(); + std::map &GetMasterPages(); const librevenge::RVNGPropertyListVector &GetCoverImages(); const librevenge::RVNGPropertyList &GetMetaData(); bool FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList &rPropList); + void SetPageSpanOpened(bool bPageSpanOpened); + bool IsPageSpanOpened() const; // XDocumentHandler void SAL_CALL startDocument() override; -- cgit v1.2.3