Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

[lyx.git] / lib / symbols

diff --git a/lib/symbols b/lib/symbols
index 5cc63a1fa2d0777e95b8eabdd933bbd913fa37cc..ba2b6d330ddf969a7fef908cc9b7d6c285688b14 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -268,7 +268,7 @@ jmath              cmm         124   0 mathord  ȷ
 ell                cmm          96   0 mathord  ℓ
 wp                 cmm         125 195 mathord  ℘
 Re                 cmsy         60 194 mathord  ℜ
-Im                 cmsy         61 193 mathord  ℑ
+Im                 cmsy         61 193 mathord  &imaginary;
 partial            cmm          64 182 mathord  ∂
 infty              cmsy         49 165 mathord  ∞
 prime              cmsy         48 162 mathord  ′
@@ -667,18 +667,18 @@ lyxleft            msa          76   0 mathord  ←
 
 male               wasy          26  0 x        ♂
 female             wasy          25  0 x        ♀
-currency           wasy          27  0 textmode ¤ wasysym # works in text mode only (produces \oe in math mode)
-phone              wasy          7   0 textmode ☎  wasysym # works in text mode only (produces \Upsilon in math mode)
-recorder           wasy          6   0 textmode ⌕ wasysym # works in text mode only (produces \Sigma in math mode)
-clock              wasy          28  0 textmode &clock;  wasysym # works in text mode only (produces \o in math mode)
-lightning          wasy          18  0 textmode ☇ wasysym # works in text mode only (produces ` in math mode)
+currency           wasy          27  0 textmode ¤ wasysym,amstext,lyxmathsym # works in text mode only (produces \oe in math mode)
+phone              wasy          7   0 textmode ☎  wasysym,amstext,lyxmathsym # works in text mode only (produces \Upsilon in math mode)
+recorder           wasy          6   0 textmode ⌕ wasysym,amstext,lyxmathsym # works in text mode only (produces \Sigma in math mode)
+clock              wasy          28  0 textmode &clock;  wasysym,amstext,lyxmathsym # works in text mode only (produces \o in math mode)
+lightning          wasy          18  0 textmode ☇ wasysym,amstext,lyxmathsym # works in text mode only (produces ` in math mode)
 # FIXME Display is wrong (bug 8493): qt does not display characters at the \t position (0x09)
-pointer            wasy          9   0 textmode x        wasysym # works in text mode only (produces \Psi in math mode)
-RIGHTarrow         wasy          17  0 textmode ▶ wasysym # works in text mode only (produces \jmath in math mode)
-LEFTarrow          wasy          16  0 textmode ◀ wasysym # works in text mode only (produces \imath in math mode)
-UParrow            wasy          75  0 textmode ▲ wasysym # works in text mode only (produces K in math mode)
-DOWNarrow          wasy          76  0 textmode ▼ wasysym # works in text mode only (produces L in math mode)
-AC                 wasy          58  0 textmode ∿ wasysym # works in text mode only
+pointer            wasy          9   0 textmode x        wasysym,amstext,lyxmathsym # works in text mode only (produces \Psi in math mode)
+RIGHTarrow         wasy          17  0 textmode ▶ wasysym,amstext,lyxmathsym # works in text mode only (produces \jmath in math mode)
+LEFTarrow          wasy          16  0 textmode ◀ wasysym,amstext,lyxmathsym # works in text mode only (produces \imath in math mode)
+UParrow            wasy          75  0 textmode ▲ wasysym,amstext,lyxmathsym # works in text mode only (produces K in math mode)
+DOWNarrow          wasy          76  0 textmode ▼ wasysym,amstext,lyxmathsym # works in text mode only (produces L in math mode)
+AC                 wasy          58  0 textmode ∿ wasysym,amstext,lyxmathsym # works in text mode only
 \def\HF{\approx}                                         wasysym
 VHF                wasy          64  0 x        ≋ # triple tilde
 Square             wasy          50  0 x        □
@@ -770,8 +770,8 @@ sagittarius        wasy          99  0 x        ♐
 capricornus        wasy          100 0 x        ♑
 aquarius           wasy          101 0 x        ♒
 pisces             wasy          102 0 x        ♓
-conjunction        wasy          86  0 textmode ☌ wasysym # works in text mode only (produces V in math mode)
-opposition         wasy          87  0 textmode ☍ wasysym # works in text mode only (produces W in math mode)
+conjunction        wasy          86  0 textmode ☌ wasysym,amstext,lyxmathsym # works in text mode only (produces V in math mode)
+opposition         wasy          87  0 textmode ☍ wasysym,amstext,lyxmathsym # works in text mode only (produces W in math mode)
 # APL characters
 APLstar            wasy          69  0 x        ⍟
 APLlog             wasy          22  0 x        x
