anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

preamble.cpp: set correct quotes language (currently an Italian document gets the non-existing quotes language "italian")

Browse Source 
- also to branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32448 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-12-10 02:41:33 +00:00
parent d04377a231
commit 64ede202fa
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/tex2lyx/preamble.cpp
View File

@ -318,22 +318,27 @@ void handle_package(Parser &p, string const & name, string const & opts,
delete_opt(options, known_languages); delete_opt(options, known_languages);
if (is_known(h_language, known_brazilian_languages)) if (is_known(h_language, known_brazilian_languages))
h_language = "brazilian"; h_language = "brazilian";
else if (is_known(h_language, known_french_languages)) else if (is_known(h_language, known_french_languages)) {
h_language = "french"; h_language = "french";
else if (is_known(h_language, known_german_languages)) h_quotes_language = "french";
} else if (is_known(h_language, known_german_languages)) {
h_language = "german"; h_language = "german";
else if (is_known(h_language, known_ngerman_languages)) h_quotes_language = "german";
} else if (is_known(h_language, known_ngerman_languages)) {
h_language = "ngerman"; h_language = "ngerman";
else if (is_known(h_language, known_portuguese_languages)) h_quotes_language = "german";
} else if (is_known(h_language, known_portuguese_languages))
h_language = "portuguese"; h_language = "portuguese";
else if (is_known(h_language, known_russian_languages)) else if (is_known(h_language, known_russian_languages))
h_language = "russian"; h_language = "russian";
else if (is_known(h_language, known_ukrainian_languages)) else if (is_known(h_language, known_ukrainian_languages))
h_language = "ukrainian"; h_language = "ukrainian";
// LyX only knows the following quotes languages:
// english, swedish, german, polish, french and danish
// french and german are already handled, english is the default
if (h_language == "swedish" || h_language == "polish"
|| h_language == "danish")
h_quotes_language = h_language; 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") else if (name == "fontenc")
@ -397,26 +402,29 @@ void handle_package(Parser &p, string const & name, string const & opts,
// command. This command is handled below. // command. This command is handled below.
else if (is_known(name, known_languages)) { else if (is_known(name, known_languages)) {
if (is_known(h_language, known_brazilian_languages)) if (is_known(name, known_brazilian_languages))
h_language = "brazilian"; h_language = "brazilian";
else if (is_known(name, known_french_languages)) else if (is_known(name, known_french_languages))
h_language = "french"; h_language = "french";
else if (is_known(name, known_german_languages)) h_quotes_language = "french";
} else if (is_known(name, known_german_languages)) {
h_language = "german"; h_language = "german";
else if (is_known(name, known_ngerman_languages)) h_quotes_language = "german";
} else if (is_known(name, known_ngerman_languages)) {
h_language = "ngerman"; h_language = "ngerman";
else if (is_known(h_language, known_portuguese_languages)) h_quotes_language = "german";
} else if (is_known(name, known_portuguese_languages))
h_language = "portuguese"; h_language = "portuguese";
else if (is_known(name, known_russian_languages)) else if (is_known(name, known_russian_languages))
h_language = "russian"; h_language = "russian";
else if (is_known(name, known_ukrainian_languages)) else if (is_known(name, known_ukrainian_languages))
h_language = "ukrainian"; h_language = "ukrainian";
else // LyX only knows the following quotes languages:
h_language = name; // english, swedish, german, polish, french and danish
h_quotes_language = h_language; // french and german are already handled, english is the default
// there is only the quotes language "german" if (name == "swedish" || name == "polish"
if (h_quotes_language == "ngerman") || name == "danish")
h_quotes_language = "german"; h_quotes_language = name;
} }
else if (name == "natbib") { else if (name == "natbib") {
@ -660,18 +668,26 @@ void parse_preamble(Parser & p, ostream & os,
delete_opt(opts, known_languages); delete_opt(opts, known_languages);
if (is_known(h_language, known_brazilian_languages)) if (is_known(h_language, known_brazilian_languages))
h_language = "brazilian"; h_language = "brazilian";
else if (is_known(h_language, known_french_languages)) else if (is_known(h_language, known_french_languages)) {
h_language = "french"; h_language = "french";
else if (is_known(h_language, known_german_languages)) h_quotes_language = "french";
} else if (is_known(h_language, known_german_languages)) {
h_language = "german"; h_language = "german";
else if (is_known(h_language, known_ngerman_languages)) h_quotes_language = "german";
} else if (is_known(h_language, known_ngerman_languages)) {
h_language = "ngerman"; h_language = "ngerman";
else if (is_known(h_language, known_portuguese_languages)) h_quotes_language = "german";
} else if (is_known(h_language, known_portuguese_languages))
h_language = "portuguese"; h_language = "portuguese";
else if (is_known(h_language, known_russian_languages)) else if (is_known(h_language, known_russian_languages))
h_language = "russian"; h_language = "russian";
else if (is_known(h_language, known_ukrainian_languages)) else if (is_known(h_language, known_ukrainian_languages))
h_language = "ukrainian"; h_language = "ukrainian";
// LyX only knows the following quotes languages:
// english, swedish, german, polish, french and danish
// french and german are already handled, english is the default
if (h_language == "swedish" || h_language == "polish"
|| h_language == "danish")
h_quotes_language = h_language; h_quotes_language = h_language;
// paper orientation // paper orientation
if ((it = find(opts.begin(), opts.end(), "landscape")) != opts.end()) { if ((it = find(opts.begin(), opts.end(), "landscape")) != opts.end()) {