Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 708eb3d1f86ef5d732f8e9dc0b89aecc04a3d83b..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,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,40 +25,31 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
-#include "support/lstrings.h"
+#include "support/gettext.h"
 
 using namespace std;
 
 namespace lyx {
 
-
-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::updateLabels(ParIterator const & it, bool out)
 {
-       DocumentClass const & tclass = buffer().params().documentClass();
-       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.
-               custom_label_= support::bformat(from_utf8("%1$s %2$s"),
-                                         translateIfPossible(getLayout(buffer().params()).labelstring()),
-                                         cnts.theCounter(foot));
-               setLabel(custom_label_);
-       
+       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);
+       InsetCollapsable::updateLabels(it, out);
 }
 
 
@@ -81,8 +70,8 @@ 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())
-               return custom_label_ + ": " + default_tip;
+       if (!isOpen(bv))
+               return custom_label_ + "\n" + default_tip;
        return default_tip;
 }
 
@@ -127,5 +116,4 @@ int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
        return i;
 }
 
-
 } // namespace lyx