jslectureplanner (7dec20)

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

25 files changed, 55 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/README b/Master/texmf-dist/doc/latex/jslectureplanner/README
index 5f9da681e12..e5dae559d2b 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/README
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/README
@@ -68,6 +68,8 @@ instructions; also have a look at the example files.
 
 == CHANGES ==
 
+* V. 1.12 (2020-12-08):  - Correctly parse staryear/endyear.
+
 * V. 1.11 (2020-05-11):  - Allow for customization of program and presentation lists.
                          - Correctly set first session in presentation list. 
 
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf
index ae0607b469c..7fe67e794fb 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf
index 54a3fe25290..24941bb9b11 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf
index 1d90d42f0c7..4f8220e8e5b 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf
index ac529f1a972..0b8f2291802 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf
index f949f346aab..b756c857050 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf
index 8618c4a994b..30b972c602e 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf
index 619c62ce976..c844df95f24 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf
index 826431e8b17..fbfee149f88 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf
index a51da79d67d..4e81e8d909c 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf
index 3effb912173..883a071f06d 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf
index a30a8d7d730..dc7be35d41c 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf
index 4df08079509..3bd76674b0d 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf
index 7494a82a679..4e02a240b84 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf
index 326beb4f684..58cf55305ff 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf
index d3539369039..1f535cb2f10 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf
index 3ecc09846a7..67df001b4cc 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf
index 303b1dae404..db9feda9756 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf
index 464a6c7f3bd..b846ca57794 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf
index d09b39386e9..0cd64cb49a3 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf
index 0050ea70455..62f446fa15c 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
index 7a0c3571509..971a3b29bcd 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
index 4792ba03bbd..ecadf4b79aa 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
@@ -87,7 +87,7 @@ colorlinks=false
 \author{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}}
 
-\date{Version 1.11, 2020/05/11}
+\date{Version 1.12, 2020/12/08}
 
 \maketitle
 
@@ -238,7 +238,8 @@ Please also cf. sec.~\ref{sec:styles} on the concept of ``styles''.
 Sec.~\ref{sec:customizing-strings} explains how to customize and extend this list.
 Also cf. sec.~\ref{sec:styles}.
 
-\item [\joption{year=\jparam{year}}] Year of the term
+\item [\joption{year=\jparam{year}}] (Start) year of the term
+\item [\joption{endyear=\jparam{year}}] End year of the term if applicable (in case of terms such as \emph{Winter Term 2020/21})
 \item [\joption{uni=\jparam{university}}] Your university
 \item [\joption{institute=\jparam{institute}}] Your institute/department
 \item [\joption{room=\jparam{room}}] The room where the course generally takes place;
@@ -315,6 +316,10 @@ description.}
 \item \joption{ss}: Summer term (\emph{Sommersemester})
 \item \joption{ws}: Winter term (\emph{Wintersemester})
 \end{itemize}
+%
+If the \joption{\jparam{year}} spans multiple years, always use a slash as separator (e.\,g., 2020/21)
+for parsing purposes in the input.
+The separator that is used in the output can be customized (see sec.~\ref{sec:custstrings}).
 \item \jcsmacro{LecUni\{\jparam{university}\}}: Record the name of
 your university
 \item \jcsmacro{LecInstitute\{\jparam{institute}\}}: Record your institute's/department's name
@@ -358,7 +363,6 @@ your university
 \item \jcsmacro{SessionTitleSep\{\jparam{separator}\}}: Specify a default separator between session title and subtitle (e.\,g., ``. '' or `` -- ''). This is used if no specific separator has been specified in the session entry (see sec.~\ref{sec:lecplan}); by default, no separator is defined.
 \end{itemize}
 
-\clearpage
 
 \section{Setting up a course schedule}\label{sec:lecplan}
 
@@ -512,11 +516,13 @@ there is a unique short title by the test
 the term type (e.\,g., ``WS'')
 \item \jcsmacro{lecsemverb}: Outputs the verbose version
 of the term type (such as ``Winter\-semester'')
-\item \jcsmacro{lecyear}: Outputs the year
+\item \jcsmacro{lecyear}: Outputs the (start) year
+\item \jcsmacro{lecendyear}: Outputs the end year if available
+\item \jcsmacro{lecendyearsep}: Outputs the separator between start and end year (slash by default)
 \item \jcsmacro{lecsemester}: Outputs the short version of
-the semester (e.\,g., ``WS 2014'')
+the semester (e.\,g., ``WS 2014/15'')
 \item \jcsmacro{lecsemesterverb}: Outputs the verbose version
-of the semester (such as ``Winter\-semester 2014'')
+of the semester (such as ``Winter\-semester 2014/15'')
 \item \jcsmacro{adjsemester}: Outputs the short version of
 the semester that \emph{follows} this one (e.\,g., ``SoSe 2015'')
 \item \jcsmacro{adjsemesterverb}: Outputs the verbose version
