11987615580

Committed 23 Nov 2024 01:36PM UTC coverage: 68.563% (+8.0%) from 60.594%

Build # 11987615580

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2167 from Omikhleia/feat-operator-table

feat(math): Support the MathML operator dictionary and many TeX-like aliases

Run Details

4115 of 4123 new or added lines in 6 files covered. (99.81%)

214 existing lines in 5 files now uncovered.

13622 of 19868 relevant lines covered (68.56%)

3653.44 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.08

/packages/math/unicode-symbols.lua

--- Extend the unicode-symbols-generated symbols with additional aliases.
local mathml_entities = require("packages.math.mathml-entities")
local symbols = mathml_entities.symbols
local operatorDict = mathml_entities.operatorDict

--- Add aliases for symbols that have multiple names.
-- We check that the alias is already defined in the generated dictionary,
-- and that the symbol is not defined.
-- If not, we raise an error: our operator dictionary is probably broken.
-- @tparam string symbol Symbol needing an alias
-- @tparam string alias  Existing alias
local function addAlias (symbol, alias)
   if symbols[symbol] then
      SU.error("Symbol " .. symbol .. " already defined (operator dictionary is probably broken)")
   end
   if not symbols[alias] then
      SU.error("Symbol " .. alias .. " not defined (operator dictionary is probably broken)")
   end
   symbols[symbol] = symbols[alias]
end

-- \% in TeX is the regular ordinary mathpercent symbol (U+0025)
addAlias("%", "mathpercent")

-- Additional TeX-like operators
addAlias("dots", "unicodeellipsis")
addAlias("ldots", "unicodeellipsis")
addAlias("cdots", "unicodecdots")
addAlias("implies", "Longrightarrow")
addAlias("iff", "Longleftrightarrow")
addAlias("vec", "overrightarrow")

-- Alias from unicode-math/um-code-epilogue.dtx
-- (Symbols with multiple names)
addAlias("le", "leq")
addAlias("ge", "geq")
addAlias("neq", "ne")
addAlias("triangle", "bigtriangleup")
addAlias("bigcirc", "mdlgwhtcircle")
addAlias("circ", "vysmwhtcircle")
addAlias("bullet", "smblkcircle")
addAlias("yen", "mathyen")
addAlias("sterling", "mathsterling")
addAlias("diamond", "smwhtdiamond")
addAlias("emptyset", "varnothing")
addAlias("hbar", "hslash")
addAlias("land", "wedge")
addAlias("lor", "vee")
addAlias("owns", "ni")
addAlias("gets", "leftarrow")
addAlias("mathring", "ocirc")
addAlias("lnot", "neg")

