Merge branch 'development'

README.md

@@ -12,7 +12,7 @@ them with specific configurations and presets as well as providing commonly need
 	HsH-book (planed)  
 	HsH-standalone
 
-**Version:** BETA 0.4, 08.02.2021
+**Version:** BETA 0.5, 14.03.2021
 
 ## Check out the **Example-Branche**
 

bib/README.md

+# Bibliograpy folder
+
+This folder is for bibliographic purpises. Here should be `.bib` files for useage with the `biblatex`package and source dokuments like pdfs,
+presentations or downloaded web-pages.
\ No newline at end of file

crc/README.md

-# Circuits-folder
+# Circuits folder
 
 This folder is for Circuit diagramms. It is recommended to use the `circuitikz` package. This extents the `tikz` package with commands for close to all
 your circuit diagramm needs. Have a look at the documentation.
\ No newline at end of file

csv/README.md

@@ -2,6 +2,7 @@
 
 This folder is for measurement readings and other kinds of data collection.  
 It is named *csv*, but you could also use different filetypes, even though the `.csv` type is the easiest to include in LaTex.  
+Keep in mind, that the config selts the ';' as the seperator, which is the german standart
 
 # Export Excel to CSV
 

src/HsH-article.cls

-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-03-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-03-13> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-article}
-\ProvidesClass{\myClassName}[2021-03-08 HsH Report based on KOMA]
+\ProvidesClass{\myClassName}[2021/03/13 HsH Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -18,25 +18,32 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 
-\@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}}
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
 % Load KOMA class
@@ -107,7 +114,6 @@
 \renewcommand{\fps@figure}{h!t} % positioning of figures
 \renewcommand{\fps@table}{h!t} % Positonierung of tables
 \renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled
-\renewcommand{\familydefault}{\sfdefault} % Sans-Serif Font as standard
 \MakeOuterQuote{"} % easy quotationmarks
 
 % custom commands
@@ -174,6 +180,10 @@
 % load config at beginning of document
 \AtBeginDocument{
 	\makeatletter
+	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{

src/HsH-report.cls

-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-02-09> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2021-03-13> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-report}
-\ProvidesClass{\myClassName}[2021/02/09 HsH Report based on KOMA]
+\ProvidesClass{\myClassName}[2021/03/13 HsH-Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -18,25 +18,32 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}}
 
-\@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}}
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
 % Load KOMA class
@@ -108,7 +115,6 @@
 \renewcommand{\fps@figure}{h!t} % positioning of figures
 \renewcommand{\fps@table}{h!t} % Positonierung of tables
 \renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled
-\renewcommand{\familydefault}{\sfdefault} % Sans-Serif Font as standard
 \MakeOuterQuote{"} % easy quotationmarks
 
 % custom commands
@@ -184,6 +190,10 @@
 % load config at beginning of document
 \AtBeginDocument{
 	\makeatletter
+	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{

src/HsH-standalone.cls

@@ -2,8 +2,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-standalone}
-\ProvidesClass{\myClassName}[2020/01/22 HsH Report based on KOMA]
-\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone}
+\ProvidesClass{\myClassName}[2020/03/13 HsH Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -21,25 +20,37 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}}
+
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
+\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone}
+
+
 \newcommand*{\@titlehead}{}%
 \newcommand{\titlehead}[1]{\gdef\@titlehead{#1}}%
 \newcommand*{\@subject}{}%
@@ -87,6 +98,9 @@
 % load config at beginning of document
 \AtBeginDocument{
 	\makeatletter
+	\@ifpackageloaded{subfigure}{
+		\newcommand{\subfigureautorefname}{\figureautorefname}
+	}{}%
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{

src/README.md

-# Der Sources Ordner
+# The sources Folder
 
-This folder is for additional source files. It provides the custom classes and support files as well as being good for storing your assignments or
-documents you need for information.
+This folder is for additional source files. It provides the custom classes and support files.
\ No newline at end of file
\ No newline at end of file

src/config.tex

@@ -12,9 +12,6 @@
 	\setcapwidth[c]{0.8\textwidth} % center all captions
 	%\setcapwidth[l]{0.8\textwidth} % leftalign all captions
 \fi
-\@ifpackageloaded{subfigure}{
-	\newcommand{\subfigureautorefname}{\figureautorefname}
-}{}%
 \@ifpackageloaded{biblatex}{
 	\ExecuteBibliographyOptions{
 		bibwarn=true,

src/personal.tex

@@ -6,4 +6,4 @@
 \subject{Subject}
 \title{Title}
 \subtitle{Subtitle}
-\date{\st{01.10.2020}\\\today}
+\date{\today}