X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFootlike.cpp;h=739d89745e6673a5d52ee82f33b49a28ff994ab2;hb=2746fdf7ddbde99d9396a4ea83942e9f572abbb9;hp=05d2ba87173ac1fade4d569cef061be8c1b9a0fa;hpb=af8ba5e0696c0e1989effe4179c990a054bc06df;p=lyx.git

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index 05d2ba8717..739d89745e 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -18,15 +18,18 @@
 #include "Font.h"
 #include "MetricsInfo.h"
 
+#include "support/lstrings.h"
+
 #include <iostream>
 
 using namespace std;
 
 namespace lyx {
 
+using support::token;
 
 InsetFootlike::InsetFootlike(Buffer * buf)
-	: InsetCollapsable(buf)
+	: InsetCollapsible(buf)
 {}
 
 
@@ -34,7 +37,7 @@ void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	FontInfo tmpfont = mi.base.font;
 	mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
-	InsetCollapsable::metrics(mi, dim);
+	InsetCollapsible::metrics(mi, dim);
 	mi.base.font = tmpfont;
 }
 
@@ -43,24 +46,24 @@ void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
 	FontInfo tmpfont = pi.base.font;
 	pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
-	InsetCollapsable::draw(pi, x, y);
+	InsetCollapsible::draw(pi, x, y);
 	pi.base.font = tmpfont;
 }
 
 
 void InsetFootlike::write(ostream & os) const
 {
-	os << to_utf8(layoutName()) << "\n";
-	InsetCollapsable::write(os);
+	// The layoutName may contain a "InTitle" qualifier
+	os << to_utf8(token(layoutName(), char_type(':'), 0)) << "\n";
+	InsetCollapsible::write(os);
 }
 
 
 bool InsetFootlike::insetAllowed(InsetCode code) const
 {
-	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE
-		|| code == LISTINGS_CODE)
+	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
 		return false;
-	return InsetCollapsable::insetAllowed(code);
+	return InsetCollapsible::insetAllowed(code);
 }