elteikthesis

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

7 files changed, 123 insertions, 68 deletions

diff --git a/Master/texmf-dist/doc/latex/elteikthesis/README b/Master/texmf-dist/doc/latex/elteikthesis/README
index 90d79beb8a3..5437f59c307 100644
--- a/Master/texmf-dist/doc/latex/elteikthesis/README
+++ b/Master/texmf-dist/doc/latex/elteikthesis/README
@@ -14,7 +14,7 @@ Install:
  - run 'latex elteikthesis.ins' for the cls file
  - run 'latex elteikthesis.dtx' to get the documentation
 
-Thesis class for the ELTE university's Informatics wing.
+Thesis class for the ELTE university's Informatics faculty.
 English summary is present in the documentation, but since
 the university is in Hungary, detailed documentation is given in
 hungarian only.
diff --git a/Master/texmf-dist/doc/latex/elteikthesis/elteikthesis.pdf b/Master/texmf-dist/doc/latex/elteikthesis/elteikthesis.pdf
index c4b3051f93e..a337d96367e 100644
--- a/Master/texmf-dist/doc/latex/elteikthesis/elteikthesis.pdf
+++ b/Master/texmf-dist/doc/latex/elteikthesis/elteikthesis.pdf
diff --git a/Master/texmf-dist/doc/latex/elteikthesis/example.pdf b/Master/texmf-dist/doc/latex/elteikthesis/example.pdf
index be29c6d211c..0db4cae3f92 100644
--- a/Master/texmf-dist/doc/latex/elteikthesis/example.pdf
+++ b/Master/texmf-dist/doc/latex/elteikthesis/example.pdf
diff --git a/Master/texmf-dist/doc/latex/elteikthesis/example.tex b/Master/texmf-dist/doc/latex/elteikthesis/example.tex
index f291ea43c8a..f518a88b9a7 100644
--- a/Master/texmf-dist/doc/latex/elteikthesis/example.tex
+++ b/Master/texmf-dist/doc/latex/elteikthesis/example.tex
@@ -14,6 +14,7 @@
 \period{Informatika Bsc}
 \thesisyear{4242}
 \department{XY Tanszék}
+\additionaltext{ABCDEF GHIJKLM NOPQRSTUV WXYZ}
 
 \begin{document}
 
