X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=2af9831d780f175aa61c26ea24e42601658d8050;hb=1a48d5a96712c72879487542e3f1a7e61ce3f78c;hp=63e61ac4b13fd746c486abf971aaca24caf21079;hpb=8c61911270d9e5f542fcb916deab50659eee9115;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 63e61ac4b1..2af9831d78 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -25,15 +25,17 @@
 #include "ParagraphParameters.h"
 #include "TextClass.h"
 #include "TexRow.h"
-#include "VSpace.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetArgument.h"
 
 #include "support/lassert.h"
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
+#include <algorithm>
 #include <boost/next_prior.hpp>
 #include <list>
 
@@ -46,9 +48,9 @@ namespace lyx {
 namespace {
 
 enum OpenEncoding {
-		none,
-		inputenc,
-		CJK
+	none,
+	inputenc,
+	CJK
 };
 
 static int open_encoding_ = none;
@@ -66,7 +68,7 @@ string const getPolyglossiaEnvName(Language const * lang)
 }
 
 
-struct TeXEnvironementData
+struct TeXEnvironmentData
 {
 	bool cjk_nested;
 	Layout const * style;
@@ -76,11 +78,13 @@ struct TeXEnvironementData
 };
 
 
-static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & text,
-		ParagraphList::const_iterator pit, odocstream & os, TexRow & texrow,
-		OutputParams const & runparams)
+static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
+					Text const & text,
+					ParagraphList::const_iterator pit,
+					otexstream & os,
+					OutputParams const & runparams)
 {
-	TeXEnvironementData data;
+	TeXEnvironmentData data;
 
 	BufferParams const & bparams = buf.params();
 
@@ -107,19 +111,18 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 		? (use_prev_env_language ? prev_env_language_
 					 : priorpit->getParLanguage(bparams))
 		: doc_language;
-	string par_lang = data.par_language->babel();
-	string prev_par_lang = prev_par_language->babel();
-	string doc_lang = doc_language->babel();
-	string lang_begin_command = lyxrc.language_command_begin;
-	string lang_end_command = lyxrc.language_command_end;
-
-	if (runparams.use_polyglossia) {
-		par_lang = getPolyglossiaEnvName(data.par_language);
-		prev_par_lang = getPolyglossiaEnvName(prev_par_language);
-		doc_lang = getPolyglossiaEnvName(doc_language);
-		lang_begin_command = "\\begin{$$lang}";
-		lang_end_command = "\\end{$$lang}";
-	}
+
+	bool const use_polyglossia = runparams.use_polyglossia;
+	string const par_lang = use_polyglossia ?
+		getPolyglossiaEnvName(data.par_language) : data.par_language->babel();
+	string const prev_par_lang = use_polyglossia ?
+		getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel();
+	string const doc_lang = use_polyglossia ?
+		getPolyglossiaEnvName(doc_language) : doc_language->babel();
+	string const lang_begin_command = use_polyglossia ?
+		"\\begin{$$lang}" : lyxrc.language_command_begin;
+	string const lang_end_command = use_polyglossia ?
+		"\\end{$$lang}" : lyxrc.language_command_end;
 
 	if (par_lang != prev_par_lang) {
 		if (!lang_end_command.empty() &&
@@ -131,7 +134,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 				prev_par_lang))
 			  // the '%' is necessary to prevent unwanted whitespace
 			  << "%\n";
-			texrow.newline();
 		}
 
 		if ((lang_end_command.empty() ||
@@ -141,14 +143,13 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 				lang_begin_command,
 				"$$lang",
 				par_lang));
-			if (runparams.use_polyglossia
+			if (use_polyglossia
 			    && !data.par_language->polyglossiaOpts().empty())
 					os << "["
 					   << from_ascii(data.par_language->polyglossiaOpts())
 					   << "]";
 			  // the '%' is necessary to prevent unwanted whitespace
 			os << "%\n";
-			texrow.newline();
 		}
 	}
 
@@ -157,18 +158,15 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 		os << "\\begin{LyXParagraphLeftIndent}{"
 		   << from_ascii(pit->params().leftIndent().asLatexString())
 		   << "}\n";
