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 6c0d9b79245fba635b6ec2e78bf9599496607876..ef7707a91b3d305971ab5e2b3d019e025a173d51 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -26,53 +26,50 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
-#include "support/lstrings.h"
 
 using namespace std;
 
 namespace lyx {
 
-using support::bformat;
-
-InsetFoot::InsetFoot(Buffer const & buf)
+InsetFoot::InsetFoot(Buffer * buf)
        : InsetFootlike(buf)
 {}
 
 
-docstring InsetFoot::editMessage() const
-{
-       return _("Opened Footnote Inset");
-}
-
-
-void InsetFoot::updateLabels(ParIterator const & it)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();
        Counters & cnts = bp.documentClass().counters();
-       docstring const foot = from_ascii("footnote");
-       Paragraph const & outer =  it.paragraph();
-       if (!outer.layout().intitle && cnts.hasCounter(foot)) {
-               cnts.step(foot);
-               // FIXME: the counter should format itself.
-               custom_label_= bformat(from_utf8("%1$s %2$s"),
-                                      translateIfPossible(getLayout(bp).labelstring()),
-                                      cnts.theCounter(foot, outer.getParLanguage(bp)->code()));
+       if (utype == OutputUpdate) {
+               // the footnote counter is local to this inset
+               cnts.saveLastCounter();
+       }
+       Paragraph const & outer = it.paragraph();
+       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::updateLabels(it);
+       InsetCollapsable::updateBuffer(it, utype);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();      
 }
 
 
-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_ + ": " + getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
+       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);
 }
@@ -80,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