disser 1.1.7 (22nov10)

git-svn-id: svn://tug.org/texlive/trunk@20522 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 36 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index 7c73e819c65..c60628dd4a5 100644
--- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
@@ -17,13 +17,31 @@
 \newcommand\bachelor@the{\default@the}
 \bachelor@the
 
-\if@titlepage\renewcommand\maketitle{
-\deflength\firstskip{1.5cm}
-\deflength\secondskip{1.5cm}
-\deflength\thirdskip{1ex}
-\deflength\fourthskip{1ex}
-\deflength\fifthskip{2cm}
-\deflength\sixthskip{1.5ex}
+\if@titlepage\renewcommand\maketitle[1][]{
+\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse}
+\if@titlepage@en
+  \def\appos{Head of Department}
+  \def\approved{``Approved for defence''}
+  \def\revname{Reviewer}
+  \def\revsndname{\revname}
+  \def\revlabel{\revname}
+  \def\revsndlabel{\revsndname}
+  \def\saname{Scientific Supervisor}
+  \def\sasndname{\saname}
+  \def\salabel{\saname}
+  \def\sasndlabel{\saname}
+  \def\topicname{Topic}
+  \def\coursename{Speciality}
+  \def\studentname{Student}
+  \def\studentlabel{\studentname\hspace{6cm}}
+\fi
+
+\ifundeflength\firstskip{1.5cm}
+\ifundeflength\secondskip{1.5cm}
+\ifundeflength\thirdskip{1ex}
+\ifundeflength\fourthskip{1ex}
+\ifundeflength\fifthskip{2cm}
+\ifundeflength\sixthskip{1.5ex}
 
 \setlength\fieldhshift{8.5cm}
 
@@ -36,24 +54,24 @@
 \thispagestyle{empty}
 \enlargethispage{2cm}
 \vspace*{-2cm}
-\begin{center}
-\instfont\@institution\par
+\begin{center}%
+  {\instfont\@institution}
 \end{center}
 
-\vskip\firstskip\normalfont
-\@approved
+\vskip\firstskip
+{\@approved}
 \vskip\secondskip
 
-\begin{center}
-  {\titlefont\@title\par}
-  \vskip\thirdskip\normalfont
+\begin{center}%
+  {\titlefont\@title\par}%
+  \vskip\thirdskip%
   {\topiclabelfont\topiclabel\ }%
-  {\topicfont\@topic\par}
-  \vskip\fourthskip\normalfont
-  \courselabel\ \@coursenum~--\ \@course
+  {\topicfont\@topic}
+  \vskip\fourthskip\normalfont%
+  \courselabel\ \@coursenum~--\ \@course%
 \end{center}
 
-\vskip\fifthskip\normalfont
+\vskip\fifthskip
 \begin{tabbing}
   \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip]
   \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi