fix bug 1905 (amsmath-wasysym conflict)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10049 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d231eb77db3b4a1f53e8f24b55ae8c42d6b17cb..7eb5de690d0d3ad076fdab93d2245c825d70c74f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,15 +1,19 @@
+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) 
+       * rowpainter.C (paintInset, paintHebrewComposeChar)
        (paintArabicComposeChar, paintChars): add a LyXFont argument.
        (paintChars): use getFontSpan to reduce calls to getFont to a
        minimum; use Paragraph::lookupChange instead of isXXXText.
        (paintForeignMark): rename LyXFont argument.
        (paintFromPos): pass a LyXFont object to the various paintXXX
-       methods. 
+       methods.
 
        * FontIterator.C (FontIterator, operator++): use
-       Paragraph::getFontSpan 
+       Paragraph::getFontSpan
 
        * paragraph.C (getFontSpan): replace getEndOfFontSpan with a
        version that returns the font span as a pair.

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 144f98a2891906b483a8a1f7da55d24f31649184..4bf391479ceca3ff925df5f4ccfac540e6341df6 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -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")