@@ -799,11 +799,11 @@ lyxgluoneelement   wasy          82  0 x        x        notexisting
 # special characters
 cent               wasy         103   0 x        &#00A2;
 permil             wasy         104   0 x        ‰
-agemO              wasy          48   0 textmode ℧    wasysym # works in text mode only (produces 0 in math mode)
-thorn              wasy         105   0 textmode þ wasysym # works in text mode only (produces i in math mode)
-Thorn              wasy         106   0 textmode Þ wasysym # works in text mode only (produces j in math mode)
-openo              wasy         108   0 textmode ɔ wasysym # works in text mode only (produces l in math mode)
-inve               wasy          85   0 textmode ə wasysym # works in text mode only (produces U in math mode)
+agemO              wasy          48   0 textmode ℧    wasysym,amstext,lyxmathsym # works in text mode only (produces 0 in math mode)
+thorn              wasy         105   0 textmode þ wasysym,amstext,lyxmathsym # works in text mode only (produces i in math mode)
+Thorn              wasy         106   0 textmode Þ wasysym,amstext,lyxmathsym # works in text mode only (produces j in math mode)
+openo              wasy         108   0 textmode ɔ wasysym,amstext,lyxmathsym # works in text mode only (produces l in math mode)
+inve               wasy          85   0 textmode ə wasysym,amstext,lyxmathsym # works in text mode only (produces U in math mode)
 
 #mho               wasy          48    0  mathord ℧    wasysym # already in amsfonts
 #Join              wasy          49    0  mathrel x        wasysym # already in amsfonts
@@ -1100,32 +1100,32 @@ pod                lyxblacktext  0   0 func     x     amsmath
 
 
 # mathtools.sty
-\def\vcentcolon{:}                             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
+\def\vcentcolon{:}                                              mathrel :        mathtools
+\def\dblcolon{\vcentcolon\kern-8mu\vcentcolon}                  mathrel ::       mathtools
+\def\coloneqq{\vcentcolon\kern-7mu=}                            mathrel ≔ mathtools
+\def\Coloneqq{\dblcolon\kern-7mu=}                              mathrel ::=      mathtools
+\def\coloneq{\vcentcolon\kern-7mu-}                             mathrel :-       mathtools
+\def\Coloneq{\dblcolon\kern-7mu-}                               mathrel ::-      mathtools
+\def\eqqcolon{=\kern-8mu\vcentcolon}                            mathrel ≕ mathtools
+\def\Eqqcolon{=\kern-8mu\dblcolon}                              mathrel =::      mathtools
+\def\eqcolon{-\kern-8mu\vcentcolon}                             mathrel -:       mathtools
+\def\Eqcolon{-\kern-8mu\dblcolon}                               mathrel -::      mathtools
+\def\colonapprox{\vcentcolon\kern-7mu\approx}                   mathrel :≈    mathtools
+\def\Colonapprox{\dblcolon\kern-7mu\approx}                     mathrel ::≈   mathtools
+\def\colonsim{\vcentcolon\kern-7mu\sim}                         mathrel :∼   mathtools
+\def\Colonsim{\dblcolon\kern-7mu\sim}                           mathrel ::∼  mathtools
 
 
 #
 # pre-defined macros
 #
 
-\def\leq\le                                                     mathrel ≤
-\def\geq\ge                                                     mathrel ≥
+\def\leq{\le}                                                   mathrel ≤
+\def\geq{\ge}                                                   mathrel ≥
 \def\neq{\not=}                                                 mathrel ≠
 \def\ne{\not=}                                                  mathrel ≠
-\def\lnot\neg                                                   mathord ¬
-\def\notin{\not\in}
+\def\lnot{\neg}                                                 mathord ¬
+\def\notin{\not\in}                                             mathrel ∉
 \def\slash{/}
 
 \def\longleftrightarrow{\leftarrow\kern-12.5mu\rightarrow}
@@ -1134,53 +1134,53 @@ pod                lyxblacktext  0   0 func     x     amsmath
 \def\doteq{\stackrel{\cdot}{=}}
 
 iffont cmsy
