X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetmarginal.C;h=c8f418bcb062c813609ddd6fbb050268e5090c1e;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=853219bf143e23f40ead018b96cfe6cfafd7caec;hpb=b881ed2d5a4d26b062556d6d417c8f4624741878;p=lyx.git

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 853219bf14..c8f418bcb0 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -11,26 +11,26 @@
 
 #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"
 
-using std::ostream;
+
+namespace lyx {
+
+using std::string;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetMarginal::InsetMarginal(BufferParams const & bp)
 	: InsetFootlike(bp)
 {
 	setLabel(_("margin"));
-	setInsetName("Marginal");
+	setInsetName(from_ascii("Marginal"));
 }
 
 
@@ -38,29 +38,40 @@ InsetMarginal::InsetMarginal(InsetMarginal const & in)
 	: InsetFootlike(in)
 {
 	setLabel(_("margin"));
-	setInsetName("Marginal");
+	setInsetName(from_ascii("Marginal"));
 }
 
 
-auto_ptr<InsetBase> InsetMarginal::clone() const
+auto_ptr<InsetBase> InsetMarginal::doClone() const
 {
 	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, 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