Amend 3093789e for cmake build

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 214c2a83ececd0c0723fd25a9f186cda6d467a98..ec11481cd966adc37edbc01e98d7b9c276bc25e5 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -175,6 +175,10 @@ void openParTag(XMLStream & xs, const Paragraph * par, const Paragraph * prevpar
        if (par == prevpar)
                prevpar = nullptr;
 
+       // If the previous paragraph is empty, don't consider it when opening wrappers.
+       if (prevpar && prevpar->empty() && !prevpar->allowEmpty())
+               prevpar = nullptr;
+
        // When should the wrapper be opened here? Only if the previous paragraph has the SAME wrapper tag
        // (usually, they won't have the same layout) and the CURRENT one allows merging.
        // The main use case is author information in several paragraphs: if the name of the author is the
@@ -221,6 +225,10 @@ void closeParTag(XMLStream & xs, Paragraph const * par, Paragraph const * nextpa
        if (par == nextpar)
                nextpar = nullptr;
 
+       // If the next paragraph is empty, don't consider it when closing wrappers.
+       if (nextpar && nextpar->empty() && !nextpar->allowEmpty())
+               nextpar = nullptr;
+
        // See comment in openParTag.
        Layout const & lay = par->layout();
        bool closeWrapper = lay.docbookwrappertag() != "NONE" && !runparams.docbook_ignore_wrapper;
@@ -1063,9 +1071,6 @@ void docbookParagraphs(Text const &text,
                                return;
                        });
 
-       std::stack<std::pair<int, string>> headerLevels; // Used to determine when to open/close sections: store the depth
-       // of the section and the tag that was used to open it.
-
        // Detect whether the document contains sections. If there are no sections, treatment is largely simplified.
        // In particular, there can't be an abstract, unless it is manually marked.
        bool documentHasSections;
@@ -1083,21 +1088,20 @@ void docbookParagraphs(Text const &text,
        outputDocBookInfo(text, buf, xs, runparams, paragraphs, info);
        bpit = info.epit;
 
-       // Then, iterate through the paragraphs of this document.
-       bool currentlyInAppendix = false;
+       std::stack<std::pair<int, string>> headerLevels; // Used to determine when to open/close sections: store the depth
+       // of the section and the tag that was used to open it.
 
+       // Then, iterate through the paragraphs of this document.
        auto par = text.paragraphs().iterator_at(bpit);
        auto end = text.paragraphs().iterator_at(epit);
        while (par != end) {
-               OutputParams ourparams = runparams;
-
-               if (par->params().startOfAppendix())
-                       currentlyInAppendix = true;
+               // Skip paragraphs not producing any output.
                if (hasOnlyNotes(*par)) {
                        ++par;
                        continue;
                }
 
+               OutputParams ourparams = runparams;
                Layout const &style = par->layout();
 
                // Think about adding <section> and/or </section>s.
@@ -1161,11 +1165,16 @@ void docbookParagraphs(Text const &text,
                        Inset const *firstInset = par->getInset(0);
                        if (firstInset && (firstInset->lyxCode() == BIBITEM_CODE || firstInset->lyxCode() == BIBTEX_CODE)) {
                                while (!headerLevels.empty()) {
+                                       // Don't close appendices before bibliographies.
+                                       if (headerLevels.top().second == "appendix")
+                                               break;
+
+                                       // Pop the section from the stack.
                                        int level = headerLevels.top().first;
                                        docstring tag = from_utf8("</" + headerLevels.top().second + ">");
                                        headerLevels.pop();
 
-                                       // Output the tag only if it corresponds to a legit section.
+                                       // Output the tag only if it corresponds to a legit section, as the rest of the code.
                                        if (level != Layout::NOT_IN_TOC) {
                                                xs << XMLStream::ESCAPE_NONE << tag;
                                                xs << xml::CR();