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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 5931bb4eba..c91d65ec37 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -16,15 +16,16 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "LaTeXFeatures.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "Language.h"
 #include "Lexer.h"
-#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
-#include "sgml.h"
-#include "Text.h"
+#include "ParIterator.h"
+#include "TextClass.h"
 
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
@@ -33,60 +34,142 @@ using namespace std;
 namespace lyx {
 
 
-InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
-	: InsetCollapsable(buf), name_(layoutName)
-{
-	// again, because now the name is initialized
-	setLayout(buf.params().documentClassPtr());
-	status_= Collapsed;
-}
+InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
+	: InsetCollapsible(buf), name_(layoutName)
+{}
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
-	: InsetCollapsable(in), name_(in.name_)
+	: InsetCollapsible(in), name_(in.name_)
 {}
 
 
-docstring InsetFlex::editMessage() const
+// 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
 {
-	return _("Opened Flex Inset");
+	InsetLayout::InsetDecoration const dec = getLayout().decoration();
+	return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
 }
 
 
 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);
 }
 
 
-int InsetFlex::docbook(odocstream & os, OutputParams const & runparams) const
+bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
 {
-	ParagraphList::const_iterator const beg = paragraphs().begin();
-	ParagraphList::const_iterator par = paragraphs().begin();
-	ParagraphList::const_iterator const end = paragraphs().end();
-
-	if (!undefined())
-		sgml::openTag(os, getLayout().latexname(),
-			      par->getID(buffer(), runparams) + getLayout().latexparam());
-
-	for (; par != end; ++par) {
-		par->simpleDocBookOnePar(buffer(), os, runparams,
-					 outerFont(distance(beg, par),
-						   paragraphs()));
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type =
+				translateLyXType(to_utf8(cmd.argument()));
+			if (il.lyxtype() == type
+			    || (il.name() == DocumentClass::plainInsetLayout().name()
+				    && type == InsetLayout::CHARSTYLE)) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				return InsetCollapsible::getStatus(cur, temp_cmd, flag);
+			} else
+				return false;
+		}
+		// fall-through
+	default:
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
+}
 
-	if (!undefined())
-		sgml::closeTag(os, getLayout().latexname());
 
-	return 0;
+void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
+{
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type =
+				translateLyXType(to_utf8(cmd.argument()));
+
+			if (il.lyxtype() == type
+			    || (il.name() == DocumentClass::plainInsetLayout().name()
+				    && type == InsetLayout::CHARSTYLE)) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				InsetCollapsible::doDispatch(cur, temp_cmd);
+			} else
+				cur.undispatched();
+			break;
+		}
+		// fall-through
+	default:
+		InsetCollapsible::doDispatch(cur, cmd);
+		break;
+	}
 }
 
 
-void InsetFlex::tocString(odocstream & os) const
+void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
-	os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
+	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();
 }