summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-31 22:47:47 +0000
committerKarl Berry <karl@freefriends.org>2016-08-31 22:47:47 +0000
commit59fe7990216c0d13eb0e9797c7dc563d2f1705b5 (patch)
tree75ab31dad47d808008a03a860422180859317e05
parent81ee5e54df53e5bb20be20bfefae95dd1e9815ef (diff)
jslectureplanner (31aug16)
git-svn-id: svn://tug.org/texlive/trunk@41965 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/README12
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdfbin85429 -> 85429 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdfbin59145 -> 59148 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdfbin84929 -> 84910 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdfbin57878 -> 57884 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdfbin34743 -> 34739 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdfbin28387 -> 28387 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdfbin28510 -> 28510 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex2
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdfbin27895 -> 27892 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdfbin26783 -> 26781 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdfbin26860 -> 26863 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdfbin411102 -> 423352 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex62
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps16
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty118
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty4
17 files changed, 148 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/README b/Master/texmf-dist/doc/latex/jslectureplanner/README
index 383dff87d67..8980f594662 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/README
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/README
@@ -68,6 +68,18 @@ instructions; also have a look at the example files.
== CHANGES ==
+* V. 1.3 (2016-08-31): - BACKWARDS-INCOMPATIBLE CHANGE! Use datetime2 instead of datetime
+ and advdate. This changes the interface to set the lecture date
+ format. Please refer to the documentation for details.
+
+ - Fix output of \SetBreaks when no span argument is given.
+
+ - Protect content of some \Lec* macros and options to allow for
+ commas in titles etc.
+
+ - Small microtypographic improvement in default definition of
+ the lecture date format.
+
* V. 1.2 (2016-05-11): - Fix line breaking with empty session titles before course
breaks.
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
index 881825f0ab5..26765829e96 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
index 7609df557a2..ee534d78a16 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
index fcb56eab53a..b2195a77512 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
index 6864d09252b..2ae19d6d76f 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
index 90bfce18646..f63e9d3c2ca 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf
index 264b28c0682..9fb8a7e0970 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf
index b7d0d7d146f..90006339dc5 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
index 8f8f5f87026..f43eb5fdd70 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
@@ -59,7 +59,7 @@
\end{SessionBlock}
% a semester break of two weeks
-\SetBreaks[units=2,span={10.\,--\,23.\,06.}]{Pfingstferien}
+\SetBreaks[units=2,span={25.\,05.\,--\,06.\,06.}]{Pfingstferien}
% start a new frame in beamer
\SetBeamerFrameBreak
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf
index f135163bd15..83fae9336e8 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf
index 43527dd2093..dcb6f3244ee 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdf
index 258ec5a8f5d..c98132035bd 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
index 1cba14c7e62..32dee2cbab3 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
index c07e23a32c2..200bb441ebc 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
@@ -69,7 +69,7 @@
\author{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}}
-\date{Version 1.2, 2016/05/11}
+\date{Version 1.3, 2016/08/31}
\maketitle
@@ -129,14 +129,13 @@ This is described later in this manual.
The following packages are required and loaded by \jslp:
\begin{itemize}
\setlength\itemsep{2pt}
- \item \textsf{advdate}
\item \textsf{calc}
- \item \textsf{datetime}
+ \item \textsf{datetime2}
\item \textsf{etoolbox}
\item \textsf{ifthen}
\item \textsf{xkeyval}
\end{itemize}
-
+\pagebreak
\section{General idea}
@@ -713,20 +712,40 @@ Thus, you could add a new term type ``spring term'' via
\item \jcsmacro{DefSemType\{st\}\{ST\}\{Spring Term\}}
\end{itemize}
-\subsection{Customizing the date format}
+\subsection{Customizing the date format}\label{sec:custdate}
-If you need to change the date format, redefine the macros \jcsmacro{lecdateformat}
-(for the long format) and \jcsmacro{lecdateshortformat}
-(for the short format), using the syntax provided by the \textsf{datetime}
+If you need to change the date format, redefine the date styles \textsf{lecdate}
+(for the long format) and \textsf{lecshortdate} (for the short format),
+using the syntax provided by the \textsf{datetime2}
package. By default, the two formats are defined as follows:
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single]
-\newcommand*\lecdateformat{%
- \THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR}
-\newcommand*\lecdateshortformat{%
- \THEDAY.\,\twodigit{\THEMONTH}.}
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,moretexcs={[1]{DTMnewdatestyle}}]
+\DTMnewdatestyle{lecdate}{% long date: DD.\,MM.~YYYY
+\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.~##1}%
+\renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}%
+}
+
+\DTMnewdatestyle{lecshortdate}{% short date: DD.\,MM.
+\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.}%
+\renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}%
+}
+\end{lstlisting}
+\jfcsmacro{DTMtwodigits\{\#\#3\}} represents the day of the month (producing always two digits, i.\,e., \emph{01} not \emph{1}), \jfcsmacro{DTMtwodigits\{\#\#2\}} represents the month (also in two-digit form) and \jfmacro{\#\#1} represents the year. Please refer to the \textsf{datetime2} manual for details.
+
+If you want to redefine the styles, use \jfcsmacro{DTMrenewdatestyle} and change the definition accordingly. For instance, to get the typical American English date formats \emph{MM/DD/YYYY} and \emph{Month, DD}, redefine the formats as follows:
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,moretexcs={[1]{DTMrenewdatestyle}}]
+\DTMrenewdatestyle{lecdate}{% long date: MM/DD/YYYY
+\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##2}/\DTMtwodigits{##3}/##1}%
+}
+
+\DTMrenewdatestyle{lecshortdate}{% short date: Month, DD
+\renewcommand*{\DTMdisplaydate}[4]{\DTMenglishmonthname{##2}, ##3}%
+}
\end{lstlisting}
-Use \jfcsmacro{renewcommand*} to redefine them.
+Note that it is not necessary to include the \jfcsmacro{DTMDisplaydate} redefinition in the date format redefinition (since it does never change here). Note further that the macro \jfcsmacro{DTMenglishmonthname} used in the short date redefinition requires the \textsf{datetime2-english} module to be loaded (see \textsf{datetime2} manual for details).
+
+Note, finally, that the date redefinition syntax used up to \jslp\ 1.2 is no longer supported, since it relied on the \textsf{datetime} package, which is deprecated (and superseded by \textsf{datetime2}). The \jslp\ package will issue a warning if you try to use the old syntax.
\subsection{Misc. customizing}
@@ -749,7 +768,7 @@ The indentation used in program lists can be changed by redefining
\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single]
\newcommand*\lecprogramlistindent{\textbf{88.\,88.}}
\end{lstlisting}
-Again, use \jfcsmacro{renewcommand{*}} for the redefinitions.
+Use \jfcsmacro{renewcommand{*}} for the redefinitions.
\subsection{Using styles}\label{sec:styles}
@@ -1002,6 +1021,15 @@ the \jslp\ style files. Thanks, Dominik.
\section{Release History}
\begin{itemize}
+\item 2016/08/31 (v. 1.3):
+ \begin{itemize}
+ \item \textbf{Backwards-incompatible change!} Use \textsf{datetime2} instead of \textsf{datetime} and \textsf{advdate}.
+ This changes the interface to set the lecture date format. See sec.~\ref{sec:custdate}.
+ \item Fix output of \jcsmacro{SetBreaks} when no \joption{span} argument is given.
+ \item Protect content of some \jcsmacro{Lec}* macros and options to allow for commas in
+ titles etc.
+ \item Microtypographic improvement in default definition of the lecture date format.
+ \end{itemize}
\item 2016/05/11 (v. 1.2):
\begin{itemize}
\item Fix line breaking with empty session titles before course breaks.
@@ -1013,7 +1041,7 @@ the \jslp\ style files. Thanks, Dominik.
\item \jcsmacro{AdjSessionTitle}
\item \jcsmacro{AdjSessionShortDate}
\item \jcsmacro{AdjSessionRoom}
- \item \jcsmacro{AdjSessionInstructor}
+ \item \jcsmacro{AdjSessionInstructor}\enlargethispage{\baselineskip}
\item \jcsmacro{AdjSessionPresStudents}
\end{itemize}
\end{itemize}
@@ -1025,7 +1053,7 @@ the \jslp\ style files. Thanks, Dominik.
\jcsmacro{makebeamerpreslist}, \jcsmacro{setfirstpressession} and
\jcsmacro{setlastpressession}.
\item Major revision of the manual.
- \end{itemize}\filbreak
+ \end{itemize}
\item 2015/07/07 (v. 1.0.2):
\begin{itemize}
\item Permit \jcsmacro{LecType} and \jcsmacro{LecYear} in the document body again
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
index 4a23ae70cf9..9b7026373c8 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
@@ -42,10 +42,18 @@
\DefSemType{ws}{WS}{Wintersemester}% winter term
% Date formats
-\renewcommand*\lecdateformat{%
- \THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR}% long date
-\renewcommand*\lecdateshortformat{%
- \THEDAY.\,\twodigit{\THEMONTH}.}% short date
+% Uses datetime2 syntax:
+% ##1: year
+% ##2: month
+% ##3: day
+% \DTMtwodigits: always output two digits
+\DTMrenewdatestyle{lecdate}{% long date: dd.\,mm.~yyyy
+\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.~##1}%
+}
+
+\DTMrenewdatestyle{lecshortdate}{% short date: dd.\,mm.
+\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.}%
+}
% Suffix to cancelled sessions
\renewcommand*\leccancel{\ -- keine \lectypesession}
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
index 81f1d97bef4..ed719c4751c 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{2016/05/11}
-\def\fileversion{1.2}
+\def\filedate{2016/08/31}
+\def\fileversion{1.3}
\def\filename{jslectureplanner.sty}
\NeedsTeXFormat{LaTeX2e}
@@ -36,9 +36,8 @@
% REQUIRED PACKAGES
%
\RequirePackage{etoolbox}
-\RequirePackage{advdate}
\RequirePackage{xkeyval}
-\RequirePackage{datetime}
+\RequirePackage[calc,useregional]{datetime2}
\RequirePackage{calc}
\RequirePackage{ifthen}
@@ -230,19 +229,19 @@
\fi
}
-\DeclareOptionX{title}{\setkeys{lec}{title=#1}}
-\DeclareOptionX{titlesep}{\setkeys{lec}{titlesep=#1}}
-\DeclareOptionX{subtitle}{\setkeys{lec}{subtitle=#1}}
-\DeclareOptionX{shorttitle}{\setkeys{lec}{shorttitle=#1}}
+\DeclareOptionX{title}{\setkeys{lec}{title={#1}}}
+\DeclareOptionX{titlesep}{\setkeys{lec}{titlesep={#1}}}
+\DeclareOptionX{subtitle}{\setkeys{lec}{subtitle={#1}}}
+\DeclareOptionX{shorttitle}{\setkeys{lec}{shorttitle={#1}}}
\DeclareOptionX{year}{\setkeys{lec}{year=#1}}
-\DeclareOptionX{uni}{\setkeys{lec}{uni=#1}}
-\DeclareOptionX{institute}{\setkeys{lec}{institute=#1}}
+\DeclareOptionX{uni}{\setkeys{lec}{uni={#1}}}
+\DeclareOptionX{institute}{\setkeys{lec}{institute={#1}}}
\DeclareOptionX{startdate}{\setkeys{lec}{startdate=#1}}
-\DeclareOptionX{instructor}{\setkeys{lec}{instructor=#1}}
-\DeclareOptionX{platform}{\setkeys{lec}{platform=#1}}
-\DeclareOptionX{officehours}{\setkeys{lec}{officehours=#1}}
-\DeclareOptionX{officenumber}{\setkeys{lec}{officenumber=#1}}
-\DeclareOptionX{room}{\setkeys{lec}{room=#1}}
+\DeclareOptionX{instructor}{\setkeys{lec}{instructor={#1}}}
+\DeclareOptionX{platform}{\setkeys{lec}{platform={#1}}}
+\DeclareOptionX{officehours}{\setkeys{lec}{officehours={#1}}}
+\DeclareOptionX{officenumber}{\setkeys{lec}{officenumber={#1}}}
+\DeclareOptionX{room}{\setkeys{lec}{room={#1}}}
\DeclareOptionX{style}{\setkeys{lec}{style=#1}}
\DeclareOptionX{interval}{\setkeys{lec}{interval=#1}}
@@ -258,15 +257,15 @@
%
\newcommand*{\LecType}[1]{\setkeys{lec}{lectype=#1}}
-\newcommand*{\LecTitle}[2][]{\setkeys{lec}{#1,title=#2}}
-\newcommand*{\LecTitleSep}[1]{\setkeys{lec}{titlesep=#1}}
-\newcommand*{\LecSubTitle}[1]{\setkeys{lec}{subtitle=#1}}
+\newcommand*{\LecTitle}[2][]{\setkeys{lec}{#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}}
+\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}}
-\newcommand*{\LecInstructor}[1]{\setkeys{lec}{instructor=#1}}
+\newcommand*{\LecInstructor}[1]{\setkeys{lec}{instructor={#1}}}
\newcommand*{\LecInterval}[1]{\setkeys{lec}{interval=#1}}
@@ -280,12 +279,25 @@
%
-% CUSTOM DATE FORMATS (via datetime)
+% CUSTOM DATE FORMATS (via datetime2)
%
-\newcommand*\lecdateformat{\THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR}
-\newcommand*\lecdateshortformat{\THEDAY.\,\twodigit{\THEMONTH}.}
-\newdateformat{vldate}{\lecdateformat}
-\newdateformat{vlshdate}{\lecdateshortformat}
+
+\DTMnewdatestyle{lecdate}{% long date: DD.\,MM.~YYYY
+ \renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.~##1}%
+ \renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}%
+}
+
+\DTMnewdatestyle{lecshortdate}{% short date: DD.\,MM.
+ \renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.}%
+ \renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}%
+}
+
+
+% Internal macro to set the date to a given value
+% Code adapted from advdate.sty
+\newcommand\jslp@SetDate[1][\s@v@dT@d@y]{\edef\d@t@{#1}%
+ \expandafter\t@d@y\d@t@\t@d@y}
+\def\t@d@y#1/#2/#3\t@d@y{\day#1 \month#2 \year#3 \relax}
%
@@ -511,13 +523,13 @@
% 1) Session definition
%
-\define@key{session}{titlesep}{\csdef{@sestitlesep}{#1}}
-\define@key{session}{subtitle}{\csdef{@vasutitle}{#1}}
-\define@key{session}{shorttitle}{\csdef{@vashorttitle}{#1}}
+\define@key{session}{titlesep}{\csdef{@sestitlesep}{{#1}}}
+\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@key{session}{instructor}{\csdef{@sesinstructor}{#1}}
-\define@key{session}{presstudents}{\csdef{@sespresstudents}{#1}}
+\define@key{session}{room}{\csdef{@sesroom}{{#1}}}
+\define@key{session}{instructor}{\csdef{@sesinstructor}{{#1}}}
+\define@key{session}{presstudents}{\csdef{@sespresstudents}{{#1}}}
\define@boolkey{session}{cancel}[true]{}
%
\newcommand*\NewSession[2][]{%
@@ -542,11 +554,11 @@
\setkeys{session}{#1}
\csdef{@sestitle}{#2}
\protected@csxdef{sesdate\thesnum}{%
- \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi%
- \AdvanceDate[\thedateratio]\vldate\today\egroup}
+ \bgroup\ifx\lecstartdate\empty\else\jslp@SetDate[\lecstartdate]\fi%
+ \DTMsetdatestyle{lecdate}\DTMdate{\year-\month-\day+\thedateratio}\egroup}
\protected@csxdef{sesshortdate\thesnum}{%
- \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi%
- \AdvanceDate[\thedateratio]\vlshdate\today\egroup}
+ \bgroup\ifx\lecstartdate\empty\else\jslp@SetDate[\lecstartdate]\fi%
+ \DTMsetdatestyle{lecshortdate}\DTMdate{\year-\month-\day+\thedateratio}\egroup}
\protected@csxdef{sestitle\thesnum}{\csuse{@sestitle}\ifcsempty{@sestitle}{\strut}{}}
\protected@csxdef{sestitlesep\thesnum}{\csuse{@sestitlesep}}
\protected@csxdef{sessubtitle\thesnum}{\csuse{@vasutitle}}
@@ -605,8 +617,8 @@
\setkeys{break}{units=#1}%
}
\newcommand*\SetBreaks[2][units=1]{%
- \csdef{@breakunits}{\empty}
- \csdef{@breakspan}{\empty}
+ \csdef{@breakunits}{}
+ \csdef{@breakspan}{}
\setkeys{break}{#1}
\setcounter{breakunits}{\csuse{@breakunits}}
\setcounter{sesunit}{\thesesunit+\thebreakunits}
@@ -621,13 +633,13 @@
}{}
\stepcounter{loopcounter}
\repeat
- \ifx\empty\csuse{@breakspan}
+ \ifcsempty{@breakspan}{%
\protected@eappto\programlist{\noexpand\begin{center} (#2) \noexpand\end{center}}
\protected@eappto\programlistbeamer{\noexpand\begin{center} (#2) \noexpand\end{center}}
- \else
+ }{%
\protected@eappto\programlist{\noexpand\begin{center} (\csuse{@breakspan}: #2) \noexpand\end{center}}
\protected@eappto\programlistbeamer{\noexpand\begin{center} (\csuse{@breakspan}: #2) \noexpand\end{center}}
- \fi
+ }
}
% Offset in days
@@ -923,6 +935,10 @@
%
%%%%%%%%%%%%%
+%
+% DEPRECATED THINGS
+%
+
% Reset to today
% DEPRECATED as of v.0.8,
\newcommand*\ResetDate{%
@@ -930,4 +946,22 @@
\protect\ResetDate\space is deprecated (not needed anymore).}%
}
+% datetime (v.1) date formats
+% DEPRECATED as of v.1.3
+% Issue a warning if redefined.
+\newcommand*\lecdateformat{}
+\newcommand*\lecdateshortformat{}
+\AtEndPreamble{%
+ \ifcsempty{lecdateformat}{}{
+ \PackageWarning{jslectureplanner}{\protect\lecdateformat\space is deprecated and non-functional.\MessageBreak
+ Please refer to the manual for the new way of customizing date output.
+ }
+ }
+ \ifcsempty{lecdateshortformat}{}{
+ \PackageWarning{jslectureplanner}{\protect\lecdateshortformat\space is deprecated and non-functional.\MessageBreak
+ Please refer to the manual for the new way of customizing date output.
+ }
+ }
+}
+
% Finis
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty
index 82f0eb053d5..da3ab9364e2 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{2015/07/15}
-\def\fileversion{1.1}
+\def\filedate{2016/08/31}
+\def\fileversion{1.3}
\def\filename{jsmembertable.sty}
\NeedsTeXFormat{LaTeX2e}