summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/jslectureplanner/jslectureplanner.sty
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-05 03:03:08 +0000
committerNorbert Preining <norbert@preining.info>2020-02-05 03:03:08 +0000
commit4b795f65d52cde0d136c0175ce20101946378b54 (patch)
tree07b9b0c89193d379ff6971be01a8ca1e3e6931ca /macros/latex/contrib/jslectureplanner/jslectureplanner.sty
parentfc358ce7332053945afe16ced2a271556cdccfb7 (diff)
CTAN sync 202002050303
Diffstat (limited to 'macros/latex/contrib/jslectureplanner/jslectureplanner.sty')
-rw-r--r--macros/latex/contrib/jslectureplanner/jslectureplanner.sty43
1 files changed, 30 insertions, 13 deletions
diff --git a/macros/latex/contrib/jslectureplanner/jslectureplanner.sty b/macros/latex/contrib/jslectureplanner/jslectureplanner.sty
index dcbe0ce604..3f589c15dc 100644
--- a/macros/latex/contrib/jslectureplanner/jslectureplanner.sty
+++ b/macros/latex/contrib/jslectureplanner/jslectureplanner.sty
@@ -23,8 +23,8 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\filedate{2019/02/06}
-\def\fileversion{1.8}
+\def\filedate{2020/02/04}
+\def\fileversion{1.9}
\def\filename{jslectureplanner.sty}
\NeedsTeXFormat{LaTeX2e}
@@ -1039,13 +1039,15 @@
}
% Automatic Offset after n sessions
-\newcommand*\SetAutoOffset[2]{%
- \setcounter{autooffsettrigger}{#1}
- \setcounter{autooffset}{#2}
+\newcommand*{\SetAutoOffset}[3][1]{%
+ \setcounter{autooffsetcounter}{#1}
+ \setcounter{autooffsettrigger}{#2}
+ \setcounter{autooffset}{#3}
}
% 3) Definition of thematic blocks
%
+\newtoggle{inblock}
\newcommand*\StartBlock[1]{%
\stepcounter{blocks}%
\protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\Roman{blocks}}.]%
@@ -1057,6 +1059,7 @@
\protected@xappto\programblocklistbeamer{\noexpand\item[{\Roman{blocks}}.] #1}%
\csxdef{@currentblock}{#1}%
\csxdef{@currentblockno}{\Roman{blocks}}%
+ \global\toggletrue{inblock}%
}
\newcommand*\EndBlock{%
@@ -1064,6 +1067,7 @@
\gappto\programlistbeamer{\end{description}}
\csxdef{@currentblock}{}%
\csxdef{@currentblockno}{}%
+ \global\togglefalse{inblock}%
}
\newcommand*\NewBlock[1]{%
@@ -1071,23 +1075,36 @@
\StartBlock{#1}
}
+\newcommand*\@PauseBlock{%
+ \gappto\programlist{\end{labeling}}
+ \gappto\programlistbeamer{\end{description}}
+}
+
+\newcommand*\@ResumeBlock{%
+ % the \item here is necessary since this is nested immediately into another list
+ \gappto\programlist{\item \begin{labeling}{\lecprogramlistindent}}%
+ \gappto\programlistbeamer{\item \begin{description}[\lecprogramlistindent]}
+}
+
\newenvironment{SessionBlock}[1]{\StartBlock{#1}}{\EndBlock}
% 4) Beamer-specific features
%
% Beamer frame breaks
\newcommand*\SetBeamerFrameBreak{%
+ \iftoggle{inblock}{\@PauseBlock}{}%
\stepcounter{fbreaks}
- \@ifundefined{programlistbeamerii}{%
+ \ifdefined\programlistbeamerii
+ \ifdefined\programlistbeameriii
+ \global\let\programlistbeameriv\programlistbeamer
+ \else
+ \global\let\programlistbeameriii\programlistbeamer
+ \fi
+ \else%
\global\let\programlistbeamerii\programlistbeamer
- }{%
- \@ifundefined{programlistbeameriii}{%
- \global\let\programlistbeameriii\programlistbeamer
- }{%
- \global\let\programlistbeameriv\programlistbeamer
- }
- }
+ \fi
\global\let\programlistbeamer\empty
+ \iftoggle{inblock}{\@ResumeBlock}{}%
}
% Beamer program hook