]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeXFeatures.cpp
* LaTeXFeatures.cpp (getI18nPreamble):
[lyx.git] / src / LaTeXFeatures.cpp
index ac9c1ca4a4ce240f4622ab34db027f82a25b741e..39076324334b2d8f70554baef9b585c72669ad60 100644 (file)
@@ -294,20 +294,31 @@ bool LaTeXFeatures::useBabel() const
 {
        if (usePolyglossia())
                return false;
-       return (lyxrc.language_package_selection != LyXRC::LP_NONE)
-               || (bufferParams().language->lang() != lyxrc.default_language
-                   && !bufferParams().language->babel().empty())
-               || this->hasLanguages();
+       if (bufferParams().lang_package == "default")
+               return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+                       || (bufferParams().language->lang() != lyxrc.default_language
+                           && !bufferParams().language->babel().empty())
+                       || this->hasLanguages();
+       return (bufferParams().lang_package != "none")
+               || (bufferParams().language->lang() != lyxrc.default_language
+                   && !bufferParams().language->babel().empty())
+               || this->hasLanguages();
 }
 
 
 bool LaTeXFeatures::usePolyglossia() const
 {
-       return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
-               && isRequired("polyglossia")
-               && isAvailable("polyglossia")
-               && !params_.documentClass().provides("babel")
-               && this->hasPolyglossiaLanguages();
+       if (bufferParams().lang_package == "default")
+               return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+                       && isRequired("polyglossia")
+                       && isAvailable("polyglossia")
+                       && !params_.documentClass().provides("babel")
+                       && this->hasPolyglossiaLanguages();
+       return (bufferParams().lang_package == "auto")
+               && isRequired("polyglossia")
+               && isAvailable("polyglossia")
+               && !params_.documentClass().provides("babel")
+               && this->hasPolyglossiaLanguages();
 }
 
 
@@ -1186,26 +1197,31 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_po
                UsedFloats::const_iterator fend = usedFloats_.end();
                for (; fit != fend; ++fit) {
                        Floating const & fl = floats.getType(fit->first);
+                       // we assume builtin floats are translated 
+                       if (fl.isPredefined())
+                               continue;
                        docstring const type = from_ascii(fl.floattype());
                        docstring const flname = from_utf8(fl.name());
                        docstring name = translateIfPossible(flname,
                                buffer().language()->code());
-                       if (use_polyglossia)
+                       // only request translation if we have a real translation
+                       // (that differs from the source)
+                       if (use_polyglossia && flname != name)
                                snippets.insert(getFloatI18nPreamble(
                                        type, name,
                                        from_ascii(buffer().language()->polyglossia())));
-                       else
+                       else if (flname != name)
                                snippets.insert(getFloatI18nPreamble(
                                        type, name,
                                        from_ascii(buffer().language()->babel())));
                        for (lang_it lit = lbeg; lit != lend; ++lit) {
                                name = translateIfPossible(flname,
                                        (*lit)->code());
-                               if (use_polyglossia)
+                               if (use_polyglossia && flname != name)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                from_ascii((*lit)->polyglossia())));
-                               else
+                               else if (flname != name)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                from_ascii((*lit)->babel())));