jslectureplanner (7jul15)

git-svn-id: svn://tug.org/texlive/trunk@37792 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 44 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/README b/Master/texmf-dist/doc/latex/jslectureplanner/README
index 4fd16bd10f5..bede5a9b1a1 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/README
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/README
@@ -60,8 +60,11 @@ instructions; also have a look at the example files.
 
 == CHANGES ==
 
-* V. 1.0.1 (2015-02-27): - Fix a regression introduced by v. 1.0 (\leccancel not properly
-                           expanded).
+* V. 1.0.2 (2015-07-07): - Permit \LecType and \LecYear in the document body again
+                           (fix a regression introduced in v. 1.0).
+
+* V. 1.0.1 (2015-02-27): - Properly expand \leccancel
+                           (fix a regression introduced by v. 1.0).
 
 * V. 1.0 (2015-02-27):   - Lecture types and term types are not hardcoded anymore and can
                            be freely modified and extended via \DefLecType and \DefSemType.
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex
index 5f73cf9d835..5a40e718650 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecpresbody.tex
@@ -4,6 +4,8 @@
 
 \title{\lectype\ \lecfulltitle}
 
+\author{\lecinstructor}
+
 \date{\lecsemester}
 
 \frame{\maketitle}
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
index 67550ca0a4f..77550df9207 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.tex
index ba5d02cdea2..1d8fec7fce0 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturebib.tex
@@ -28,6 +28,8 @@
 
 \title{\lectype\ \lecfulltitle:\\Auswahlbibliographie}
 
+\author{\lecinstructor}
+
 \date{\lecsemesterverb}
 
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
index 6951952daf0..23dd94a7617 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturehandout.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
index f5c5a997e98..edea80cea3f 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturepresentation.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
index a871c02b22c..8c5a7a7ea28 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.tex
index cced2b550ea..8df642c0bd0 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lectureprogram.tex
@@ -19,6 +19,8 @@
 
 \title{\lectypeverb: \lecfulltitle}
 
+\author{\lecinstructor}
+
 \date{\lecsemesterverb}
 
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
index fc247f35df4..3c05d9a917d 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.tex
index 8ff6b4a4025..1a816369ec5 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/lecturescript.tex
@@ -17,6 +17,8 @@
 
 \title{\lectype\ \lecfulltitle}
 
+\author{\lecinstructor}
+
 \date{\lecsemester}
 
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex b/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
index 0a9e85f428a..a742ae1796c 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/examples/metadata.tex
@@ -9,10 +9,11 @@
 \LecTitle[shorttitle={Meine Wissenschaft},
           subtitle={Grundlagen und Theorien},
           titlesep={\ --\ }]{Einf\"uhrung in meine Wissenschaft}
-\LecYear{ss}{2013}
+\LecYear{ss}{2015}
 \LecUni{Universit\"at Schwanheim}
 \LecInstitute{Institut f\"ur Wissenschaftsgeschichte}
-\LecStartDate{17/04/2013}
+\LecInstructor{Dr. Paula Pan}
+\LecStartDate{01/04/2015}
 
 %
 % Session data
@@ -58,7 +59,7 @@
 \end{SessionBlock}
 
 % a semester break of two weeks
-\SetBreaks[units=2,span={10.\,--\,23.\,06.}]{Osterferien}
+\SetBreaks[units=2,span={10.\,--\,23.\,06.}]{Pfingstferien}
 
 % start a new frame in beamer
 \SetBeamerFrameBreak
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
index 894df05da19..e7710ef0438 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.pdf
diff --git a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
index 5d12a545f24..77c58a8cbc7 100644
--- a/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
+++ b/Master/texmf-dist/doc/latex/jslectureplanner/jslectureplanner.tex
@@ -29,7 +29,7 @@
 \author{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}}
 
-\date{Version 1.0.1, 2015/02/27}
+\date{Version 1.0.2, 2015/07/07}
 
 \maketitle
 
@@ -238,7 +238,7 @@ the first session (argument\emph{ must} have the form DD/MM/YYYY)
 \item \jcsmacro{SetOfficeHours\{<office hours>\}}: Record date of your office hours
 \item \jcsmacro{SetOfficeNumber\{<office number>\}}: Record your office number
 \item \jcsmacro{SetPlatform\{<platform information>\}}: Record information
-(e.\,g., URL) of the e-learning platform
+(such as URL) of the e-learning platform
 \end{itemize}
 
 \section{Setting up a course schedule\label{sec:lecplan}}
@@ -644,10 +644,15 @@ them for inclusion to the package.
 \section{History}
 
 \begin{itemize}
+\item 2015/07/07 (v. 1.0.2):
+     \begin{itemize}
+       \item Permit \jcsmacro{LecType} and \jcsmacro{LecYear} in the document body again
+             (fix a regression introduced by v. 1.0).
+     \end{itemize}
 \item 2015/02/27 (v.\,1.0.1):
      \begin{itemize}
-       \item Fix a regression introduced by v. 1.0 (\jcsmacro{leccancel}
-             was not properly expanded).
+       \item Properly expand \jcsmacro{leccancel}
+             (fix a regression introduced by v. 1.0).
      \end{itemize}
 \item 2015/02/27 (v.\,1.0):
      \begin{itemize}
diff --git a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
index 4cc723ca8d4..e1a8298900e 100644
--- a/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
+++ b/Master/texmf-dist/tex/latex/jslectureplanner/jslectureplanner.sty
@@ -21,8 +21,8 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\filedate{2015/02/27}
-\def\fileversion{1.0.1}
+\def\filedate{2015/07/07}
+\def\fileversion{1.0.2}
 \def\filename{jslectureplanner.sty}
 
 \NeedsTeXFormat{LaTeX2e}
@@ -157,12 +157,26 @@
 \newcounter{breakunits}
 \newcounter{loopcounter}
 
+%
+% HELPERS
+%
+
+% Helper command that uses etoolbox's \AtEndPreamble iff
+% we actually are in a preamble. If not, the argument is
+% output as is.
+\newcommand\js@AtEndPreambleIfInPreamble[1]{%
+  \ifx\@onlypreamble\@notprerr
+   #1
+  \else
+   \AtEndPreamble{#1}
+  \fi
+}
 
 %
 % PACKAGE OPTIONS
 %
 \define@key{lec}{lectype}{%
-  \AtEndPreamble{%
+  \js@AtEndPreambleIfInPreamble{%
     \ifcsundef{lectype@#1}{%
        \PackageError{jslectureplanner}{Lecture type '#1' is not defined!}{%
              Please consult the package manual for instructions how to define it}
@@ -175,7 +189,7 @@
 \DeclareOptionX{type}{\setkeys{lec}{lectype=#1}}
 
 \define@key{lec}{lecsem}{%
-  \AtEndPreamble{%
+  \js@AtEndPreambleIfInPreamble{%
     \ifcsundef{lecsemshort@#1}{%
        \PackageError{jslectureplanner}{Semester type '#1' is not defined!}{%
              Please consult the package manual for instructions how to define it}