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

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 0c70cbfc224859f1ca211d5a911d20904e6aff23..853219bf143e23f40ead018b96cfe6cfafd7caec 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -6,7 +6,7 @@
  * \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>
@@ -23,6 +23,7 @@
 
 
 using std::ostream;
+using std::auto_ptr;
 
 
 InsetMarginal::InsetMarginal(BufferParams const & bp)
@@ -33,17 +34,17 @@ InsetMarginal::InsetMarginal(BufferParams const & bp)
 }
 
 
-InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id)
-       : InsetFootlike(in, same_id)
+InsetMarginal::InsetMarginal(InsetMarginal const & in)
+       : InsetFootlike(in)
 {
        setLabel(_("margin"));
        setInsetName("Marginal");
 }
 
 
-Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetMarginal::clone() const
 {
-       return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
+       return auto_ptr<InsetBase>(new InsetMarginal(*this));
 }
 
 
@@ -53,12 +54,12 @@ string const InsetMarginal::editMessage() const
 }
 
 
-int InsetMarginal::latex(Buffer const * buf,
-                        ostream & os, bool fragile, bool fp) const
+int InsetMarginal::latex(Buffer const & buf, ostream & os,
+                        LatexRunParams const & runparams) const
 {
        os << "%\n\\marginpar{";
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.latex(buf, os, runparams);
        os << "%\n}";
 
        return i + 2;