anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup of lib/symbols

Browse Source 
Try as far as possible to use the same definitions as in the LaTeX files.

An example of that is the definition and subsequent use of \joinrel,
\relbar and \Relbar.

This is mostly Guillaume's work.
This commit is contained in:
Jean-Marc Lasgouttes 2016-11-14 15:33:51 +01:00
parent 9a9a6a8c8f
commit 7335ee8ea3
1 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/symbols
View File

@ -300,8 +300,7 @@ spadesuit cmsy 127 170 mathord ♠
# We define lyxnot as mathrel in order to have proper alignment # We define lyxnot as mathrel in order to have proper alignment
lyxnot cmsy 54 47 mathrel / hiddensymbol lyxnot cmsy 54 47 mathrel / hiddensymbol
iffont cmsy iffont cmsy
# 10mu is the extra space added to relation operators \def\not{\lyxnot\mathrel{\kern-11mu}}
\def\not{\lyxnot\kern-20mu}
else else
\def\not{\kern4mu\lyxnot\kern-19mu} \def\not{\kern4mu\lyxnot\kern-19mu}
endif endif
@ -669,7 +668,7 @@ hslash msb 125 0 mathord ℏ
hbar msb 126 0 mathord ℏ hbar msb 126 0 mathord ℏ
backepsilon msb 127 0 mathrel ϶ backepsilon msb 127 0 mathrel ϶
lyxbar cmsy 161 0 mathord — hiddensymbol lyxbar cmsy 161 0 mathrel — hiddensymbol
lyxminus cmsy 161 0 mathbin — hiddensymbol lyxminus cmsy 161 0 mathbin — hiddensymbol
lyxplus cmr 43 43 mathbin + hiddensymbol lyxplus cmr 43 43 mathbin + hiddensymbol
lyxeq cmr 61 61 mathord = hiddensymbol lyxeq cmr 61 61 mathord = hiddensymbol
@ -795,7 +794,7 @@ APLup wasy 0 0 x x
APLdown wasy 70 0 x x APLdown wasy 70 0 x x
APLinput wasy 125 0 x x APLinput wasy 125 0 x x
APLcomment wasy 127 0 x x APLcomment wasy 127 0 x x
\def\APLinv{\div\kern-17.9mu\APLbox} wasysym \def\APLinv{\mathord{\div\kern-13.9mu\APLbox}} wasysym
APLuparrowbox wasy 110 0 x ⍐ APLuparrowbox wasy 110 0 x ⍐
APLdownarrowbox wasy 111 0 x ⍗ APLdownarrowbox wasy 111 0 x ⍗
APLleftarrowbox wasy 112 0 x ⍇ APLleftarrowbox wasy 112 0 x ⍇
@ -976,15 +975,15 @@ 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 #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 #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\varcopyright{\mathord{c\kern-11mu\varbigcirc}} stmaryrd
\def\longarrownot{\kern5.5mu\arrownot\kern-5.5mu} stmaryrd \def\longarrownot{\mathrel{\kern5.5mu}\arrownot\mathrel{\kern-5.5mu}} stmaryrd
\def\Longarrownot{\kern5.5mu\Arrownot\kern-5.5mu} stmaryrd \def\Longarrownot{\mathrel{\kern5.5mu}\Arrownot\mathrel{\kern-5.5mu}} stmaryrd
\def\Mapsto{\Mapstochar\kern-9mu\Rightarrow} stmaryrd \def\Mapsto{\Mapstochar\mathrel{\kern-2mu}\Rightarrow} stmaryrd
\def\mapsfrom{\leftarrow\kern-9mu\mapsfromchar} stmaryrd \def\mapsfrom{\leftarrow\kern-9mu\mapsfromchar} stmaryrd
\def\Mapsfrom{\Leftarrow\kern-9mu\Mapsfromchar} stmaryrd \def\Mapsfrom{\Leftarrow\kern-9mu\Mapsfromchar} stmaryrd
\def\Longmapsto{\Mapstochar\kern-7mu\Longrightarrow} stmaryrd \def\Longmapsto{\Mapstochar\Longrightarrow} stmaryrd
\def\longmapsfrom{\longleftarrow\kern-7mu\mapsfromchar} stmaryrd \def\longmapsfrom{\longleftarrow\mapsfromchar} stmaryrd
\def\Longmapsfrom{\Longleftarrow\kern-7mu\Mapsfromchar} stmaryrd \def\Longmapsfrom{\Longleftarrow\mathrel{\kern1mu}\Mapsfromchar} stmaryrd
# symbols from the mhchem package, all of them are equivalent to a math symbol # 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 # mhchem is not loaded because these commands can only be used inside
@ -1115,21 +1114,21 @@ pod lyxblacktext 0 0 func x amsmath
# mathtools.sty # mathtools.sty
vcentcolon cmr 58 58 mathrel : mathtools vcentcolon cmr 58 58 mathrel : mathtools
ordinarycolon cmr 58 58 mathrel : mathtools ordinarycolon cmr 58 58 mathrel : mathtools
\def\dblcolon{\vcentcolon\kern-10.9mu\vcentcolon} mathrel :: mathtools \def\dblcolon{\vcentcolon\mathrel{\kern-0.9mu}\vcentcolon} mathrel :: mathtools
\def\coloneqq{\vcentcolon\kern-11.2mu=} mathrel ≔ mathtools \def\coloneqq{\vcentcolon\mathrel{\kern-1.2mu}=} mathrel ≔ mathtools
\def\Coloneqq{\dblcolon\kern-11.2mu=} mathrel ::= mathtools \def\Coloneqq{\dblcolon\mathrel{\kern-1.2mu}=} mathrel ::= mathtools
\def\coloneq{\vcentcolon\kern-11.2mu-} mathrel :- mathtools \def\coloneq{\vcentcolon\mathrel{\kern-1.2mu}\mathrel{-}} mathrel :- mathtools
\def\Coloneq{\dblcolon\kern-11.2mu-} mathrel ::- mathtools \def\Coloneq{\dblcolon\mathrel{\kern-1.2mu}\mathrel{-}} mathrel ::- mathtools
\def\eqqcolon{=\kern-11.2mu\vcentcolon} mathrel ≕ mathtools \def\eqqcolon{=\mathrel{\kern-1.2mu}\vcentcolon} mathrel ≕ mathtools
\def\Eqqcolon{=\kern-11.2mu\dblcolon} mathrel =:: mathtools \def\Eqqcolon{=\mathrel{\kern-1.2mu}\dblcolon} mathrel =:: mathtools
\def\eqcolon{-\kern-11.2mu\vcentcolon} mathrel -: mathtools \def\eqcolon{\mathrel{-}\mathrel{\kern-1.2mu}\vcentcolon} mathrel -: mathtools
\def\Eqcolon{-\kern-11.2mu\dblcolon} mathrel -:: mathtools \def\Eqcolon{\mathrel{-}\mathrel{\kern-1.2mu}\dblcolon} mathrel -:: mathtools
\def\colonapprox{\vcentcolon\kern-11.2mu\approx} mathrel :≈ mathtools \def\colonapprox{\vcentcolon\mathrel{\kern-1.2mu}\approx} mathrel :≈ mathtools
\def\Colonapprox{\dblcolon\kern-11.2mu\approx} mathrel ::≈ mathtools \def\Colonapprox{\dblcolon\mathrel{\kern-1.2mu}\approx} mathrel ::≈ mathtools
\def\colonsim{\vcentcolon\kern-11.2mu\sim} mathrel :∼ mathtools \def\colonsim{\vcentcolon\mathrel{\kern-1.2mu}\sim} mathrel :∼ mathtools
\def\Colonsim{\dblcolon\kern-11.2mu\sim} mathrel ::∼ mathtools \def\Colonsim{\dblcolon\mathrel{\kern-1.2mu}\sim} mathrel ::∼ mathtools
# #
@ -1144,50 +1143,53 @@ ordinarycolon cmr 58 58 mathrel : mathtools
\def\notin{\not\in} mathrel ∉ \def\notin{\not\in} mathrel ∉
\def\slash{/} \def\slash{/}
\def\longleftrightarrow{\leftarrow\kern-12.5mu\rightarrow} \def\joinrel{\mathrel{\kern-3mu}}
\def\Longleftrightarrow{\Leftarrow\kern-12.5mu\Rightarrow} \def\relbar{\lyxbar}
\def\iff{\Leftarrow\kern-12.5mu\Rightarrow} \def\Relbar{\mathrel{=}}
\def\longleftrightarrow{\leftarrow\joinrel\rightarrow}
\def\Longleftrightarrow{\Leftarrow\joinrel\Rightarrow}
\def\iff{\Leftarrow\joinrel\Rightarrow}
\def\doteq{\stackrel{\cdot}{=}} \def\doteq{\stackrel{\cdot}{=}}
iffont cmsy iffont cmsy
\def\longrightarrow{\lyxbar\kern-11mu\rightarrow} mathrel ⟶ \def\longrightarrow{\relbar\joinrel\rightarrow} mathrel ⟶
\def\longleftarrow{\leftarrow\kern-11mu\lyxbar} mathrel ⟵ \def\longleftarrow{\leftarrow\joinrel\relbar} mathrel ⟵
\def\Longrightarrow{\lyxeq\kern-9.5mu\Rightarrow} mathrel ⟹ \def\Longrightarrow{\Relbar\joinrel\Rightarrow} mathrel ⟹
\def\Longleftarrow{\Leftarrow\kern-9.5mu\lyxeq} mathrel ⟸ \def\Longleftarrow{\Leftarrow\joinrel\Relbar} mathrel ⟸
\def\implies{\Longrightarrow} mathrel ⟹ amsmath \def\implies{\Longrightarrow} mathrel ⟹ amsmath
\def\impliedby{\Longleftarrow} mathrel ⟸ amsmath \def\impliedby{\Longleftarrow} mathrel ⟸ amsmath
\def\mapsto{\mapstochar\kern-9mu\rightarrow} mathrel ↤ \def\mapsto{\mapstochar\mathrel{\kern-2mu}\rightarrow} mathrel ↤
\def\longmapsto{\mapstochar\kern-6mu\lyxbar\kern-11mu\rightarrow} mathrel ⟻ \def\longmapsto{\mapstochar\joinrel\relbar\joinrel\rightarrow} mathrel ⟻
\def\models{\vert\kern-3mu\lyxeq} mathrel ⊨ \def\models{\mathrel{\vert}\joinrel\Relbar} mathrel ⊨
else else
\def\implies{=>} mathrel ⟹ amsmath \def\implies{=>} mathrel ⟹ amsmath
\def\impliedby{<=} mathrel &#x27F8; amsmath \def\impliedby{<=} mathrel &#x27F8; amsmath
endif endif
iffont cmm iffont cmm
\def\hookrightarrow{\lhook\kern-12mu\rightarrow} mathrel &#x21AA; \def\hookrightarrow{\lhook\joinrel\rightarrow} mathrel &#x21AA;
\def\hookleftarrow{\leftarrow\kern-12mu\rhook} mathrel &#x21A9; \def\hookleftarrow{\leftarrow\joinrel\rhook} mathrel &#x21A9;
\def\bowtie{\triangleright\kern-10mu\triangleleft} mathrel &#x22C8; \def\bowtie{\mathrel\triangleright\joinrel\mathrel\triangleleft} mathrel &#x22C8;
endif endif
iffont msa iffont msa
\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} mathrel &#x290F; amssymb \def\dashrightarrow{\mathrel{\lyxdabar\lyxdabar\lyxright}} mathrel &#x290F; amssymb
\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} mathrel &#x290E; amssymb \def\dashleftarrow{\mathrel{\lyxleft\lyxdabar\lyxdabar}} mathrel &#x290E; amssymb
else else
\def\dashrightarrow{- - \rightarrow} mathrel &#x290F; amssymb \def\dashrightarrow{- - \rightarrow} mathrel &#x290F; amssymb
\def\dashleftarrow{\leftarrow{} - -} mathrel &#x290E; amssymb \def\dashleftarrow{\leftarrow{} - -} mathrel &#x290E; amssymb
endif endif
\def\dasharrow{\dashrightarrow} mathrel &#x290F; amssymb \def\dasharrow{\dashrightarrow} mathrel &#x290F; amssymb
iffont msb iffont msb
\def\Join{\ltimes\kern-22mu\rtimes} amssymb \def\Join{\mathrel{\ltimes\kern-13.5mu\rtimes}} amssymb
else else
\def\Join{|x|} amssymb \def\Join{|x|} amssymb
endif endif
# Fixme: latin-1 chars in text file # FIXME: UTF-8 chars in text file
\def\AA{\AA}{Å} textmode &Aring; amstext,lyxmathsym \def\AA{\AA}{Å} textmode &Aring; amstext,lyxmathsym
\def\O{\O}{Ø} textmode &Oslash; amstext,lyxmathsym \def\O{\O}{Ø} textmode &Oslash; amstext,lyxmathsym
iffont cmsy iffont cmsy
# The \sim is placed too high... # The \sim is placed too high...
\def\cong{\stackrel{_\sim}{=}} mathrel &cong; \def\cong{\stackrel{\sim}{=}} mathrel &cong;
lyxsurd cmsy 112 0 mathord &radic; lyxsurd cmsy 112 0 mathord &radic;
\def\surd{^\lyxsurd} mathord &radic; \def\surd{^\lyxsurd} mathord &radic;
\def\textdegree{\kern-1mu^{\circ}\kern-4mu} textmode &deg; textcomp,amstext,lyxmathsym \def\textdegree{\kern-1mu^{\circ}\kern-4mu} textmode &deg; textcomp,amstext,lyxmathsym