anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/preamble.cpp: improve the fix from r31440:

Browse Source 
- when languages are given in the documentclass options _and_ the babel options, babel takes the last language option of the \usepackage call
 - there is no quote language "ngerman", it is in both cases "german"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31685 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-10-20 01:45:33 +00:00
parent d98251c379
commit d319b368c7
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tex2lyx/preamble.cpp
View File

@ -49,9 +49,6 @@ map<string, vector<string> > used_packages;
// needed to handle encodings with babel
bool one_language = true;
// to avoid that the babel options overwrite the documentclass options
bool documentclass_language = false;
namespace {
const char * const known_languages[] = { "afrikaans", "american", "arabic",
@ -140,7 +137,6 @@ string h_tracking_changes = "false";
string h_output_changes = "false";
string h_margins = "";
// returns true if at least one of the options in what has been found
bool handle_opt(vector<string> & opts, char const * const * what, string & target)
{
@ -315,12 +311,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
one_language = false;
h_inputencoding = "auto";
}
// only set the document language when there was not already one set
// via the documentclass options
// babel takes the the last language given in the documentclass options
// as document language. If there is no such language option, the last
// option of its \usepackage call is used.
if (documentclass_language == false) {
// babel takes the 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.
handle_opt(options, known_languages, h_language);
delete_opt(options, known_languages);
if (is_known(h_language, known_brazilian_languages))
@ -338,7 +331,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
else if (is_known(h_language, known_ukrainian_languages))
h_language = "ukrainian";
h_quotes_language = h_language;
}
// there is only the quotes language "german"
if (h_quotes_language == "ngerman")
h_quotes_language = "german";
}
else if (name == "fontenc")
@ -417,6 +412,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
else
h_language = name;
h_quotes_language = h_language;
// there is only the quotes language "german"
if (h_quotes_language == "ngerman")
h_quotes_language = "german";
}
else if (name == "natbib") {
@ -653,8 +651,9 @@ void parse_preamble(Parser & p, ostream & os,
string::size_type i = h_paperfontsize.find("pt");
if (i != string::npos)
h_paperfontsize.erase(i);
// to avoid that the babel options overwrite the documentclass options
documentclass_language =
// The documentclass options are always parsed before the options
// of the babel call so that a language cannot overwrite the babel
// options.
handle_opt(opts, known_languages, h_language);
delete_opt(opts, known_languages);
if (is_known(h_language, known_brazilian_languages))