Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 77733ef21cded28c82057708f8e66847857b6b9b..f5b3e4a8d78b545a15aa25a90bb2e78bacd7dc8a 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,67 @@
 #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::updateLabels(ParIterator const & it, bool out)
 {
-       return new InsetFoot(*this);
+       BufferParams const & bp = buffer().masterBuffer()->params();
+       Counters & cnts = bp.documentClass().counters();
+       Paragraph const & outer = it.paragraph();
+       InsetLayout const & il = getLayout();
+       docstring const & count = il.counter();
+       if (!outer.layout().intitle && cnts.hasCounter(count)) {
+               cnts.step(count);
+               custom_label_= translateIfPossible(il.labelstring()) 
+                       + ' ' + cnts.theCounter(count, outer.getParLanguage(bp)->code());
+               setLabel(custom_label_);        
+       }
+       InsetCollapsable::updateLabels(it, out);
 }
 
 
-docstring const InsetFoot::editMessage() const
+void InsetFoot::addToToc(DocIterator const & cpit)
 {
-       return _("Opened Footnote Inset");
-}
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
-
-void InsetFoot::updateLabels(Buffer const & buf, ParIterator const & it)
-{
-       TextClass const & tclass = buf.params().textClass();
-       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);
+       Toc & toc = buffer().tocBackend().toc("footnote");
+       docstring str;
+       str = custom_label_ + ": " + getNewLabel(str);
+       toc.push_back(TocItem(pit, 0, str));
+       // 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));
+       docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
+       if (!isOpen(bv))
+               return custom_label_ + "\n" + default_tip;
+       return default_tip;
 }
 
 
-int InsetFoot::latex(Buffer const & buf, odocstream & os,
-                    OutputParams const & runparams_in) const
+int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        // footnotes in titling commands like \title have moving arguments
@@ -103,7 +89,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 +97,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