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

Revert "tex2lyx/Preamble.cpp: fix bug #8525 temporarily"

Browse Source 
This reverts commit a69fcde0726450d696081ed5c21506d42a90b103.
The commit causing #8525 is [2f7f0c76/lyxgit]
This commit is contained in:
Uwe Stöhr 2013-02-11 11:56:27 +01:00
parent 036a4be387
commit 5db148d22c
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tex2lyx/Preamble.cpp
View File

@ -853,20 +853,11 @@ void Preamble::handle_package(Parser &p, string const & name,
// Therefore check for the "," character. // Therefore check for the "," character.
// It is also only set when there is not more than one babel // It is also only set when there is not more than one babel
// language option. // language option.
if (!opts.empty()) { if (opts.find(",") == string::npos && one_language == true)
if (opts.find(",") == string::npos && one_language == true) { h_inputencoding = opts;
h_inputencoding = opts; if (!options.empty())
// FIXME: if this line is used, tex2lyx swallows the next character p.setEncoding(options.back(), Encoding::inputenc);
// in the file behind "{inputenc}" options.clear();
//p.setEncoding(opts);
} else {
h_preamble << "\\usepackage[" << opts << "}{" << name << "}\n";
// FIXME: enabling this introduces bug #8525
//p.setEncoding(options.back(), Encoding::inputenc);
}
options.clear();
} else
h_preamble << "\\usepackage{" << name << "}\n";
} }
else if (name == "srcltx") { else if (name == "srcltx") {