X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=e78773eea6862420ab9a675bdd53bfd8e168901b;hb=0657a91fd08e9c31d7f9e6be26055cc5050e5f8b;hp=f775d4af126f668f6ea7f93a8438839baa4a71e7;hpb=1b3f5ee46ff2924c4b374f52ad6317b5fd7ac9a5;p=lyx.git

diff --git a/src/output_latex.C b/src/output_latex.C
index f775d4af12..e78773eea6 100644
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -18,57 +18,56 @@
 #include "encoding.h"
 #include "language.h"
 #include "lyxrc.h"
+#include "outputparams.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "texrow.h"
 #include "vspace.h"
 
+#include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
 
-#ifdef HAVE_LOCALE
-#endif
 
-using lyx::support::subst;
+namespace lyx {
+
+using support::subst;
 
 using std::endl;
-using std::ostream;
 using std::string;
 
-extern string bibitemWidest(Buffer const &);
-
 
 namespace {
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXEnvironment(Buffer const & buf,
 	       ParagraphList const & paragraphs,
-	       ParagraphList::iterator pit,
-	       ostream & os, TexRow & texrow,
+	       ParagraphList::const_iterator pit,
+	       odocstream & os, TexRow & texrow,
 	       OutputParams const & runparams);
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
 	  ParagraphList const & paragraphs,
-	  ParagraphList::iterator pit,
-	  ostream & os, TexRow & texrow,
+	  ParagraphList::const_iterator pit,
+	  odocstream & os, TexRow & texrow,
 	  OutputParams const & runparams,
 	  string const & everypar = string());
 
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXDeeper(Buffer const & buf,
 	  ParagraphList const & paragraphs,
-	  ParagraphList::iterator pit,
-	  ostream & os, TexRow & texrow,
+	  ParagraphList::const_iterator pit,
+	  odocstream & os, TexRow & texrow,
 	  OutputParams const & runparams)
 {
 	lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
-	ParagraphList::iterator par = pit;
+	ParagraphList::const_iterator par = pit;
 
-	while (par != const_cast<ParagraphList&>(paragraphs).end() &&
+	while (par != paragraphs.end() &&
 		     par->params().depth() == pit->params().depth()) {
 		if (par->layout()->isEnvironment()) {
 			par = TeXEnvironment(buf, paragraphs, par,
@@ -78,17 +77,21 @@ TeXDeeper(Buffer const & buf,
 					     os, texrow, runparams);
 		}
 	}
-	lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
+	lyxerr[Debug::LATEX] << "TeXDeeper...done " << endl;
 
 	return par;
 }
 
 
-ParagraphList::iterator
+int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
+		      odocstream & os, OutputParams const & runparams, int number);
+
+
+ParagraphList::const_iterator
 TeXEnvironment(Buffer const & buf,
 	       ParagraphList const & paragraphs,
-	       ParagraphList::iterator pit,
-	       ostream & os, TexRow & texrow,
+	       ParagraphList::const_iterator pit,
+	       odocstream & os, TexRow & texrow,
 	       OutputParams const & runparams)
 {
 	lyxerr[Debug::LATEX] << "TeXEnvironment...     " << &*pit << endl;
@@ -100,52 +103,73 @@ TeXEnvironment(Buffer const & buf,
 	Language const * language = pit->getParLanguage(bparams);
 	Language const * doc_language = bparams.language;
 	Language const * previous_language =
-		(pit != const_cast<ParagraphList&>(paragraphs).begin())
+		(pit != paragraphs.begin())
 		? boost::prior(pit)->getParLanguage(bparams)
 		: doc_language;
 	if (language->babel() != previous_language->babel()) {
 
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel()) {
-			os << subst(lyxrc.language_command_end, "$$lang",
-				    previous_language->babel())
-			   << endl;
+			os << from_ascii(subst(
+				lyxrc.language_command_end,
+				"$$lang",
+				previous_language->babel()))
+			   << '\n';
 			texrow.newline();
 		}
 
 		if (lyxrc.language_command_end.empty() ||
 		    language->babel() != doc_language->babel()) {
-			os << subst(lyxrc.language_command_begin, "$$lang",
-				    language->babel())
-			   << endl;
+			os << from_ascii(subst(
+				lyxrc.language_command_begin,
+				"$$lang",
+				language->babel()))
+			   << '\n';
 			texrow.newline();
 		}
 	}
 
 	bool leftindent_open = false;
 	if (!pit->params().leftIndent().zero()) {
-		os << "\\begin{LyXParagraphLeftIndent}{" <<
-			pit->params().leftIndent().asLatexString() << "}\n";
+		os << "\\begin{LyXParagraphLeftIndent}{"
+		   << from_ascii(pit->params().leftIndent().asLatexString())
+		   << "}\n";
 		texrow.newline();
 		leftindent_open = true;
 	}
 
 	if (style->isEnvironment()) {
-		os << "\\begin{" << style->latexname() << '}';
+		os << "\\begin{" << from_ascii(style->latexname()) << '}';
+		if (style->optionalargs > 0) {
+			int ret = latexOptArgInsets(buf, *pit, os, runparams,
+						    style->optionalargs);
+			while (ret > 0) {
+				texrow.newline();
+				--ret;
+			}
+		}
 		if (style->latextype == LATEX_LIST_ENVIRONMENT) {
-			os << "{" << pit->params().labelWidthString() << "}\n";
+			os << '{'
+			   << pit->params().labelWidthString()
+			   << "}\n";
 		} else if (style->labeltype == LABEL_BIBLIO) {
 			// ale970405
-			os << "{" <<  bibitemWidest(buf) << "}\n";
+			os << '{' << bibitemWidest(buf) << "}\n";
 		} else
-			os << style->latexparam() << '\n';
+			os << from_ascii(style->latexparam()) << '\n';
 		texrow.newline();
 	}
-	ParagraphList::iterator par = pit;
+	ParagraphList::const_iterator par = pit;
 	do {
 		par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
 
-		if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) {
+		if (par == paragraphs.end()) {
+			// Make sure that the last paragraph is
+			// correctly terminated (because TeXOnePar does
+			// not add a \n in this case)
+			os << '\n';
+			texrow.newline();
+		} else if (par->params().depth() > pit->params().depth()) {
 			    if (par->layout()->isParagraph()) {
 
 			    // Thinko!
@@ -168,13 +192,13 @@ TeXEnvironment(Buffer const & buf,
 			par = TeXDeeper(buf, paragraphs, par, os, texrow,
 					runparams);
 		}
-	} while (par != const_cast<ParagraphList&>(paragraphs).end()
+	} while (par != paragraphs.end()
 		 && par->layout() == pit->layout()
 		 && par->params().depth() == pit->params().depth()
 		 && par->params().leftIndent() == pit->params().leftIndent());
 
 	if (style->isEnvironment()) {
-		os << "\\end{" << style->latexname() << "}\n";
+		os << "\\end{" << from_ascii(style->latexname()) << "}\n";
 		texrow.newline();
 	}
 
@@ -183,86 +207,65 @@ TeXEnvironment(Buffer const & buf,
 		texrow.newline();
 	}
 
-	lyxerr[Debug::LATEX] << "TeXEnvironment...done " << &*par << endl;
-	return par;  // ale970302
+	if (par != paragraphs.end() && lyxerr.debugging(Debug::LATEX))
+		lyxerr << "TeXEnvironment...done " << &*par << endl;
+	return par;
 }
 
 
-InsetOptArg * optArgInset(Paragraph const & par)
+int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
+		      odocstream & os, OutputParams const & runparams, int number)
 {
-	// Find the entry.
+	int lines = 0;
+
 	InsetList::const_iterator it = par.insetlist.begin();
 	InsetList::const_iterator end = par.insetlist.end();
-	for (; it != end; ++it) {
-		InsetBase * ins = it->inset;
-		if (ins->lyxCode() == InsetBase::OPTARG_CODE) {
-			return static_cast<InsetOptArg *>(ins);
+	for (; it != end && number > 0 ; ++it) {
+		if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) {
+			InsetOptArg * ins =
+				static_cast<InsetOptArg *>(it->inset);
+			lines += ins->latexOptional(buf, os, runparams);
+			--number;
 		}
 	}
-	return 0;
+	return lines;
 }
 
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
 	  ParagraphList const & paragraphs,
-	  ParagraphList::iterator pit,
-	  ostream & os, TexRow & texrow,
-	  OutputParams const & runparams,
+	  ParagraphList::const_iterator pit,
+	  odocstream & os, TexRow & texrow,
+	  OutputParams const & runparams_in,
 	  string const & everypar)
 {
 	lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '"
 		<< everypar << "'" << endl;
 	BufferParams const & bparams = buf.params();
-
-	InsetOld const * in = pit->inInset();
-	bool further_blank_line = false;
 	LyXLayout_ptr style;
 
-	// well we have to check if we are in an inset with unlimited
-	// length (all in one row) if that is true then we don't allow
-	// any special options in the paragraph and also we don't allow
-	// any environment other then "Standard" to be valid!
-	if (in == 0 || !in->forceDefaultParagraphs(in)) {
+	// In an inset with unlimited length (all in one row),
+	// force layout to default
+	if (!pit->forceDefaultParagraphs())
 		style = pit->layout();
-
-		if (pit->params().startOfAppendix()) {
-			os << "\\appendix\n";
-			texrow.newline();
-		}
-
-		if (!pit->params().spacing().isDefault()
-			&& (pit == const_cast<ParagraphList&>(paragraphs).begin()
-			    || !boost::prior(pit)->hasSameLayout(*pit)))
-		{
-			os << pit->params().spacing().writeEnvirBegin() << '\n';
-			texrow.newline();
-		}
-
-		if (style->isCommand()) {
-			os << '\n';
-			texrow.newline();
-		}
-
-		if (further_blank_line) {
-			os << '\n';
-			texrow.newline();
-		}
-	} else {
+	else
 		style = bparams.getLyXTextClass().defaultLayout();
-	}
+
+	OutputParams runparams = runparams_in;
+	runparams.moving_arg |= style->needprotect;
 
 	Language const * language = pit->getParLanguage(bparams);
 	Language const * doc_language = bparams.language;
 	Language const * previous_language =
-		(pit != const_cast<ParagraphList&>(paragraphs).begin())
+		(pit != paragraphs.begin())
 		? boost::prior(pit)->getParLanguage(bparams)
 		: doc_language;
 
 	if (language->babel() != previous_language->babel()
 	    // check if we already put language command in TeXEnvironment()
 	    && !(style->isEnvironment()
-		 && (pit == const_cast<ParagraphList&>(paragraphs).begin() ||
+		 && (pit == paragraphs.begin() ||
 		     (boost::prior(pit)->layout() != pit->layout() &&
 		      boost::prior(pit)->getDepth() <= pit->getDepth())
 		     || boost::prior(pit)->getDepth() < pit->getDepth())))
@@ -270,42 +273,81 @@ TeXOnePar(Buffer const & buf,
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel())
 		{
-			os << subst(lyxrc.language_command_end, "$$lang",
-				    previous_language->babel())
-			   << endl;
+			os << from_ascii(subst(lyxrc.language_command_end,
+				"$$lang",
+				previous_language->babel()))
+			   << '\n';
 			texrow.newline();
 		}
 
 		if (lyxrc.language_command_end.empty() ||
 		    language->babel() != doc_language->babel())
 		{
-			os << subst(lyxrc.language_command_begin, "$$lang",
-				    language->babel())
-			   << endl;
+			os << from_ascii(subst(
+				lyxrc.language_command_begin,
+				"$$lang",
+				language->babel()))
+			   << '\n';
 			texrow.newline();
 		}
 	}
 
-	if (bparams.inputenc == "auto" &&
-	    language->encoding() != previous_language->encoding()) {
-		os << "\\inputencoding{"
-		   << language->encoding()->LatexName()
-		   << "}\n";
+	LyXFont const outerfont =
+		outerFont(std::distance(paragraphs.begin(), pit),
+			  paragraphs);
+	// This must be identical to basefont in Paragraph::simpleTeXOnePar
+	LyXFont basefont = (pit->beginOfBody() > 0) ?
+			pit->getLabelFont(bparams, outerfont) :
+			pit->getLayoutFont(bparams, outerfont);
+	Encoding const & outer_encoding(*(outerfont.language()->encoding()));
+	// FIXME we switch from the outer encoding to the encoding of
+	// this paragraph, since I could not figure out the correct
+	// logic to take the encoding of the previous paragraph into
+	// account. This may result in some unneeded encoding changes.
+	if (switchEncoding(os, bparams, outer_encoding,
+	                   *(basefont.language()->encoding()))) {
+		os << '\n';
 		texrow.newline();
 	}
 
+	// In an inset with unlimited length (all in one row),
+	// don't allow any special options in the paragraph
+	if (!pit->forceDefaultParagraphs()) {
+		if (pit->params().startOfAppendix()) {
+			os << "\\appendix\n";
+			texrow.newline();
+		}
+
+		if (!pit->params().spacing().isDefault()
+			&& (pit == paragraphs.begin()
+			    || !boost::prior(pit)->hasSameLayout(*pit)))
+		{
+			os << from_ascii(pit->params().spacing().writeEnvirBegin())
+			    << '\n';
+			texrow.newline();
+		}
+
+		if (style->isCommand()) {
+			os << '\n';
+			texrow.newline();
+		}
+	}
+
 	switch (style->latextype) {
 	case LATEX_COMMAND:
-		os << '\\' << style->latexname();
+		os << '\\' << from_ascii(style->latexname());
 
 		// Separate handling of optional argument inset.
-		if (style->optionalargs == 1) {
-			InsetOptArg * it = optArgInset(*pit);
-			if (it)
-				it->latexOptional(buf, os, runparams);
+		if (style->optionalargs > 0) {
+			int ret = latexOptArgInsets(buf, *pit, os, runparams,
+						    style->optionalargs);
+			while (ret > 0) {
+				texrow.newline();
+				--ret;
+			}
 		}
 		else
-			os << style->latexparam();
+			os << from_ascii(style->latexparam());
 		break;
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
@@ -318,9 +360,9 @@ TeXOnePar(Buffer const & buf,
 		break;
 	}
 
-	os << everypar;
-	bool need_par = pit->simpleTeXOnePar(buf, bparams,
-					     outerFont(pit, paragraphs),
+	// FIXME UNICODE
+	os << from_utf8(everypar);
+	bool need_par = pit->simpleTeXOnePar(buf, bparams, outerfont,
 					     os, texrow, runparams);
 
 	// Make sure that \\par is done with the font of the last
@@ -332,7 +374,6 @@ TeXOnePar(Buffer const & buf,
 	// Is this really needed ? (Dekel)
 	// We do not need to use to change the font for the last paragraph
 	// or for a command.
-	LyXFont const outerfont = outerFont(pit, paragraphs);
 
 	LyXFont const font =
 		(pit->empty()
@@ -342,31 +383,30 @@ TeXOnePar(Buffer const & buf,
 	bool is_command = style->isCommand();
 
 	if (style->resfont.size() != font.size()
-	    && boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
+	    && boost::next(pit) != paragraphs.end()
 	    && !is_command) {
 		if (!need_par)
 			os << '{';
-		os << "\\" << font.latexSize() << " \\par}";
+		os << "\\" << from_ascii(font.latexSize()) << " \\par}";
 	} else if (need_par) {
 		os << "\\par}";
 	} else if (is_command)
 		os << '}';
 
+	bool pending_newline = false;
 	switch (style->latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
-		if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
-		    && (pit->params().depth() < boost::next(pit)->params().depth())) {
-			os << '\n';
-			texrow.newline();
-		}
+		if (boost::next(pit) != paragraphs.end()
+		    && (pit->params().depth() < boost::next(pit)->params().depth()))
+			pending_newline = true;
 		break;
 	case LATEX_ENVIRONMENT: {
 		// if its the last paragraph of the current environment
 		// skip it otherwise fall through
-		ParagraphList::iterator next = boost::next(pit);
+		ParagraphList::const_iterator next = boost::next(pit);
 
-		if (next != const_cast<ParagraphList&>(paragraphs).end()
+		if (next != paragraphs.end()
 		    && (next->layout() != pit->layout()
 			|| next->params().depth() != pit->params().depth()))
 			break;
@@ -375,54 +415,71 @@ TeXOnePar(Buffer const & buf,
 		// fall through possible
 	default:
 		// we don't need it for the last paragraph!!!
-		if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
-			os << '\n';
-			texrow.newline();
-		}
+		if (boost::next(pit) != paragraphs.end())
+			pending_newline = true;
 	}
 
-	if (in == 0 || !in->forceDefaultParagraphs(in)) {
-		further_blank_line = false;
-
-		if (further_blank_line) {
-			os << '\n';
-			texrow.newline();
-		}
-
+	if (!pit->forceDefaultParagraphs()) {
 		if (!pit->params().spacing().isDefault()
-			&& (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()
+			&& (boost::next(pit) == paragraphs.end()
 			    || !boost::next(pit)->hasSameLayout(*pit)))
 		{
-			os << pit->params().spacing().writeEnvirEnd() << '\n';
-			texrow.newline();
+			if (pending_newline) {
+				os << '\n';
+				texrow.newline();
+			}
+			os << from_ascii(pit->params().spacing().writeEnvirEnd());
+			pending_newline = true;
 		}
 	}
 
-	// we don't need it for the last paragraph!!!
-	if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
-		os << '\n';
-		texrow.newline();
-	} else {
+	if (boost::next(pit) == paragraphs.end()
+	    && language->babel() != doc_language->babel()) {
 		// Since \selectlanguage write the language to the aux file,
 		// we need to reset the language at the end of footnote or
 		// float.
 
-		if (language->babel() != doc_language->babel()) {
-			if (lyxrc.language_command_end.empty())
-				os << subst(lyxrc.language_command_begin,
-					    "$$lang",
-					    doc_language->babel())
-				   << endl;
-			else
-				os << subst(lyxrc.language_command_end,
-					    "$$lang",
-					    language->babel())
-				   << endl;
+		if (pending_newline) {
+			os << '\n';
 			texrow.newline();
 		}
+		if (lyxrc.language_command_end.empty())
+			os << from_ascii(subst(
+				lyxrc.language_command_begin,
+				"$$lang",
+				doc_language->babel()));
+		else
+			os << from_ascii(subst(
+				lyxrc.language_command_end,
+				"$$lang",
+				language->babel()));
+		pending_newline = true;
+	}
+
+	// FIXME we switch from the encoding of this paragraph to the
+	// outer encoding, since I could not figure out the correct logic
+	// to take the encoding of the next paragraph into account.
+	// This may result in some unneeded encoding changes.
+	basefont = pit->getLayoutFont(bparams, outerfont);
+	switchEncoding(os, bparams, *(basefont.language()->encoding()),
+	               outer_encoding);
+	if (pending_newline) {
+		os << '\n';
+		texrow.newline();
+	}
+
+	// we don't need it for the last paragraph!!!
+	// Note from JMarc: we will re-add a \n explicitely in
+	// TeXEnvironment, because it is needed in this case
+	if (boost::next(pit) != paragraphs.end()) {
+		os << '\n';
+		texrow.newline();
 	}
 
-	lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;
+	if (boost::next(pit) != paragraphs.end() &&
+	    lyxerr.debugging(Debug::LATEX))
+		lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl;
+
 	return ++pit;
 }
 
@@ -432,7 +489,7 @@ TeXOnePar(Buffer const & buf,
 // LaTeX all paragraphs
 void latexParagraphs(Buffer const & buf,
 		     ParagraphList const & paragraphs,
-		     ostream & os,
+		     odocstream & os,
 		     TexRow & texrow,
 		     OutputParams const & runparams,
 		     string const & everypar)
@@ -440,17 +497,29 @@ void latexParagraphs(Buffer const & buf,
 	bool was_title = false;
 	bool already_title = false;
 	LyXTextClass const & tclass = buf.params().getLyXTextClass();
-	ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
-	ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
+	ParagraphList::const_iterator par = paragraphs.begin();
+	ParagraphList::const_iterator endpar = paragraphs.end();
+
+	BOOST_ASSERT(runparams.par_begin <= runparams.par_end);
+	// if only part of the paragraphs will be outputed
+	if (runparams.par_begin !=  runparams.par_end) {
+		par = boost::next(paragraphs.begin(), runparams.par_begin);
+		endpar = boost::next(paragraphs.begin(), runparams.par_end);
+		// runparams will be passed to nested paragraphs, so
+		// we have to reset the range parameters.
+		const_cast<OutputParams&>(runparams).par_begin = 0;
+		const_cast<OutputParams&>(runparams).par_end = 0;
+	}
 
 	// if only_body
 	while (par != endpar) {
-		InsetOld * in = par->inInset();
+		ParagraphList::const_iterator lastpar = par;
 		// well we have to check if we are in an inset with unlimited
 		// length (all in one row) if that is true then we don't allow
 		// any special options in the paragraph and also we don't allow
-		// any environment other then "Standard" to be valid!
-		if (in == 0 || !in->forceDefaultParagraphs(in)) {
+		// any environment other than the default layout of the
+		// text class to be valid!
+		if (!par->forceDefaultParagraphs()) {
 			LyXLayout_ptr const & layout = par->layout();
 
 			if (layout->intitle) {
@@ -462,18 +531,18 @@ void latexParagraphs(Buffer const & buf,
 					was_title = true;
 					if (tclass.titletype() == TITLE_ENVIRONMENT) {
 						os << "\\begin{"
-						    << tclass.titlename()
+						    << from_ascii(tclass.titlename())
 						    << "}\n";
 						texrow.newline();
 					}
 				}
 			} else if (was_title && !already_title) {
 				if (tclass.titletype() == TITLE_ENVIRONMENT) {
-					os << "\\end{" << tclass.titlename()
+					os << "\\end{" << from_ascii(tclass.titlename())
 					    << "}\n";
 				}
 				else {
-					os << "\\" << tclass.titlename()
+					os << "\\" << from_ascii(tclass.titlename())
 					    << "\n";
 				}
 				texrow.newline();
@@ -483,31 +552,58 @@ void latexParagraphs(Buffer const & buf,
 
 			if (layout->is_environment) {
 				par = TeXOnePar(buf, paragraphs, par, os, texrow,
-				                runparams, everypar);
+						runparams, everypar);
 			} else if (layout->isEnvironment() ||
-				!par->params().leftIndent().zero())
-			{
+			           !par->params().leftIndent().zero()) {
 				par = TeXEnvironment(buf, paragraphs, par, os,
 						     texrow, runparams);
 			} else {
 				par = TeXOnePar(buf, paragraphs, par, os, texrow,
-				                runparams, everypar);
+						runparams, everypar);
 			}
 		} else {
 			par = TeXOnePar(buf, paragraphs, par, os, texrow,
-			                runparams, everypar);
+					runparams, everypar);
 		}
+		if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+			break;
 	}
 	// It might be that we only have a title in this document
 	if (was_title && !already_title) {
 		if (tclass.titletype() == TITLE_ENVIRONMENT) {
-			os << "\\end{" << tclass.titlename()
+			os << "\\end{" << from_ascii(tclass.titlename())
 			    << "}\n";
 		}
 		else {
-			os << "\\" << tclass.titlename()
+			os << "\\" << from_ascii(tclass.titlename())
 			    << "\n";
 				}
 		texrow.newline();
 	}
 }
+
+
+int switchEncoding(odocstream & os, BufferParams const & bparams,
+                   Encoding const & oldEnc, Encoding const & newEnc)
+{
+	// FIXME thailatex does not support the inputenc package, so we
+	// ignore switches from/to tis620-0 encoding here. This does of
+	// course only work as long as the non-thai text contains ASCII
+	// only, but it is the best we can do.
+	if ((bparams.inputenc == "auto" || bparams.inputenc == "default") &&
+	    oldEnc.name() != newEnc.name() &&
+	    oldEnc.name() != "tis620-0" && newEnc.name() != "tis620-0") {
+		lyxerr[Debug::LATEX] << "Changing LaTeX encoding from "
+		                     << oldEnc.name() << " to "
+		                     << newEnc.name() << endl;
+		os << setEncoding(newEnc.iconvName());
+		if (bparams.inputenc != "default") {
+			docstring const inputenc(from_ascii(newEnc.latexName()));
+			os << "\\inputencoding{" << inputenc << '}';
+			return 16 + inputenc.length();
+		}
+	}
+	return 0;
+}
+
+} // namespace lyx