X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.cpp;h=7711277e0a90f2d6c22348fc8ebb1e3188ad19f2;hb=87a7f728ca9b8b4d358cf06de980f61b67a927ac;hp=eee16fe6472912751eb5e7daf013c529bc778ddb;hpb=28e6174be7dc56afdcee8852f0c58e3b6858e339;p=lyx.git

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index eee16fe647..7711277e0a 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -27,6 +27,8 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "output_xhtml.h"
+#include "TexRow.h"
+#include "texstream.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -90,7 +92,7 @@ BoxTranslatorLoc const & boxtranslator_loc()
 	return translator;
 }
 
-} // namespace anon
+} // namespace
 
 
 /////////////////////////////////////////////////////////////////////////
@@ -100,7 +102,7 @@ BoxTranslatorLoc const & boxtranslator_loc()
 /////////////////////////////////////////////////////////////////////////
 
 InsetBox::InsetBox(Buffer * buffer, string const & label)
-	: InsetCollapsable(buffer), params_(label)
+	: InsetCollapsible(buffer), params_(label)
 {}
 
 
@@ -114,14 +116,14 @@ docstring InsetBox::layoutName() const
 void InsetBox::write(ostream & os) const
 {
 	params_.write(os);
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
 void InsetBox::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCollapsible::read(lex);
 }
 
 
@@ -163,13 +165,13 @@ void InsetBox::setButtonLabel()
 	if (btype == Boxed)
 		setFrameColor(lcolor.getFromLaTeXName(params_.framecolor));
 	else
-		setFrameColor(Color_collapsableframe);
+		setFrameColor(Color_collapsibleframe);
 }
 
 
 bool InsetBox::hasFixedWidth() const
 {
-	return !params_.width.empty();
+	return !params_.width.empty() && params_.special == "none";
 }
 
 
@@ -180,15 +182,15 @@ bool InsetBox::allowMultiPar() const
 }
 
 
-void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
+void InsetBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	// back up textwidth.
-	int textwidth_backup = m.base.textwidth;
+	int textwidth_backup = mi.base.textwidth;
 	if (hasFixedWidth())
-		m.base.textwidth = params_.width.inPixels(m.base);
-	InsetCollapsable::metrics(m, dim);
+		mi.base.textwidth = mi.base.inPixels(params_.width);
+	InsetCollapsible::metrics(mi, dim);
 	// retore textwidth.
-	m.base.textwidth = textwidth_backup;
+	mi.base.textwidth = textwidth_backup;
 }
 
 
@@ -199,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
@@ -225,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
@@ -285,7 +300,7 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -308,7 +323,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 			flag.setEnabled(true);
 			return true;
 		}
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 
 	case LFUN_INSET_DIALOG_UPDATE:
@@ -316,7 +331,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return true;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 }
 
@@ -334,6 +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(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
@@ -424,7 +440,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 			if (params_.framecolor != "black" || params_.backgroundcolor != "none")
 				os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
 			else
-				os << "\\fbox";
+				os << cprotect << "\\fbox";
 		}
 		os << "{";
 		break;
@@ -728,7 +744,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
 		features.require("framed");
 		break;
 	}
-	InsetCollapsable::validate(features);
+	InsetCollapsible::validate(features);
 }