X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=e0cd894a4ae95ebe1ccf9cdedbe513e2caeac698;hb=a25569ebb3e739779ff458b287e403c3bf79777a;hp=8c9d3df314c60aef7c046b0ced9fff0ec17bb4ac;hpb=ca03f8cf7b7bd53f978da9bae23d838fef1bc1d5;p=lyx.git

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 8c9d3df314..e0cd894a4a 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -125,7 +125,7 @@ void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos)
 void InsetText::clear()
 {
 	ParagraphList & pars = paragraphs();
-	LASSERT(!pars.empty(), /**/);
+	LBUFERR(!pars.empty());
 
 	// This is a gross hack...
 	Layout const & old_layout = pars.begin()->layout();
@@ -251,7 +251,6 @@ void InsetText::edit(Cursor & cur, bool front, EntryDirection entry_from)
 	}
 
 	text_.setCursor(cur.top(), pit, pos);
-	cur.clearSelection();
 	cur.finishUndo();
 }
 
@@ -266,9 +265,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
-#if 0
-// FIXME: This code does not seem to be necessary anymore
-// Remove for 2.1 if no counter-evidence is found.
+	// See bug #9042, for instance.
 	if (isPassThru() && lyxCode() != ARG_CODE) {
 		// Force any new text to latex_language FIXME: This
 		// should only be necessary in constructor, but new
@@ -279,7 +276,6 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 		cur.current_font.setLanguage(latex_language);
 		cur.real_current_font.setLanguage(latex_language);
 	}
-#endif
 
 	switch (cmd.action()) {
 	case LFUN_PASTE:
@@ -437,6 +433,8 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 	// environment. Standard collapsable insets should not
 	// redefine this, non-standard ones may call this.
 	InsetLayout const & il = getLayout();
+	if (il.forceOwnlines())
+		os << breakln;
 	if (!il.latexname().empty()) {
 		if (il.latextype() == InsetLayout::COMMAND) {
 			// FIXME UNICODE
@@ -499,11 +497,13 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 				os << breakln;
 			else
 				os << safebreakln;
-			os << "\\end{" << from_utf8(il.latexname()) << "}\n";
+			os << "\\end{" << from_utf8(il.latexname()) << "}" << breakln;
 			if (!il.isDisplay())
 				os.protectSpace(true);
 		}
 	}
+	if (il.forceOwnlines())
+		os << breakln;
 }
 
 
@@ -803,11 +803,11 @@ void InsetText::toString(odocstream & os) const
 }
 
 
-void InsetText::forToc(docstring & os, size_t maxlen) const
+void InsetText::forOutliner(docstring & os, size_t maxlen) const
 {
 	if (!getLayout().isInToc())
 		return;
-	text().forToc(os, maxlen, false);
+	text().forOutliner(os, maxlen, false);
 }
 
 
@@ -815,6 +815,13 @@ void InsetText::addToToc(DocIterator const & cdit, bool output_active) const
 {
 	DocIterator dit = cdit;
 	dit.push_back(CursorSlice(const_cast<InsetText &>(*this)));
+	iterateForToc(dit, output_active);
+}
+
+
+void InsetText::iterateForToc(DocIterator const & cdit, bool output_active) const
+{
+	DocIterator dit = cdit;
 	Toc & toc = buffer().tocBackend().toc("tableofcontents");
 
 	BufferParams const & bufparams = buffer_->params();
@@ -852,9 +859,9 @@ void InsetText::addToToc(DocIterator const & cdit, bool output_active) const
 				tocstring = par.labelString();
 				if (!tocstring.empty())
 					tocstring += ' ';
-				arginset->text().forToc(tocstring, length);
+				arginset->text().forOutliner(tocstring, length);
 			} else
-				par.forToc(tocstring, length);
+				par.forOutliner(tocstring, length);
 			dit.pos() = 0;
 			toc.push_back(TocItem(dit, toclevel - min_toclevel,
 				tocstring, doing_output, tocstring));
@@ -874,9 +881,11 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 	// find text inset in old cursor
 	Cursor insetCur = old;
 	int scriptSlice	= insetCur.find(this);
-	LASSERT(scriptSlice != -1, /**/);
+	// we can try to continue here. returning true means
+	// the cursor is "now" invalid. which it was.
+	LASSERT(scriptSlice != -1, return true);
 	insetCur.cutOff(scriptSlice);
-	LASSERT(&insetCur.inset() == this, /**/);
+	LASSERT(&insetCur.inset() == this, return true);
 	
 	// update the old paragraph's words
 	insetCur.paragraph().updateWords();
@@ -887,7 +896,7 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 
 bool InsetText::completionSupported(Cursor const & cur) const
 {
-	//LASSERT(&cur.bv().cursor().inset() != this, return false);
+	//LASSERT(&cur.bv().cursor().inset() == this, return false);
 	return text_.completionSupported(cur);
 }