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

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 76ca85581f9082ffb4df010086a8cfb92e845cb6..c8f418bcb062c813609ddd6fbb050268e5090c1e 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -6,22 +6,23 @@
  * \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 "insetmarginal.h"
+
 #include "gettext.h"
-#include "lyxfont.h"
-#include "BufferView.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "debug.h"
+#include "paragraph.h"
+
+#include "support/std_ostream.h"
+
 
+namespace lyx {
 
+using std::string;
+using std::auto_ptr;
 using std::ostream;
 
 
@@ -29,7 +30,7 @@ InsetMarginal::InsetMarginal(BufferParams const & bp)
        : InsetFootlike(bp)
 {
        setLabel(_("margin"));
-       setInsetName("Marginal");
+       setInsetName(from_ascii("Marginal"));
 }
 
 
@@ -37,43 +38,40 @@ InsetMarginal::InsetMarginal(InsetMarginal const & in)
        : InsetFootlike(in)
 {
        setLabel(_("margin"));
-       setInsetName("Marginal");
+       setInsetName(from_ascii("Marginal"));
 }
 
 
-// InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id)
-//     : InsetFootlike(in, same_id)
-// {
-//     setLabel(_("margin"));
-//     setInsetName("Marginal");
-// }
-
-
-Inset * InsetMarginal::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetMarginal::doClone() const
 {
-       return new InsetMarginal(*const_cast<InsetMarginal *>(this));
+       return auto_ptr<InsetBase>(new InsetMarginal(*this));
 }
 
 
-// Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
-// }
-
-
-string const InsetMarginal::editMessage() const
+docstring const InsetMarginal::editMessage() const
 {
        return _("Opened Marginal Note Inset");
 }
 
 
-int InsetMarginal::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const & runparams) const
+int InsetMarginal::latex(Buffer const & buf, odocstream & os,
+                        OutputParams const & runparams) const
 {
        os << "%\n\\marginpar{";
-
-       int const i = inset.latex(buf, os, runparams);
+       int const i = InsetText::latex(buf, os, runparams);
        os << "%\n}";
-
        return i + 2;
 }
+
+int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
+                      OutputParams const & runparams) const
+{
+       os << "<note role=\"margin\">";
+       int const i = InsetText::docbook(buf, os, runparams);
+       os << "</note>";
+
+       return i;
+}
+
+
+} // namespace lyx