Merge branch 'development'

src/HsH-article.cls

@@ -62,7 +62,7 @@
 \DeclareOption{roman}{
   \renewcommand{\familydefault}{\rmdefault}
 }
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrartcl}}
 \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax
 %% Load KOMA class
@@ -95,7 +95,7 @@
 \RequirePackage{pgffor}
 %% options for not loaded packages ----------------------------------------------------------------
 \PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex}
-\PassOptionsToPackage{free-standing-units,abbreviations}{siunitx}
+\PassOptionsToPackage{free-standing-units}{siunitx}
 \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
 
 %% title matters ----------------------------------------------------------------------------------

src/HsH-report.cls

@@ -62,7 +62,7 @@
 \DeclareOption{roman}{
   \renewcommand{\familydefault}{\rmdefault}
 }
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}}
+\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{scrreprt}}
 \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax
 %% Load KOMA class
@@ -95,7 +95,7 @@
 \RequirePackage{pgffor}
 %% options for not loaded packages ----------------------------------------------------------------
 \PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex}
-\PassOptionsToPackage{free-standing-units,abbreviations}{siunitx}
+\PassOptionsToPackage{free-standing-units}{siunitx}
 \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
 
 %% title matters ----------------------------------------------------------------------------------

src/HsH-standalone.cls

@@ -62,7 +62,7 @@
 \DeclareOption{roman}{
   \renewcommand{\familydefault}{\rmdefault}
 }
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}}
+\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{standalone}}
 \ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % default options
 \ProcessOptions\relax
 %% Load KOMA class
@@ -78,7 +78,7 @@
 \RequirePackage{amsmath}
 \if@german\RequirePackage{ziffer}\fi
 %% options for not loaded packages ----------------------------------------------------------------
-\PassOptionsToPackage{free-standing-units,abbreviations}{siunitx}
+\PassOptionsToPackage{free-standing-units}{siunitx}
 \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
 
 %% typesetting indexes upright or standart