X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.cpp;h=ec113744964695eaa25f40d5ad45a07e40c795cf;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=893424b04e561f2db92934ca783f54ff0aedaa4e;hpb=142caff8336c54627606c09d3ce5bb7de7a8adb6;p=lyx.git

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 893424b04e..ec11374496 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -102,13 +102,10 @@ InsetBox::InsetBox(Buffer * buffer, string const & label)
 {}
 
 
-docstring InsetBox::name() const 
+docstring InsetBox::layoutName() const
 {
 	// FIXME: UNICODE
-	string name = "Box";
-	if (boxtranslator().find(params_.type) == Shaded)
-		name += ":Shaded";
-	return from_ascii(name);
+	return from_ascii("Box:" + params_.type);
 }
 
 
@@ -182,7 +179,8 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 
 bool InsetBox::forcePlainLayout(idx_type) const
 {
-	return !params_.inner_box && params_.type != "Framed";
+	return (!params_.inner_box || params_.use_makebox)
+		&& params_.type != "Shaded" && params_.type != "Framed";
 }
 
 
@@ -192,9 +190,10 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_INSET_MODIFY: {
 		//lyxerr << "InsetBox::dispatch MODIFY" << endl;
-		if (cmd.getArg(0) == "changetype")
+		cur.recordUndoInset(ATOMIC_UNDO, this);
+		if (cmd.getArg(0) == "changetype") {
 			params_.type = cmd.getArg(1);
-		else
+		} else
 			string2params(to_utf8(cmd.argument()), params_);
 		setButtonLabel();
 		break;
@@ -223,7 +222,8 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return true;
 
 	case LFUN_BREAK_PARAGRAPH:
-		if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded")
+		if ((params_.inner_box && !params_.use_makebox)
+		     || params_.type == "Shaded" || params_.type == "Framed")
 			return InsetCollapsable::getStatus(cur, cmd, flag);
 		flag.setEnabled(false);
 		return true;
@@ -234,7 +234,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 {
 	BoxType btype = boxtranslator().find(params_.type);
 
@@ -268,8 +268,10 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
 		}
 	}
 
-	int i = 0;
-	os << "%\n";
+	os << safebreakln;
+	if (runparams.lastid != -1)
+		os.texrow().start(runparams.lastid, runparams.lastpos);
+
 	// Adapt to column/text width correctly also if paragraphs indented:
 	if (stdwidth)
 		os << "\\noindent";
@@ -279,7 +281,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
 		break;
 	case Framed:
 		os << "\\begin{framed}%\n";
-		i += 1;
 		break;
 	case Boxed:
 		os << "\\framebox";
@@ -365,15 +366,13 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
 		}
 
 		os << "%\n";
-		++i;
 	} // end if inner_box
 
 	if (btype == Shaded) {
 		os << "\\begin{shaded}%\n";
-		++i;
 	}
 
-	i += InsetText::latex(os, runparams);
+	InsetText::latex(os, runparams);
 
 	if (btype == Shaded)
 		os << "\\end{shaded}";
@@ -404,10 +403,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const
 		// already done
 		break;
 	}
-
-	i += 2;
-
-	return i;
 }
 
 
@@ -483,8 +478,11 @@ docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) cons
 	// construct attributes
 	string attrs = "class='" + params_.type + "'";
 	string style;
-	if (!params_.width.empty())
-		style += ("width: " + params_.width.asHTMLString() + "; ");
+	if (!params_.width.empty()) {
+		string w = params_.width.asHTMLString();
+		if (w != "100%")
+			style += ("width: " + params_.width.asHTMLString() + "; ");
+	}
 	// The special heights don't really mean anything for us.
 	if (!params_.height.empty() && params_.height_special == "none")
 		style += ("height: " + params_.height.asHTMLString() + "; ");
@@ -528,7 +526,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+docstring InsetBox::contextMenuName() const
 {
 	return from_ascii("context-box");
 }