Revert this change as it sneaked in and wasn't discussed yet.

[lyx.git] / src / insets / insetmarginal.C

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index a56694f96025b4366e3cad86cfb8795430d90b16..a62b85144cca2f21863d2392f79fbd45b339f7e2 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *      
+ *
  *          Copyright 1998 The LyX Team.
  *
  * ======================================================
@@ -23,51 +23,45 @@
 #include "support/LOstream.h"
 #include "debug.h"
 
+
 using std::ostream;
-using std::endl;
 
 
-InsetMarginal::InsetMarginal()
-       : InsetFootlike()
+InsetMarginal::InsetMarginal(BufferParams const & bp)
+       : InsetFootlike(bp)
 {
        setLabel(_("margin"));
        setInsetName("Marginal");
 }
 
 
-Inset * InsetMarginal::Clone(Buffer const &) const
+InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id)
+       : InsetFootlike(in, same_id)
 {
-       InsetMarginal * result = new InsetMarginal;
-       result->inset.init(&inset);
-       
-       result->collapsed = collapsed;
-       return result;
+       setLabel(_("margin"));
+       setInsetName("Marginal");
 }
 
 
-string const InsetMarginal::EditMessage() const
+Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
 {
-       return _("Opened Marginal Note Inset");
+       return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
 }
 
 
-int InsetMarginal::Latex(Buffer const * buf,
-                        ostream & os, bool fragile, bool fp) const
+string const InsetMarginal::editMessage() const
 {
-       os << "\\marginpar{%\n";
-       
-       int i = inset.Latex(buf, os, fragile, fp);
-       os << "}%\n";
-       
-       return i + 2;
+       return _("Opened Marginal Note Inset");
 }
 
 
-bool InsetMarginal::InsertInsetAllowed(Inset * in) const
+int InsetMarginal::latex(Buffer const * buf,
+                        ostream & os, bool fragile, bool fp) const
 {
-       if ((in->LyxCode() == Inset::FOOT_CODE) ||
-           (in->LyxCode() == Inset::MARGIN_CODE)) {
-               return false;
-       }
-       return true;
+       os << "%\n\\marginpar{";
+
+       int const i = inset.latex(buf, os, fragile, fp);
+       os << "%\n}";
+
+       return i + 2;
 }