This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index a2b6cbf26c6a6cb56a2080875405e00661fe90f0..58acf7d562d312a4be4e8b2dde8656a59b8b60d0 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -10,35 +10,34 @@
  */
 
 #include <config.h>
-#include "debug.h"
 
 #include "InsetFoot.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "gettext.h"
-// the following is needed just to get the layout of the enclosing
+#include "support/gettext.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/convert.h"
-#include "support/std_ostream.h"
+#include "support/debug.h"
 #include "support/lstrings.h"
 
-namespace lyx {
+#include <ostream>
+
+using namespace std;
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
+namespace lyx {
 
 
 InsetFoot::InsetFoot(BufferParams const & bp)
        : InsetFootlike(bp)
-{
-       setLayout(bp);
-}
+{}
 
 
 InsetFoot::InsetFoot(InsetFoot const & in)
@@ -46,9 +45,9 @@ InsetFoot::InsetFoot(InsetFoot const & in)
 {}
 
 
-auto_ptr<Inset> InsetFoot::doClone() const
+Inset * InsetFoot::clone() const
 {
-       return auto_ptr<Inset>(new InsetFoot(*this));
+       return new InsetFoot(*this);
 }
 
 
@@ -62,19 +61,34 @@ 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");
+       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, 
-                                         convert<docstring>(cnts.value(foot))));
+                                         getLayout(buf.params()).labelstring(), 
+                                         cnts.theCounter(foot)));
        
        }
        InsetCollapsable::updateLabels(buf, it);
 }
 
+
+void InsetFoot::addToToc(Buffer const & buf,
+       ParConstIterator const & cpit) 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));
+}
+
+
 int InsetFoot::latex(Buffer const & buf, odocstream & os,
                     OutputParams const & runparams_in) const
 {