Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index c0647b0824f99b6bafcbabc9ef4c1f0f9d137df1..5685e865bfa8407ed6b6eec42966e3b9b0924127 100644 (file)
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,20 +15,21 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "Font.h"
 #include "MetricsInfo.h"
 
-#include <iostream>
+#include "support/lstrings.h"
 
-namespace lyx {
+#include <iostream>
 
+using namespace std;
 
-InsetFootlike::InsetFootlike(BufferParams const & bp)
-       : InsetCollapsable(bp)
-{}
+namespace lyx {
 
+using support::token;
 
-InsetFootlike::InsetFootlike(InsetFootlike const & in)
-       : InsetCollapsable(in)
+InsetFootlike::InsetFootlike(Buffer * buf)
+       : InsetCollapsable(buf)
 {}
 
 
@@ -50,10 +51,11 @@ void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetFootlike::write(Buffer const & buf, std::ostream & os) const
+void InsetFootlike::write(ostream & os) const
 {
-       os << to_utf8(name()) << "\n";
-       InsetCollapsable::write(buf, os);
+       // The layoutName may contain a "InTitle" qualifier
+       os << to_utf8(token(layoutName(), char_type(':'), 0)) << "\n";
+       InsetCollapsable::write(os);
 }