From b248dc0ef22a0e175a76c6379c03cc3a728f7f4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 May 2016 21:28:48 +0000 Subject: jslectureplanner (11may16) git-svn-id: svn://tug.org/texlive/trunk@41043 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/jslectureplanner/README | 7 +++ .../jslectureplanner/examples/lecpresbody.tex | 2 +- .../latex/jslectureplanner/examples/lecturebib.pdf | Bin 85429 -> 85429 bytes .../jslectureplanner/examples/lecturehandout.pdf | Bin 59145 -> 59145 bytes .../examples/lecturepresentation.pdf | Bin 84929 -> 84929 bytes .../jslectureplanner/examples/lectureprogram.pdf | Bin 57878 -> 57878 bytes .../jslectureplanner/examples/lecturescript.pdf | Bin 34743 -> 34743 bytes .../examples/membertable-blank.pdf | Bin 28387 -> 28387 bytes .../examples/membertable-filled.pdf | Bin 28510 -> 28510 bytes .../examples/presencetable-blank.pdf | Bin 27895 -> 27895 bytes .../examples/presencetable-filled.pdf | Bin 26783 -> 26783 bytes .../examples/presentation-list.pdf | Bin 26860 -> 26860 bytes .../latex/jslectureplanner/jslectureplanner.pdf | Bin 409457 -> 411102 bytes .../latex/jslectureplanner/jslectureplanner.tex | 67 ++++++++++++++++++-- .../latex/jslectureplanner/jslectureplanner.sty | 68 ++++++++++++++++++++- 15 files changed, 135 insertions(+), 9 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 fb1ed5a8e07..383dff87d67 100644 --- a/Master/texmf-dist/doc/latex/jslectureplanner/README +++ b/Master/texmf-dist/doc/latex/jslectureplanner/README @@ -68,6 +68,13 @@ instructions; also have a look at the example files. == CHANGES == +* V. 1.2 (2016-05-11): - Fix line breaking with empty session titles before course + breaks. + + - New commands \AdjSessionFullTitle, \AdjSessionDate, + \AdjSessionShortTitle, \AdjSessionTitle, \AdjSessionShortDate, + \AdjSessionRoom, \AdjSessionInstructor, \AdjSessionPresStudents + * V. 1.1 (2015-07-15): - Include and document the companion package jsmembertable. - Add support for student presentation lists (new macros \makepreslist, \makepreslist*, \makebeamerpreslist, diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex index 5a40e718650..1532d67df04 100644 --- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex +++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex @@ -34,6 +34,6 @@ \begin{frame}{N\"achste Woche} -\SessionFullTitle{2} +\AdjSessionFullTitle \end{frame} diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf index b69d5273994..881825f0ab5 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf index 18c0156668a..7609df557a2 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf index 9f1c206bf80..fcb56eab53a 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf index 756ff524c6f..6864d09252b 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf differ diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf index c1ddefa1488..90bfce18646 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf 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 6657cd72d31..264b28c0682 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-blank.pdf 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 4cf89b7b0b6..b7d0d7d146f 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/membertable-filled.pdf differ 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 f492296b844..f135163bd15 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-blank.pdf 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 b8779feb160..43527dd2093 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/presencetable-filled.pdf 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 434dfa37585..258ec5a8f5d 100644 Binary files a/Master/texmf-dist/doc/latex/jslectureplanner/examples/presentation-list.pdf and b/Master/texmf-dist/doc/latex/jslectureplanner/examples/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 528efacfb7d..1cba14c7e62 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 60d9a49e7f4..c07e23a32c2 100644 --- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex +++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex @@ -1,3 +1,28 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File jslectureplanner.tex +%% +%% Manual of the jslectureplanner bundle. +%% +%% This file is part of the jslectureplanner bundle. +%% +%% Author: Juergen Spitzmueller +%% +%% 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 +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \documentclass[english]{article} \usepackage[osf]{libertine} @@ -44,7 +69,7 @@ \author{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}} -\date{Version 1.1, 2015/07/15} +\date{Version 1.2, 2016/05/11} \maketitle @@ -602,6 +627,26 @@ session (title, separator, subtitle) \item \jcsmacro{sesroom}: Room of the current session \end{itemize} +\subsection{Generating session-specific information for adjacent sessions} + +Depending on the value of \jcsmacro{ThisSession}, you can retrieve the following +information for sessions that follow or precede the current session by a specific interval unit via the following macros: +\begin{itemize} + \item \jcsmacro{AdjSessionTitle[]}: Outputs the main title + of the adjacent session + \item \jcsmacro{AdjSessionFullTitle[]}: Outputs the full + title (main title, separator, subtitle) of the adjacent session + \item \jcsmacro{AdjSessionShortTitle[]}: Outputs the short + title of the adjacent session + \item \jcsmacro{AdjSessionDate[]}: Outputs the date of the adjacent session + \item \jcsmacro{AdjSessionShortDate[]}: Outputs the short + date (no year) of the adjacent session + \item \jcsmacro{AdjSessionInstructor[]}: Outputs the name of the instructor of the adjacent session + \item \jcsmacro{AdjSessionPresStudents[]}: Outputs the name of the students presenting in the adjacent session + \item \jcsmacro{AdjSessionRoom[]}: Outputs the room of the adjacent session +\end{itemize} +Via the numerical \joption{} option, you can specify which session, relative to the current one, you want to output. The default is \joption{1}, i.\,e., \jcsmacro{AdjSessionTitle} without argument outputs the title of the \emph{next} session. Negative values are valid: \jcsmacro{AdjSessionTitle[-1]}, thus, outputs the title of the \emph{previous} session. + \subsection{Generating session-specific information for an arbitrary session} Independent of the value of \jcsmacro{ThisSession}, @@ -626,15 +671,12 @@ in session number \joption{} \item \jcsmacro{MakeProgramline\{\}}: Outputs a list item line for session number \joption{} in the form - \begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single] \item[{\bfseries }] \end{lstlisting} - \end{itemize} - \section{Customizing the output}\label{sec:customizing-strings} @@ -960,6 +1002,21 @@ the \jslp\ style files. Thanks, Dominik. \section{Release History} \begin{itemize} +\item 2016/05/11 (v. 1.2): + \begin{itemize} + \item Fix line breaking with empty session titles before course breaks. + \item New commands for getting adjacent session data: + \begin{itemize} + \item \jcsmacro{AdjSessionFullTitle} + \item \jcsmacro{AdjSessionDate} + \item \jcsmacro{AdjSessionShortTitle} + \item \jcsmacro{AdjSessionTitle} + \item \jcsmacro{AdjSessionShortDate} + \item \jcsmacro{AdjSessionRoom} + \item \jcsmacro{AdjSessionInstructor} + \item \jcsmacro{AdjSessionPresStudents} + \end{itemize} + \end{itemize} \item 2015/07/15 (v. 1.1): \begin{itemize} \item Include and document the \jsmt\ package. @@ -968,7 +1025,7 @@ the \jslp\ style files. Thanks, Dominik. \jcsmacro{makebeamerpreslist}, \jcsmacro{setfirstpressession} and \jcsmacro{setlastpressession}. \item Major revision of the manual. - \end{itemize} + \end{itemize}\filbreak \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/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty index 5e3df477936..81f1d97bef4 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{2015/07/15} -\def\fileversion{1.1} +\def\filedate{2016/05/11} +\def\fileversion{1.2} \def\filename{jslectureplanner.sty} \NeedsTeXFormat{LaTeX2e} @@ -159,6 +159,7 @@ \newcounter{autooffsetcounter} \newcounter{breakunits} \newcounter{loopcounter} +\newcounter{adjsession} % % HELPERS @@ -546,7 +547,7 @@ \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{sestitle\thesnum}{\csuse{@sestitle}\ifcsempty{@sestitle}{\strut}{}} \protected@csxdef{sestitlesep\thesnum}{\csuse{@sestitlesep}} \protected@csxdef{sessubtitle\thesnum}{\csuse{@vasutitle}} \protected@csxdef{sesshorttitle\thesnum}{\csuse{@vashorttitle}} @@ -861,6 +862,67 @@ \lsestitle\lsestitlesep\lsessubtitle% } +% Get information for adjacent (next, previous etc.) sessions +% +% Full title +\newcommand*\AdjSessionFullTitle[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionFullTitle{\theadjsession}% + \fi +} +% Date +\newcommand*\AdjSessionDate[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionDate{\theadjsession}% + \fi +} +% Short title +\newcommand*\AdjSessionShortTitle[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionShortTitle{\theadjsession}% + \fi +} +% Main title +\newcommand*\AdjSessionTitle[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionTitle{\theadjsession}% + \fi +} +% Short date +\newcommand*\AdjSessionShortDate[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionShortDate{\theadjsession}% + \fi +} +% Room +\newcommand*\AdjSessionRoom[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionRoom{\theadjsession}% + \fi +} +% Instructor +\newcommand*\AdjSessionInstructor[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionInstructor{\theadjsession}% + \fi +} +% Presenting students +\newcommand*\AdjSessionPresStudents[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionPresStudents{\theadjsession}% + \fi +} +% +%%%%%%%%%%%%% + % Reset to today % DEPRECATED as of v.0.8, \newcommand*\ResetDate{% -- cgit v1.2.3