X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=656e4d84afcfca2f47c2861a335f3353c1c394c7;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=cd67e1729fff468ac6042a24ec22bb4b87307df7;hpb=37f41fd4b56c54764014c93c003be555f3fd6421;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index cd67e1729f..656e4d84af 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -23,20 +23,26 @@
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
+#include "texstream.h"
 #include "TextClass.h"
-#include "TexRow.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetArgument.h"
 
+#include "frontends/alert.h"
+
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
+#include "support/textutils.h"
+#include "support/gettext.h"
+
+#include <QThreadStorage>
 
-#include <algorithm>
-#include <boost/next_prior.hpp>
 #include <list>
+#include <stack>
 
 using namespace std;
 using namespace lyx::support;
@@ -52,9 +58,77 @@ enum OpenEncoding {
 	CJK
 };
 
-static int open_encoding_ = none;
-static int cjk_inherited_ = 0;
-Language const * prev_env_language_ = 0;
+
+struct OutputState
+{
+	OutputState() : open_encoding_(none), cjk_inherited_(0),
+		        prev_env_language_(0), nest_level_(0)
+	{
+	}
+	OpenEncoding open_encoding_;
+	int cjk_inherited_;
+	Language const * prev_env_language_;
+	int nest_level_;
+	stack<int> lang_switch_depth_;          // Both are always empty when
+	stack<string> open_polyglossia_lang_;   // not using polyglossia
+};
+
+
+OutputState * getOutputState()
+{
+	// FIXME An instance of OutputState should be kept around for each export
+	//       instead of using local thread storage
+	static QThreadStorage<OutputState *> outputstate;
+	if (!outputstate.hasLocalData())
+		outputstate.setLocalData(new OutputState);
+	return outputstate.localData();
+}
+
+
+string const & openLanguageName(OutputState const * state)
+{
+	// Return a reference to the last active language opened with
+	// polyglossia or when using begin/end commands. If none or when
+	// using babel with only a begin command, return a reference to
+	// an empty string.
+
+	static string const empty;
+
+	return state->open_polyglossia_lang_.empty()
+		? empty
+		: state->open_polyglossia_lang_.top();
+}
+
+
+bool atSameLastLangSwitchDepth(OutputState const * state)
+{
+	// Return true if the actual nest level is the same at which the
+	// language was switched when using polyglossia or begin/end
+	// commands. Instead, return always true when using babel with
+	// only a begin command.
+
+	return state->lang_switch_depth_.size() == 0
+			? true
+			: abs(state->lang_switch_depth_.top()) == state->nest_level_;
+}
+
+
+bool isLocalSwitch(OutputState const * state)
+{
+	// Return true if the language was opened by a local command switch.
+
+	return state->lang_switch_depth_.size()
+		&& state->lang_switch_depth_.top() < 0;
+}
+
+
+bool langOpenedAtThisLevel(OutputState const * state)
+{
+	// Return true if the language was opened at the current nesting level.
+
+	return state->lang_switch_depth_.size()
+		&& abs(state->lang_switch_depth_.top()) == state->nest_level_;
+}
 
 
 string const getPolyglossiaEnvName(Language const * lang)
@@ -67,6 +141,20 @@ string const getPolyglossiaEnvName(Language const * lang)
 }
 
 
