BufferParams.h: add comment

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 5902106485c5ee7bdbb10fe8a822bf0032954064..888c62da9c024fe390196719c972b6e2c62e5639 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -191,7 +191,8 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 bool LaTeXFeatures::useBabel() const
 {
        return lyxrc.language_use_babel ||
-               bufferParams().language->lang() != lyxrc.default_language ||
+               (bufferParams().language->lang() != lyxrc.default_language &&
+                !bufferParams().language->babel().empty()) ||
                this->hasLanguages();
 }
 
@@ -322,7 +323,8 @@ void LaTeXFeatures::useFloat(string const & name)
 
 void LaTeXFeatures::useLanguage(Language const * lang)
 {
-       UsedLanguages_.insert(lang);
+       if (!lang->babel().empty())
+               UsedLanguages_.insert(lang);
 }
 
 
@@ -342,26 +344,29 @@ string LaTeXFeatures::getLanguages() const
 {
        ostringstream languages;
 
-       for (LanguageList::const_iterator cit =
-                   UsedLanguages_.begin();
+       LanguageList::const_iterator const begin = UsedLanguages_.begin();
+       for (LanguageList::const_iterator cit = begin;
             cit != UsedLanguages_.end();
-            ++cit)
-               languages << (*cit)->babel() << ',';
+            ++cit) {
+               if (cit != begin)
+                       languages << ',';
+               languages << (*cit)->babel();
+       }
        return languages.str();
 }
 
 
 set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
+       // This does only find encodings of languages supported by babel, but
+       // that does not matter since we don't have a language with an
+       // encoding supported by inputenc but without babel support.
        set<string> encodings;
        LanguageList::const_iterator it  = UsedLanguages_.begin();
        LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
-               // thailatex does not use the inputenc package, but sets up
-               // babel directly for tis620-0 encoding, therefore we must
-               // not add tis620-0 to the encoding set.
                if ((*it)->encoding()->latexName() != doc_encoding &&
-                   (*it)->encoding()->name() != "tis620-0")
+                   (*it)->encoding()->package() == Encoding::inputenc)
                        encodings.insert((*it)->encoding()->latexName());
        return encodings;
 }