* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index e2b5b5cf74022a68d52f6e4c6cd9b1135c477a40..b9be27578b7835d9ee2798557114dcf6c0365da1 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -12,30 +12,30 @@
 #include <config.h>
 
 #include "insetfoot.h"
+
 #include "gettext.h"
-#include "lyxfont.h"
-#include "BufferView.h"
-#include "latexrunparams.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "debug.h"
 // the following are needed just to get the layout of the enclosing
 // paragraph. This seems a bit too much to me (JMarc)
 #include "lyxlayout.h"
-#include "buffer.h"
+#include "outputparams.h"
 #include "paragraph.h"
+#include "paragraph_funcs.h"
 
+#include "support/std_ostream.h"
 
-using std::ostream;
+
+namespace lyx {
+
+using std::string;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetFoot::InsetFoot(BufferParams const & bp)
        : InsetFootlike(bp)
 {
        setLabel(_("foot"));
-       setInsetName("Foot");
+       setInsetName(from_ascii("Foot"));
 }
 
 
@@ -43,45 +43,52 @@ InsetFoot::InsetFoot(InsetFoot const & in)
        : InsetFootlike(in)
 {
        setLabel(_("foot"));
-       setInsetName("Foot");
+       setInsetName(from_ascii("Foot"));
 }
 
 
-auto_ptr<InsetBase> InsetFoot::clone() const
+auto_ptr<InsetBase> InsetFoot::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetFoot(*this));
 }
 
 
-string const InsetFoot::editMessage() const
+docstring const InsetFoot::editMessage() const
 {
        return _("Opened Footnote Inset");
 }
 
 
-int InsetFoot::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams_in) const
+int InsetFoot::latex(Buffer const & buf, odocstream & os,
+                    OutputParams const & runparams_in) const
 {
-       LatexRunParams runparams = runparams_in;
-       if (buf && parOwner()) {
-               LyXLayout_ptr const & layout = parOwner()->layout();
-               runparams.moving_arg |= layout->intitle;
-       }
-
-       os << "%\n\\footnote{";
-
-       int const i = inset.latex(buf, os, runparams);
+       OutputParams runparams = runparams_in;
+       // footnotes in titling commands like \title have moving arguments
+       runparams.moving_arg |= runparams_in.intitle;
+
+       // in titling commands, \thanks should be used instead of \footnote.
+       // some classes (e.g. memoir) do not understand \footnote.
+       if (runparams_in.intitle)
+               os << "%\n\\thanks{";
+       else
+               os << "%\n\\footnote{";
+
+       int const i = InsetText::latex(buf, os, runparams);
        os << "%\n}";
 
        return i + 2;
 }
 
 
-int InsetFoot::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetFoot::docbook(Buffer const & buf, odocstream & os,
+                      OutputParams const & runparams) const
 {
        os << "<footnote>";
-       int const i = inset.docbook(buf, os, mixcont);
+       int const i = InsetText::docbook(buf, os, runparams);
        os << "</footnote>";
 
        return i;
 }
+
+
+} // namespace lyx