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 57b404614fa8c6d6f5c8a45363a61d68a3b27f4c..ef7707a91b3d305971ab5e2b3d019e025a173d51 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,81 +16,75 @@
 #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"
 #include "TocBackend.h"
 
 #include "support/debug.h"
-#include "support/lstrings.h"
-
-#include <ostream>
+#include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 
 namespace lyx {
 
-
-InsetFoot::InsetFoot(BufferParams const & bp)
-       : InsetFootlike(bp)
+InsetFoot::InsetFoot(Buffer * buf)
+       : InsetFootlike(buf)
 {}
 
 
-InsetFoot::InsetFoot(InsetFoot const & in)
-       : InsetFootlike(in)
-{}
-
-
-Inset * InsetFoot::clone() const
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       return new InsetFoot(*this);
-}
-
-
-docstring const InsetFoot::editMessage() const
-{
-       return _("Opened Footnote Inset");
+       BufferParams const & bp = buffer().masterBuffer()->params();
+       Counters & cnts = bp.documentClass().counters();
+       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::updateBuffer(it, utype);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();      
 }
 
 
-void InsetFoot::updateLabels(Buffer const & buf, ParIterator const & it)
+void InsetFoot::addToToc(DocIterator const & cpit) const
 {
-       TextClass const & tclass = buf.params().getTextClass();
-       Counters & cnts = tclass.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.
-               setLabel(support::bformat(from_ascii("%1$s %2$s"), 
-                                         getLayout(buf.params()).labelstring, 
-                                         cnts.theCounter(foot)));
-       
-       }
-       InsetCollapsable::updateLabels(buf, it);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
+
+       Toc & toc = buffer().tocBackend().toc("footnote");
+       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);
 }
 
 
-void InsetFoot::addToToc(Buffer const & buf,
-       ParConstIterator const & cpit) const
+docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
-
-       Toc & toc = buf.tocBackend().toc("footnote");
-       // FIXME: we probably want the footnote number too.
-       docstring str;
-       str = getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
+       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(Buffer const & buf, 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
@@ -103,7 +97,7 @@ int InsetFoot::latex(Buffer const & buf, odocstream & os,
        else
                os << "%\n\\footnote{";
 
-       int const i = InsetText::latex(buf, os, runparams);
+       int const i = InsetText::latex(os, runparams);
        os << "%\n}";
        runparams_in.encoding = runparams.encoding;
 
@@ -111,26 +105,23 @@ int InsetFoot::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetFoot::plaintext(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams) const
+int InsetFoot::plaintext(odocstream & os, OutputParams const & runparams) const
 {
-       os << '[' << buf.B_("footnote") << ":\n";
-       InsetText::plaintext(buf, os, runparams);
+       os << '[' << buffer().B_("footnote") << ":\n";
+       InsetText::plaintext(os, runparams);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetFoot::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
 {
        os << "<footnote>";
-       int const i = InsetText::docbook(buf, os, runparams);
+       int const i = InsetText::docbook(os, runparams);
        os << "</footnote>";
 
        return i;
 }
 
-
 } // namespace lyx