Fix text frame drawing.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 21d32ac8ac5031226adf1f166fabe30ee1d2c9b3..11d4b6e144aa5a9e613cbe6501482779be5e0b80 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -10,19 +10,21 @@
  */
 
 #include <config.h>
+#include "debug.h"
 
 #include "InsetFoot.h"
 
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
 #include "gettext.h"
-// the following are needed just to get the layout of the enclosing
+// the following is needed just to get the layout of the enclosing
 // paragraph. This seems a bit too much to me (JMarc)
-#include "LyXLayout.h"
 #include "OutputParams.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
+#include "ParIterator.h"
 
 #include "support/std_ostream.h"
-
+#include "support/lstrings.h"
 
 namespace lyx {
 
@@ -34,20 +36,18 @@ using std::ostream;
 InsetFoot::InsetFoot(BufferParams const & bp)
        : InsetFootlike(bp)
 {
-       setLabel(_("foot"));
+       setLayout(bp);
 }
 
 
 InsetFoot::InsetFoot(InsetFoot const & in)
        : InsetFootlike(in)
-{
-       setLabel(_("foot"));
-}
+{}
 
 
-auto_ptr<Inset> InsetFoot::doClone() const
+Inset * InsetFoot::clone() const
 {
-       return auto_ptr<Inset>(new InsetFoot(*this));
+       return new InsetFoot(*this);
 }
 
 
@@ -57,8 +57,26 @@ docstring const InsetFoot::editMessage() const
 }
 
 
+void InsetFoot::updateLabels(Buffer const & buf, ParIterator const & it)
+{
+       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);
+}
+
+
 int InsetFoot::latex(Buffer const & buf, odocstream & os,
-                     OutputParams const & runparams_in) const
+                    OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        // footnotes in titling commands like \title have moving arguments
@@ -80,9 +98,9 @@ int InsetFoot::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetFoot::plaintext(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
-       os << '[' << _("footnote") << ":\n";
+       os << '[' << buf.B_("footnote") << ":\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
 
@@ -91,7 +109,7 @@ int InsetFoot::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetFoot::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                      OutputParams const & runparams) const
 {
        os << "<footnote>";
        int const i = InsetText::docbook(buf, os, runparams);