X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbox.C;h=2af61d15e5f8c4343bb0e4a04d02b8b7be3cc14b;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=7d0a0ad35ea511970d95e92d6ae9da663bb0a6e7;hpb=1fc0c01877f19d8194b6b22e61aa3db5fa2b1671;p=lyx.git

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 7d0a0ad35e..2af61d15e5 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -30,6 +30,9 @@
 
 #include <sstream>
 
+
+namespace lyx {
+
 using std::auto_ptr;
 using std::string;
 using std::istringstream;
@@ -41,8 +44,10 @@ using std::endl;
 namespace {
 
 typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
 
-BoxTranslator const init_boxtranslator() {
+BoxTranslator const init_boxtranslator()
+{
 	BoxTranslator translator("Boxed", InsetBox::Boxed);
 	translator.addPair("Frameless", InsetBox::Frameless);
 	translator.addPair("ovalbox", InsetBox::ovalbox);
@@ -53,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);
@@ -64,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;
 }
 
@@ -80,7 +88,7 @@ BoxTranslator const & boxtranslator_loc() {
 
 void InsetBox::init()
 {
-	setInsetName("Box");
+	setInsetName(from_ascii("Box"));
 	setButtonLabel();
 }
 
@@ -111,7 +119,7 @@ auto_ptr<InsetBase> InsetBox::doClone() const
 }
 
 
-string const InsetBox::editMessage() const
+docstring const InsetBox::editMessage() const
 {
 	return _("Opened Box Inset");
 }
@@ -139,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(_("Box") + " (" + _("Parbox") + ")");
+			label += _("Parbox");
 		else
-			setLabel(_("Box") + " (" + _("Minipage") + ")");
+			label += _("Minipage");
 	} else
-		setLabel(_("Box") + " (" + boxtranslator_loc().find(btype) + ")");
+		label += boxtranslator_loc().find(btype);
+	label += ")";
+
+	setLabel(label);
 
 	font.setColor(LColor::foreground);
 	setBackgroundColor(LColor::background);
@@ -153,13 +168,21 @@ void InsetBox::setButtonLabel()
 }
 
 
-void InsetBox::metrics(MetricsInfo & m, 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 (params_.inner_box || params_.special != "width")
+	if (hasFixedWidth())
 		mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
 	InsetCollapsable::metrics(mi, dim);
+	bool const changed = dim_ != dim;
 	dim_ = dim;
+	return changed;
 }
 
 
@@ -181,8 +204,8 @@ void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
 	switch (cmd.action) {
 
 	case LFUN_INSET_MODIFY: {
-		lyxerr << "InsetBox::dispatch MODIFY" << endl;
-		InsetBoxMailer::string2params(lyx::to_utf8(cmd.argument()), params_);
+		//lyxerr << "InsetBox::dispatch MODIFY" << endl;
+		InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
 		break;
 	}
@@ -198,13 +221,6 @@ void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
 		}
 		InsetCollapsable::doDispatch(cur, cmd);
 		break;
-	case LFUN_PASTE:
-	case LFUN_CLIPBOARD_PASTE:
-	case LFUN_PRIMARY_SELECTION_PASTE:
-		InsetCollapsable::doDispatch(cur, cmd);
-		if (!params_.inner_box)
-			forceParagraphsToDefault(cur);
-		break;
 
 	default:
 		InsetCollapsable::doDispatch(cur, cmd);
@@ -236,7 +252,7 @@ bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetBox::latex(Buffer const & buf, ostream & os,
+int InsetBox::latex(Buffer const & buf, odocstream & os,
 				OutputParams const & runparams) const
 {
 	BoxType btype = boxtranslator().find(params_.type);
@@ -283,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 << "]";
 		}
@@ -316,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 << "{";
@@ -365,14 +389,14 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetBox::docbook(Buffer const & buf, std::ostream & os,
+int InsetBox::docbook(Buffer const & buf, odocstream & os,
 		      OutputParams const & runparams) const
 {
 	return InsetText::docbook(buf, os, runparams);
 }
 
 
-int InsetBox::plaintext(Buffer const & buf, std::ostream & os,
+int InsetBox::plaintext(Buffer const & buf, odocstream & os,
 		    OutputParams const & runparams) const
 {
 	BoxType const btype = boxtranslator().find(params_.type);
@@ -613,3 +637,6 @@ void InsetBoxParams::read(LyXLex & lex)
 		lex.pushToken(token);
 	}
 }
+
+
+} // namespace lyx