Lars Gullik Bjønnes wrote:
> | // color.sty
> | if (isRequired("color")) {
> | - if (params_.graphicsDriver == "default")
> | - packages << "\\usepackage[usenames]{color}\n";
> | - else
> | - packages << "\\usepackage["
> | + if (params_.graphicsDriver != "default")
> | + packages << "\\PassOptionsToPackage{"
> | << params_.graphicsDriver
> | - << ",usenames"
> | - << "]{color}\n";
> | + << "}{color}\n";
> | + packages << "\\usepackage{color}\n";
> | }
>
> This one I am a bit more wary about. I am absolutely not certain that
> this won't have unforseen consequences.
> IMHO this should be held for later releases.
OK, but to resolve the bug we need at least the attached. Note that "usenames"
has been introduced *only* for dvipost (we didn't use it in 1.3).
(also note that this version is likely to still cause conflicts, e.g. for
beamer and non-standard ps driver, but that's no regression).
> | +\TestPackage{bibtopic}
> | +\TestPackage{jurabib}
>
> Are these already mentioned in LaTeXConfig? Or is it not needed?
They are already mentioned. Apparently, I forgot to add the above entries when
I did the entries in LaTeXConfig.
> | \TestPackage{dvipost}
> |
> | % The test for the graphics package is slightly more involved...
> | Index: lib/doc/LaTeXConfig.lyx.in
> | ===================================================================
> | RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/LaTeXConfig.lyx.in,v
> | retrieving revision 1.43
> | diff -u -r1.43 LaTeXConfig.lyx.in
> | --- lib/doc/LaTeXConfig.lyx.in 25 Oct 2005 08:58:07 -0000 1.43
> | +++ lib/doc/LaTeXConfig.lyx.in 26 Jan 2006 09:14:11 -0000
> | @@ -2073,54 +2073,6 @@
>
> The added section on dvipost is good.
> Get OK from J-M before removing the others from the doc.
OK.
> (I would have preferred two different patches for this)
Next time.
Jürgen
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.630
diff -p -u -r1.630 buffer.C
--- src/buffer.C 29 Nov 2005 15:08:34 -0000 1.630
+++ src/buffer.C 26 Jan 2006 09:46:55 -0000
@@ -1157,10 +1157,8 @@ void Buffer::validate(LaTeXFeatures & fe
LyXTextClass const & tclass = params().getLyXTextClass();
if (features.isAvailable("dvipost") && params().tracking_changes
- && params().output_changes) {
+ && params().output_changes)
features.require("dvipost");
- features.require("color");
- }
// AMS Style is at document level
if (params().use_amsmath == BufferParams::AMS_ON
Index: src/LaTeXFeatures.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeXFeatures.C,v
retrieving revision 1.119
diff -p -u -r1.119 LaTeXFeatures.C
--- src/LaTeXFeatures.C 11 Jun 2005 11:02:22 -0000 1.119
+++ src/LaTeXFeatures.C 26 Jan 2006 09:46:56 -0000
@@ -282,11 +282,10 @@ string const LaTeXFeatures::getPackages(
// color.sty
if (isRequired("color")) {
if (params_.graphicsDriver == "default")
- packages << "\\usepackage[usenames]{color}\n";
+ packages << "\\usepackage{color}\n";
else
packages << "\\usepackage["
<< params_.graphicsDriver
- << ",usenames"
<< "]{color}\n";
}
