X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfootlike.C;h=8aef1d25bdb2fb26e1323ffe8dca305ee40dbecd;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=6e33522aedb1b157b66584ec6ebf707dcf0491a8;hpb=d5d5562e0292d69fdd511bb13f715827eded652e;p=lyx.git

diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C
index 6e33522aed..8aef1d25bd 100644
--- a/src/insets/insetfootlike.C
+++ b/src/insets/insetfootlike.C
@@ -13,12 +13,14 @@
 #include "insetfootlike.h"
 
 #include "buffer.h"
+#include "BufferView.h"
+#include "bufferparams.h"
 #include "LColor.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-using std::ostream;
 
+namespace lyx {
 
 InsetFootlike::InsetFootlike(BufferParams const & bp)
 	: InsetCollapsable(bp)
@@ -42,28 +44,30 @@ InsetFootlike::InsetFootlike(InsetFootlike const & in)
 }
 
 
-void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	LyXFont tmpfont = mi.base.font;
-	mi.base.font = LyXFont(LyXFont::ALL_SANE);
+	mi.base.font = mi.base.bv->buffer()->params().getFont();
 	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
 {
 	LyXFont tmpfont = pi.base.font;
-	pi.base.font = LyXFont(LyXFont::ALL_SANE);
+	pi.base.font = pi.base.bv->buffer()->params().getFont();
 	InsetCollapsable::draw(pi, x, y);
 	pi.base.font = tmpfont;
 }
 
 
-void InsetFootlike::write(Buffer const & buf, ostream & os) const
+void InsetFootlike::write(Buffer const & buf, std::ostream & os) const
 {
-	os << getInsetName() << "\n";
+	os << to_utf8(getInsetName()) << "\n";
 	InsetCollapsable::write(buf, os);
 }
 
@@ -75,3 +79,6 @@ bool InsetFootlike::insetAllowed(InsetBase::Code code) const
 		return false;
 	return InsetCollapsable::insetAllowed(code);
 }
+
+
+} // namespace lyx