From 4fb081704811b66194ea11e528ad792957b7ccfd Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Tue, 24 Apr 2018 21:26:49 +0800 Subject: tdf#116822 export ruby text and base text to epub. Backport aa254c9e6f2d1ecfa2512111746a77c05ba9717f from libepubgen, implement XMLRubyContext, XMLRubyTextContext, XMLRubyBaseContext. Character formats of ruby text, ruby alignment, and ruby position are not implemented yet. Change-Id: I6c3708e6bc8e9e36a68171a037fd393f45d8d34f Reviewed-on: https://gerrit.libreoffice.org/53408 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- writerperfect/qa/unit/EPUBExportTest.cxx | 10 +++ .../qa/unit/data/writer/epubexport/simple-ruby.odt | Bin 0 -> 8307 bytes writerperfect/source/writer/exp/txtparai.cxx | 85 +++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 writerperfect/qa/unit/data/writer/epubexport/simple-ruby.odt (limited to 'writerperfect') diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index ce8f2964b0b7..90e97ba77799 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -103,6 +103,7 @@ public: void testTdf115623SingleWritingMode(); void testTdf115623SplitByChapter(); void testTdf115623ManyPageSpans(); + void testSimpleRuby(); CPPUNIT_TEST_SUITE(EPUBExportTest); CPPUNIT_TEST(testOutlineLevel); @@ -152,6 +153,7 @@ public: CPPUNIT_TEST(testTdf115623SingleWritingMode); CPPUNIT_TEST(testTdf115623SplitByChapter); CPPUNIT_TEST(testTdf115623ManyPageSpans); + CPPUNIT_TEST(testSimpleRuby); CPPUNIT_TEST_SUITE_END(); }; @@ -967,6 +969,14 @@ void EPUBExportTest::testTdf115623ManyPageSpans() } } +void EPUBExportTest::testSimpleRuby() +{ + createDoc("simple-ruby.odt", {}); + mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); + assertXPathContent(mpXmlDoc, "//xhtml:body/xhtml:p/xhtml:ruby/xhtml:span", "base text"); + assertXPathContent(mpXmlDoc, "//xhtml:body/xhtml:p/xhtml:ruby/xhtml:rt", "ruby text"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest); } diff --git a/writerperfect/qa/unit/data/writer/epubexport/simple-ruby.odt b/writerperfect/qa/unit/data/writer/epubexport/simple-ruby.odt new file mode 100644 index 000000000000..160dd00ee1e7 Binary files /dev/null and b/writerperfect/qa/unit/data/writer/epubexport/simple-ruby.odt differ diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx index f219cf711880..297c5824ccf8 100644 --- a/writerperfect/source/writer/exp/txtparai.cxx +++ b/writerperfect/source/writer/exp/txtparai.cxx @@ -148,6 +148,89 @@ void XMLSpanContext::characters(const OUString& rChars) mrImport.GetGenerator().closeSpan(); } +/// Handler for . +class XMLRubyContext : public XMLImportContext +{ +public: + XMLRubyContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList); + + rtl::Reference + CreateChildContext(const OUString& rName, + const css::uno::Reference& xAttribs) override; + + void SAL_CALL endElement(const OUString& rName) override; + + OUString m_sRubyText; + OUString m_sRubyBase; + +private: + librevenge::RVNGPropertyList m_aPropertyList; +}; + +/// Handler for . +class XMLRubyTextContext : public XMLImportContext +{ +public: + XMLRubyTextContext(XMLImport& rImport, XMLRubyContext& rParent) + : XMLImportContext(rImport) + , m_rParent(rParent) + { + } + + void SAL_CALL characters(const OUString& rChars) override { m_rParent.m_sRubyText = rChars; } + +private: + XMLRubyContext& m_rParent; +}; + +/// Handler for . +class XMLRubyBaseContext : public XMLImportContext +{ +public: + XMLRubyBaseContext(XMLImport& rImport, XMLRubyContext& rParent) + : XMLImportContext(rImport) + , m_rParent(rParent) + { + } + + void SAL_CALL characters(const OUString& rChars) override { m_rParent.m_sRubyBase += rChars; } + +private: + XMLRubyContext& m_rParent; +}; + +XMLRubyContext::XMLRubyContext(XMLImport& rImport, + const librevenge::RVNGPropertyList& rPropertyList) + : XMLImportContext(rImport) + , m_sRubyText() +{ + // Inherit properties from parent. + librevenge::RVNGPropertyList::Iter itProp(rPropertyList); + for (itProp.rewind(); itProp.next();) + m_aPropertyList.insert(itProp.key(), itProp()->clone()); +} + +rtl::Reference XMLRubyContext::CreateChildContext( + const OUString& rName, const css::uno::Reference& /*xAttribs*/) +{ + if (rName == "text:ruby-base") + return new XMLRubyBaseContext(mrImport, *this); + if (rName == "text:ruby-text") + return new XMLRubyTextContext(mrImport, *this); + return nullptr; +} + +void XMLRubyContext::endElement(const OUString& /*rName*/) +{ + OString sRubyText = OUStringToOString(m_sRubyText, RTL_TEXTENCODING_UTF8); + OString sRubyBase = OUStringToOString(m_sRubyBase, RTL_TEXTENCODING_UTF8); + if (sRubyText.getLength()) + m_aPropertyList.insert("text:ruby-text", sRubyText.getStr()); + mrImport.GetGenerator().openSpan(m_aPropertyList); + mrImport.GetGenerator().insertText(sRubyBase.getStr()); + mrImport.GetGenerator().closeSpan(); +} + /// Base class for contexts that represent a single character only. class XMLCharContext : public XMLImportContext { @@ -426,6 +509,8 @@ rtl::Reference XMLParaContext::CreateChildContext( return new XMLHyperlinkContext(mrImport, m_aTextPropertyList); if (rName == "draw:a") return new XMLTextFrameHyperlinkContext(mrImport, m_aTextPropertyList); + if (rName == "text:ruby") + return new XMLRubyContext(mrImport, m_aTextPropertyList); return CreateParagraphOrSpanChildContext(mrImport, rName, m_aTextPropertyList); } -- cgit