InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
- : InsetCollapsable(buf), name_(layoutName)
+ : InsetCollapsible(buf), name_(layoutName)
{}
InsetFlex::InsetFlex(InsetFlex const & in)
- : InsetCollapsable(in), name_(in.name_)
+ : InsetCollapsible(in), name_(in.name_)
{}
return DocumentClass::plainInsetLayout();
DocumentClass const & dc = buffer().params().documentClass();
- docstring const dname = from_utf8(name_);
+ docstring const dname = from_utf8(name_);
if (dc.hasInsetLayout(dname))
return dc.insetLayout(dname);
return dc.insetLayout(from_utf8("Flex:" + name_));
}
}
os << name << "\n";
- InsetCollapsable::write(os);
+ InsetCollapsible::write(os);
}
case LFUN_INSET_DISSOLVE:
if (!cmd.argument().empty()) {
InsetLayout const & il = getLayout();
- InsetLayout::InsetLyXType const type =
+ InsetLayout::InsetLyXType const type =
translateLyXType(to_utf8(cmd.argument()));
if (il.lyxtype() == type) {
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
- return InsetCollapsable::getStatus(cur, temp_cmd, flag);
+ return InsetCollapsible::getStatus(cur, temp_cmd, flag);
} else
return false;
}
// fall-through
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
}
case LFUN_INSET_DISSOLVE:
if (!cmd.argument().empty()) {
InsetLayout const & il = getLayout();
- InsetLayout::InsetLyXType const type =
+ InsetLayout::InsetLyXType const type =
translateLyXType(to_utf8(cmd.argument()));
-
+
if (il.lyxtype() == type) {
FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
- InsetCollapsable::doDispatch(cur, temp_cmd);
+ InsetCollapsible::doDispatch(cur, temp_cmd);
} else
cur.undispatched();
break;
}
// fall-through
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
cnts.theCounter(count, it.paragraph().getParLanguage(bp)->code());
}
setLabel(custom_label);
-
+
bool const save_counter = have_counter && utype == OutputUpdate;
if (save_counter) {
// we assume the counter is local to this inset
// need a layout flag
cnts.saveLastCounter();
}
- InsetCollapsable::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype);
if (save_counter)
cnts.restoreLastCounter();
}