Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4910 by creating InsetText::addToToc().

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 310ab27edceb770eb2bb72cf46dd7be949c153de..9b5e1f65a8aed49c8801dc3cb73bd8168b310355 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -29,8 +29,6 @@
 #include "support/docstream.h"
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
@@ -56,8 +54,8 @@ void InsetFoot::updateLabels(ParIterator const & it)
        if (!outer.layout().intitle && cnts.hasCounter(foot)) {
                cnts.step(foot);
                // FIXME: the counter should format itself.
-               custom_label_= support::bformat(from_ascii("%1$s %2$s"),
-                                         getLayout(buffer().params()).labelstring(),
+               custom_label_= support::bformat(from_utf8("%1$s %2$s"),
+                                         translateIfPossible(getLayout(buffer().params()).labelstring()),
                                          cnts.theCounter(foot));
                setLabel(custom_label_);
        
@@ -66,13 +64,12 @@ void InsetFoot::updateLabels(ParIterator const & it)
 }
 
 
-void InsetFoot::addToToc(ParConstIterator const & cpit) const
+void InsetFoot::addToToc(DocIterator const & cpit)
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc("footnote");
-       // FIXME: we probably want the footnote number too.
        docstring str;
        str = custom_label_ + ": " + getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
@@ -82,15 +79,8 @@ void InsetFoot::addToToc(ParConstIterator const & cpit) const
 docstring InsetFoot::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 foot_tip = custom_label_ + ": " + ods.str();
-       // shorten it if necessary
-       if (foot_tip.size() > 200)
-               foot_tip = foot_tip.substr(0, 200) + "...";
-       if (!isOpen() && !foot_tip.empty())
-               return foot_tip + '\n' + default_tip;
+       if (!isOpen())
+               return custom_label_ + ": " + default_tip;
        return default_tip;
 }