13 files changed, 128 insertions, 67 deletions
diff --git a/macros/unicodetex/latex/fontsetup/README b/macros/unicodetex/latex/fontsetup/README
index e8d6ff95b3..2c6b3916cd 100644
--- a/macros/unicodetex/latex/fontsetup/README
+++ b/macros/unicodetex/latex/fontsetup/README
@@ -1,5 +1,5 @@
                The fontsetup package
-               (Version 1.4, GPL3)
+               (Version 1.5, GPL3)
 
 This simple package makes it trivial to switch quickly between 
 different quality fonts supporting Mathematics. 
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
index af25860a87..5b0cedc0dc 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
index 34e12b51b9..f56fcc39c9 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
@@ -14,8 +14,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{2} Jan \textsc{2023}\\[1ex]
-	  Version 1.4, \textsc{gpl3}
+	  \textsc{28} July \textsc{2023}\\[1ex]
+	  Version 1.5, \textsc{gpl3}
   \end{center}
 
   This package is a simple wrapper-type package that makes the setup of fonts easy and
@@ -101,6 +101,13 @@ NewComputerModern font family.
   \item[concrete] Loads the Concrete fonts from the \texttt{cmu} package with Concrete-Math
     font for mathematics.
   \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math.
+    \item[erewhon] Loads the Erewhon fonts with Erewhon-Math.
+    \item[euler] Loads the Concrete fonts with the Euler-Math for Mathematics. This option replaces
+      the older option \texttt{neoeuler} which was using the neoeuler font. This font has continued
+      its development as Euler-Math. I want to thank Shyam Sundar for helping with the
+      proper setup of the support for the math font and it's fallback to TeX Gyre Pagella for
+      glyphs not yet covered by Euler-Math. \textit{Important notice}: the fallback mechanism is slow. Expect
+	delays at each run.
     \item[fira] Loads the Fira family, a sans-serif font.
     \item[gfsartemisia] Loads the GFSArtemisia, a font family designed to be used
       as a Times replacement. The Mathematics is from stix2 but latin
@@ -131,8 +138,7 @@ NewComputerModern font family.
       Garamond-Math with letters replaced
       from MS-Garamond. This option works only if
     fontsetup-nonfree is installed.
-    \item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics. 
-      Needs euler.otf to be instaled in the TeX installation.
+    \item[neoeuler] This option is preserved for backwards compatibility. See option \texttt{euler}.
 \item[oldstandard] Loads the OldStandard fonts. Mathematics is from
       Garamond-Math with letters replaced
       from OldStandard.
@@ -169,13 +175,13 @@ to another among the supported ones.
 
 \textbf{Summary of installation steps to support all fonts}
 
-\medskip
-
-For accessing the free fonts there is nothing to install (provided
-you have a full installation of TeX system) unless you want to access
-the \verb|neoeuler| option. For this you have to install
-\verb|euler.otf| in your TeX tree from
-  here: \verb|https://github.com/khaledhosny/euler-otf|
+%\medskip
+%
+%For accessing the free fonts there is nothing to install (provided
+%you have a full installation of TeX system) unless you want to access
+%the \verb|neoeuler| option. For this you have to install
+%\verb|euler.otf| in your TeX tree from
+%  here: \verb|https://github.com/khaledhosny/euler-otf|
 
 \medskip
 
@@ -222,6 +228,21 @@ Samples for the free fonts follow. Samples for the nonfree fonts can be found in
 \newpage
 
 \begin{center}
+{\Large Erewhon and Erewhon-Math fonts: option \verb|erewhon|}\\[1cm] 
+\includegraphics[scale=1.2]{fspsample-erewhon.pdf}
+\end{center}
+
+\newpage
+
+
+\begin{center}
+{\Large Concrete fonts and Euler-Math: option \verb|euler|}\\[1cm] 
+\includegraphics[scale=1.2]{fspsample-euler.pdf}
+\end{center}
+
+\newpage
+
+\begin{center}
 {\Large Fira fonts: option \verb|fira|}\\[1cm] 
 \includegraphics[scale=1.2]{fspsample-fira.pdf}
 \end{center}
@@ -274,15 +295,6 @@ Samples for the free fonts follow. Samples for the nonfree fonts can be found in
 
 \newpage
 
