X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbox.C;h=2af61d15e5f8c4343bb0e4a04d02b8b7be3cc14b;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=62748c2274be506ea8bd2bfb413d501b7e67147c;hpb=16e1f90daad4974183e6a9766d3f0391ac9bcf0b;p=lyx.git

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 62748c2274..2af61d15e5 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -13,9 +13,11 @@
 #include <config.h>
 
 #include "insetbox.h"
-#include "debug.h"
 
-#include "BufferView.h"
+#include "cursor.h"
+#include "dispatchresult.h"
+#include "debug.h"
+#include "FuncStatus.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
@@ -24,7 +26,12 @@
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
+#include "support/translator.h"
+
+#include <sstream>
+
+
+namespace lyx {
 
 using std::auto_ptr;
 using std::string;
@@ -36,7 +43,11 @@ using std::endl;
 
 namespace {
 
-BoxTranslator const init_boxtranslator() {
+typedef Translator<std::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("ovalbox", InsetBox::ovalbox);
@@ -47,8 +58,9 @@ BoxTranslator const init_boxtranslator() {
 }
 
 
-BoxTranslator const init_boxtranslator_loc() {
-	BoxTranslator translator(_("Boxed"), InsetBox::Boxed);
+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);
@@ -58,14 +70,16 @@ BoxTranslator const init_boxtranslator_loc() {
 }
 
 
-BoxTranslator const & boxtranslator() {
+BoxTranslator const & boxtranslator()
+{
 	static BoxTranslator translator = init_boxtranslator();
 	return translator;
 }
 
 
-BoxTranslator const & boxtranslator_loc() {
-	static BoxTranslator translator = init_boxtranslator_loc();
+BoxTranslatorLoc const & boxtranslator_loc()
+{
+	static BoxTranslatorLoc translator = init_boxtranslator_loc();
 	return translator;
 }
 
@@ -74,7 +88,7 @@ BoxTranslator const & boxtranslator_loc() {
 
 void InsetBox::init()
 {
-	setInsetName("Box");
+	setInsetName(from_ascii("Box"));
 	setButtonLabel();
 }
 
@@ -95,18 +109,17 @@ InsetBox::InsetBox(InsetBox const & in)
 
 InsetBox::~InsetBox()
 {
-	InsetBoxMailer mailer(*this);
-	mailer.hideDialog();
+	InsetBoxMailer(*this).hideDialog();
 }
 
 
-auto_ptr<InsetBase> InsetBox::clone() const
+auto_ptr<InsetBase> InsetBox::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetBox(*this));
 }
 
 
-string const InsetBox::editMessage() const
+docstring const InsetBox::editMessage() const
 {
 	return _("Opened Box Inset");
 }
@@ -134,13 +147,20 @@ void InsetBox::setButtonLabel()
 	font.decSize();
 
 	BoxType btype = boxtranslator().find(params_.type);
+
+	docstring label;
+	label += _("Box");
+	label += " (";
 	if (btype == Frameless) {
 		if (params_.use_parbox)
-			setLabel(_("Parbox"));
+			label += _("Parbox");
 		else
-			setLabel(_("Minipage"));
+			label += _("Minipage");
 	} else
-		setLabel(boxtranslator_loc().find(btype));
+		label += boxtranslator_loc().find(btype);
+	label += ")";
+
+	setLabel(label);
 
 	font.setColor(LColor::foreground);
 	setBackgroundColor(LColor::background);
@@ -148,12 +168,27 @@ void InsetBox::setButtonLabel()
 }
 
 
-void InsetBox::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetBox::hasFixedWidth() const
+{
+      return params_.inner_box || params_.special != "width";
+}
+
+
+bool InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 {
+	MetricsInfo mi = m;
+	if (hasFixedWidth())
+		mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
 	InsetCollapsable::metrics(mi, dim);
-	if (params_.inner_box && isOpen())
-		dim.wid = mi.base.textwidth;
+	bool const changed = dim_ != dim;
 	dim_ = dim;
+	return changed;
+}
+
+
+bool InsetBox::forceDefaultParagraphs(idx_type) const
+{
+	return !params_.inner_box;
 }
 
 
@@ -164,37 +199,61 @@ bool InsetBox::showInsetDialog(BufferView * bv) const
 }
 
 
-dispatch_result InsetBox::localDispatch(FuncRequest const & cmd)
+void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-	BufferView * bv = cmd.view();
-
 	switch (cmd.action) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetBoxMailer::string2params(cmd.argument, params_);
+		//lyxerr << "InsetBox::dispatch MODIFY" << endl;
+		InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
-		bv->updateInset(this);
-		return DISPATCHED;
+		break;
 	}
+
 	case LFUN_INSET_DIALOG_UPDATE:
-		InsetBoxMailer(*this).updateDialog(bv);
-		return DISPATCHED;
+		InsetBoxMailer(*this).updateDialog(&cur.bv());
+		break;
 
 	case LFUN_MOUSE_RELEASE:
 		if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
-			InsetBoxMailer(*this).showDialog(bv);
-			return DISPATCHED;
+			InsetBoxMailer(*this).showDialog(&cur.bv());
+			break;
 		}
