mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
* src/LaTeXFeatures.cpp:
- load xcolor.sty the same way than color.sty, and only load one of them (xcolor, if requested, else color). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22548 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c81f5add99
commit
59c8ede0a3
@ -521,7 +521,6 @@ char const * simplefeatures[] = {
|
||||
"framed",
|
||||
"soul",
|
||||
"textcomp",
|
||||
"xcolor",
|
||||
"pmboxdraw",
|
||||
"bbding",
|
||||
"ifsym",
|
||||
@ -589,14 +588,16 @@ string const LaTeXFeatures::getPackages() const
|
||||
(params_.use_esint != BufferParams::package_off || !isRequired("esint")))
|
||||
packages << "\\usepackage{wasysym}\n";
|
||||
|
||||
// color.sty
|
||||
if (mustProvide("color")) {
|
||||
// [x]color.sty
|
||||
if (mustProvide("color") || mustProvide("xcolor")) {
|
||||
string const package =
|
||||
(mustProvide("xcolor") ? "xcolor" : "color");
|
||||
if (params_.graphicsDriver == "default")
|
||||
packages << "\\usepackage{color}\n";
|
||||
packages << "\\usepackage{" << package << "}\n";
|
||||
else
|
||||
packages << "\\usepackage["
|
||||
<< params_.graphicsDriver
|
||||
<< "]{color}\n";
|
||||
<< "]{" << package << "}\n";
|
||||
}
|
||||
|
||||
// pdfcolmk must be loaded after color
|
||||
|
Loading…
Reference in New Issue
Block a user