diff --git a/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.dtx b/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.dtx
index 48d4f7cc29b..ec6db4bf769 100644
--- a/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.dtx
+++ b/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.dtx
@@ -45,7 +45,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{130}
+% \CheckSum{141}
 %
 % \CharacterTable
 % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -64,6 +64,7 @@
 %     Right brace         \}     Tilde           \~}
 %
 % \changes{v1.0}{2010/09/14}{Kezdeti verzi\'o}
+% \changes{v1.1}{2011/04/19}{Wing \'atnevez\'ese department-re, angol le\'ir\'as b\H{o}v\'it\'ese, additionaltext hozz\'aad\'asa}
 %
 % \DoNotIndex{\newcommand, \RequirePackage, \NeedsTeXFormat, \ProvidesClass, \LoadClass, \renewcommand, \DeclareRobustCommand}
 % \DoNotIndex{\begin, \end, \vspace, \centering, \newline, \textwidth, \rule, \Huge, \vfill}
@@ -134,6 +135,7 @@
 %				\end{tabular}
 %				
 %				Lent középen:
+%				\begin{center}\textbf{Plusz szöveg}\end{center}
 %				\begin{center}\textbf{Budapest, <évszám>}\end{center}
 %				
 %	\end{itemize}
@@ -160,30 +162,45 @@
 %	\DescribeMacro{\period} \DescribeMacro{\city} \DescribeMacro{\thesisyear}
 %	A szaknak a |\period| parancs felel meg, a városnak a |\city|, az évnek a |\thesisyear|.
 %
-%	\DescribeMacro{\university} \DescribeMacro{\wing} \DescribeMacro{\department}
+%	\DescribeMacro{\university} \DescribeMacro{\faculty} \DescribeMacro{\department}
 %	Az egyetem nevét a |\university| paranccsal lehet felüldefiniálni, de van alapértelmezett értéke:
-%	Eötvös Lóránd Tudományegyetem. A kar |\wing|, alapértelmezett értéke Informatikai Kar.
+%	Eötvös Lóránd Tudományegyetem. A kar |\faculty|, alapértelmezett értéke Informatikai Kar.
 %	A tanszék nevét a |\department| makróval lehet felüldefiniálni: |\department{tanszék}|.
 %
+%	\DescribeMacro{\additionaltext}
+%	Ezzel a makróval egy-két soros további adatot lehet berakni a címoldal alján levő évszám fölé.
+%
 % \section{Magyar nevű aliasok}
 %	\begin{itemize}
 %		\item |\university| = |\egyetem|
-%		\item |\wing| = |\kar|
+%		\item |\faculty| = |\kar|
 %		\item |\department| = |\tanszek|
 %		\item |\supervisor| = |\temavezeto|
 %		\item |\supervisorstitle| = |\temavezetocime|
 %		\item |\city| = |\varos|
 %		\item |\thesisyear| = |\evszam|
 %		\item |\period| = |\szak|
+%		\item |\additionaltext| = |\plusszoveg|
 %	\end{itemize}
 %
 %	\section{English summary}
-%		Thesis class for the ELTE university's Informatics wing.
-%		There are different setup commands for setting up the labels for the title. The name of the setup macros
-%		are self-explanatory(I hope), see previous chapter for a list.
+%		Thesis class for the ELTE university's Informatics faculty.
+%		There are different setup commands for setting up the labels for the title. 
+%
+%	\DescribeMacro{\university} |\university| \marg{name} sets the name of the university.
+%	\DescribeMacro{\faculty} |\faculty| \marg{name} sets the name of the university's faculty.
+%	\DescribeMacro{\department} |\department| \marg{name} sets the name of thedepartment.
+%	\DescribeMacro{\supervisor} |\supervisor| \marg{name} sets the name of the supervisor.
+%	\DescribeMacro{\supervisorstitle} |\supervisorstitle| \marg{title} sets the title of the supervisor.
+%	\DescribeMacro{\city} |\city| \marg{name} sets the name of the city on the bottom.
+%	\DescribeMacro{\thesisyear} |\thesisyear| \marg{year} sets the year of the thesis.
+%	\DescribeMacro{\period} |\period| \marg{name} sets the period of the student.
+%	\DescribeMacro{\additionaltext} |\additionaltext| \marg{text} sets the additional short text to be
+%		added at the bottom above the year.
 %
 %		The emblem of the university must be present, it's default path is \\ |./pics/eltecimerszines|. This
-%		can be redefined with the |\logopic| macro: do not give any extension to it. The picture should be present
+%		can be redefined with the \DescribeMacro{\logopic} |\logopic| macro: do not give 
+%		any extension to it. The picture should be present
 %		in the specified location with the specified name with (for example) a jpg extension for pdf output and
 %		eps extension for ps output.
 %
@@ -329,20 +346,38 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\ths@wing}
+% \begin{macro}{\ths@additionaltext}
+%	 Tárolja az egyéni információt. \\
+%	 Használat: |\ths@additionaltext|
+%    \begin{macrocode}
+\newcommand{\ths@additionaltext}{}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\additionaltext}
+%	 Egyéni információ megjelenítése az évszám fölött. \\
+%	 Használat: |\additionaltext| \marg{szöveg}
+%    \begin{macrocode}
+\DeclareRobustCommand{\additionaltext}[1]{
+	\renewcommand{\ths@additionaltext}{#1}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ths@faculty}
 %	 Tárolja a kar nevét. \\
-%	 Használat: |\ths@wing|
+%	 Használat: |\ths@faculty|
 %    \begin{macrocode}
-\newcommand{\ths@wing}{Informatikai Kar}
+\newcommand{\ths@faculty}{Informatikai Kar}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\wing}
+% \begin{macro}{\faculty}
 %	 Beállítja a kar nevét. \\
-%	 Használat: |\wing| \marg{kar neve}
+%	 Használat: |\faculty| \marg{kar neve}
 %    \begin{macrocode}
-\DeclareRobustCommand{\wing}[1]{
-	\renewcommand{\ths@wing}{#1}
+\DeclareRobustCommand{\faculty}[1]{
+	\renewcommand{\ths@faculty}{#1}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -408,10 +443,10 @@
 % \end{macro}
 %
 % \begin{macro}{\kar}
-%	 Ekvivalens a |\wing| makróval. \\
+%	 Ekvivalens a |\faculty| makróval. \\
 %	 Használat: |\kar| \marg{kar neve}
 %    \begin{macrocode}
-\DeclareRobustCommand{\kar}[1]{\wing{#1}}
+\DeclareRobustCommand{\kar}[1]{\faculty{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -447,6 +482,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\szak}
+%	 Ekvivalens a |\period| makróval. \\
+%	 Használat: |\szak| \marg{szak}
+%    \begin{macrocode}
+\DeclareRobustCommand{\plusszoveg}[1]{\additionaltext{#1}}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\maketitle}
 %	 A belső fedőlapot létrehozó makró. A fenti makrókkal beállított értékekkel dolgozik.
 %	 Használat: |\maketitle|
@@ -462,7 +505,7 @@
 			\end{minipage} & & 
 			\begin{minipage}{7cm}
 				\vspace{0pt}\ths@university \vspace{10pt}
-				\newline \ths@wing \vspace{10pt}
+				\newline \ths@faculty \vspace{10pt}
 				\newline \ths@department 
 			\end{minipage}
 		\end{tabular}
@@ -480,6 +523,9 @@
 		\end{tabular}
 		
 		\vfill
+		\ths@additionaltext
+		
+		\vspace*{1cm}
 		\ths@city, \ths@thesisyear
 	\end{titlepage}
 }
diff --git a/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.ins b/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.ins
index f25007982aa..8276d4381b5 100644
--- a/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.ins
+++ b/Master/texmf-dist/source/latex/elteikthesis/elteikthesis.ins
@@ -1,44 +1,44 @@
-

-% Copyright (C) 2010 Majoros Daniel

-% 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

-% version. The latest version of this license is in:

-%

-% http://www.latex-project.org/lppl.txt

-%

-% and version 1.2 or later is part of all distributions of

-% LaTeX version 1999/12/01 or later.

-%

-\input docstrip.tex

-\keepsilent

-\usedir{tex/latex/elteikthesis}

-\preamble

-This is a generated file.

-Copyright (C) 2010 Majoros Daniel

-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

-version. The latest version of this license is in:

-

-	http://www.latex-project.org/lppl.txt

-	

-and version 1.2 or later is part of all distributions of

-LaTeX version 1999/12/01 or later.

-

-\endpreamble

-

-\generate{\file{elteikthesis.cls}{\from{./elteikthesis.dtx}{class}}}

-\Msg{*********************************************************}

-\Msg{*}

-\Msg{* To finish the installation you have to move the}

-\Msg{* following file into a directory searched by TeX:}

-\Msg{*}

-\Msg{* \space\space elteikthesis.cls}

-\Msg{*}

-\Msg{* To produce the documentation run the file elteikthesis.dtx}

-\Msg{* through LaTeX.}

-\Msg{*}

-\Msg{* Happy TeXing!}

-\Msg{*********************************************************}

-\endbatchfile

+
+% Copyright (C) 2010 Majoros Daniel
+% 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
+% version. The latest version of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.2 or later is part of all distributions of
+% LaTeX version 1999/12/01 or later.
+%
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/elteikthesis}
+\preamble
+This is a generated file.
+Copyright (C) 2010 Majoros Daniel
+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
+version. The latest version of this license is in:
+
+	http://www.latex-project.org/lppl.txt
+	
+and version 1.2 or later is part of all distributions of
+LaTeX version 1999/12/01 or later.
+
+\endpreamble
+
+\generate{\file{elteikthesis.cls}{\from{./elteikthesis.dtx}{class}}}
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space elteikthesis.cls}
+\Msg{*}
+\Msg{* To produce the documentation run the file elteikthesis.dtx}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/elteikthesis/elteikthesis.cls b/Master/texmf-dist/tex/latex/elteikthesis/elteikthesis.cls
index aa2f5eb557e..d5454fa8647 100644
--- a/Master/texmf-dist/tex/latex/elteikthesis/elteikthesis.cls
+++ b/Master/texmf-dist/tex/latex/elteikthesis/elteikthesis.cls
@@ -49,9 +49,13 @@
 \DeclareRobustCommand{\university}[1]{
 \renewcommand{\ths@university}{#1}
 }
-\newcommand{\ths@wing}{Informatikai Kar}
-\DeclareRobustCommand{\wing}[1]{
-\renewcommand{\ths@wing}{#1}
+\newcommand{\ths@additionaltext}{}
+\DeclareRobustCommand{\additionaltext}[1]{
+\renewcommand{\ths@additionaltext}{#1}
+}
+\newcommand{\ths@faculty}{Informatikai Kar}
+\DeclareRobustCommand{\faculty}[1]{
+\renewcommand{\ths@faculty}{#1}
 }
 \newcommand{\ths@department}{}
 \DeclareRobustCommand{\department}[1]{
@@ -65,11 +69,12 @@
 \DeclareRobustCommand{\temavezeto}[1]{\supervisor{#1}}
 \DeclareRobustCommand{\temavezetocime}[1]{\supervisorstitle{#1}}
 \DeclareRobustCommand{\egyetem}[1]{\university{#1}}
-\DeclareRobustCommand{\kar}[1]{\wing{#1}}
+\DeclareRobustCommand{\kar}[1]{\faculty{#1}}
 \DeclareRobustCommand{\tanszek}[1]{\department{#1}}
 \DeclareRobustCommand{\evszam}[1]{\thesisyear{#1}}
 \DeclareRobustCommand{\varos}[1]{\city{#1}}
 \DeclareRobustCommand{\szak}[1]{\period{#1}}
+\DeclareRobustCommand{\plusszoveg}[1]{\additionaltext{#1}}
 \renewcommand{\maketitle}{
 \begin{titlepage}
 \vspace*{0cm}
@@ -81,7 +86,7 @@
 \end{minipage} & &
 \begin{minipage}{7cm}
 \vspace{0pt}\ths@university \vspace{10pt}
-\newline \ths@wing \vspace{10pt}
+\newline \ths@faculty \vspace{10pt}
 \newline \ths@department
 \end{minipage}
 \end{tabular}
@@ -99,6 +104,9 @@
 \end{tabular}
 
 \vfill
+\ths@additionaltext
+
+\vspace*{1cm}
 \ths@city, \ths@thesisyear
 \end{titlepage}
 }