Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index 345d921f51ff480284bd65a70c2660b173aa93c2..cc047e2a9ba47912eab93372b4441aa760fcd22d 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -6,16 +6,16 @@
  * \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"
@@ -23,11 +23,11 @@
 // 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 "paragraph.h"
+#include "paragraph_funcs.h"
 
 
 using std::ostream;
+using std::auto_ptr;
 
 
 InsetFoot::InsetFoot(BufferParams const & bp)
@@ -38,17 +38,17 @@ InsetFoot::InsetFoot(BufferParams const & bp)
 }
 
 
-InsetFoot::InsetFoot(InsetFoot const & in, bool same_id)
-       : InsetFootlike(in, same_id)
+InsetFoot::InsetFoot(InsetFoot const & in)
+       : InsetFootlike(in)
 {
        setLabel(_("foot"));
        setInsetName("Foot");
 }
 
 
-Inset * InsetFoot::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetFoot::clone() const
 {
-       return new InsetFoot(*const_cast<InsetFoot *>(this), same_id);
+       return auto_ptr<InsetBase>(new InsetFoot(*this));
 }
 
 
@@ -58,24 +58,22 @@ string const InsetFoot::editMessage() const
 }
 
 
-int InsetFoot::latex(Buffer const * buf,
-                    ostream & os, bool fragile, bool fp) const
+int InsetFoot::latex(Buffer const & buf, ostream & os,
+                    LatexRunParams const & runparams_in) const
 {
-       if (buf && parOwner()) {
-               LyXLayout_ptr const & layout = parOwner()->layout();
-               fragile |= layout->intitle;
-       }
+       LatexRunParams runparams = runparams_in;
+       runparams.moving_arg |= ownerPar(buf, this).layout()->intitle;
 
        os << "%\n\\footnote{";
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.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, ostream & os, bool mixcont) const
 {
        os << "<footnote>";
        int const i = inset.docbook(buf, os, mixcont);