summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/csplain/fonts/uni-math.tex')
-rw-r--r--Master/texmf-dist/tex/csplain/fonts/uni-math.tex120
1 files changed, 111 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/csplain/fonts/uni-math.tex b/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
index 0951e0b30d9..6fb0922a266 100644
--- a/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
@@ -1,8 +1,8 @@
% uni-math.tex
-%%%%%%%%%%%%%%%%%%
-% Petr Olsak 2016
+%%%%%%%%%%%%%%%%%%%%%%%%
+% Petr Olsak 2016, 2019
-\def\unimathversion{May 2016} % Warning: this is at beta testing state
+\def\unimathversion{Mar. 2019} % Warning: this is at beta testing state
% Macros for loading Unicode math fonts in XeTeX or LuaTeX
@@ -26,7 +26,11 @@
\fi\fi % lua code to re-define \font primitive
\def\umathname#1#2{"#1:\mfontfeatures#2"}
-\def\mfontfeatures{mode=base;script=math;}
+\ifx\directlua\undefined
+ \def\mfontfeatures{script=math;} % XeTeX
+\else
+ \def\mfontfeatures{mode=base;script=math;} % LuaTeX
+\fi
\ifx\unimathfont\relax\else % \relax ... font will be declared later
\ifx\unimathfont\undefined \def\unimathfont{??}\fi
@@ -37,12 +41,15 @@
\message{uni-math WARNING: \string\unimathfont{\unimathfont} isn't loadable.}
\bgroup
\toks0={Examples:^^J
- \def\unimathfont{[xits-math]} ... XITS MATH^^J
+ \def\unimathfont{[XITSMath-Regular]} ... XITS MATH^^J
\def\unimathfont{[latinmodern-math]} ... Latin Modern Math^^J
\def\unimathfont{[texgyretermes-math]} ... TeXGyre Termes Math^^J
\def\unimathfont{[texgyrebonum-math]} ... TeXGyre Bonum Math^^J
\def\unimathfont{[texgyrepagella-math]} ... TeXGyre Pagella Math^^J
\def\unimathfont{[texgyreschola-math]} ... TeXGyre Schola Math^^J
+ \def\unimathfont{[texgyredejavu-math]} ... TeXGyre DeJaVu Math^^J
+ \def\unimathfont{[LibertinusMath-Regular]} ... Libertinus Math^^J
+ \def\unimathfont{[FiraMath-Regular]} ... Fira Math^^J
\def\unimathfont{[Asana-Math]} ... Asana Math^^J
\let\unimathfont=\relax ... Don't load the font right now.^^J
Note brackets if direct file name is used. Don't use quotes "...".
@@ -170,7 +177,7 @@
\chardef\ncharsnA="1D5A0 \chardef\ncharsna="1D5BA
\chardef\ncharbsA="1D5D4 \chardef\ncharbsa="1D5EE
\chardef\ncharsiA="1D608 \chardef\ncharsia="1D622
-\chardef\ncharsxA="1D63C \chardef\ncharbsx="1D656
+\chardef\ncharsxA="1D63C \chardef\ncharsxa="1D656
\chardef\ncharttA="1D670 \chardef\nchartta="1D68A
\protected\def\rmvariables {\umathrange{A-Z}\ncharrmA \umathrange{a-z}\ncharrma}
@@ -264,7 +271,7 @@
}
\catcode`#=14
\everypar={\setbox0=\lastbox \par \p}
- \input MathClass.txt
+ \input MathClass-15.txt
\endgroup
\begingroup % \input unicode-math-table.tex:
@@ -314,7 +321,91 @@
\def\overrightarrow {\Umathaccent 7 1 "020D7 }
\def\overleftrightarrow {\Umathaccent 7 1 "020E1 }
-\let\loadmathfonts=\relax % we need no more 8bit math fonts
+% corrections:
+
+\mathchardef\ldotp="612E
+\let\|=\Vert
+
+\let\setminus=\smallsetminus
+\let\diamond=\smwhtdiamond
+\let\bullet=\smblkcircle
+\let\circ=\vysmwhtcircle
+\let\bigcirc=\mdlgwhtcircle
+\let\to=\rightarrow
+\let\le=\leq
+\let\ge=\geq
+\let\neq=\ne
+\protected\def\triangle{\mathord{\bigtriangleup}}
+\let\emptyset=\varnothing
+\let\hbar=\hslash
+\let\land=\wedge
+\let\lor=\vee
+\let\owns=\ni
+\let\gets=\leftarrow
+\let\mathring=\ocirc
+\let\lnot=\neg
+\let\longdivision=\longdivisionsign
+\let\backepsilon=\upbackepsilon
+\let\eth=\matheth
+\let\dbkarow=\dbkarrow
+\let\drbkarow=\drbkarrow
+\let\hksearow=\hksearrow
+\let\hkswarow=\hkswarrow
+
+\let\varepsilon=\epsilon
+\let\upalpha=\mupalpha
+\let\upbeta=\mupbeta
+\let\upgamma=\mupgamma
+\let\updelta=\mupdelta
+\let\upepsilon=\mupvarepsilon
+\let\upvarepsilon=\mupvarepsilon
+\let\upzeta=\mupzeta
+\let\upeta=\mupeta
+\let\uptheta=\muptheta
+\let\upiota=\mupiota
+\let\upkappa=\mupkappa
+\let\uplambda=\muplambda
+\let\upmu=\mupmu
+\let\upnu=\mupnu
+\let\upxi=\mupxi
+\let\upomicron=\mupomicron
+\let\uppi=\muppi
+\let\uprho=\muprho
+\let\upvarrho=\mupvarrho
+\let\upvarsigma=\mupvarsigma
+\let\upsigma=\mupsigma
+\let\uptau=\muptau
+\let\upupsilon=\mupupsilon
+\let\upvarphi=\mupvarphi
+\let\upchi=\mupchi
+\let\uppsi=\muppsi
+\let\upomega=\mupomega
+\let\upvartheta=\mupvartheta
+\let\upphi=\mupphi
+\let\upvarpi=\mupvarpi
+
+\protected\def\not#1{%
+ \expandafter\ifx \csname not!\string#1\endcsname \relax
+ \mathrel{\mathord{\rlap{\kern1pt/}}\mathord{#1}}%
+ \else \csname not!\string#1\endcsname
+ \fi
+}
+\def\negationof#1#2{\expandafter\let \csname not!\string#1\endcsname =#2}
+\negationof = \neq
+\negationof < \nless
+\negationof > \ngtr
+\negationof \gets \nleftarrow
+\negationof \simeq \nsime
+\negationof \equal \ne
+\negationof \le \nleq
+\negationof \ge \ngeq
+\negationof \greater \ngtr
+\negationof \forksnot \forks
+\negationof \in \notin
+
+% we need no more 8bit math fonts
+
+\let\loadmathfonts=\relax
\endinput
@@ -335,7 +426,18 @@ font has its bold vaiant (like xits-math), you can re-define \boldmath macro
by:
\def\boldmath{%
- \loadumathfamily 1 {[xits-mathbold]}{} % Base font
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
+ \loadmathfamily 4 rsfs % script
+ \setmathdimens
+}
+
+XITSmath-bold needs correction: the norm symbol ||x|| is missing here. So, you
+can define:
+
+\def\boldmath{%
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
\loadmathfamily 4 rsfs % script
+ \loadumathfamily 5 {[xitsmath-regular]}{}
+ \def\|{\Udelimiter 0 5 "02016 }% % norm delimiter from family 5
\setmathdimens
}