X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.cpp;h=28d79c08de85cea8355bde442e0fa9230fcff9b9;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=0156603f764d3906599bb496cceae9549ad6004d;hpb=34da63445181325d846d47e866637fe72b38b984;p=lyx.git

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 0156603f76..28d79c08de 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"
@@ -158,12 +160,18 @@ void InsetBox::setButtonLabel()
 		label = bformat(_("%1$s (%2$s, %3$s)"),
 			type, inner, frame);
 	setLabel(label);
+
+	// set the frame color for the inset if the type is Boxed
+	if (btype == Boxed)
+		setFrameColor(lcolor.getFromLaTeXName(params_.framecolor));
+	else
+		setFrameColor(Color_collapsableframe);
 }
 
 
 bool InsetBox::hasFixedWidth() const
 {
-	return !params_.width.empty();
+	return !params_.width.empty() && params_.special == "none";
 }
 
 
@@ -195,15 +203,50 @@ bool InsetBox::forcePlainLayout(idx_type) const
 
 ColorCode InsetBox::backgroundColor(PainterInfo const &) const
 {
-	if (params_.type != "Shaded")
-		return getLayout().bgcolor();
-	// FIXME: This hardcoded color is a hack!
-	if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
+	// we only support background color for 3 types
+	if (params_.type != "Shaded" && params_.type != "Frameless" && params_.type != "Boxed")
 		return getLayout().bgcolor();
-	ColorCode c = lcolor.getFromLyXName("boxbgcolor");
-	if (c == Color_none)
-		return getLayout().bgcolor();
-	return c;
+
+	if (params_.type == "Shaded") {
+		// FIXME: This hardcoded color is a hack!
+		if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
+			return getLayout().bgcolor();
+
+		ColorCode c = lcolor.getFromLyXName("boxbgcolor");
+		if (c == Color_none)
+			return getLayout().bgcolor();
+		return c;
+	}
+
+	if (params_.backgroundcolor != "none")
+		return lcolor.getFromLaTeXName(params_.backgroundcolor);
+
+	return getLayout().bgcolor();
+}
+
+
+LyXAlignment InsetBox::contentAlignment() const
+{
+	if (!params_.use_makebox)
+		return LYX_ALIGN_NONE;
+
+	// The default value below is actually irrelevant
+	LyXAlignment align = LYX_ALIGN_NONE;
+	switch (params_.hor_pos) {
+	case 'l':
+		align = LYX_ALIGN_LEFT;
+		break;
+	case 'c':
+		align = LYX_ALIGN_CENTER;
+		break;
+	case 'r':
+		align = LYX_ALIGN_RIGHT;
+		break;
+	case 's':
+		align = LYX_ALIGN_BLOCK;
+		break;
+	}
+	return align;
 }
 
 
@@ -223,9 +266,21 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 			return;
 		}
 		cur.recordUndoInset(this);
-		if (change_type)
+		if (change_type) {
 			params_.type = cmd.getArg(1);
-		else // if (for_box)
+			// set a makebox if there is no inner box but Frameless was exectued
+			// otherwise the result would be a non existent box (no inner AND outer box)
+			// (this was LyX bug 8712)
+			if (params_.type == "Frameless" && !params_.inner_box) {
+				params_.use_makebox = true;
+				params_.inner_box = true;
+			}
+			// handle the opposite case
+			if (params_.type == "Boxed" && params_.use_makebox) {
+				params_.use_makebox = false;
+				params_.inner_box = false;
+			}
+		} else
 			string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
 		break;
