Get rid of spelling and language marks in info inset

[features.git] / src / insets / InsetBox.cpp

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index d714cf7853f6a9e1d33484231cfbc92bc9bee5fc..c04bd1e927e6bf9721ba0b13b6793766bb854699 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -34,6 +34,7 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Translator.h"
@@ -220,11 +221,10 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const
                return getLayout().bgcolor();
 
        if (params_.type == "Shaded") {
-               // FIXME: This hardcoded color is a hack!
-               if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
+               if (!buffer().params().isboxbgcolor)
                        return getLayout().bgcolor();
 
-               ColorCode c = lcolor.getFromLyXName("boxbgcolor");
+               ColorCode c = lcolor.getFromLyXName("boxbgcolor@" + buffer().fileName().absFileName());
                if (c == Color_none)
                        return getLayout().bgcolor();
                return c;
@@ -718,14 +718,24 @@ int InsetBox::plaintext(odocstringstream & os,
 
 void InsetBox::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       if (!getLayout().docbookwrappertag().empty()) {
+       // There really should be a wrapper tag for this layout.
+       bool hasBoxTag = !getLayout().docbookwrappertag().empty();
+       if (!hasBoxTag)
+               LYXERR0("Assertion failed: box layout " + getLayout().name() + " missing DocBookWrapperTag.");
+
+       // Avoid nesting boxes in DocBook, it's not allowed. Only make the check for <sidebar> to avoid destroying
+       // tags if this is not the wrapper tag for this layout (unlikely).
+       bool isAlreadyInBox = hasBoxTag && xs.isTagOpen(xml::StartTag(getLayout().docbookwrappertag()));
+
+       bool outputBoxTag = hasBoxTag && !isAlreadyInBox;
+
+       // Generate the box tag (typically, <sidebar>).
+       if (outputBoxTag) {
                if (!xs.isLastTagCR())
                        xs << xml::CR();
 
                xs << xml::StartTag(getLayout().docbookwrappertag(), getLayout().docbookwrapperattr());
                xs << xml::CR();
-       } else {
-               LYXERR0("Assertion failed: box layout " + getLayout().name() + " missing DocBookWrapperTag.");
        }
 
        // If the box starts with a sectioning item, use as box title.
@@ -735,16 +745,22 @@ void InsetBox::docbook(XMLStream & xs, OutputParams const & runparams) const
                current_par = makeAny(text(), buffer(), xs, runparams, paragraphs().begin());
        }
 
-       xs.startDivision(false);
        // Don't call InsetText::docbook, as this would generate all paragraphs in the inset, not the ones we are
        // interested in. The best solution would be to call docbookParagraphs with an updated OutputParams object to only
        // generate paragraphs after the title, but it leads to strange crashes, as if text().paragraphs() then returns
        // a smaller set of paragrphs.
+       // Elements in the box must keep their paragraphs.
+       auto rp = runparams;
+       rp.docbook_in_par = false;
+       rp.docbook_force_pars = true;
+
+       xs.startDivision(false);
        while (current_par != paragraphs().end())
-               current_par = makeAny(text(), buffer(), xs, runparams, current_par);
+               current_par = makeAny(text(), buffer(), xs, rp, current_par);
        xs.endDivision();
 
-       if (!getLayout().docbookwrappertag().empty()) {
+       // Close the box.
+       if (outputBoxTag) {
                if (!xs.isLastTagCR())
                        xs << xml::CR();