-		// fallthrough:
+		InsetCollapsable::doDispatch(cur, cmd);
+		break;
 
 	default:
-		return InsetCollapsable::localDispatch(cmd);
+		InsetCollapsable::doDispatch(cur, cmd);
+		break;
 	}
 }
 
 
-int InsetBox::latex(Buffer const & buf, ostream & os,
-				LatexRunParams const & runparams) const
+bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
+{
+	switch (cmd.action) {
+
+	case LFUN_INSET_MODIFY:
+	case LFUN_INSET_DIALOG_UPDATE:
+		flag.enabled(true);
+		return true;
+	case LFUN_BREAK_PARAGRAPH:
+		if (params_.inner_box) {
+			return InsetCollapsable::getStatus(cur, cmd, flag);
+		} else {
+			flag.enabled(false);
+			return true;
+		}
+
+	default:
+		return InsetCollapsable::getStatus(cur, cmd, flag);
+	}
+}
+
+
+int InsetBox::latex(Buffer const & buf, odocstream & os,
+				OutputParams const & runparams) const
 {
 	BoxType btype = boxtranslator().find(params_.type);
 
@@ -240,11 +299,14 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 		if (!params_.inner_box) {
 			os << "{\\makebox";
 			// Special widths, see usrguide §3.5
+			// FIXME UNICODE
 			if (params_.special != "none") {
 				os << "[" << params_.width.value()
-				   << "\\" << params_.special << "]";
+				   << '\\' << from_utf8(params_.special)
+				   << ']';
 			} else
-				os << "[" << width_string << "]";
+				os << '[' << from_ascii(width_string)
+				   << ']';
 			if (params_.hor_pos != 'c')
 				os << "[" << params_.hor_pos << "]";
 		}
@@ -273,16 +335,21 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 
 		os << "[" << params_.pos << "]";
 		if (params_.height_special == "none") {
-			os << "[" << params_.height.asLatexString() << "]";
+			// FIXME UNICODE
+			os << '[' << from_ascii(params_.height.asLatexString())
+			   << ']';
 		} else {
 			// Special heights
+			// FIXME UNICODE
 			os << "[" << params_.height.value()
-			   << "\\" << params_.height_special << "]";
+			   << '\\' << from_utf8(params_.height_special)
+			   << ']';
 		}
 		if (params_.inner_pos != params_.pos)
 			os << "[" << params_.inner_pos << "]";
 
-		os << "{" << width_string << "}";
+		// FIXME UNICODE
+		os << '{' << from_ascii(width_string) << '}';
 
 		if (params_.use_parbox)
 			os << "{";
@@ -290,7 +357,7 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 		i += 1;
 	}
 