+string const getPolyglossiaBegin(string const & lang_begin_command,
+				 string const & lang, string const & opts)
+{
+	string result;
+	if (!lang.empty())
+		result = subst(lang_begin_command, "$$lang", lang);
+	string options = opts.empty() ?
+		    string() : "[" + opts + "]";
+	result = subst(result, "$$opts", options);
+
+	return result;
+}
+
+
 struct TeXEnvironmentData
 {
 	bool cjk_nested;
@@ -94,9 +182,10 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 
 	ParagraphList const & paragraphs = text.paragraphs();
 	ParagraphList::const_iterator const priorpit =
-		pit == paragraphs.begin() ? pit : boost::prior(pit);
+		pit == paragraphs.begin() ? pit : prev(pit, 1);
 
-	bool const use_prev_env_language = prev_env_language_ != 0
+	OutputState * state = getOutputState();
+	bool const use_prev_env_language = state->prev_env_language_ != 0
 			&& priorpit->layout().isEnvironment()
 			&& (priorpit->getDepth() > pit->getDepth()
 			    || (priorpit->getDepth() == pit->getDepth()
@@ -107,7 +196,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 	Language const * const doc_language = bparams.language;
 	Language const * const prev_par_language =
 		(pit != paragraphs.begin())
-		? (use_prev_env_language ? prev_env_language_
+		? (use_prev_env_language ? state->prev_env_language_
 					 : priorpit->getParLanguage(bparams))
 		: doc_language;
 
@@ -122,9 +211,13 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 		"\\begin{$$lang}" : lyxrc.language_command_begin;
 	string const lang_end_command = use_polyglossia ?
 		"\\end{$$lang}" : lyxrc.language_command_end;
+	bool const using_begin_end = use_polyglossia ||
+					!lang_end_command.empty();
 
+	// For polyglossia, switch language outside of environment, if possible.
 	if (par_lang != prev_par_lang) {
-		if (!lang_end_command.empty() &&
+		if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
+		    !lang_end_command.empty() &&
 		    prev_par_lang != doc_lang &&
 		    !prev_par_lang.empty()) {
 			os << from_ascii(subst(
@@ -133,22 +226,31 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 				prev_par_lang))
 			  // the '%' is necessary to prevent unwanted whitespace
 			  << "%\n";
+			if (using_begin_end)
+				popLanguageName();
 		}
 
+		// If no language was explicitly opened and we are using
+		// polyglossia or begin/end commands, then the current
+		// language is the document language.
+		string const & cur_lang = using_begin_end
+					  && state->lang_switch_depth_.size()
+						  ? openLanguageName(state)
+						  : doc_lang;
+
 		if ((lang_end_command.empty() ||
-		    par_lang != doc_lang) &&
+		    par_lang != doc_lang ||
+		    par_lang != cur_lang) &&
 		    !par_lang.empty()) {
-			os << from_ascii(subst(
-				lang_begin_command,
-				"$$lang",
-				par_lang));
-			if (use_polyglossia
-			    && !data.par_language->polyglossiaOpts().empty())
-					os << "["
-					   << from_ascii(data.par_language->polyglossiaOpts())
-					   << "]";
-			  // the '%' is necessary to prevent unwanted whitespace
-			os << "%\n";
+			    string bc = use_polyglossia ?
+					getPolyglossiaBegin(lang_begin_command, par_lang,
+							    data.par_language->polyglossiaOpts())
+				      : subst(lang_begin_command, "$$lang", par_lang);
+			    os << bc;
+			    // the '%' is necessary to prevent unwanted whitespace
+			    os << "%\n";
+			    if (using_begin_end)
+				    pushLanguageName(par_lang);
 		}
 	}
 
@@ -160,7 +262,10 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 		data.leftindent_open = true;
 	}
 
-	if (style.isEnvironment()) {
+	if (style.isEnvironment())
+		state->nest_level_ += 1;
+
+	if (style.isEnvironment() && !style.latexname().empty()) {
 		os << "\\begin{" << from_ascii(style.latexname()) << '}';
 		if (!style.latexargs().empty()) {
 			OutputParams rp = runparams;
@@ -186,11 +291,11 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 	// in multilingual environments, the CJK tags have to be nested properly
 	data.cjk_nested = false;
 	if (data.par_language->encoding()->package() == Encoding::CJK &&
-	    open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
+	    state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
 		if (prev_par_language->encoding()->package() == Encoding::CJK)
 			os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName())
 			   << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
-		open_encoding_ = CJK;
+		state->open_encoding_ = CJK;
 		data.cjk_nested = true;
 	}
 	return data;
@@ -198,34 +303,58 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 
 
 static void finishEnvironment(otexstream & os, OutputParams const & runparams,
-			       TeXEnvironmentData const & data)
+			      TeXEnvironmentData const & data)
 {
-	if (open_encoding_ == CJK && data.cjk_nested) {
+	OutputState * state = getOutputState();
+	// BufferParams const & bparams = buf.params(); // FIXME: for speedup shortcut below, would require passing of "buf" as argument
+	if (state->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";
-		open_encoding_ = none;
+		state->open_encoding_ = none;
 	}
 
 	if (data.style->isEnvironment()) {
-		os << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
-		prev_env_language_ = data.par_language;
+		os << breakln;
+		bool const using_begin_end =
+			runparams.use_polyglossia ||
+				!lyxrc.language_command_end.empty();
+		// Close any language opened at this nest level
+		if (using_begin_end) {
+			while (langOpenedAtThisLevel(state)) {
+				if (isLocalSwitch(state)) {
+					os << "}";
+				} else {
+					os << "\\end{"
+					   << openLanguageName(state)
+					   << "}%\n";
+				}
+				popLanguageName();
+			}
+		}
+		state->nest_level_ -= 1;
+		string const & name = data.style->latexname();
+		if (!name.empty())
+			os << "\\end{" << from_ascii(name) << "}\n";
+		state->prev_env_language_ = data.par_language;
 		if (runparams.encoding != data.prev_encoding) {
 			runparams.encoding = data.prev_encoding;
-			if (!runparams.isFullUnicode())
-				os << setEncoding(data.prev_encoding->iconvName());
+			os << setEncoding(data.prev_encoding->iconvName());
 		}
 	}
 
 	if (data.leftindent_open) {
-		os << "\\end{LyXParagraphLeftIndent}\n";
-		prev_env_language_ = data.par_language;
+		os << breakln << "\\end{LyXParagraphLeftIndent}\n";
+		state->prev_env_language_ = data.par_language;
 		if (runparams.encoding != data.prev_encoding) {
 			runparams.encoding = data.prev_encoding;
-			if (!runparams.isFullUnicode())
-				os << setEncoding(data.prev_encoding->iconvName());
+			os << setEncoding(data.prev_encoding->iconvName());
 		}
 	}
+
+	// Check whether we should output a blank line after the environment
+	if (!data.style->nextnoindent)
+		os << '\n';
 }
 
 
@@ -272,21 +401,6 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
 		// Or     par->params().depth() > current_depth
 		// Or     par->params().leftIndent() != current_left_indent)
 
-		if (par->layout().isParagraph()) {
-			// 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';
-		}
-
 		// FIXME This test should not be necessary.
 		// We should perhaps issue an error if it is.
 		bool const force_plain_layout = text.inset().forcePlainLayout();
@@ -320,6 +434,18 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
 	if (argnr == 0)
 		return;
 
+	// Default and preset args are always output, so if they require
+	// other arguments, consider this.
+	Layout::LaTeXArgMap::const_iterator lit = latexargs.begin();
+	Layout::LaTeXArgMap::const_iterator const lend = latexargs.end();
+	for (; lit != lend; ++lit) {
+		Layout::latexarg arg = (*lit).second;
+		if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) {
+				vector<string> req = getVectorFromString(arg.requires);
+				required.insert(required.end(), req.begin(), req.end());
+			}
+	}
+
 	for (unsigned int i = 1; i <= argnr; ++i) {
 		map<int, InsetArgument const *>::const_iterator lit = ilist.find(i);
 		bool inserted = false;
@@ -350,22 +476,24 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
 				string const name = prefix + convert<string>(i);
 				if ((*lait).first == name) {
 					Layout::latexarg arg = (*lait).second;
+					docstring preset = arg.presetarg;
+					if (!arg.defaultarg.empty()) {
+						if (!preset.empty())
+							preset += ",";
+						preset += arg.defaultarg;
+					}
 					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;
+						os << ldelim << preset << rdelim;
+					} else if (!preset.empty()) {
+						docstring ldelim = arg.ldelim.empty() ?
+								from_ascii("[") : arg.ldelim;
+						docstring rdelim = arg.rdelim.empty() ?
+								from_ascii("]") : arg.rdelim;
+						os << ldelim << preset << rdelim;
 					} else if (find(required.begin(), required.end(),
 						   (*lait).first) != required.end()) {
 						docstring ldelim = arg.ldelim.empty() ?
@@ -385,43 +513,76 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
 } // namespace anon
 
 
-void latexArgInsets(Paragraph const & par, otexstream & os,
-	OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix)
+void pushLanguageName(string const & lang_name, bool localswitch)
 {
-	map<int, InsetArgument const *> ilist;
-	vector<string> required;
+	OutputState * state = getOutputState();
 
-	InsetList::const_iterator it = par.insetList().begin();
-	InsetList::const_iterator end = par.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);
-				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());
-					}
-				}
-			}
+	int nest_level = localswitch ? -state->nest_level_ : state->nest_level_;
+	state->lang_switch_depth_.push(nest_level);
+	state->open_polyglossia_lang_.push(lang_name);
+}
+
+
+void popLanguageName()
+{
+	OutputState * state = getOutputState();
+
+	state->lang_switch_depth_.pop();
+	state->open_polyglossia_lang_.pop();
+}
+
+
+namespace {
+
+void addArgInsets(Paragraph const & par, string const & prefix,
+                 Layout::LaTeXArgMap const & latexargs,
+                 map<int, InsetArgument const *> & ilist,
+                 vector<string> & required)
+{
+	for (auto const & table : par.insetList()) {
+		InsetArgument const * arg = table.inset->asInsetArgument();
+		if (!arg)
+			continue;
+		if (arg->name().empty()) {
+			LYXERR0("Error: Unnamed argument inset!");
+			continue;
+		}
+		string const name = prefix.empty() ?
+			arg->name() : split(arg->name(), ':');
+		// why converting into an integer?
+		unsigned int const nr = convert<unsigned int>(name);
+		if (ilist.find(nr) == ilist.end())
+			ilist[nr] = arg;
+		Layout::LaTeXArgMap::const_iterator const lit =
+			latexargs.find(arg->name());
+		if (lit != latexargs.end()) {
+			Layout::latexarg const & larg = lit->second;
+			vector<string> req = getVectorFromString(larg.requires);
+			move(req.begin(), req.end(), back_inserter(required));
 		}
 	}
+}
+
+} // anon namespace
+
+
+void latexArgInsets(Paragraph const & par, otexstream & os,
+                    OutputParams const & runparams,
+                    Layout::LaTeXArgMap const & latexargs,
+                    string const & prefix)
+{
+	map<int, InsetArgument const *> ilist;
+	vector<string> required;
+	addArgInsets(par, prefix, latexargs, ilist, required);
 	getArgInsets(os, runparams, latexargs, ilist, required, prefix);
 }
 
 
