X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=fa96ec758b3fadb24a8307b899e63ef2636b1b6a;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=e78773eea6862420ab9a675bdd53bfd8e168901b;hpb=439582ec6d627ee33477f0c05daa086cb07eba7c;p=lyx.git

diff --git a/src/output_latex.C b/src/output_latex.C
index e78773eea6..fa96ec758b 100644
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -83,10 +83,6 @@ TeXDeeper(Buffer const & buf,
 }
 
 
-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,
@@ -212,6 +208,8 @@ TeXEnvironment(Buffer const & buf,
 	return par;
 }
 
+}
+
 
 int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
 		      odocstream & os, OutputParams const & runparams, int number)
@@ -232,6 +230,8 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
 }
 
 
+namespace {
+
 ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
 	  ParagraphList const & paragraphs,
@@ -592,6 +592,7 @@ int switchEncoding(odocstream & os, BufferParams const & bparams,
 	// only, but it is the best we can do.
 	if ((bparams.inputenc == "auto" || bparams.inputenc == "default") &&
 	    oldEnc.name() != newEnc.name() &&
+	    oldEnc.name() != "ascii" && newEnc.name() != "ascii" &&
 	    oldEnc.name() != "tis620-0" && newEnc.name() != "tis620-0") {
 		lyxerr[Debug::LATEX] << "Changing LaTeX encoding from "
 		                     << oldEnc.name() << " to "