From 76ad05084d9acb1f9ed0b0c3df1e42de37381cc2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Apr 2020 21:28:09 +0000 Subject: jslectureplanner (30apr20) git-svn-id: svn://tug.org/texlive/trunk@54951 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/jslectureplanner/README | 5 ++++ .../examples/English/lecturebib-english.pdf | Bin 85104 -> 85104 bytes .../examples/English/lecturehandout-english.pdf | Bin 57923 -> 57923 bytes .../English/lecturepresentation-english.pdf | Bin 84606 -> 84606 bytes .../examples/English/lectureprogram-english.pdf | Bin 56905 -> 56905 bytes .../examples/English/lecturescript-english.pdf | Bin 34575 -> 34575 bytes .../examples/English/membertable-blank-english.pdf | Bin 28442 -> 28442 bytes .../English/membertable-filled-english.pdf | Bin 28450 -> 28450 bytes .../English/presencetable-blank-english.pdf | Bin 27974 -> 27974 bytes .../English/presencetable-filled-english.pdf | Bin 26752 -> 26752 bytes .../examples/English/presentation-list-english.pdf | Bin 25688 -> 25688 bytes .../examples/German/lecturebib.pdf | Bin 85488 -> 85488 bytes .../examples/German/lecturehandout.pdf | Bin 59148 -> 59148 bytes .../examples/German/lecturepresentation.pdf | Bin 84992 -> 84992 bytes .../examples/German/lectureprogram.pdf | Bin 57899 -> 57899 bytes .../examples/German/lecturescript.pdf | Bin 34772 -> 34772 bytes .../examples/German/membertable-blank.pdf | Bin 28387 -> 28387 bytes .../examples/German/membertable-filled.pdf | Bin 28509 -> 28509 bytes .../examples/German/presencetable-blank.pdf | Bin 27896 -> 27896 bytes .../examples/German/presencetable-filled.pdf | Bin 26784 -> 26784 bytes .../examples/German/presentation-list.pdf | Bin 26864 -> 26864 bytes .../latex/jslectureplanner/jslectureplanner.pdf | Bin 457357 -> 457635 bytes .../latex/jslectureplanner/jslectureplanner.tex | 33 +++++++++++++-------- .../latex/jslectureplanner/jslectureplanner.sty | 7 +++-- .../tex/latex/jslectureplanner/jsmembertable.sty | 4 +-- 25 files changed, 32 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/README b/Master/texmf-dist/doc/latex/jslectureplanner/README index f43cc469892..9d1d09cea49 100644 --- a/Master/texmf-dist/doc/latex/jslectureplanner/README +++ b/Master/texmf-dist/doc/latex/jslectureplanner/README @@ -68,6 +68,11 @@ instructions; also have a look at the example files. == CHANGES == +* V. 1.10 (2020-04-30): - Do not increment session topic counter for cancelled sessions + and breaks. + - Add session option topicnumber to reset topic number in draft mode. + - Recode manual in utf8. + * V. 1.9 (2020-02-04): - Allow \SetBeamerFrameBreak within SessionBlock. - Fix \SetAutoOffset at first session and add optional argument to alter first session (fix contributed by Richard Zach). 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 1d8eaeed7a5..8ee99de4cde 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf differ 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 61c1ab39781..174d1d40bbd 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf differ 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 1c78b890ff5..1b8c27038b1 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf differ 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 eaf6da63b45..4be1c094ff2 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf differ 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 30538ff4fd7..9183f3c466c 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf differ 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 609f107b66f..25e1e676aa2 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf differ 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 6c9c7e5b767..52869faee25 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf differ 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 23a07d88636..0d7916a4179 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf differ 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 bdd8dbaa5e0..3374c33a779 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf differ 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 0eb46a1e780..77bdc57f1ff 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf differ 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 607a2cd7f9b..adfe94072a7 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturebib.pdf differ 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 2182f4979b3..39957602713 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf differ 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 596a55e08ef..f34eddf6645 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf differ 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 e16e7512279..a45658c81f8 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf differ 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 19499e9c1b1..4b40e63e826 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/lecturescript.pdf differ 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 dd34a9f2bee..da80a5f6384 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf differ 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 4b270733dd0..f4185515edc 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf differ 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 5358bf3ccf0..cd749eb1e08 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf differ 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 41c7b8dc250..fd02425a5fa 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf differ 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 d35b6105fe2..8c0539e5968 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/German/presentation-list.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf index b3889d88df2..bedf7f4281c 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex index 315435eb6a5..a5aff8fa2a9 100644 --- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex +++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex @@ -29,7 +29,7 @@ \usepackage[osf]{libertine} \usepackage[scaled=0.7]{beramono} \usepackage[T1]{fontenc} -\usepackage[latin9]{inputenc} +\usepackage[utf8]{inputenc} \usepackage{url} % markup @@ -69,10 +69,10 @@ \title{The \jslp\ bundle} -\author{Jürgen Spitzmüller% +\author{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}} -\date{Version 1.9, 2020/02/04} +\date{Version 1.10, 2020/04/30} \maketitle @@ -189,7 +189,7 @@ in ``the second \emph{session} of this course''). short form: \emph{PS}, session form: \emph{Sitzung}) \item \joption{se}: Seminar (verbose form: \emph{Seminar}, short form: \emph{SE}, session form: \emph{Sitzung}) -\item \joption{ue}: Practical course (verbose form: \emph{Übung}, short +\item \joption{ue}: Practical course (verbose form: \emph{Ãœbung}, short form: \emph{UE}, session form: \emph{Sitzung}) \item \joption{ko}: Colloquium (verbose form: \emph{Kolloquium}, short form: \emph{KO}, session form: \emph{Sitzung}) @@ -215,7 +215,7 @@ Please also cf. sec.~\ref{sec:styles} on the concept of ``styles''. \item [\joption{semester=\jparam{term}},] where \joption{\jparam{term}} is one of \begin{itemize} -\item \joption{fs}: Spring term (\emph{Frühjahrssemester}, short form: \emph{FS}) +\item \joption{fs}: Spring term (\emph{Frühjahrssemester}, short form: \emph{FS}) \item \joption{hs}: Fall term (\emph{Herbstsemester}, short form: \emph{HS}) \item \joption{ss}: Summer term (\emph{Sommersemester}, short form: \emph{SoSe}) \item \joption{ws}: Winter term (\emph{Wintersemester}, short form: \emph{WS}) @@ -271,7 +271,7 @@ description.} \item \joption{vl}: Lecture (\emph{Vorlesung}) \item \joption{ps}: Undergraduate seminar (\emph{Proseminar}) \item \joption{se}: Seminar (\emph{Seminar}) -\item \joption{ue}: Practical course (\emph{Übung}) +\item \joption{ue}: Practical course (\emph{Ãœbung}) \item \joption{ko}: Colloquium (\emph{Kolloquium}) \item \joption{pv}: Research seminar (\emph{Privatissimum}) \end{itemize} @@ -295,7 +295,7 @@ year of the course; \joption{\jparam{term}} is one of\footnote{See above sec.~\r description.} \begin{itemize} -\item \joption{fs}: Spring term (\emph{Frühjahrssemester}) +\item \joption{fs}: Spring term (\emph{Frühjahrssemester}) \item \joption{hs}: Fall term (\emph{Herbstsemester}) \item \joption{ss}: Summer term (\emph{Sommersemester}) \item \joption{ws}: Winter term (\emph{Wintersemester}) @@ -357,6 +357,9 @@ Valid \joption{\jparam{options}} include: \item \joption{draft=\jparam{true|false}}: If \joption{true}, a placeholder text (by default: ``Thema \jparam{n}'', see sec.~\ref{sec:misccust}) will be output if no session title is defined. This might be handy for planning the schedule. +\item \joption{topicnumber=\jparam{n}}: In draft mode, reset the current topic number of this session to \jparam{n}. + All subsequent topics will be calculated from this unless reset again. This might be useful if only part of + the schedule is still drafted. \item \joption{titlesep=\jparam{separator}}: Separator between session title and subtitle (e.\,g., \verb|titlesep={.\ }|); this overrides any global separator set via \joption{sestitlesep} option or \jcsmacro{SessionTitleSep} macro for the current session @@ -947,11 +950,11 @@ Currently, the package ships three styles: This style can be used as a basis for English styles. The English examples included in the \jslp\ bundle use this style. \item \joption{cologne} provides some specifics current at the University of Cologne - (\emph{Universität zu Köln}): + (\emph{Universität zu Köln}): \begin{itemize} \item Additional course types: \joption{ak} (AK, \emph{Arbeitskurs}), - \joption{as} (AS, \emph{Aufbauseminar}), \joption{es} (ES, \emph{Einführungsseminar}), - \joption{evl} (EVL, \emph{Einführungsvorlesung}), \joption{hs} (HS, \emph{Hauptseminar}). + \joption{as} (AS, \emph{Aufbauseminar}), \joption{es} (ES, \emph{Einführungsseminar}), + \joption{evl} (EVL, \emph{Einführungsvorlesung}), \joption{hs} (HS, \emph{Hauptseminar}). \end{itemize} \end{enumerate} @@ -1188,13 +1191,19 @@ The time span calculation uses code provided by Christian Hupfer at \url{https://tex.stackexchange.com/a/473552/19291}. Thank you, Herbert, Enrico and Christian! Richard Zach provided a fix and enhancement to \jcsmacro{SetAutoOffset}. Many thanks for this. -Finally, Dominik Waßenhoven tested the package and provided +Finally, Dominik Waßenhoven tested the package and provided me with multiple suggestions, which effectively manifested in major new features such as the \jslp\ style files. Thanks, Dominik. \section{Release History} \begin{itemize} +\item 2020/04/30 (v. 1.10): + \begin{itemize} + \item Do not increment session topic counter for cancelled sessions and breaks. + \item Add session option \joption{topicnumber} to reset topic number in draft mode. + \item Recode this manual in utf8. + \end{itemize} \item 2020/02/04 (v. 1.9): \begin{itemize} \item Allow \jcsmacro{SetBeamerFrameBreak} within \joption{SessionBlock}. @@ -1306,7 +1315,7 @@ the \jslp\ style files. Thanks, Dominik. \item Fix expansion issue in \joption{options} option of \jcsmacro{makebeamerprogram}. \item Add option to automatically shift all subsequent sessions by a certain value after every \emph{n}th session (\jcsmacro{SetAutoOffset}). - \item Add \joption{cologne} style file (suggested by Dominik Waßenhoven). + \item Add \joption{cologne} style file (suggested by Dominik Waßenhoven). \end{itemize} \item 2015/02/08 (v. 0.9): \begin{itemize} diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty index 3f589c15dc4..975be52a0d0 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/02/04} -\def\fileversion{1.9} +\def\filedate{2020/04/30} +\def\fileversion{1.10} \def\filename{jslectureplanner.sty} \NeedsTeXFormat{LaTeX2e} @@ -869,12 +869,12 @@ \define@key{session}{presstudents}{\csdef{@sespresstudents}{{#1}}} \define@boolkey{session}{cancel}[true]{} \define@boolkey{session}{draft}[true]{} +\define@key{session}{topicnumber}{\setcounter{sestopic}{#1-1}} \define@key{session}{extradate}{\csdef{@xsesdate}{#1}} \define@boolkey{session}{exam}[true]{} % \newcommand*\NewSession[2][]{% \stepcounter{sesunit} - \stepcounter{sestopic} \setcounter{snum}{\thesesunit-\thecancellations} \protected@csxdef{sesnr\thesnum}{\thesnum} \togglefalse{shortinstrdef} @@ -963,6 +963,7 @@ \noexpand\printbibliography[keyword=\csuse{sesbib\thesnum},heading=none]}% }% \else + \stepcounter{sestopic} \ifKV@session@draft \ifcsempty{@sestitle}{\protected@csxdef{sestitle\thesnum}{\sestopic}}{} \fi diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty index 27d4be77795..7ec35c292d0 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/02/04} -\def\fileversion{1.9} +\def\filedate{2020/04/30} +\def\fileversion{1.10} \def\filename{jsmembertable.sty} \NeedsTeXFormat{LaTeX2e} -- cgit v1.2.3