X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfoot.C;h=b9be27578b7835d9ee2798557114dcf6c0365da1;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=c020e5484596cc2b0d3711e16c24e722424705bf;hpb=46e5fe4a67e6645e0cb6a74c47c6036efc6625de;p=lyx.git

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index c020e54845..b9be27578b 100644
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -6,27 +6,28 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #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"
+
 
+namespace lyx {
 
+using std::string;
+using std::auto_ptr;
 using std::ostream;
 
 
@@ -34,7 +35,7 @@ InsetFoot::InsetFoot(BufferParams const & bp)
 	: InsetFootlike(bp)
 {
 	setLabel(_("foot"));
-	setInsetName("Foot");
+	setInsetName(from_ascii("Foot"));
 }
 
 
@@ -42,59 +43,52 @@ InsetFoot::InsetFoot(InsetFoot const & in)
 	: InsetFootlike(in)
 {
 	setLabel(_("foot"));
-	setInsetName("Foot");
+	setInsetName(from_ascii("Foot"));
 }
 
 
-// InsetFoot::InsetFoot(InsetFoot const & in, bool same_id)
-//	: InsetFootlike(in, same_id)
-// {
-//	setLabel(_("foot"));
-//	setInsetName("Foot");
-// }
-
-
-Inset * InsetFoot::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetFoot::doClone() const
 {
-	return new InsetFoot(*const_cast<InsetFoot *>(this));
+	return auto_ptr<InsetBase>(new InsetFoot(*this));
 }
 
 
-// Inset * InsetFoot::clone(Buffer const &, bool same_id) const
-// {
-//	return new InsetFoot(*const_cast<InsetFoot *>(this), same_id);
-// }
-
-
-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