X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.cpp;h=2400722fd33f829fcd17b33f75272824a8f5f6fe;hb=2e7d1199dfa7ec7b7d963c374a014f2a2227ae7c;hp=ec4dd6a0756b4d92a0a681c3bedc1fa14b97fe5a;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index ec4dd6a075..2400722fd3 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -15,43 +15,41 @@
 #include "InsetBox.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
-#include "debug.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "TextClass.h"
 
+#include "support/debug.h"
 #include "support/Translator.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::endl;
-
-
 namespace {
 
-typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<string, InsetBox::BoxType> BoxTranslator;
 typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
 
 BoxTranslator const init_boxtranslator()
 {
 	BoxTranslator translator("Boxed", InsetBox::Boxed);
 	translator.addPair("Frameless", InsetBox::Frameless);
+	translator.addPair("Framed", InsetBox::Framed);
 	translator.addPair("ovalbox", InsetBox::ovalbox);
 	translator.addPair("Ovalbox", InsetBox::Ovalbox);
 	translator.addPair("Shadowbox", InsetBox::Shadowbox);
+	translator.addPair("Shaded", InsetBox::Shaded);
 	translator.addPair("Doublebox",InsetBox::Doublebox);
 	return translator;
 }
@@ -59,12 +57,14 @@ BoxTranslator const init_boxtranslator()
 
 BoxTranslatorLoc const init_boxtranslator_loc()
 {
-	BoxTranslatorLoc translator(_("Boxed"), InsetBox::Boxed);
-	translator.addPair(_("Frameless"), InsetBox::Frameless);
-	translator.addPair(_("ovalbox"), InsetBox::ovalbox);
-	translator.addPair(_("Ovalbox"), InsetBox::Ovalbox);
-	translator.addPair(_("Shadowbox"), InsetBox::Shadowbox);
-	translator.addPair(_("Doublebox"), InsetBox::Doublebox);
+	BoxTranslatorLoc translator(_("simple frame"), InsetBox::Boxed);
+	translator.addPair(_("frameless"), InsetBox::Frameless);
+	translator.addPair(_("simple frame, page breaks"), InsetBox::Framed);
+	translator.addPair(_("oval, thin"), InsetBox::ovalbox);
+	translator.addPair(_("oval, thick"), InsetBox::Ovalbox);
+	translator.addPair(_("drop shadow"), InsetBox::Shadowbox);
+	translator.addPair(_("shaded background"), InsetBox::Shaded);
+	translator.addPair(_("double frame"), InsetBox::Doublebox);
 	return translator;
 }
 
@@ -85,25 +85,17 @@ BoxTranslatorLoc const & boxtranslator_loc()
 } // anon
 
 
-void InsetBox::init()
-{
-	setButtonLabel();
-}
-
-
 InsetBox::InsetBox(BufferParams const & bp, string const & label)
 	: InsetCollapsable(bp), params_(label)
 {
-	setLayout(bp);
-	init();
+	if (forceEmptyLayout())
+		paragraphs().back().setLayout(bp.getTextClass().emptyLayout());
 }
 
 
 InsetBox::InsetBox(InsetBox const & in)
 	: InsetCollapsable(in), params_(in.params_)
-{
-	init();
-}
+{}
 
 
 InsetBox::~InsetBox()
@@ -124,6 +116,16 @@ docstring const InsetBox::editMessage() const
 }
 
 
+docstring InsetBox::name() const 
+{
+	// FIXME: UNICODE
+	string name = string("Box");
+	if (boxtranslator().find(params_.type) == Shaded)
+		name += string(":Shaded");
+	return from_ascii(name);
+}
+
+
 void InsetBox::write(Buffer const & buf, ostream & os) const
 {
 	params_.write(os);
@@ -135,17 +137,11 @@ void InsetBox::read(Buffer const & buf, Lexer & lex)
 {
 	params_.read(lex);
 	InsetCollapsable::read(buf, lex);
-	setLayout(buf.params());
-	setButtonLabel();
 }
 
 
 void InsetBox::setButtonLabel()
 {
-	Font font(Font::ALL_SANE);
-	font.decSize();
-	font.decSize();
-
 	BoxType btype = boxtranslator().find(params_.type);
 
 	docstring label;
@@ -161,9 +157,6 @@ void InsetBox::setButtonLabel()
 	label += ")";
 
 	setLabel(label);
-
-	font.setColor(Color_foreground);
-	setLabelFont(font);
 }
 
 
@@ -185,7 +178,7 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 }
 
 
-bool InsetBox::forceDefaultParagraphs(idx_type) const
+bool InsetBox::forceEmptyLayout() const
 {
 	return !params_.inner_box;
 }
@@ -206,7 +199,6 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 		//lyxerr << "InsetBox::dispatch MODIFY" << endl;
 		InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
 		setLayout(cur.buffer().params());
-		setButtonLabel();
 		break;
 	}
 
