* 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 0ab7524a9a9cbf02ccb323af694c430a97d201a0..c8f418bcb062c813609ddd6fbb050268e5090c1e 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -1,70 +1,77 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 1998 The LyX Team.
+/**
+ * \file insetmarginal.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #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;
+
+
+InsetMarginal::InsetMarginal(BufferParams const & bp)
+       : InsetFootlike(bp)
+{
+       setLabel(_("margin"));
+       setInsetName(from_ascii("Marginal"));
+}
 
 
-InsetMarginal::InsetMarginal()
-       : InsetFootlike()
+InsetMarginal::InsetMarginal(InsetMarginal const & in)
+       : InsetFootlike(in)
 {
        setLabel(_("margin"));
-       setInsetName("Marginal");
+       setInsetName(from_ascii("Marginal"));
 }
 
 
-Inset * InsetMarginal::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetMarginal::doClone() const
 {
-       InsetMarginal * result = new InsetMarginal;
-       result->inset.init(&inset);
-       
-       result->collapsed = collapsed;
-       return result;
+       return auto_ptr<InsetBase>(new InsetMarginal(*this));
 }
 
 
-string const InsetMarginal::editMessage() const
+docstring const InsetMarginal::editMessage() const
 {
        return _("Opened Marginal Note Inset");
 }
 
 
-int InsetMarginal::latex(Buffer const * buf,
-                        std::ostream & os, bool fragile, bool fp) const
+int InsetMarginal::latex(Buffer const & buf, odocstream & os,
+                        OutputParams const & runparams) const
 {
-       os << "\\marginpar{%\n";
-       
-       int const i = inset.latex(buf, os, fragile, fp);
-       os << "}%\n";
-       
+       os << "%\n\\marginpar{";
+       int const i = InsetText::latex(buf, os, runparams);
+       os << "%\n}";
        return i + 2;
 }
 
-
-bool InsetMarginal::insertInsetAllowed(Inset * in) const
+int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
+                      OutputParams const & runparams) const
 {
-       if ((in->lyxCode() == Inset::FOOT_CODE) ||
-           (in->lyxCode() == Inset::MARGIN_CODE)) {
-               return false;
-       }
-       return true;
+       os << "<note role=\"margin\">";
+       int const i = InsetText::docbook(buf, os, runparams);
+       os << "</note>";
+
+       return i;
 }
+
+
+} // namespace lyx