Am Freitag, 10. Juni 2005 16:39 schrieb Jean-Marc Lasgouttes:
> >>>>> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
>
> >> I'd prefer a solution that works always...
>
> Georg> Me too, but that is unfortunately impossible :-(
>
> And what about loading wasysym package _after_ amsmath? It seems to
> work here.
Here too. Obviously I did not think enough ;-(
I am going to apply the attached patch to 1.4 and 1.3. We could still
decide to change the font of \iint and \iiint, but since I see no reason
to prefer wasysym or amsmath I am leaving it alone.
Georg
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/ChangeLog lyx-1.4-cvs/src/ChangeLog
--- lyx-1.4-clean/src/ChangeLog 2005-06-10 18:46:15.000000000 +0200
+++ lyx-1.4-cvs/src/ChangeLog 2005-06-11 12:27:23.000000000 +0200
@@ -1,15 +1,19 @@
+2005-06-11 Georg Baum <[EMAIL PROTECTED]>
+
+ * LaTeXFeatures.C (getPackages): solve amsmath-wasysym conflict
+
2005-06-09 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
- * 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 -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/LaTeXFeatures.C lyx-1.4-cvs/src/LaTeXFeatures.C
--- lyx-1.4-clean/src/LaTeXFeatures.C 2005-04-26 17:36:21.000000000 +0200
+++ lyx-1.4-cvs/src/LaTeXFeatures.C 2005-06-11 12:10:22.000000000 +0200
@@ -233,6 +233,7 @@ char const * simplefeatures[] = {
"varioref",
"prettyref",
"float",
- "wasysym",
"dvipost",
"fancybox",
"calc",
@@ -271,6 +283,11 @@ string const LaTeXFeatures::getPackages(
&& params_.use_amsmath != BufferParams::AMS_OFF) {
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")) {
