X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFootlike.cpp;h=739d89745e6673a5d52ee82f33b49a28ff994ab2;hb=639aa354448188f45e69d6bd1e0ef3dfcc938c5f;hp=afd23295307bb8d33da8bc6b29f4219728108ca9;hpb=3f27f951cbc2521edfbf78792839d61306bdb978;p=lyx.git diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp index afd2329530..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 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,15 +46,16 @@ 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); } @@ -59,7 +63,7 @@ bool InsetFootlike::insetAllowed(InsetCode code) const { if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE) return false; - return InsetCollapsable::insetAllowed(code); + return InsetCollapsible::insetAllowed(code); }