worksheet (17aug18)

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

4 files changed, 44 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/worksheet/README.md b/Master/texmf-dist/doc/latex/worksheet/README.md
index 63adc78c8d3..8b48cb0a32b 100644
--- a/Master/texmf-dist/doc/latex/worksheet/README.md
+++ b/Master/texmf-dist/doc/latex/worksheet/README.md
@@ -1,9 +1,9 @@
-This package provides functions and an environment for easy worksheet creation:
+This package provides macros and an environment for easy worksheet creation:
 	use the exercise environment for formating exercises in a simple, efficient design;
-	make custom, automatically numbered worksheet titles likewise \LaTeX\ title functions;
+	make custom, automatically numbered worksheet titles in the same way as the \LaTeX\ title macros;
 	provide course and author information with a scrlayer-scrpage based automated header;
-	conforming to different Babel Languages (At this time only English and German are supported.).
+	conforming to different Babel languages (At this time only English, French and German are supported.).
 
-This package is guaranteed to work with pdflatex and xelatex, only depending on scrlayer-scrpage. It is recommended to use xelatex including fontspec package and setting sans font to "Helvetica Neue" or "Raleway".
+This package is guaranteed to work with pdflatex and xelatex, only depending on scrlayer-scrpage and Babel. It is recommended to use xelatex including fontspec package and setting sans font to "Helvetica Neue" or "Raleway".
 
 Package worksheet by Benjamin Zöllner (c)2018. This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (latest version).
diff --git a/Master/texmf-dist/doc/latex/worksheet/worksheet.pdf b/Master/texmf-dist/doc/latex/worksheet/worksheet.pdf
index 17941d65772..893a91dfda5 100644
--- a/Master/texmf-dist/doc/latex/worksheet/worksheet.pdf
+++ b/Master/texmf-dist/doc/latex/worksheet/worksheet.pdf
diff --git a/Master/texmf-dist/doc/latex/worksheet/worksheet.tex b/Master/texmf-dist/doc/latex/worksheet/worksheet.tex
index eea382dd53d..c7bb551ab87 100644
--- a/Master/texmf-dist/doc/latex/worksheet/worksheet.tex
+++ b/Master/texmf-dist/doc/latex/worksheet/worksheet.tex
@@ -291,32 +291,36 @@ Setting header information manually ("lv.tex" does not exist):
 \subsubsection*{2. Example}
 Changing the directory path of "lv.tex" ("lv.tex" does exist in "./MySubDirectory/"):
 \sourceCodeMinipage{
-	\sourceCodeWorksheetChangelvFile{./MySubDirectory/lv.tex}\\[2ex]
+	\sourceCodeWorksheetChangelvFile{./MySubDirectory/lv.tex}\\[1.5ex]
 	\sourceCodeWorksheetAuthors{Ignored Author}\\
-	\sourceCodeWorksheetCourseName{Ignored Header}\\[2ex]
+	\sourceCodeWorksheetCourseName{Ignored Header}\\[1.5ex]
 	\sourceCodeBegin{document}...
 }
+\vfil
+\begin{center}
+		\begin{minipage}[b]{\textwidth}
+			\begin{minipage}[b]{0.5\textwidth}
+				\noindent Content of "MySubDirectory/lv.tex":\par\addvspace{0.5\baselineskip}\noindent
+				{\ttfamily\raggedright \aqua{\textbackslash def}\textbackslash coursename\{Example Header\}\\
+				\aqua{\textbackslash def}\textbackslash authors\{Example Author\}}
+			\end{minipage}%
+			\begin{minipage}[b]{0.5\textwidth}
+				\noindent Also a german version of "MYSubDirectory/lv.tex" is possible:\par\addvspace{0.5\baselineskip}\noindent
+				{\ttfamily\raggedright \aqua{\textbackslash def}\textbackslash lvname\{Example Header\}\\
+				\aqua{\textbackslash def}\textbackslash autoren\{Example Author\}}
+			\end{minipage}
+		\end{minipage}
+\end{center}
 
-\noindent Content of "MySubDirectory/lv.tex":
-\sourceCodeMinipage{
-	\aqua{\textbackslash def}\textbackslash coursename\{Example Header\}\\
-	\aqua{\textbackslash def}\textbackslash authors\{Example Author\}
-}
-
-Also a german version of "MYSubDirectory/lv.tex" is possible:
-\sourceCodeMinipage{
-	\aqua{\textbackslash def}\textbackslash lvname\{Example Header\}\\
-	\aqua{\textbackslash def}\textbackslash autoren\{Example Author\}
-}
 
 % play it safe to display Example Header on both Pages, if this Section is 2 Pages long
 \thispagestyle{headings}
 
 % Babel Languages
 \newpage\section{Conforming to Babel Languages}
-This package automatically changes its appearance to a specific language, after a specific language is selected with {\ttfamily\textbackslash selectlanguage\{...\}}. Supported languages are:
+This package automatically changes its appearance to a specific language, after a specific language is selected with {\ttfamily\textbackslash selectlanguage\{...\}}. Supported Babel languages are:
 \begin{center}
-\textbf{english, german and ngerman}
+\textbf{english, french, german and ngerman}
 \end{center}
 
 % Babel Languages Example
