X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsymbols;h=71ade6c82449854d592974fda8fac8c381aae66f;hb=04816dfe7b5609c2d4d33f418c0c23b318a38cf1;hp=2b4eaa16904a5d2ca538e4d9e0ef292bd4f64b73;hpb=2db7521b7080d63acbcd3bd5bfe892f5a414b2b0;p=lyx.git

diff --git a/lib/symbols b/lib/symbols
index 2b4eaa1690..71ade6c824 100644
--- a/lib/symbols
+++ b/lib/symbols
@@ -761,17 +761,21 @@ varoint            wasy         117    0  mathop  x
 # It is important that they have the same requirements in both cases,
 # otherwise the LaTeX output would depend on the availability of the esint10
 # font in the GUI
+# Note that we do _not_ require the wasysym package for any integral besides
+# \varint and \varoint. The reason is that the integrals of the wasysym
+# package do not match the standard \int and \intop. See
+# http://bugzilla.lyx.org/show_bug.cgi?id=1942 for details.
+# If the wasysym integrals are really wanted then one has to load the package
+# manually and disable automatic loading of amsmath and esint.
 iffont esint
 int                esint        001    0  mathop  ∫  esint
 intop              esint        001    0  mathop  ∫  esint
-iint               esint        003    0  mathop  x      esint
+iint               esint        003    0  mathop  x      esintoramsmath
 iintop             esint        003    0  mathop  x      esint
-iiint              esint        005    0  mathop  x      esint
+iiint              esint        005    0  mathop  x      esintoramsmath
 iiintop            esint        005    0  mathop  x      esint
-iiiint             esint        007    0  mathop  x      esint
+iiiint             esint        007    0  mathop  x      esintoramsmath
 iiiintop           esint        007    0  mathop  x      esint
-dotsint            esint        009    0  mathop  x      esint
-dotsintop          esint        009    0  mathop  x      esint
 oint               esint        011    0  mathop  x      esint
 ointop             esint        011    0  mathop  x      esint
 oiint              esint        013    0  mathop  x      esint
@@ -780,6 +784,8 @@ sqint              esint        015    0  mathop  x      esint
 sqintop            esint        015    0  mathop  x      esint
 sqiint             esint        017    0  mathop  x      esint
 sqiintop           esint        017    0  mathop  x      esint
+dotsint            esint        019    0  mathop  x      esint
+dotsintop          esint        019    0  mathop  x      esint
 ointctrclockwise   esint        023    0  mathop  x      esint
 ointctrclockwiseop esint        023    0  mathop  x      esint
 ointclockwise      esint        025    0  mathop  x      esint
@@ -787,11 +793,11 @@ ointclockwiseop    esint        025    0  mathop  x      esint
 else
 int                cmex          82  242  mathop  ∫  esint
 intop              cmex          82  242  mathop  ∫  esint
-iint               wasy         115    0  mathop  x      esint
+iint               wasy         115    0  mathop  x      esintoramsmath
 iintop             wasy         115    0  mathop  x      esint
-iiint              wasy         116    0  mathop  x      esint
+iiint              wasy         116    0  mathop  x      esintoramsmath
 iiintop            wasy         116    0  mathop  x      esint
-\def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int}        esint
+\def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int}        esintoramsmath
 \def\iiiintop{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int}      esint
 \def\dotsint{\int\kern-3mu\cdots\kern-3mu\int}                  esint
 \def\dotsintop{\int\kern-3mu\cdots\kern-3mu\int}                esint
@@ -859,13 +865,13 @@ gcd                lyxblacktext  0   0 funclim  x
 deg                lyxblacktext  0   0 func     x
 bmod               lyxblacktext  0   0 func     x
 
-{                  mathnormal    0   0 special  x
-}                  mathnormal    0   0 special  x
-$                  mathnormal    0   0 special  x
-%                  mathnormal    0   0 special  x
-&                  mathnormal    0   0 special  x
+{                  mathrm        0   0 special  x
+}                  mathrm        0   0 special  x
+$                  mathrm        0   0 special  x
+%                  mathrm        0   0 special  x
+&                  mathrm        0   0 special  x
 ## don't remove the space from the beginning of the next line
- #                 mathnormal    0   0 special  x
+ #                 mathrm        0   0 special  x
 
 
 
@@ -888,7 +894,7 @@ iffont cmsy
 \def\longleftarrow{\leftarrow\kern-11mu\lyxbar}
 \def\Longrightarrow{\lyxeq\kern-9.5mu\Rightarrow}
 \def\Longleftarrow{\Leftarrow\kern-9.5mu\lyxeq}
-\def\implies{\Longrightarrow}
+\def\implies{\Longrightarrow}                                     amsmath
 \def\mapsto{\mapstochar\kern-9mu\rightarrow}
 \def\longmapsto{\mapstochar\kern-6mu\lyxbar\kern-11mu\rightarrow}
 \def\models{\vert\kern-7mu\lyxeq}
@@ -925,3 +931,4 @@ endif
 
 #"{\hat{}}
 
+