Skip to content
Snippets Groups Projects
Commit cc51f224 authored by Jan Wille's avatar Jan Wille
Browse files

Merge branch 'development'

parents a820c1a7 7e5b93b3
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
README.md
+ 3
− 3
View file @ cc51f224
src/HsH-article.cls
+ 26
− 27
View file @ cc51f224
...@@ -32,40 +32,39 @@ ...@@ -32,40 +32,39 @@
\newif\if@german% \newif\if@german%
%% document options ------------------------------------------------------------------------------- %% document options -------------------------------------------------------------------------------
\DeclareOption{german}{% \DeclareOption{german}{
\@germantrue \@germantrue
} }
\DeclareOption{ngerman}{% \DeclareOption{ngerman}{
\@germantrue \@germantrue
} }
\DeclareOption{english}{% \DeclareOption{english}{
\@germanfalse \@germanfalse
} }
\DeclareOption{f1}{% use logo of fakulty 1 \DeclareOption{f1}{
\renewcommand{\HsHlogoPage}{2} \renewcommand{\HsHlogoPage}{2}
} }
\DeclareOption{f2}{% use logo of fakulty 2 \DeclareOption{f2}{
\renewcommand{\HsHlogoPage}{3} \renewcommand{\HsHlogoPage}{3}
} }
\DeclareOption{f3}{% use logo of fakulty 3 \DeclareOption{f3}{
\renewcommand{\HsHlogoPage}{4} \renewcommand{\HsHlogoPage}{4}
} }
\DeclareOption{f4}{% use logo of fakulty 4 \DeclareOption{f4}{
\renewcommand{\HsHlogoPage}{5} \renewcommand{\HsHlogoPage}{5}
} }
\DeclareOption{f5}{% use logo of fakulty 5 \DeclareOption{f5}{
\renewcommand{\HsHlogoPage}{6} \renewcommand{\HsHlogoPage}{6}
} }
\DeclareOption{sans}{% use san serif font \DeclareOption{sans}{
\renewcommand{\familydefault}{\sfdefault} \renewcommand{\familydefault}{\sfdefault}
} }
\DeclareOption{roman}{% use roman/serif font \DeclareOption{roman}{
\renewcommand{\familydefault}{\rmdefault} \renewcommand{\familydefault}{\rmdefault}
} }
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
\ProcessOptions\relax \ProcessOptions\relax
%% Load KOMA class %% Load KOMA class
\LoadClass{scrartcl} \LoadClass{scrartcl}
\KOMAoption{toc}{bibliography,listof} \KOMAoption{toc}{bibliography,listof}
...@@ -75,7 +74,7 @@ ...@@ -75,7 +74,7 @@
\RequirePackage{inputenc} \RequirePackage{inputenc}
\PassOptionsToPackage{T1}{fontenc} \PassOptionsToPackage{T1}{fontenc}
\RequirePackage{fontenc} \RequirePackage{fontenc}
\RequirePackage{lmodern} % font \RequirePackage{lmodern}
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage{amsmath} \RequirePackage{amsmath}
\if@german\RequirePackage{ziffer}\fi \if@german\RequirePackage{ziffer}\fi
...@@ -100,12 +99,12 @@ ...@@ -100,12 +99,12 @@
\PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz} \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
%% title matters ---------------------------------------------------------------------------------- %% title matters ----------------------------------------------------------------------------------
\newcommand*{\@matrikelnr}{}% \newcommand*{\@matrikelnr}{}
\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}% \newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}
\newcommand*{\@professor}{}% \newcommand*{\@professor}{}
\newcommand{\professor}[1]{\gdef\@professor{#1}}% \newcommand{\professor}[1]{\gdef\@professor{#1}}
\newcommand*{\@keywords}{}% \newcommand*{\@keywords}{}
\newcommand{\keywords}[1]{\gdef\@keywords{#1}}% \newcommand{\keywords}[1]{\gdef\@keywords{#1}}
\let\@author\@empty \let\@author\@empty
\let\@keywords\@empty \let\@keywords\@empty
...@@ -148,9 +147,9 @@ ...@@ -148,9 +147,9 @@
\renewcommand{\labelitemiv}{$\cdot$} \renewcommand{\labelitemiv}{$\cdot$}
%% do stuff %% do stuff
\setlength\parindent{0pt} % indentation of new paragraphs \setlength\parindent{0pt}
\raggedbottom \raggedbottom
\renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled \renewcommand{\layercontentsmeasure}{\@empty}
%% custom commands %% custom commands
\newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}} \newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}}
...@@ -174,14 +173,14 @@ ...@@ -174,14 +173,14 @@
\makeatother \makeatother
} }
%% nicer abstract --------------------------------------------------------------------------------- %% nicer abstract ---------------------------------------------------------------------------------
\renewenvironment{abstract}{% \renewenvironment{abstract}{
\section*{\centering\abstractname}
\addcontentsline{toc}{chapter}{\abstractname}
\small
\quotation \quotation
\setlength\parindent{0pt}
\section*{\abstractname}
\addcontentsline{toc}{section}{\abstractname}
}{% }{%
\ifx\@keywords\@empty\else \ifx\@keywords\@empty\else
\vspace{1cm} \vskip 0.5em
\paragraph{\if@german Schlüsselwörter:\else Keywords:\fi} \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi}
\@keywords \@keywords
\fi \fi
......
src/HsH-report.cls
+ 25
− 26
View file @ cc51f224
...@@ -32,40 +32,39 @@ ...@@ -32,40 +32,39 @@
\newif\if@german% \newif\if@german%
%% document options ------------------------------------------------------------------------------- %% document options -------------------------------------------------------------------------------
\DeclareOption{german}{% \DeclareOption{german}{
\@germantrue \@germantrue
} }
\DeclareOption{ngerman}{% \DeclareOption{ngerman}{
\@germantrue \@germantrue
} }
\DeclareOption{english}{% \DeclareOption{english}{
\@germanfalse \@germanfalse
} }
\DeclareOption{f1}{% use logo of fakulty 1 \DeclareOption{f1}{
\renewcommand{\HsHlogoPage}{2} \renewcommand{\HsHlogoPage}{2}
} }
\DeclareOption{f2}{% use logo of fakulty 2 \DeclareOption{f2}{
\renewcommand{\HsHlogoPage}{3} \renewcommand{\HsHlogoPage}{3}
} }
\DeclareOption{f3}{% use logo of fakulty 3 \DeclareOption{f3}{
\renewcommand{\HsHlogoPage}{4} \renewcommand{\HsHlogoPage}{4}
} }
\DeclareOption{f4}{% use logo of fakulty 4 \DeclareOption{f4}{
\renewcommand{\HsHlogoPage}{5} \renewcommand{\HsHlogoPage}{5}
} }
\DeclareOption{f5}{% use logo of fakulty 5 \DeclareOption{f5}{
\renewcommand{\HsHlogoPage}{6} \renewcommand{\HsHlogoPage}{6}
} }
\DeclareOption{sans}{% use san serif font \DeclareOption{sans}{
\renewcommand{\familydefault}{\sfdefault} \renewcommand{\familydefault}{\sfdefault}
} }
\DeclareOption{roman}{% use roman/serif font \DeclareOption{roman}{
\renewcommand{\familydefault}{\rmdefault} \renewcommand{\familydefault}{\rmdefault}
} }
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}}
\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options
\ProcessOptions\relax \ProcessOptions\relax
%% Load KOMA class %% Load KOMA class
\LoadClass{scrreprt} \LoadClass{scrreprt}
\KOMAoption{toc}{bibliography,listof} \KOMAoption{toc}{bibliography,listof}
...@@ -75,7 +74,7 @@ ...@@ -75,7 +74,7 @@
\RequirePackage{inputenc} \RequirePackage{inputenc}
\PassOptionsToPackage{T1}{fontenc} \PassOptionsToPackage{T1}{fontenc}
\RequirePackage{fontenc} \RequirePackage{fontenc}
\RequirePackage{lmodern} % font \RequirePackage{lmodern}
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage{amsmath} \RequirePackage{amsmath}
\if@german\RequirePackage{ziffer}\fi \if@german\RequirePackage{ziffer}\fi
...@@ -100,12 +99,12 @@ ...@@ -100,12 +99,12 @@
\PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz} \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
%% title matters ---------------------------------------------------------------------------------- %% title matters ----------------------------------------------------------------------------------
\newcommand*{\@matrikelnr}{}% \newcommand*{\@matrikelnr}{}
\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}% \newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}
\newcommand*{\@professor}{}% \newcommand*{\@professor}{}
\newcommand{\professor}[1]{\gdef\@professor{#1}}% \newcommand{\professor}[1]{\gdef\@professor{#1}}
\newcommand*{\@keywords}{}% \newcommand*{\@keywords}{}
\newcommand{\keywords}[1]{\gdef\@keywords{#1}}% \newcommand{\keywords}[1]{\gdef\@keywords{#1}}
\let\@author\@empty \let\@author\@empty
\let\@keywords\@empty \let\@keywords\@empty
...@@ -149,9 +148,9 @@ ...@@ -149,9 +148,9 @@
\renewcommand{\labelitemiv}{$\cdot$} \renewcommand{\labelitemiv}{$\cdot$}
%% do stuff %% do stuff
\setlength\parindent{0pt} % indentation of new paragraphs \setlength\parindent{0pt}
\raggedbottom \raggedbottom
\renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled \renewcommand{\layercontentsmeasure}{\@empty}
%% custom commands %% custom commands
\newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}} \newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}}
...@@ -175,14 +174,14 @@ ...@@ -175,14 +174,14 @@
\makeatother \makeatother
} }
%% nicer abstract --------------------------------------------------------------------------------- %% nicer abstract ---------------------------------------------------------------------------------
\renewenvironment{abstract}{% \renewenvironment{abstract}{
\chapter*{\centering\abstractname}
\addcontentsline{toc}{chapter}{\abstractname}
\small
\quotation \quotation
\setlength\parindent{0pt}
\chapter*{\abstractname}
\addcontentsline{toc}{chapter}{\abstractname}
}{% }{%
\ifx\@keywords\@empty\else \ifx\@keywords\@empty\else
\vspace{1cm} \vskip 2em
\paragraph{\if@german Schlüsselwörter:\else Keywords:\fi} \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi}
\@keywords \@keywords
\fi \fi
......
src/HsH-standalone.cls
+ 12
− 13
View file @ cc51f224
...@@ -32,40 +32,39 @@ ...@@ -32,40 +32,39 @@
\newif\if@german% \newif\if@german%
%% document options ------------------------------------------------------------------------------- %% document options -------------------------------------------------------------------------------
\DeclareOption{german}{% \DeclareOption{german}{
\@germantrue \@germantrue
} }
\DeclareOption{ngerman}{% \DeclareOption{ngerman}{
\@germantrue \@germantrue
} }
\DeclareOption{english}{% \DeclareOption{english}{
\@germanfalse \@germanfalse
} }
\DeclareOption{f1}{% use logo of fakulty 1 \DeclareOption{f1}{
\renewcommand{\HsHlogoPage}{2} \renewcommand{\HsHlogoPage}{2}
} }
\DeclareOption{f2}{% use logo of fakulty 2 \DeclareOption{f2}{
\renewcommand{\HsHlogoPage}{3} \renewcommand{\HsHlogoPage}{3}
} }
\DeclareOption{f3}{% use logo of fakulty 3 \DeclareOption{f3}{
\renewcommand{\HsHlogoPage}{4} \renewcommand{\HsHlogoPage}{4}
} }
\DeclareOption{f4}{% use logo of fakulty 4 \DeclareOption{f4}{
\renewcommand{\HsHlogoPage}{5} \renewcommand{\HsHlogoPage}{5}
} }
\DeclareOption{f5}{% use logo of fakulty 5 \DeclareOption{f5}{
\renewcommand{\HsHlogoPage}{6} \renewcommand{\HsHlogoPage}{6}
} }
\DeclareOption{sans}{% use san serif font \DeclareOption{sans}{
\renewcommand{\familydefault}{\sfdefault} \renewcommand{\familydefault}{\sfdefault}
} }
\DeclareOption{roman}{% use roman/serif font \DeclareOption{roman}{
\renewcommand{\familydefault}{\rmdefault} \renewcommand{\familydefault}{\rmdefault}
} }
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}}
\ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % standart options \ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % default options
\ProcessOptions\relax \ProcessOptions\relax
%% Load KOMA class %% Load KOMA class
\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone} \LoadClass[multi=tikzpicture,multi=circuitikz]{standalone}
...@@ -74,7 +73,7 @@ ...@@ -74,7 +73,7 @@
\RequirePackage{inputenc} \RequirePackage{inputenc}
\PassOptionsToPackage{T1}{fontenc} \PassOptionsToPackage{T1}{fontenc}
\RequirePackage{fontenc} \RequirePackage{fontenc}
\RequirePackage{lmodern} % font \RequirePackage{lmodern}
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage{amsmath} \RequirePackage{amsmath}
\if@german\RequirePackage{ziffer}\fi \if@german\RequirePackage{ziffer}\fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment