The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 33c8906f70920540ebde1f97d7007b64d5591cbe
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Aug 7 07:59:18 2012 +0200
Decouple lyxrc.default_language from useBabel()
No status entry necessary
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 3f7226f..d425977 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -297,7 +297,7 @@ bool LaTeXFeatures::useBabel() const
&& lyxrc.language_package_selection == LyXRC::LP_NONE))
return false;
- return (bufferParams().language->lang() != lyxrc.default_language
+ return (bufferParams().language->lang() != "english"
&& !bufferParams().language->babel().empty())
|| this->hasLanguages();
}
diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index e36ef43..5feebd3 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -119,9 +119,9 @@ public:
void setBuffer(Buffer const &);
///
BufferParams const & bufferParams() const;
- /// the return value is dependent upon both LyXRC and LaTeXFeatures.
+ /// Do we use Babel?
bool useBabel() const;
- ///
+ /// Do we use Polyglossia?
bool usePolyglossia() const;
/// are we in a float?
bool inFloat() const { return in_float_; }
-----------------------------------------------------------------------
Summary of changes:
src/LaTeXFeatures.cpp | 2 +-
src/LaTeXFeatures.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