@@ -252,6 +244,13 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
+bool InsetBox::isMacroScope(Buffer const &) const
+{
+	BoxType btype = boxtranslator().find(params_.type);
+	return btype != Frameless || params_.inner_box;
+}
+
+
 int InsetBox::latex(Buffer const & buf, odocstream & os,
 		    OutputParams const & runparams) const
 {
@@ -265,8 +264,10 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 		stdwidth = true;
 		switch (btype) {
 		case Frameless:
+		case Framed:
 			break;
 		case Boxed:
+		case Shaded:
 			width_string += " - 2\\fboxsep - 2\\fboxrule";
 			break;
 		case ovalbox:
@@ -280,7 +281,7 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 			width_string += " - 2\\fboxsep - 2\\fboxrule"/* "-\\shadowsize"*/;
 			break;
 		case Doublebox:
-			width_string += " - 2\\fboxsep - 7.5\\fboxrule - 1.0pt";
+			width_string += " - 2\\fboxsep - 7.5\\fboxrule - 1pt";
 			break;
 		}
 	}
@@ -294,6 +295,10 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 	switch (btype) {
 	case Frameless:
 		break;
+	case Framed:
+		os << "\\begin{framed}%\n";
+		i += 1;
+		break;
 	case Boxed:
 		os << "\\framebox";
 		if (!params_.inner_box) {
@@ -322,6 +327,9 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 	case Shadowbox:
 		os << "\\shadowbox{";
 		break;
+	case Shaded:
+		// later
+		break;
 	case Doublebox:
 		os << "\\doublebox{";
 		break;
@@ -362,9 +370,15 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 		os << "%\n";
 		i += 1;
 	}
+	if (btype == Shaded)
+		os << "\\begin{shaded}%\n";
+		i += 1;
 
 	i += InsetText::latex(buf, os, runparams);
 
+	if (btype == Shaded)
+		os << "\\end{shaded}";
+
 	if (params_.inner_box) {
 		if (params_.use_parbox)
 			os << "%\n}";
@@ -375,6 +389,9 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 	switch (btype) {
 	case Frameless:
 		break;
+	case Framed:
+		os << "\\end{framed}";
+		break;
 	case Boxed:
 		if (!params_.inner_box)
 			os << "}"; // for makebox
@@ -386,10 +403,12 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 	case Shadowbox:
 		os << "}";
 		break;
+	case Shaded:
+		// already done
+		break;
 	}
-	os << "%\n";
 
-	i += 3;
+	i += 2;
 
 	return i;
 }
@@ -401,24 +420,56 @@ int InsetBox::plaintext(Buffer const & buf, odocstream & os,
 	BoxType const btype = boxtranslator().find(params_.type);
 
 	switch (btype) {
-		case Frameless: break;
-		case Boxed:     os << "[\n";  break;
-		case ovalbox:   os << "(\n";  break;
-		case Ovalbox:   os << "((\n"; break;
-		case Shadowbox: os << "[/\n"; break;
-		case Doublebox: os << "[[\n"; break;
+		case Frameless:
+			break;
+		case Framed:
+		case Boxed:
+			os << "[\n";
+			break;
+		case ovalbox:
+			os << "(\n";
+			break;
+		case Ovalbox:
+			os << "((\n";
+			break;
+		case Shadowbox:
+		case Shaded:
+			os << "[/\n";
+			break;
+		case Doublebox:
+			os << "[[\n";
+			break;
 	}
 
 	InsetText::plaintext(buf, os, runparams);
 
 	int len = 0;
 	switch (btype) {
-		case Frameless: os << "\n";            break;
-		case Boxed:     os << "\n]";  len = 1; break;
-		case ovalbox:   os << "\n)";  len = 1; break;
-		case Ovalbox:   os << "\n))"; len = 2; break;
-		case Shadowbox: os << "\n/]"; len = 2; break;
-		case Doublebox: os << "\n]]"; len = 2; break;
+		case Frameless:
+			os << "\n";
+			break;
+		case Framed:
+		case Boxed:
+			os << "\n]";
+			len = 1;
+			break;
+		case ovalbox:
+			os << "\n)";
+			len = 1;
+			break;
+		case Ovalbox:
+			os << "\n))";
+			len = 2;
+			break;
+		case Shadowbox:
+		case Shaded:
+			os << "\n/]";
+			len = 2;
+			break;
+		case Doublebox:
+			os << "\n]]";
+			len = 2;
+			break;
 	}
 
 	return PLAINTEXT_NEWLINE + len; // len chars on a separate line
@@ -438,6 +489,9 @@ void InsetBox::validate(LaTeXFeatures & features) const
 	switch (btype) {
 	case Frameless:
 		break;
+	case Framed:
+		features.require("framed");
+		break;
 	case Boxed:
 		features.require("calc");
 		break;
@@ -448,6 +502,10 @@ void InsetBox::validate(LaTeXFeatures & features) const
 		features.require("calc");
 		features.require("fancybox");
 		break;
+	case Shaded:
+		features.require("color");
+		features.require("framed");
+		break;
 	}
 	InsetText::validate(features);
 }