fix bug 1905 (amsmath-wasysym conflict)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10049 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-06-11 11:02:22 +00:00
parent dfa2f5b999
commit c2ac48e442
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2005-06-11 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* LaTeXFeatures.C (getPackages): solve amsmath-wasysym conflict
2005-06-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* rowpainter.C (paintInset, paintHebrewComposeChar)

View File

@ -238,7 +238,6 @@ char const * simplefeatures[] = {
"varioref",
"prettyref",
"float",
"wasysym",
"dvipost",
"fancybox",
"calc",
@ -275,6 +274,11 @@ string const LaTeXFeatures::getPackages() const
packages << "\\usepackage{amsmath}\n";
}
// wasysym is a simple feature, but it must be after amsmath if both
// are used
if (isRequired("wasysym"))
packages << "\\usepackage{wasysym}\n";
// color.sty
if (isRequired("color")) {
if (params_.graphicsDriver == "default")