From f302d1aaabaeb41bdd624d8ab7ec10414480e124 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 17 Jan 2015 23:48:13 +0000 Subject: jslectureplanner (17jan15) git-svn-id: svn://tug.org/texlive/trunk@36079 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/jslectureplanner/jslectureplanner.sty | 51 ++++++++++++++++------ 1 file changed, 38 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty') diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty index 767dddab36b..89827f0074b 100644 --- a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty +++ b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty @@ -21,8 +21,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\filedate{2014/01/04} -\def\fileversion{0.7} +\def\filedate{2015/01/17} +\def\fileversion{0.8} \def\filename{jslectureplanner.sty} \NeedsTeXFormat{LaTeX2e} @@ -61,6 +61,8 @@ \def\lecsemesterverb{} \def\lecuniversity{} \def\lecinstitute{} +\def\lecroom{} +\def\lecstartdate{} \def\lecplatform{} \def\officehours{} @@ -83,7 +85,8 @@ \def\lectypevl{Vorlesung} \def\lectypevls{VL} \def\lectypevlses{Vorlesung} -% vo +% vo (redundant and undocumented; +% just kept for historical reasons) \def\lectypevo{Vorlesung} \def\lectypevos{VO} \def\lectypevoses{Vorlesung} @@ -122,7 +125,7 @@ \def\lectermwss{WS} % misc. -\newcommand*\leccancel{-- keine} +\newcommand*\leccancel{\ -- keine \lectypesession} \newcommand*\lecprogram{Programm} \newcommand*\lecprogramlistindent{\textbf{88.\,88.}} @@ -134,7 +137,7 @@ \def\lectype{\lectypevls} \def\lectypeverb{\lectypevl} \def\lectypesession{\lectypevlses} - \or% vo (wien) + \or% vo (redundant and undocumented; just kept for historical reasons) \def\lectype{\lectypevos} \def\lectypeverb{\lectypevo} \def\lectypesession{\lectypevoses} @@ -192,7 +195,9 @@ \define@key{lec}{institute}{\def\lecinstitute{#1}} \define@key{lec}{platform}{\def\lecplatform{#1}} \define@key{lec}{officehours}{\def\officehours{#1}} -\define@key{lec}{startdate}{\SetDate[#1]} +\define@key{lec}{room}{\def\lecroom{#1}} +\define@key{lec}{startdate}{\def\lecstartdate{#1}} +\define@key{lec}{style}{\AtEndOfPackage{\input{#1.lps}}} \DeclareOptionX{title}{\setkeys{lec}{title=#1}} \DeclareOptionX{titlesep}{\setkeys{lec}{titlesep=#1}} @@ -204,6 +209,8 @@ \DeclareOptionX{startdate}{\setkeys{lec}{startdate=#1}} \DeclareOptionX{platform}{\setkeys{lec}{platform=#1}} \DeclareOptionX{officehours}{\setkeys{lec}{officehours=#1}} +\DeclareOptionX{room}{\setkeys{lec}{room=#1}} +\DeclareOptionX{style}{\setkeys{lec}{style=#1}} \ProcessOptionsX @@ -222,6 +229,7 @@ \newcommand*{\LecYear}[2]{\setkeys{lec}{lecsem=#1,year=#2}} \newcommand*{\LecUni}[1]{\setkeys{lec}{uni=#1}} \newcommand*{\LecInstitute}[1]{\setkeys{lec}{institute=#1}} +\newcommand*{\LecRoom}[1]{\setkeys{lec}{room=#1}} \newcommand*{\LecStartDate}[1]{\setkeys{lec}{startdate=#1}} % @@ -263,7 +271,8 @@ \def\lectypevls{#1} \def\lectypevlses{#2} } -% vo +% vo (redundant and undocumented; +% just kept for historical reasons) \newcommand*\DefTypeVO[3]{% \def\lectypevo{#2} \def\lectypevos{#1} @@ -474,6 +483,7 @@ \define@key{session}{subtitle}{\csdef{@vasutitle}{#1}} \define@key{session}{shorttitle}{\csdef{@vashorttitle}{#1}} \define@key{session}{bibsec}{\csdef{@sesbibsec}{#1}} +\define@key{session}{room}{\csdef{@sesroom}{#1}} \define@boolkey{session}{cancel}[true]{} \newcommand*\NewSession[2][]{% @@ -485,24 +495,30 @@ \csdef{@vasutitle}{} \csdef{@vashorttitle}{} \csdef{@sesbibsec}{} + \csdef{@sesroom}{\lecroom} \setkeys{session}{cancel=false} \setkeys{session}{#1} \csdef{@sestitle}{#2} - \protected@csxdef{sesdate\thesnum}{\AdvanceDate[\thedateratio]\vldate\today\AdvanceDate[-\thedateratio]} - \protected@csxdef{sesshortdate\thesnum}{\AdvanceDate[\thedateratio]\vlshdate\today\AdvanceDate[-\thedateratio]} + \protected@csxdef{sesdate\thesnum}{% + \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi% + \AdvanceDate[\thedateratio]\vldate\today\egroup} + \protected@csxdef{sesshortdate\thesnum}{% + \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi% + \AdvanceDate[\thedateratio]\vlshdate\today\egroup} \protected@csxdef{sestitle\thesnum}{\csuse{@sestitle}} \protected@csxdef{sestitlesep\thesnum}{\csuse{@sestitlesep}} \protected@csxdef{sessubtitle\thesnum}{\csuse{@vasutitle}} \protected@csxdef{sesshorttitle\thesnum}{\csuse{@vashorttitle}} \protected@csxdef{sesbib\thesnum}{\csuse{@sesbibsec}} + \protected@csxdef{sesroom\thesnum}{\csuse{@sesroom}} \ifKV@session@cancel \stepcounter{cancellations} \protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}% - \ \leccancel\ \lectypesession\noexpand\egroup} + \leccancel\noexpand\egroup} \protected@eappto\programlistbeamer{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}% - \ \leccancel\ \lectypesession\noexpand\egroup} + \leccancel\noexpand\egroup} \else \protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% \csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}} @@ -590,6 +606,7 @@ \gdef\sestitlesep{\csuse{sestitlesep#1}}% \gdef\sesshorttitle{\csuse{sesshorttitle#1}}% \gdef\sessubtitle{\csuse{sessubtitle#1}}% + \gdef\sesroom{\csuse{sesroom#1}}% } \newcommand\LocalSession[1]{% @@ -600,6 +617,7 @@ \gdef\lsestitlesep{\csuse{sestitlesep#1}}% \gdef\lsesshorttitle{\csuse{sesshorttitle#1}}% \gdef\lsessubtitle{\csuse{sessubtitle#1}}% + \gdef\lsesroom{\csuse{sesroom#1}}% } % Session information @@ -628,13 +646,20 @@ \lsesshortdate% } +\newcommand*\SessionRoom[1]{% + \LocalSession{#1}% + \lsesroom% +} + \newcommand*\MakeProgramline[1]{% \LocalSession{#1}% -\item[{\bfseries\lsesshortdate}]% - \lsestitle\lsestitlesep\lsessubtitle% + \item[{\bfseries\lsesshortdate}]% + \lsestitle\lsestitlesep\lsessubtitle% } % Reset to today +% Not needed anymore as of v. 0.8, +% but kept for backwards compatibility reasons \newcommand*\ResetDate{\SetDate} % Finis -- cgit v1.2.3