Set mathrel for a few more lib/symbols

Improve display of textmode macros in lib/symbols

diff --git a/lib/symbols b/lib/symbols
index 1a05a683d4cc3e2ec0a63729792056668971cadd..82a6d132d54c107afdcecbc16647cce5a5c8f1a5 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
@@ -988,17 +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 see when \[Aa]rrownot is selected
+# kerning is slightly imperfect so that one sees when \[Aa]rrownot is selected
 \def\arrownot{\lyxarrownot\mathrel{\kern-11mu}}             stmaryrd
 \def\Arrownot{\lyxArrownot\mathrel{\kern-10.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{\kern-2mu}\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
@@ -1160,10 +1162,10 @@ ordinarycolon      cmr          58  58    mathrel :             mathtools
 \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 ⟶
@@ -1193,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().