@@ -268,17 +323,18 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
+const string defaultThick = "0.4pt";
+const string defaultSep = "3pt";
+const string defaultShadow = "4pt";
+
 void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 {
 	BoxType btype = boxtranslator().find(params_.type);
 
 	string width_string = params_.width.asLatexString();
 	string thickness_string = params_.thickness.asLatexString();
-	const string defaultThick = "0.4pt";
 	string separation_string = params_.separation.asLatexString();
-	const string defaultSep = "3pt";
 	string shadowsize_string = params_.shadowsize.asLatexString();
-	const string defaultShadow = "4pt";
 	bool stdwidth = false;
 	// 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
@@ -330,77 +386,79 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 	case Frameless:
 		break;
 	case Framed:
-		if (!(thickness_string.find(defaultThick) != string::npos)) {
+		if (thickness_string != defaultThick) {
 			os << "{\\FrameRule " << from_ascii(thickness_string);
-			if (!(separation_string.find(defaultSep) != string::npos))
+			if (separation_string != defaultSep)
 				os << "\\FrameSep " << from_ascii(separation_string);
 		}
-		if (!(separation_string.find(defaultSep) != string::npos)
-			&& (thickness_string.find(defaultThick) != string::npos))
+		if (separation_string != defaultSep && thickness_string == defaultThick)
 			os << "{\\FrameSep " << from_ascii(separation_string);
 
 		os << "\\begin{framed}%\n";
 		break;
 	case Boxed:
-		if (!(thickness_string.find(defaultThick) != string::npos)) {
+		if (thickness_string != defaultThick) {
 			os << "{\\fboxrule " << from_ascii(thickness_string);
-			if (!(separation_string.find(defaultSep) != string::npos))
+			if (separation_string != defaultSep)
 				os << "\\fboxsep " << from_ascii(separation_string);
 		}
-		if (!(separation_string.find(defaultSep) != string::npos)
-			&& (thickness_string.find(defaultThick) != string::npos))
+		if (separation_string != defaultSep && thickness_string == defaultThick)
 			os << "{\\fboxsep " << from_ascii(separation_string);
-		if (!width_string.empty()) {
-			if (!params_.inner_box) {
+		if (!params_.inner_box && !width_string.empty()) {
+			if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
+				os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
+				os << "\\makebox";
+			} else
 				os << "\\framebox";
-				// Special widths, see usrguide sec. 3.5
-				// FIXME UNICODE
-				if (params_.special != "none") {
-					os << "[" << params_.width.value()
-					   << '\\' << from_utf8(params_.special)
-					   << ']';
-				} else
-					os << '[' << from_ascii(width_string)
-					   << ']';
-				if (params_.hor_pos != 'c')
-					os << "[" << params_.hor_pos << "]";
+			// Special widths, see usrguide sec. 3.5
+			// FIXME UNICODE
+			if (params_.special != "none") {
+				os << "[" << params_.width.value()
+				   << '\\' << from_utf8(params_.special)
+				   << ']';
 			} else
+				os << '[' << from_ascii(width_string)
+				   << ']';
+			// default horizontal alignment is 'c'
+			if (params_.hor_pos != 'c')
+				os << "[" << params_.hor_pos << "]";
+		} else {
+			if (params_.framecolor != "black" || params_.backgroundcolor != "none")
+				os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
+			else
 				os << "\\fbox";
-		} else
-			os << "\\fbox";
+		}
 		os << "{";
 		break;
 	case ovalbox:
-		if (!separation_string.empty() && separation_string.find(defaultSep) == string::npos)
+		if (!separation_string.empty() && separation_string != defaultSep)
 			os << "{\\fboxsep " << from_ascii(separation_string);
 		os << "\\ovalbox{";
 		break;
 	case Ovalbox:
-		if (!separation_string.empty() && separation_string.find(defaultSep) == string::npos)
+		if (!separation_string.empty() && separation_string != defaultSep)
 			os << "{\\fboxsep " << from_ascii(separation_string);
 		os << "\\Ovalbox{";
 		break;
 	case Shadowbox:
-		if (!(thickness_string.find(defaultThick) != string::npos)) {
+		if (thickness_string != defaultThick) {
 			os << "{\\fboxrule " << from_ascii(thickness_string);
-			if (!(separation_string.find(defaultSep) != string::npos)) {
+			if (separation_string != defaultSep) {
 				os << "\\fboxsep " << from_ascii(separation_string);
-				if (!(shadowsize_string.find(defaultShadow) != string::npos))
+				if (shadowsize_string != defaultShadow)
 					os << "\\shadowsize " << from_ascii(shadowsize_string);
 			}
-			if (!(shadowsize_string.find(defaultShadow) != string::npos)
-				&& (separation_string.find(defaultSep) != string::npos))
+			if (shadowsize_string != defaultShadow	&& separation_string == defaultSep)
 				os << "\\shadowsize " << from_ascii(shadowsize_string);
 		}
-		if (!(separation_string.find(defaultSep) != string::npos)
-			&& (thickness_string.find(defaultThick) != string::npos)) {
+		if (separation_string != defaultSep && thickness_string == defaultThick) {
 				os << "{\\fboxsep " << from_ascii(separation_string);
-				if (!(shadowsize_string.find(defaultShadow) != string::npos))
+				if (shadowsize_string != defaultShadow)
 					os << "\\shadowsize " << from_ascii(shadowsize_string);
 		}
-		if (!(shadowsize_string.find(defaultShadow) != string::npos)
-				&& (separation_string.find(defaultSep) != string::npos)
-				&& (thickness_string.find(defaultThick) != string::npos))
+		if (shadowsize_string != defaultShadow
+				&& separation_string == defaultSep
+				&& thickness_string == defaultThick)
 				os << "{\\shadowsize " << from_ascii(shadowsize_string);
 		os << "\\shadowbox{";
 		break;
@@ -409,23 +467,26 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 		// it is inside a minipage or parbox
 		break;
 	case Doublebox:
-		if (!(thickness_string.find(defaultThick) != string::npos)) {
+		if (thickness_string != defaultThick) {
 			os << "{\\fboxrule " << from_ascii(thickness_string);
-			if (!(separation_string.find(defaultSep) != string::npos))
+			if (separation_string != defaultSep)
 				os << "\\fboxsep " << from_ascii(separation_string);
 		}
-		if (!(separation_string.find(defaultSep) != string::npos)
-			&& (thickness_string.find(defaultThick) != string::npos))
+		if (separation_string != defaultSep && thickness_string == defaultThick)
 			os << "{\\fboxsep " << from_ascii(separation_string);
 		os << "\\doublebox{";
 		break;
 	}
 
 	if (params_.inner_box) {
-		if (params_.use_parbox)
+		if (params_.use_parbox) {
+			if (params_.backgroundcolor != "none" && btype == Frameless)
+				os << "\\colorbox{" << params_.backgroundcolor << "}{";
 			os << "\\parbox";
-		else if (params_.use_makebox) {
+		} else if (params_.use_makebox) {
 			if (!width_string.empty()) {
+				if (params_.backgroundcolor != "none")
+					os << "\\colorbox{" << params_.backgroundcolor << "}{";
 				os << "\\makebox";
 				// FIXME UNICODE
 				// output the width and horizontal position
@@ -438,12 +499,19 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 					   << ']';
 				if (params_.hor_pos != 'c')
 					os << "[" << params_.hor_pos << "]";
-			} else
-				os << "\\mbox";
+			} else {
+				if (params_.backgroundcolor != "none")
+					os << "\\colorbox{" << params_.backgroundcolor << "}";
+				else
+					os << "\\mbox";
+			}
 			os << "{";
 		}
-		else
+		else {
+			if (params_.backgroundcolor != "none" && btype == Frameless)
+				os << "\\colorbox{" << params_.backgroundcolor << "}{";
 			os << "\\begin{minipage}";
+		}
 
 		// output parameters for parbox and minipage
 		if (!params_.use_makebox) {
@@ -480,23 +548,6 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 		os << "\\begin{shaded}%\n";
 	}
 
-	// \framebox and \makebox handle hor_pos their own way
-	// hor_pos is senseless for \mbox and \fbox
-	if (!(params_.use_makebox)
-		&& !(btype == Boxed && !params_.inner_box)) {
-			switch (params_.hor_pos) {
-			case 'l':
-				// do nothing because this is LaTeX's default
-				break;
-			case 'c':
-				os << "\\centering ";
-				break;
-			case 'r':
-				os << "\\raggedleft ";
-				break;
-			}
-	}
-
 	InsetText::latex(os, runparams);
 
 	if (btype == Shaded)
@@ -507,6 +558,9 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 			os << "%\n}";
 		else
 			os << "%\n\\end{minipage}";
+		if (params_.backgroundcolor != "none" && btype == Frameless
+			&& !(params_.use_makebox && width_string.empty()))
+			os << "}";
 	}
 
 	switch (btype) {
@@ -514,37 +568,37 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 		break;
 	case Framed:
 		os << "\\end{framed}";
-		if (!(separation_string.find(defaultSep) != string::npos)
-			|| !(thickness_string.find(defaultThick) != string::npos))
+		if (separation_string != defaultSep	|| thickness_string != defaultThick)
 			os << "}";
 		break;
 	case Boxed:
 		os << "}";
-		if (!(separation_string.find(defaultSep) != string::npos)
-			|| !(thickness_string.find(defaultThick) != string::npos))
+		if (!params_.inner_box && !width_string.empty()
+			&& (params_.framecolor != "black" || params_.backgroundcolor != "none"))
+			os << "}";
+		if (separation_string != defaultSep	|| thickness_string != defaultThick)
 			os << "}";
 		break;
 	case ovalbox:
 		os << "}";
-		if (!(separation_string.find(defaultSep) != string::npos))
+		if (separation_string != defaultSep)
 			os << "}";
 		break;
 	case Ovalbox:
 		os << "}";
-		if (!(separation_string.find(defaultSep) != string::npos))
+		if (separation_string != defaultSep)
 			os << "}";
 		break;
 	case Doublebox:
 		os << "}";
-		if (!(separation_string.find(defaultSep) != string::npos)
-			|| !(thickness_string.find(defaultThick) != string::npos))
+		if (separation_string != defaultSep || thickness_string != defaultThick)
 			os << "}";
 		break;
 	case Shadowbox:
 		os << "}";
-		if (!(separation_string.find(defaultSep) != string::npos)
-			|| !(thickness_string.find(defaultThick) != string::npos)
-			|| !(shadowsize_string.find(defaultShadow) != string::npos))
+		if (separation_string != defaultSep
+			|| thickness_string != defaultThick
+			|| shadowsize_string != defaultShadow)
 			os << "}";
 		break;
 	case Shaded:
@@ -652,6 +706,8 @@ void InsetBox::validate(LaTeXFeatures & features) const
 	BoxType btype = boxtranslator().find(params_.type);
 	switch (btype) {
 	case Frameless:
+		if (params_.backgroundcolor != "none")
+			features.require("xcolor");
 		break;
 	case Framed:
 		features.require("calc");
@@ -659,6 +715,8 @@ void InsetBox::validate(LaTeXFeatures & features) const
 		break;
 	case Boxed:
 		features.require("calc");
+		if (params_.framecolor != "black" || params_.backgroundcolor != "none")
+			features.require("xcolor");
 		break;
 	case ovalbox:
 	case Ovalbox:
@@ -740,9 +798,11 @@ InsetBoxParams::InsetBoxParams(string const & label)
 	  inner_pos('t'),
 	  height(Length("1in")),
 	  height_special("totalheight"), // default is 1\\totalheight
-	  thickness(Length("0.4pt")),
-	  separation(Length("3pt")),
-	  shadowsize(Length("4pt"))
+	  thickness(Length(defaultThick)),
+	  separation(Length(defaultSep)),
+	  shadowsize(Length(defaultShadow)),
+	  framecolor("black"),
+	  backgroundcolor("none")
 {}
 
 
@@ -762,6 +822,8 @@ void InsetBoxParams::write(ostream & os) const
 	os << "thickness \"" << thickness.asString() << "\"\n";
 	os << "separation \"" << separation.asString() << "\"\n";
 	os << "shadowsize \"" << shadowsize.asString() << "\"\n";
+	os << "framecolor \"" << framecolor << "\"\n";
+	os << "backgroundcolor \"" << backgroundcolor << "\"\n";
 }
 
 
@@ -784,6 +846,8 @@ void InsetBoxParams::read(Lexer & lex)
 	lex >> "thickness" >> thickness;
 	lex >> "separation" >> separation;
 	lex >> "shadowsize" >> shadowsize;
+	lex >> "framecolor" >> framecolor;
+	lex >> "backgroundcolor" >> backgroundcolor;
 }