@@ -999,7 +1005,7 @@ Analogous macros for canceled session items, exam items and presentation list it
 \begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},
 frame=single,moretexcs={[3]{ProgramListCancelItem,programdateformat,cansestitleformat}}]
 \newcommand*{\ProgramListCancelItem}[4]{\item[\programdateformat{#1}]
-                                             \cansestitleformat{#2#3#4 \leccancel}}
+                                             \cansestitleformat{#2#3#4\leccancel}}
 \end{lstlisting}
 \begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},
 frame=single,moretexcs={[3]{ProgramListExamItem,programdateformat,exsestitleformat}}]
@@ -1132,7 +1138,7 @@ frame=single,moretexcs={[1]{breakevent}}]
 and if so, it is output followed by the separator given as second argument and the break
 title (\texttt{\#2}). If not, only the break title (\texttt{\#2}) is output.
 
-\subsubsection{Strings}
+\subsubsection{Strings}\label{sec:custstrings}
 
 For canceled sessions, the program outputs
 ``\jparam{Session title} -- keine \jparam{Session}'' (``keine''
@@ -1163,6 +1169,12 @@ an em-dash), can be redefined by changing
 moretexcs={[1]{emptypressession}}]
 \newcommand*\emptypressession{---}
 \end{lstlisting}
+%
+The separator between start and end year of a term can be redefined by changing
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,
+moretexcs={[1]{lecendyearsep}}]
+\newcommand*\lecendyearsep{/}
+\end{lstlisting}
 
 \subsection{Using styles}\label{sec:styles}
 
@@ -1427,6 +1439,10 @@ the \jslp\ style files. Thanks, Dominik.
 \section{Release History}
 
 \begin{itemize}
+\item 2020/12/08 (v. 1.12):
+	\begin{itemize}
+		\item Correctly parse staryear/endyear.
+	\end{itemize}
 \item 2020/05/11 (v. 1.11):
 	\begin{itemize}
 		\item Allow for customization of program and presentation lists (see sec.~\ref{sec:listcust}).
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
index 72c62b27fa7..31bbfd3530c 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
@@ -23,8 +23,8 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\filedate{2020/05/11}
-\def\fileversion{1.11}
+\def\filedate{2020/12/08}
+\def\fileversion{1.12}
 \def\filename{jslectureplanner.sty}
 
 \NeedsTeXFormat{LaTeX2e}
@@ -58,6 +58,8 @@
 \def\lecnsemverb{}
 \def\lecnsemny{}
 \def\lecyear{}
+\def\lecendyear{}
+\def\lecendyearsep{/}
 \def\lecsemester{}
 \def\lecsemesterverb{}
 \def\lecuniversity{}
@@ -256,6 +258,7 @@
     \def\lecshorttitle{#1}%
     \global\toggletrue{uniquelecshorttitle}}
 \define@key{lec}{year}{\def\lecyear{#1}}
+\define@key{lec}{endyear}{\def\lecendyear{#1}}
 \define@key{lec}{uni}{\def\lecuniversity{#1}}
 \define@key{lec}{institute}{\def\lecinstitute{#1}}
 \define@key{lec}{platform}{\def\lecplatform{#1}}
@@ -313,12 +316,31 @@
 %
 % ALTERNATIVE SETUP MACROS
 %
+\RequirePackage{xparse}
+
+% LecYear parses and splits {...}{startyear/endyear}
+\ExplSyntaxOn
+\NewDocumentCommand \LecYear { m m }
+{
+   % #1: semester/term
+   \setkeys{lec}{lecsem=#1}
+   % split #2 at / if available (startyear/endyear)
+   \seq_set_split:Nnn \seq_jslp_lec_year { / } { #2 }
+   \seq_pop_left:NNT \seq_jslp_lec_year \tl_jslp_start_year
+   { 
+      \setkeys{lec}{year=\tl_jslp_start_year} 
+   }
+   \seq_get_right:NNT \seq_jslp_lec_year \tl_jslp_end_year
+   {
+       \setkeys{lec}{endyear=\tl_jslp_end_year}
+   }
+}
+\ExplSyntaxOff
 
 \newcommand*{\LecType}[1]{\setkeys{lec}{lectype=#1}}
 \newcommand*{\LecTitle}[2][]{\setkeys{lec}{shorttitle={#2},#1,title={#2}}}
 \newcommand*{\LecTitleSep}[1]{\setkeys{lec}{titlesep={#1}}}
 \newcommand*{\LecSubTitle}[1]{\setkeys{lec}{subtitle={#1}}}
-\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}}}
@@ -341,7 +363,6 @@
 %
 % Courtesy of Christian Hupfer at
 % https://tex.stackexchange.com/a/473552/19291
-\RequirePackage{xparse}
 
 \ExplSyntaxOn
 \cs_generate_variant:Nn \int_set:Nn {NV}
@@ -384,8 +405,8 @@
 %
 % CONCATENATED VARIABLES
 %
-\def\lecsemester{\lecsemshort~\lecyear}
-\def\lecsemesterverb{\lecsemverb\ \lecyear}
+\def\lecsemester{\lecsemshort~\lecyear\ifcsempty{lecendyear}{}{\lecendyearsep\lecendyear}}
+\def\lecsemesterverb{\lecsemverb\ \lecyear\ifcsempty{lecendyear}{}{\lecendyearsep\lecendyear}}
 \def\lecfulltitle{\lectitle\lectitlesep\lecsubtitle}
 \def\sesfulltitle{\sestitle\sestitlesep\sessubtitle}
 \def\lecendtime{\jslp@endtime{\@lecstarttime}{\lecduration}}
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty
index 8d8b634bbac..a371a492a57 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty
@@ -24,8 +24,8 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\filedate{2020/05/11}
-\def\fileversion{1.11}
+\def\filedate{2020/12/08}
+\def\fileversion{1.12}
 \def\filename{jsmembertable.sty}
 
 \NeedsTeXFormat{LaTeX2e}