X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=44b9b034360b0174bd5a306785c9e117dd4fb466;hb=e30db1e44474ee379bedb0d1c752297541156497;hp=9679b06240ec7dc658a1c34b0eea806cc8917525;hpb=a9614f15d244b6eda60b93f971f56b40e838d351;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 9679b06240..44b9b03436 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -25,6 +25,7 @@
 #include "TextClass.h"
 
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
@@ -57,14 +58,6 @@ InsetLayout const & InsetFlex::getLayout() const
 }
 
 
-bool InsetFlex::resetFontEdit() const
-{
-	if (getLayout().resetsFont())
-		return true;
-	return InsetCollapsable::resetFontEdit();
-}
-
-
 InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
 	InsetLayout::InsetDecoration const dec = getLayout().decoration();
@@ -74,8 +67,20 @@ InsetLayout::InsetDecoration InsetFlex::decoration() const
 
 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);
 }
 
@@ -129,21 +134,28 @@ void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 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();
 }