Fix computation of InsetLayout arguments for InsetText

[lyx.git] / lib / symbols

diff --git a/lib/symbols b/lib/symbols
index aadcd0d00664714b0f78b3c8b4f8eac2bac44774..31ba7f0eb18dbcca076be334a35d6f5264e7ec60 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -16,6 +16,8 @@
 # or
 # \def\macroname{definition} requires
 # or
+# \def\macroname{definition} extra xmlname
+# or
 # \def\macroname{definition} extra xmlname requires
 #
 # ("" for empty strings is not supported. One would have to use x for fields
@@ -198,10 +200,20 @@ hspace*           space       none
 hspace            space       none
 
 # styles
-displaystyle      style       0
-textstyle         style       1
-scriptstyle       style       2
-scriptscriptstyle style       3
+displaystyle      style       3
+textstyle         style       2
+scriptstyle       style       1
+scriptscriptstyle style       0
+
+# math classes
+mathord           class    none
+mathop            class    none
+mathbin           class    none
+mathrel           class    none
+mathopen          class    none
+mathclose         class    none
+mathpunct         class    none
+mathinner         class    none
 
 # misc
 # The commented lines in this block get misparsed as MathSymbolInset because
@@ -261,6 +273,7 @@ varpi              cmm          36 118 mathord  ϖ
 varrho             cmm          37   0 mathord  ϱ
 varsigma           cmm          38  86 mathord  ς
 varphi             cmm          39 106 mathord  ϕ
+slash              cmr          47  47 mathord  /
 Gamma              cmr         161  71 mathalpha  Γ
 Delta              cmr         162  68 mathalpha  Δ
 Theta              cmr         163  81 mathalpha  Θ
@@ -300,7 +313,8 @@ spadesuit          cmsy        127 170 mathord  ♠
 # We define lyxnot as mathrel in order to have proper alignment
 lyxnot             cmsy         54  47 mathrel  /           hiddensymbol
 iffont cmsy
-\def\not{\lyxnot\mathrel{\kern-11mu}}
+# kerning is slightly imperfect so that one can see when \not is selected
+\def\not{\lyxnot}
 else
 \def\not{\kern4mu\lyxnot\kern-19mu}
 endif
@@ -934,8 +948,8 @@ llfloor            stmry  84   0 mathopen   x  stmaryrd
 rrfloor            stmry  85   0 mathclose  x  stmaryrd
 llceil             stmry  86   0 mathopen   x  stmaryrd
 rrceil             stmry  87   0 mathclose  x  stmaryrd
-arrownot           stmry  88   0 mathrel    x  stmaryrd
-Arrownot           stmry  89   0 mathrel    x  stmaryrd
+lyxarrownot        stmry  88   0 mathrel    x  hiddensymbol #see arrownot defined below
+lyxArrownot        stmry  89   0 mathrel    x  hiddensymbol #see Arrownot defined below
 Mapstochar         stmry  90   0 mathrel    x  stmaryrd
 mapsfromchar       stmry  91   0 mathrel    x  stmaryrd
 Mapsfromchar       stmry  92   0 mathrel    x  stmaryrd
@@ -976,14 +990,17 @@ bignplus           stmry 112   0 mathop     x  stmaryrd # caution: named hugenpl
 #rrbracketex        stmry 127   0 mathclose  x  stmaryrd # only in the font, not the .sty caution: named Hugerrbracketex in the font
 
 \def\varcopyright{\mathord{c\kern-11mu\varbigcirc}}         stmaryrd
+# kerning is slightly imperfect so that one sees when \[Aa]rrownot is selected
+\def\arrownot{\lyxarrownot}                                 stmaryrd
+\def\Arrownot{\lyxArrownot\mathrel{\kern0.5mu}}             stmaryrd
 \def\longarrownot{\mathrel{\kern5.5mu}\arrownot\mathrel{\kern-5.5mu}} stmaryrd
 \def\Longarrownot{\mathrel{\kern5.5mu}\Arrownot\mathrel{\kern-5.5mu}} stmaryrd
