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.
"\\newcommand{\\lyxdeleted}[3]{}\n");
static docstring const textgreek_def = from_ascii(
- "\\providecommand*{\\perispomeni}{\\char126}\n"
- "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
- " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
- " \\renewcommand{\\~}{\\perispomeni}%\n"
- "}}\n"
+ "\\DeclareRobustCommand{\\greektext}{%\n"
+ " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
- "\\DeclareFontEncoding{LGR}{}{}\n");
+ "\\DeclareFontEncoding{LGR}{}{}\n"
+ "\\DeclareTextSymbol{\\~}{LGR}{126}");
static docstring const textcyr_def = from_ascii(
"\\DeclareRobustCommand{\\cyrtext}{%\n"
// 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.builtin()) {
+ if (!fl.floattype().empty() && fl.needsFloatPkg()) {
require("float");
}
}
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("fontcolor")) {
+ colors << "\\definecolor{document_fontcolor}{rgb}{";
+ colors << outputLaTeXColor(params_.fontcolor) << "}\n";
+ // set the color
+ colors << "\\color{document_fontcolor}\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 (see lyxgreyedout_def)
+ }
+
+ // color for shaded boxes
+ if (isRequired("framed") && mustProvide("color")) {
+ colors << "\\definecolor{shadecolor}{rgb}{";
+ colors << outputLaTeXColor(params_.boxbgcolor) << "}\n";
+ // this color is automatically used by the LaTeX-package "framed"
+ }
+
return colors.str();
}
<< params_.graphicsDriver
<< "]{graphicx}\n";
}
- // shadecolor for shaded
- if (isRequired("framed") && mustProvide("color")) {
- RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
- //255.0 to force conversion to double
- //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
- //to use the xcolor package instead, and then we can do
- // \define{shadcolor}{RGB}...
- //and not do any conversion. We'd then need to require xcolor
- //in InsetNote::validate().
- int const stmSize = packages.precision(2);
- packages << "\\definecolor{shadecolor}{rgb}{"
- << c.r / 255.0 << ',' << c.g / 255.0 << ',' << c.b / 255.0 << "}\n";
- packages.precision(stmSize);
- }
-
+
// lyxskak.sty --- newer chess support based on skak.sty
if (mustProvide("chess"))
packages << "\\usepackage[ps,mover]{lyxskak}\n";
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;
fi != end; ++fi)
// FIXME UNICODE
sgmlpreamble << "\n<!ENTITY " << fi->first
- << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+ << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
<< makeRelPath(from_utf8(fi->second), basename) << "\">";
return sgmlpreamble.str();
Floating const & fl = floats.getType(cit->first);
// For builtin floats we do nothing.
- if (fl.builtin())
+ if (!fl.needsFloatPkg())
continue;
// We have to special case "table" and "figure"