* ANNOUNCE

[lyx.git] / src / insets / InsetMarginal.cpp

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index d96653ca2be37863f2535c521bc9d2bfd49edbe7..377693f17b6400a1af82da12bae07a052ed0005d 100644 (file)
--- 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,48 +14,21 @@
 #include "InsetMarginal.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "OutputParams.h"
 #include "TocBackend.h"
 
+#include "support/docstream.h"
 #include "support/gettext.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
-InsetMarginal::InsetMarginal(BufferParams const & bp)
-       : InsetFootlike(bp)
-{}
-
-
-InsetMarginal::InsetMarginal(InsetMarginal const & in)
-       : InsetFootlike(in)
+InsetMarginal::InsetMarginal(Buffer * buf)
+       : InsetFootlike(buf)
 {}
 
 
-Inset * InsetMarginal::clone() const
-{
-       return new InsetMarginal(*this);
-}
-
-
-docstring InsetMarginal::editMessage() const
-{
-       return _("Opened Marginal Note Inset");
-}
-
-
-int InsetMarginal::latex(odocstream & os, OutputParams const & runparams) const
-{
-       os << "%\n\\marginpar{";
-       int const i = InsetText::latex(os, runparams);
-       os << "%\n}";
-       return i + 2;
-}
-
-
 int InsetMarginal::plaintext(odocstream & os,
                             OutputParams const & runparams) const
 {
@@ -78,15 +51,17 @@ int InsetMarginal::docbook(odocstream & os,
 }
 
 
-void InsetMarginal::addToToc(ParConstIterator const & cpit) const
+void InsetMarginal::addToToc(DocIterator const & cpit)
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc("marginalnote");
        docstring str;
-       str = getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
+       str = text().getPar(0).asString();
+       toc.push_back(TocItem(pit, 0, str, toolTipText()));
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit);
 }
 
 } // namespace lyx