diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-02 22:12:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-02 22:12:17 +0000 |
commit | 586aedcf63ecf6ea7da1c1529e5ea5ba8f5cb426 (patch) | |
tree | b679941add6df7f6b1ee8c135b24181f992dcb65 /Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty | |
parent | fecdcd43eaa7f73e830159293fe22a202803086b (diff) |
tudscr (2jul15)
git-svn-id: svn://tug.org/texlive/trunk@37736 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty | 177 |
1 files changed, 108 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty index 3e1dcd4b761..eaf2f6b57e9 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% tudscr-version.dtx (with options: `package,supervisor,tudscr') +%% tudscr-version.dtx (with options: `package,supervisor') %% tudscr-supervisor.dtx (with options: `package') %% tudscr-fields.dtx (with options: `package,supervisor') %% tudscr-locale.dtx (with options: `package,supervisor') @@ -54,15 +54,15 @@ \fi% }% \fi% - \@TUDVersion{2015/06/11 v2.03a TUD-KOMA-Script}% + \@TUDVersion{2015/07/02 v2.04 TUD-KOMA-Script}% \endgroup% \providecommand*\tudscrmail{tudscr@gmail.com} -\@ifundefined{tudcls@name}{% +\@ifundefined{TUDClassName}{% \PackageError{% tudscrsupervisor% }{Unsupported class found}{% This package can only be used with a class out of the\MessageBreak% - tudscr bundle (tudscrartcl, tudscrreprt, tudscrbook)% + tudscr bundle (tudscrbook, tudscrreprt, tudscrartcl).% } \endinput }{} @@ -74,9 +74,9 @@ }% }{} %%% From File: tudscr-supervisor.dtx -\NeedsTeXFormat{LaTeX2e}[2011/06/27] +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudscrsupervisor}[% - 2015/06/11 v2.03a TUD-KOMA-Script + 2015/07/02 v2.04 TUD-KOMA-Script package (commands for supervisors)% ] @@ -105,7 +105,7 @@ \ifx\supervisorothername\@empty\else\supervisorothername\@titledelim\fi% & \def\and{\tabularnewline &}% }% - \vskip-\lastskip% + \removelastskip% \ifdim\parskip>\z@\vskip\parskip\else\vskip\topsep\fi\medskip% \begingroup% \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative% @@ -115,7 +115,7 @@ \issuedatetext\@titledelim & \@issuedate\tabularnewline% \duedatetext\@titledelim & \@duedate\tabularnewline% \end{tabular}% - \vskip 15mm plus 10mm minus 10mm% + \vskip\tud@signatureskip\noindent% \ifx\@chairman\@empty\else% \begin{tabular}{@{}l@{}}% \@chairman\tabularnewline% @@ -136,7 +136,7 @@ } \newcommand\taskform[3][]{% \begin{task}[#1] - \vskip-\lastskip% + \removelastskip% \ifxblank{#2}{}{\minisec{\objectivesname}#2}% \ifxblank{#3}{}{% \minisec{\focusname}% @@ -167,19 +167,19 @@ }% \tud@author@table% }{% - \vskip-\lastskip% + \removelastskip% \ifdim\parskip>\z@\vskip\parskip\else\vskip\topsep\fi% - \medskip% + \setlength{\@tempskipa}{\smallskipamount}% \ifx\@grade\@empty\else% - \noindent\gradetext% - \vskip\bigskipamount% + \vskip\@tempskipa\noindent% + \gradetext% + \setlength{\@tempskipa}{\bigskipamount}% \fi% \ifx\@date\@empty\else% - \noindent% - \ifx\@place\@empty\else\@place,~\fi\@date% - \vskip\bigskipamount% + \vskip\@tempskipa\noindent% + \ifx\@place\@empty\else\@place,\nobreakspace\fi\@date% \fi% - \bigskip\bigskip\noindent% + \vskip\tud@signatureskip\noindent% \ifx\@referee\@empty\let\@referee\@supervisor\fi% \let\@tempa\refereename% \def\and{% @@ -201,39 +201,24 @@ } \newcommand\evaluationform[5][]{% \begin{evaluation}[#1] - \vskip-\lastskip% + \removelastskip% \ifxblank{#2}{}{\minisec{\taskname}#2}% \ifxblank{#3}{}{\minisec{\contentname}#3}% \ifxblank{#4}{}{\minisec{\assessmentname}#4}% \ifxblank{#5}{}{\def\@grade{#5}}% \end{evaluation}% } +\newcommand*\student{\author} \newlength\tud@dim@table% \newcommand*\tud@author@table{% - \tud@check@author% \begingroup% \let\thanks\@gobble% \let\footnote\@gobble% - \renewcommand*\tud@split@author[2]{% - \tud@multiple@setfields{\null}{##1}% - \begin{tabular}{l@{}}% - \ifx\@course\@empty\else\@course\tabularnewline\fi% - \ifx\@discipline\@empty\else\@discipline\tabularnewline\fi% - \textsf{\textbf{\ignorespaces##1}}\tabularnewline% - \ifx\@matriculationnumber\@empty\else% - \@matriculationnumber\tabularnewline% - \fi% - \ifx\@matriculationyear\@empty\else% - \@matriculationyear\tabularnewline% - \fi% - \end{tabular}% - \tud@multiple@@@split{##2}{~~\hspace{\tabcolsep}} - }% + \tud@multiple@split{@author}% + \tud@multiple@fields@preset{@author}{\null}{}% \setlength\tud@dim@table{2em}% - \gdef\tud@multiple@field{@author}% - \tud@multiple@setfields{\null}{}% \edef\@tempa{% - \authorname,\titlename,\supervisorname,\supervisorothername,% + \namesname,\titlename,\supervisorname,\supervisorothername,% \issuedatetext,\duedatetext,% \expandafter\ifx\@matriculationnumber\@empty\else% \matriculationnumbername% @@ -260,7 +245,7 @@ \ifx\@discipline\@empty\else% \disciplinename\@titledelim\tabularnewline% \fi% - \authorname\@titledelim\tabularnewline% + \namesname\@titledelim\tabularnewline% \ifx\@matriculationnumber\@empty\else% \matriculationnumbername\@titledelim\tabularnewline% \fi% @@ -268,6 +253,23 @@ \matriculationyearname\@titledelim\tabularnewline% \fi% \end{tabular}% + \renewcommand*\tud@split@author[2]{% + \tud@multiple@fields@store{@author}{##1}% + \tud@multiple@fields@preset{@author}{\null}{##1}% + \begin{tabular}{l@{}}% + \ifx\@course\@empty\else\@course\tabularnewline\fi% + \ifx\@discipline\@empty\else\@discipline\tabularnewline\fi% + \textsf{\textbf{\ignorespaces##1}}\tabularnewline% + \ifx\@matriculationnumber\@empty\else% + \@matriculationnumber\tabularnewline% + \fi% + \ifx\@matriculationyear\@empty\else% + \@matriculationyear\tabularnewline% + \fi% + \end{tabular}% + \tud@multiple@fields@restore{@author}% + \tud@multiple@@@split{##2}{\enskip\hspace{\tabcolsep}}% + }% \tud@multiple@split{@author}% \vskip\smallskipamount% \begin{tabular}{@{}p{\tud@dim@table}% @@ -280,8 +282,9 @@ \endgroup% \noindent\ignorespaces% } -\patchcmd{\tud@split@author@list}{\authormore}% - {\authormore,\course,\discipline}{}{\tud@patch@wrn{tud@split@author@list}} +\patchcmd{\tud@split@author@list}{authormore}{% + authormore,course,discipline% +}{}{\tud@patch@wrn{tud@split@author@list}} \newenvironment{notice}[1][]{% \cleardoubleoddpage% \def\@headline{\noticename}% @@ -307,8 +310,20 @@ }{% \ifx\@contactperson\@empty\let\@contactperson\@supervisor\fi% \ifx\@contactperson\@empty\else% - \vskip-\lastskip% + \removelastskip% \ifdim\parskip>\z@\vskip\parskip\else\vskip\topsep\fi% + \renewcommand*\tud@split@contactperson[2]{% + \tud@multiple@fields@store{@contactperson}{##1}% + \tud@multiple@fields@preset{@contactperson}{}{##1}% + \begin{tabular}[t]{@{}l@{}}% + \ignorespaces##1\tabularnewline% + \ifx\@office\@empty\else\@office\tabularnewline\fi% + \ifx\@telephone\@empty\else\@telephone\tabularnewline\fi% + \ifx\@emailaddress\@empty\else\@emailaddress\tabularnewline\fi% + \end{tabular}% + \tud@multiple@fields@restore{@contactperson}% + \tud@multiple@@@split{##2}{\hfill}% + }% \subsection*{\contactpersonname}% \noindent\tud@multiple@split{@contactperson}\hfill\null% \fi% @@ -317,7 +332,7 @@ } \newcommand\noticeform[3][]{% \begin{notice}[#1] - \vskip-\lastskip% + \removelastskip% \ifxblank{#2}{}{% \ifx\@@title\@empty\else% \minisec{\expandonce{\@@title}}% @@ -332,17 +347,6 @@ }% \end{notice}% } -\newcommand*\tud@split@contactperson[2]{% - \tud@multiple@setfields{\null}{#1}% - \begin{tabular}{@{}l@{}}% - \ignorespaces#1\tabularnewline% - \ifx\@office\@empty\else\@office\tabularnewline\fi% - \ifx\@telephone\@empty\else\@telephone\tabularnewline\fi% - \ifx\@emailaddress\@empty\else\@emailaddress\tabularnewline\fi% - \end{tabular}% - \tud@multiple@@@split{#2}{\hfill}% -} -\newcommand*\tud@split@contactperson@list{\office,\telephone,\emailaddress} %%% From File: tudscr-fields.dtx \newcommand*\@course{} \newrobustcmd*\course[1]{\gdef\@course{#1}} @@ -350,19 +354,6 @@ \newrobustcmd*\discipline[1]{\gdef\@discipline{#1}} \newcommand*\@chairman{} \newcommand*\chairman[1]{\gdef\@chairman{#1}} -\newcommand*\@contactperson{} -\newcommand*\contactperson[1]{\gdef\@contactperson{#1}} -\newcommand*\@office{} -\newrobustcmd*\office[1]{\gdef\@office{#1}} -\newcommand*\@telephone{} -\newrobustcmd*\telephone[1]{\gdef\@telephone{#1}} -\newcommand*\@emailaddress{} -\newrobustcmd*\emailaddress[1]{\gdef\@emailaddress{#1}} -\AfterPackage*{hyperref}{% - \renewrobustcmd*\emailaddress[1]{% - \gdef\@emailaddress{\href{mailto:#1}{\nolinkurl{#1}}}% - }% -} \newcommand*\@grade{} \newcommand*\grade[1]{\gdef\@grade{#1}} \newcommand*\@headline{} @@ -372,10 +363,58 @@ \newcommand*\duedate[1]{\tud@printdate{\@duedate}{#1}} \newcommand*\finaldate{} \newcommand*\maturitydate{} +\@ifpackageloaded{% + tudscrposter% +}{}{% + \newcommand*\@contactperson{} + \newcommand*\contactperson[1]{\gdef\@contactperson{#1}} + \newcommand*\@office{} + \newrobustcmd*\office[1]{\gdef\@office{#1}} + \newcommand*\@telephone{} + \newrobustcmd*\telephone[1]{\gdef\@telephone{#1}} + \newcommand*\@emailaddress{} + \newrobustcmd*\emailaddress[2][]{\gdef\@emailaddress{#2}} + \AfterPackage*{hyperref}{% + \renewrobustcmd*\emailaddress[2][hidelinks]{% + \gdef\@emailaddress{% + \begingroup% + \hypersetup{#1}% + \href{mailto:#2}{#2}% + \endgroup% + }% + }% + }% + \newcommand*\tud@multiple@fields@preset[3]{% + \letcs\@tempa{tud@split#1@list}% + \let\and\relax% + \@for\@tempb:=\@tempa\do{% + \ifx\@tempb\@empty\else% + \edef\@tempc{\@nameuse{\@tempb}}% + \ifstr{#2}{*}{% + \@namedef{@\@tempb}{}% + }{% + \begingroup% + \protected@expandtwoargs\in@{\@tempc}{\@nameuse{#1}}% + \ifin@% + \ifcsempty{@\@tempb}{\@tempc{#2}}{}% + \fi% + \endgroup% + }% + \fi% + }% + \begingroup% + \let\thanks\@gobble% + \let\footnote\@gobble% + \sbox\z@{#3}% + \endgroup% + }% + \newcommand*\tud@split@contactperson[2]{} + \newcommand*\tud@split@contactperson@list{office,telephone,emailaddress} +} %%% From File: tudscr-locale.dtx \tud@locale@define{\taskname} \tud@locale@define{\tasktext} -\tud@locale@define{\authorname} +\tud@locale@define{\namesname} \tud@locale@define{\titlename} \tud@locale@define{\coursename} \tud@locale@define{\disciplinename} @@ -393,7 +432,7 @@ \tud@locale@define{\contactpersonname} \tud@locale@german{\taskname}{Aufgabenstellung}% \tud@locale@german{\tasktext}{f\"ur die Anfertigung einer}% -\tud@locale@german{\authorname}{Name}% +\tud@locale@german{\namesname}{Name}% \tud@locale@german{\titlename}{Titel}% \tud@locale@german{\coursename}{Studiengang}% \tud@locale@german{\disciplinename}{Studienrichtung}% @@ -413,7 +452,7 @@ \tud@locale@german{\contactpersonname}{Ansprechpartner}% \tud@locale@english{\taskname}{Task}% \tud@locale@english{\tasktext}{for the preparation of a}% -\tud@locale@english{\authorname}{Name}% +\tud@locale@english{\namesname}{Name}% \tud@locale@english{\titlename}{Title}% \tud@locale@english{\coursename}{Course}% \tud@locale@english{\disciplinename}{Discipline}% |