#include "TextClass.h"
#include "support/gettext.h"
+#include "support/lstrings.h"
#include <ostream>
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_));
void InsetFlex::write(ostream & os) const
{
- os << "Flex " <<
- (name_.empty() ? "undefined" : name_) << "\n";
- InsetCollapsable::write(os);
+ os << "Flex ";
+ string name;
+ if (name_.empty())
+ name = "undefined";
+ else {
+ InsetLayout const & il = getLayout();
+ // use il.name(), since this resolves obsoleted InsetLayout names
+ if (il.name() == "undefined")
+ // This is the name of the plain_insetlayout_. We assume that the
+ // name resolution has failed.
+ name = name_;
+ else {
+ name = to_utf8(il.name());
+ // Remove the "Flex:" prefix, if it is present
+ if (support::prefixIs(name, "Flex:"))
+ name = support::split(name, ':');
+ }
+ }
+ os << name << "\n";
+ 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) {
+ if (il.lyxtype() == type
+ || (il.name() == DocumentClass::plainInsetLayout().name()
+ && type == InsetLayout::CHARSTYLE)) {
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) {
+
+ if (il.lyxtype() == type
+ || (il.name() == DocumentClass::plainInsetLayout().name()
+ && type == InsetLayout::CHARSTYLE)) {
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;
}
}
-void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
BufferParams const & bp = buffer().masterBuffer()->params();
InsetLayout const & il = getLayout();
docstring const & count = il.counter();
bool const have_counter = cnts.hasCounter(count);
if (have_counter) {
- cnts.step(count, utype);
- custom_label += ' ' +
- cnts.theCounter(count, it.paragraph().getParLanguage(bp)->code());
+ Paragraph const & par = it.paragraph();
+ if (!par.isDeleted(it.pos())) {
+ cnts.step(count, utype);
+ custom_label += ' ' +
+ cnts.theCounter(count, it.paragraph().getParLanguage(bp)->code());
+ } else
+ custom_label += ' ' + from_ascii("#");
}
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, deleted);
if (save_counter)
cnts.restoreLastCounter();
}