-
-\begin{center}
-{\Large Concrete fonts and NeoEuler Math: option \verb|neoeuler|}\\
-NeoEuler font must be installed in TeX tree\\[1cm] 
-\includegraphics[scale=1.2]{fspsample-neoeuler.pdf}
-\end{center}
-
-\newpage
-
 \begin{center}
 {\Large OldStandard fonts with Garamond-Math: option \verb|oldstandard|}\\[1cm] 
 \includegraphics[scale=1.2]{fspsample-oldstandard.pdf}
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-erewhon.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-erewhon.pdf
new file mode 100644
index 0000000000..bcedcaac1d
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-erewhon.pdf
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-euler.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-euler.pdf
new file mode 100644
index 0000000000..04d9f53df8
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-euler.pdf
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-neoeuler.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-neoeuler.pdf
deleted file mode 100644
index 545c0d7ace..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-neoeuler.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample.tex b/macros/unicodetex/latex/fontsetup/doc/fspsample.tex
index ec18b14d70..d3f8091903 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample.tex
@@ -25,6 +25,7 @@
 %\usepackage[msgaramond]{fontsetup}
 %\usepackage[ebgaramond]{fontsetup}
 %\usepackage[minion]{fontsetup}
+%\usepackage[euler]{fontsetup}
 %\usepackage[neoeuler]{fontsetup}
 %\usepackage[libertinus]{fontsetup}
 %\usepackage[olddefault]{fontsetup}
@@ -32,7 +33,7 @@
 %\usepackage[talos]{fontsetup}
 %\usepackage[oldstandard]{fontsetup}
 %\usepackage[xcharter,upint]{fontsetup}
-
+%\usepackage[erewhon]{fontsetup}
 
 \newtheorem{theorem}{Theorem}
 \newtheorem{theoremg}[theorem]{Θεώρημα}
diff --git a/macros/unicodetex/latex/fontsetup/fontsetup.sty b/macros/unicodetex/latex/fontsetup/fontsetup.sty
index bc355c0f42..f68237105b 100644
--- a/macros/unicodetex/latex/fontsetup/fontsetup.sty
+++ b/macros/unicodetex/latex/fontsetup/fontsetup.sty
@@ -27,13 +27,14 @@
 \chardef\fontsetupmsgaramond=13 %install Microsoft Garamond as a System font. Gara.TTF, Garai, Garabd
 \chardef\fontsetupebgaramond=14
 \chardef\fontsetupminion=15 % Install MinionPro and provided fspMinionGreekSmallCaps as a system font.
-\chardef\fontsetupneoeuler=16
+\chardef\fontsetupeuler=16
 \chardef\fontsetuplibertinus=17
 \chardef\fontsetupolddefault=18 % old (thin) CMR
 \chardef\fontsetupconcrete=19
 \chardef\fontsetuptalos=20
 \chardef\fontsetupoldstandard=21
 \chardef\fontsetupxcharter=22
+\chardef\fontsetuperewhon=23
 
 \chardef\fontsetupfont\fontsetupdefault
 \DeclareOption{default}{\chardef\fontsetupfont\fontsetupdefault}
@@ -52,13 +53,15 @@
 \DeclareOption{msgaramond}{\chardef\fontsetupfont\fontsetupmsgaramond}
 \DeclareOption{ebgaramond}{\chardef\fontsetupfont\fontsetupebgaramond}
 \DeclareOption{minion}{\chardef\fontsetupfont\fontsetupminion}
-\DeclareOption{neoeuler}{\chardef\fontsetupfont\fontsetupneoeuler}
+\DeclareOption{euler}{\chardef\fontsetupfont\fontsetupeuler}
+\DeclareOption{neoeuler}{\chardef\fontsetupfont\fontsetupeuler} %compatibility
 \DeclareOption{libertinus}{\chardef\fontsetupfont\fontsetuplibertinus}
 \DeclareOption{olddefault}{\chardef\fontsetupfont\fontsetupolddefault}
 \DeclareOption{concrete}{\chardef\fontsetupfont\fontsetupconcrete}
 \DeclareOption{talos}{\chardef\fontsetupfont\fontsetuptalos}
 \DeclareOption{oldstandard}{\chardef\fontsetupfont\fontsetupoldstandard}
 \DeclareOption{xcharter}{\chardef\fontsetupfont\fontsetupxcharter}
+\DeclareOption{erewhon}{\chardef\fontsetupfont\fontsetuperewhon}
 \DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
 %
 \newif\if@upint