-- Additional aliases from LaTeX / AMS
-- (Mix from unicode-math and AMS names in unicode.xml
addAlias("colon", "mathcolon")
addAlias("eth", "matheth")
addAlias("AA", "Angstrom")
addAlias("bbsum", "Bbbsum")
addAlias("blacksquare", "mdlgblksquare")
addAlias("square", "mdlgwhtsquare")
addAlias("lozenge", "mdlgwhtlozenge")
addAlias("circlearrowleft", "acwcirclearrow")
addAlias("circlearrowright", "cwcirclearrow")
addAlias("blacklozenge", "mdlgblklozenge")

-- (Original-TeX) TeX-like greek letters
symbols.alpha = "α"
symbols.beta = "β"
symbols.gamma = "γ"
symbols.delta = "δ"
symbols.epsilon = "ϵ"
symbols.varepsilon = "ε"
symbols.zeta = "ζ"
symbols.eta = "η"
symbols.theta = "θ"
symbols.vartheta = "ϑ"
symbols.iota = "ι"
symbols.kappa = "κ"
symbols.lambda = "λ"
symbols.mu = "μ"
symbols.nu = "ν"
symbols.xi = "ξ"
symbols.omicron = "ο"
symbols.pi = "π"
symbols.varpi = "ϖ"
symbols.rho = "ρ"
symbols.varrho = "ϱ"
symbols.sigma = "σ"
symbols.varsigma = "ς"
symbols.tau = "τ"
symbols.upsilon = "υ"
symbols.phi = "ϕ"
symbols.varphi = "φ"
symbols.chi = "χ"
symbols.psi = "ψ"
symbols.omega = "ω"
symbols.Alpha = "Α"
symbols.Beta = "Β"
symbols.Gamma = "Γ"
symbols.Delta = "Δ"
symbols.Epsilon = "Ε"
symbols.Zeta = "Ζ"
symbols.Eta = "Η"
symbols.Theta = "Θ"
symbols.Iota = "Ι"
symbols.Kappa = "Κ"
symbols.Lambda = "Λ"
symbols.Mu = "Μ"
symbols.Nu = "Ν"
symbols.Xi = "Ξ"
symbols.Omicron = "Ο"
symbols.Pi = "Π"
symbols.Rho = "Ρ"
symbols.Sigma = "Σ"
symbols.Tau = "Τ"
symbols.Upsilon = "Υ"
symbols.Phi = "Φ"
symbols.Chi = "Χ"
symbols.Psi = "Ψ"
symbols.Omega = "Ω"
-- Other TeX-like greek symbols
symbols.digamma = "ϝ" -- Supported by TeMML, MathJax, and LaTeX's unicode-math
symbols.Digamma = "Ϝ" -- Supported by LaTeX's unicode-math

-- In xml-entities's unicode.xml, the minus-hyphen (U+002D) has different
-- properties from to the minus sign (U+2212).
-- In our TeX-like syntax, they should however lead to the same symbol.
operatorDict["-"] = operatorDict["−"]

return {
   symbols = symbols,
   operatorDict = operatorDict,
}

1	--- Extend the unicode-symbols-generated symbols with additional aliases.
2	local mathml_entities = require("packages.math.mathml-entities")	16✔
3	local symbols = mathml_entities.symbols	16✔
4	local operatorDict = mathml_entities.operatorDict	16✔
5
6	--- Add aliases for symbols that have multiple names.
7	-- We check that the alias is already defined in the generated dictionary,
8	-- and that the symbol is not defined.
9	-- If not, we raise an error: our operator dictionary is probably broken.
10	-- @tparam string symbol Symbol needing an alias
11	-- @tparam string alias Existing alias
12	local function addAlias (symbol, alias)
13	if symbols[symbol] then	560✔
NEW 14	SU.error("Symbol " .. symbol .. " already defined (operator dictionary is probably broken)")	×
15	end
16	if not symbols[alias] then	560✔
NEW 17	SU.error("Symbol " .. alias .. " not defined (operator dictionary is probably broken)")	×
18	end
19	symbols[symbol] = symbols[alias]	560✔
20	end
21
22	-- \% in TeX is the regular ordinary mathpercent symbol (U+0025)
23	addAlias("%", "mathpercent")	16✔
24
25	-- Additional TeX-like operators
26	addAlias("dots", "unicodeellipsis")	16✔
27	addAlias("ldots", "unicodeellipsis")	16✔
28	addAlias("cdots", "unicodecdots")	16✔
29	addAlias("implies", "Longrightarrow")	16✔
30	addAlias("iff", "Longleftrightarrow")	16✔
31	addAlias("vec", "overrightarrow")	16✔
32
33	-- Alias from unicode-math/um-code-epilogue.dtx
34	-- (Symbols with multiple names)
35	addAlias("le", "leq")	16✔
36	addAlias("ge", "geq")	16✔
37	addAlias("neq", "ne")	16✔
38	addAlias("triangle", "bigtriangleup")	16✔
39	addAlias("bigcirc", "mdlgwhtcircle")	16✔
40	addAlias("circ", "vysmwhtcircle")	16✔
41	addAlias("bullet", "smblkcircle")	16✔
42	addAlias("yen", "mathyen")	16✔
43	addAlias("sterling", "mathsterling")	16✔
44	addAlias("diamond", "smwhtdiamond")	16✔
45	addAlias("emptyset", "varnothing")	16✔
46	addAlias("hbar", "hslash")	16✔
47	addAlias("land", "wedge")	16✔
48	addAlias("lor", "vee")	16✔
49	addAlias("owns", "ni")	16✔
50	addAlias("gets", "leftarrow")	16✔
51	addAlias("mathring", "ocirc")	16✔
52	addAlias("lnot", "neg")	16✔
53
54	-- Additional aliases from LaTeX / AMS
55	-- (Mix from unicode-math and AMS names in unicode.xml
56	addAlias("colon", "mathcolon")	16✔
57	addAlias("eth", "matheth")	16✔
58	addAlias("AA", "Angstrom")	16✔
59	addAlias("bbsum", "Bbbsum")	16✔
60	addAlias("blacksquare", "mdlgblksquare")	16✔
61	addAlias("square", "mdlgwhtsquare")	16✔
62	addAlias("lozenge", "mdlgwhtlozenge")	16✔
63	addAlias("circlearrowleft", "acwcirclearrow")	16✔
64	addAlias("circlearrowright", "cwcirclearrow")	16✔
65	addAlias("blacklozenge", "mdlgblklozenge")	16✔
66
67	-- (Original-TeX) TeX-like greek letters
68	symbols.alpha = "α"	16✔
69	symbols.beta = "β"	16✔
70	symbols.gamma = "γ"	16✔
71	symbols.delta = "δ"	16✔
72	symbols.epsilon = "ϵ"	16✔
73	symbols.varepsilon = "ε"	16✔
74	symbols.zeta = "ζ"	16✔
75	symbols.eta = "η"	16✔
76	symbols.theta = "θ"	16✔
77	symbols.vartheta = "ϑ"	16✔
78	symbols.iota = "ι"	16✔
79	symbols.kappa = "κ"	16✔
80	symbols.lambda = "λ"	16✔
81	symbols.mu = "μ"	16✔
82	symbols.nu = "ν"	16✔
83	symbols.xi = "ξ"	16✔
84	symbols.omicron = "ο"	16✔
85	symbols.pi = "π"	16✔
86	symbols.varpi = "ϖ"	16✔
87	symbols.rho = "ρ"	16✔
88	symbols.varrho = "ϱ"	16✔
89	symbols.sigma = "σ"	16✔
90	symbols.varsigma = "ς"	16✔
91	symbols.tau = "τ"	16✔
92	symbols.upsilon = "υ"	16✔
93	symbols.phi = "ϕ"	16✔
94	symbols.varphi = "φ"	16✔
95	symbols.chi = "χ"	16✔
96	symbols.psi = "ψ"	16✔
97	symbols.omega = "ω"	16✔
98	symbols.Alpha = "Α"	16✔
99	symbols.Beta = "Β"	16✔
100	symbols.Gamma = "Γ"	16✔
101	symbols.Delta = "Δ"	16✔
102	symbols.Epsilon = "Ε"	16✔
103	symbols.Zeta = "Ζ"	16✔
104	symbols.Eta = "Η"	16✔
105	symbols.Theta = "Θ"	16✔
106	symbols.Iota = "Ι"	16✔
107	symbols.Kappa = "Κ"	16✔
108	symbols.Lambda = "Λ"	16✔
109	symbols.Mu = "Μ"	16✔
110	symbols.Nu = "Ν"	16✔
111	symbols.Xi = "Ξ"	16✔
112	symbols.Omicron = "Ο"	16✔
113	symbols.Pi = "Π"	16✔
114	symbols.Rho = "Ρ"	16✔
115	symbols.Sigma = "Σ"	16✔
116	symbols.Tau = "Τ"	16✔
117	symbols.Upsilon = "Υ"	16✔
118	symbols.Phi = "Φ"	16✔
119	symbols.Chi = "Χ"	16✔
120	symbols.Psi = "Ψ"	16✔
121	symbols.Omega = "Ω"	16✔
122	-- Other TeX-like greek symbols
123	symbols.digamma = "ϝ" -- Supported by TeMML, MathJax, and LaTeX's unicode-math	16✔
124	symbols.Digamma = "Ϝ" -- Supported by LaTeX's unicode-math	16✔
125
126	-- In xml-entities's unicode.xml, the minus-hyphen (U+002D) has different
127	-- properties from to the minus sign (U+2212).
128	-- In our TeX-like syntax, they should however lead to the same symbol.
129	operatorDict["-"] = operatorDict["−"]	16✔
130
131	return {	16✔
132	symbols = symbols,	16✔
133	operatorDict = operatorDict,	16✔
134	}	16✔

sile-typesetter / sile / 11987615580

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous