Skip to content

Commit

Permalink
Merge branch 'release/1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
faltfe committed Apr 1, 2020
2 parents 7ec29b5 + 4659ba2 commit 509ad6e
Show file tree
Hide file tree
Showing 18 changed files with 370 additions and 83 deletions.
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,6 @@ Diese befinden sich im Ordner [doc/examples](doc/examples)
- Erstellen einer schwarz/weiß Ausgabe
- Römische Nummerierung vor dem Inhaltsverzeichnis

## Installationshinweis

Das Paket befindet sich ab der Version `v1.0` in den offiziellen Paketquellen von
[CTAN](https://www.ctan.org/pkg/iodhbwm). Daher ist eine manuelle Installtion in
einem lokalen `texmf`-Verzeichnis nicht mehr notwendig. In der Dokumentation
sind zusätzlich kurze Anleitungen für die Installation
unter MiKTeX und TeXlive integriert.

Die neueste Version kann unter <https://github.com/faltfe/iodhbwm/releases/latest> heruntergeladen
werden. Ab Version `v0.4-alpha` enthalten Downloads eine TDS-konforme Ordnerstruktur.

## Für Entwickler

Die Entwicklung erfolgt nach [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/). Das
Expand Down
21 changes: 11 additions & 10 deletions doc/README.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
iodhbwm
=======
# iodhbwm

[![CTAN](https://img.shields.io/ctan/v/iodhbwm.svg)](https://www.ctan.org/pkg/iodhbwm)
[![GitHub license](https://img.shields.io/github/license/faltfe/iodhbwm.svg?style=flat-square)](https://github.com/faltfe/iodhbwm/blob/master/LICENSE)
[![Build Status](https://img.shields.io/travis/faltfe/iodhbwm/master.svg?style=flat-square)](https://travis-ci.org/faltfe/iodhbwm)

--------------------------------------------------------------------------
---

This project provides the _unofficial_ template of the [DHBW Mannheim](http://www.dhbw-mannheim.de) for
the creation of bachelor thesis, studies or project work with _LaTeX_. The goal of the package is
the quick creation of a basic framework without much effort.

The documentation is currently only available in German.

--------------------------------------------------------------------------
---

Felix Faltin

Web: <https://github.com/faltfe/iodhbwm>
Web: <https://github.com/faltfe/iodhbwm>

E-Mail: ffaltin91@gmail.com

--------------------------------------------------------------------------
Copyright 2018-2019 Felix Faltin
---

Copyright 2018-2020 Felix Faltin

This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or (at your option) any later version.
The latest version of this license is in
<http://www.latex-project.org/lppl.txt>
<http://www.latex-project.org/lppl.txt>
and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.

This work has the LPPL maintenance status `maintained'.

The Current Maintainer of this work is Felix Faltin.

--------------------------------------------------------------------------
---

If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.

--------------------------------------------------------------------------
---
Binary file modified doc/iodhbwm.pdf
Binary file not shown.
23 changes: 12 additions & 11 deletions doc/iodhbwm.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%\usepackage{showframe}

\package[vcs=https://github.com/faltfe/iodhbwm,ctan=iodhbwm]{iodhbwm}
\version{1.1.1}
\version{1.2}

\title{iodhbwm Klasse}
\author{Felix Faltin}
Expand Down Expand Up @@ -150,9 +150,9 @@
\newcommand{\Version}[1]{\marginpar[\raggedleft v#1]{\raggedright v#1}}

\begin{document}
\changes{0.4-alpha}{Add print option, auto-intro-pages and some new commands}
\changes{0.4a-alpha}{Rename \opt{intro/add custom list} into \opt{intro/append custom content}}%
\changes{0.4.1-alpha}{Unterstützung eines Anhang wurde hinzugefügt}%
\changes{1.1}{Erweiterung der Optionen}%
\changes{1.1.1}{Kleinere Fehlerbehebungen innerhalb von listings}
\changes{1.2}{Bereitstellung Englischer Vorlagen (Danke an mickmack1213)}

\maketitle

Expand All @@ -173,7 +173,11 @@
\clearpage

\tableofcontents


\clearpage
\PrintChanges
\clearpage

\section{Konventionen}
% \begin{sourcecode}[listing side comment, comment={Ich bin ein Kommentar},title={Hello world example}]
%% Hello again
Expand Down Expand Up @@ -679,12 +683,11 @@
Um die Autovervollständigung für \thepackage{} zu aktiveren, müssen die Dateien \file{iodhbwm.cwl} und \file{iodhbwm-template.cwl} nach \path|%appdata%\texstudio\completion\user| beziehungsweise nach \path|.config/texstudio/completion/user| kopiert werden.

\section{Installation}
\subsection{CTAN}
Das Bundle wird ebenfalls über CTAN zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.
\subsection{Lokale Installation}
Eine eigene Installation des Pakets kann in einem lokalen texmf Ordner (lokales Repository) erfolgen. Das Bundle kann manuell aus dem Git-Repository heruntergeladen werden.

\subsection{CTAN}
Das Bundle wird ebenfalls über CTAN (mit Release der Version v1.0) zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.


\subsubsection{MiKTeX}
\begin{enumerate}
\item Lokales Repository anlegen, welches der \href{http://tug.ctan.org/tds/tds.html}{Verzeichnisstruktur für \LaTeX{} Dateien} entspricht. Die Verzeichnisstruktur könnte wie folgt aussehen:\par \verb|C:\Users\<username>\localtexmf\tex\latex\iodhbwm|
Expand All @@ -708,8 +711,6 @@

Eine ausführliche Beschreibung befindet sich auf \url{https://tex.stackexchange.com/a/73017/142408}.

% \PrintChanges

\PrintIndex

\end{document}
36 changes: 36 additions & 0 deletions source/i18n.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
\newcommand{\@addlanguage}[7]{%
\iflanguage{#1}{
\renewcommand*{\iodhbwm@file@prefix}{i18n/#1/dhbw}

\def\iodhbwm@bachelor@type@boe{#2}
\def\iodhbwm@bachelor@type@bos{#3}
\def\iodhbwm@bachelor@type@boa{#4}

\def\iodhbwm@thesis@type@ba{#5}
\def\iodhbwm@thesis@type@pa{#6}
\def\iodhbwm@thesis@type@sa{#7}

\booltrue{iodhbwm@if@supported@language}
}%
{}%
}

% ################################################################
% ### ADD SUPPORTED LANGUAGES HERE
% ################################################################

% english
\@addlanguage{english}
{Bachelor of Engineering}
{Bachelor of Science}
{Bachelor of Arts}
{bachelor's thesis}
{project report}
{study report}

% ################################################################

% Print waring if an unsupported language is used
\ifbool{iodhbwm@if@supported@language}{}{%
\PackageWarning{\iodhbwm@pkg@name}{The passed language `\iodhbwm@main@language` was not found.\MessageBreak Using ngerman instead.}
}
37 changes: 37 additions & 0 deletions source/i18n/english/dhbw-declaration.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
\clearpage

\ifcsdef{chapter}%
{\chapter*{Declaration}}%
{\section*{Declaration}}

\thispagestyle{empty}

\bigskip

I hereby assure you that I have written my \getThesisType{} on the\bigskip

\textsc{Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}

{\bfseries \getThesisTitle}

\ifcsempty{iodhbwm@thesis@second@title}{}{%
\bigskip
\textsc{Subject B}\par%
{\bfseries \getThesisSecondTitle}%
}{}\bigskip

independently and that I have not used any other sources and aids than those indicated.


I also assure you that the electronic version submitted is the same as the printed version.$^\ast$

{\small$^\ast$ if both versions are required.}

\vfill

\begin{tabular}{l}
\hline
\getLocation, \getDate
\end{tabular}

\clearpage
57 changes: 57 additions & 0 deletions source/i18n/english/dhbw-titlepage-ba.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
\begin{titlepage}
\centering
\ifcsempty{iodhbwm@institute@logo}{%
\includegraphics[height=1.7cm]{\getDHBWLogo}
}{%
\begin{minipage}[c]{.25\textwidth}
\includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
\end{minipage}
\hfill
\begin{minipage}[c]{.25\textwidth}
\centering
\includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
\end{minipage}
}

\bigskip

\rule{\textwidth}{.5mm}\bigskip

{\bfseries \getThesisTitle}\smallskip

\rule{\textwidth}{.5mm}\bigskip

\textsc{\Large Bachelor's thesis}

\bigskip
for the degree

\textsc{\large \getBachelorDegree}

\bigskip
of the course \getCourseName\par
at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation

\vfill

by\par
{\bfseries\large \getAuthor}\bigskip

Submission on \getSubmissionDate

\vfill

\small{%
\begin{tabularx}{\textwidth}{@{}lX@{}}
\toprule
Processing Period: & \getProcessingPeriod\\
Student id, course: & \getStudentId, \getCourseId\\
\ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
Apprenticing company: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
Company's supervisor: & \getSupervisor\\
University's reviewer: & \getReviewer\\
\end{tabularx}
}
\cleardoublepage
\end{titlepage}
59 changes: 59 additions & 0 deletions source/i18n/english/dhbw-titlepage-pa.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
\begin{titlepage}
\centering
\ifcsempty{iodhbwm@institute@logo}{%
\includegraphics[height=1.5cm]{\getDHBWLogo}
}{%
\begin{minipage}[c]{.25\textwidth}
\includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
\end{minipage}
\hfill
\begin{minipage}[c]{.25\textwidth}
\raggedleft
\includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
\end{minipage}
}

\bigskip

\Large\textsc{Project report}

\normalsize
of the course \getCourseName\par
at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation

\rule{\textwidth}{.5mm}\bigskip

\textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}

{\bfseries \getThesisTitle}\bigskip

\ifcsempty{iodhbwm@thesis@second@title}{}{%
\textsc{\large Subject B}\par
%\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
{\bfseries \getThesisSecondTitle}
}{}

\rule{\textwidth}{.5mm}

\vfill

\par
{\bfseries\large \getAuthor}\par
\getDate

\vfill

\small{%
\begin{tabularx}{\textwidth}{@{}lX@{}}
\toprule
Processing Period: & \getProcessingPeriod\\
Student id, course: & \getStudentId, \getCourseId\\
\ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
Apprenticing company: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
Supervisor: & \getSupervisor\\
Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
\end{tabularx}
}
\cleardoublepage
\end{titlepage}
59 changes: 59 additions & 0 deletions source/i18n/english/dhbw-titlepage-sa.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
\begin{titlepage}
\centering
\ifcsempty{iodhbwm@institute@logo}{%
\includegraphics[height=1.5cm]{\getDHBWLogo}
}{%
\begin{minipage}[c]{.25\textwidth}
\includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
\end{minipage}
\hfill
\begin{minipage}[c]{.25\textwidth}
\raggedleft
\includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
\end{minipage}
}

\bigskip

\Large\textsc{Study report}

\normalsize
of the course \getCourseName\par
at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation

\rule{\textwidth}{.5mm}\bigskip

\textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}

{\bfseries \getThesisTitle}\bigskip

\ifcsempty{iodhbwm@thesis@second@title}{}{%
\textsc{\large Subject B}\par
%\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
{\bfseries \getThesisSecondTitle}
}{}

\rule{\textwidth}{.5mm}

\vfill

\par
{\bfseries\large \getAuthor}\par
\getDate

\vfill

\small{%
\begin{tabularx}{\textwidth}{@{}lX@{}}
\toprule
Processing Period: & \getProcessingPeriod\\
Student id, course: & \getStudentId, \getCourseId\\
\ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
% Apprenticing company: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
Supervisor: & \getSupervisor\\
% Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
\end{tabularx}
}
\cleardoublepage
\end{titlepage}
Loading

0 comments on commit 509ad6e

Please sign in to comment.