anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/LaTeXFeatures.cpp:

Browse Source 
- 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:
Jürgen Spitzmüller 2008-01-14 10:08:08 +00:00
parent c81f5add99
commit 59c8ede0a3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/LaTeXFeatures.cpp
View File

@ -521,7 +521,6 @@ char const * simplefeatures[] = {
"framed", "framed",
"soul", "soul",
"textcomp", "textcomp",
"xcolor",
"pmboxdraw", "pmboxdraw",
"bbding", "bbding",
"ifsym", "ifsym",
@ -589,14 +588,16 @@ string const LaTeXFeatures::getPackages() const
(params_.use_esint != BufferParams::package_off || !isRequired("esint"))) (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
packages << "\\usepackage{wasysym}\n"; packages << "\\usepackage{wasysym}\n";
// color.sty // [x]color.sty
if (mustProvide("color")) { if (mustProvide("color") || mustProvide("xcolor")) {
string const package =
(mustProvide("xcolor") ? "xcolor" : "color");
if (params_.graphicsDriver == "default") if (params_.graphicsDriver == "default")
packages << "\\usepackage{color}\n"; packages << "\\usepackage{" << package << "}\n";
else else
packages << "\\usepackage[" packages << "\\usepackage["
<< params_.graphicsDriver << params_.graphicsDriver
<< "]{color}\n"; << "]{" << package << "}\n";
} }
// pdfcolmk must be loaded after color // pdfcolmk must be loaded after color