From 709e428fadb73504b8ff5245b290fbf387f8fe33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 29 Oct 2011 19:32:09 +0000 Subject: [PATCH] tex2lyx: fix for documents using Latvian, Lithuanian, Mongolian, Turkmen and/or Vietnamese fixes bug #7862 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40064 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/preamble.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 4ff4e04a94..e926e0519a 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -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") { -- 2.39.2