X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsymbols;h=691b661222fff9d1d3c8ec8dc11b1af3b352fac6;hb=e9a28c8000e8a62d05e5e932d4d1e00a606d1865;hp=e2cc2b2028cb5c4ee564b92f668652bbe5c1d59c;hpb=01013c078556843961d843a3ca13314777ec7b41;p=lyx.git

diff --git a/lib/symbols b/lib/symbols
index e2cc2b2028..691b661222 100644
--- a/lib/symbols
+++ b/lib/symbols
@@ -26,6 +26,11 @@ underleftarrow      decoration none       amsmath
 underleftrightarrow decoration none       amsmath
 underline           decoration none
 underrightarrow     decoration none       amsmath
+#Do not load automatically, it redefines some other symbols, and we don't
+#have a possibility to turn automatic loading off like for ams
+#undertilde          decoration none       accents
+undertilde          decoration none
+utilde              decoration none       undertilde
 vec                 decoration none
 widehat             decoration none
 widetilde           decoration none
@@ -155,8 +160,11 @@ medspace          space       none
 ;                 space       none
 thickspace        space       none
 enskip            space       none
+enspace           space       none
 quad              space       none
 qquad             space       none
+hfill             space       none
+hspace*           space       none
 hspace            space       none
 
 # styles
@@ -689,6 +697,20 @@ RIGHTCIRCLE        wasy          72  0 x        ◗
 #LEFTcircle {\hbox to 0pt{\wasyfamily\char71\hss}\hbox{\wasyfamily\char35}}
 #RIGHTcircle{\hbox to 0pt{\wasyfamily\char72\hss}\hbox{\wasyfamily\char35}}
 
+# Defined by amsmath.sty
+
+varGamma           cmm         161  0  mathord  x  amsmath
+varDelta           cmm         162  0  mathord  x  amsmath
+varTheta           cmm         163  0  mathord  x  amsmath
+varLambda          cmm         164  0  mathord  x  amsmath
+varXi              cmm         165  0  mathord  x  amsmath
+varPi              cmm         166  0  mathord  x  amsmath
+varSigma           cmm         167  0  mathord  x  amsmath
+varUpsilon         cmm         168  0  mathord  x  amsmath
+varPhi             cmm         169  0  mathord  x  amsmath
+varPsi             cmm         170  0  mathord  x  amsmath
+varOmega           cmm         173  0  mathord  x  amsmath
+
 #
 # wasy astronomy
 #
@@ -797,18 +819,18 @@ tbond              cmsy        180 186 mathord  x
 # 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.
+# http://www.lyx.org/trac/ticket/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  ∬      esintoramsmath
+iint               esint        003    0  mathop  ∬         esint|amsmath
 iintop             esint        003    0  mathop  ∬      esint
-iiint              esint        005    0  mathop  ∭      esintoramsmath
+iiint              esint        005    0  mathop  ∭        esint|amsmath
 
 iiintop            esint        005    0  mathop  ∭      esint
-iiiint             esint        007    0  mathop  ⨌      esintoramsmath
+iiiint             esint        007    0  mathop  ⨌        esint|amsmath
 
 iiiintop           esint        007    0  mathop  ⨌      esint
 oint               esint        011    0  mathop  ∮      esint
@@ -829,12 +851,12 @@ ointclockwiseop    esint        025    0  mathop  ∲      esint
 else
 int                cmex          82  242  mathop  ∫  esint
 intop              cmex          82  242  mathop  ∫  esint
-iint               wasy         115    0  mathop  ∬      esintoramsmath
+iint               wasy         115    0  mathop  ∬         esint|amsmath
 iintop             wasy         115    0  mathop  &Int      esint
-iiint              wasy         116    0  mathop  ∭      esintoramsmath
+iiint              wasy         116    0  mathop  ∭        esint|amsmath
 
 iiintop            wasy         116    0  mathop  ∭      esint
-\def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int}        esintoramsmath
+\def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int}        esint|amsmath
 \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
@@ -903,9 +925,27 @@ exp                lyxblacktext  0   0 func     x
 Pr                 lyxblacktext  0   0 funclim  x
 gcd                lyxblacktext  0   0 funclim  x
 deg                lyxblacktext  0   0 func     x
+mod                lyxblacktext  0   0 func     x     amsmath
 bmod               lyxblacktext  0   0 func     x
 pmod               lyxblacktext  0   0 func     x
-
+pod                lyxblacktext  0   0 func     x     amsmath
+
+
+# mathtools.sty
+\def\vcentcolon{\kern4mu:\kern3mu}             mathtools
+\def\dblcolon{\vcentcolon\kern-8mu\vcentcolon} mathtools
+\def\coloneqq{\vcentcolon\kern-7mu=}           mathtools
+\def\Coloneqq{\dblcolon\kern-7mu=}             mathtools
+\def\coloneq{\vcentcolon\kern-7mu-}            mathtools
+\def\Coloneq{\dblcolon\kern-7mu-}              mathtools
+\def\eqqcolon{=\kern-8mu\vcentcolon}           mathtools
+\def\Eqqcolon{=\kern-8mu\dblcolon}             mathtools
+\def\eqcolon{-\kern-8mu\vcentcolon}            mathtools
+\def\Eqcolon{-\kern-8mu\dblcolon}              mathtools
+\def\colonapprox{\vcentcolon\kern-7mu\approx}  mathtools
+\def\Colonapprox{\dblcolon\kern-7mu\approx}    mathtools
+\def\colonsim{\vcentcolon\kern-7mu\sim}        mathtools
+\def\Colonsim{\dblcolon\kern-7mu\sim}          mathtools
 
 
 #