anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve beamer/color conflict (bug 2169)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10778 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-01-26 10:37:33 +00:00
parent 1e62f8f399
commit cf9e9c930a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-26 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* buffer.C: change tracking (dvipost) doesn't require
color.sty anymore.
* LaTeXFeatures.C (getPackages): no need for the color
option "usenames" (bug 2169).
2006-01-23 Helge Hafting <helge.hafting@aitel.hist.no>
* buffer_funcs.C: Trivial fix - added {} around
the statements to be affected by a if-test. Now

3
src/LaTeXFeatures.C
View File

@ -282,11 +282,10 @@ string const LaTeXFeatures::getPackages() const
// 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";
}

4
src/buffer.C
View File

@ -1157,10 +1157,8 @@ void Buffer::validate(LaTeXFeatures & features) const
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