Some configure.py fixes from Guenter.

[lyx.git] / lib / symbols

diff --git a/lib/symbols b/lib/symbols
index 2d18e9ceafbd3e6f6184da43f3ce87d5cf6df3f2..ae8a8d00b930b84736cc5a6f23d6da8d41e3fff2 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -7,7 +7,8 @@ acute               decoration none
 bar                 decoration none
 breve               decoration none
 check               decoration none
 bar                 decoration none
 breve               decoration none
 check               decoration none

-dddot               decoration none
+ddddot              decoration none       amsmath
+dddot               decoration none       amsmath

 ddot                decoration none
 dot                 decoration none
 grave               decoration none
 ddot                decoration none
 dot                 decoration none
 grave               decoration none


@@ -15,29 +16,37 @@ hat                 decoration none
 mathring            decoration none
 overbrace           decoration none
 overleftarrow       decoration none
 mathring            decoration none
 overbrace           decoration none
 overleftarrow       decoration none

-overleftrightarrow  decoration none
+overleftrightarrow  decoration none       amsmath

 overline            decoration none
 overrightarrow      decoration none
 tilde               decoration none
 underbar            decoration none
 underbrace          decoration none
 overline            decoration none
 overrightarrow      decoration none
 tilde               decoration none
 underbar            decoration none
 underbrace          decoration none

-underleftarrow      decoration none
-underleftrightarrow decoration none
+underleftarrow      decoration none       amsmath
+underleftrightarrow decoration none       amsmath

 underline           decoration none
 underline           decoration none

-underrightarrow     decoration none
+underrightarrow     decoration none       amsmath

 vec                 decoration none
 widehat             decoration none
 widetilde           decoration none
 
 # dots
 dots              dots        none
 vec                 decoration none
 widehat             decoration none
 widetilde           decoration none
 
 # dots
 dots              dots        none

+#Do not load automatically, it redefines some other symbols, and we don't
+#have a possibility to turn automatic loading off like for ams
+#adots             dots        none        yhmath
+adots             dots        none

 cdots             dots        none
 ddots             dots        none
 cdots             dots        none
 ddots             dots        none

-dotsb             dots        none
-dotsc             dots        none
-dotsi             dots        none
-dotsm             dots        none
-dotso             dots        none
+dotsb             dots        none        amsmath
+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

 ldots             dots        none
 vdots             dots        none
 
 ldots             dots        none
 vdots             dots        none
 


@@ -90,6 +99,9 @@ texttt            font        textmode
 textup            font        textmode
 emph              font        textmode
 noun              font        textmode
 textup            font        textmode
 emph              font        textmode
 noun              font        textmode

+# ce and cf are provided by the mhchem package
+ce                font        forcetext
+cf                font        forcetext

 
 # old-style font commands
 bf                oldfont     none
 
 # old-style font commands
 bf                oldfont     none


@@ -109,6 +121,14 @@ smallmatrix       matrix      none
 vmatrix           matrix      none
 CD                matrix      none
 
 vmatrix           matrix      none
 CD                matrix      none
 

+# split environments with optional valign argument.
+# the others (split and alignedat) are hardcoded.
+aligned           split       none
+gathered          split       none
+# from Morten H\o gholm's mathtools.sty:
+lgathered         split       none
+rgathered         split       none
+

 # references
 pageref           ref         none
 prettyref         ref         none
 # references
 pageref           ref         none
 prettyref         ref         none


@@ -120,13 +140,19 @@ vref              ref         none
 lyxnegspace       space       none
 lyxposspace       space       none
 !                 space       none
 lyxnegspace       space       none
 lyxposspace       space       none
 !                 space       none

+negthinspace      space       none

 negmedspace       space       none
 negthickspace     space       none
 ,                 space       none
 negmedspace       space       none
 negthickspace     space       none
 ,                 space       none

+thinspace         space       none

 :                 space       none
 :                 space       none

+medspace          space       none

 ;                 space       none
 ;                 space       none

+thickspace        space       none
+enskip            space       none

 quad              space       none
 qquad             space       none
 quad              space       none
 qquad             space       none

+hspace            space       none

 
 # styles
 displaystyle      style       0
 
 # styles
 displaystyle      style       0


@@ -237,13 +263,11 @@ bigwedge           cmex         86   0 mathop   x
 biguplus           cmex         85   0 mathop   x
 bigcap             cmex         84   0 mathop   x
 bigcup             cmex         83   0 mathop   x
 biguplus           cmex         85   0 mathop   x
 bigcap             cmex         84   0 mathop   x
 bigcup             cmex         83   0 mathop   x

-int                cmex         82 242 mathop   ∫

 prod               cmex         81 213 mathop   x
 sum                cmex         80 229 mathop   x
 bigotimes          cmex         78   0 mathop   x
 bigoplus           cmex         76   0 mathop   x
 bigodot            cmex         74   0 mathop   x
 prod               cmex         81 213 mathop   x
 sum                cmex         80 229 mathop   x
 bigotimes          cmex         78   0 mathop   x
 bigoplus           cmex         76   0 mathop   x
 bigodot            cmex         74   0 mathop   x

-oint               cmex         72   0 mathop   x

 bigsqcup           cmex         70   0 mathop   x
 smallint           cmsy        115   0 mathop   x
 triangleleft       cmm          47   0 mathbin  x
 bigsqcup           cmex         70   0 mathop   x
 smallint           cmsy        115   0 mathop   x
 triangleleft       cmm          47   0 mathbin  x


