Math-Font per "firamath","mathastext" + italic corr. (prime)

kalibrierschein/kalibrierschein.cls

@@ -7,7 +7,7 @@
 \newcommand*\ks@langs{ngerman,main=english}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{kalibrierschein}
-  [2019/03/07 v0.4a Dokumentenklasse (RN/PTB)]
+  [2019/03/13 v0.4b Dokumentenklasse (RN/PTB)]
 \DeclareOption{BS}{\def\ks@location{Braunschweig}}
 \DeclareOption{BLN}{\def\ks@location{Berlin}}
 \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
@@ -107,7 +107,7 @@ footskip=0bp,
     \else% TeX+dvips
     \fi
   \fi
-\fi
+\fi 
 
 \RequirePackage{amsmath}
 
@@ -118,22 +118,7 @@ footskip=0bp,
 %\RequirePackage[no-math]{fontspec}
 \RequirePackage{unicode-math}
 
-\setmainfont{texgyreheros}[
-  Ligatures=TeX,
-  Extension=.otf,
-  UprightFont=*-regular,
-  BoldFont=*-bold,
-  ItalicFont=*-italic,
-  BoldItalicFont=*-bolditalic.otf]
-\setsansfont{texgyreheros}[
-  Ligatures=TeX,
-  Extension=.otf,
-  UprightFont=*-regular,
-  BoldFont=*-bold,
-  ItalicFont=*-italic,
-  BoldItalicFont=*-bolditalic.otf]
-
-\iftrue  
+\iffalse 
   
 \setmathfont{Asana-Math.otf}[math-style=ISO,bold-style=ISO]% damit sind Einheiten kursiv
 \setmathfont{texgyreheros-regular.otf}[range=\mathup,Scale=MatchLowercase]
@@ -152,13 +137,32 @@ footskip=0bp,
 
 \else
 
-%%%\usepackage{firamath-otf} % passt doch nicht gut zu Helvetica (Arial))
+%%%\RequirePackage{firamath-otf} % passt doch nicht gut zu Helvetica (Arial))
 
-\setmathfont{GFSNeohellenicMath.otf}%
-  [math-style=ISO,bold-style=ISO,Scale=MatchUppercase]
+%%%\setmathfont{GFSNeohellenicMath.otf}%
+%%%  [math-style=ISO,bold-style=ISO,Scale=MatchUppercase]
 
+%%%  \renewcommand*\familydefault{\sfdefault}
+%%%  \RequirePackage[cmintegrals]{newtxsf}
 
-\fi
+\RequirePackage{unicode-math}
+\setmainfont{texgyreheros}[
+  Ligatures=TeX,
+  Extension=.otf,
+  UprightFont=*-regular,
+  BoldFont=*-bold,
+  ItalicFont=*-italic,
+  BoldItalicFont=*-bolditalic.otf]
+\RequirePackage{firamath-otf}
+\RequirePackage[italic]{mathastext}
+ 
+\def\prim@s{\/\prime\futurelet\@let@token\pr@m@s}
+
+\AtBeginDocument{\let\PRIME\prime
+  \def\prime{\mkern2mu\PRIME}%
+}
+
+\fi 
 
 \RequirePackage{newunicodechar}
 \newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239)