The branch, betterspacing, has been updated. - Log -----------------------------------------------------------------
commit 6fd73db634edae49e412de4b8f96c5408f91694e Author: Jean-Marc Lasgouttes <[email protected]> Date: Thu Oct 13 20:07:45 2016 +0200 Cleanup of lib/symbols Try as far as possible to use the same definitions than in the LaTeX files. An example of that is the definition and subsequent use of \joinrel, \relbar and \Relbar. diff --git a/lib/symbols b/lib/symbols index 962324e..4d2fc16 100644 --- a/lib/symbols +++ b/lib/symbols @@ -291,7 +291,7 @@ spadesuit cmsy 127 170 mathord ♠ lyxnot cmsy 54 47 mathrel / iffont cmsy # 9mu = 0.5em which is the extra space added to relation operators -\def\not{\lyxnot\kern-9mu} +\def\not{\lyxnot} else \def\not{\kern4mu\lyxnot\kern-19mu} endif @@ -659,8 +659,7 @@ 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 = +lyxbar cmsy 161 0 mathrel — lyxdabar msa 57 0 mathord – lyxright msa 75 0 mathord → lyxleft msa 76 0 mathord ← @@ -962,14 +961,14 @@ 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{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\longarrownot{\mathrel{\kern5.5mu}\arrownot\mathrel{\kern-5.5mu}} stmaryrd +\def\Longarrownot{\mathrel{\kern5.5mu}\Arrownot\mathrel{\kern-5.5mu}} stmaryrd +\def\Mapsto{\Mapstochar\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\Longmapsto{\Mapstochar\Longrightarrow} stmaryrd +\def\longmapsfrom{\longleftarrow\mapsfromchar} stmaryrd +\def\Longmapsfrom{\Longleftarrow\Mapsfromchar} 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 @@ -1128,29 +1127,32 @@ pod lyxblacktext 0 0 func x amsmath \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\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}{=}} 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\relbar\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 @@ -1161,17 +1163,17 @@ else endif \def\dasharrow{\dashrightarrow} mathrel ⤏ amssymb iffont msb -\def\Join{\ltimes\kern-18.5mu\rtimes} amssymb +\def\Join{\mathrel{\ltimes\kern-13.5mu\rtimes}} amssymb else \def\Join{|x|} amssymb endif -# Fixme: latin-1 chars in text file +# FIXME: UTF-8 chars in text file \def\AA{\AA}{Ã } textmode Å amstext,lyxmathsym \def\O{\O}{Ã} 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 commit 0890cdd65cc4473950c95c36284cd94949cbc182 Author: Jean-Marc Lasgouttes <[email protected]> Date: Thu Oct 13 20:05:10 2016 +0200 Fixup: let operator symbols have class mathop diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp index 6a73b9b..dcde289 100644 --- a/src/mathed/InsetMathSymbol.cpp +++ b/src/mathed/InsetMathSymbol.cpp @@ -120,6 +120,8 @@ bool InsetMathSymbol::isOrdAlpha() const MathClass InsetMathSymbol::mathClass() const { + if (sym_->extra == "func" || sym_->extra == "funclim") + return MC_OP; MathClass const mc = string_to_class(sym_->extra); return (mc == MC_UNKNOWN) ? MC_ORD : mc; } ----------------------------------------------------------------------- Summary of changes: lib/symbols | 52 ++++++++++++++++++++------------------- src/mathed/InsetMathSymbol.cpp | 2 + 2 files changed, 29 insertions(+), 25 deletions(-) hooks/post-receive -- Repository for new features
