* ANNOUNCE

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

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 748ae3eca511b6e451a72f978971d997f502b6ca..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.
  */
@@ -21,48 +21,14 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
-InsetMarginal::InsetMarginal(Buffer const & buf)
+InsetMarginal::InsetMarginal(Buffer * buf)
        : InsetFootlike(buf)
 {}
 
 
-docstring InsetMarginal::editMessage() const
-{
-       return _("Opened Marginal Note Inset");
-}
-
-
-docstring InsetMarginal::toolTip(BufferView const & bv, int x, int y) const
-{
-       docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
-       OutputParams rp(&buffer().params().encoding());
-       odocstringstream ods;
-       InsetText::plaintext(ods, rp);
-       docstring margin_tip = ods.str();
-       // shorten it if necessary
-       if (margin_tip.size() > 200)
-               margin_tip = margin_tip.substr(0, 200) + "...";
-       if (!isOpen() && !margin_tip.empty())
-               return margin_tip + '\n' + default_tip;
-       return default_tip;
-}
-
-
-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
 {
@@ -85,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