CTAN sync 202306220301

7 files changed, 125 insertions, 105 deletions

diff --git a/fonts/erewhon-math/Erewhon-Math-Bold.otf b/fonts/erewhon-math/Erewhon-Math-Bold.otf
index 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
index 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
index 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
index ec607c8e3e..47ac7a70ce 100644
--- a/fonts/erewhon-math/unimath-erewhon.pdf
+++ b/fonts/erewhon-math/unimath-erewhon.pdf