de.po

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 7dc5ed3d3071f383911a916f263a9371c0f6372c..7711277e0a90f2d6c22348fc8ebb1e3188ad19f2 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -201,6 +201,17 @@ bool InsetBox::forcePlainLayout(idx_type) const
 }
 
 
+bool InsetBox::needsCProtection(bool const maintext, bool const fragile) const
+{
+       // We need to cprotect boxes that use minipages as inner box
+       // in fragile context
+       if (fragile && params_.inner_box && !params_.use_parbox && !params_.use_makebox)
+               return true;
+
+       return InsetText::needsCProtection(maintext, fragile);
+}
+
+
 ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 {
        // we only support background color for 3 types
@@ -227,7 +238,9 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 
 LyXAlignment InsetBox::contentAlignment() const
 {
-       if (!params_.use_makebox)
+       // Custom horizontal alignment is only allowed with a fixed width
+       // and if either makebox or no inner box are used
+       if (params_.width.empty() || !(params_.use_makebox || !params_.inner_box))
                return LYX_ALIGN_NONE;
 
        // The default value below is actually irrelevant
@@ -336,7 +349,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
        string separation_string = params_.separation.asLatexString();
        string shadowsize_string = params_.shadowsize.asLatexString();
        bool stdwidth = false;
-       string const cprotect = hasCProtectContent() ? "\\cprotect" : string();
+       string const cprotect = hasCProtectContent(runparams.moving_arg) ? "\\cprotect" : string();
        // in general the overall width of some decorated boxes is wider thean the inner box
        // we could therefore calculate the real width for all sizes so that if the user wants
        // e.g. 0.1\columnwidth or 2cm he gets exactly this size
@@ -407,10 +420,10 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                        os << "{\\fboxsep " << from_ascii(separation_string);
                if (!params_.inner_box && !width_string.empty()) {
                        if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
-                               os << cprotect << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
+                               os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
                                os << "\\makebox";
                        } else
-                               os << cprotect << "\\framebox";
+                               os << "\\framebox";
                        // Special widths, see usrguide sec. 3.5
                        // FIXME UNICODE
                        if (params_.special != "none") {
@@ -425,7 +438,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                                os << "[" << params_.hor_pos << "]";
                } else {
                        if (params_.framecolor != "black" || params_.backgroundcolor != "none")
-                               os << cprotect << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
+                               os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
                        else
                                os << cprotect << "\\fbox";
                }
@@ -434,12 +447,12 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
        case ovalbox:
                if (!separation_string.empty() && separation_string != defaultSep)
                        os << "{\\fboxsep " << from_ascii(separation_string);
-               os << cprotect << "\\ovalbox{";
+               os << "\\ovalbox{";
                break;
        case Ovalbox:
                if (!separation_string.empty() && separation_string != defaultSep)
                        os << "{\\fboxsep " << from_ascii(separation_string);
-               os << cprotect << "\\Ovalbox{";
+               os << "\\Ovalbox{";
                break;
        case Shadowbox:
                if (thickness_string != defaultThick) {
@@ -461,7 +474,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                                && separation_string == defaultSep
                                && thickness_string == defaultThick)
                                os << "{\\shadowsize " << from_ascii(shadowsize_string);
-               os << cprotect << "\\shadowbox{";
+               os << "\\shadowbox{";
                break;
        case Shaded:
                // must be set later because e.g. the width settings only work when
@@ -475,7 +488,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                }
                if (separation_string != defaultSep && thickness_string == defaultThick)
                        os << "{\\fboxsep " << from_ascii(separation_string);
-               os << cprotect << "\\doublebox{";
+               os << "\\doublebox{";
                break;
        }