From: Uwe Stöhr <uwestoehr@web.de>
Date: Fri, 11 Dec 2009 01:26:07 +0000 (+0000)
Subject: preamble.cpp: tex2lyx creates fileformat 264 - the encoding "ascii" is known to LyX... 
X-Git-Tag: 2.0.0~4849
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6b26b4abd17503a7f6bbca18a0ce634b2061c372;p=features.git

preamble.cpp: tex2lyx creates fileformat 264 - the encoding "ascii" is known to LyX since fileformat 262 so that a special handling for this encoding is no longer necessary

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32472 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 3c67b6ca66..9557fa7b3c 100644
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -328,14 +328,8 @@ void handle_package(Parser &p, string const & name, string const & opts,
 		// Therefore check for the "," character.
 		// It is also only set when there is not more then one babel
 		// language option but this is handled in the routine for babel.
-		if (opts.find(",") == string::npos && one_language == true) {
-			if (opts == "ascii")
-				//change ascii to auto to be in the unicode range, see
-				//http://www.lyx.org/trac/ticket/4719
-				h_inputencoding = "auto";
-			else if (!opts.empty())
-				h_inputencoding = opts;
-		}
+		if (opts.find(",") == string::npos && one_language == true)
+			h_inputencoding = opts;
 		if (!options.empty())
 			p.setEncoding(options.back());
 		options.clear();