Add: optional parameter to load main document other than TUWmaster/TU…

…Wbachelor
gsalzer · Jun 2, 2023 · 2cbbe49 · 2cbbe49
1 parent 6a4ff45
commit 2cbbe49
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/TUWcurriculum.zip b/TUWcurriculum.zip
diff --git a/TUWcurriculum/TUWAoMaster.tex b/TUWcurriculum/TUWAoMaster.tex
@@ -1,8 +1,10 @@
-% TU Wien Curriculum 2023.5
+% TU Wien Curriculum 2023.6
 
 \newcommand*\Markierung{Lehrgang}
 \newcommand*\Studienart{außerordentliche Masterstudium}
 \newcommand*\ArtikelAkkusativStudienart{das}
+
+\begin{document}
 \DECKBLATT
 
 \tableofcontents
@@ -11,7 +13,7 @@
 \section{Grundlage und Geltungsbereich}\label{sec:GG}
 
 Der vorliegende Studienplan definiert und regelt das
-{\ifENGLISCHSPRACHIG{ englischsprachige}{}
+\ifENGLISCHSPRACHIG{ englischsprachige}{}
 außerordentliche Masterstudium \emph{\VAR{Titel}} 
 an der Technischen Universität Wien. 
 Dieses Masterstudium basiert auf dem Universitätsgesetz 

diff --git a/TUWcurriculum/TUWbachelor.tex b/TUWcurriculum/TUWbachelor.tex
@@ -1,8 +1,10 @@
-% TU Wien Curriculum 2023.5
+% TU Wien Curriculum 2023.6
 
 \newcommand*\Markierung{Bachelor}
 \newcommand*\Studienart{Bachelorstudium}
 \newcommand*\ArtikelAkkusativStudienart{das}
+
+\begin{document}
 \DECKBLATT
 
 \tableofcontents
@@ -501,3 +503,5 @@ \section{Lehrveranstaltungstypen}\label{app:ALT}
 \ifDEF{Anhang}{%
   \VAR{Anhang}%
 }{}
+
+\end{document}
diff --git a/TUWcurriculum/TUWcurriculum.cls b/TUWcurriculum/TUWcurriculum.cls
@@ -1,4 +1,4 @@
-%% TU Wien Curriculum 2023.5
+%% TU Wien Curriculum 2023.6
 %% Copyright 2023 G. Salzer
 %
 % This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
 % This work consists of the file TUWcurriculum.cls.
 
 % Class stuff
-\ProvidesClass{TUWcurriculum}[TU Wien Curriculum 2023.5]
+\ProvidesClass{TUWcurriculum}[TU Wien Curriculum 2023.6]
 \RequirePackage{xcolor}
 \LoadClass[a4paper,12pt]{scrartcl}
 \setcounter{tocdepth}{1}
@@ -475,7 +475,8 @@
 % BACHELOR
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\newenvironment{Bachelor}{
+\newenvironment{Bachelor}[1][TUWbachelor]{
+  \gdef\TUWbachelor{#1}
   \BachelorBeginHook
   \CURnewcmd{Titel}
   \CURnewcmd{Kennzahl}
@@ -527,17 +528,16 @@
   \ifDEF{Module}{\LadeModule{\VAR{Module}}}{}
   \ifDEF{ExterneModule}{\LadeModule{\VAR{ExterneModule}}}{}
   \LVcsv{lvas.csv}
-  \begin{document}
-  \input{TUWbachelor}
-  \end{document}
+  \input{\TUWbachelor}
 }
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % MASTER
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\newenvironment{Master}{
+\newenvironment{Master}[1][TUWmaster]{
+  \gdef\TUWmaster{#1}
   \MasterBeginHook
   \CURnewcmd{Titel}
   \CURnewcmd{Kennzahl}
@@ -595,9 +595,7 @@
   \ifDEF{Module}{\LadeModule{\VAR{Module}}}{}
   \ifDEF{ExterneModule}{\LadeModule{\VAR{ExterneModule}}}{}
   \LVcsv{lvas.csv}
-  \begin{document}
-  \input{TUWmaster}
-  \end{document}
+  \input{\TUWmaster}
 }
 
 

diff --git a/TUWcurriculum/TUWdeckblatt.tex b/TUWcurriculum/TUWdeckblatt.tex
@@ -1,4 +1,4 @@
-% TU Wien Curriculum 2023.5
+% TU Wien Curriculum 2023.6
 \newcommand\TUWfonts{TUWfonts}
 \newfontfamily\TUtext{TUTextRegular.ttf}%
   [Path = \currfiledir\TUWfonts/,%

diff --git a/TUWcurriculum/TUWmaster.tex b/TUWcurriculum/TUWmaster.tex
@@ -1,8 +1,10 @@
-% TU Wien Curriculum 2023.5
+% TU Wien Curriculum 2023.6
 
 \newcommand*\Markierung{Master}
 \newcommand*\Studienart{Masterstudium}
 \newcommand*\ArtikelAkkusativStudienart{das}
+
+\begin{document}
 \DECKBLATT
 
 \tableofcontents

diff --git a/TUWcurriculum/TUWmodul.tex b/TUWcurriculum/TUWmodul.tex
@@ -1,4 +1,4 @@
-% TU Wien Curriculum 2023.5
+% TU Wien Curriculum 2023.6
 
 \ifENTWURF
   \pagebreak