-void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit,
-	otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
-	string const & prefix)
+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;
@@ -432,9 +593,9 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi
 	// get the first paragraph in sequence with this layout and depth
 	pit_type offset = 0;
 	while (true) {
-		if (boost::prior(pit, offset) == pars.begin())
+		if (lyx::prev(pit, offset) == pars.begin())
 			break;
-		ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1);
+		ParagraphList::const_iterator priorpit = lyx::prev(pit, offset + 1);
 		if (priorpit->layout() == current_layout
 		    && priorpit->params().depth() == current_depth)
 			++offset;
@@ -442,42 +603,38 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi
 			break;
 	}
 
-	ParagraphList::const_iterator spit = boost::prior(pit, offset);
+	ParagraphList::const_iterator spit = lyx::prev(pit, offset);
 
 	for (; spit != pars.end(); ++spit) {
-		if (spit->layout() != current_layout || spit->params().depth() < current_depth)
+		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());
-						}
-					}
-				}
-			}
-		}
+		addArgInsets(*spit, prefix, latexargs, ilist, required);
+	}
+	getArgInsets(os, runparams, latexargs, ilist, required, prefix);
+}
+
+
+void latexArgInsetsForParent(ParagraphList const & pars, otexstream & os,
+                             OutputParams const & runparams,
+                             Layout::LaTeXArgMap const & latexargs,
+                             string const & prefix)
+{
+	map<int, InsetArgument const *> ilist;
+	vector<string> required;
+
+	for (Paragraph const & par : pars) {
+		if (par.layout().hasArgs())
+			// The InsetArguments inside this paragraph refer to this paragraph
+			continue;
+		addArgInsets(par, prefix, latexargs, ilist, required);
 	}
 	getArgInsets(os, runparams, latexargs, ilist, required, prefix);
 }
 
