several changes and some new insets, read the Changelog

[features.git] / src / insets / insetfoot.C

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index ed2fb66624d185d1956d5e0fe38848fd1ca7a9ef..9b33e6f08b25a1559e1836a9642c39f27f867fe6 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -17,14 +17,14 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "BufferView.h"
-#include "lyxscreen.h"
 #include "Painter.h"
+#include "lyxtext.h"
 #include "support/LOstream.h"
 
 using std::ostream;
+using std::endl;
 
-InsetFoot::InsetFoot(Buffer * bf)
-               : InsetCollapsable(bf)
+InsetFoot::InsetFoot() : InsetCollapsable()
 {
     setLabel(_("foot"));
     LyXFont font(LyXFont::ALL_SANE);
@@ -33,13 +33,21 @@ InsetFoot::InsetFoot(Buffer * bf)
     font.setColor(LColor::footnote);
     setLabelFont(font);
     setAutoCollapse(false);
+    setInsetName("Foot");
+}
+
+
+void InsetFoot::Write(Buffer const * buf, ostream & os) const 
+{
+       os << getInsetName() << "\n";
+       InsetCollapsable::Write(buf, os);
 }
 
 
 Inset * InsetFoot::Clone() const
 {
-    InsetFoot * result = new InsetFoot(buffer);
-    result->init(buffer, this);
+    InsetFoot * result = new InsetFoot;
+    result->init(this);
 
     result->collapsed = collapsed;
     return result;
@@ -52,43 +60,14 @@ char const * InsetFoot::EditMessage() const
 }
 
 
-int InsetFoot::Latex(ostream & os, bool fragile, bool fp) const
-{
-       if (fragile) 
-               os << "\\footnote{"; // was footnotemark but that won't work
-       else 
-               os << "\\footnote{";
-       
-       int i = InsetText::Latex(os, fragile, fp);
-       os << "}";
-       
-       return i;
-}
-
-
-void InsetFoot::Write(ostream & os) const
+int InsetFoot::Latex(Buffer const * buf, ostream & os, bool fragile, bool fp) const
 {
-       os << "Foot\n"
-          << "\ncollapsed ";
-       if (display())
-               os << "false\n";
-       else
-               os << "true\n";
-       WriteParagraphData(os);
-}
-
-
-void InsetFoot::Read(LyXLex & lex)
-{
-    if (lex.IsOK()) {
-       lex.next();
-        string token = lex.GetString();
-       if (token == "collapsed") {
-           lex.next();
-           collapsed = lex.GetBool();
-       }
-    }
-    InsetText::Read(lex);
+    os << "\\footnote{%\n";
+    
+    int i = InsetText::Latex(buf, os, fragile, fp);
+    os << "}%\n";
+    
+    return i + 2;
 }
 
 
@@ -100,6 +79,7 @@ bool InsetFoot::InsertInset(BufferView * bv, Inset * inset)
     return InsetText::InsertInset(bv, inset);
 }
 
+
 bool InsetFoot::InsertInsetAllowed(Inset * inset) const
 {
     if ((inset->LyxCode() == Inset::FOOT_CODE) ||
@@ -109,10 +89,10 @@ bool InsetFoot::InsertInsetAllowed(Inset * inset) const
     return true;
 }
 
-LyXFont InsetFoot::GetDrawFont(LyXParagraph * par, int pos) const
+
+LyXFont InsetFoot::GetDrawFont(BufferView * bv,LyXParagraph * p, int pos) const
 {
-    LyXFont fn = InsetCollapsable::GetDrawFont(par, pos);
-    fn.decSize();
-    fn.decSize();
+    LyXFont fn = getLyXText(bv)->GetFont(bv->buffer(), p, pos);
+    fn.decSize().decSize();
     return fn;
 }