* sk.po

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 090a1d84d70328e58d753c86305f3c4cb6da23e0..7ac0734ab60f879f1f23da2fe018319524bff36d 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -163,7 +163,9 @@ static docstring const tabularnewline_def = from_ascii(
        
 static docstring const lyxgreyedout_def = from_ascii(
        "%% The greyedout annotation environment\n"
-       "\\newenvironment{lyxgreyedout}{\\textcolor{note_fontcolor}\\bgroup}{\\egroup}\n");
+       "\\newenvironment{lyxgreyedout}\n"
+       "  {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+       "  {\\ignorespacesafterend\\egroup}\n");
 
 // We want to omit the file extension for includegraphics, but this does not
 // work when the filename contains other dots.
@@ -292,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();
 }
 
 
@@ -457,7 +470,7 @@ void LaTeXFeatures::useFloat(string const & name, bool subfloat)
        // use the "H" modifier. This includes modified table and
        // figure floats. (Lgb)
        Floating const & fl = params_.documentClass().floats().getType(name);
-       if (!fl.floattype().empty() && fl.needsFloatPkg()) {
+       if (!fl.floattype().empty() && fl.usesFloatPkg()) {
                require("float");
        }
 }
@@ -1295,7 +1308,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                Floating const & fl = floats.getType(cit->first);
 
                // For builtin floats we do nothing.
-               if (!fl.needsFloatPkg()) 
+               if (fl.isPredefined())
                        continue;
 
                // We have to special case "table" and "figure"