From: Georg Baum Date: Sun, 21 Aug 2016 18:34:40 +0000 (+0200) Subject: Fix regression of 88603655 X-Git-Tag: 2.2.3~116 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b692e3a484aa18c0bf43bfae179a407bff1c8094;p=features.git Fix regression of 88603655 The XHTML entries were added in the wrong field, if they are given we need extra xhtml requires. The order is inconsistent, there are discussions on the list about that but for now I'll use the existing order to fix the export tests. The format of the lib/symbols file does not support "" for empty strings. One would have to use x for fields that are not set (this is a hack), but actually we know how to fill the extra field. (cherry-pick of commit 338cef2a) --- diff --git a/lib/symbols b/lib/symbols index fbe5f43e46..5dc3e4cbe5 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} 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 # @@ -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} mathrel ∉ \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} 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 ⟹ amsmath +\def\impliedby{<=} mathrel ⟸ 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 ↪ +\def\hookleftarrow{\leftarrow\kern-12mu\rhook} mathrel ↩ +\def\bowtie{\triangleright\kern-6mu\triangleleft} mathrel ⋈ endif iffont msa -\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} amssymb ⤏ -\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} amssymb ⤎ +\def\dashrightarrow{\lyxdabar\lyxdabar\lyxright} mathrel ⤏ amssymb +\def\dashleftarrow{\lyxleft\lyxdabar\lyxdabar} mathrel ⤎ amssymb else -\def\dashrightarrow{- - \rightarrow} amssymb ⤏ -\def\dashleftarrow{\leftarrow{} - -} amssymb ⤎ +\def\dashrightarrow{- - \rightarrow} mathrel ⤏ amssymb +\def\dashleftarrow{\leftarrow{} - -} mathrel ⤎ amssymb endif -\def\dasharrow{\dashrightarrow} amssymb ⤏ +\def\dasharrow{\dashrightarrow} mathrel ⤏ 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}{=}} mathrel ≅ lyxsurd cmsy 112 0 mathord √ -\def\surd{^\lyxsurd} "" √ -\def\textdegree{\kern-1mu^{\circ}\kern-4mu} "" ° +\def\surd{^\lyxsurd} mathord √ +\def\textdegree{\kern-1mu^{\circ}\kern-4mu} mathord ° else # FIXME: These don't work on OS X, since the Symbol font uses a different # encoding and is therefore disabled in FontLoader::available().