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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index fac205070d..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,6 +265,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
+	// 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
@@ -341,7 +341,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 		if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
 			return text_.getStatus(cur, cmd, status);
 
-		Layout::LaTeXArgMap args = getLayout().latexargs();
+		Layout::LaTeXArgMap args = getLayout().args();
 		Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
 		if (lait != args.end()) {
 			status.setEnabled(true);
@@ -433,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
@@ -440,7 +442,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 				os << "\\protect";
 			os << '\\' << from_utf8(il.latexname());
 			if (!il.latexargs().empty())
-				getOptArg(os, runparams);
+				getArgs(os, runparams);
 			if (!il.latexparam().empty())
 				os << from_utf8(il.latexparam());
 			os << '{';
@@ -454,14 +456,14 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 						  runparams.lastpos);
 			os << "\\begin{" << from_utf8(il.latexname()) << "}";
 			if (!il.latexargs().empty())
-				getOptArg(os, runparams);
+				getArgs(os, runparams);
 			if (!il.latexparam().empty())
 				os << from_utf8(il.latexparam());
 			os << '\n';
 		}
 	} else {
 		if (!il.latexargs().empty())
-			getOptArg(os, runparams);
+			getArgs(os, runparams);
 		if (!il.latexparam().empty())
 			os << from_utf8(il.latexparam());
 	}
@@ -487,21 +489,26 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 	if (!il.latexname().empty()) {
 		if (il.latextype() == InsetLayout::COMMAND) {
 			os << "}";
+			if (!il.postcommandargs().empty())
+				getArgs(os, runparams, true);
 		} else if (il.latextype() == InsetLayout::ENVIRONMENT) {
 			// A comment environment doesn't need a % before \n\end
 			if (il.isDisplay() || runparams.inComment)
-			    os << breakln;
+				os << breakln;
 			else
-			    os << safebreakln;
-			os << "\\end{" << from_utf8(il.latexname()) << "}\n";
+				os << safebreakln;
+			os << "\\end{" << from_utf8(il.latexname()) << "}" << breakln;
 			if (!il.isDisplay())
 				os.protectSpace(true);
 		}
 	}
+	if (il.forceOwnlines())
+		os << breakln;
 }
 
 
-int InsetText::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetText::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
 	ParagraphList::const_iterator beg = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
@@ -515,12 +522,14 @@ int InsetText::plaintext(odocstream & os, OutputParams const & runparams) const
 				os << '\n';
 		}
 		odocstringstream oss;
-		writePlaintextParagraph(buffer(), *it, oss, runparams, ref_printed);
+		writePlaintextParagraph(buffer(), *it, oss, runparams, ref_printed, max_length);
 		docstring const str = oss.str();
 		os << str;
 		// FIXME: len is not computed fully correctly; in principle,
 		// we have to count the characters after the last '\n'
 		len = str.size();
+		if (os.str().size() >= max_length)
+			break;
 	}
 
 	return len;
@@ -601,7 +610,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 	if (opts & WriteInnerTag)
 		xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
 
-	// we will eventaully lose information about the containing inset
+	// we will eventually lose information about the containing inset
 	if (!il.isMultiPar() || opts == JustText)
 		runparams.html_make_pars = false;
 	if (il.isPassThru())
@@ -618,15 +627,18 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 	return docstring();
 }
 
-void InsetText::getOptArg(otexstream & os,
-			OutputParams const & runparams_in) const
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+			bool const post) const
 {
 	OutputParams runparams = runparams_in;
 	runparams.local_font =
 		&paragraphs()[0].getFirstFontSettings(buffer().masterBuffer()->params());
 	if (isPassThru())
 		runparams.pass_thru = true;
-	latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs());
+	if (post)
+		latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().postcommandargs(), "post:");
+	else
+		latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs());
 }
 
 
@@ -791,22 +803,32 @@ 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);
 }
 
 
-void InsetText::addToToc(DocIterator const & cdit) const
+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();
 	int const min_toclevel = bufparams.documentClass().min_toclevel();
+	// we really should have done this before we got here, but it
+	// can't hurt too much to do it again
+	bool const doing_output = output_active && producesOutput();
 
 	// For each paragraph, traverse its insets and let them add
 	// their toc items
@@ -823,7 +845,7 @@ void InsetText::addToToc(DocIterator const & cdit) const
 			Inset & inset = *it->inset;
 			dit.pos() = it->pos;
 			//lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
-			inset.addToToc(dit);
+			inset.addToToc(dit, doing_output);
 			if (inset.lyxCode() == ARG_CODE)
 				arginset = inset.asInsetText();
 		}
@@ -832,20 +854,21 @@ void InsetText::addToToc(DocIterator const & cdit) const
 		if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
 			// insert this into the table of contents
 			docstring tocstring;
+			int const length = doing_output ? INT_MAX : TOC_ENTRY_LENGTH;
 			if (arginset) {
 				tocstring = par.labelString();
 				if (!tocstring.empty())
 					tocstring += ' ';
-				arginset->text().forToc(tocstring, TOC_ENTRY_LENGTH);
+				arginset->text().forOutliner(tocstring, length);
 			} else
-				par.forToc(tocstring, TOC_ENTRY_LENGTH);
+				par.forOutliner(tocstring, length);
 			dit.pos() = 0;
 			toc.push_back(TocItem(dit, toclevel - min_toclevel,
-				tocstring, tocstring));
+				tocstring, doing_output, tocstring));
 		}
 		
 		// And now the list of changes.
-		par.addChangesToToc(dit, buffer());
+		par.addChangesToToc(dit, buffer(), doing_output);
 	}
 }
 
@@ -858,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();
@@ -871,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);
 }
 
@@ -952,6 +977,7 @@ docstring InsetText::toolTipText(docstring prefix,
 {
 	size_t const max_length = numlines * len;
 	OutputParams rp(&buffer().params().encoding());
+	rp.for_tooltip = true;
 	odocstringstream oss;
 	oss << prefix;
 
@@ -964,9 +990,9 @@ docstring InsetText::toolTipText(docstring prefix,
 	for (; it != end; ++it) {
 		if (it != beg)
 			oss << '\n';
-		writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed);
+		writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, max_length);
 		str = oss.str();
-		if (str.length() > max_length)
+		if (str.length() >= max_length)
 			break;
 	}
 	return support::wrapParas(str, 4, len, numlines);