@@ -327,7 +331,8 @@ Defining two different exercises in two different languages:
 \sourceCodeMinipage{
 	\sourceCodeWorksheetShowScore\\
 	\sourceCodeWorksheetShowLearningTargets\\
-	\sourceCodeWorksheetShowDifficulty\\[1ex]
+	\sourceCodeWorksheetShowDifficulty\\
+	\sourceCodeWorksheetShowOccurrence\\[1ex]
 	\sourceCodeBeginExercise\spring{\%}\\{}
 	{\small[\sourceCodeScore{10}\sourceCodeEasy\sourceCodeLearningTargets{1, 2, 3}\sourceCodeOccurrence{Exam WS 2018}]}\\
 	This is an exercise written in english and described in a sentence. Maybe there is another sentence which is not enough though. This last sentence should do.\\
@@ -346,6 +351,7 @@ Defining two different exercises in two different languages:
 \worksheetShowScore
 \worksheetShowLearningTargets
 \worksheetShowDifficulty
+\worksheetShowOccurrence
 \begin{exercise}%
 [\score{10}\easy\learningtargets{1, 2, 3}\occurrence{Exam WS 2018}] This is an exercise written in english and described in a sentence. Maybe there is another sentence which is not enough though. This last sentence should do.
 \end{exercise}
@@ -375,6 +381,6 @@ to hide and
 to show worksheet header. Per default \emph{scrlayer-scrpage's} header is redefined and -- per default -- pagestyle "headings" is selected; suppress all this behaviour by calling \sourceCodeWorksheetHideHeader{} \textbf{before} {\ttfamily\aqua{\textbackslash begin}\{document\}}.\par
 
 \subsection*{Babel}
-The package worksheet redefines {\ttfamily\textbackslash selectlanguage\{...\}} keeping the original functionality plus checking the selected language's support and changing the internal language if the selected language is supported.
+The package worksheet redefines {\ttfamily\textbackslash selectlanguage\{...\}} keeping the original macro functionality plus checking the selected language's support and changing the internal language if the selected language is supported.
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/worksheet/worksheet.sty b/Master/texmf-dist/tex/latex/worksheet/worksheet.sty
index b2c8e2fe04c..aa9e7929b7c 100644
--- a/Master/texmf-dist/tex/latex/worksheet/worksheet.sty
+++ b/Master/texmf-dist/tex/latex/worksheet/worksheet.sty
@@ -6,7 +6,7 @@
 %------------------------------------------------------------------------------------------------------------%
 
 \NeedsTeXFormat{LaTeX2e}[2018]
-\ProvidesPackage{worksheet}[2018/08/08 by Benjamin Zoellner (c)2018 v1.0 This Package provides functions and an environment for easy worksheet creation]
+\ProvidesPackage{worksheet}[2018/08/08 by Benjamin Zoellner (c)2018 v1.1 This Package provides macros and an environment for easy worksheet creation]
 
 \PassOptionsToPackage{headsepline=1pt}{scrlayer-scrpage}
 \RequirePackage{scrlayer-scrpage}
@@ -21,7 +21,7 @@
 \newcounter{@worksheet@numberFound}
 \newcounter{@worksheet@numberEnded}
 
-% evil String Search Hacking using Latex-Kernel Functions \in@ & \ifin@
+% evil String Search Hacking using Latex-Kernel Macros \in@ & \ifin@
 \def\@worksheet@isInString#1#2{TT\fi\begingroup % What the f**k?!
 \edef\x{\endgroup\noexpand\in@{#1}{#2}}\x\ifin@}
 
@@ -64,18 +64,27 @@
 	\xdef\@worksheet@languageSelection@score{Maximum Score}
 	\xdef\@worksheet@languageSelection@learningTargets{Learning Targets}
 	\xdef\@worksheet@languageSelection@difficulty{Difficulty Level}
-	\xdef\@worksheet@languageSelection@easy{Easy}
-	\xdef\@worksheet@languageSelection@medium{Medium}
-	\xdef\@worksheet@languageSelection@hard{Hard}
+	\xdef\@worksheet@languageSelection@easy{easy}
+	\xdef\@worksheet@languageSelection@medium{medium}
+	\xdef\@worksheet@languageSelection@hard{hard}
+}
+\def\@worksheet@selectLanguage@french{
+	\xdef\@worksheet@languageSelection@exercise{Exercice}
+	\xdef\@worksheet@languageSelection@score{Points}
+	\xdef\@worksheet@languageSelection@learningTargets{Buts}
+	\xdef\@worksheet@languageSelection@difficulty{Difficulté}
+	\xdef\@worksheet@languageSelection@easy{facile}
+	\xdef\@worksheet@languageSelection@medium{moyen}
+	\xdef\@worksheet@languageSelection@hard{difficile}
 }
 \def\@worksheet@selectLanguage@german{
 	\xdef\@worksheet@languageSelection@exercise{Aufgabe}
 	\xdef\@worksheet@languageSelection@score{Punkte}
 	\xdef\@worksheet@languageSelection@learningTargets{Lernziele}
 	\xdef\@worksheet@languageSelection@difficulty{Schwierigkeitsgrad}
-	\xdef\@worksheet@languageSelection@easy{Leicht}
-	\xdef\@worksheet@languageSelection@medium{Mittel}
-	\xdef\@worksheet@languageSelection@hard{Schwer}
+	\xdef\@worksheet@languageSelection@easy{leicht}
+	\xdef\@worksheet@languageSelection@medium{mittel}
+	\xdef\@worksheet@languageSelection@hard{schwer}
 }
 \def\@worksheet@selectLanguage@ngerman{\@worksheet@selectLanguage@german}