diff --git a/src/HsH-report.cls b/src/HsH-report.cls index eb38334ef40975d3e8f7fad788069309141c73f6..a6bc30c9a6da52fedacc9013dbad23f87859e9ea 100644 --- a/src/HsH-report.cls +++ b/src/HsH-report.cls @@ -10,13 +10,16 @@ \newcommand{\includeHsHlogohere}{\raisebox{0pt}[\ht\strutbox][\dp\strutbox]{\includegraphics[width=5cm,page=\HsHlogoPage]{\HsHlogoPath}}} \providecommand{\abs}[1]{\ensuremath{\left\vert#1\right\vert}} % Makro für Betragsstriche +\newif\if@german% + \DeclareOption{ngerman}{% \PassOptionsToPackage{\CurrentOption}{babel} \renewcaptionname{ngerman}{\figurename}{Abb.} %Figure \renewcaptionname{ngerman}{\tablename}{Tab.} %Table + \@germantrue } \DeclareOption{english}{% - \PassOptionsToPackage{\CurrentOption,main=english}{babel} + \PassOptionsToPackage{\CurrentOption}{babel} \renewcaptionname{english}{\figurename}{Fig.} %Figure \renewcaptionname{english}{\tablename}{Tab.} %Table } @@ -37,7 +40,7 @@ } \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}} -\ExecuteOptions{ngerman} +\@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}} \ProcessOptions\relax \InputIfFileExists{personal.tex}{ @@ -50,9 +53,9 @@ \PassOptionsToPackage{utf8}{inputenc} \PassOptionsToPackage{T1}{fontenc} \PassOptionsToPackage{left=3cm,right=2.5cm,top=3cm,bottom=3cm}{geometry} -\PassOptionsToPackage{free-standing-units}{siunitx} \PassOptionsToPackage{babel, german=quotes}{csquotes} \PassOptionsToPackage{headsepline}{scrlayer-scrpage} +\PassOptionsToPackage{free-standing-units}{siunitx} %used packages: \RequirePackage{inputenc} % inputencoding, utf8 recomendet @@ -64,6 +67,7 @@ \RequirePackage{scrlayer-scrpage} % required for header and footer \RequirePackage{scrhack} % compatability with listings \RequirePackage{pgffor} % foreach loops +\if@german\RequirePackage{ziffer}\fi % german dezimal numbers % should these be in? \RequirePackage{subfigure} diff --git a/src/config.tex b/src/config.tex index f8ac159fd6875d2b830cd54c0902003e92a8ccec..4370bcbb0115930d3b1f5fe1557c86bfa1607ed3 100644 --- a/src/config.tex +++ b/src/config.tex @@ -1,4 +1,4 @@ -\renewcaptionname{ngerman}{\abstractname}{Abstract} %Abstract +\renewcommand\abstractname{Abstract} %Abstract \@ifpackageloaded{biblatex}{ \ExecuteBibliographyOptions{ sorting=nyt, @@ -32,3 +32,12 @@ escapeinside={(*@}{@*)}, } }{}% +\@ifpackageloaded{listings}{ + \ctikzset{ + font=\footnotesize, + resistors/scale=0.7, + transistors/scale=0.75, + default/scale=0.5, + bipole annotation style/.style={font=\tiny ,inner sep=1pt}, + } +}{}% diff --git a/test.tex b/test.tex index 8d884b5f37e52b591f8dd2d3697e9ea535233fdd..0f70ccace7cceed8817f0eee38eddabdf1e2c847 100644 --- a/test.tex +++ b/test.tex @@ -3,7 +3,6 @@ \usepackage{color} \usepackage{lipsum} \usepackage{siunitx} -\usepackage{ziffer} \begin{document} @@ -33,6 +32,7 @@ mit einheit: $R=200\,\milli\ohm+ \SI{0.34567453}{\volt\per\metre}$ \vspace{2cm}\\ + eine zahl: $3,5+3.5$\\