X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetmarginal.C;h=b4aa735602644e5ab46ad291ac3763b7574276b7;hb=7521b5d20f42102cf444e3fd8718a088a60d0098;hp=4a631bd8ccef46150748636aa2542e3fd76bb1d5;hpb=74784ee97b67490c7bb82128bff76f0e8f94a139;p=lyx.git

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 4a631bd8cc..b4aa735602 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -32,38 +32,40 @@ InsetMarginal::InsetMarginal()
 }
 
 
-Inset * InsetMarginal::Clone(Buffer const &) const
+Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
 {
 	InsetMarginal * result = new InsetMarginal;
-	result->inset.init(&inset);
+	result->inset.init(&inset, same_id);
 	
 	result->collapsed = collapsed;
+	if (same_id)
+		result->id_ = id_;
 	return result;
 }
 
 
-string const InsetMarginal::EditMessage() const
+string const InsetMarginal::editMessage() const
 {
 	return _("Opened Marginal Note Inset");
 }
 
 
-int InsetMarginal::Latex(Buffer const * buf,
+int InsetMarginal::latex(Buffer const * buf,
 			 std::ostream & os, bool fragile, bool fp) const
 {
-	os << "\\marginpar{%\n";
+	os << "%\n\\marginpar{";
 	
-	int const i = inset.Latex(buf, os, fragile, fp);
-	os << "}%\n";
+	int const i = inset.latex(buf, os, fragile, fp);
+	os << "%\n}";
 	
 	return i + 2;
 }
 
 
-bool InsetMarginal::InsertInsetAllowed(Inset * in) const
+bool InsetMarginal::insertInsetAllowed(Inset * in) const
 {
-	if ((in->LyxCode() == Inset::FOOT_CODE) ||
-	    (in->LyxCode() == Inset::MARGIN_CODE)) {
+	if ((in->lyxCode() == Inset::FOOT_CODE) ||
+	    (in->lyxCode() == Inset::MARGIN_CODE)) {
 		return false;
 	}
 	return true;