Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 6c0d9b79245fba635b6ec2e78bf9599496607876..f5b3e4a8d78b545a15aa25a90bb2e78bacd7dc8a 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -26,41 +26,30 @@
 #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::updateLabels(ParIterator const & it, bool out)
 {
        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()));
-               setLabel(custom_label_);
-       
+       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);
 }