@@ -747,10 +771,91 @@ invneg             wasy          24    0  mathrel x
 ocircle            wasy          35    0  mathbin x
 logof              wasy          22    0  mathrel x
 varint             wasy         114    0  mathop  x
 ocircle            wasy          35    0  mathbin x
 logof              wasy          22    0  mathrel x
 varint             wasy         114    0  mathop  x

-iint               wasy         115    0  mathop  x
-iiint              wasy         116    0  mathop  x

 varoint            wasy         117    0  mathop  x
 varoint            wasy         117    0  mathop  x

-oiint              wasy         118    0  mathop  x
+
+# symbols from the mhchem package, all of them are equivalent to a math symbol
+# mhchem is not loaded because these commands can only be used inside
+# a \ce or a \cf inset
+
+sbond              cmsy        161   0 mathord  x
+dbond              cmr          61   0 mathord  x
+tbond              cmsy        180 186 mathord  x
+
+# From the esint package:
+# We emulate some symbols if the esint10 font is not available.
+# 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      esintoramsmath
+iintop             esint        003    0  mathop  x      esint
+iiint              esint        005    0  mathop  x      esintoramsmath
+iiintop            esint        005    0  mathop  x      esint
+iiiint             esint        007    0  mathop  x      esintoramsmath
+iiiintop           esint        007    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
+oiintop            esint        013    0  mathop  x      esint
+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
+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      esintoramsmath
+iintop             wasy         115    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}        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
+oint               cmex          72    0  mathop  x      esint
+ointop             cmex          72    0  mathop  x      esint
+oiint              wasy         118    0  mathop  x      esint
+oiintop            wasy         118    0  mathop  x      esint
+\def\sqint{\square\kern-17mu\int\kern6mu}                       esint
+\def\sqintop{\square\kern-17mu\int\kern6mu}                     esint
+\def\sqiint{\square\kern-20mu\iint\kern3mu}                     esint
+\def\sqiintop{\square\kern-20mu\iint\kern3mu}                   esint
+\def\ointctrclockwise{\circlearrowleft\kern-21mu\int\kern6mu}   esint
+\def\ointctrclockwiseop{\circlearrowleft\kern-21mu\int\kern6mu} esint
+\def\ointclockwise{\circlearrowright\kern-21mu\int\kern6mu}     esint
+\def\ointclockwiseop{\circlearrowright\kern-21mu\int\kern6mu}   esint
+endif
+
+varointclockwise   esint        027    0  mathop  x      esint
+varointclockwiseop esint        027    0  mathop  x      esint
+varointctrclockwise esint       029    0  mathop  x      esint
+varointctrclockwiseop esint     029    0  mathop  x      esint
+fint               esint        031    0  mathop  x      esint
+fintop             esint        031    0  mathop  x      esint
+varoiint           esint        033    0  mathop  x      esint
+varoiintop         esint        033    0  mathop  x      esint
+landupint          esint        035    0  mathop  x      esint
+landupintop        esint        035    0  mathop  x      esint
+landdownint        esint        037    0  mathop  x      esint
+landdownintop      esint        037    0  mathop  x      esint
+
+
+# From the amsmath package:
+\def\idotsint{\int\kern-3mu\cdots\kern-3mu\int}               amsmath

 
 
 log                lyxblacktext  0   0 func     x
 
 
 log                lyxblacktext  0   0 func     x


@@ -786,14 +891,7 @@ Pr                 lyxblacktext  0   0 funclim  x
 gcd                lyxblacktext  0   0 funclim  x
 deg                lyxblacktext  0   0 func     x
 bmod               lyxblacktext  0   0 func     x
 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
-## don't remove the space from the beginning of the next line
- #                 mathnormal    0   0 special  x
+pmod               lyxblacktext  0   0 func     x

 
 
 
 
 
 


@@ -816,7 +914,7 @@ iffont cmsy
 \def\longleftarrow{\leftarrow\kern-11mu\lyxbar}
 \def\Longrightarrow{\lyxeq\kern-9.5mu\Rightarrow}
 \def\Longleftarrow{\Leftarrow\kern-9.5mu\lyxeq}
 \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}
 \def\mapsto{\mapstochar\kern-9mu\rightarrow}
 \def\longmapsto{\mapstochar\kern-6mu\lyxbar\kern-11mu\rightarrow}
 \def\models{\vert\kern-7mu\lyxeq}


@@ -834,10 +932,9 @@ endif
 iffont msb
 \def\Join{\ltimes\kern-18.5mu\rtimes}
 endif
 iffont msb
 \def\Join{\ltimes\kern-18.5mu\rtimes}
 endif

-\def\mathcircumflex{\mbox{\^{}}}{\^}

 # Fixme: latin-1 chars in text file
 # Fixme: latin-1 chars in text file

-\def\AA{\AA}{Å}
-\def\O{\O}{Ø}
+\def\AA{\AA}{Å}
+\def\O{\O}{Ø}

 
 iffont cmsy
 # The \sim is placed too high...
 
 iffont cmsy
 # The \sim is placed too high...


@@ -853,3 +950,4 @@ endif
 
 #"{\hat{}}
 
 
 #"{\hat{}}
 

+