@@ -133,7 +136,7 @@
 \or
   \RequirePackage{fspminion}
 \or
-  \RequirePackage{fspneoeulerot}
+  \RequirePackage{fspeulerot}
 \or
   \RequirePackage{libertinus-otf}
 \or
@@ -162,8 +165,10 @@
 \if@upint
     \setmathfont[StylisticSet=3]{XCharter-Math.otf}
 \else
-   \relax
+    \relax
 \fi
+\or
+\RequirePackage{fsperewhon}
 %%%
 %
 %%%
diff --git a/macros/unicodetex/latex/fontsetup/fspdefault.sty b/macros/unicodetex/latex/fontsetup/fspdefault.sty
index c03fa97046..2eb60881f9 100644
--- a/macros/unicodetex/latex/fontsetup/fspdefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspdefault.sty
@@ -103,6 +103,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
 \setmathfont{NewCMMath-Book.otf}
 \DeclareOption{varnothing}{\setmathfont[CharacterVariant=1]{NewCMMath-Book.otf}}
 \ProcessOptions
+\setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Book.otf}
 
 \newcommand{\tttextsc}[1]{{\ttscshape#1}}
 %
diff --git a/macros/unicodetex/latex/fontsetup/fsperewhon.sty b/macros/unicodetex/latex/fontsetup/fsperewhon.sty
new file mode 100644
index 0000000000..738e8c1db9
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup/fsperewhon.sty
@@ -0,0 +1,20 @@
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+
+
+\RequirePackage{fourier-otf}
+
+\setmainfont[%
+  SlantedFont=Erewhon-RegularSlanted,
+  BoldSlantedFont=Erewhon-BoldSlanted,
+  BoldFont=Erewhon-Bold,
+  ItalicFont=Erewhon-Italic,
+  BoldItalicFont=Erewhon-BoldItalic,
+  UprightFont=Erewhon-Regular,
+  SmallCapsFeatures={Numbers=OldStyle}
+  ]{Erewhon-Regular.otf}
+
+\usepackage{unicode-math}
+\setmathfont{Erewhon-Math.otf}
+
+\endinput
diff --git a/macros/unicodetex/latex/fontsetup/fspeulerot.sty b/macros/unicodetex/latex/fontsetup/fspeulerot.sty
new file mode 100644
index 0000000000..3be2bc9f5f
--- /dev/null
+++ b/macros/unicodetex/latex/fontsetup/fspeulerot.sty
@@ -0,0 +1,62 @@
+\RequirePackage{fontspec}
+\RequirePackage{unicode-math}
+%\unimathsetup{math-style=upright}
+\setmainfont[ItalicFont=cmunoti.otf,
+	 BoldFont=cmunobx.otf,
+	 BoldItalicFont=cmunobi.otf,
+         % RawFeature=+pnum,% variable width numbers
+SmallCapsFeatures={Numbers=OldStyle}]{cmunorm.otf}
+\defaultfontfeatures{Scale=MatchLowercase}
+
+
+%\setmathfont{LibertinusMath-Regular.otf}
+\setmathfont{texgyrepagella-math.otf}
+\setmathfont[%
+  range={"21-"7E,"A0,"A3,"A5,"A7-"A8,"AC,"AE-"AF,"B1,"B4-"B7,"D7,"F0,"F7,"127,
+    "131,"1B5,"237,"2C6-"2C7,"2D8-"2DA,"2DC,"300-"30C,"30F,"311,"323-"325,"32E-"332,"338,
+    "34D,"391-"3A1,"3A3-"3A9,"3B1-"3C1,"3C3-"3C9,"3D1,"3D5-"3D6,"3F0,"3F4-"3F6,"2000-"200A,
+    "2010-"2016,"2018-"2019,"2020-"2022,"2026,"2030-"2037,"2044,"2057,"20AC,"20D0-"20D2,
+    "20D5-"20D7,"20DB-"20DF,"20E1,"20E4,"20E8-"20E9,"20EC-"20F0,"2102,"2107,"210B-"2113,
+    "2115,"2118-"211D,"2124,"2126-"2128,"212B-"212D,"2130-"2133,"2135-"2138,"213C-"2141,
+    "214B,"2190-"219B,"219E-"21A7,"21A9-"21AE,"21B0-"21B3,"21B6-"21B7,"21BA-"21DD,
+    "21E0-"21E3,"21E6-"21E9,"21F5-"21F6,"2200-"22AF,"22B2-"22F1,"2300,"2305-"2306,
+    "2308-"230B,"2310,"2319,"231C-"2323,"2329-"232A,"239B-"23B1,"23B4-"23B5,"23B7,
+    "23DC-"23DF,"2422-"2423,"24C7-"24C8,"25A0-"25A1,"25AA-"25AD,"25B2-"25B9,
+    "25BC-"25C3,"25C6-"25C7,"25CA-"25CB,"25CF,"25E6,"25EF,"25FB-"25FE,"2605,"2660-"2667,
+    "266D-"266F,"26AA-"26AC,"2713,"2720,"27C2,"27CB,"27CD,"27D8-"27DE,"27E0-"27E3,
+    "27E6-"27EB,"27F4-"27FF,"2906-"2907,"2933,"2980-"2981,"29EB,"29F5,"2A00-"2A06,"2A09,
+    "2A0C,"2A11,"2A1D,"2A2F,"2A3F,"2A5E-"2A5F,"2A7D-"2A7E,"2A85-"2A8C,"2A95-"2A96,
+    "2A9B-"2A9C,"2AAF-"2ABA,"2AC5-"2AC6,"2ACB-"2ACC,"2AF9-"2AFA,"2B1A-"2B1E,"2B24-"2B2B,
+    "2B31,"2B33,"2B3F,"E010-"E01F,"E021,"E045-"E048,"E08D-"E08F,"E098-"E099,"E09C-"E09F,
+    "E0A2-"E0AF,"E0C0-"E0C9,"E0CB,"E0D0-"E0D9,"E0DB,"E143-"E14D,"E1D3-"E1D4,"E1E3,
+    "E1F3,"E223,"E22A-"E22B,"E22E-"E22F,"E233,"E243,"E253,"E263,"E283,"E293,"E2A3,
+    "E311-"E318,"E321-"E328,"E331-"E338,"E341-"E348,"E351-"E358,"E35A-"E35F,"E361-"E368,
+    "E371-"E378,"E381-"E388,"E391-"E398,"E3A1-"E3A4,"E3AA-"E3AB,"E3D1-"E3D4,"E3D9,
+    "E3E1-"E3E4,"E3E9,"E3F1-"E3F4,"E3F9,"E4A0-"E4BB,"E4BD-"E4C7,"E500-"E507,"E50E-"E517,
+    "E520-"E527,"E530-"E544,"E551-"E554,"E561-"E564,"E570-"E57F,"E581-"E584,"E590-"E591,
+    "E593-"E596,"E598-"E599,"E59B-"E59E,"E5A0-"E5B1,"E5B3,"E5B8-"E5BA,"E5BF-"E5CF,
+    "E741-"E75A,"E761-"E77A,"E800-"E809,"E80B,"E810-"E819,"E820-"E853,"E856,"E862,"E867,
+    "E86A,"E86D,"E86F,"E871,"E873-"E874,"E876,"E878-"E882,"E884-"E885,"E887-"E893,
+    "E8A0-"E8D3,"E8D5-"E8DC,"E8E0-"E8F9,"E900-"E909,"E90B,"E910-"E919,"E920-"E953,
+    "E958-"E95A,"E962-"E963,"E967,"E96A,"E96D,"E96F,"E971,"E973-"E974,"E976-"E986,
+    "E988-"E995,"E9A0-"E9D3,"E9D5-"E9DA,"E9DE-"E9F9,"EA00-"EA01,"EA05-"EA0B,"EA0D-"EA14,
+    "EA16-"EA19,"EA1C-"EA1E,"EA21,"EA23,"EA25,"EA27,"EA29-"EA36,"EA38,"EA3B,"EA3D-"EA4B,
+    "EA50-"EA61,"EA6C-"EA6F,"EA71-"EA7B,"EA7F-"EA81,"EA85-"EA86,"EA88-"EA90,"EA99-"EA9A,
+    "EAA8-"EAAA,"EAAC-"EAAD,"EABE-"EACF,"EAD8-"EAD9,"EADD-"EADF,"EB00-"EB0E,"EB10-"EB14,
+    "EB20-"EB23,"EB30-"EB33,"EC00-"EC09,"EC0B,"EC10-"EC19,"EC20-"EC53,"EC56,"EC62,"EC67,
+    "EC6A,"EC6D,"EC6F,"EC71,"EC73-"EC74,"EC76,"EC78-"EC82,"EC84-"EC85,"EC87-"EC93,
+    "ECA0-"ECD3,"ECD5-"ECDC,"ECE0-"ECF9,"ED00-"ED09,"ED0B,"ED10-"ED19,"ED20-"ED53,
+    "ED58-"ED5A,"ED62-"ED63,"ED67,"ED6A,"ED6D,"ED6F,"ED71,"ED73-"ED74,"ED76-"ED86,
+    "ED88-"ED95,"EDA0-"EDD3,"EDD5-"EDDA,"EDDE-"EDF9,"EE00-"EE01,"EE05-"EE0B,"EE0D-"EE14,
+    "EE16-"EE19,"EE1C-"EE1E,"EE21,"EE23,"EE25,"EE27,"EE29-"EE36,"EE38,"EE3B,"EE3D-"EE41,
+    "EE60-"EE61,"EE6C-"EE6F,"EE71-"EE76,"EE7A-"EE7B,"EE7F-"EE81,"EE86,"EE88-"EE8B,
+    "EE99-"EE9A,"EEA8-"EEAA,"EEAC-"EEAD,"EEBE-"EECF,"EED8-"EED9,"EEDD-"EEDF,
+    "1D400-"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,"1D4A9-"1D4AC,"1D4AE-"1D4B5,
+    "1D4D0-"1D4E9,"1D504-"1D505,"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D539,
+    "1D53B-"1D53E,"1D540-"1D544,"1D546,"1D54A-"1D550,"1D552-"1D6A5,"1D6A8-"1D6D2,
+    "1D6D4-"1D6DF,"1D6E1-"1D70C,"1D70E-"1D719,"1D71B-"1D746,"1D748-"1D753,"1D755-"1D789,
+    "1D790-"1D7C3,"1D7CE-"1D7FF}]{Euler-Math.otf}
+\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+            ]{Euler-Math.otf}
+\setmathfont[range=up/{latin,Latin,num}, script-features={}, sscript-features={}
+            ]{Euler-Math.otf}
diff --git a/macros/unicodetex/latex/fontsetup/fspneoeulerot.sty b/macros/unicodetex/latex/fontsetup/fspneoeulerot.sty
deleted file mode 100644
index 725686c3a8..0000000000
--- a/macros/unicodetex/latex/fontsetup/fspneoeulerot.sty
+++ /dev/null
@@ -1,41 +0,0 @@
-\RequirePackage{fontspec}
-\RequirePackage{unicode-math}
-%\unimathsetup{math-style=upright}
-\setmainfont[ItalicFont=cmunoti.otf,
-	 BoldFont=cmunobx.otf,
-	 BoldItalicFont=cmunobi.otf,
-         % RawFeature=+pnum,% variable width numbers
-SmallCapsFeatures={Numbers=OldStyle}]{cmunorm.otf}
-\defaultfontfeatures{Scale=MatchLowercase}
-\setmathfont{LibertinusMath-Regular.otf}
-\setmathfont[range={"0000-"0001,"0020-"007E,
-                    "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
-                    "00D7,"00F7,
-                    "0131,
-                    "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
-                    "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
-                    "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
-                    "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
-                    "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
-                    "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
-                    "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
-                    "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
-                    "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
-                    "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
-                    "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
-                    "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
-                    "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
-                    "22DC-"22DD,"22EF,"22F0-"22F1,
-                    "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
-                    "23DC-"23DF,
-                    "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
-                    "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
-                    "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
-                    "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
-                    "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
-                    "1D6DF,"1D6E1,"1D7CE-"1D7D7
-                   }]{euler.otf}
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
-            ]{euler.otf}
-\setmathfont[range=up/{latin,Latin,num}, script-features={}, sscript-features={}
-            ]{euler.otf}
diff --git a/macros/unicodetex/latex/fontsetup/fspolddefault.sty b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
index 30e71c931c..fbe816a4a5 100644
--- a/macros/unicodetex/latex/fontsetup/fspolddefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
@@ -105,6 +105,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
 \setmathfont{NewCMMath-Regular.otf}
 \DeclareOption{varnothing}{\setmathfont[CharacterVariant=1]{NewCMMath-Regular.otf}}
 \ProcessOptions
+\setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Regular.otf}
 
 \newcommand{\tttextsc}[1]{{\ttscshape#1}}
 %