Bug 3878 http://bugzilla.lyx.org/show_bug.cgi?id=3878 prevents the Userguide from beeing compiled, so I tried to fix this quickly.

The attahed patch fixes this bug but reintroduce bug 1942 http://bugzilla.lyx.org/show_bug.cgi?id=1942 because the patch for bug 1942 is incorrect. The correct fix would be not to use the wasy symbols for \iint and \iiint. Could anybody help me how to do this because I've never worked on the math code of LyX yet.

thanks and regards
Uwe
Index: LaTeXFeatures.cpp
===================================================================
--- LaTeXFeatures.cpp	(revision 18805)
+++ LaTeXFeatures.cpp	(working copy)
@@ -431,37 +431,27 @@
 	ostringstream packages;
 	TextClass const & tclass = params_.getTextClass();
 
+	// some packages redefine amsmath commands e.g. waswasym redefines \iint,
+	// therefore amsmath must be the first loaded package
+	// see http://bugzilla.lyx.org/show_bug.cgi?id=3878
+	if (mustProvide("amsmath")
+	    && params_.use_amsmath != BufferParams::package_off) {
+		packages << "\\usepackage{amsmath}\n";
+	}
+
+	// These are all the 'simple' includes. i.e
+	// packages which we just \usepackage{package}
 	//
-	//  These are all the 'simple' includes.  i.e
-	//  packages which we just \usepackage{package}
-	//
 	for (int i = 0; i < nb_simplefeatures; ++i) {
 		if (mustProvide(simplefeatures[i]))
 			packages << "\\usepackage{"
 				 << simplefeatures[i] << "}\n";
 	}
 
-	//
 	// The rest of these packages are somewhat more complicated
 	// than those above.
 	//
 
-	if (mustProvide("amsmath")
-	    && params_.use_amsmath != BufferParams::package_off) {
-		packages << "\\usepackage{amsmath}\n";
-	}
-
-	// wasysym is a simple feature, but it must be after amsmath if both
-	// are used
-	// wasysym redefines some integrals (e.g. iint) from amsmath. That
-	// leads to inconsistent integrals. We only load this package if
-	// esint is used, since esint redefines all relevant integral
-	// symbols from wasysym and amsmath.
-	// See http://bugzilla.lyx.org/show_bug.cgi?id=1942
-	if (mustProvide("wasysym") && isRequired("esint") &&
-	    params_.use_esint != BufferParams::package_off)
-		packages << "\\usepackage{wasysym}\n";
-
 	// color.sty
 	if (mustProvide("color")) {
 		if (params_.graphicsDriver == "default")

Reply via email to