-		texrow.newline();
 		data.leftindent_open = true;
 	}
 
 	if (style.isEnvironment()) {
 		os << "\\begin{" << from_ascii(style.latexname()) << '}';
-		if (style.optargs != 0 || style.reqargs != 0) {
-			int ret = latexArgInsets(*pit, os, runparams, style.reqargs, style.optargs);
-			while (ret > 0) {
-				texrow.newline();
-				--ret;
-			}
+		if (!style.latexargs().empty()) {
+			OutputParams rp = runparams;
+			rp.local_font = &pit->getFirstFontSettings(bparams);
+			latexArgInsets(paragraphs, pit, os, rp, style.latexargs());
 		}
 		if (style.latextype == LATEX_LIST_ENVIRONMENT) {
 			os << '{'
@@ -183,7 +181,6 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 				  << "}\n";
 		} else
 			os << from_ascii(style.latexparam()) << '\n';
-		texrow.newline();
 	}
 	data.style = &style;
 
@@ -196,26 +193,23 @@ static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const &
 			   << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
 		open_encoding_ = CJK;
 		data.cjk_nested = true;
-		texrow.newline();
 	}
 	return data;
 }
 
 
-static void finishEnvironement(odocstream & os, TexRow & texrow,
-		OutputParams const & runparams, TeXEnvironementData const & data)
+static void finishEnvironment(otexstream & os, OutputParams const & runparams,
+			       TeXEnvironmentData const & data)
 {
 	if (open_encoding_ == CJK && data.cjk_nested) {
 		// We need to close the encoding even if it does not change
 		// to do correct environment nesting
 		os << "\\end{CJK}\n";
-		texrow.newline();
 		open_encoding_ = none;
 	}
 
 	if (data.style->isEnvironment()) {
 		os << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
-		texrow.newline();
 		prev_env_language_ = data.par_language;
 		if (runparams.encoding != data.prev_encoding) {
 			runparams.encoding = data.prev_encoding;
@@ -226,7 +220,6 @@ static void finishEnvironement(odocstream & os, TexRow & texrow,
 
 	if (data.leftindent_open) {
 		os << "\\end{LyXParagraphLeftIndent}\n";
-		texrow.newline();
 		prev_env_language_ = data.par_language;
 		if (runparams.encoding != data.prev_encoding) {
 			runparams.encoding = data.prev_encoding;
@@ -237,9 +230,9 @@ static void finishEnvironement(odocstream & os, TexRow & texrow,
 }
 
 
-void TeXEnvironment(Buffer const & buf,
-	       Text const & text, OutputParams const & runparams,
-		   pit_type & pit, odocstream & os, TexRow & texrow)
+void TeXEnvironment(Buffer const & buf, Text const & text,
+		    OutputParams const & runparams,
+		    pit_type & pit, otexstream & os)
 {
 	ParagraphList const & paragraphs = text.paragraphs();
 	ParagraphList::const_iterator par = paragraphs.constIterator(pit);
@@ -252,7 +245,6 @@ void TeXEnvironment(Buffer const & buf,
 	// This is for debugging purpose at the end.
 	pit_type const par_begin = pit;
 	for (; pit < runparams.par_end; ++pit) {
-	
 		ParagraphList::const_iterator par = paragraphs.constIterator(pit);
 
 		// check first if this is an higher depth paragraph.
@@ -272,7 +264,7 @@ void TeXEnvironment(Buffer const & buf,
 			&& par->params().depth() == current_depth
 			&& par->params().leftIndent() == current_left_indent) {
 			// We are still in the same environment so TeXOnePar and continue;
-			TeXOnePar(buf, text, pit, os, texrow, runparams);
+			TeXOnePar(buf, text, pit, os, runparams);
 			continue;
 		}
 
@@ -282,20 +274,18 @@ void TeXEnvironment(Buffer const & buf,
 		// Or     par->params().leftIndent() != current_left_indent)
 
 		if (par->layout().isParagraph()) {
-			// FIXME (Lgb): How to handle this? 
+			// FIXME (Lgb): How to handle this?
 			//&& !suffixIs(os, "\n\n")
 
 			// (ARRae) There should be at least one '\n' already but we need there to
 			// be two for Standard paragraphs that are depth-increment'ed to be
 			// output correctly. However, tables can also be paragraphs so
 			// don't adjust them.
-			// 
 
 			// FIXME (Lgb): Will it ever harm to have one '\n' too
 			// many? i.e. that we sometimes will have
 			// three in a row.
 			os << '\n';
-			texrow.newline();
 		}
 
 		// FIXME This test should not be necessary.
@@ -307,88 +297,229 @@ void TeXEnvironment(Buffer const & buf,
 
 		if (!style.isEnvironment()) {
 			// This is a standard paragraph, no need to call TeXEnvironment.
-			TeXOnePar(buf, text, pit, os, texrow, runparams);
+			TeXOnePar(buf, text, pit, os, runparams);
 			continue;
 		}
 
 		// This is a new environment.
-		TeXEnvironementData const data = prepareEnvironement(buf, text, par,
-			os, texrow, runparams);
+		TeXEnvironmentData const data =
+			prepareEnvironment(buf, text, par, os, runparams);
 		// Recursive call to TeXEnvironment!
-		TeXEnvironment(buf, text, runparams, pit, os, texrow);
-		finishEnvironement(os, texrow, runparams, data);
+		TeXEnvironment(buf, text, runparams, pit, os);
+		finishEnvironment(os, runparams, data);
 	}
 
 	if (pit != runparams.par_end)
 		LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done.");
 }
 
+
+void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
+		  map<int, lyx::InsetArgument const *> ilist, vector<string> required, string const & prefix)
+{
+	unsigned int const argnr = latexargs.size();
+	if (argnr == 0)
+		return;
+
+	for (unsigned int i = 1; i <= argnr; ++i) {
+		map<int, InsetArgument const *>::const_iterator lit = ilist.find(i);
+		bool inserted = false;
+		if (lit != ilist.end()) {
+			InsetArgument const * ins = (*lit).second;
+			if (ins) {
+				Layout::LaTeXArgMap::const_iterator const lait =
+						latexargs.find(ins->name());
+				if (lait != latexargs.end()) {
+					Layout::latexarg arg = (*lait).second;
+					docstring ldelim = arg.mandatory ?
+							from_ascii("{") : from_ascii("[");
+					docstring rdelim = arg.mandatory ?
+							from_ascii("}") : from_ascii("]");
+					if (!arg.ldelim.empty())
+						ldelim = arg.ldelim;
+					if (!arg.rdelim.empty())
+						rdelim = arg.rdelim;
+					ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg);
+					inserted = true;
+				}
+			}
+		}
+		if (!inserted) {
+			Layout::LaTeXArgMap::const_iterator lait = latexargs.begin();
+			Layout::LaTeXArgMap::const_iterator const laend = latexargs.end();
+			for (; lait != laend; ++lait) {
+				string const name = prefix + convert<string>(i);
+				if ((*lait).first == name) {
+					Layout::latexarg arg = (*lait).second;
+					if (arg.mandatory) {
+						docstring ldelim = arg.ldelim.empty() ?
+								from_ascii("{") : arg.ldelim;
+						docstring rdelim = arg.rdelim.empty() ?
+								from_ascii("}") : arg.rdelim;
+						os << ldelim << arg.presetarg << rdelim;
+					} else if (!arg.presetarg.empty()) {
+						docstring ldelim = arg.mandatory ?
+								from_ascii("{") : from_ascii("[");
+						docstring rdelim = arg.mandatory ?
+								from_ascii("}") : from_ascii("]");
+						if (!arg.ldelim.empty())
+							ldelim = arg.ldelim;
+						if (!arg.rdelim.empty())
+							rdelim = arg.rdelim;
+						os << ldelim << arg.presetarg << rdelim;
+					} else if (find(required.begin(), required.end(),
+						   (*lait).first) != required.end()) {
+						docstring ldelim = arg.ldelim.empty() ?
+								from_ascii("[") : arg.ldelim;
+						docstring rdelim = arg.rdelim.empty() ?
+								from_ascii("]") : arg.rdelim;
+						os << ldelim << rdelim;
+					} else
+						break;
+				}
+			}
+		}
+	}
+}
+
+
 } // namespace anon
 
 
-int latexArgInsets(Paragraph const & par, odocstream & os,
-	OutputParams const & runparams, unsigned int reqargs,
-	unsigned int optargs)
+void latexArgInsets(Paragraph const & par, otexstream & os,
+	OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix)
 {
-	unsigned int totalargs = reqargs + optargs;
-	list<InsetArgument const *> ilist;
+	map<int, InsetArgument const *> ilist;
+	vector<string> required;
 
 	InsetList::const_iterator it = par.insetList().begin();
 	InsetList::const_iterator end = par.insetList().end();
 	for (; it != end; ++it) {
 		if (it->inset->lyxCode() == ARG_CODE) {
-			if (ilist.size() >= totalargs) {
-				LYXERR0("WARNING: Found extra argument inset.");
-				continue;
-			}
 			InsetArgument const * ins =
 				static_cast<InsetArgument const *>(it->inset);
-			ilist.push_back(ins);
+			if (ins->name().empty())
+				LYXERR0("Error: Unnamed argument inset!");
+			else {
+				string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
+				unsigned int const nr = convert<unsigned int>(name);
+				ilist[nr] = ins;
+				Layout::LaTeXArgMap::const_iterator const lit =
+						latexargs.find(ins->name());
+				if (lit != latexargs.end()) {
+					Layout::latexarg const & arg = (*lit).second;
+					if (!arg.requires.empty()) {
+						vector<string> req = getVectorFromString(arg.requires);
+						required.insert(required.end(), req.begin(), req.end());
+					}
+				}
+			}
 		}
 	}
+	getArgInsets(os, runparams, latexargs, ilist, required, prefix);
+}
 
-	if (!reqargs && ilist.size() == 0)
-		return 0;
-
-	int lines = 0;
-	bool const have_optional_args = ilist.size() > reqargs;
-	if (have_optional_args) {
-		unsigned int todo = ilist.size() - reqargs;
-		for (unsigned int i = 0; i < todo; ++i) {
-			InsetArgument const * ins = ilist.front();
-			ilist.pop_front();
-			lines += ins->latexArgument(os, runparams, true);
-		}
+
+void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit,
+	otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
+	string const & prefix)
+{
+	map<int, InsetArgument const *> ilist;
+	vector<string> required;
+
+	depth_type const current_depth = pit->params().depth();
+	Layout const current_layout = pit->layout();
+
+	// get the first paragraph in sequence with this layout and depth
+	pit_type offset = 0;
+	while (true) {
+		if (boost::prior(pit, offset) == pars.begin())
+			break;
+		ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1);
+		if (priorpit->layout() == current_layout
+		    && priorpit->params().depth() == current_depth)
+			++offset;
+		else
+			break;
 	}
 
-	// we should now have no more insets than there are required
-	// arguments.
-	LASSERT(ilist.size() <= reqargs, /* */);
-	if (!reqargs)
-		return lines;
-
-	for (unsigned int i = 0; i < reqargs; ++i) {
-		if (ilist.empty())
-			// a required argument wasn't given, so we output {}
-			os << "{}";
-		else {
-			InsetArgument const * ins = ilist.front();
-			ilist.pop_front();
-			lines += ins->latexArgument(os, runparams, false);
+	ParagraphList::const_iterator spit = boost::prior(pit, offset);
+
+	for (; spit != pars.end(); ++spit) {
+		if (spit->layout() != current_layout || spit->params().depth() < current_depth)
+			break;
+		if (spit->params().depth() > current_depth)
+			continue;
+		InsetList::const_iterator it = spit->insetList().begin();
+		InsetList::const_iterator end = spit->insetList().end();
+		for (; it != end; ++it) {
+			if (it->inset->lyxCode() == ARG_CODE) {
+				InsetArgument const * ins =
+					static_cast<InsetArgument const *>(it->inset);
+				if (ins->name().empty())
+					LYXERR0("Error: Unnamed argument inset!");
+				else {
+					string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
+					unsigned int const nr = convert<unsigned int>(name);
+					if (ilist.find(nr) == ilist.end())
+						ilist[nr] = ins;
+					Layout::LaTeXArgMap::const_iterator const lit =
+							latexargs.find(ins->name());
+					if (lit != latexargs.end()) {
+						Layout::latexarg const & arg = (*lit).second;
+						if (!arg.requires.empty()) {
+							vector<string> req = getVectorFromString(arg.requires);
+							required.insert(required.end(), req.begin(), req.end());
+						}
+					}
+				}
+			}
 		}
 	}
-	return lines;
+	getArgInsets(os, runparams, latexargs, ilist, required, prefix);
 }
 
+namespace {
+
+// output the proper paragraph start according to latextype.
+void parStartCommand(Paragraph const & par, otexstream & os,
+		     OutputParams const & runparams, Layout const & style) 
+{
+	switch (style.latextype) {
+	case LATEX_COMMAND:
+		os << '\\' << from_ascii(style.latexname());
+
+		// Command arguments
+		if (!style.latexargs().empty())
+			latexArgInsets(par, os, runparams, style.latexargs());
+		os << from_ascii(style.latexparam());
+		break;
+	case LATEX_ITEM_ENVIRONMENT:
+	case LATEX_LIST_ENVIRONMENT:
+		os << "\\" + style.itemcommand();
+		// Item arguments
+		if (!style.itemargs().empty())
+			latexArgInsets(par, os, runparams, style.itemargs(), "item:");
+		os << " ";
+		break;
+	case LATEX_BIB_ENVIRONMENT:
+		// ignore this, the inset will write itself
+		break;
+	default:
+		break;
+	}
+}
+
+} // namespace anon
 
 // FIXME: this should be anonymous
 void TeXOnePar(Buffer const & buf,
-	  Text const & text,
-	  pit_type pit,
-	  odocstream & os, TexRow & texrow,
-	  OutputParams const & runparams_in,
-	  string const & everypar,
-	  int start_pos, int end_pos)
+	       Text const & text,
+	       pit_type pit,
+	       otexstream & os,
+	       OutputParams const & runparams_in,
+	       string const & everypar,
+	       int start_pos, int end_pos)
 {
 	BufferParams const & bparams = buf.params();
 	ParagraphList const & paragraphs = text.paragraphs();
@@ -421,21 +552,17 @@ void TeXOnePar(Buffer const & buf,
 		open_encoding_ = none;
 	}
 
-	if (text.inset().getLayout().isPassThru()) {
+	if (text.inset().isPassThru()) {
 		Font const outerfont = text.outerFont(pit);
 
 		// No newline before first paragraph in this lyxtext
 		if (pit > 0) {
 			os << '\n';
-			texrow.newline();
-			if (!text.inset().getLayout().parbreakIsNewline()) {
+			if (!text.inset().getLayout().parbreakIsNewline())
 				os << '\n';
-				texrow.newline();
-			}
 		}
 
-		par.latex(bparams, outerfont, os, texrow, runparams, start_pos,
-			end_pos);
+		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
 		return;
 	}
 
@@ -444,20 +571,26 @@ void TeXOnePar(Buffer const & buf,
 
 	if (style.pass_thru) {
 		Font const outerfont = text.outerFont(pit);
-		par.latex(bparams, outerfont, os, texrow, runparams, start_pos,
-			end_pos);
-		os << '\n';
-		texrow.newline();
+		runparams.local_font = &par.getFirstFontSettings(bparams);
+		parStartCommand(par, os, runparams, style);
+
+		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+
+		// I did not create a parEndCommand for this minuscule
+		// task because in the other user of parStartCommand
+		// the code is different (JMarc)
+		if (style.isCommand())
+			os << "}\n";
+		else
+			os << '\n';
 		if (!style.parbreak_is_newline) {
 			os << '\n';
-			texrow.newline();
-		} else if (nextpar) {
-			Layout const nextstyle = text.inset().forcePlainLayout() ?
-				bparams.documentClass().plainLayout() : nextpar->layout();
-			if (nextstyle.name() != style.name()) {
+		} else if (nextpar && !style.isEnvironment()) {
+			Layout const nextstyle = text.inset().forcePlainLayout()
+				? bparams.documentClass().plainLayout()
+				: nextpar->layout();
+			if (nextstyle.name() != style.name())
 				os << '\n';
-				texrow.newline();
-			}
 		}
 
 		return;
@@ -492,21 +625,32 @@ void TeXOnePar(Buffer const & buf,
 					 : priorpar->getParLanguage(bparams))
 		: outer_language;
 
-	string par_lang = par_language->babel();
-	string prev_lang = prev_language->babel();
-	string doc_lang = doc_language->babel();
-	string outer_lang = outer_language->babel();
-	string lang_begin_command = lyxrc.language_command_begin;
-	string lang_end_command = lyxrc.language_command_end;
-
-	if (runparams.use_polyglossia) {
-		par_lang = getPolyglossiaEnvName(par_language);
-		prev_lang = getPolyglossiaEnvName(prev_language);
-		doc_lang = getPolyglossiaEnvName(doc_language);
-		outer_lang = getPolyglossiaEnvName(outer_language);
-		lang_begin_command = "\\begin{$$lang}";
-		lang_end_command = "\\end{$$lang}";
+
+	bool const use_polyglossia = runparams.use_polyglossia;
+	string const par_lang = use_polyglossia ?
+		getPolyglossiaEnvName(par_language): par_language->babel();
+	string const prev_lang = use_polyglossia ?
+		getPolyglossiaEnvName(prev_language) : prev_language->babel();
+	string const doc_lang = use_polyglossia ?
+		getPolyglossiaEnvName(doc_language) : doc_language->babel();
+	string const outer_lang = use_polyglossia ?
+		getPolyglossiaEnvName(outer_language) : outer_language->babel();
+	string lang_begin_command = use_polyglossia ?
+		"\\begin{$$lang}" : lyxrc.language_command_begin;
+	string lang_end_command = use_polyglossia ?
+		"\\end{$$lang}" : lyxrc.language_command_end;
+	// the '%' is necessary to prevent unwanted whitespace
+	string lang_command_termination = "%\n";
+
+	// In some insets (such as Arguments), we cannot use \selectlanguage
+	bool const localswitch = !use_polyglossia
+		&& text.inset().getLayout().forcelocalfontswitch();
+	if (localswitch) {
+		lang_begin_command = lyxrc.language_command_local;
+		lang_end_command = "}";
+		lang_command_termination.clear();
 	}
+
 	if (par_lang != prev_lang
 		// check if we already put language command in TeXEnvironment()
 		&& !(style.isEnvironment()
@@ -521,9 +665,7 @@ void TeXOnePar(Buffer const & buf,
 			os << from_ascii(subst(lang_end_command,
 				"$$lang",
 				prev_lang))
-			   // the '%' is necessary to prevent unwanted whitespace
-			   << "%\n";
-			texrow.newline();
+			   << lang_command_termination;
 		}
 
 		// We need to open a new language if we couldn't close the previous
@@ -538,7 +680,7 @@ void TeXOnePar(Buffer const & buf,
 			// language paragraph should appear within an \L or \R (in addition
 			// to, outside of, the normal language switch commands).
 			// This behavior is not correct for ArabTeX, though.
-			if (!runparams.use_polyglossia
+			if (!use_polyglossia
 			    // not for ArabTeX
 				&& par_language->lang() != "arabic_arabtex"
 				&& outer_language->lang() != "arabic_arabtex"
@@ -570,19 +712,18 @@ void TeXOnePar(Buffer const & buf,
 					os << "\\L{";
 			}
 			// With CJK, the CJK tag has to be closed first (see below)
-			if (runparams.encoding->package() != Encoding::CJK) {
+			if (runparams.encoding->package() != Encoding::CJK
+			    && !par_lang.empty()) {
 				os << from_ascii(subst(
 					lang_begin_command,
 					"$$lang",
 					par_lang));
-				if (runparams.use_polyglossia
+				if (use_polyglossia
 				    && !par_language->polyglossiaOpts().empty())
 						os << "["
 						  << from_ascii(par_language->polyglossiaOpts())
 						  << "]";
-				   // the '%' is necessary to prevent unwanted whitespace
-				os << "%\n";
-				texrow.newline();
+				os << lang_command_termination;
 			}
 		}
 	}
@@ -604,7 +745,7 @@ void TeXOnePar(Buffer const & buf,
 				par.getFontSettings(bparams, i).language()->encoding();
 			if (encoding->package() != Encoding::CJK
 				&& runparams.encoding->package() == Encoding::inputenc
-				&& c < 0x80)
+				&& isASCII(c))
 				continue;
 			if (par.isInset(i))
 				break;
@@ -616,8 +757,8 @@ void TeXOnePar(Buffer const & buf,
 			if (i != 0 && encoding->package() == Encoding::CJK)
 				continue;
 
-			pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
-				*encoding);
+			pair<bool, int> enc_switch = switchEncoding(os.os(),
+						bparams, runparams, *encoding);
 			// the following is necessary after a CJK environment in a multilingual
 			// context (nesting issue).
 			if (par_language->encoding()->package() == Encoding::CJK
@@ -625,23 +766,20 @@ void TeXOnePar(Buffer const & buf,
 				os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
 				   << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
 				open_encoding_ = CJK;
-				texrow.newline();
 			}
 			if (encoding->package() != Encoding::none && enc_switch.first) {
 				if (enc_switch.second > 0) {
 					// the '%' is necessary to prevent unwanted whitespace
 					os << "%\n";
-					texrow.newline();
 				}
 				// With CJK, the CJK tag had to be closed first (see above)
-				if (runparams.encoding->package() == Encoding::CJK) {
+				if (runparams.encoding->package() == Encoding::CJK
+				    && !par_lang.empty()) {
 					os << from_ascii(subst(
 						lang_begin_command,
 						"$$lang",
 						par_lang))
-					// the '%' is necessary to prevent unwanted whitespace
-					<< "%\n";
-					texrow.newline();
+					<< lang_command_termination;
 				}
 				runparams.encoding = encoding;
 			}
@@ -656,7 +794,6 @@ void TeXOnePar(Buffer const & buf,
 	if (par.allowParagraphCustomization()) {
 		if (par.params().startOfAppendix()) {
 			os << "\\appendix\n";
-			texrow.newline();
 		}
 
 		if (!par.params().spacing().isDefault()
@@ -664,46 +801,20 @@ void TeXOnePar(Buffer const & buf,
 		{
 			os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
 			    << '\n';
-			texrow.newline();
 		}
 
 		if (style.isCommand()) {
 			os << '\n';
-			texrow.newline();
 		}
 	}
 
-	switch (style.latextype) {
-	case LATEX_COMMAND:
-		os << '\\' << from_ascii(style.latexname());
-
-		// Separate handling of optional argument inset.
-		if (style.optargs != 0 || style.reqargs != 0) {
-			int ret = latexArgInsets(par, os, runparams, style.reqargs, style.optargs);
-			while (ret > 0) {
-				texrow.newline();
-				--ret;
-			}
-		}
-		else
-			os << from_ascii(style.latexparam());
-		break;
-	case LATEX_ITEM_ENVIRONMENT:
-	case LATEX_LIST_ENVIRONMENT:
-		os << "\\item ";
-		break;
-	case LATEX_BIB_ENVIRONMENT:
-		// ignore this, the inset will write itself
-		break;
-	default:
-		break;
-	}
-
+	runparams.local_font = &par.getFirstFontSettings(bparams);
+	parStartCommand(par, os, runparams, style);
 	Font const outerfont = text.outerFont(pit);
 
 	// FIXME UNICODE
 	os << from_utf8(everypar);
-	par.latex(bparams, outerfont, os, texrow, runparams, start_pos, end_pos);
+	par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
 
 	// Make sure that \\par is done with the font of the last
 	// character if this has another size as the default.
@@ -728,6 +839,8 @@ void TeXOnePar(Buffer const & buf,
 		os << "\\" << from_ascii(font.latexSize()) << " \\par}";
 	} else if (is_command) {
 		os << '}';
+		if (!style.postcommandargs().empty())
+			latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
 		if (runparams.encoding != prev_encoding) {
 			runparams.encoding = prev_encoding;
 			if (!runparams.isFullUnicode())
@@ -736,6 +849,7 @@ void TeXOnePar(Buffer const & buf,
 	}
 
 	bool pending_newline = false;
+	bool unskip_newline = false;
 	switch (style.latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
@@ -761,10 +875,8 @@ void TeXOnePar(Buffer const & buf,
 	if (par.allowParagraphCustomization()) {
 		if (!par.params().spacing().isDefault()
 			&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
-			if (pending_newline) {
+			if (pending_newline)
 				os << '\n';
-				texrow.newline();
-			}
 			os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace));
 			pending_newline = true;
 		}
@@ -773,7 +885,7 @@ void TeXOnePar(Buffer const & buf,
 	// Closing the language is needed for the last paragraph; it is also
 	// needed if we're within an \L or \R that we may have opened above (not
 	// necessarily in this paragraph) and are about to close.
-	bool closing_rtl_ltr_environment = !runparams.use_polyglossia
+	bool closing_rtl_ltr_environment = !use_polyglossia
 		// not for ArabTeX
 		&& (par_language->lang() != "arabic_arabtex"
 		    && outer_language->lang() != "arabic_arabtex")
@@ -785,15 +897,16 @@ void TeXOnePar(Buffer const & buf,
 		   || (runparams.isLastPar && par_language->babel() != outer_language->babel()));
 
 	if (closing_rtl_ltr_environment
-		|| (runparams.isLastPar && par_language->babel() != outer_language->babel())) {
+	    || (runparams.isLastPar
+	        && ((!use_polyglossia && par_language->babel() != outer_language->babel())
+		    || (use_polyglossia && par_language->polyglossia() != outer_language->polyglossia())))) {
 		// Since \selectlanguage write the language to the aux file,
 		// we need to reset the language at the end of footnote or
 		// float.
 
-		if (pending_newline) {
+		if (pending_newline)
 			os << '\n';
-			texrow.newline();
-		}
+
 		// when the paragraph uses CJK, the language has to be closed earlier
 		if (font.language()->encoding()->package() != Encoding::CJK) {
 			if (lang_end_command.empty()) {
@@ -803,22 +916,24 @@ void TeXOnePar(Buffer const & buf,
 					(runparams.isLastPar && runparams.master_language)
 						? runparams.master_language
 						: outer_language;
-				string const current_lang = runparams.use_polyglossia ?
-					getPolyglossiaEnvName(current_language)
+				string const current_lang = use_polyglossia
+					? getPolyglossiaEnvName(current_language)
 					: current_language->babel();
 				if (!current_lang.empty()) {
 					os << from_ascii(subst(
 						lang_begin_command,
 						"$$lang",
 						current_lang));
-					pending_newline = true;
+					pending_newline = !localswitch;
+					unskip_newline = !localswitch;
 				}
 			} else if (!par_lang.empty()) {
 				os << from_ascii(subst(
 					lang_end_command,
 					"$$lang",
 					par_lang));
-				pending_newline = true;
+				pending_newline = !localswitch;
+				unskip_newline = !localswitch;
 			}
 		}
 	}
@@ -826,8 +941,10 @@ void TeXOnePar(Buffer const & buf,
 		os << "}";
 
 	if (pending_newline) {
+		if (unskip_newline)
+			// prevent unwanted whitespace
+			os << '%';
 		os << '\n';
-		texrow.newline();
 	}
 
 	// if this is a CJK-paragraph and the next isn't, close CJK
@@ -852,10 +969,7 @@ void TeXOnePar(Buffer const & buf,
 					break;
 				// end of main text
 				if (maintext) {
-					os << '\n';
-					texrow.newline();
-					os << "\\end{CJK}\n";
-					texrow.newline();
+					os << "\n\\end{CJK}\n";
 				// end of an inset
 				} else
 					os << "\\end{CJK}";
@@ -908,7 +1022,6 @@ void TeXOnePar(Buffer const & buf,
 		    // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html
 		    || nextpar->params().depth() != par.params().depth()) {
 			os << '\n';
-			texrow.newline();
 		}
 	}
 
@@ -922,8 +1035,7 @@ void TeXOnePar(Buffer const & buf,
 // LaTeX all paragraphs
 void latexParagraphs(Buffer const & buf,
 		     Text const & text,
-		     odocstream & os,
-		     TexRow & texrow,
+		     otexstream & os,
 		     OutputParams const & runparams,
 		     string const & everypar)
 {
@@ -939,13 +1051,12 @@ void latexParagraphs(Buffer const & buf,
 	    && bparams.encoding().package() == Encoding::CJK) {
 		os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
 		<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
-		texrow.newline();
 		open_encoding_ = CJK;
 	}
 	// if "auto begin" is switched off, explicitly switch the
 	// language on at start
-	string const mainlang = runparams.use_polyglossia ?
-		getPolyglossiaEnvName(bparams.language)
+	string const mainlang = runparams.use_polyglossia
+		? getPolyglossiaEnvName(bparams.language)
 		: bparams.language->babel();
 	string const lang_begin_command = runparams.use_polyglossia ?
 		"\\begin{$$lang}" : lyxrc.language_command_begin;
@@ -962,7 +1073,6 @@ void latexParagraphs(Buffer const & buf,
 			    << from_ascii(bparams.language->polyglossiaOpts())
 			    << "]";
 		os << '\n';
-		texrow.newline();
 	}
 
 	ParagraphList const & paragraphs = text.paragraphs();
@@ -1003,7 +1113,6 @@ void latexParagraphs(Buffer const & buf,
 					os << "\\begin{"
 							<< from_ascii(tclass.titlename())
 							<< "}\n";
-					texrow.newline();
 				}
 			}
 		} else if (was_title && !already_title) {
@@ -1015,7 +1124,6 @@ void latexParagraphs(Buffer const & buf,
 				os << "\\" << from_ascii(tclass.titlename())
 						<< "\n";
 			}
-			texrow.newline();
 			already_title = true;
 			was_title = false;
 		}
@@ -1023,15 +1131,15 @@ void latexParagraphs(Buffer const & buf,
 
 		if (!layout.isEnvironment() && par->params().leftIndent().zero()) {
 			// This is a standard top level paragraph, TeX it and continue.
-			TeXOnePar(buf, text, pit, os, texrow, runparams, everypar);
+			TeXOnePar(buf, text, pit, os, runparams, everypar);
 			continue;
 		}
 		
-		TeXEnvironementData const data = prepareEnvironement(buf, text, par,
-			os, texrow, runparams);
+		TeXEnvironmentData const data =
+			prepareEnvironment(buf, text, par, os, runparams);
 		// pit can be changed in TeXEnvironment.
-		TeXEnvironment(buf, text, runparams, pit, os, texrow);
-		finishEnvironement(os, texrow, runparams, data);
+		TeXEnvironment(buf, text, runparams, pit, os);
+		finishEnvironment(os, runparams, data);
 	}
 
 	if (pit == runparams.par_end) {
@@ -1039,20 +1147,17 @@ void latexParagraphs(Buffer const & buf,
 			// correctly terminated (because TeXOnePar does
 			// not add a \n in this case)
 			//os << '\n';
-			//texrow.newline();
 	}
 
 	// It might be that we only have a title in this document
 	if (was_title && !already_title) {
 		if (tclass.titletype() == TITLE_ENVIRONMENT) {
 			os << "\\end{" << from_ascii(tclass.titlename())
-			    << "}\n";
-		}
-		else {
+			   << "}\n";
+		} else {
 			os << "\\" << from_ascii(tclass.titlename())
-			    << "\n";
-				}
-		texrow.newline();
+			   << "\n";
+		}
 	}
 
 	// if "auto end" is switched off, explicitly close the language at the end
@@ -1065,14 +1170,12 @@ void latexParagraphs(Buffer const & buf,
 					"$$lang",
 					mainlang))
 			<< '\n';
-		texrow.newline();
 	}
 
 	// If the last paragraph is an environment, we'll have to close
 	// CJK at the very end to do proper nesting.
 	if (maintext && !is_child && open_encoding_ == CJK) {
 		os << "\\end{CJK}\n";
-		texrow.newline();
 		open_encoding_ = none;
 	}