Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index d320476733a531ff6c6cf3ca25c73a5a70dbc603..d0d432b5fdbbf7f4af0341d86d80cad3cb091bcd 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.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.
  */
@@ -16,10 +16,8 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "support/gettext.h"
+#include "Language.h"
 #include "Layout.h"
-// FIXME: the following is needed just to get the layout of the enclosing
-// paragraph. This seems a bit too much to me (JMarc)
 #include "OutputParams.h"
 #include "ParIterator.h"
 #include "TextClass.h"
@@ -27,14 +25,14 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
 
+using support::bformat;
 
 InsetFoot::InsetFoot(Buffer const & buf)
        : InsetFootlike(buf)
@@ -49,16 +47,16 @@ docstring InsetFoot::editMessage() const
 
 void InsetFoot::updateLabels(ParIterator const & it)
 {
-       DocumentClass const & tclass = buffer().params().documentClass();
-       Counters & cnts = tclass.counters();
+       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_= support::bformat(from_utf8("%1$s %2$s"),
-                                         translateIfPossible(getLayout(buffer().params()).labelstring()),
-                                         cnts.theCounter(foot));
+               custom_label_= bformat(from_utf8("%1$s %2$s"),
+                                      translateIfPossible(getLayout().labelstring()),
+                                      cnts.theCounter(foot, outer.getParLanguage(bp)->code()));
                setLabel(custom_label_);
        
        }
@@ -66,31 +64,25 @@ 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));
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit);
 }
 
 
 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(bv))
+               return custom_label_ + "\n" + default_tip;
        return default_tip;
 }
 
@@ -135,5 +127,4 @@ int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
        return i;
 }
 
-
 } // namespace lyx