HTML for stackrel.

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 1629186280413fe8ba5d87bcd18f183f107ed095..8f78e02d1ab0ce1c9ff00195dbc25d5d9d8a9b0c 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -160,7 +160,7 @@ static docstring const tabularnewline_def = from_ascii(
        
 static docstring const lyxgreyedout_def = from_ascii(
        "%% The greyedout annotation environment\n"
-       "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n");
+       "\\newenvironment{lyxgreyedout}{\\textcolor{note_fontcolor}\\bgroup}{\\egroup}\n");
 
 // We want to omit the file extension for includegraphics, but this does not
 // work when the filename contains other dots.
@@ -432,7 +432,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.type().empty() && !fl.builtin()) {
+       if (!fl.floattype().empty() && fl.needsFloatPkg()) {
                require("float");
        }
 }
@@ -546,7 +546,8 @@ char const * simplefeatures[] = {
        "bm",
        "pdfpages",
        "amscd",
-       "slashed"
+       "slashed",
+       "multirow"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -579,16 +580,23 @@ string const LaTeXFeatures::getColorOptions() const
        if (mustProvide("pdfcolmk"))
                colors << "\\usepackage{pdfcolmk}\n";
 
+       // the following 3 color commands must be set after color
+       // is loaded and before pdfpages, therefore add the command
+       // here define the set color
        if (mustProvide("pagecolor")) {
-               // the \pagecolor command must be set after color is loaded and
-               // before pdfpages, therefore add the command here
-               // define the set color
                colors << "\\definecolor{page_backgroundcolor}{rgb}{";
                colors << outputLaTeXColor(params_.backgroundcolor) << "}\n";
                // set the page color
                colors << "\\pagecolor{page_backgroundcolor}\n";
        }
 
+       if (mustProvide("lyxgreyedout")) {
+               colors << "\\definecolor{note_fontcolor}{rgb}{";
+               colors << outputLaTeXColor(params_.notefontcolor) << "}\n";
+               // the color will be set together with the definition of
+               // the lyxgreyedout environment (lyxgreyedout_def)
+       }
+
        return colors.str();
 }
 
@@ -884,7 +892,9 @@ docstring const LaTeXFeatures::getMacros() const
        if (mustProvide("NeedTabularnewline"))
                macros << tabularnewline_def;
 
-       // greyedout environment (note inset)
+       // greyed-out environment (note inset)
+       // the color is specified in the routine
+       // getColorOptions() to avoid LaTeX-package clashes
        if (mustProvide("lyxgreyedout"))
                macros << lyxgreyedout_def;
 
@@ -1054,7 +1064,7 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const
                UsedFloats::const_iterator fend = usedFloats_.end();
                for (; fit != fend; ++fit) {
                        Floating const & fl = floats.getType(fit->first);
-                       docstring const type = from_ascii(fl.type());
+                       docstring const type = from_ascii(fl.floattype());
                        docstring const flname = from_utf8(fl.name());
                        docstring name = translateIfPossible(flname,
                                buffer().language()->code());
@@ -1155,15 +1165,16 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                Floating const & fl = floats.getType(cit->first);
 
                // For builtin floats we do nothing.
-               if (fl.builtin()) continue;
+               if (!fl.needsFloatPkg()) 
+                       continue;
 
                // We have to special case "table" and "figure"
-               if (fl.type() == "tabular" || fl.type() == "figure") {
+               if (fl.floattype() == "tabular" || fl.floattype() == "figure") {
                        // Output code to modify "table" or "figure"
                        // but only if builtin == false
                        // and that have to be true at this point in the
                        // function.
-                       docstring const type = from_ascii(fl.type());
+                       docstring const type = from_ascii(fl.floattype());
                        docstring const placement = from_ascii(fl.placement());
                        docstring const style = from_ascii(fl.style());
                        if (!style.empty()) {
@@ -1177,7 +1188,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                } else {
                        // The other non builtin floats.
 
-                       docstring const type = from_ascii(fl.type());
+                       docstring const type = from_ascii(fl.floattype());
                        docstring const placement = from_ascii(fl.placement());
                        docstring const ext = from_ascii(fl.ext());
                        docstring const within = from_ascii(fl.within());
@@ -1202,7 +1213,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
                        // effect. (Lgb)
                }
                if (cit->second)
-                       os << "\n\\newsubfloat{" << from_ascii(fl.type()) << "}\n";
+                       os << "\n\\newsubfloat{" << from_ascii(fl.floattype()) << "}\n";
        }
 }