X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fsymbols;h=31ba7f0eb18dbcca076be334a35d6f5264e7ec60;hb=3de5218e63e606fa2a4e4b74511548adba3da9f1;hp=f6611142a357a222e65098cebdd253ee466d3224;hpb=143a177ad34b6628dce6e76c9103eb32f981260e;p=lyx.git diff --git a/lib/symbols b/lib/symbols index f6611142a3..31ba7f0eb1 100644 --- 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 Θ @@ -298,10 +311,10 @@ diamondsuit cmsy 125 168 mathord ♢ heartsuit cmsy 126 169 mathord ♡ spadesuit cmsy 127 170 mathord ♠ # We define lyxnot as mathrel in order to have proper alignment -lyxnot cmsy 54 47 mathrel / +lyxnot cmsy 54 47 mathrel / hiddensymbol iffont cmsy -# 9mu = 0.5em which is the extra space added to relation operators -\def\not{\lyxnot\kern-9mu} +# kerning is slightly imperfect so that one can see when \not is selected +\def\not{\lyxnot} else \def\not{\kern4mu\lyxnot\kern-19mu} endif @@ -669,11 +682,16 @@ hslash msb 125 0 mathord ℏ hbar msb 126 0 mathord ℏ backepsilon msb 127 0 mathrel ϶ -lyxbar cmsy 161 0 mathord — -lyxeq cmr 61 0 mathord = -lyxdabar msa 57 0 mathord – -lyxright msa 75 0 mathord → -lyxleft msa 76 0 mathord ← +lyxbar cmsy 161 0 mathrel — hiddensymbol +lyxminus cmsy 161 0 mathbin — hiddensymbol +lyxplus cmr 43 43 mathbin + hiddensymbol +lyxeq cmr 61 61 mathord = hiddensymbol +lyxeqrel cmr 61 61 mathrel = hiddensymbol +lyxlt cmm 60 60 mathrel < hiddensymbol +lyxgt cmm 62 62 mathrel > hiddensymbol +lyxdabar msa 57 0 mathord – hiddensymbol +lyxright msa 75 0 mathord → hiddensymbol +lyxleft msa 76 0 mathord ← hiddensymbol male wasy 26 0 x ♂ female wasy 25 0 x ♀ @@ -692,7 +710,7 @@ AC wasy 58 0 textmode ∿ wasysym,amstext,lyxmath \def\HF{\approx} wasysym VHF wasy 64 0 x ≋ # triple tilde Square wasy 50 0 x □ -\def\CheckedBox{\Square\kern-0.8em\checked} wasysym +\def\CheckedBox{\Square\kern-13.4mu\checked} wasysym XBox wasy 52 0 x ⊠ hexagon wasy 55 0 x ⬡ pentagon wasy 68 0 x ⬠ @@ -726,8 +744,8 @@ Leftcircle wasy 73 0 x x LEFTCIRCLE wasy 71 0 x ◖ Rightcircle wasy 74 0 x x RIGHTCIRCLE wasy 72 0 x ◗ -\def\LEFTcircle{\LEFTCIRCLE\kern-1em\Circle} wasysym -\def\RIGHTcircle{\RIGHTCIRCLE\kern-1em\Circle} wasysym +\def\LEFTcircle{\LEFTCIRCLE\kern-13.4mu\Circle} wasysym +\def\RIGHTcircle{\RIGHTCIRCLE\kern-13.4mu\Circle} wasysym # Defined by amsmath.sty @@ -790,7 +808,7 @@ APLup wasy 0 0 x x APLdown wasy 70 0 x x APLinput wasy 125 0 x x APLcomment wasy 127 0 x x -\def\APLinv{\div\kern-17mu\APLbox} wasysym +\def\APLinv{\mathord{\div\kern-13.9mu\APLbox}} wasysym APLuparrowbox wasy 110 0 x ⍐ APLdownarrowbox wasy 111 0 x ⍗ APLleftarrowbox wasy 112 0 x ⍇ @@ -801,11 +819,11 @@ Bowtie wasy 49 0 x ⋈ leftturn wasy 34 0 x ⟲ rightturn wasy 33 0 x ⟳ # diagrams -\def\photon{\AC\kern-3mu\AC\kern-3mu\AC\kern-3mu\AC} wasysym -lyxgluonelement wasy 80 0 x x notexisting -lyxgluonbelement wasy 81 0 x x notexisting -lyxgluoneelement wasy 82 0 x x notexisting -\def\gluon{\lyxgluonbelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluonelement\kern-3mu\lyxgluoneelement} wasysym +\def\photon{\AC\AC\AC\AC} wasysym +lyxgluonelement wasy 80 0 x x hiddensymbol +lyxgluonbelement wasy 81 0 x x hiddensymbol +lyxgluoneelement wasy 82 0 x x hiddensymbol +\def\gluon{\lyxgluonbelement\lyxgluonelement\lyxgluonelement\lyxgluonelement\lyxgluonelement\lyxgluonelement\lyxgluonelement\lyxgluoneelement} wasysym # special characters cent wasy 103 0 x �A2; permil wasy 104 0 x ‰ @@ -930,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 @@ -971,15 +989,18 @@ bignplus stmry 112 0 mathop x stmaryrd # caution: named hugenpl #Largerrbracketbot stmry 126 0 mathclose x stmaryrd # only in the font, not the .sty caution: named Hugerrbracketbot in the font #rrbracketex stmry 127 0 mathclose x stmaryrd # only in the font, not the .sty caution: named Hugerrbracketex in the font -\def\varcopyright{c\kern-14mu\varbigcirc} stmaryrd -\def\longarrownot{\kern5.5mu\arrownot\kern-5.5mu} stmaryrd -\def\Longarrownot{\kern5.5mu\Arrownot\kern-5.5mu} stmaryrd -\def\Mapsto{\Mapstochar\kern-9mu\Rightarrow} stmaryrd -\def\mapsfrom{\leftarrow\kern-9mu\mapsfromchar} stmaryrd -\def\Mapsfrom{\Leftarrow\kern-9mu\Mapsfromchar} stmaryrd -\def\Longmapsto{\Mapstochar\kern-7mu\Longrightarrow} stmaryrd -\def\longmapsfrom{\longleftarrow\kern-7mu\mapsfromchar} stmaryrd -\def\Longmapsfrom{\Longleftarrow\kern-7mu\Mapsfromchar} stmaryrd +\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\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 @@ -1110,20 +1131,21 @@ pod lyxblacktext 0 0 func x amsmath # mathtools.sty -\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 +vcentcolon cmr 58 58 mathrel : mathtools +ordinarycolon cmr 58 58 mathrel : mathtools +\def\dblcolon{\vcentcolon\mathrel{\kern-0.9mu}\vcentcolon} mathrel :: mathtools +\def\coloneqq{\vcentcolon\mathrel{\kern-1.2mu}=} mathrel ≔ mathtools +\def\Coloneqq{\dblcolon\mathrel{\kern-1.2mu}=} mathrel ::= mathtools +\def\coloneq{\vcentcolon\mathrel{\kern-1.2mu}\mathrel{-}} mathrel :- mathtools +\def\Coloneq{\dblcolon\mathrel{\kern-1.2mu}\mathrel{-}} mathrel ::- mathtools +\def\eqqcolon{=\mathrel{\kern-1.2mu}\vcentcolon} mathrel ≕ mathtools +\def\Eqqcolon{=\mathrel{\kern-1.2mu}\dblcolon} mathrel =:: mathtools +\def\eqcolon{\mathrel{-}\mathrel{\kern-1.2mu}\vcentcolon} mathrel -: mathtools +\def\Eqcolon{\mathrel{-}\mathrel{\kern-1.2mu}\dblcolon} mathrel -:: mathtools +\def\colonapprox{\vcentcolon\mathrel{\kern-1.2mu}\approx} mathrel :≈ mathtools +\def\Colonapprox{\dblcolon\mathrel{\kern-1.2mu}\approx} mathrel ::≈ mathtools +\def\colonsim{\vcentcolon\mathrel{\kern-1.2mu}\sim} mathrel :∼ mathtools +\def\Colonsim{\dblcolon\mathrel{\kern-1.2mu}\sim} mathrel ::∼ mathtools # @@ -1136,55 +1158,56 @@ pod lyxblacktext 0 0 func x amsmath \def\ne{\not=} mathrel ≠ \def\lnot{\neg} mathord ¬ \def\notin{\not\in} mathrel ∉ -\def\slash{/} -\def\longleftrightarrow{\leftarrow\kern-12.5mu\rightarrow} -\def\Longleftrightarrow{\Leftarrow\kern-12.5mu\Rightarrow} -\def\iff{\Leftarrow\kern-12.5mu\Rightarrow} -\def\doteq{\stackrel{\cdot}{=}} +\def\joinrel{\mathrel{\kern-3mu}} +\def\relbar{\lyxbar} +\def\Relbar{\mathrel{=}} +\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{\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\longrightarrow{\relbar\joinrel\rightarrow} mathrel ⟶ +\def\longleftarrow{\leftarrow\joinrel\relbar} mathrel ⟵ +\def\Longrightarrow{\Relbar\joinrel\Rightarrow} mathrel ⟹ +\def\Longleftarrow{\Leftarrow\joinrel\Relbar} 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 ⊨ +\def\mapsto{\mapstochar\rightarrow} mathrel ↤ +\def\longmapsto{\mapstochar\joinrel\relbar\joinrel\rightarrow} mathrel ⟻ +\def\models{\mathrel{\vert}\joinrel\Relbar} mathrel ⊨ else \def\implies{=>} mathrel ⟹ amsmath \def\impliedby{<=} mathrel ⟸ amsmath endif iffont cmm -\def\hookrightarrow{\lhook\kern-12mu\rightarrow} mathrel ↪ -\def\hookleftarrow{\leftarrow\kern-12mu\rhook} mathrel ↩ -\def\bowtie{\triangleright\kern-6mu\triangleleft} mathrel ⋈ +\def\hookrightarrow{\lhook\joinrel\rightarrow} mathrel ↪ +\def\hookleftarrow{\leftarrow\joinrel\rhook} mathrel ↩ +\def\bowtie{\mathrel\triangleright\joinrel\mathrel\triangleleft} mathrel ⋈ endif iffont msa -\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} mathrel ⤏ amssymb -\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} mathrel ⤎ amssymb +\def\dashrightarrow{\mathrel{\lyxdabar\lyxdabar\lyxright}} mathrel ⤏ amssymb +\def\dashleftarrow{\mathrel{\lyxleft\lyxdabar\lyxdabar}} mathrel ⤎ amssymb else \def\dashrightarrow{- - \rightarrow} mathrel ⤏ amssymb \def\dashleftarrow{\leftarrow{} - -} mathrel ⤎ amssymb endif \def\dasharrow{\dashrightarrow} mathrel ⤏ amssymb iffont msb -\def\Join{\ltimes\kern-18.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: latin-1 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 ≅ +\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().