fix compilation pb ; update eu.po

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 9a592c972bf0433454772bd0b8875ba0548c7d9a..4a631bd8ccef46150748636aa2542e3fd76bb1d5 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -5,7 +5,8 @@
  *      
  *          Copyright 1998 The LyX Team.
  *
- *======================================================*/
+ * ======================================================
+ */
 
 #include <config.h>
 
@@ -17,77 +18,53 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "BufferView.h"
-#include "Painter.h"
 #include "lyxtext.h"
+#include "insets/insettext.h"
 #include "support/LOstream.h"
+#include "debug.h"
 
-using std::ostream;
-using std::endl;
 
-InsetMarginal::InsetMarginal() : InsetCollapsable()
+InsetMarginal::InsetMarginal()
+       : InsetFootlike()
 {
        setLabel(_("margin"));
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       font.decSize();
-       font.setColor(LColor::footnote);
-       setLabelFont(font);
-       setAutoCollapse(false);
        setInsetName("Marginal");
 }
 
 
-Inset * InsetMarginal::Clone() const
+Inset * InsetMarginal::Clone(Buffer const &) const
 {
        InsetMarginal * result = new InsetMarginal;
-       result->init(this);
-
+       result->inset.init(&inset);
+       
        result->collapsed = collapsed;
        return result;
 }
 
 
-char const * InsetMarginal::EditMessage() const
+string const InsetMarginal::EditMessage() const
 {
        return _("Opened Marginal Note Inset");
 }
 
 
 int InsetMarginal::Latex(Buffer const * buf,
-                        ostream & os, bool fragile, bool fp) const
-{
-    os << "\\marginpar{%" << endl;
-    
-    int i = InsetText::Latex(buf, os, fragile, fp);
-    os << "}%" << endl;
-    
-    return i + 2;
-}
-
-
-bool InsetMarginal::InsertInset(BufferView * bv, Inset * inset)
-{
-    if (!InsertInsetAllowed(inset))
-       return false;
-
-    return InsetText::InsertInset(bv, inset);
-}
-
-
-bool InsetMarginal::InsertInsetAllowed(Inset * inset) const
+                        std::ostream & os, bool fragile, bool fp) const
 {
-    if ((inset->LyxCode() == Inset::FOOT_CODE) ||
-       (inset->LyxCode() == Inset::MARGIN_CODE)) {
-       return false;
-    }
-    return true;
+       os << "\\marginpar{%\n";
+       
+       int const i = inset.Latex(buf, os, fragile, fp);
+       os << "}%\n";
+       
+       return i + 2;
 }
 
 
-LyXFont InsetMarginal::GetDrawFont(BufferView * bv,
-                                  LyXParagraph * p, int pos) const
+bool InsetMarginal::InsertInsetAllowed(Inset * in) const
 {
-    LyXFont fn = getLyXText(bv)->GetFont(bv->buffer(), p, pos);
-    fn.decSize().decSize();
-    return fn;
+       if ((in->LyxCode() == Inset::FOOT_CODE) ||
+           (in->LyxCode() == Inset::MARGIN_CODE)) {
+               return false;
+       }
+       return true;
 }