* BufferParams:

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index f6e69e6a333e06c7b068215f566f436b0a1f2bf3..160d8b6d2c08d7fe6a1be003557cf491795fd58d 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -15,10 +15,13 @@
 
 #include "gettext.h"
 #include "paragraph.h"
+#include "outputparams.h"
 
 #include "support/std_ostream.h"
 
 
+namespace lyx {
+
 using std::string;
 using std::auto_ptr;
 using std::ostream;
@@ -27,18 +30,16 @@ using std::ostream;
 InsetMarginal::InsetMarginal(BufferParams const & bp)
        : InsetFootlike(bp)
 {
-       // FIXME UNICODE
-       setLabel(lyx::to_utf8(_("margin")));
-       setInsetName("Marginal");
+       setLabel(_("margin"));
+       setInsetName(from_ascii("Marginal"));
 }
 
 
 InsetMarginal::InsetMarginal(InsetMarginal const & in)
        : InsetFootlike(in)
 {
-       // FIXME UNICODE
-       setLabel(lyx::to_utf8(_("margin")));
-       setInsetName("Marginal");
+       setLabel(_("margin"));
+       setInsetName(from_ascii("Marginal"));
 }
 
 
@@ -48,15 +49,14 @@ auto_ptr<InsetBase> InsetMarginal::doClone() const
 }
 
 
-string const InsetMarginal::editMessage() const
+docstring const InsetMarginal::editMessage() const
 {
-       // FIXME UNICODE
-       return lyx::to_utf8(_("Opened Marginal Note Inset"));
+       return _("Opened Marginal Note Inset");
 }
 
 
-int InsetMarginal::latex(Buffer const & buf, ostream & os,
-                        OutputParams const & runparams) const
+int InsetMarginal::latex(Buffer const & buf, odocstream & os,
+                         OutputParams const & runparams) const
 {
        os << "%\n\\marginpar{";
        int const i = InsetText::latex(buf, os, runparams);
@@ -64,8 +64,20 @@ int InsetMarginal::latex(Buffer const & buf, ostream & os,
        return i + 2;
 }
 
-int InsetMarginal::docbook(Buffer const & buf, ostream & os,
-                      OutputParams const & runparams) const
+
+int InsetMarginal::plaintext(Buffer const & buf, odocstream & os,
+                             OutputParams const & runparams) const
+{
+       os << '[' << _("margin") << ":\n";
+       InsetText::plaintext(buf, os, runparams);
+       os << "\n]";
+
+       return PLAINTEXT_NEWLINE + 1; // one char on a separate line
+}
+
+
+int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
+                           OutputParams const & runparams) const
 {
        os << "<note role=\"margin\">";
        int const i = InsetText::docbook(buf, os, runparams);
@@ -73,3 +85,6 @@ int InsetMarginal::docbook(Buffer const & buf, ostream & os,
 
        return i;
 }
+
+
+} // namespace lyx