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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 0b14973faa..c91d65ec37 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -35,12 +35,12 @@ namespace lyx {
 
 
 InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
-	: InsetCollapsable(buf), name_(layoutName)
+	: InsetCollapsible(buf), name_(layoutName)
 {}
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
-	: InsetCollapsable(in), name_(in.name_)
+	: InsetCollapsible(in), name_(in.name_)
 {}
 
 
@@ -51,7 +51,7 @@ InsetLayout const & InsetFlex::getLayout() const
 		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_));
@@ -86,7 +86,7 @@ void InsetFlex::write(ostream & os) const
 		}
 	}
 	os << name << "\n";
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
@@ -97,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);
 	}
 }
 
@@ -118,25 +120,27 @@ 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)
+void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
 	BufferParams const & bp = buffer().masterBuffer()->params();
 	InsetLayout const & il = getLayout();
@@ -146,12 +150,16 @@ void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
 	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());
+		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
@@ -159,7 +167,7 @@ void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
 		// need a layout flag
 		cnts.saveLastCounter();
 	}
-	InsetCollapsable::updateBuffer(it, utype);
+	InsetCollapsible::updateBuffer(it, utype, deleted);
 	if (save_counter)
 		cnts.restoreLastCounter();
 }