diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/erewhon-math/fourier-otf.sty | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/erewhon-math/fourier-otf.sty b/Master/texmf-dist/tex/latex/erewhon-math/fourier-otf.sty index b43e11a0bf6..f7fc6e819a2 100644 --- a/Master/texmf-dist/tex/latex/erewhon-math/fourier-otf.sty +++ b/Master/texmf-dist/tex/latex/erewhon-math/fourier-otf.sty @@ -1,19 +1,25 @@ \NeedsTeXFormat{LaTeX2e}[2018/01/01] -\def\fileversion{0.47} -\def\filedate{2021/09/16} +\def\fileversion{0.50} +\def\filedate{2022-02-06} \ProvidesPackage{fourier-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine \RequirePackage{iftex}[2019/10/24] \RequireTUTeX \RequirePackage{unicode-math} -\RequirePackage{fourier-orns} +\newopentypefeature{Style}{upint}{ss03} \newopentypefeature{Style}{leqslant}{ss04} \newopentypefeature{Style}{smaller}{ss05} \newopentypefeature{Style}{subsetneq}{ss06} \newopentypefeature{Style}{parallelslant}{ss07} +\newcommand*{\Store@KV@Option}[2]{% + \def\FOT@scale{Scale}\def\FOT@opt{#1}% + \ifx\FOT@opt\FOT@scale\FOTtoksT={Scale={#2}}\fi + \FOTtoksM=\expandafter{\the\FOTtoksM #1={#2},}} +\RequirePackage{fourier-orns} % checks \Store@KV@Option availability. + % Options: forward them to \setmathfont except "tight", "loose" and "no-text". \RequirePackage{xkeyval} \newtoks\FOTtoksT @@ -32,10 +38,6 @@ \DeclareOptionX{StylisticSet}{\Store@KV@Option{StylisticSet}{#1}} \DeclareOptionX{Style}{\Store@KV@Option{Style}{#1}} \DeclareOptionX{Scale}{\Store@KV@Option{Scale}{#1}} -\newcommand*{\Store@KV@Option}[2]{% - \def\FOT@scale{Scale}\def\FOT@opt{#1}% - \ifx\FOT@opt\FOT@scale\FOTtoksT={Scale={#2}}\fi - \FOTtoksM=\expandafter{\the\FOTtoksM #1={#2},}} \ExecuteOptionsX{tight} \ProcessOptionsX % Math fonts: Erewhon-Math @@ -47,45 +49,25 @@ [\unexpanded\expandafter{\the\FOTtoksM}]% } \temp +% \ifFOT@tight \thinmuskip=2mu \medmuskip=2.5mu plus 1mu minus 2.5mu \thickmuskip=3.5mu plus 2.5mu \fi -% Text Serif fonts. +% Text Serif fonts: erewhon with possible scaling. \ifFOT@notext \else - %Text Serif fonts: Erewhon - \begingroup - \defaultfontfeatures[Erewhon] - {Extension = .otf , - UprightFont = *-Regular, - BoldFont = *-Bold, - ItalicFont = *-Italic, - BoldItalicFont = *-BoldItalic, - SlantedFont = *-RegularSlanted, - BoldSlantedFont = *-BoldSlanted} - \edef\temp{% - \endgroup - \noexpand\setmainfont{Erewhon}% - [\unexpanded\expandafter{\the\FOTtoksT}]% - } - \temp + \setmainfont{erewhon}[\unexpanded\expandafter{\the\FOTtoksT}] \fi -% Enable FourierOrns' scaling anyway. -\begingroup - \defaultfontfeatures[FourierOrns] - {Extension = .otf , - UprightFont = *-Regular, - BoldFont = *-Bold, - ItalicFont = *-Italic, - BoldItalicFont = *-BoldItalic} - \edef\temp{% - \endgroup - \noexpand\renewfontfamily\FourierOrns{FourierOrns}% - [\unexpanded\expandafter{\the\FOTtoksT}]% - } - \temp +% Enable FourierOrns font with possible scaling. +\providecommand{\FourierOrns}{\relax} % compatibility with fourier-orns v2.2 +\renewfontfamily\FourierOrns{FourierOrns-Regular.otf}[ + BoldFont = FourierOrns-Regular.otf , + ItalicFont = FourierOrns-Regular.otf , + BoldItalicFont = FourierOrns-Regular.otf , + \unexpanded\expandafter{\the\FOTtoksT}] + % Text Sans Serif fonts: default (lmss unless specified) % Text Typewriter fonts: default (lmtt unless specified) @@ -129,7 +111,13 @@ \Umathchardef\gtreqqslantless = 3 0 "E097 \relax \Umathchardef\nsubseteqq = 3 0 "E0AE \relax \Umathchardef\nsupseteqq = 3 0 "E0AF \relax - % \widearc and\overrightarc + \Umathchardef\varsymscrE = 0 0 "E07D \relax + \Umathchardef\varsymscrQ = 0 0 "E07E \relax + \Umathchardef\varsymscrT = 0 0 "E07F \relax + \Umathchardef\varsymbfscrE = 0 0 "E06D \relax + \Umathchardef\varsymbfscrQ = 0 0 "E06E \relax + \Umathchardef\varsymbfscrT = 0 0 "E06F \relax + % \widearc and\overrightarc \newcommand*{\widearc}{\Umathaccent 0 0 "E540 }% \newcommand*{\overrightarc}{\Umathaccent 0 0 "20D5 }% % From FourierOrns |