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.
static docstring const changetracking_xcolor_ulem_def = from_ascii(
"%% Change tracking with ulem\n"
- "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
+ "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n");
static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii(
"%% Change tracking with ulem\n"
- "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}}{}#3}}\n"
+ "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n");
static docstring const changetracking_none_def = from_ascii(
"\\newcommand{\\lyxdeleted}[3]{}\n");
static docstring const textgreek_def = from_ascii(
- "\\DeclareRobustCommand{\\greektext}{%\n"
- " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
+ "\\providecommand*{\\perispomeni}{\\char126}\n"
+ "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
+ " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
+ " \\renewcommand{\\~}{\\perispomeni}%\n"
+ "}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
"\\DeclareFontEncoding{LGR}{}{}\n");
// 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");
}
}
"bm",
"pdfpages",
"amscd",
- "slashed"
+ "slashed",
+ "multirow"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char 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();
}
// the document does not contain integrals (then isRequired("esint")
// is false) or if esint is used, since esint redefines all relevant
// integral symbols from wasysym and amsmath.
- // See http://bugzilla.lyx.org/show_bug.cgi?id=1942
+ // See http://www.lyx.org/trac/ticket/1942
if (mustProvide("wasysym") &&
(params_.use_esint != BufferParams::package_off || !isRequired("esint")))
packages << "\\usepackage{wasysym}\n";
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
- if (mustProvide("mhchem"))
+ if (mustProvide("mhchem") &&
+ params_.use_mhchem != BufferParams::package_off)
packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
"\\usepackage{mhchem}\n";
}
+string LaTeXFeatures::getPreambleSnippets() const
+{
+ ostringstream snip;
+ SnippetList::const_iterator pit = preamble_snippets_.begin();
+ SnippetList::const_iterator pend = preamble_snippets_.end();
+ for (; pit != pend; ++pit)
+ snip << *pit << '\n';
+ return snip.str();
+}
+
+
docstring const LaTeXFeatures::getMacros() const
{
odocstringstream macros;
- if (!preamble_snippets_.empty())
+ if (!preamble_snippets_.empty()) {
macros << '\n';
- SnippetList::const_iterator pit = preamble_snippets_.begin();
- SnippetList::const_iterator pend = preamble_snippets_.end();
- for (; pit != pend; ++pit)
- macros << *pit << '\n';
+ macros << from_utf8(getPreambleSnippets());
+ }
- if (mustProvide("papersize")) {
+ if (mustProvide("papersize")) {
if (runparams_.flavor == OutputParams::LATEX)
macros << papersizedvi_def << '\n';
else
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
- if (mustProvide("textgreek"))
- macros << textgreek_def << '\n';
+ if (mustProvide("textgreek")) {
+ // Avoid a LaTeX error if times fonts are used and the grtimes
+ // package is installed but actual fonts are not (bug 6469).
+ if (params_.fontsRoman == "times")
+ macros << subst(textgreek_def,
+ from_ascii("\\greektext #1"),
+ from_ascii("%\n \\IfFileExists"
+ "{grtm10.tfm}{}{\\fontfamily"
+ "{cmr}}\\greektext #1"))
+ << '\n';
+ else
+ macros << textgreek_def << '\n';
+ }
if (mustProvide("textcyr"))
macros << textcyr_def << '\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;
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());
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()) {
} 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());
// effect. (Lgb)
}
if (cit->second)
- os << "\n\\newsubfloat{" << from_ascii(fl.type()) << "}\n";
+ os << "\n\\newsubfloat{" << from_ascii(fl.floattype()) << "}\n";
}
}
projects / lyx.git / blobdiff