#include "TextClass.h"
#include "support/gettext.h"
+#include "support/lstrings.h"
#include <ostream>
}
-bool InsetFlex::resetFontEdit() const
-{
- if (getLayout().resetsFont())
- return true;
- return InsetCollapsable::resetFontEdit();
-}
-
-
InsetLayout::InsetDecoration InsetFlex::decoration() const
{
InsetLayout::InsetDecoration const dec = getLayout().decoration();
void InsetFlex::write(ostream & os) const
{
- os << "Flex " <<
- (name_.empty() ? "undefined" : name_) << "\n";
+ os << "Flex ";
+ InsetLayout const & il = getLayout();
+ if (name_.empty())
+ os << "undefined";
+ else {
+ // use il.name(), since this resolves obsoleted
+ // InsetLayout names
+ string name = to_utf8(il.name());
+ // Remove the "Flex:" prefix, if it is present
+ if (support::prefixIs(name, "Flex:"))
+ name = support::token(name, ':', 1);
+ os << name;
+ }
+ os << "\n";
InsetCollapsable::write(os);
}
void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
{
BufferParams const & bp = buffer().masterBuffer()->params();
- Counters & cnts = bp.documentClass().counters();
- if (utype == OutputUpdate) {
- // the counter is local to this inset
- cnts.saveLastCounter();
- }
InsetLayout const & il = getLayout();
- docstring const & count = il.counter();
docstring custom_label = translateIfPossible(il.labelstring());
- if (cnts.hasCounter(count))
+
+ Counters & cnts = bp.documentClass().counters();
+ 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());
+ custom_label += ' ' +
+ 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
+ // if this turns out to be wrong in some case, we will
+ // need a layout flag
+ cnts.saveLastCounter();
+ }
InsetCollapsable::updateBuffer(it, utype);
- if (utype == OutputUpdate)
+ if (save_counter)
cnts.restoreLastCounter();
}