From ffa15bc301c6d15da6c42f8fe59e977d74c5ecbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 18 Jul 2008 22:22:17 +0000 Subject: [PATCH] BufferParams.cpp: clarify the babel loading logic: treat jurabib the same as hyperref, japanese, and vietnamese git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25707 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 5cde23fc41..9c6a0e2926 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1226,11 +1226,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, texrow.newline(); } - // If we use jurabib, we have to call babel here. - if (use_babel && features.isRequired("jurabib")) { - os << from_ascii(babelCall(language_options.str())) + // If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel here. + if (use_babel + && (features.isRequired("jurabib") + || features.isRequired("hyperref") + || features.isRequired("vietnamese") + || features.isRequired("japanese") ) ) { + // FIXME UNICODE + os << from_utf8(babelCall(language_options.str())) << '\n' - << from_ascii(features.getBabelOptions()); + << from_utf8(features.getBabelOptions()); texrow.newline(); } @@ -1242,15 +1247,6 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, // Line spacing lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace"))); - // If we use hyperref or japanese or vietnamese, we have to call babel here. - if (use_babel && !features.isRequired("jurabib") - && (features.isRequired("hyperref") || features.isRequired("vietnamese") - || features.isRequired("japanese"))) { - // FIXME UNICODE - lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n'; - lyxpreamble += from_utf8(features.getBabelOptions()); - } - // PDF support. // * Hyperref manual: "Make sure it comes last of your loaded // packages, to give it a fighting chance of not being over-written, -- 2.39.2