Fix bad cursor positioning when entering an inset

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

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 654caca709859b87c5f8e9e8bd789c8f08f9af23..cb85ab3c2045bf2028a2890f3569165ea9c5cb98 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,42 +14,27 @@
 #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>
-
+#include "support/lstrings.h"
 
 namespace lyx {
 
 
-InsetMarginal::InsetMarginal(Buffer const & buf)
+InsetMarginal::InsetMarginal(Buffer * buf)
        : InsetFootlike(buf)
 {}
 
 
-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
+int InsetMarginal::plaintext(odocstringstream & os,
+                            OutputParams const & runparams, size_t max_length) const
 {
        os << '[' << buffer().B_("margin") << ":\n";
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -67,15 +52,22 @@ int InsetMarginal::docbook(odocstream & os,
 }
 
 
-void InsetMarginal::addToToc(ParConstIterator const & cpit) const
+void InsetMarginal::addToToc(DocIterator const & cpit, bool output_active,
+                                 UpdateType utype) const
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
-
-       Toc & toc = buffer().tocBackend().toc("marginalnote");
-       docstring str;
-       str = getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(const_cast<InsetMarginal &>(*this)));
+
+       docstring tooltip;
+       text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
+       docstring const str = tooltip;
+       tooltip = support::wrapParas(tooltip, 0, 60, 2);
+       
+       shared_ptr<Toc> toc = buffer().tocBackend().toc("marginalnote");
+       toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
+
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit, output_active, utype);
 }
 
 } // namespace lyx