Author: uwestoehr
Date: Mon Oct 31 02:58:58 2011
New Revision: 40109
URL: http://www.lyx.org/trac/changeset/40109
Log:
backporting tex2lyx: fix bug #7863
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp Mon Oct 31
02:51:46 2011 (r40108)
+++ lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp Mon Oct 31
02:58:58 2011 (r40109)
@@ -550,11 +550,8 @@
// we need to keep it in the preamble to prevent cases like bug
#7861.
if (!opts.empty()) {
// check if more than one option was used - used later
for inputenc
- // in case inputenc is parsed before babel, set the
encoding to auto
- if (options.begin() != options.end() - 1) {
+ if (options.begin() != options.end() - 1)
one_language = false;
- h_inputencoding = "auto";
- }
// babel takes the last language of the option of its
\usepackage
// call as document language. If there is no such
language option, the
// last language in the documentclass options is used.
@@ -587,8 +584,8 @@
// inputenc option because otherwise h_inputencoding must be
// set to "auto" (the default encoding of the document language)
// 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.
+ // It is also only set when there is not more than one babel
+ // language option.
if (opts.find(",") == string::npos && one_language == true)
h_inputencoding = opts;
if (!options.empty())
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Oct 31 02:51:46 2011
(r40108)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Mon Oct 31 02:58:58 2011
(r40109)
@@ -151,6 +151,8 @@
- Fix (La)TeX import for files using Latvian, Lithuanian, Mongolian,
Turkmen and/or Vietnamese (bug 7862).
+- Fix tex2lyx handling of inputenc encoding settings (bug 7863).
+
- Store the autosave files of unnamed buffers in the correct directory
and make sure they are not left behind after saving (bug 7793).
