anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-24 01:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backporting tex2lyx: fix bug #7863

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40109 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-31 01:58:58 +00:00
parent 3f691d1f55
commit 120d030a89
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tex2lyx/preamble.cpp
View File

@ -550,11 +550,8 @@ void handle_package(Parser &p, string const & name, string const & opts,
// 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 @@ void handle_package(Parser &p, string const & name, string const & opts,
// 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())

2
status.20x
View File

@ -151,6 +151,8 @@ What's new
- 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).