Fix #10328.

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 434148bc86c5582d926589c0e5a62267b3a41821..5e15edcee9b47b84d50432e5bd0f6d29f903f064 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -189,7 +189,7 @@ namespace {
 
 // convenience functions
 
-void openParTag(XMLStream & xs, Layout const & lay)
+void openParTag(XMLStream &xs, Layout const &lay)
 {
        if (lay.docbookwrappertag() != "NONE") {
                xs << xml::StartTag(lay.docbookwrappertag(), lay.docbookwrapperattr());
@@ -203,7 +203,7 @@ void openParTag(XMLStream & xs, Layout const & lay)
 }
 
 
-void closeTag(XMLStream & xs, Layout const & lay)
+void closeTag(XMLStream &xs, Layout const &lay)
 {
        string tag = lay.docbooktag();
        if (tag == "Plain Layout")
@@ -228,14 +228,14 @@ void closeLabelTag(XMLStream & xs, Layout const & lay)
 }
 
 
-void openItemTag(XMLStream & xs, Layout const & lay)
+void openItemTag(XMLStream &xs, Layout const &lay)
 {
        xs << xml::StartTag(lay.docbookitemtag(), lay.docbookitemattr());
 }
 
 
 // Return true when new elements are output in a paragraph, false otherwise.
-bool openInnerItemTag(XMLStream & xs, Layout const & lay)
+bool openInnerItemTag(XMLStream &xs, Layout const &lay)
 {
        if (lay.docbookiteminnertag() != "NONE") {
                xs << xml::CR();
@@ -249,7 +249,7 @@ bool openInnerItemTag(XMLStream & xs, Layout const & lay)
 }
 
 
-void closeInnerItemTag(XMLStream & xs, Layout const & lay)
+void closeInnerItemTag(XMLStream &xs, Layout const &lay)
 {
        if (lay.docbookiteminnertag()!= "NONE") {
                xs << xml::EndTag(lay.docbookiteminnertag());
@@ -258,7 +258,7 @@ void closeInnerItemTag(XMLStream & xs, Layout const & lay)
 }
 
 
-inline void closeItemTag(XMLStream & xs, Layout const & lay)
+inline void closeItemTag(XMLStream &xs, Layout const &lay)
 {
        xs << xml::EndTag(lay.docbookitemtag());
        xs << xml::CR();
@@ -266,11 +266,10 @@ inline void closeItemTag(XMLStream & xs, Layout const & lay)
 
 // end of convenience functions
 
-ParagraphList::const_iterator findLast(
+ParagraphList::const_iterator findLastParagraph(
                ParagraphList::const_iterator p,
-               ParagraphList::const_iterator const & pend,
-               LatexType type) {
-       for (++p; p != pend && p->layout().latextype == type; ++p);
+               ParagraphList::const_iterator const & pend) {
+       for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p);
 
        return p;
 }
@@ -645,11 +644,11 @@ ParagraphList::const_iterator makeEnvironment(
                        break;
                }
                case LATEX_PARAGRAPH:
-                       send = findLast(par, pend, LATEX_PARAGRAPH);
+                       send = findLastParagraph(par, pend);
                        par = makeParagraphs(buf, xs, runparams, text, par, send);
                        break;
                case LATEX_BIB_ENVIRONMENT:
-                       send = findLast(par, pend, LATEX_BIB_ENVIRONMENT);
+                       send = findLastBibliographyParagraph(par, pend);
                        par = makeParagraphBibliography(buf, xs, runparams, text, par, send);
                        break;
                case LATEX_COMMAND:
@@ -719,19 +718,22 @@ pair<ParagraphList::const_iterator, ParagraphList::const_iterator> makeAny(
                }
                case LATEX_ENVIRONMENT:
                case LATEX_LIST_ENVIRONMENT:
-               case LATEX_ITEM_ENVIRONMENT:
+               case LATEX_ITEM_ENVIRONMENT: {
                        // FIXME Same fix here.
                        send = findEndOfEnvironment(par, pend);
                        par = makeEnvironment(buf, xs, ourparams, text, par, send);
                        break;
-               case LATEX_PARAGRAPH:
-                       send = findLast(par, pend, LATEX_PARAGRAPH);
-                       par = makeParagraphs(buf, xs, ourparams, text, par, send);
-                       break;
-               case LATEX_BIB_ENVIRONMENT:
-                       send = findLast(par, pend, LATEX_BIB_ENVIRONMENT);
+               }
+               case LATEX_BIB_ENVIRONMENT: {
+                       send = findLastBibliographyParagraph(par, pend);
                        par = makeParagraphBibliography(buf, xs, ourparams, text, par, send);
                        break;
+               }
+               case LATEX_PARAGRAPH: {
+                       send = findLastParagraph(par, pend);
+                       par = makeParagraphs(buf, xs, ourparams, text, par, send);
+                       break;
+               }
        }
 
        return make_pair(par, send);
@@ -762,34 +764,15 @@ DocBookDocumentSectioning hasDocumentSectioning(ParagraphList const &paragraphs,
 }
 
 
-bool hasOnlyNotes(Paragraph const & par)
-{
-       for (int i = 0; i < par.size(); ++i)
-               if (!par.isInset(i) || !dynamic_cast<InsetNote *>(par.insetList().get(i)))
-                       return false;
-       return true;
-}
-
-
-DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type bpit, pit_type const epit) {
+DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type const bpit, pit_type const epit) {
        set<pit_type> shouldBeInInfo;
        set<pit_type> mustBeInInfo;
 
-       // Find the first non empty paragraph by mutating bpit.
-       while (bpit < epit) {
-               Paragraph const &par = paragraphs[bpit];
-               if (par.empty() || hasOnlyNotes(par))
-                       bpit += 1;
-               else
-                       break;
-       }
-
-       // Find the last info-like paragraph.
        pit_type cpit = bpit;
        while (cpit < epit) {
                // Skip paragraphs only containing one note.
                Paragraph const &par = paragraphs[cpit];
-               if (hasOnlyNotes(par)) {
+               if (par.size() == 1 && dynamic_cast<InsetNote*>(paragraphs[cpit].insetList().get(0))) {
                        cpit += 1;
                        continue;
                }