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

Load babel with English-only documents (bug 8423)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-12-23 11:34:38 +01:00
parent 25e4bf4b27
commit 0dd741e4da
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Font.cpp
View File

@ -707,7 +707,7 @@ void Font::validate(LaTeXFeatures & features) const
// FIXME: Do something for background and soul package? // FIXME: Do something for background and soul package?
if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia()) if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
|| (features.useBabel(true) && lang_->babel() != doc_language->babel())) || (features.useBabel() && lang_->babel() != doc_language->babel()))
&& lang_ != ignore_language && lang_ != ignore_language
&& lang_ != latex_language) && lang_ != latex_language)
{ {

8
src/LaTeXFeatures.cpp
View File

@ -327,7 +327,7 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
{} {}
LaTeXFeatures::LangPackage LaTeXFeatures::langPackage(bool englishbabel) const LaTeXFeatures::LangPackage LaTeXFeatures::langPackage() const
{ {
string const local_lp = bufferParams().lang_package; string const local_lp = bufferParams().lang_package;
@ -347,9 +347,6 @@ LaTeXFeatures::LangPackage LaTeXFeatures::langPackage(bool englishbabel) const
* If babel is selected (either directly or via the "auto" * If babel is selected (either directly or via the "auto"
* mechanism), we really do only require it if we have * mechanism), we really do only require it if we have
* a language that needs it. * a language that needs it.
* English alone normally does not require babel (since it is
* the default language of LaTeX). However, in some cases we
* need to surpass this exception (see Font::validate).
*/ */
bool const polyglossia_required = bool const polyglossia_required =
isRequired("polyglossia") isRequired("polyglossia")
@ -357,8 +354,7 @@ LaTeXFeatures::LangPackage LaTeXFeatures::langPackage(bool englishbabel) const
&& !isProvided("babel") && !isProvided("babel")
&& this->hasOnlyPolyglossiaLanguages(); && this->hasOnlyPolyglossiaLanguages();
bool const babel_required = bool const babel_required =
((englishbabel || bufferParams().language->lang() != "english") !bufferParams().language->babel().empty()
&& !bufferParams().language->babel().empty())
|| !this->getBabelLanguages().empty(); || !this->getBabelLanguages().empty();
if (local_lp == "auto") { if (local_lp == "auto") {

4
src/LaTeXFeatures.h
View File

@ -138,9 +138,9 @@ public:
/** Which language package do we require? \p englishbabel determines /** Which language package do we require? \p englishbabel determines
* if we require babel even if English is the only language. * if we require babel even if English is the only language.
*/ */
LangPackage langPackage(bool englishbabel = false) const; LangPackage langPackage() const;
/// Convenience function to test if we use babel /// Convenience function to test if we use babel
bool useBabel(bool englishbabel = false) const { return langPackage(englishbabel) == LANG_PACK_BABEL; } bool useBabel() const { return langPackage() == LANG_PACK_BABEL; }
/// Convenience function to test if we use polyglossia /// Convenience function to test if we use polyglossia
bool usePolyglossia() const { return langPackage() == LANG_PACK_POLYGLOSSIA; } bool usePolyglossia() const { return langPackage() == LANG_PACK_POLYGLOSSIA; }
/// are we in a float? /// are we in a float?