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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 2e9e97096f..44b9b03436 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -19,9 +19,13 @@
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "Language.h"
 #include "Lexer.h"
+#include "ParIterator.h"
+#include "TextClass.h"
 
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
@@ -32,9 +36,7 @@ namespace lyx {
 
 InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
 	: InsetCollapsable(buf), name_(layoutName)
-{
-	status_= Collapsed;
-}
+{}
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
@@ -42,6 +44,20 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
+// special code for InsetFlex when there is not the explicit Flex:: prefix
+InsetLayout const & InsetFlex::getLayout() const
+{
+	if (!buffer_)
+		return DocumentClass::plainInsetLayout();
+
+	DocumentClass const & dc = buffer().params().documentClass();
+	docstring const dname = from_utf8(name_); 
+	if (dc.hasInsetLayout(dname))
+		return dc.insetLayout(dname);
+	return dc.insetLayout(from_utf8("Flex:" + name_));
+}
+
+
 InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
 	InsetLayout::InsetDecoration const dec = getLayout().decoration();
@@ -51,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);
 }
 
@@ -60,7 +88,7 @@ void InsetFlex::write(ostream & os) const
 bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action_) {
+	switch (cmd.action()) {
 	case LFUN_INSET_DISSOLVE:
 		if (!cmd.argument().empty()) {
 			InsetLayout const & il = getLayout();
@@ -81,7 +109,7 @@ bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action_) {
+	switch (cmd.action()) {
 	case LFUN_INSET_DISSOLVE:
 		if (!cmd.argument().empty()) {
 			InsetLayout const & il = getLayout();
@@ -103,4 +131,33 @@ void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
+{
+	BufferParams const & bp = buffer().masterBuffer()->params();
+	InsetLayout const & il = getLayout();
+	docstring custom_label = translateIfPossible(il.labelstring());
+
+	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());
+	}
+	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 (save_counter)
+		cnts.restoreLastCounter();
+}
+
+
 } // namespace lyx