-\def\Mapsto{\Mapstochar\mathrel{\kern-2mu}\Rightarrow}      stmaryrd
-\def\mapsfrom{\leftarrow\kern-9mu\mapsfromchar}             stmaryrd
-\def\Mapsfrom{\Leftarrow\kern-9mu\Mapsfromchar}             stmaryrd
-\def\Longmapsto{\Mapstochar\Longrightarrow}                 stmaryrd
-\def\longmapsfrom{\longleftarrow\mapsfromchar}              stmaryrd
-\def\Longmapsfrom{\Longleftarrow\mathrel{\kern1mu}\Mapsfromchar}      stmaryrd
+\def\Mapsto{\Mapstochar\mathrel\Rightarrow}              mathrel ⤇ stmaryrd
+\def\mapsfrom{\leftarrow\kern-9mu\mapsfromchar}          mathrel ↤ stmaryrd
+\def\Mapsfrom{\Leftarrow\kern-9mu\Mapsfromchar}          mathrel ⤆ stmaryrd
+\def\Longmapsto{\Mapstochar\Longrightarrow}              mathrel ⟾ stmaryrd
+\def\longmapsfrom{\longleftarrow\mapsfromchar}           mathrel ⟻ stmaryrd
+\def\Longmapsfrom{\Longleftarrow\mathrel{\kern1mu}\Mapsfromchar}   mathrel ⟽ stmaryrd
 
 # 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
@@ -1141,15 +1158,14 @@ ordinarycolon      cmr          58  58    mathrel :             mathtools
 \def\ne{\not=}                                                  mathrel ≠
 \def\lnot{\neg}                                                 mathord ¬
 \def\notin{\not\in}                                             mathrel ∉
-\def\slash{/}
 
 \def\joinrel{\mathrel{\kern-3mu}}
 \def\relbar{\lyxbar}
 \def\Relbar{\mathrel{=}}
-\def\longleftrightarrow{\leftarrow\joinrel\rightarrow}
-\def\Longleftrightarrow{\Leftarrow\joinrel\Rightarrow}
-\def\iff{\Leftarrow\joinrel\Rightarrow}
-\def\doteq{\stackrel{\cdot}{=}}
+\def\longleftrightarrow{\leftarrow\joinrel\rightarrow}          mathrel ⟷
+\def\Longleftrightarrow{\Leftarrow\joinrel\Rightarrow}          mathrel ⟺
+\def\iff{\Leftarrow\joinrel\Rightarrow}                         mathrel ⟺
+\def\doteq{\stackrel{\cdot}{=}}                                 mathrel ≐
 
 iffont cmsy
 \def\longrightarrow{\relbar\joinrel\rightarrow}                 mathrel ⟶
@@ -1158,7 +1174,7 @@ iffont cmsy
 \def\Longleftarrow{\Leftarrow\joinrel\Relbar}                   mathrel ⟸
 \def\implies{\Longrightarrow}                                   mathrel ⟹ amsmath
 \def\impliedby{\Longleftarrow}                                  mathrel ⟸ amsmath
-\def\mapsto{\mapstochar\mathrel{\kern-2mu}\rightarrow}          mathrel ↤
+\def\mapsto{\mapstochar\rightarrow}                             mathrel ↤
 \def\longmapsto{\mapstochar\joinrel\relbar\joinrel\rightarrow}  mathrel ⟻
 \def\models{\mathrel{\vert}\joinrel\Relbar}                     mathrel ⊨
 else
@@ -1179,20 +1195,19 @@ else
 endif
 \def\dasharrow{\dashrightarrow}                                 mathrel ⤏ amssymb
 iffont msb
-\def\Join{\mathrel{\ltimes\kern-13.5mu\rtimes}}                 amssymb
+\def\Join{\mathrel{\ltimes\kern-13.5mu\rtimes}}                 mathrel ⨝ amssymb
 else
-\def\Join{|x|}                                                  amssymb
+\def\Join{|x|}                                                  mathrel ⨝ amssymb
 endif
-# FIXME: UTF-8 chars in text file
-\def\AA{\AA}{Å} textmode Å  amstext,lyxmathsym
-\def\O{\O}{Ø}   textmode Ø amstext,lyxmathsym
+\def\AA{\AA}{\text{Å}} textmode Å  amstext,lyxmathsym
+\def\O{\O}{\text{Ø}}   textmode Ø amstext,lyxmathsym
 
 iffont cmsy
 # The \sim is placed too high...
 \def\cong{\stackrel{\sim}{=}}                                   mathrel ≅
 lyxsurd               cmsy        112 0 mathord  √
 \def\surd{^\lyxsurd}                                            mathord √
-\def\textdegree{\kern-1mu^{\circ}\kern-4mu} textmode ° textcomp,amstext,lyxmathsym
+\def\textdegree{\text{°}} textmode ° textcomp,amstext,lyxmathsym
 else
 # FIXME: These don't work on OS X, since the Symbol font uses a different
 #        encoding and is therefore disabled in FontLoader::available().