commit 21ccd006ee7d407c95aa0909cdd93880a84893ca
Author: Richard Heck <[email protected]>
Date: Sat Jul 30 21:08:06 2016 -0400
Fix some symbols that are displayed incorrectly in MathML export.
(cherry picked from commit 88603655657e9cf7c3c858213702e2d9675b8af8)
---
lib/symbols | 74 +++++++++++++++++++++++++++++-----------------------------
status.22x | 2 +
2 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/lib/symbols b/lib/symbols
index 6106b46..fbe5f43 100644
--- a/lib/symbols
+++ b/lib/symbols
@@ -1103,20 +1103,20 @@ pod lyxblacktext 0 0 func x
amsmath
# mathtools.sty
-\def\vcentcolon{\kern4mu:\kern3mu} 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{\kern4mu:\kern3mu} 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 ::∼
#
@@ -1125,7 +1125,7 @@ pod lyxblacktext 0 0 func x
amsmath
\def\neq{\not=} mathrel ≠
\def\ne{\not=} mathrel ≠
-\def\notin{\not\in}
+\def\notin{\not\in} "" ∉
\def\slash{/}
\def\longleftrightarrow{\leftarrow\kern-12.5mu\rightarrow}
@@ -1134,32 +1134,32 @@ 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} ""
⟶
+\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} ""
⊨
else
-\def\implies{=>} amsmath
-\def\impliedby{<=} amsmath
+\def\implies{=>} amsmath
⟹
+\def\impliedby{<=} 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} ""
↪
+\def\hookleftarrow{\leftarrow\kern-12mu\rhook} ""
↩
+\def\bowtie{\triangleright\kern-6mu\triangleleft} ""
⋈
endif
iffont msa
-\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} amssymb
-\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} amssymb
+\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} amssymb
⤏
+\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} amssymb
⤎
else
-\def\dashrightarrow{- - \rightarrow} amssymb
-\def\dashleftarrow{\leftarrow{} - -} amssymb
+\def\dashrightarrow{- - \rightarrow} amssymb
⤏
+\def\dashleftarrow{\leftarrow{} - -} amssymb
⤎
endif
-\def\dasharrow{\dashrightarrow} amssymb
+\def\dasharrow{\dashrightarrow} amssymb
⤏
iffont msb
\def\Join{\ltimes\kern-18.5mu\rtimes} amssymb
else
@@ -1171,10 +1171,10 @@ endif
iffont cmsy
# The \sim is placed too high...
-\def\cong{\stackrel{_\sim}{=}}
+\def\cong{\stackrel{_\sim}{=}} ""
≅
lyxsurd cmsy 112 0 mathord √
-\def\surd{^\lyxsurd}
-\def\textdegree{\kern-1mu^{\circ}\kern-4mu}
+\def\surd{^\lyxsurd} ""
√
+\def\textdegree{\kern-1mu^{\circ}\kern-4mu} "" °
else
# FIXME: These don't work on OS X, since the Symbol font uses a different
# encoding and is therefore disabled in FontLoader::available().
diff --git a/status.22x b/status.22x
index f81d8aa..c8c7fa1 100644
--- a/status.22x
+++ b/status.22x
@@ -77,6 +77,8 @@ What's new
- Fix output of table borders (bug 10154).
+- Fix display of several math symbols (bug 8844).
+
* TEX2LYX