thesis-ekf (1jul16)

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

6 files changed, 182 insertions, 81 deletions

diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo1.png b/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo1.png
deleted file mode 100644
index ff80e2604d7..00000000000
--- a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo1.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo2.pdf b/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo2.pdf
deleted file mode 100644
index a5d9a6e3166..00000000000
--- a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo3.pdf b/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo3.pdf
deleted file mode 100644
index b74394e3d2d..00000000000
--- a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo3.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo4.pdf b/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo4.pdf
deleted file mode 100644
index fe5b9fe846b..00000000000
--- a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo4.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo5.pdf b/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo5.pdf
deleted file mode 100644
index f7a51e4a84b..00000000000
--- a/Master/texmf-dist/tex/latex/thesis-ekf/images/ekf-logo5.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/thesis-ekf/thesis-ekf.cls b/Master/texmf-dist/tex/latex/thesis-ekf/thesis-ekf.cls
index 402003feed4..248a855d1bb 100644
--- a/Master/texmf-dist/tex/latex/thesis-ekf/thesis-ekf.cls
+++ b/Master/texmf-dist/tex/latex/thesis-ekf/thesis-ekf.cls
@@ -6,7 +6,7 @@
 %%
 %% ./thesis-ekf.dtx  (with options: `class')
 %% This is a generated file.
-%% Copyright (C) 2014 Tibor Tomacs
+%% Copyright (C) 2014-2016 Tibor Tomacs
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
 %% version 1.2 of this license or (at your option) any later
@@ -19,56 +19,67 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{thesis-ekf}[2015/04/19 v1.1 class for EKF thesis]
-\LoadClass[a4paper,12pt]{report}
-\RequirePackage[top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry}
-\RequirePackage[unicode,linktocpage,linkcolor=blue,citecolor=blue,urlcolor=blue,
-pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref}
-\linespread{1.24}
-\overfullrule10pt
+\ProvidesClass{thesis-ekf}[2016/07/01 v2.0 Thesis class for Eszterhazy Karoly University (Eger, Hungary)]
+
+\RequirePackage{kvoptions,etoolbox,setspace}
+\SetupKeyvalOptions{family=ekf,prefix=ekf@}
+\DeclareVoidOption{twoside}{\PassOptionsToClass{twoside}{report}}
+\DeclareVoidOption{colorlinks}{\PassOptionsToPackage{colorlinks}{hyperref}}
+\DeclareBoolOption{logodown}
+\DeclareBoolOption[true]{centeredchapter}
+\DeclareStringOption[12pt]{fontsize}
+\DeclareStringOption[10mm]{institutesep}
+\DeclareStringOption[0mm]{logosep}
+\DeclareStringOption[\stretch{1.5}]{titlesep}
+\DeclareStringOption[15mm]{authorsep}
+\DeclareStringOption[10mm]{xmargin}
+\DeclareStringOption[1mm]{captionsep}
+\DeclareStringOption[\large\normalfont\scshape]{institutefont}
+\DeclareStringOption[\large\normalfont\scshape]{logofont}
+\DeclareStringOption[\Huge\normalfont\sffamily\bfseries]{titlefont}
+\DeclareStringOption[\large\normalfont]{authorfont}
+\DeclareStringOption[\large\normalfont\bfseries]{captionfont}
+\DeclareStringOption[\large\normalfont\scshape]{cityfont}
+\ProcessKeyvalOptions{ekf}
+\InputIfFileExists{thesis-ekf.cfg}{}{}
+
+\def\ekf@ten{10pt}
+\def\ekf@eleven{11pt}
+\def\ekf@twelve{12pt}
+
+\ifx\ekf@fontsize\ekf@ten\else
+\ifx\ekf@fontsize\ekf@eleven\else
+\ifx\ekf@fontsize\ekf@twelve\else
+\ClassWarning{thesis-ekf}{
+Unused option: fontsize=\ekf@fontsize.
+Use fontsize=10pt, fontsize=11pt or fontsize=12pt!}
+\def\ekf@fontsize{12pt}
+\fi\fi\fi
+
+\PassOptionsToClass{\ekf@fontsize}{report}
+
+\LoadClass{report}
+\RequirePackage[unicode,linktocpage,allcolors=blue,pdfstartview=FitH,
+bookmarksnumbered,pdfborder={0 0 0}]{hyperref}
+\RequirePackage[a4paper,top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry}
+\onehalfspacing
 \flushbottom
 \widowpenalty=10000
 \clubpenalty=10000
 
-\if@twoside
-\def\ps@plain{}
-\def\@oddfoot{\hbox{}\hfill\normalsize\textnormal\thepage}
-\def\@evenfoot{\normalsize\textnormal\thepage}
-\def\@aftertitlepage{\thispagestyle{empty}\hbox{}\newpage}
-\else
-\def\@aftertitlepage{}
-\fi
-
-\renewcommand*\l@chapter[2]{%
-  \ifnum \c@tocdepth >\z@
-    \addpenalty\@secpenalty
-    \addvspace{1.0em \@plus\p@}%
-    \setlength\@tempdima{1.8em}%
-    \begingroup
-      \parindent \z@ \rightskip \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode \bfseries
-      \advance\leftskip\@tempdima
-      \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
-    \endgroup
-  \fi}
-\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}}
-\renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.2em}}
-
-\def\thesisekf@chapternumber{%
+\def\ekf@chapternumber{%
     \@ifundefined{l@magyar}
        {\@chapapp\space \thechapter}
        {\iflanguage{magyar}
           {\magyar@huordinal@chapterheaddot \@chapapp}
           {\@chapapp\space \thechapter}}}
 
-\def\thesisekf@centeredchapter{%
+\def\ekf@centeredchapter{%
     \def\@makechapterhead##1{%
       \vspace*{50\p@}%
       {\parindent \z@ \raggedright \normalfont
         \ifnum \c@secnumdepth >\m@ne
-            {\centering\huge\bfseries \thesisekf@chapternumber
+            {\centering\huge\bfseries \ekf@chapternumber
             \par\nobreak}
             \vskip 20\p@
         \fi
@@ -85,55 +96,145 @@ pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref}
         \vskip 40\p@
       }}}
 
-\def\logo#1{\def\@logo{#1}}\logo{LOGO}
-\def\institute#1{\def\@institute{#1}}\institute{INSTITUTE}
-\def\authorcaption#1{\def\@authorcaption{#1}}\authorcaption{Author:}
-\def\supervisorcaption#1{\def\@supervisorcaption{#1}}\supervisorcaption{Supervisor:}
-\def\supervisor#1{\def\@supervisor{#1}}\supervisor{}
-\def\city#1{\def\@city{#1}}\city{}
+\AfterEndPreamble{
+\ifekf@centeredchapter
+    \ekf@centeredchapter
+    \let\original@selectlanguage\selectlanguage
+    \def\selectlanguage#1{\original@selectlanguage{#1}\ekf@centeredchapter}\fi
+
+\def\@dottedtocline#1#2#3#4#5{%
+  \ifnum #1>\c@tocdepth \else
+    \vskip \z@ \@plus.2\p@
+    {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #3\relax
+     \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+     {#4}\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+     \par}%
+  \fi}
+
+\renewcommand*\l@chapter[2]{%
+  \ifnum \c@tocdepth >\z@
+    \addpenalty\@secpenalty
+    \addvspace{1.0em \@plus\p@}%
+    \setlength\@tempdima{1.8em}%
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \leavevmode \bfseries
+      \advance\leftskip\@tempdima
+      \hskip -\leftskip
+      #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+    \endgroup
+  \fi}
+\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{4.3em}{3.2em}}
+
+\if@nochanged@authorcaption@%
+    \@ifundefined{l@magyar}{}{%
+    \iflanguage{magyar}{\gdef\ekf@authorcaption{K\'{e}sz\'{\i}tette}}{}}\fi
+
+\if@nochanged@supervisorcaption@%
+    \@ifundefined{l@magyar}{}{%
+    \iflanguage{magyar}{\gdef\ekf@supervisorcaption{T\'{e}mavezet\H{o}}}{}}\fi
+}
+
+\def\logo#1{\gdef\ekf@logo{#1}}
+\logo{}
+\def\ekf@logo@{\ifx\ekf@logo\@empty%
+    \ClassWarning{thesis-ekf}{There isn't logo!}%
+    \else\ekf@logo\fi}
+
+\def\institute#1{\gdef\ekf@institute{#1}}
+\institute{}
+\def\ekf@institute@{\ifx\ekf@institute\@empty%
+    \ClassWarning{thesis-ekf}{There isn't institute!}%
+    \else\ekf@institute\fi}
+
+\def\title#1{\gdef\ekf@title{#1}}
+\title{}
+\def\ekf@title@{\ifx\ekf@title\@empty
+    \ClassWarning{thesis-ekf}{There isn't title!}~%
+    \else\ekf@title\fi}
+
+\def\author#1{\gdef\ekf@author{#1}}
+\author{}
+\def\ekf@author@{\ifx\ekf@author\@empty
+    \ClassWarning{thesis-ekf}{There isn't author!}~%
+    \else\ekf@author\fi}
+
+\newif\if@nochanged@authorcaption@\@nochanged@authorcaption@true
+\def\authorcaption#1{\@nochanged@authorcaption@false\gdef\ekf@authorcaption{#1}}
+\def\ekf@authorcaption{Author}
+\def\ekf@authorcaption@{\ifx\ekf@author\@empty~%
+    \else
+    \ifx\ekf@authorcaption\@empty
+    \ClassWarning{thesis-ekf}{There isn't authorcaption!}~%
+    \else\ekf@authorcaption\fi\fi}
+
+\def\supervisor#1{\gdef\ekf@supervisor{#1}}
+\supervisor{}
+\def\ekf@supervisor@{\ifx\ekf@supervisor\@empty
+    \ClassWarning{thesis-ekf}{There isn't supervisor!}~%
+    \else\ekf@supervisor\fi}
+
+\newif\if@nochanged@supervisorcaption@\@nochanged@supervisorcaption@true
+\def\supervisorcaption#1{\@nochanged@supervisorcaption@false\gdef\ekf@supervisorcaption{#1}}
+\def\ekf@supervisorcaption{Supervisor}
+\def\ekf@supervisorcaption@{\ifx\ekf@supervisor\@empty~%
+    \else
+    \ifx\ekf@supervisorcaption\@empty
+    \ClassWarning{thesis-ekf}{There isn't supervisorcaption!}~%
+    \else\ekf@supervisorcaption\fi\fi}
+
+\def\city#1{\gdef\ekf@city{#1}}
+\city{}
+\def\ekf@city@{\ekf@city\ifx\ekf@city\@empty%
+    \ClassWarning{thesis-ekf}{There isn't city!}\fi}
+
+\def\date#1{\gdef\ekf@date{#1}}
+\date{\number\year}
+\def\ekf@date@{\ekf@date\ifx\ekf@date\@empty%
+    \ClassWarning{thesis-ekf}{There isn't date!}\fi}
+
+\def\ekf@sep{,~}
+\def\ekf@sep@{\ifx\ekf@city\@empty\else\ifx\ekf@date\@empty\else\ekf@sep\fi\fi}
 
 \def\maketitle{
-\if@centeredchapter
-\thesisekf@centeredchapter
-\let\oldselectlanguage\selectlanguage
-\def\selectlanguage##1{\oldselectlanguage{##1}\thesisekf@centeredchapter}
-\fi
 \thispagestyle{empty}
-\begin{large}
-\centering
-\if@logono{\scshape\@institute\\}\fi
-\if@logoup{\scshape\@logo\\\@institute\\}\fi
-\if@logodown{\scshape\@institute\\[10mm]\@logo\\}\fi
-\vfill{\Huge\sffamily\bfseries\@title\\}\vspace{\stretch{1.8}}
-\begin{tabular}[t]{@{\hspace{10mm}}l@{}}
-{\bfseries\@authorcaption}\\[1mm]
-\@author
+{\centering
+\ifekf@logodown
+{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty\else\\
+\vspace{\ekf@institutesep}\fi}
+{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty~\\\else\\\fi}
+\else
+{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty\else\\\vspace{\ekf@logosep}\fi}
+{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty~\\\else\\\fi}
+\fi
+\vfill{\ekf@titlefont\ekf@title@\\}\vspace{\ekf@titlesep}
+{\ekf@authorfont
+\begin{tabular}[t]{@{\hspace{\ekf@xmargin}}l@{}}
+{\ekf@captionfont\ekf@authorcaption@}\\[\ekf@captionsep]
+\ekf@author@
 \end{tabular}
 \hfill
-\begin{tabular}[t]{@{}l@{\hspace{10mm}}}
-{\bfseries\@supervisorcaption}\\[1mm]
-\@supervisor
-\end{tabular}
-\par\vspace{15mm}
-{\scshape\@city\if\@city\empty\else,~\fi\@date\par}
-\end{large}
-\newpage\@aftertitlepage}
-
-\newif\if@logono
-\newif\if@logoup
-\newif\if@logodown
-\newif\if@centeredchapter
-
-\DeclareOption{nocolorlinks}{\hypersetup{colorlinks=false}}
-\DeclareOption{colorlinks}{\hypersetup{colorlinks}}
-\DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse}
-\DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue}
-\DeclareOption{logono}{\@logonotrue\@logoupfalse\@logodownfalse}
-\DeclareOption{logoup}{\@logonofalse\@logouptrue\@logodownfalse}
-\DeclareOption{logodown}{\@logonofalse\@logoupfalse\@logodowntrue}
-\DeclareOption{centeredchapter}{\@centeredchaptertrue}
-\ExecuteOptions{nocolorlinks,oneside,logoup}
-\ProcessOptions
+\begin{tabular}[t]{@{}l@{\hspace{\ekf@xmargin}}}
+{\ekf@captionfont\ekf@supervisorcaption@}\\[\ekf@captionsep]
+\ekf@supervisor@
+\end{tabular}}
+\par\vspace{\ekf@authorsep}
+{\ekf@cityfont\ekf@city@\ekf@sep@\ekf@date@\par}
+}
+\newpage
+\if@twoside\thispagestyle{empty}\hbox{}\newpage\fi}
+
 \endinput
 %%
 %% End of file `thesis-ekf.cls'.