X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=09a52150509e0ea62dc2ef7a52779f98024f9769;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=3805e836bc2234038edc374e35c718141abfd6b4;hpb=e0dfcdbdda3f233dc66e45b29f8503495628053a;p=lyx.git

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 3805e836bc..09a5215050 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -99,6 +99,26 @@ void InsetText::setBuffer(Buffer & buf)
 }
 
 
+void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos)
+{
+	text_.setMacrocontextPosition(pos);
+
+	ParagraphList::const_iterator pit = paragraphs().begin();
+	ParagraphList::const_iterator pend = paragraphs().end();
+	for (; pit != pend; ++pit) {
+		InsetList::const_iterator iit = pit->insetList().begin();
+		InsetList::const_iterator end = pit->insetList().end();
+		for (; iit != end; ++iit) {
+			if (InsetText * txt = iit->inset->asInsetText()) {
+				DocIterator ppos(pos);
+				ppos.push_back(CursorSlice(*txt));
+				iit->inset->asInsetText()->setMacrocontextPositionRecursive(ppos);
+			}
+		}
+	}
+}
+
+
 void InsetText::clear()
 {
 	ParagraphList & pars = paragraphs();
@@ -326,16 +346,15 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetText::fixParagraphsFont()
 {
-	if (!getLayout().isPassThru())
-		return;
-
 	Font font(inherit_font, buffer().params().language);
 	font.setLanguage(latex_language);
 	ParagraphList::iterator par = paragraphs().begin();
 	ParagraphList::iterator const end = paragraphs().end();
 	while (par != end) {
-		par->resetFonts(font);
-		par->params().clear();
+		if (par->isPassThru())
+			par->resetFonts(font);
+		if (!par->allowParagraphCustomization())
+			par->params().clear();
 		++par;
 	}
 }
@@ -371,14 +390,13 @@ void InsetText::validate(LaTeXFeatures & features) const
 }
 
 
-int InsetText::latex(odocstream & os, OutputParams const & runparams) const
+void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 {
 	// This implements the standard way of handling the LaTeX
 	// output of a text inset, either a command or an
 	// environment. Standard collapsable insets should not
 	// redefine this, non-standard ones may call this.
 	InsetLayout const & il = getLayout();
-	int rows = 0;
 	if (!il.latexname().empty()) {
 		if (il.latextype() == InsetLayout::COMMAND) {
 			// FIXME UNICODE
@@ -389,10 +407,16 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const
 				os << from_utf8(il.latexparam());
 			os << '{';
 		} else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-			os << "%\n\\begin{" << from_utf8(il.latexname()) << "}\n";
+			if (il.isDisplay())
+			    os << breakln;
+			else
+			    os << safebreakln;
+			if (runparams.lastid != -1)
+				os.texrow().start(runparams.lastid,
+						  runparams.lastpos);
+			os << "\\begin{" << from_utf8(il.latexname()) << "}\n";
 			if (!il.latexparam().empty())
 				os << from_utf8(il.latexparam());
-			rows += 2;
 		}
 	}
 	OutputParams rp = runparams;
@@ -404,20 +428,23 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const
 	rp.par_end = paragraphs().size();
 
 	// Output the contents of the inset
-	TexRow texrow;
-	latexParagraphs(buffer(), text_, os, texrow, rp);
-	rows += texrow.rows();
+	latexParagraphs(buffer(), text_, os, rp);
 	runparams.encoding = rp.encoding;
 
 	if (!il.latexname().empty()) {
 		if (il.latextype() == InsetLayout::COMMAND) {
 			os << "}";
 		} else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-			os << "%\n\\end{" << from_utf8(il.latexname()) << "}\n";
-			rows += 2;
+			// A comment environment doesn't need a % before \n\end
+			if (il.isDisplay() || runparams.inComment)
+			    os << breakln;
+			else
+			    os << safebreakln;
+			os << "\\end{" << from_utf8(il.latexname()) << "}\n";
+			if (!il.isDisplay())
+				os.protectSpace(true);
 		}
 	}
-	return rows;
 }
 
 
@@ -483,9 +510,15 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con
 // if so, try to close fonts, etc. 
 // There are probably limits to how well we can do here, though, and we will
 // have to rely upon users not putting footnotes inside noun-type insets.
-docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runparams,
+docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
                                   XHTMLOptions opts) const
 {
+	// we will always want to output all our paragraphs when we are
+	// called this way.
+	OutputParams runparams = rp;
+	runparams.par_begin = 0;
+	runparams.par_end = text().paragraphs().size();
+	
 	if (undefined()) {
 		xhtmlParagraphs(text_, buffer(), xs, runparams);
 		return docstring();
@@ -815,18 +848,18 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+string InsetText::contextMenu(BufferView const &, int, int) const
 {
-	docstring context_menu = contextMenuName();
+	string context_menu = contextMenuName();
 	if (context_menu != InsetText::contextMenuName())
 		context_menu += ";" + InsetText::contextMenuName(); 
 	return context_menu;
 }
 
 
-docstring InsetText::contextMenuName() const
+string InsetText::contextMenuName() const
 {
-	return from_ascii("context-edit");
+	return "context-edit";
 }