revert r37459 and add a note to the sources:

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index fd8038f4ee654fef029a6bb9b4892f464fbef4d5..ef7707a91b3d305971ab5e2b3d019e025a173d51 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -45,13 +45,15 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
                cnts.saveLastCounter();
        }
        Paragraph const & outer = it.paragraph();
-       InsetLayout const & il = getLayout();
-       docstring const & count = il.counter();
-       if (!outer.layout().intitle && cnts.hasCounter(count)) {
-               cnts.step(count, utype);
-               custom_label_= translateIfPossible(il.labelstring()) 
-                       + ' ' + cnts.theCounter(count, outer.getParLanguage(bp)->code());
-               setLabel(custom_label_);        
+       if (!outer.layout().intitle) {
+               InsetLayout const & il = getLayout();
+               docstring const & count = il.counter();
+               custom_label_ = translateIfPossible(il.labelstring()) + ' ';
+               if (cnts.hasCounter(count))
+                       cnts.step(count, utype);
+               custom_label_ += 
+                       cnts.theCounter(count, outer.getParLanguage(bp)->code());
+               setLabel(custom_label_);
        }
        InsetCollapsable::updateBuffer(it, utype);
        if (utype == OutputUpdate)
@@ -59,15 +61,15 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetFoot::addToToc(DocIterator const & cpit)
+void InsetFoot::addToToc(DocIterator const & cpit) const
 {
        DocIterator pit = cpit;
-       pit.push_back(CursorSlice(*this));
+       pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
 
        Toc & toc = buffer().tocBackend().toc("footnote");
-       docstring str;
-       str = custom_label_ + ": " + text().getPar(0).asString();
-       toc.push_back(TocItem(pit, 0, str, toolTipText()));
+       docstring str = custom_label_ + ": ";
+       text().forToc(str, TOC_ENTRY_LENGTH);
+       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
        // Proceed with the rest of the inset.
        InsetFootlike::addToToc(cpit);
 }
@@ -75,14 +77,14 @@ void InsetFoot::addToToc(DocIterator const & cpit)
 
 docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
 {
-       docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
-       if (!isOpen(bv))
-               return custom_label_ + "\n" + default_tip;
-       return default_tip;
+       if (isOpen(bv))
+               // this will give us something useful if there is no button
+               return InsetCollapsable::toolTip(bv, x, y);
+       return toolTipText(custom_label_);
 }
 
 
-int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
+int InsetFoot::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        // footnotes in titling commands like \title have moving arguments