+
 namespace {
 
 // output the proper paragraph start according to latextype.
@@ -520,12 +677,13 @@ void TeXOnePar(Buffer const & buf,
 	       string const & everypar,
 	       int start_pos, int end_pos)
 {
-	BufferParams const & bparams = buf.params();
+	BufferParams const & bparams = runparams_in.is_child
+		? buf.masterParams() : buf.params();
 	ParagraphList const & paragraphs = text.paragraphs();
 	Paragraph const & par = paragraphs.at(pit);
 	// FIXME This check should not really be needed.
 	// Perhaps we should issue an error if it is.
-	Layout const style = text.inset().forcePlainLayout() ?
+	Layout const & style = text.inset().forcePlainLayout() ?
 		bparams.documentClass().plainLayout() : par.layout();
 
 	if (style.inpreamble)
@@ -545,10 +703,11 @@ void TeXOnePar(Buffer const & buf,
 	bool const maintext = text.isMainText();
 	// we are at the beginning of an inset and CJK is already open;
 	// we count inheritation levels to get the inset nesting right.
+	OutputState * state = getOutputState();
 	if (pit == 0 && !maintext
-	    && (cjk_inherited_ > 0 || open_encoding_ == CJK)) {
-		cjk_inherited_ += 1;
-		open_encoding_ = none;
+	    && (state->cjk_inherited_ > 0 || state->open_encoding_ == CJK)) {
+		state->cjk_inherited_ += 1;
+		state->open_encoding_ = none;
 	}
 
 	if (text.inset().isPassThru()) {
@@ -570,7 +729,6 @@ void TeXOnePar(Buffer const & buf,
 
 	if (style.pass_thru) {
 		Font const outerfont = text.outerFont(pit);
-		runparams.local_font = &par.getFirstFontSettings(bparams);
 		parStartCommand(par, os, runparams, style);
 
 		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
@@ -584,7 +742,7 @@ void TeXOnePar(Buffer const & buf,
 			os << '\n';
 		if (!style.parbreak_is_newline) {
 			os << '\n';
-		} else if (nextpar) {
+		} else if (nextpar && !style.isEnvironment()) {
 			Layout const nextstyle = text.inset().forcePlainLayout()
 				? bparams.documentClass().plainLayout()
 				: nextpar->layout();
@@ -597,6 +755,8 @@ void TeXOnePar(Buffer const & buf,
 
 	// This paragraph's language
 	Language const * const par_language = par.getParLanguage(bparams);
+	Language const * const nextpar_language = nextpar ?
+		nextpar->getParLanguage(bparams) : 0;
 	// The document's language
 	Language const * const doc_language = bparams.language;
 	// The language that was in effect when the environment this paragraph is
@@ -612,7 +772,7 @@ void TeXOnePar(Buffer const & buf,
 	// environment with nesting depth greater than (or equal to, but with
 	// a different layout) the current one. If there is no previous
 	// paragraph, the previous language is the outer language.
-	bool const use_prev_env_language = prev_env_language_ != 0
+	bool const use_prev_env_language = state->prev_env_language_ != 0
 			&& priorpar
 			&& priorpar->layout().isEnvironment()
 			&& (priorpar->getDepth() > par.getDepth()
@@ -620,7 +780,7 @@ void TeXOnePar(Buffer const & buf,
 				    && priorpar->layout() != par.layout()));
 	Language const * const prev_language =
 		(pit != 0)
-		? (use_prev_env_language ? prev_env_language_
+		? (use_prev_env_language ? state->prev_env_language_
 					 : priorpar->getParLanguage(bparams))
 		: outer_language;
 
@@ -630,22 +790,26 @@ void TeXOnePar(Buffer const & buf,
 		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 const nextpar_lang = nextpar_language ? (use_polyglossia ?
+		getPolyglossiaEnvName(nextpar_language) :
+		nextpar_language->babel()) : string();
 	string lang_begin_command = use_polyglossia ?
-		"\\begin{$$lang}" : lyxrc.language_command_begin;
+		"\\begin{$$lang}$$opts" : 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";
+	bool const using_begin_end = use_polyglossia ||
+					!lang_end_command.empty();
 
 	// In some insets (such as Arguments), we cannot use \selectlanguage
-	bool const localswitch = !use_polyglossia
-		&& text.inset().getLayout().forcelocalfontswitch();
+	bool const localswitch = text.inset().forceLocalFontSwitch()
+			|| (using_begin_end && text.inset().forcePlainLayout());
 	if (localswitch) {
-		lang_begin_command = lyxrc.language_command_local;
+		lang_begin_command = use_polyglossia ?
+			    "\\text$$lang$$opts{" : lyxrc.language_command_local;
 		lang_end_command = "}";
 		lang_command_termination.clear();
 	}
@@ -657,14 +821,18 @@ void TeXOnePar(Buffer const & buf,
 			                  && priorpar->getDepth() <= par.getDepth())
 		                  || priorpar->getDepth() < par.getDepth())))
 	{
-		if (!lang_end_command.empty() &&
+		if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
+		    !lang_end_command.empty() &&
 		    prev_lang != outer_lang &&
-		    !prev_lang.empty())
+		    !prev_lang.empty() &&
+		    (!using_begin_end || !style.isEnvironment()))
 		{
 			os << from_ascii(subst(lang_end_command,
 				"$$lang",
 				prev_lang))
 			   << lang_command_termination;
+			if (using_begin_end)
+				popLanguageName();
 		}
 
 		// We need to open a new language if we couldn't close the previous
@@ -672,14 +840,16 @@ void TeXOnePar(Buffer const & buf,
 		// the previous one, if the current language is different than the
 		// outer_language (which is currently in effect once the previous one
 		// is closed).
-		if ((lang_end_command.empty() || par_lang != outer_lang)
+		if ((lang_end_command.empty() || par_lang != outer_lang
+		     || (!using_begin_end
+			 || (style.isEnvironment() && par_lang != prev_lang)))
 			&& !par_lang.empty()) {
 			// If we're inside an inset, and that inset is within an \L or \R
 			// (or equivalents), then within the inset, too, any opposite
 			// 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 (!use_polyglossia
+			if (!using_begin_end
 			    // not for ArabTeX
 				&& par_language->lang() != "arabic_arabtex"
 				&& outer_language->lang() != "arabic_arabtex"
@@ -712,17 +882,15 @@ void TeXOnePar(Buffer const & buf,
 			}
 			// With CJK, the CJK tag has to be closed first (see below)
 			if (runparams.encoding->package() != Encoding::CJK
+			    && par_lang != openLanguageName(state)
 			    && !par_lang.empty()) {
-				os << from_ascii(subst(
-					lang_begin_command,
-					"$$lang",
-					par_lang));
-				if (use_polyglossia
-				    && !par_language->polyglossiaOpts().empty())
-						os << "["
-						  << from_ascii(par_language->polyglossiaOpts())
-						  << "]";
+				string bc = use_polyglossia ?
+					  getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
+					  : subst(lang_begin_command, "$$lang", par_lang);
+				os << bc;
 				os << lang_command_termination;
+				if (using_begin_end)
+					pushLanguageName(par_lang, localswitch);
 			}
 		}
 	}
@@ -731,6 +899,7 @@ void TeXOnePar(Buffer const & buf,
 	// encoding, since this only affects the position of the outputted
 	// \inputencoding command; the encoding switch will occur when necessary
 	if (bparams.inputenc == "auto"
+		&& !runparams.isFullUnicode() // Xe/LuaTeX use one document-wide encoding  (see also switchEncoding())
 		&& runparams.encoding->package() != Encoding::none) {
 		// Look ahead for future encoding changes.
 		// We try to output them at the beginning of the paragraph,
@@ -744,7 +913,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;
@@ -761,10 +930,10 @@ void TeXOnePar(Buffer const & buf,
 			// the following is necessary after a CJK environment in a multilingual
 			// context (nesting issue).
 			if (par_language->encoding()->package() == Encoding::CJK
-				&& open_encoding_ != CJK && cjk_inherited_ == 0) {
+				&& state->open_encoding_ != CJK && state->cjk_inherited_ == 0) {
 				os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
 				   << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
-				open_encoding_ = CJK;
+				state->open_encoding_ = CJK;
 			}
 			if (encoding->package() != Encoding::none && enc_switch.first) {
 				if (enc_switch.second > 0) {
@@ -773,12 +942,15 @@ void TeXOnePar(Buffer const & buf,
 				}
 				// With CJK, the CJK tag had to be closed first (see above)
 				if (runparams.encoding->package() == Encoding::CJK
+				    && par_lang != openLanguageName(state)
 				    && !par_lang.empty()) {
 					os << from_ascii(subst(
 						lang_begin_command,
 						"$$lang",
 						par_lang))
 					<< lang_command_termination;
+					if (using_begin_end)
+						pushLanguageName(par_lang, localswitch);
 				}
 				runparams.encoding = encoding;
 			}
@@ -792,7 +964,7 @@ void TeXOnePar(Buffer const & buf,
 	bool const useSetSpace = bparams.documentClass().provides("SetSpace");
 	if (par.allowParagraphCustomization()) {
 		if (par.params().startOfAppendix()) {
-			os << "\\appendix\n";
+			os << "\n\\appendix\n";
 		}
 
 		if (!par.params().spacing().isDefault()
@@ -807,7 +979,6 @@ void TeXOnePar(Buffer const & buf,
 		}
 	}
 
-	runparams.local_font = &par.getFirstFontSettings(bparams);
 	parStartCommand(par, os, runparams, style);
 	Font const outerfont = text.outerFont(pit);
 
@@ -815,53 +986,47 @@ void TeXOnePar(Buffer const & buf,
 	os << from_utf8(everypar);
 	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.
-	// This is necessary because LaTeX (and LyX on the screen)
-	// calculates the space between the baselines according
-	// to this font. (Matthias)
-	//
-	// Is this really needed ? (Dekel)
-	// We do not need to use to change the font for the last paragraph
-	// or for a command.
-
 	Font const font = par.empty()
 		 ? par.getLayoutFont(bparams, outerfont)
 		 : par.getFont(bparams, par.size() - 1, outerfont);
 
 	bool const is_command = style.isCommand();
 
-	if (style.resfont.size() != font.fontInfo().size()
-	    && nextpar
-	    && !is_command) {
-		os << '{';
-		os << "\\" << from_ascii(font.latexSize()) << " \\par}";
-	} else if (is_command) {
+	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())
-				os << setEncoding(prev_encoding->iconvName());
+			os << setEncoding(prev_encoding->iconvName());
 		}
 	}
 
 	bool pending_newline = false;
 	bool unskip_newline = false;
+	bool close_lang_switch = false;
 	switch (style.latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
-		if (nextpar && (par.params().depth() < nextpar->params().depth()))
+		if ((nextpar && par_lang != nextpar_lang
+			     && nextpar->getDepth() == par.getDepth())
+		    || (atSameLastLangSwitchDepth(state) && nextpar
+			    && nextpar->getDepth() < par.getDepth()))
+			close_lang_switch = using_begin_end;
+		if (nextpar && par.params().depth() < nextpar->params().depth())
 			pending_newline = true;
 		break;
 	case LATEX_ENVIRONMENT: {
 		// if its the last paragraph of the current environment
 		// skip it otherwise fall through
 		if (nextpar
-			&& (nextpar->layout() != par.layout()
-		        || nextpar->params().depth() != par.params().depth()))
+		    && ((nextpar->layout() != par.layout()
+			   || nextpar->params().depth() != par.params().depth())
+			|| (!using_begin_end || par_lang != nextpar_lang)))
+		{
+			close_lang_switch = using_begin_end;
 			break;
+		}
 	}
 
 	// fall through possible
@@ -876,7 +1041,13 @@ void TeXOnePar(Buffer const & buf,
 			&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
 			if (pending_newline)
 				os << '\n';
-			os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace));
+
+			string const endtag =
+				par.params().spacing().writeEnvirEnd(useSetSpace);
+			if (prefixIs(endtag, "\\end{"))
+				os << breakln;
+
+			os << from_ascii(endtag);
 			pending_newline = true;
 		}
 	}
@@ -884,26 +1055,27 @@ 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 = !use_polyglossia
+	bool closing_rtl_ltr_environment = !using_begin_end
 		// not for ArabTeX
 		&& (par_language->lang() != "arabic_arabtex"
 		    && outer_language->lang() != "arabic_arabtex")
-		     // have we opened and \L or \R environment?
+		// have we opened an \L or \R environment?
 		&& runparams.local_font != 0
 		&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
 		// are we about to close the language?
-		&&((nextpar && par_language->babel() != (nextpar->getParLanguage(bparams))->babel())
-		   || (runparams.isLastPar && par_language->babel() != outer_language->babel()));
+		&&((nextpar && par_lang != nextpar_lang)
+		   || (runparams.isLastPar && par_lang != outer_lang));
 
 	if (closing_rtl_ltr_environment
-	    || (runparams.isLastPar
-	        && ((!use_polyglossia && par_language->babel() != outer_language->babel())
-		    || (use_polyglossia && par_language->polyglossia() != outer_language->polyglossia())))) {
+	    || ((runparams.isLastPar || close_lang_switch)
+	        && (par_lang != outer_lang || (using_begin_end
+						&& style.isEnvironment()
+						&& par_lang != nextpar_lang)))) {
 		// 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 || close_lang_switch)
 			os << '\n';
 
 		// when the paragraph uses CJK, the language has to be closed earlier
@@ -918,50 +1090,80 @@ void TeXOnePar(Buffer const & buf,
 				string const current_lang = use_polyglossia
 					? getPolyglossiaEnvName(current_language)
 					: current_language->babel();
-				if (!current_lang.empty()) {
+				if (!current_lang.empty()
+				    && current_lang != openLanguageName(state)) {
+					string bc = use_polyglossia ?
+						    getPolyglossiaBegin(lang_begin_command, current_lang,
+									current_language->polyglossiaOpts())
+						  : subst(lang_begin_command, "$$lang", current_lang);
+					os << bc;
+					pending_newline = !localswitch;
+					unskip_newline = !localswitch;
+					if (using_begin_end)
+						pushLanguageName(current_lang, localswitch);
+				}
+			} else if ((!using_begin_end ||
+				    langOpenedAtThisLevel(state)) &&
+				   !par_lang.empty()) {
+				// If we are in an environment, we have to
+				// close the "outer" language afterwards
+				string const & cur_lang = openLanguageName(state);
+				if (!style.isEnvironment()
+				    || (close_lang_switch
+					&& atSameLastLangSwitchDepth(state)
+					&& par_lang != outer_lang
+					&& (par_lang != cur_lang
+					    || (cur_lang != outer_lang
+						&& nextpar
+						&& style != nextpar->layout())))
+				    || (atSameLastLangSwitchDepth(state)
+					&& state->lang_switch_depth_.size()
+					&& cur_lang != par_lang))
+				{
+					if (using_begin_end && !localswitch)
+						os << breakln;
 					os << from_ascii(subst(
-						lang_begin_command,
+						lang_end_command,
 						"$$lang",
-						current_lang));
+						par_lang));
 					pending_newline = !localswitch;
 					unskip_newline = !localswitch;
+					if (using_begin_end)
+						popLanguageName();
 				}
-			} else if (!par_lang.empty()) {
-				os << from_ascii(subst(
-					lang_end_command,
-					"$$lang",
-					par_lang));
-				pending_newline = !localswitch;
-				unskip_newline = !localswitch;
 			}
 		}
 	}
 	if (closing_rtl_ltr_environment)
 		os << "}";
 
+	bool const last_was_separator =
+		par.size() > 0 && par.isEnvSeparator(par.size() - 1);
+
 	if (pending_newline) {
 		if (unskip_newline)
 			// prevent unwanted whitespace
 			os << '%';
-		os << '\n';
+		if (!os.afterParbreak() && !last_was_separator)
+			os << '\n';
 	}
 
 	// if this is a CJK-paragraph and the next isn't, close CJK
 	// also if the next paragraph is a multilingual environment (because of nesting)
 	if (nextpar
-		&& open_encoding_ == CJK
-		&& (nextpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK
+		&& state->open_encoding_ == CJK
+		&& (nextpar_language->encoding()->package() != Encoding::CJK
 		   || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
 		// inbetween environments, CJK has to be closed later (nesting!)
 		&& (!style.isEnvironment() || !nextpar->layout().isEnvironment())) {
 		os << "\\end{CJK}\n";
-		open_encoding_ = none;
+		state->open_encoding_ = none;
 	}
 
 	// If this is the last paragraph, close the CJK environment
 	// if necessary. If it's an environment, we'll have to \end that first.
 	if (runparams.isLastPar && !style.isEnvironment()) {
-		switch (open_encoding_) {
+		switch (state->open_encoding_) {
 			case CJK: {
 				// do nothing at the end of child documents
 				if (maintext && buf.masterBuffer() != &buf)
@@ -972,12 +1174,12 @@ void TeXOnePar(Buffer const & buf,
 				// end of an inset
 				} else
 					os << "\\end{CJK}";
-				open_encoding_ = none;
+				state->open_encoding_ = none;
 				break;
 			}
 			case inputenc: {
 				os << "\\egroup";
-				open_encoding_ = none;
+				state->open_encoding_ = none;
 				break;
 			}
 			case none:
@@ -988,14 +1190,14 @@ void TeXOnePar(Buffer const & buf,
 	}
 
 	// If this is the last paragraph, and a local_font was set upon entering
-	// the inset, and we're using "auto" or "default" encoding, the encoding
+	// the inset, and we're using "auto" or "default" encoding, and not
+	// compiling with XeTeX or LuaTeX, the encoding
 	// should be set back to that local_font's encoding.
-	// However, do not change the encoding when a fully unicode aware backend
-	// such as XeTeX is used.
 	if (runparams.isLastPar && runparams_in.local_font != 0
 	    && runparams_in.encoding != runparams_in.local_font->language()->encoding()
 	    && (bparams.inputenc == "auto" || bparams.inputenc == "default")
-	    && (!runparams.isFullUnicode())) {
+		&& !runparams.isFullUnicode()
+	   ) {
 		runparams_in.encoding = runparams_in.local_font->language()->encoding();
 		os << setEncoding(runparams_in.encoding->iconvName());
 	}
@@ -1007,20 +1209,52 @@ void TeXOnePar(Buffer const & buf,
 	// we don't need a newline for the last paragraph!!!
 	// Note from JMarc: we will re-add a \n explicitly in
 	// TeXEnvironment, because it is needed in this case
-	if (nextpar) {
+	if (nextpar && !os.afterParbreak() && !last_was_separator) {
+		// Make sure to start a new line
+		os << breakln;
 		Layout const & next_layout = nextpar->layout();
-		if (style == next_layout
-		    // no blank lines before environments!
-		    || !next_layout.isEnvironment()
-		    // unless there's a depth change
-		    // FIXME What we really want to do here is put every \begin and \end
-		    // tag on a new line (which was not the case with nested environments).
-		    // But in the present state of play, we don't have access to the
-		    // information whether the current TeX row is empty or not.
-		    // For some ideas about how to fix this, see this thread:
-		    // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html
-		    || nextpar->params().depth() != par.params().depth()) {
-			os << '\n';
+		// A newline '\n' is always output before a command,
+		// so avoid doubling it.
+		if (!next_layout.isCommand()) {
+			// Here we now try to avoid spurious empty lines by
+			// outputting a paragraph break only if: (case 1) the
+			// paragraph style allows parbreaks and no \begin, \end
+			// or \item tags are going to follow (i.e., if the next
+			// isn't the first or the current isn't the last
+			// paragraph of an environment or itemize) and the
+			// depth and alignment of the following paragraph is
+			// unchanged, or (case 2) the following is a
+			// non-environment paragraph whose depth is increased
+			// but whose alignment is unchanged, or (case 3) the
+			// paragraph is not an environment and the next one is a
+			// non-itemize-like env at lower depth, or (case 4) the
+			// paragraph is a command not followed by an environment
+			// and the alignment of the current and next paragraph
+			// is unchanged, or (case 5) the current alignment is
+			// changed and a standard paragraph follows.
+			DocumentClass const & tclass = bparams.documentClass();
+			if ((style == next_layout
+			     && !style.parbreak_is_newline
+			     && !text.inset().getLayout().parbreakIsNewline()
+			     && style.latextype != LATEX_ITEM_ENVIRONMENT
+			     && style.latextype != LATEX_LIST_ENVIRONMENT
+			     && style.align == par.getAlign()
+			     && nextpar->getDepth() == par.getDepth()
+			     && nextpar->getAlign() == par.getAlign())
+			    || (!next_layout.isEnvironment()
+				&& nextpar->getDepth() > par.getDepth()
+				&& nextpar->getAlign() == par.getAlign())
+			    || (!style.isEnvironment()
+				&& next_layout.latextype == LATEX_ENVIRONMENT
+				&& nextpar->getDepth() < par.getDepth())
+			    || (style.isCommand()
+				&& !next_layout.isEnvironment()
+				&& style.align == par.getAlign()
+				&& next_layout.align == nextpar->getAlign())
+			    || (style.align != par.getAlign()
+				&& tclass.isDefaultLayout(next_layout))) {
+				os << '\n';
+			}
 		}
 	}
 
@@ -1038,19 +1272,33 @@ void latexParagraphs(Buffer const & buf,
 		     OutputParams const & runparams,
 		     string const & everypar)
 {
+	LASSERT(runparams.par_begin <= runparams.par_end,
+		{ os << "% LaTeX Output Error\n"; return; } );
+
 	BufferParams const & bparams = buf.params();
+	BufferParams const & mparams = buf.masterParams();
 
 	bool const maintext = text.isMainText();
 	bool const is_child = buf.masterBuffer() != &buf;
+	bool const multibib_child = maintext && is_child
+			&& mparams.multibib == "child";
+
+	if (multibib_child && mparams.useBiblatex())
+		os << "\\newrefsection";
+	else if (multibib_child && mparams.useBibtopic()) {
+		os << "\\begin{btUnit}\n";
+		runparams.openbtUnit = true;
+	}
 
 	// Open a CJK environment at the beginning of the main buffer
 	// if the document's language is a CJK language
 	// (but not in child documents)
+	OutputState * state = getOutputState();
 	if (maintext && !is_child
 	    && bparams.encoding().package() == Encoding::CJK) {
 		os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
 		<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
-		open_encoding_ = CJK;
+		state->open_encoding_ = CJK;
 	}
 	// if "auto begin" is switched off, explicitly switch the
 	// language on at start
@@ -1058,24 +1306,26 @@ void latexParagraphs(Buffer const & buf,
 		? getPolyglossiaEnvName(bparams.language)
 		: bparams.language->babel();
 	string const lang_begin_command = runparams.use_polyglossia ?
-		"\\begin{$$lang}" : lyxrc.language_command_begin;
+		"\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
+	string const lang_end_command = runparams.use_polyglossia ?
+		"\\end{$$lang}" : lyxrc.language_command_end;
+	bool const using_begin_end = runparams.use_polyglossia ||
+					!lang_end_command.empty();
 
 	if (maintext && !lyxrc.language_auto_begin &&
 	    !mainlang.empty()) {
 		// FIXME UNICODE
-		os << from_utf8(subst(lang_begin_command,
-					"$$lang",
-					mainlang));
-		if (runparams.use_polyglossia
-		    && !bparams.language->polyglossiaOpts().empty())
-			os << "["
-			    << from_ascii(bparams.language->polyglossiaOpts())
-			    << "]";
+		string bc = runparams.use_polyglossia ?
+			    getPolyglossiaBegin(lang_begin_command, mainlang,
+						bparams.language->polyglossiaOpts())
+			  : subst(lang_begin_command, "$$lang", mainlang);
+		os << bc;
 		os << '\n';
+		if (using_begin_end)
+			pushLanguageName(mainlang);
 	}
 
 	ParagraphList const & paragraphs = text.paragraphs();
-	LASSERT(runparams.par_begin <= runparams.par_end, /**/);
 
 	if (runparams.par_begin == runparams.par_end) {
 		// The full doc will be exported but it is easier to just rely on
@@ -1092,6 +1342,8 @@ void latexParagraphs(Buffer const & buf,
 	bool already_title = false;
 	DocumentClass const & tclass = bparams.documentClass();
 
+	// Did we already warn about inTitle layout mixing? (we only warn once)
+	bool gave_layout_warning = false;
 	for (; pit < runparams.par_end; ++pit) {
 		lastpit = pit;
 		ParagraphList::const_iterator par = paragraphs.constIterator(pit);
@@ -1103,9 +1355,15 @@ void latexParagraphs(Buffer const & buf,
 
 		if (layout.intitle) {
 			if (already_title) {
-				LYXERR0("Error in latexParagraphs: You"
-					" should not mix title layouts"
-					" with normal ones.");
+				if (!gave_layout_warning && !runparams.dryrun) {
+					gave_layout_warning = true;
+					frontend::Alert::warning(_("Error in latexParagraphs"),
+							bformat(_("You are using at least one "
+							  "layout (%1$s) intended for the title, "
+							  "after using non-title layouts. This "
+							  "could lead to missing or incorrect output."
+							  ), layout.name()));
+				}
 			} else if (!was_title) {
 				was_title = true;
 				if (tclass.titletype() == TITLE_ENVIRONMENT) {
@@ -1114,7 +1372,7 @@ void latexParagraphs(Buffer const & buf,
 							<< "}\n";
 				}
 			}
-		} else if (was_title && !already_title) {
+		} else if (was_title && !already_title && !layout.inpreamble) {
 			if (tclass.titletype() == TITLE_ENVIRONMENT) {
 				os << "\\end{" << from_ascii(tclass.titlename())
 						<< "}\n";
@@ -1127,6 +1385,15 @@ void latexParagraphs(Buffer const & buf,
 			was_title = false;
 		}
 
+		if (layout.isCommand() && !layout.latexname().empty()
+		    && layout.latexname() == bparams.multibib) {
+			if (runparams.openbtUnit)
+				os << "\\end{btUnit}\n";
+			if (!bparams.useBiblatex()) {
+				os << '\n' << "\\begin{btUnit}\n";
+				runparams.openbtUnit = true;
+			}
+		}
 
 		if (!layout.isEnvironment() && par->params().leftIndent().zero()) {
 			// This is a standard top level paragraph, TeX it and continue.
@@ -1159,30 +1426,48 @@ void latexParagraphs(Buffer const & buf,
 		}
 	}
 
+	if (maintext && !is_child && runparams.openbtUnit)
+		os << "\\end{btUnit}\n";
+
 	// if "auto end" is switched off, explicitly close the language at the end
-	// but only if the last par is in a babel language
-	string const lang_end_command = runparams.use_polyglossia ?
-		"\\end{$$lang}" : lyxrc.language_command_end;
+	// but only if the last par is in a babel or polyglossia language
 	if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
 		paragraphs.at(lastpit).getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
 		os << from_utf8(subst(lang_end_command,
 					"$$lang",
 					mainlang))
 			<< '\n';
+		if (using_begin_end)
+			popLanguageName();
 	}
 
 	// 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) {
+	if (maintext && !is_child && state->open_encoding_ == CJK) {
 		os << "\\end{CJK}\n";
-		open_encoding_ = none;
+		state->open_encoding_ = none;
+	}
+	// Likewise for polyglossia or when using begin/end commands
+	string const & cur_lang = openLanguageName(state);
+	if (maintext && !is_child && !cur_lang.empty()) {
+		os << from_utf8(subst(lang_end_command,
+					"$$lang",
+					cur_lang))
+		   << '\n';
+		if (using_begin_end)
+			popLanguageName();
 	}
 
 	// reset inherited encoding
-	if (cjk_inherited_ > 0) {
-		cjk_inherited_ -= 1;
-		if (cjk_inherited_ == 0)
-			open_encoding_ = CJK;
+	if (state->cjk_inherited_ > 0) {
+		state->cjk_inherited_ -= 1;
+		if (state->cjk_inherited_ == 0)
+			state->open_encoding_ = CJK;
+	}
+
+	if (multibib_child && mparams.useBibtopic()) {
+		os << "\\end{btUnit}\n";
+		runparams.openbtUnit = false;
 	}
 }
 
@@ -1191,10 +1476,21 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 		   OutputParams const & runparams, Encoding const & newEnc,
 		   bool force)
 {
+	// XeTeX/LuaTeX use only one encoding per document:
+	// * with useNonTeXFonts: "utf8plain",
+	// * with XeTeX and TeX fonts: "ascii" (inputenc fails),
+	// * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc.
+	if (runparams.isFullUnicode())
+		return make_pair(false, 0);
+
 	Encoding const & oldEnc = *runparams.encoding;
 	bool moving_arg = runparams.moving_arg;
-	if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-		|| moving_arg))
+	// If we switch from/to CJK, we need to switch anyway, despite custom inputenc
+	bool const from_to_cjk = 
+		(oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
+		|| (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
+	if (!force && !from_to_cjk
+	    && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
 		return make_pair(false, 0);
 
 	// Do nothing if the encoding is unchanged.
@@ -1217,6 +1513,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 		return make_pair(true, 0);
 
 	docstring const inputenc_arg(from_ascii(newEnc.latexName()));
+	OutputState * state = getOutputState();
 	switch (newEnc.package()) {
 		case Encoding::none:
 		case Encoding::japanese:
@@ -1225,15 +1522,15 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 		case Encoding::inputenc: {
 			int count = inputenc_arg.length();
 			if (oldEnc.package() == Encoding::CJK &&
-			    open_encoding_ == CJK) {
+			    state->open_encoding_ == CJK) {
 				os << "\\end{CJK}";
-				open_encoding_ = none;
+				state->open_encoding_ = none;
 				count += 9;
 			}
 			else if (oldEnc.package() == Encoding::inputenc &&
-				 open_encoding_ == inputenc) {
+				 state->open_encoding_ == inputenc) {
 				os << "\\egroup";
-				open_encoding_ = none;
+				state->open_encoding_ = none;
 				count += 7;
 			}
 			if (runparams.local_font != 0
@@ -1243,7 +1540,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 				// else CJK fails.
 				os << "\\bgroup";
 				count += 7;
-				open_encoding_ = inputenc;
+				state->open_encoding_ = inputenc;
 			}
 			// with the japanese option, inputenc is omitted.
 			if (runparams.use_japanese)
@@ -1254,18 +1551,18 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 		case Encoding::CJK: {
 			int count = inputenc_arg.length();
 			if (oldEnc.package() == Encoding::CJK &&
-			    open_encoding_ == CJK) {
+			    state->open_encoding_ == CJK) {
 				os << "\\end{CJK}";
 				count += 9;
 			}
 			if (oldEnc.package() == Encoding::inputenc &&
-			    open_encoding_ == inputenc) {
+			    state->open_encoding_ == inputenc) {
 				os << "\\egroup";
 				count += 7;
 			}
 			os << "\\begin{CJK}{" << inputenc_arg << "}{"
 			   << from_ascii(bparams.fonts_cjk) << "}";
-			open_encoding_ = CJK;
+			state->open_encoding_ = CJK;
 			return make_pair(true, count + 15);
 		}
 	}