-\def\longrightarrow{\lyxbar\kern-11mu\rightarrow}
-\def\longleftarrow{\leftarrow\kern-11mu\lyxbar}
-\def\Longrightarrow{\lyxeq\kern-9.5mu\Rightarrow}
-\def\Longleftarrow{\Leftarrow\kern-9.5mu\lyxeq}
-\def\implies{\Longrightarrow}                                   amsmath
-\def\impliedby{\Longleftarrow}                                  amsmath
-\def\mapsto{\mapstochar\kern-9mu\rightarrow}
-\def\longmapsto{\mapstochar\kern-6mu\lyxbar\kern-11mu\rightarrow}
-\def\models{\vert\kern-7mu\lyxeq}
+\def\longrightarrow{\lyxbar\kern-11mu\rightarrow}               mathrel ⟶
+\def\longleftarrow{\leftarrow\kern-11mu\lyxbar}                 mathrel ⟵
+\def\Longrightarrow{\lyxeq\kern-9.5mu\Rightarrow}               mathrel ⟹
+\def\Longleftarrow{\Leftarrow\kern-9.5mu\lyxeq}                 mathrel ⟸
+\def\implies{\Longrightarrow}                                   mathrel ⟹ amsmath
+\def\impliedby{\Longleftarrow}                                  mathrel ⟸ amsmath
+\def\mapsto{\mapstochar\kern-9mu\rightarrow}                    mathrel ↤
+\def\longmapsto{\mapstochar\kern-6mu\lyxbar\kern-11mu\rightarrow} mathrel ⟻
+\def\models{\vert\kern-7mu\lyxeq}                               mathrel ⊨
 else
-\def\implies{=>}                                                amsmath
-\def\impliedby{<=}                                              amsmath
+\def\implies{=>}                                                mathrel &#x27F9; amsmath
+\def\impliedby{<=}                                              mathrel &#x27F8; amsmath
 endif
 iffont cmm
-\def\hookrightarrow{\lhook\kern-12mu\rightarrow}
-\def\hookleftarrow{\leftarrow\kern-12mu\rhook}
-\def\bowtie{\triangleright\kern-6mu\triangleleft}
+\def\hookrightarrow{\lhook\kern-12mu\rightarrow}                mathrel &#x21AA;
+\def\hookleftarrow{\leftarrow\kern-12mu\rhook}                  mathrel &#x21A9;
+\def\bowtie{\triangleright\kern-6mu\triangleleft}               mathrel &#x22C8;
 endif
 iffont msa
-\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright}                amssymb
-\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar}                  amssymb
+\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright}                mathrel &#x290F; amssymb
+\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar}                  mathrel &#x290E; amssymb
 else
-\def\dashrightarrow{- - \rightarrow}                            amssymb
-\def\dashleftarrow{\leftarrow{} - -}                            amssymb
+\def\dashrightarrow{- - \rightarrow}                            mathrel &#x290F; amssymb
+\def\dashleftarrow{\leftarrow{} - -}                            mathrel &#x290E; amssymb
 endif
-\def\dasharrow{\dashrightarrow}                                 amssymb
+\def\dasharrow{\dashrightarrow}                                 mathrel &#x290F; amssymb
 iffont msb
 \def\Join{\ltimes\kern-18.5mu\rtimes}                           amssymb
 else
 \def\Join{|x|}                                                  amssymb
 endif
 # Fixme: latin-1 chars in text file
-\def\AA{\AA}{Å}
-\def\O{\O}{Ø}
+\def\AA{\AA}{Å} textmode &Aring;  amstext,lyxmathsym
+\def\O{\O}{Ø}   textmode &Oslash; amstext,lyxmathsym
 
 iffont cmsy
 # The \sim is placed too high...
-\def\cong{\stackrel{_\sim}{=}}
+\def\cong{\stackrel{_\sim}{=}}                                  mathrel &cong;
 lyxsurd               cmsy        112 0 mathord  &radic;
-\def\surd{^\lyxsurd}
-\def\textdegree{\kern-1mu^{\circ}\kern-4mu}
+\def\surd{^\lyxsurd}                                            mathord &radic;
+\def\textdegree{\kern-1mu^{\circ}\kern-4mu} textmode &deg; 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().
 cong               lyxsymbol             64  0 mathrel  &cong;
 surd               lyxsymbol             214 0 mathord  &radic;
-textdegree         lyxsymbol             176 0 mathord  &deg;
+textdegree         lyxsymbol             176 0 mathord  &deg; textcomp,amstext,lyxmathsym
 endif
 
 #"{\hat{}}