diff options
Diffstat (limited to 'fonts')
55 files changed, 324 insertions, 201 deletions
diff --git a/fonts/concmath-otf/Concrete-Math.otf b/fonts/concmath-otf/Concrete-Math.otf Binary files differindex 81b5d49460..f3e54d45be 100644 --- a/fonts/concmath-otf/Concrete-Math.otf +++ b/fonts/concmath-otf/Concrete-Math.otf diff --git a/fonts/concmath-otf/README.md b/fonts/concmath-otf/README.md index 066cffa65f..c9749ff737 100644 --- a/fonts/concmath-otf/README.md +++ b/fonts/concmath-otf/README.md @@ -81,6 +81,10 @@ Either version 1.3 or, at your option, any later version. Hans Hagen). - Most horizontal arrows and harpoons are now stretchable (dito). - Glyphs \leqqslant, \geqqslant, \nleqqslant, \ngeqqslant added. +* v0.41: + - radicals corrected. + - concmath-otf.sty: options handled by `l3keys` instead of `xkeyval` + (requires a LaTeX kernel not older than 2022-06-01). --- Copyright 2022-2023 Daniel Flipo diff --git a/fonts/concmath-otf/concmath-otf.ltx b/fonts/concmath-otf/concmath-otf.ltx index 752319b5c5..9220b3e048 100644 --- a/fonts/concmath-otf/concmath-otf.ltx +++ b/fonts/concmath-otf/concmath-otf.ltx @@ -27,7 +27,7 @@ \title{Concrete Math font, OTF version} \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}} -\newcommand*{\version}{0.40} +\newcommand*{\version}{0.41} \begin{document} \maketitle @@ -291,6 +291,8 @@ their smaller variants as shown by table~\vref{ss05}. \hline Command & Default & Variant \\ \hline + \cmd{in} & $\in$ & $\smallin$ \\ + \cmd{ni} & $\ni$ & $\smallni$ \\ \cmd{mid} & $\mid$ & $\shortmid$ \\ \cmd{nmid} & $\nmid$ & $\nshortmid$ \\ \cmd{parallel} & $\parallel$ & $\shortparallel$ \\ @@ -330,6 +332,43 @@ instead of\qquad \setmathfont{Concrete-Math.otf}% $x\leq y \quad A \subsetneq B$ +\verb+StylisticSet=3+, alias% +\footnote{These \texttt{Style} aliases are provided by \file{concmath-otf.sty}.} +\verb+Style=upint+, converts integrals signs into their upright +variants, see table~\vref{ss03}. +\begin{table}[ht] + \let\DS\displaystyle + \centering + \caption{Style=upint\quad (+ss03)}\hlabel{ss03} + \begin{tabular}[t]{@{}l*{8}c@{}} + \hline + Command &\cmd{int} &\cmd{iint} &\cmd{iiint} &\cmd{iiiint} + &\cmd{oint} &\cmd{oiint} &\cmd{oiiint} \\ + \hline + Default\rule[-15pt]{0pt}{35pt} &$\DS\int$ &$\DS\iint$ &$\DS\iiint$ &$\DS\iiiint$ + &$\DS\oint$ &$\DS\oiint$ &$\DS\oiint$ &$\DS\oiiint$ + \\[\baselineskip] + \setmathfont{Concrete-Math.otf}[Style=upint] + Upright\rule[-15pt]{0pt}{30pt} &$\DS\int$ &$\DS\iint$ &$\DS\iiint$ &$\DS\iiiint$ + &$\DS\oint$ &$\DS\oiint$ &$\DS\oiint$ &$\DS\oiiint$ \\ + \hline + \end{tabular}\\[\baselineskip] + \setmathfont{Concrete-Math.otf} + \begin{tabular}[t]{@{}l*{4}c@{}} + \hline + Command &\cmd{intclockwise} &\cmd{awint} + &\cmd{varointclockwise} &\cmd{ointctrclockwise} \\ + \hline + Default\rule[-15pt]{0pt}{35pt} &$\DS\intclockwise$ &$\DS\awint$ + &$\DS\varointclockwise$ &$\DS\ointctrclockwise$ \\ + \setmathfont{Concrete-Math.otf}[Style=upint] + Upright\rule[-15pt]{0pt}{30pt} &$\DS\intclockwise$ &$\DS\awint$ + &$\DS\varointclockwise$ &$\DS\ointctrclockwise$ \\ + \hline + \end{tabular} +\end{table} +\setmathfont{Concrete-Math.otf} + \subsection{Standard \LaTeX{} math commands} \label{ssec-math-commands} diff --git a/fonts/concmath-otf/concmath-otf.pdf b/fonts/concmath-otf/concmath-otf.pdf Binary files differindex eb57fcf64e..fc7214604d 100644 --- a/fonts/concmath-otf/concmath-otf.pdf +++ b/fonts/concmath-otf/concmath-otf.pdf diff --git a/fonts/concmath-otf/concmath-otf.sty b/fonts/concmath-otf/concmath-otf.sty index 27eb39c983..38b74d8690 100644 --- a/fonts/concmath-otf/concmath-otf.sty +++ b/fonts/concmath-otf/concmath-otf.sty @@ -1,6 +1,6 @@ -\NeedsTeXFormat{LaTeX2e}[2018/01/01] -\def\fileversion{0.40} -\def\filedate{2023-03-28} +\NeedsTeXFormat{LaTeX2e}[2022/06/01] +\def\fileversion{0.41} +\def\filedate{2023-06-21} \ProvidesPackage{concmath-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -13,27 +13,26 @@ \newopentypefeature{Style}{smaller}{+ss05} \newopentypefeature{Style}{subsetneq}{+ss06} -% Options: forward them to \setmathfont except "tight", "loose" and "no-text". -\RequirePackage{xkeyval} \newtoks\CCMtoks -\newcommand*{\Store@KV@Option}[2]{% +\newcommand*{\CCM@KV@Option}[2]{% \CCMtoks=\expandafter{\the\CCMtoks #1={#2},}} -\newif\ifCCM@tight -\newif\ifCCM@notext - -\DeclareOptionX{no-text}{\CCM@notexttrue} -\DeclareOptionX{tight}{\CCM@tighttrue} -\DeclareOptionX{loose}{\CCM@tightfalse} -\DeclareOptionX{math-style}{\Store@KV@Option{math-style}{#1}} -\DeclareOptionX{bold-style}{\Store@KV@Option{bold-style}{#1}} -\DeclareOptionX{nabla}{\Store@KV@Option{nabla}{#1}} -\DeclareOptionX{partial}{\Store@KV@Option{partial}{#1}} -\DeclareOptionX{CharacterVariant}{\Store@KV@Option{CharacterVariant}{#1}} -\DeclareOptionX{StylisticSet}{\Store@KV@Option{StylisticSet}{#1}} -\DeclareOptionX{Style}{\Store@KV@Option{Style}{#1}} -\ExecuteOptionsX{tight} -\ProcessOptionsX +% Package options +\DeclareKeys + { + no-text.if = CCM@notext , + tight.if = CCM@tight , + loose.code = \CCM@tightfalse , + math-style.code = \CCM@KV@Option{math-style}{#1} , + bold-style.code = \CCM@KV@Option{bold-style}{#1} , + nabla.code = \CCM@KV@Option{nabla}{#1} , + partial.code = \CCM@KV@Option{partial}{#1} , + CharacterVariant.code = \CCM@KV@Option{CharacterVariant}{#1} , + StylisticSet.code = \CCM@KV@Option{StylisticSet}{#1} , + Style.code = \CCM@KV@Option{Style}{#1} , + } +\CCM@tighttrue +\ProcessKeyOptions % \ifCCM@tight \thinmuskip=2mu diff --git a/fonts/concmath-otf/unimath-concrete.pdf b/fonts/concmath-otf/unimath-concrete.pdf Binary files differindex c88d328f1a..3f1d3470d9 100644 --- a/fonts/concmath-otf/unimath-concrete.pdf +++ b/fonts/concmath-otf/unimath-concrete.pdf diff --git a/fonts/erewhon-math/Erewhon-Math-Bold.otf b/fonts/erewhon-math/Erewhon-Math-Bold.otf Binary files differindex 1e6154289f..0a2598f595 100644 --- a/fonts/erewhon-math/Erewhon-Math-Bold.otf +++ b/fonts/erewhon-math/Erewhon-Math-Bold.otf diff --git a/fonts/erewhon-math/Erewhon-Math.ltx b/fonts/erewhon-math/Erewhon-Math.ltx index c6d6b55c9d..1740a4747f 100644 --- a/fonts/erewhon-math/Erewhon-Math.ltx +++ b/fonts/erewhon-math/Erewhon-Math.ltx @@ -33,7 +33,7 @@ \title{\decofourleft\,\FOTF\,\decofourright} \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}} -\newcommand*{\version}{0.60} +\newcommand*{\version}{0.61} \begin{document} \maketitle @@ -628,6 +628,10 @@ a \emph{limited} bold variant has been added in version~0.54. Example of usage:\ \\ \verb+\section{\mathversion{bold} Einstein’s equation $E=mc^2$}+ +It is also possible to use the \verb+\boldmath+ command:\\ +\verb+\setmathfont{Erewhon-Math-Regular.otf}[BoldFont=Erewhon-Math-Bold.otf]+\\ +\verb+\section{\boldmath Einstein’s equation $E=mc^2$}+ + \subsection{Missing symbols} \FOTF{} does not aim at being as complete as \file{STIXTwoMath-Regular} or diff --git a/fonts/erewhon-math/Erewhon-Math.otf b/fonts/erewhon-math/Erewhon-Math.otf Binary files differindex f179c88b6d..6072cfb8be 100644 --- a/fonts/erewhon-math/Erewhon-Math.otf +++ b/fonts/erewhon-math/Erewhon-Math.otf diff --git a/fonts/erewhon-math/Erewhon-Math.pdf b/fonts/erewhon-math/Erewhon-Math.pdf Binary files differindex 5baa86eba8..cbfc54da55 100644 --- a/fonts/erewhon-math/Erewhon-Math.pdf +++ b/fonts/erewhon-math/Erewhon-Math.pdf diff --git a/fonts/erewhon-math/README.md b/fonts/erewhon-math/README.md index 8fb717d3af..9b64e4fda0 100644 --- a/fonts/erewhon-math/README.md +++ b/fonts/erewhon-math/README.md @@ -50,99 +50,106 @@ Either version 1.3 or, at your option, any later version. * First public version: 0.40 * v0.41: - - Added chars U+2AB1 to U+2AB4 (\precneq, \succneq, \preceqq, \succeqq). - - Fixed kerning between Italic/BoldItalic Latin and Greek letters - and their subscript. + - Added chars U+2AB1 to U+2AB4 (\precneq, \succneq, \preceqq, \succeqq). + - Fixed kerning between Italic/BoldItalic Latin and Greek letters + and their subscript. * v0.42: - - Added thirty symbols U+00B0 (degree), U+01B5, U+214B, U+2232, U+2233, - arrows U+2933 to U+2937 and some more. - - Improved kerning between roots and degrees. - - Improved kerning between arrows accents and parenthesis. - - Accents position above italic dans bold italic latin - and greek letters tuned. + - Added thirty symbols U+00B0 (degree), U+01B5, U+214B, U+2232, U+2233, + arrows U+2933 to U+2937 and some more. + - Improved kerning between roots and degrees. + - Improved kerning between arrows accents and parenthesis. + - Accents position above italic dans bold italic latin + and greek letters tuned. * v0.43 - - Corrected "IsExtended" flags. - - Improved kernings for differential elements. - - Changed \hbar, which now behaves as intended by unicode-math package. - - Glyph \Game (U+2141) corrected (it was upside down). + - Corrected "IsExtended" flags. + - Improved kernings for differential elements. + - Changed \hbar, which now behaves as intended by unicode-math package. + - Glyph \Game (U+2141) corrected (it was upside down). * v0.44 - - Improved sub- and superscripts: glyphs redesigned bolder, - size reduced (70%, 55%) instead of (76%, 60%). - - Fixed right kernings of "italic f". - - Fixed right bearings and italic corrections of mathscr capitals. + - Improved sub- and superscripts: glyphs redesigned bolder, + size reduced (70%, 55%) instead of (76%, 60%). + - Fixed right kernings of "italic f". + - Fixed right bearings and italic corrections of mathscr capitals. * v0.45 - - Added stretchy accents \wideoverbar, \widebreve, \widecheck. + - Added stretchy accents \wideoverbar, \widebreve, \widecheck. * v0.46 - - Stretchable \langle, \rangle, \lAngle and \rangle delimiters - are now available in eight sizes (three bigger sizes added). - - Sub- and superscripts reshaped: boldness slightly reduced. + - Stretchable \langle, \rangle, \lAngle and \rangle delimiters + are now available in eight sizes (three bigger sizes added). + - Sub- and superscripts reshaped: boldness slightly reduced. * v0.47 - - Added \mdsmwhtsquare (U+25FD), \mdsmblksquare (U+25FE), - \lgwhtsquare (U+02B1B), \lgblksquare U+02B1C). - - Tuned all "squares", "circles" and "triangles": the smaller ones - are centered on the math-axis, larger ones rest on the baseline. - - Redesigned symbols \angle, \measuredangle, \sphericalangle - (U+2220 to U+2222). - - Redesigned lowercase script letters \mscre, \mscrg, \mscro - (U+212F, U+210A, U+2134). - - Added symbols \inttop, \intbottom, \sumtop, \sumbottom - (U+2320, U+2321, U+23B2, U+23B3). - - Added symbols \hrectangleblack (U+025AC), \hrectangle (U+025AD), - \mdlgwhtlozenge (U+25CA) \mdlgblklozenge (U+29EB). - - Added symbols \enclosedcircle, \enclosedsquare, \encloseddiamond, - \enclosedtriangle (U+20DD, U+20DE, U+20DF, U+20E4). - - Added symbols \lozengeminus, \concavediamond, \concavediamondticketleft, - \concavediamondticketright (U+27E0 to U+27E3). - - Added symbols \mdblkdiamond, \mdwhtdiamond, \mdblklozenge, - \mdwhtlozenge, \smblkdiamond, \smblklozenge, \smwhtlozenge - (U+2B25 to U+2B2B). + - Added \mdsmwhtsquare (U+25FD), \mdsmblksquare (U+25FE), + \lgwhtsquare (U+02B1B), \lgblksquare U+02B1C). + - Tuned all "squares", "circles" and "triangles": the smaller ones + are centered on the math-axis, larger ones rest on the baseline. + - Redesigned symbols \angle, \measuredangle, \sphericalangle + (U+2220 to U+2222). + - Redesigned lowercase script letters \mscre, \mscrg, \mscro + (U+212F, U+210A, U+2134). + - Added symbols \inttop, \intbottom, \sumtop, \sumbottom + (U+2320, U+2321, U+23B2, U+23B3). + - Added symbols \hrectangleblack (U+025AC), \hrectangle (U+025AD), + \mdlgwhtlozenge (U+25CA) \mdlgblklozenge (U+29EB). + - Added symbols \enclosedcircle, \enclosedsquare, \encloseddiamond, + \enclosedtriangle (U+20DD, U+20DE, U+20DF, U+20E4). + - Added symbols \lozengeminus, \concavediamond, \concavediamondticketleft, + \concavediamondticketright (U+27E0 to U+27E3). + - Added symbols \mdblkdiamond, \mdwhtdiamond, \mdblklozenge, + \mdwhtlozenge, \smblkdiamond, \smblklozenge, \smwhtlozenge + (U+2B25 to U+2B2B). - Added two options (no-text, Scale=) to fourier-otf.sty. * v0.50 - - Changes in Erewhon-Math: - * Added upright versions of integrals (StylisticSet=3 feature). - * All bold Math Script uppercase characters redesigned (their - look was not consistent with their normal weight counterparts). - * Added variants for mscrE, mscrQ and mscrT and their bold - counterparts accessible through cv20, cv21 and cv22 respectively. - * Added U+0338 for negation of "\mathrel" chars. - - Changes in FourierOrns: - * \texpertenthousand now defined in Erewhon (v.1.118). - * \eurologo now borrowed from Erewhon (v.1.118). - * Files FourierOrns-Bold.otf, FourierOrns-Italic.otf and - FourierOrns-BoldItalic.otf (useless now) deleted. - * Breaking change: ornaments \leafleft and \leafright - swapped in order to match the orignal type1 version. + - Changes in Erewhon-Math: + * Added upright versions of integrals (StylisticSet=3 feature). + * All bold Math Script uppercase characters redesigned (their + look was not consistent with their normal weight counterparts). + * Added variants for mscrE, mscrQ and mscrT and their bold + counterparts accessible through cv20, cv21 and cv22 respectively. + * Added U+0338 for negation of "\mathrel" chars. + - Changes in FourierOrns: + * \texpertenthousand now defined in Erewhon (v.1.118). + * \eurologo now borrowed from Erewhon (v.1.118). + * Files FourierOrns-Bold.otf, FourierOrns-Italic.otf and + FourierOrns-BoldItalic.otf (useless now) deleted. + * Breaking change: ornaments \leafleft and \leafright + swapped in order to match the orignal type1 version. * v0.51 - - Feature +onum added (oldstyle numerals in maths). - Option fulloldstyle added to fourier-otf.sty, this option was - available with the original fourier-GUTenberg package. - - Sub- and superscript placement corrected for bold calligraphic capitals. - - Metrics changed for sans-serif and typewriter glyphs. + - Feature +onum added (oldstyle numerals in maths). + Option fulloldstyle added to fourier-otf.sty, this option was + available with the original fourier-GUTenberg package. + - Sub- and superscript placement corrected for bold calligraphic capitals. + - Metrics changed for sans-serif and typewriter glyphs. * v0.52 - - Over/underbrace: metrics of horizontal variants tuned. - - Added glyphs \nleqqslant and \ngeqqslant (U+E09A, U+E09B). - - Fixed "Style=" options in fourier-otf.sty (they didn't work for XeLaTeX). + - Over/underbrace: metrics of horizontal variants tuned. + - Added glyphs \nleqqslant and \ngeqqslant (U+E09A, U+E09B). + - Fixed "Style=" options in fourier-otf.sty (they didn't work for XeLaTeX). * v0.53 - - fourier-otf.sty now loads realscripts for better superscripts. - - Vertical variants of \mathslash, \backslash: slope corrected. - - Added proportional digits and lnum, pnum features in math mode. - - Added character variant (cv11) for \partial. + - fourier-otf.sty now loads realscripts for better superscripts. + - Vertical variants of \mathslash, \backslash: slope corrected. + - Added proportional digits and lnum, pnum features in math mode. + - Added character variant (cv11) for \partial. * v0.54 - - Delimiters' sizes `()’, `[]’ and `{}’ now match those of the - Erewhon text fonts. Bacward compatibility option (+ss09) added. - - Slight correction to degree position on radicals. - - Experimental Bold variant added. - - Glyph Bbbsum.v1 (displaystyle) added. - - Metrics of some italic capitals (H,M,N,U) corrected. + - Delimiters' sizes `()’, `[]’ and `{}’ now match those of the + Erewhon text fonts. Bacward compatibility option (+ss09) added. + - Slight correction to degree position on radicals. + - Experimental Bold variant added. + - Glyph Bbbsum.v1 (displaystyle) added. + - Metrics of some italic capitals (H,M,N,U) corrected. * v0.55 - - Fixed vertical variants of \Vert and \Vvert. - - Added stretchable integral for U+222B (usable with luametatex). + - Fixed vertical variants of \Vert and \Vvert. + - Added stretchable integral for U+222B (usable with luametatex). * v0.56 - - Package now compatible with mathtools’ stretchable arrows. - - \diagup and \diagdown moved from private area to U+27CB, U+27CD. + - Package now compatible with mathtools’ stretchable arrows. + - \diagup and \diagdown moved from private area to U+27CB, U+27CD. * v0.60 - Metrics of all "under" arrows and harpoons corrected. - Most horizontal arrows and harpoons are now stretchable. +* v0.61 + - fourier-otf.sty: options handled by `l3keys` instead of `xkeyval` + (requires a LaTeX kernel not older than 2022-06-01). + - fourier-otf.sty: option "fulloldstyle" now applies to both text + and maths fonts. + - Fixed widths of under/overbraces variants. + - Blackboard bold capitals added to Erewhon-Math-Bold.otf. --- Copyright 2019-2023 Michel Bovani, Daniel Flipo diff --git a/fonts/erewhon-math/fourier-otf.sty b/fonts/erewhon-math/fourier-otf.sty index 08b5daa413..bac945866e 100644 --- a/fonts/erewhon-math/fourier-otf.sty +++ b/fonts/erewhon-math/fourier-otf.sty @@ -1,6 +1,6 @@ -\NeedsTeXFormat{LaTeX2e}[2018/01/01] -\def\fileversion{0.60} -\def\filedate{2023-03-28} +\NeedsTeXFormat{LaTeX2e}[2022/06/01] +\def\fileversion{0.61} +\def\filedate{2023-06-21} \ProvidesPackage{fourier-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -15,37 +15,46 @@ \newopentypefeature{Style}{parallelslant}{+ss07} \newopentypefeature{Style}{smalldelim}{+ss09} -\newif\ifFOT@tight -\newif\ifFOT@notext +\newtoks\FOTtoksT +\newtoks\FOTtoksM \newcommand*{\Store@KV@Option}[2]{% + \FOTtoksM=\expandafter{\the\FOTtoksM #1={#2},} \def\FOT@opt{#1}\def\FOT@val{#2}% + \def\FOT@fullos{Numbers}% \def\FOT@scale{Scale}% - \ifx\FOT@opt\FOT@scale\FOTtoksT={Scale={#2}}\fi - \FOTtoksM=\expandafter{\the\FOTtoksM #1={#2},} + \ifx\FOT@opt\FOT@fullos + \FOTtoksT=\expandafter{\the\FOTtoksT Numbers=OldStyle,}% + \fi + \ifx\FOT@opt\FOT@scale + \FOTtoksT=\expandafter{\the\FOTtoksT Scale={#2},}% + \fi } +% \RequirePackage{fourier-orns} % checks \Store@KV@Option availability. - -% Options: forward them to \setmathfont except "tight", "loose" and "no-text". -\RequirePackage{xkeyval} -\newtoks\FOTtoksT -\newtoks\FOTtoksM - -\DeclareOptionX{no-text}{\FOT@notexttrue} -\DeclareOptionX{tight}{\FOT@tighttrue} -\DeclareOptionX{loose}{\FOT@tightfalse} -\DeclareOptionX{fulloldstyle}{\Store@KV@Option{Numbers}{OldStyle}} -\DeclareOptionX{math-style}{\Store@KV@Option{math-style}{#1}} -\DeclareOptionX{bold-style}{\Store@KV@Option{bold-style}{#1}} -\DeclareOptionX{nabla}{\Store@KV@Option{nabla}{#1}} -\DeclareOptionX{partial}{\Store@KV@Option{partial}{#1}} -\DeclareOptionX{CharacterVariant}{\Store@KV@Option{CharacterVariant}{#1}} -\DeclareOptionX{StylisticSet}{\Store@KV@Option{StylisticSet}{#1}} -\DeclareOptionX{Style}{\Store@KV@Option{Style}{#1}} -\DeclareOptionX{Scale}{\Store@KV@Option{Scale}{#1}} -\ExecuteOptionsX{tight} -\ProcessOptionsX +% +% Package options +\DeclareKeys + { + no-text.if = FOT@notext , + tight.if = FOT@tight , + loose.code = \FOT@tightfalse , + fulloldstyle.code = \Store@KV@Option{Numbers}{OldStyle} , + math-style.code = \Store@KV@Option{math-style}{#1} , + bold-style.code = \Store@KV@Option{bold-style}{#1} , + nabla.code = \Store@KV@Option{nabla}{#1} , + partial.code = \Store@KV@Option{partial}{#1} , + CharacterVariant.code = \Store@KV@Option{CharacterVariant}{#1} , + StylisticSet.code = \Store@KV@Option{StylisticSet}{#1} , + Style.code = \Store@KV@Option{Style}{#1} , + Scale.code = \Store@KV@Option{Scale}{#1} + } +% +\FOT@tighttrue +\ProcessKeyOptions +% % Math fonts: Erewhon-Math.otf. No Family name for XeLaTEX! % Following Joseph Wright in https://tex.stackexchange.com/questions/451 +\Store@KV@Option{BoldFont}{Erewhon-Math-Bold.otf} \begingroup \edef\temp{% \endgroup @@ -59,7 +68,7 @@ \medmuskip=2.5mu plus 1mu minus 2.5mu \thickmuskip=3.5mu plus 2.5mu \fi -% Text Serif fonts: erewhon with possible scaling. +% Text Serif fonts: erewhon with possible scaling and oldstyle numbers. \ifFOT@notext \else \RequirePackage{realscripts} diff --git a/fonts/erewhon-math/unimath-erewhon.pdf b/fonts/erewhon-math/unimath-erewhon.pdf Binary files differindex ec607c8e3e..47ac7a70ce 100644 --- a/fonts/erewhon-math/unimath-erewhon.pdf +++ b/fonts/erewhon-math/unimath-erewhon.pdf diff --git a/fonts/euler-math/Euler-Math.ltx b/fonts/euler-math/Euler-Math.ltx index a5146ac36d..147fde9bf7 100644 --- a/fonts/euler-math/Euler-Math.ltx +++ b/fonts/euler-math/Euler-Math.ltx @@ -37,7 +37,7 @@ \title{Euler Math font, OTF version} \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}} -\newcommand*{\version}{0.40} +\newcommand*{\version}{0.41} \begin{document} \maketitle diff --git a/fonts/euler-math/Euler-Math.otf b/fonts/euler-math/Euler-Math.otf Binary files differindex b475b11ac0..fb1792e227 100644 --- a/fonts/euler-math/Euler-Math.otf +++ b/fonts/euler-math/Euler-Math.otf diff --git a/fonts/euler-math/Euler-Math.pdf b/fonts/euler-math/Euler-Math.pdf Binary files differindex b26eab0251..e9d3e2d144 100644 --- a/fonts/euler-math/Euler-Math.pdf +++ b/fonts/euler-math/Euler-Math.pdf diff --git a/fonts/euler-math/README.md b/fonts/euler-math/README.md index 97dd20a39d..aa93e4f565 100644 --- a/fonts/euler-math/README.md +++ b/fonts/euler-math/README.md @@ -68,6 +68,10 @@ Either version 1.3 or, at your option, any later version. - Metrics of all "over" arrows and harpoons corrected. - Metrics of all "under" arrows and harpoons corrected. - Most horizontal arrows and harpoons are now stretchable. +* v0.41: + - radicals corrected. + - euler-math.sty: options handled by `l3keys` instead of `xkeyval` + (requires a LaTeX kernel not older than 2022-06-01). --- Copyright 2009-2016 Khaled Hosny diff --git a/fonts/euler-math/euler-math.sty b/fonts/euler-math/euler-math.sty index 860f76f016..f87669df3c 100644 --- a/fonts/euler-math/euler-math.sty +++ b/fonts/euler-math/euler-math.sty @@ -1,6 +1,6 @@ -\NeedsTeXFormat{LaTeX2e}[2018/01/01] -\def\fileversion{0.40} -\def\filedate{2023-03-28} +\NeedsTeXFormat{LaTeX2e}[2022/06/01] +\def\fileversion{0.41} +\def\filedate{2023-06-21} \ProvidesPackage{euler-math}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -11,18 +11,20 @@ \newopentypefeature{Style}{smaller}{+ss05} \newopentypefeature{Style}{subsetneq}{+ss06} -% Options: forward them to \setmathfont. -\RequirePackage{xkeyval} \newtoks\NEUtoks -\newcommand*{\Store@KV@Option}[2]{% +\newcommand*{\NEstore@KV@Option}[2]{% \NEUtoks=\expandafter{\the\NEUtoks #1={#2},}} -\DeclareOptionX{CharacterVariant}{\Store@KV@Option{CharacterVariant}{#1}} -\DeclareOptionX{StylisticSet}{\Store@KV@Option{StylisticSet}{#1}} -\DeclareOptionX{Style}{\Store@KV@Option{Style}{#1}} -\DeclareOptionX{Scale}{\Store@KV@Option{Scale}{#1}} -\DeclareOptionX{Numbers}{\Store@KV@Option{Numbers}{#1}} -\ProcessOptionsX +% Package options: +\DeclareKeys + { + CharacterVariant.code = \NEstore@KV@Option{CharacterVariant}{#1} , + StylisticSet.code = \NEstore@KV@Option{StylisticSet}{#1} , + Style.code = \NEstore@KV@Option{Style}{#1} , + Scale.code = \NEstore@KV@Option{Scale}{#1} , + Numbers.code = \NEstore@KV@Option{Numbers}{#1} + } +\ProcessKeyOptions % Following Joseph Wright in https://tex.stackexchange.com/questions/451 \begingroup diff --git a/fonts/euler-math/unimath-euler.pdf b/fonts/euler-math/unimath-euler.pdf Binary files differindex 725c1ab650..66540cb6f4 100644 --- a/fonts/euler-math/unimath-euler.pdf +++ b/fonts/euler-math/unimath-euler.pdf diff --git a/fonts/kpfonts-otf/README.md b/fonts/kpfonts-otf/README.md index 2948034e0f..35e2e744e2 100644 --- a/fonts/kpfonts-otf/README.md +++ b/fonts/kpfonts-otf/README.md @@ -212,7 +212,13 @@ Either version 1.3 or, at your option, any later version. * v. 0.53: - Text fonts: added missing substitutions 'sups' and 'sinf' for the minus sign. - + +* v. 0.54: + - Math Sans Serif fonts: \imath and \jmath corrected. + - Math Bold and Semibold fonts: missing glyphs added in range + U+1D400-U+1D7F5 (SE#688363). + - File kpfonts-otf.sty: new options 'sftext', 'sfmath', 'sans'. + --- Copyright 2020-2023 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx index 742de7607a..e3317bd31b 100644 --- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx +++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx @@ -40,7 +40,7 @@ \title{Kp-fonts: OpenType version} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\version}{0.53} +\newcommand*{\version}{0.54} \begin{document} \selectlanguage{british} @@ -136,8 +136,8 @@ and a bunch of Kp-fonts specifics symbols. Please compare \famvar{regular} (left) and \famvar{light} fonts (right): \newcommand*{\test}{Normal or light? Just a matter of taste} -\medskip +\medskip \begin{minipage}{.45\textwidth}\test. $E=mc^2$\end{minipage}\hfill \begin{minipage}{.45\textwidth}\ltseries\test. \mathversion{light}$E=mc^2$ \end{minipage} @@ -155,6 +155,7 @@ and a bunch of Kp-fonts specifics symbols. \begin{minipage}{.45\textwidth}\sbseries\itshape\test\end{minipage} \medskip +\item[sans:] switches to \famvar{sans-serif} fonts for text and maths. \item[nomath:] load neither \pkg{unicode-math} nor \family{KpMath} fonts; useful for documents without maths, or to choose other maths fonts. @@ -183,6 +184,8 @@ and a bunch of Kp-fonts specifics symbols. |{\sbseries\itshape Foo}| or |\textsb{\textit{Foo}}| print {\sbseries\itshape Foo}. +\item[sfstext:] switches to \famvar{sans-serif} text fonts. + \item[oldstylenums:] provides lowercase digits as a default. To get uppercase digits locally: |{\addfontfeature{Numbers=Lining} 123}|. @@ -257,6 +260,8 @@ and a bunch of Kp-fonts specifics symbols. \item[lightmath:] uses \famvar{light} maths fonts. +\item[sfmath:] uses \famvar{sans-serif} maths fonts. + \item[bbsans:] command |\mathbb| prints Sans-Serif Blackboard Bold capitals with Serif fonts too: compare \mathversion{full} diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf Binary files differindex 904a72ab25..e339565f32 100644 --- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf +++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx index f949104d9a..909e52aaf7 100644 --- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx +++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx @@ -39,7 +39,7 @@ \title{Kp-fonts version OpenType} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\version}{0.53} +\newcommand*{\version}{0.54} \begin{document} \maketitle @@ -158,6 +158,9 @@ ainsi qu’un certain nombre de symboles et de commandes spécifiques à Kp-font \medskip +\item[sans :] pour utiliser la version \famvar{sans-serif} des polices texte + et math. + \item[nomath :] ne charge ni \pkg{unicode-math} ni les fontes \family{KpMath} ; utile pour les documents sans maths ou pour faire appel à d’autres fontes pour les maths. @@ -189,6 +192,8 @@ Notez que ces options n'affectent que les polices de texte. |{\sbseries\itshape Foo}| ou |\textsb{\textit{Foo}}| donne {\sbseries\itshape Foo}. +\item[sftext :] le texte est composé en utilisant les polices sans-serif. + \item[oldstylenums :] Les polices fournissent ici les nombres elzéviriens par défaut. @@ -268,14 +273,15 @@ Notez que ces options n'affectent que les polices de texte. \item[lightmath :] les mathématiques sont composées avec les polices « light ». -\item[bbsans :] dans tous les cas, la commande |\mathbb| produit du - sans-serif : +\item[sfmath :] les mathématiques sont composées avec les polices sans-serif. + +\item[bbsans :] la commande |\mathbb| produit du sans-serif : \mathversion{full} $\mathbb{C}$, $\mathbb{K}$, $\mathbb{N}$, $\mathbb{Q}$, $\mathbb{R}$, $\mathbb{Z}$, à comparer à \mathversion{base} $\mathbb{C}$, $\mathbb{K}$, $\mathbb{N}$, $\mathbb{Q}$, $\mathbb{R}$, - $\mathbb{Z}$. + $\mathbb{Z}$ obtenus par défaut. %\item[mathcal :] cette option modifie l’effet des commandes % |\mathcal| et |\mathscr|, elles produisent toutes les deux diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf Binary files differindex f6648abebb..1b2cfa19a4 100644 --- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf +++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf diff --git a/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf b/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf Binary files differindex fbc634bcc5..3bb9a27063 100644 --- a/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf +++ b/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf diff --git a/fonts/kpfonts-otf/fonts/KpMath-Bold.otf b/fonts/kpfonts-otf/fonts/KpMath-Bold.otf Binary files differindex 14f0d8ff56..9d8001120f 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-Bold.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-Bold.otf diff --git a/fonts/kpfonts-otf/fonts/KpMath-Light.otf b/fonts/kpfonts-otf/fonts/KpMath-Light.otf Binary files differindex f121fd7436..830f789930 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-Light.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-Light.otf diff --git a/fonts/kpfonts-otf/fonts/KpMath-Regular.otf b/fonts/kpfonts-otf/fonts/KpMath-Regular.otf Binary files differindex 4925d53f38..8a6833c782 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-Regular.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-Regular.otf diff --git a/fonts/kpfonts-otf/fonts/KpMath-Sans.otf b/fonts/kpfonts-otf/fonts/KpMath-Sans.otf Binary files differindex d32a217e84..e84543fcb1 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-Sans.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-Sans.otf diff --git a/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf b/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf Binary files differindex 595a7da6e1..7ca7c34e8f 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf diff --git a/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf b/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf Binary files differindex 09c14d2d5b..4d995347f5 100644 --- a/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf +++ b/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf diff --git a/fonts/kpfonts-otf/fonts/KpMono-Bold.otf b/fonts/kpfonts-otf/fonts/KpMono-Bold.otf Binary files differindex 9cd1ec45e8..78519493b3 100644 --- a/fonts/kpfonts-otf/fonts/KpMono-Bold.otf +++ b/fonts/kpfonts-otf/fonts/KpMono-Bold.otf diff --git a/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf Binary files differindex 644392da3c..908e5b7454 100644 --- a/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf +++ b/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf diff --git a/fonts/kpfonts-otf/fonts/KpMono-Italic.otf b/fonts/kpfonts-otf/fonts/KpMono-Italic.otf Binary files differindex 9571a0047c..7b884fb43d 100644 --- a/fonts/kpfonts-otf/fonts/KpMono-Italic.otf +++ b/fonts/kpfonts-otf/fonts/KpMono-Italic.otf diff --git a/fonts/kpfonts-otf/fonts/KpMono-Regular.otf b/fonts/kpfonts-otf/fonts/KpMono-Regular.otf Binary files differindex 1f678f4f2e..3e8843a6f2 100644 --- a/fonts/kpfonts-otf/fonts/KpMono-Regular.otf +++ b/fonts/kpfonts-otf/fonts/KpMono-Regular.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf b/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf Binary files differindex f956bbd44e..386be3f0bd 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf Binary files differindex 67e16167b6..c79dd2f35b 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf b/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf Binary files differindex c94fd20cba..b095428108 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Light.otf b/fonts/kpfonts-otf/fonts/KpRoman-Light.otf Binary files differindex 68b32790e0..e8ca3ebfeb 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-Light.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-Light.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf Binary files differindex 6d7a3546bf..a18b403abb 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf b/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf Binary files differindex eb91278800..bda96f543e 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf b/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf Binary files differindex 57897273cc..8cff5d264c 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf diff --git a/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf Binary files differindex 1561ff603c..7658059ebf 100644 --- a/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf +++ b/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf diff --git a/fonts/kpfonts-otf/fonts/KpSans-Bold.otf b/fonts/kpfonts-otf/fonts/KpSans-Bold.otf Binary files differindex 31c42814e5..214cd0fd65 100644 --- a/fonts/kpfonts-otf/fonts/KpSans-Bold.otf +++ b/fonts/kpfonts-otf/fonts/KpSans-Bold.otf diff --git a/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf Binary files differindex 22b4bc6d77..e8de697706 100644 --- a/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf +++ b/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf diff --git a/fonts/kpfonts-otf/fonts/KpSans-Italic.otf b/fonts/kpfonts-otf/fonts/KpSans-Italic.otf Binary files differindex 0b82dad6f9..5b6696e753 100644 --- a/fonts/kpfonts-otf/fonts/KpSans-Italic.otf +++ b/fonts/kpfonts-otf/fonts/KpSans-Italic.otf diff --git a/fonts/kpfonts-otf/fonts/KpSans-Regular.otf b/fonts/kpfonts-otf/fonts/KpSans-Regular.otf Binary files differindex 8409779129..88cad6faaa 100644 --- a/fonts/kpfonts-otf/fonts/KpSans-Regular.otf +++ b/fonts/kpfonts-otf/fonts/KpSans-Regular.otf diff --git a/fonts/kpfonts-otf/tex/kpfonts-otf.sty b/fonts/kpfonts-otf/tex/kpfonts-otf.sty index 8ff8c69fc3..7ea1af9cc1 100644 --- a/fonts/kpfonts-otf/tex/kpfonts-otf.sty +++ b/fonts/kpfonts-otf/tex/kpfonts-otf.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e}[2019-01-01] -\def\fileversion{0.53} -\def\filedate{2023-05-27} +\def\fileversion{0.54} +\def\filedate{2023-06-21} \ProvidesPackage{kpfonts-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -13,6 +13,8 @@ \newif\ifkp@tt \kp@tttrue % \newif\ifkp@lighttext +\newif\ifkp@sftext +\newif\ifkp@sans \newif\ifkp@largesmallcaps \newif\ifkp@altfligs \newif\ifkp@eurosym @@ -24,6 +26,7 @@ \newif\ifkp@Qtail % \newif\ifkp@lightmath +\newif\ifkp@sfmath \newif\ifkp@osnm \newif\ifkp@narrowiints \newif\ifkp@partialup @@ -39,6 +42,7 @@ \DeclareOption{light} {\kp@lighttexttrue\kp@lightmathtrue} \DeclareOption{nomath} {\kp@mathfalse\kp@symbolsfalse} \DeclareOption{notext} {\kp@textfalse} +\DeclareOption{sans} {\kp@sftexttrue\kp@sfmathtrue} \DeclareOption{nosf} {\kp@sffalse} \DeclareOption{nott} {\kp@ttfalse} \DeclareOption{onlyrm} {\kp@ttfalse\kp@sffalse} @@ -47,6 +51,7 @@ \kp@osnmtrue} % Text options \DeclareOption{lighttext} {\kp@lighttexttrue} +\DeclareOption{sftext} {\kp@sftexttrue} \DeclareOption{oldstylenums} {\kp@osntrue} \DeclareOption{oldstyle} {\kp@ostrue\kp@osntrue\kp@Qtailtrue} \DeclareOption{veryoldstyle} {\kp@vostrue\kp@osntrue\kp@Qtailtrue} @@ -57,6 +62,7 @@ \DeclareOption{harfbuzz} {\kp@harfbuzztrue} % Math options \DeclareOption{lightmath} {\kp@lightmathtrue} +\DeclareOption{sfmath} {\kp@sfmathtrue} \DeclareOption{bbsans} {\kp@sfmathbbtrue} \DeclareOption{mathcal} {\kp@calasscrtrue} \DeclareOption{narrowiints} {\kp@narrowiintstrue} @@ -146,22 +152,26 @@ \defaultfontfeatures+[KpRoman,KpLight,\sffamily]{StylisticSet=3} \fi % Loading Text Serif fonts: - \ifkp@lighttext - \setmainfont{KpLight} - \renewfontfamily\KpLight{KpLight} - \renewfontfamily\KpRoman{KpRoman} - \newcommand*{\sbseries}{\KpRoman} - \newcommand*{\ebseries}{\KpRoman\bfseries} - \DeclareTextFontCommand{\textsb}{\sbseries} - \DeclareTextFontCommand{\texteb}{\ebseries} + \ifkp@sftext + \setmainfont{KpSans} \else - \setmainfont{KpRoman} - \renewfontfamily\KpRoman{KpRoman} - \renewfontfamily\KpLight{KpLight} - \newcommand*{\sbseries}{\KpLight\bfseries} - \newcommand*{\ltseries}{\KpLight} - \DeclareTextFontCommand{\textsb}{\sbseries} - \DeclareTextFontCommand{\textlt}{\ltseries} + \ifkp@lighttext + \setmainfont{KpLight} + \renewfontfamily\KpLight{KpLight} + \renewfontfamily\KpRoman{KpRoman} + \newcommand*{\sbseries}{\KpRoman} + \newcommand*{\ebseries}{\KpRoman\bfseries} + \DeclareTextFontCommand{\textsb}{\sbseries} + \DeclareTextFontCommand{\texteb}{\ebseries} + \else + \setmainfont{KpRoman} + \renewfontfamily\KpRoman{KpRoman} + \renewfontfamily\KpLight{KpLight} + \newcommand*{\sbseries}{\KpLight\bfseries} + \newcommand*{\ltseries}{\KpLight} + \DeclareTextFontCommand{\textsb}{\sbseries} + \DeclareTextFontCommand{\textlt}{\ltseries} + \fi \fi % Loading Text Sans Serif fonts: \ifkp@sf @@ -220,24 +230,38 @@ \ifkp@partialup \Store@KP@MOption{partial}{upright} \fi - \ifkp@lightmath + \ifkp@sfmath + \Store@KP@MOption{BoldFont}{KpMath-SansBold.otf} % Following Joseph Wright in https://tex.stackexchange.com/questions/451 \begingroup \edef\temp{% \endgroup - \noexpand\setmathfont{KpMath-Light.otf}% + \noexpand\setmathfont{KpMath-Sans.otf}% [\unexpanded\expandafter{\the\KpMtoks}]% } - \temp - \setmathfont{KpMath-Light.otf}[range={cal,bfcal},RawFeature=+ss01] + \temp + \setmathfont{KpMath-Sans.otf}[range={cal,bfcal},RawFeature=+ss01] \else - % Following Joseph Wright in https://tex.stackexchange.com/questions/451 - \begingroup - \edef\temp{% - \endgroup - \noexpand\setmathfont{KpMath-Regular.otf}% - [\unexpanded\expandafter{\the\KpMtoks}]% - } + \ifkp@lightmath + \Store@KP@MOption{BoldFont}{KpMath-Semibold.otf} + % Following Joseph Wright in https://tex.stackexchange.com/questions/451 + \begingroup + \edef\temp{% + \endgroup + \noexpand\setmathfont{KpMath-Light.otf}% + [\unexpanded\expandafter{\the\KpMtoks}]% + } + \temp + \setmathfont{KpMath-Light.otf}[range={cal,bfcal},RawFeature=+ss01] + \else + % Following Joseph Wright in https://tex.stackexchange.com/questions/451 + \Store@KP@MOption{BoldFont}{KpMath-Bold.otf} + \begingroup + \edef\temp{% + \endgroup + \noexpand\setmathfont{KpMath-Regular.otf}% + [\unexpanded\expandafter{\the\KpMtoks}]% + } \temp \setmathfont{KpMath-Regular.otf}[range={cal,bfcal},RawFeature=+ss01] \fi @@ -254,6 +278,8 @@ \newopentypefeature{Style}{parallelslant}{ss07} \AtBeginDocument{% % Kpfonts specific math symbols + \Umathchardef\dotlessi = 0 0 "0131 \relax + \Umathchardef\dotlessj = 0 0 "0237 \relax \Umathchardef\mitsanswp = 0 0 "E015 \relax \Umathchardef\mitsansell = 0 0 "E019 \relax \Umathchardef\varemptyset = 0 0 "E021 \relax diff --git a/fonts/xcharter-math/README.md b/fonts/xcharter-math/README.md index 842c473609..951cab6493 100644 --- a/fonts/xcharter-math/README.md +++ b/fonts/xcharter-math/README.md @@ -71,6 +71,12 @@ Either version 1.3 or, at your option, any later version. - Metrics of all "over" arrows and harpoons corrected. - Metrics of all "under" arrows and harpoons corrected. - Most horizontal arrows and harpoons are now stretchable. +* v0.41: + - radicals corrected. + - xcharter-otf.sty: options handled by `l3keys` instead of `xkeyval` + (requires a LaTeX kernel not older than 2022-06-01). + - XCharter-Math-Bold.otf: missing glyphs added in range + U+1D400-U+1D7F5 (SE#688363 for KP-fonts). --- Copyright 2022-2023 Daniel Flipo diff --git a/fonts/xcharter-math/XCharter-Math-Bold.otf b/fonts/xcharter-math/XCharter-Math-Bold.otf Binary files differindex 8be3f3fcac..ab719662c7 100644 --- a/fonts/xcharter-math/XCharter-Math-Bold.otf +++ b/fonts/xcharter-math/XCharter-Math-Bold.otf diff --git a/fonts/xcharter-math/XCharter-Math.ltx b/fonts/xcharter-math/XCharter-Math.ltx index 9e2bea6ded..48a674d254 100644 --- a/fonts/xcharter-math/XCharter-Math.ltx +++ b/fonts/xcharter-math/XCharter-Math.ltx @@ -34,7 +34,7 @@ \title{\decofourleft\,\XCotf\,\decofourright} \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}} -\newcommand*{\version}{0.40} +\newcommand*{\version}{0.41} \begin{document} \maketitle @@ -413,7 +413,7 @@ variants, see table~\vref{ss03}. To get oldstyle numbers in maths, the feature \texttt{+onum} is available: \begin{verbatim} \setmathfont{XCharter-Math.otf}[Numbers=OldStyle] or -\usepackage[Style={fulloldstyle]{xcharter-otf} +\usepackage[Style=fulloldstyle]{xcharter-otf} \end{verbatim} \setmathfont{XCharter-Math.otf}[Numbers=OldStyle] @@ -595,6 +595,10 @@ a \emph{limited} bold variant has been added in version~0.35. Example of usage:\ \verb+\setmathfont{XCharter-Math-Bold.otf}[version=bold, +\textit{options}\verb+]+\\ \verb+\section{\mathversion{bold} Einstein’s equation $E=mc^2$}+ +It is also possible to use the \verb+\boldmath+ command:\\ +\verb+\setmathfont{XCharter-Math-Regular.otf}[BoldFont=XCharter-Math-Bold.otf]+\\ +\verb+\section{\boldmath Einstein’s equation $E=mc^2$}+ + \subsection{Missing symbols} \XCotf{} does not aim at being as complete as \file{STIXTwoMath-Regular} or diff --git a/fonts/xcharter-math/XCharter-Math.otf b/fonts/xcharter-math/XCharter-Math.otf Binary files differindex a51237b1b7..46926e2302 100644 --- a/fonts/xcharter-math/XCharter-Math.otf +++ b/fonts/xcharter-math/XCharter-Math.otf diff --git a/fonts/xcharter-math/XCharter-Math.pdf b/fonts/xcharter-math/XCharter-Math.pdf Binary files differindex f54289c14e..2fa2c06ceb 100644 --- a/fonts/xcharter-math/XCharter-Math.pdf +++ b/fonts/xcharter-math/XCharter-Math.pdf diff --git a/fonts/xcharter-math/unimath-xcharter.pdf b/fonts/xcharter-math/unimath-xcharter.pdf Binary files differindex afef60d889..e6b2eda1ea 100644 --- a/fonts/xcharter-math/unimath-xcharter.pdf +++ b/fonts/xcharter-math/unimath-xcharter.pdf diff --git a/fonts/xcharter-math/xcharter-otf.sty b/fonts/xcharter-math/xcharter-otf.sty index e156e3b860..1315b946ee 100644 --- a/fonts/xcharter-math/xcharter-otf.sty +++ b/fonts/xcharter-math/xcharter-otf.sty @@ -1,6 +1,6 @@ -\NeedsTeXFormat{LaTeX2e}[2018/01/01] -\def\fileversion{0.40} -\def\filedate{2023-03-29} +\NeedsTeXFormat{LaTeX2e}[2022/06/01] +\def\fileversion{0.41} +\def\filedate{2023-06-21} \ProvidesPackage{xcharter-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -14,34 +14,36 @@ \newopentypefeature{Style}{subsetneq}{+ss06} \newopentypefeature{Style}{parallelslant}{+ss07} +\newtoks\XCottoksT +\newtoks\XCottoksM \newcommand*{\XCstore@KV@Option}[2]{% \def\XCot@scale{Scale}\def\XCot@opt{#1}% \ifx\XCot@opt\XCot@scale\XCottoksT={Scale={#2}}\fi \XCottoksM=\expandafter{\the\XCottoksM #1={#2},}} -% Options: forward them to \setmathfont except "tight", "loose" and "no-text". -\RequirePackage{xkeyval} -\newtoks\XCottoksT -\newtoks\XCottoksM - -\newif\ifXCot@tight -\newif\ifXCot@notext -\DeclareOptionX{no-text}{\XCot@notexttrue} -\DeclareOptionX{tight}{\XCot@tighttrue} -\DeclareOptionX{loose}{\XCot@tightfalse} -\DeclareOptionX{fulloldstyle}{\XCstore@KV@Option{Numbers}{OldStyle}} -\DeclareOptionX{math-style}{\XCstore@KV@Option{math-style}{#1}} -\DeclareOptionX{bold-style}{\XCstore@KV@Option{bold-style}{#1}} -\DeclareOptionX{nabla}{\XCstore@KV@Option{nabla}{#1}} -\DeclareOptionX{partial}{\XCstore@KV@Option{partial}{#1}} -\DeclareOptionX{CharacterVariant}{\XCstore@KV@Option{CharacterVariant}{#1}} -\DeclareOptionX{StylisticSet}{\XCstore@KV@Option{StylisticSet}{#1}} -\DeclareOptionX{Style}{\XCstore@KV@Option{Style}{#1}} -\DeclareOptionX{Scale}{\XCstore@KV@Option{Scale}{#1}} -\ExecuteOptionsX{tight} -\ProcessOptionsX +% Package options: +\DeclareKeys + { + no-text.if = XCot@notext , + tight.if = XCot@tight , + loose.code = \XCot@tightfalse , + fulloldstyle.code = \XCstore@KV@Option{Numbers}{OldStyle} , + math-style.code = \XCstore@KV@Option{math-style}{#1} , + bold-style.code = \XCstore@KV@Option{bold-style}{#1} , + nabla.code = \XCstore@KV@Option{nabla}{#1} , + partial.code = \XCstore@KV@Option{partial}{#1} , + CharacterVariant.code = \XCstore@KV@Option{CharacterVariant}{#1} , + StylisticSet.code = \XCstore@KV@Option{StylisticSet}{#1} , + Style.code = \XCstore@KV@Option{Style}{#1} , + Scale.code = \XCstore@KV@Option{Scale}{#1} + } +% +\XCot@tighttrue +\ProcessKeyOptions +% % Math fonts: XCharter-Math.otf % Following Joseph Wright in https://tex.stackexchange.com/questions/451 +\XCstore@KV@Option{BoldFont}{XCharter-Math-Bold.otf} \begingroup \edef\temp{% \endgroup |