X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFootlike.cpp;h=5685e865bfa8407ed6b6eec42966e3b9b0924127;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=fff8555d900f725dc27ad7e65dce5175089e6e08;hpb=2bd998c29eab19692e976a086b02174cc924b376;p=lyx.git

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index fff8555d90..5685e865bf 100644
--- 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,52 +15,53 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "Font.h"
 #include "MetricsInfo.h"
 
-namespace lyx {
+#include "support/lstrings.h"
 
-InsetFootlike::InsetFootlike(BufferParams const & bp)
-	: InsetCollapsable(bp)
-{}
+#include <iostream>
+
+using namespace std;
+
+namespace lyx {
 
+using support::token;
 
-InsetFootlike::InsetFootlike(InsetFootlike const & in)
-	: InsetCollapsable(in)
+InsetFootlike::InsetFootlike(Buffer * buf)
+	: InsetCollapsable(buf)
 {}
 
 
-bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	Font tmpfont = mi.base.font;
-	mi.base.font = mi.base.bv->buffer()->params().getFont();
+	FontInfo tmpfont = mi.base.font;
+	mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
 	InsetCollapsable::metrics(mi, dim);
 	mi.base.font = tmpfont;
-	bool const changed = dim_ != dim;
-	dim_ = dim;
-	return changed;
 }
 
 
 void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
-	Font tmpfont = pi.base.font;
-	pi.base.font = pi.base.bv->buffer()->params().getFont();
+	FontInfo tmpfont = pi.base.font;
+	pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
 	InsetCollapsable::draw(pi, x, y);
 	pi.base.font = tmpfont;
 }
 
 
-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);
 }
 
 
-bool InsetFootlike::insetAllowed(Inset::Code code) const
+bool InsetFootlike::insetAllowed(InsetCode code) const
 {
-	if (code == Inset::FOOT_CODE || code == Inset::MARGIN_CODE
-	    || code == Inset::FLOAT_CODE)
+	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
 		return false;
 	return InsetCollapsable::insetAllowed(code);
 }