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

tex2lyx: fix for documents using Latvian, Lithuanian, Mongolian, Turkmen and/or Vietnamese fixes bug #7862

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40064 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-29 19:32:09 +00:00
parent 019f8415f3
commit 709e428fad
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tex2lyx/preamble.cpp
View File

@ -63,7 +63,6 @@ namespace {
//"chinese-simplified", "chinese-traditional", "japanese", "korean"
// Both changes require first that support for non-babel languages (CJK,
// armtex) is added.
// add turkmen for lyxformat 383
/**
* known babel language names (including synonyms)
* not in standard babel: arabic, arabtex, armenian, belarusian, serbian-latin, thai
@ -557,7 +556,6 @@ void handle_package(Parser &p, string const & name, string const & opts,
// babel call in every roundtrip.
// But the user could have defined babel-specific things afterwards. So
// we need to keep it in the preamble to prevent cases like bug #7861.
h_preamble << "\\usepackage{babel}\n";
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
@ -569,8 +567,17 @@ void handle_package(Parser &p, string const & name, string const & opts,
// 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);
// If babel is called with options, LyX puts them by default into the
// document class options. This works for most languages, except
// for Latvian, Lithuanian, Mongolian, Turkmen and Vietnamese and
// perhaps in future others.
// Therefore keep the babel call as it is as the user might have
// reasons for it.
h_preamble << "\\usepackage[" << opts << "]{babel}\n";
delete_opt(options, known_languages);
}
else
h_preamble << "\\usepackage{babel}\n";
}
else if (name == "fontenc") {