+ }

+

++bool EPUBSplitGuard::inHeading() const

++{

++ if (!m_currentHeadingLevel)

++ return false;

++

++ return m_headingLevel >= m_currentHeadingLevel;

++}

++

+ bool EPUBSplitGuard::splitOnSize() const

+ {

+ return canSplit(EPUB_SPLIT_METHOD_SIZE) && (m_size <= m_currentSize);

+diff --git a/src/lib/EPUBSplitGuard.h b/src/lib/EPUBSplitGuard.h

+index 17613ac..7bc53ce 100644

+--- a/src/lib/EPUBSplitGuard.h

++++ b/src/lib/EPUBSplitGuard.h

+@@ -21,6 +21,7 @@ public:

+ explicit EPUBSplitGuard(EPUBSplitMethod method);

+

+ void setSplitHeadingLevel(unsigned level);

++ void setCurrentHeadingLevel(unsigned level);

+ void setSplitSize(unsigned size);

+

+ void openLevel();

+@@ -29,6 +30,7 @@ public:

+

+ bool splitOnPageBreak() const;

+ bool splitOnHeading(unsigned level) const;

++ bool inHeading() const;

+ bool splitOnSize() const;

+

+ void onSplit();

+@@ -39,6 +41,7 @@ private:

+ private:

+ const EPUBSplitMethod m_method;

+ unsigned m_headingLevel;

++ unsigned m_currentHeadingLevel;

+ unsigned m_size;

+ unsigned m_currentSize;

+ unsigned m_nestingLevel;

+diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp

+index b1e33f8..5206b37 100644

+--- a/src/lib/EPUBTextGenerator.cpp

++++ b/src/lib/EPUBTextGenerator.cpp

+@@ -67,7 +67,6 @@ public:

+ bool m_inPageSpan;

+ bool m_inHeader;

+ bool m_inFooter;

+- bool m_inHeading;

+

+ RVNGPropertyList m_pageSpanProps;

+ shared_ptr<EPUBTextElements> m_currentHeader;

+@@ -89,7 +88,6 @@ EPUBTextGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod

+ , m_inPageSpan(false)

+ , m_inHeader(false)

+ , m_inFooter(false)

+- , m_inHeading(false)

+ , m_pageSpanProps()

+ , m_currentHeader()

+ , m_currentFooter()

+@@ -262,7 +260,7 @@ void EPUBTextGenerator::openParagraph(const librevenge::RVNGPropertyList &propLi

+ const RVNGProperty *const outlineLevel = propList["text:outline-level"];

+ if (outlineLevel && m_impl->getSplitGuard().splitOnHeading(outlineLevel->getInt()))

+ m_impl->startNewHtmlFile();

+- m_impl->m_inHeading = outlineLevel != nullptr;

++ m_impl->getSplitGuard().setCurrentHeadingLevel(outlineLevel ? outlineLevel->getInt() : 0);

+

+ m_impl->getSplitGuard().openLevel();

+

+@@ -369,7 +367,7 @@ void EPUBTextGenerator::insertText(const librevenge::RVNGString &text)

+ if (m_impl->m_inHeader || m_impl->m_inFooter)

+ m_impl->m_currentHeaderOrFooter->addInsertText(text);

+

+- if (m_impl->m_inHeading)

++ if (m_impl->getSplitGuard().inHeading())

+ m_impl->getHtmlManager().insertHeadingText(text.cstr());

+

+ m_impl->getSplitGuard().incrementSize(text.len());

+--

+2.12.3

+