Help avoiding shortcut clashes by discriminating strings.

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 090a1d84d70328e58d753c86305f3c4cb6da23e0..ac9c1ca4a4ce240f4622ab34db027f82a25b741e 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.
@@ -457,7 +459,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 +1297,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"