Fix bookmarks-goto inside insets.

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index e039d70ea69acd3ecfe5ea7d6ce10d37d327c7b3..582fab0242a47601b1958e2803a9f6826e764a26 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -286,9 +286,17 @@ void makeBibliography(
 
        // Generate the entry. Concatenate the different parts of the paragraph if any.
        auto const begin = text.paragraphs().begin();
-       auto pars = par->simpleDocBookOnePar(buf, runparams, text.outerFont(std::distance(begin, par)), 0);
+       std::vector<docstring> pars_prepend;
+       std::vector<docstring> pars;
+       std::vector<docstring> pars_append;
+       tie(pars_prepend, pars, pars_append) = par->simpleDocBookOnePar(buf, runparams, text.outerFont(std::distance(begin, par)), 0);
+
+       for (auto & parXML : pars_prepend)
+               xs << XMLStream::ESCAPE_NONE << parXML;
        for (auto & parXML : pars)
                xs << XMLStream::ESCAPE_NONE << parXML;
+       for (auto & parXML : pars_append)
+               xs << XMLStream::ESCAPE_NONE << parXML;
 
        // End the precooked bibliography entry.
        xs << xml::EndTag("bibliomixed");
@@ -432,7 +440,14 @@ void makeParagraph(
        // Open and close tags around each contained paragraph.
        auto nextpar = par;
        ++nextpar;
-       auto pars = par->simpleDocBookOnePar(buf, runparams, text.outerFont(distance(begin, par)), 0, nextpar == end, special_case);
+
+       std::vector<docstring> pars_prepend;
+       std::vector<docstring> pars;
+       std::vector<docstring> pars_append;
+       tie(pars_prepend, pars, pars_append) = par->simpleDocBookOnePar(buf, runparams, text.outerFont(distance(begin, par)), 0, nextpar == end, special_case);
+
+       for (docstring const & parXML : pars_prepend)
+           xs << XMLStream::ESCAPE_NONE << parXML;
        for (docstring const & parXML : pars) {
                if (!xml::isNotOnlySpace(parXML))
                        continue;
@@ -445,6 +460,8 @@ void makeParagraph(
                if (close_par)
                        closeParTag(xs, &*par, (nextpar != end) ? &*nextpar : nullptr, runparams);
        }
+       for (docstring const & parXML : pars_append)
+           xs << XMLStream::ESCAPE_NONE << parXML;
 }
 
 
@@ -480,8 +497,13 @@ void makeEnvironment(Text const &text,
                // Nothing to do (otherwise, infinite loops).
        } else if (style.latextype == LATEX_ENVIRONMENT) {
                // Generate the paragraph, if need be.
-               auto pars = par->simpleDocBookOnePar(buf, runparams, text.outerFont(std::distance(text.paragraphs().begin(), par)), 0, false, ignoreFonts);
+               std::vector<docstring> pars_prepend;
+        std::vector<docstring> pars;
+        std::vector<docstring> pars_append;
+        tie(pars_prepend, pars, pars_append) = par->simpleDocBookOnePar(buf, runparams, text.outerFont(std::distance(text.paragraphs().begin(), par)), 0, false, ignoreFonts);
 
+        for (docstring const & parXML : pars_prepend)
+            xs << XMLStream::ESCAPE_NONE << parXML;
                if (mimicListing) {
                        auto p = pars.begin();
                        while (p != pars.end()) {
@@ -504,6 +526,8 @@ void makeEnvironment(Text const &text,
                                xml::closeTag(xs, par->layout().docbookiteminnertag(), par->layout().docbookiteminnertagtype());
                        }
                }
+        for (docstring const & parXML : pars_append)
+            xs << XMLStream::ESCAPE_NONE << parXML;
        } else {
                makeAny(text, buf, xs, runparams, par);
        }
@@ -604,14 +628,21 @@ ParagraphList::const_iterator makeListEnvironment(Text const &text,
 
                // Generate the content of the item.
                if (sep < par->size()) {
-                       auto pars = par->simpleDocBookOnePar(buf, runparams,
+            std::vector<docstring> pars_prepend;
+            std::vector<docstring> pars;
+            std::vector<docstring> pars_append;
+            tie(pars_prepend, pars, pars_append) = par->simpleDocBookOnePar(buf, runparams,
                                                             text.outerFont(std::distance(text.paragraphs().begin(), par)), sep);
+            for (docstring const & parXML : pars_prepend)
+                xs << XMLStream::ESCAPE_NONE << parXML;
                        for (auto &p : pars) {
                                xml::openTag(xs, par->layout().docbookiteminnertag(), par->layout().docbookiteminnerattr(),
                                             par->layout().docbookiteminnertagtype());
                                xs << XMLStream::ESCAPE_NONE << p;
                                xml::closeTag(xs, par->layout().docbookiteminnertag(), par->layout().docbookiteminnertagtype());
                        }
+            for (docstring const & parXML : pars_append)
+                xs << XMLStream::ESCAPE_NONE << parXML;
                } else {
                        // DocBook doesn't like emptiness.
                        xml::compTag(xs, par->layout().docbookiteminnertag(), par->layout().docbookiteminnerattr(),
@@ -656,14 +687,23 @@ void makeCommand(
 
        // Generate this command.
        auto prevpar = text.paragraphs().getParagraphBefore(par);
-       openParTag(xs, &*par, prevpar, runparams);
 
-       auto pars = par->simpleDocBookOnePar(buf, runparams,text.outerFont(distance(begin, par)));
+    std::vector<docstring> pars_prepend;
+    std::vector<docstring> pars;
+    std::vector<docstring> pars_append;
+    tie(pars_prepend, pars, pars_append) = par->simpleDocBookOnePar(buf, runparams,text.outerFont(distance(begin, par)));
+
+    for (docstring const & parXML : pars_prepend)
+        xs << XMLStream::ESCAPE_NONE << parXML;
+
+    openParTag(xs, &*par, prevpar, runparams);
        for (auto & parXML : pars)
                // TODO: decide what to do with openParTag/closeParTag in new lines.
                xs << XMLStream::ESCAPE_NONE << parXML;
+    closeParTag(xs, &*par, (nextpar != end) ? &*nextpar : nullptr, runparams);
 
-       closeParTag(xs, &*par, (nextpar != end) ? &*nextpar : nullptr, runparams);
+    for (docstring const & parXML : pars_append)
+        xs << XMLStream::ESCAPE_NONE << parXML;
 }