2 files changed, 93 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
new file mode 100644
index 00000000000..e7318a054fd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
@@ -0,0 +1,55 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% File german-default.lps
+%%
+%% Default German style for lecture planning
+%%
+%% This file is part of the jslectureplanner package.
+%%
+%% Author: Juergen Spitzmueller <juergen.spitzmueller@univie.ac.at>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Juergen Spitzmueller.
+%%
+%% Code repository and issue tracker: https://github.com/jspitz/jslectureplanner
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Lecture types
+\DefTypeVL{VL}{Vorlesung}{Vorlesung}% lecture
+\DefTypePS{PS}{Proseminar}{Sitzung}% undergraduate seminar
+\DefTypeSE{SE}{Seminar}{Sitzung}% seminar
+\DefTypeUE{UE}{\"Ubung}{Sitzung}% practical course
+\DefTypeKO{KO}{Kolloquium}{Sitzung}% colloquium
+\DefTypePV{PV}{Privatissimum}{Sitzung}% research seminar
+
+% Term types
+\DefTypeFS{FS}{Fr\"ujahrssemester}% spring term
+\DefTypeHS{HS}{Herbstsemester}% fall term
+\DefTypeSS{SoSe}{Sommersemester}% summer term
+\DefTypeWS{WS}{Wintersemester}% winter term
+
+% Date formats
+\renewcommand*\lecdateformat{%
+  \THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR}% long date
+\renewcommand*\lecdateshortformat{%
+  \THEDAY.\,\twodigit{\THEMONTH}.}% short date
+
+% Suffix to cancelled sessions
+\renewcommand*\leccancel{\ -- keine \lectypesession}
+
+% Program heading
+\renewcommand*\lecprogram{Programm}
+
+% Indentation of program list
+\renewcommand*\lecprogramlistindent{\textbf{88.\,88.}}
+
+% Finis
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