X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetMarginal.cpp;h=1c1df328e96ba4e31c07d12ba9c585e59ccbdfeb;hb=d4550b7a4d64e9ff772cf3a7635cb4ca532fb340;hp=be61f468eab1363a20d6d4bdf129e928166c8044;hpb=d14da39009f479d7c8218a41480c1e9e418ec1e2;p=lyx.git

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index be61f468ea..1c1df328e9 100644
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -3,8 +3,8 @@
  * 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
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,75 +14,57 @@
 #include "InsetMarginal.h"
 
 #include "Buffer.h"
-#include "gettext.h"
+#include "BufferParams.h"
 #include "OutputParams.h"
+#include "TocBackend.h"
 
-#include "support/std_ostream.h"
-
+#include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
-
 
-InsetMarginal::InsetMarginal(BufferParams const & bp)
-	: InsetFootlike(bp)
-{
-	setLabel(_("margin"));
-}
+InsetMarginal::InsetMarginal(Buffer * buf)
+	: InsetFootlike(buf)
+{}
 
 
-InsetMarginal::InsetMarginal(InsetMarginal const & in)
-	: InsetFootlike(in)
+int InsetMarginal::plaintext(odocstringstream & os,
+			     OutputParams const & runparams, size_t max_length) const
 {
-	setLabel(_("margin"));
-}
-
-
-auto_ptr<Inset> InsetMarginal::doClone() const
-{
-	return auto_ptr<Inset>(new InsetMarginal(*this));
-}
-
-
-docstring const InsetMarginal::editMessage() const
-{
-	return _("Opened Marginal Note Inset");
-}
-
-
-int InsetMarginal::latex(Buffer const & buf, odocstream & os,
-			 OutputParams const & runparams) const
-{
-	os << "%\n\\marginpar{";
-	int const i = InsetText::latex(buf, os, runparams);
-	os << "%\n}";
-	return i + 2;
-}
-
-
-int InsetMarginal::plaintext(Buffer const & buf, odocstream & os,
-			     OutputParams const & runparams) const
-{
-	os << '[' << buf.B_("margin") << ":\n";
-	InsetText::plaintext(buf, os, runparams);
+	os << '[' << buffer().B_("margin") << ":\n";
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetMarginal::docbook(Buffer const & buf, odocstream & os,
+int InsetMarginal::docbook(odocstream & os,
 			   OutputParams const & runparams) const
 {
 	os << "<note role=\"margin\">";
-	int const i = InsetText::docbook(buf, os, runparams);
+	int const i = InsetText::docbook(os, runparams);
 	os << "</note>";
 
 	return i;
 }
 
 
+void InsetMarginal::addToToc(DocIterator const & cpit, bool output_active,
+				  UpdateType utype) const
+{
+	DocIterator pit = cpit;
+	pit.push_back(CursorSlice(const_cast<InsetMarginal &>(*this)));
+
+	docstring str;
+	text().forOutliner(str, TOC_ENTRY_LENGTH);
+	std::shared_ptr<Toc> toc = buffer().tocBackend().toc("marginalnote");
+	toc->push_back(TocItem(pit, 0, str, output_active));
+
+	// Proceed with the rest of the inset.
+	InsetFootlike::addToToc(cpit, output_active, utype);
+}
+
 } // namespace lyx