summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/jslectureplanner
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-26 20:47:27 +0000
committerKarl Berry <karl@freefriends.org>2018-09-26 20:47:27 +0000
commit4b73f59e9b8d0135d1cb4132625e33a6a1e64ba1 (patch)
treee0ff48055dabfabcc793ac1ffae734a22cca3fc2 /Master/texmf-dist/tex/latex/jslectureplanner
parentb3005aae20352defc31b6d35779adf58b0ac5f98 (diff)
jslectureplanner (26sep18)
git-svn-id: svn://tug.org/texlive/trunk@48766 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/jslectureplanner')
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/english.lps3
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps3
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty243
-rw-r--r--Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty4
4 files changed, 140 insertions, 113 deletions
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/english.lps b/Master/texmf-dist/tex/latex/jslectureplanner/english.lps
index 7ed97ea0b96..0a203dc1874 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/english.lps
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/english.lps
@@ -64,6 +64,9 @@
% Indentation of program list
\renewcommand*\lecprogramlistindent{\textbf{88/88}}
+% Session topic placeholder
+\renewcommand*\sestopic{Topic~\thesestopic}
+
%
% Strings used by the jsmembertable package
% NOTE that these have to be defined via \newcommand
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
index 9b7026373c8..1ce08f93031 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/german-default.lps
@@ -64,6 +64,9 @@
% Indentation of program list
\renewcommand*\lecprogramlistindent{\textbf{88.\,88.}}
+% Session topic placeholder
+\renewcommand*\sestopic{Thema~\thesestopic}
+
%
% Strings used by the jsmembertable package
% NOTE that these have to be defined via \newcommand
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
index 42cdac10242..18a2191bca2 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{2017/03/12}
-\def\fileversion{1.5}
+\def\filedate{2018/09/26}
+\def\fileversion{1.6}
\def\filename{jslectureplanner.sty}
\NeedsTeXFormat{LaTeX2e}
@@ -78,10 +78,33 @@
\def\programlist{}
\def\programlistbeamer{}
+\def\programblocklistbeamer{\item}
\def\jsbiblist{}
%
+% COUNTERS
+%
+\newcounter{sesunit}
+\newcounter{dateratio}
+\setcounter{dateratio}{1}
+\newcounter{cancellations}
+\newcounter{snum}
+\newcounter{blocks}
+\newcounter{fbreaks}
+\newcounter{lecinterval}
+\setcounter{lecinterval}{7}
+\newcounter{sesoffset}
+\newcounter{autooffset}
+\newcounter{autooffsettrigger}
+\newcounter{autooffsetcounter}
+\newcounter{breakunits}
+\newcounter{loopcounter}
+\newcounter{adjsession}
+\newcounter{sestopic}
+
+
+%
% STRINGS
%
@@ -140,27 +163,8 @@
\newcommand*\lecprogram{Programm}
% Program list indentation
\newcommand*\lecprogramlistindent{\textbf{88.\,88.}}
-
-
-%
-% COUNTERS
-%
-\newcounter{sesunit}
-\newcounter{dateratio}
-\setcounter{dateratio}{1}
-\newcounter{cancellations}
-\newcounter{snum}
-\newcounter{blocks}
-\newcounter{fbreaks}
-\newcounter{lecinterval}
-\setcounter{lecinterval}{7}
-\newcounter{sesoffset}
-\newcounter{autooffset}
-\newcounter{autooffsettrigger}
-\newcounter{autooffsetcounter}
-\newcounter{breakunits}
-\newcounter{loopcounter}
-\newcounter{adjsession}
+% Session topic placeholder
+\newcommand*\sestopic{Thema~\thesestopic}
%
@@ -439,106 +443,116 @@
\define@key{beamerprogram}{options}{\csdef{@bpopts}{#1}}
\define@key{beamerprogram}{listoptions}{\csdef{@bplistopts}{#1}}
\define@boolkey{beamerprogram}{alerted}[true]{}
+\define@boolkey{beamerprogram}{blocksonly}[true]{}
+\define@boolkey{beamerprogram}{uncover}[true]{}
\newcommand*\makebeamerprogram[1][]{%
\csdef{@bptitle}{\lecprogram}
\def\btitleapp{}
\numdef\pframes{\thefbreaks + 1}
\setkeys{beamerprogram}{alerted=false}
+ \setkeys{beamerprogram}{blocksonly=false}
+ \setkeys{beamerprogram}{uncover=false}
\setkeys{beamerprogram}{#1}
\def\bpdescbeg{\begin{description}[\lecprogramlistindent]}
- \providebool{alertedlist}
\ifKV@beamerprogram@alerted
- \booltrue{alertedlist}
+ \fi
+ \providebool{uncoveredlist}
+ \ifKV@beamerprogram@uncover
+ \booltrue{uncoveredlist}
\else
- \boolfalse{alertedlist}
+ \boolfalse{uncoveredlist}
\fi
- \@ifundefined{programlistbeamerii}{}{%
- \def\btitleapp{\ (1/\pframes)}
- \ifcsdef{@bpopts}{%
- \begingroup\edef\tempa{\endgroup\noexpand%
- \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
- }{%
+ \ifKV@beamerprogram@blocksonly
\begin{frame}[label=beamerprogram1]{\csuse{@bptitle}\btitleapp}
- }
- \ifbool{alertedlist}{%
- \begin{description}[<alert@+(1)>][\lecprogramlistindent]
- \programlistbeamerii
- \end{description}
- }{%
- \begin{description}[\lecprogramlistindent]
- \programlistbeamerii
- \end{description}
- }
- \end{frame}
- }
- \@ifundefined{programlistbeameriii}{}{%
- \def\btitleapp{\ (2/\pframes)}
- \ifcsdef{@bpopts}{%
- \begingroup\edef\tempa{\endgroup\noexpand%
- \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
- }{%
- \begin{frame}[label=beamerprogram2]{\csuse{@bptitle}\btitleapp}
- }
- \ifbool{alertedlist}{%
- \begin{description}[<alert@+(1)>][\lecprogramlistindent]
- \programlistbeameriii
- \end{description}
- }{%
- \begin{description}[\lecprogramlistindent]
- \programlistbeameriii
- \end{description}
- }
- \end{frame}
- }
- \@ifundefined{programlistbeameriv}{}{%
- \def\btitleapp{\ (2/\pframes)}
- \ifcsdef{@bpopts}{%
- \begingroup\edef\tempa{\endgroup\noexpand%
- \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
- }{%
- \begin{frame}[label=beamerprogram3]{\csuse{@bptitle}\btitleapp}
- }
- \ifbool{alertedlist}{%
- \begin{description}[<alert@+(1)>][\lecprogramlistindent]
- \programlistbeameriv
- \end{description}
- }{%
- \begin{description}[\lecprogramlistindent]
- \programlistbeameriv
- \end{description}
- }
- \end{frame}
- }
- \ifnumgreater{\thefbreaks}{0}{\def\btitleapp{\ (\pframes/\pframes)}}{}
- \ifcsdef{@bpopts}{%
- \begingroup\edef\tempa{\endgroup\noexpand%
- \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
+ \ifbool{uncoveredlist}{%
+ \begin{description}[<+->][\lecprogramlistindent]
+ }{%
+ \begin{description}[\lecprogramlistindent]
+ }
+ \programblocklistbeamer
+ \end{description}
+ \end{frame}
+ \else
+ \@ifundefined{programlistbeamerii}{}{%
+ \def\btitleapp{\ (1/\pframes)}
+ \ifcsdef{@bpopts}{%
+ \begingroup\edef\tempa{\endgroup\noexpand%
+ \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
}{%
- \@ifundefined{programlistbeamerii}{%
- \begin{frame}[label=beamerprogram]{\csuse{@bptitle}\btitleapp}
- }{%
- \@ifundefined{programlistbeameriii}{%
- \begin{frame}[label=beamerprogram2]{\csuse{@bptitle}\btitleapp}
- }{%
- \@ifundefined{programlistbeameriv}{%
- \begin{frame}[label=beamerprogram3]{\csuse{@bptitle}\btitleapp}
- }{%
- \begin{frame}[label=beamerprogram4]{\csuse{@bptitle}\btitleapp}
- }
- }
- }
- }
- \ifbool{alertedlist}{%
- \begin{description}[<alert@+(1)>][\lecprogramlistindent]
- \programlistbeamer
- \end{description}
- }{%
- \begin{description}[\lecprogramlistindent]
- \programlistbeamer
- \end{description}
- }
- \end{frame}
+ \begin{frame}[label=beamerprogram1]{\csuse{@bptitle}\btitleapp}
+ }
+ \ifbool{uncoveredlist}{%
+ \begin{description}[<+(1)->][\lecprogramlistindent]
+ }{%
+ \begin{description}[\lecprogramlistindent]
+ }
+ \programlistbeamerii
+ \end{description}
+ \end{frame}
+ }
+ \@ifundefined{programlistbeameriii}{}{%
+ \def\btitleapp{\ (2/\pframes)}
+ \ifcsdef{@bpopts}{%
+ \begingroup\edef\tempa{\endgroup\noexpand%
+ \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
+ }{%
+ \begin{frame}[label=beamerprogram2]{\csuse{@bptitle}\btitleapp}
+ }
+ \ifbool{uncoveredlist}{%
+ \begin{description}[<+->][\lecprogramlistindent]
+ }{%
+ \begin{description}[\lecprogramlistindent]
+ }
+ \programlistbeameriii
+ \end{description}
+ \end{frame}
+ }
+ \@ifundefined{programlistbeameriv}{}{%
+ \def\btitleapp{\ (2/\pframes)}
+ \ifcsdef{@bpopts}{%
+ \begingroup\edef\tempa{\endgroup\noexpand%
+ \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
+ }{%
+ \begin{frame}[label=beamerprogram3]{\csuse{@bptitle}\btitleapp}
+ }
+ \ifbool{uncoveredlist}{%
+ \begin{description}[+(1)->][\lecprogramlistindent]
+ }{%
+ \begin{description}[\lecprogramlistindent]
+ }
+ \programlistbeameriv
+ \end{description}
+ \end{frame}
+ }
+ \ifnumgreater{\thefbreaks}{0}{\def\btitleapp{\ (\pframes/\pframes)}}{}
+ \ifcsdef{@bpopts}{%
+ \begingroup\edef\tempa{\endgroup\noexpand%
+ \begin{frame}[\csuse{@bpopts}]{\csuse{@bptitle}\btitleapp}}\tempa
+ }{%
+ \@ifundefined{programlistbeamerii}{%
+ \begin{frame}[label=beamerprogram]{\csuse{@bptitle}\btitleapp}
+ }{%
+ \@ifundefined{programlistbeameriii}{%
+ \begin{frame}[label=beamerprogram2]{\csuse{@bptitle}\btitleapp}
+ }{%
+ \@ifundefined{programlistbeameriv}{%
+ \begin{frame}[label=beamerprogram3]{\csuse{@bptitle}\btitleapp}
+ }{%
+ \begin{frame}[label=beamerprogram4]{\csuse{@bptitle}\btitleapp}
+ }
+ }
+ }
+ }
+ \ifbool{uncoveredlist}{%
+ \begin{description}[<+->][\lecprogramlistindent]
+ }{%
+ \begin{description}[\lecprogramlistindent]
+ }
+ \programlistbeamer
+ \end{description}
+ \end{frame}
+ \fi%\else\ifKV@beamerprogram@blocksonly
}
@@ -568,9 +582,11 @@
\csdef{@sesshortinstructor}{{#1}}\csdef{@usesshortinstructor}{{#1}}\toggletrue{shortinstrdef}}
\define@key{session}{presstudents}{\csdef{@sespresstudents}{{#1}}}
\define@boolkey{session}{cancel}[true]{}
+\define@boolkey{session}{draft}[true]{}
%
\newcommand*\NewSession[2][]{%
\stepcounter{sesunit}
+ \stepcounter{sestopic}
\ifnumcomp{\value{autooffsettrigger}}{>}{0}{%
\ifnumcomp{\value{autooffsettrigger}}{=}{\value{autooffsetcounter}}{%
\addtocounter{sesoffset}{\theautooffset}%
@@ -581,7 +597,7 @@
\setcounter{snum}{\thesesunit-\thecancellations}
\protected@csxdef{sesnr\thesnum}{\thesnum}
\togglefalse{shortinstrdef}
- \csdef{@sestitlesep}{\sestitlesep}
+ \csdef{@sestitlesep}{\ifcsempty{@sessubtitle}{}{\sestitlesep}}
\csdef{@sessubtitle}{}
\csdef{@sesshorttitle}{#2}
\csdef{@usesshorttitle}{}
@@ -593,6 +609,7 @@
\csdef{@usesshortinstructor}{}
\csdef{@sespresstudents}{}
\setkeys{session}{cancel=false}
+ \setkeys{session}{draft=false}
\setkeys{session}{#1}
\csdef{@sestitle}{#2}
\protected@csxdef{sesdate\thesnum}{%
@@ -622,6 +639,9 @@
\noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}%
\noexpand\leccancel\noexpand\egroup}
\else
+ \ifKV@session@draft
+ \ifcsempty{@sestitle}{\protected@csxdef{sestitle\thesnum}{\sestopic}}{}
+ \fi
\protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]%
\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}}
\protected@eappto\programlistbeamer{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]%
@@ -709,6 +729,7 @@
\protected@eappto\programlistbeamer{\noexpand\item[{\noexpand\bfseries\Roman{blocks}}.]%
\noexpand\bgroup\noexpand\bfseries #1\noexpand\egroup}
\gappto\programlistbeamer{\begin{description}[\lecprogramlistindent]}
+ \protected@xappto\programblocklistbeamer{\noexpand\item[{\Roman{blocks}}.] #1}
}
\newcommand*\EndBlock{%
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jsmembertable.sty
index 19428272eb7..a5e8d6d0e6b 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{2017/03/12}
-\def\fileversion{1.5}
+\def\filedate{2017/09/26}
+\def\fileversion{1.6}
\def\filename{jsmembertable.sty}
\NeedsTeXFormat{LaTeX2e}