-	i += inset.latex(buf, os, runparams);
+	i += InsetText::latex(buf, os, runparams);
 
 	if (params_.inner_box) {
 		if (params_.use_parbox)
@@ -322,63 +389,36 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetBox::linuxdoc(Buffer const & buf, std::ostream & os) const
+int InsetBox::docbook(Buffer const & buf, odocstream & os,
+		      OutputParams const & runparams) const
 {
-	return inset.linuxdoc(buf, os);
+	return InsetText::docbook(buf, os, runparams);
 }
 
 
-int InsetBox::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
+int InsetBox::plaintext(Buffer const & buf, odocstream & os,
+		    OutputParams const & runparams) const
 {
-	return inset.docbook(buf, os, mixcont);
-}
-
+	BoxType const btype = boxtranslator().find(params_.type);
 
-int InsetBox::ascii(Buffer const & buf, std::ostream & os, int ll) const
-{
-	int i = 0;
-	string const pt = params_.type;
-	BoxType btype = boxtranslator().find(params_.type);
 	switch (btype) {
-		case Frameless:
-		break;
-		case Boxed:
-		os << "[";
-		break;
-		case ovalbox:
-		os << "(";
-		break;
-		case Ovalbox:
-		os << "((";
-		break;
-		case Shadowbox:
-		os << "[";
-		break;
-		case Doublebox:
-		os << "[[";
-		break;
+		case Frameless: break;
+		case Boxed:     os << "[";  break;
+		case ovalbox:   os << "(";  break;
+		case Ovalbox:   os << "(("; break;
+		case Shadowbox: os << "[";  break;
+		case Doublebox: os << "[["; break;
 	}
 
-	i = inset.ascii(buf, os, ll);
+	int i = InsetText::plaintext(buf, os, runparams);
 
 	switch (btype) {
-		case Frameless:
-		break;
-		case Boxed:
-		os << "]";
-		break;
-		case ovalbox:
-		os << ")";
-		break;
-		case Ovalbox:
-		os << "))";
-		break;
-		case Shadowbox:
-		os << "]/";
-		break;
-		case Doublebox:
-		os << "]]";
-		break;
+		case Frameless: break;
+		case Boxed:     os << "]";  break;
+		case ovalbox:   os << ")";  break;
+		case Ovalbox:   os << "))"; break;
+		case Shadowbox: os << "]/"; break;
+		case Doublebox: os << "]]"; break;
 	}
 
 	return i;
@@ -400,14 +440,13 @@ void InsetBox::validate(LaTeXFeatures & features) const
 		features.require("fancybox");
 		break;
 	}
-	inset.validate(features);
+	InsetText::validate(features);
 }
 
 
 InsetBoxMailer::InsetBoxMailer(InsetBox & inset)
 	: inset_(inset)
-{
-}
+{}
 
 
 string const InsetBoxMailer::name_ = "box";
@@ -429,10 +468,9 @@ string const InsetBoxMailer::params2string(InsetBoxParams const & params)
 
 
 void InsetBoxMailer::string2params(string const & in,
-	InsetBoxParams & params)
+				   InsetBoxParams & params)
 {
 	params = InsetBoxParams(string());
-
 	if (in.empty())
 		return;
 
@@ -440,10 +478,17 @@ void InsetBoxMailer::string2params(string const & in,
 	LyXLex lex(0,0);
 	lex.setStream(data);
 
-	string token;
-	lex.next();
-	token = lex.getString();
-	lex.next();
+	string name;
+	lex >> name;
+	if (!lex || name != name_)
+		return print_mailer_error("InsetBoxMailer", in, 1, name_);
+
+	// This is part of the inset proper that is usually swallowed
+	// by LyXText::readInset
+	string id;
+	lex >> id;
+	if (!lex || id != "Box")
+		return print_mailer_error("InsetBoxMailer", in, 2, "Box");
 
 	params.read(lex);
 }
@@ -465,7 +510,7 @@ InsetBoxParams::InsetBoxParams(string const & label)
 
 void InsetBoxParams::write(ostream & os) const
 {
-	os << type << "\n";
+	os << "Box " << type << "\n";
 	os << "position \"" << pos << "\"\n";
 	os << "hor_pos \"" << hor_pos << "\"\n";
 	os << "has_inner_box " << inner_box << "\n";
@@ -480,13 +525,17 @@ void InsetBoxParams::write(ostream & os) const
 
 void InsetBoxParams::read(LyXLex & lex)
 {
+	if (!lex.isOK())
+		return;
+
 	if (lex.isOK()) {
+		lex.next();
 		type = lex.getString();
 	}
-	string token;
 	if (!lex.isOK())
 		return;
 	lex.next();
+	string token;
 	token = lex.getString();
 	if (token == "position") {
 		lex.next();
@@ -588,3 +637,6 @@ void InsetBoxParams::read(LyXLex & lex)
 		lex.pushToken(token);
 	}
 }
+
+
+} // namespace lyx