X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsymbols;h=c70f13667df81842100154a2185fb9c1269c68b5;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=07830c6b356d89565d236d6355db317c099dcab3;hpb=61791114a1c75edc42077f83463e34c455cc0815;p=lyx.git

diff --git a/lib/symbols b/lib/symbols
index 07830c6b35..c70f13667d 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
@@ -43,10 +48,7 @@ dotsc             dots        none        amsmath
 dotsi             dots        none        amsmath
 dotsm             dots        none        amsmath
 dotso             dots        none        amsmath
-#Do not load automatically, since we don't have a possibility to turn
-#automatic loading off like for ams
-#iddots            dots        none        mathdots
-iddots            dots        none
+iddots            dots        none        mathdots
 ldots             dots        none
 vdots             dots        none
 
@@ -111,12 +113,11 @@ ce                font        forcetext
 cf                font        forcetext
 
 # old-style font commands
-# name           "oldfont"    alias
-bf                oldfont     textbf
-cal               oldfont     mathcal
-it                oldfont     textit
-rm                oldfont     textrm
-tt                oldfont     texttt
+bf                oldfont     none
+cal               oldfont     none
+it                oldfont     none
+rm                oldfont     none
+tt                oldfont     none
 
 # matrix environments
 Bmatrix           matrix      none
@@ -140,6 +141,7 @@ rgathered         split       none
 # references
 pageref           ref         none
 prettyref         ref         none
+refstyle          ref         none
 ref               ref         none
 vpageref          ref         none
 vref              ref         none
@@ -158,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
@@ -692,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
 #
@@ -806,12 +825,12 @@ tbond              cmsy        180 186 mathord  x
 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
@@ -832,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