Fairly trivial change here: Just protect against inheriting limits to

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index bcbe4f027874225f4c12551a5ead4dce26fd1e5f..61bd0a7a03da8ae4b5e004bb1049b65065e32a63 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -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,37 @@ 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)
+                       docstring name = buffer().language()->translateLayout(fl.name());
+                       // 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)
+                               string const code = (*lit)->code();
+                               name = (*lit)->translateLayout(fl.name());
+                               // we assume we have a suitable translation if
+                               // either the language is English (we need to
+                               // translate into English if English is a secondary
+                               // language) or if translateIfPossible returns
+                               // something different to the English source.
+                               bool const have_translation =
+                                       (flname != name || contains(code, "en"));
+                               if (use_polyglossia && have_translation)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                from_ascii((*lit)->polyglossia())));
-                               else
+                               else if (have_translation)
                                        snippets.insert(getFloatI18nPreamble(
                                                type, name,
                                                from_ascii((*lit)->babel())));
@@ -1297,7 +1319,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                Floating const & fl = floats.getType(cit->first);
 
                // For builtin floats we do nothing.
-               if (!fl.usesFloatPkg())
+               if (fl.isPredefined())
                        continue;
 
                // We have to special case "table" and "figure"
@@ -1325,9 +1347,8 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                        docstring const ext = from_ascii(fl.ext());
                        docstring const within = from_ascii(fl.within());
                        docstring const style = from_ascii(fl.style());
-                       docstring const name = translateIfPossible(
-                                       from_utf8(fl.name()),
-                                       buffer().language()->code());
+                       docstring const name =
+                               buffer().language()->translateLayout(fl.name());
                        os << "\\floatstyle{" << style << "}\n"
                           << "\\newfloat{" << type << "}{" << placement
                           << "}{" << ext << '}';