remove lowercase, better layout handling and some variable renameing

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 017a0e642d4aa3d23f67f5bf4cb1c7054e95b40f..babd19772ff9d1323086415bf8b8a9ed1a54ff7a 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -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() 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");
+}
+
+
+Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
+{
+       return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
 }
 
 
-char 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,
                         ostream & os, bool fragile, bool fp) const
 {
-       os << "\\marginpar{%\n";
+       os << "%\n\\marginpar{";
        
-       int 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
-{
-       if ((in->LyxCode() == Inset::FOOT_CODE) ||
-           (in->LyxCode() == Inset::MARGIN_CODE)) {
-               return false;
-       }
-       return true;
-}