X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=c91d65ec377c07773a67f3e254e25f4113dd1115;hb=110f8f67ac1afe9892dad5566d1c697044427cf0;hp=9355d42b796fa13b280921f494a47d2ff8ff96b9;hpb=2a63b2d1cb4bcbd5ec3f3ab7a71f8005f23427ed;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 9355d42b79..c91d65ec37 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>
 
@@ -31,21 +35,23 @@ namespace lyx {
 
 
 InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
-	: InsetCollapsable(buf), name_(layoutName)
-{
-	status_= Collapsed;
-}
+	: InsetCollapsible(buf), name_(layoutName)
+{}
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
-	: InsetCollapsable(in), name_(in.name_)
+	: InsetCollapsible(in), name_(in.name_)
 {}
 
 
+// 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_); 
+	docstring const dname = from_utf8(name_);
 	if (dc.hasInsetLayout(dname))
 		return dc.insetLayout(dname);
 	return dc.insetLayout(from_utf8("Flex:" + name_));
@@ -61,9 +67,26 @@ InsetLayout::InsetDecoration InsetFlex::decoration() const
 
 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);
 }
 
 
@@ -74,17 +97,19 @@ bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
 	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);
 	}
 }
 
@@ -95,22 +120,57 @@ void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 	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, bool const deleted)
+{
+	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) {
+		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
+		// if this turns out to be wrong in some case, we will
+		// need a layout flag
+		cnts.saveLastCounter();
+	}
+	InsetCollapsible::updateBuffer(it, utype, deleted);
+	if (save_counter)
+		cnts.restoreLastCounter();
+}
+
+
 } // namespace lyx