From 5ad29c6111edb313f812d6d1cd4c9cfb6c46559a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 May 2020 22:31:49 +0000 Subject: exercises (18may20) git-svn-id: svn://tug.org/texlive/trunk@55188 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/exercises/README.md | 2 +- .../texmf-dist/doc/latex/exercises/exercises.pdf | Bin 414151 -> 420909 bytes .../source/latex/exercises/exercises.dtx | 68 +++++++++++++++++++-- .../source/latex/exercises/exercises.ins | 4 +- .../texmf-dist/tex/latex/exercises/exercises.sty | 6 +- 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/exercises/README.md b/Master/texmf-dist/doc/latex/exercises/README.md index 037dc5c6c3d..42dfb37fe72 100644 --- a/Master/texmf-dist/doc/latex/exercises/README.md +++ b/Master/texmf-dist/doc/latex/exercises/README.md @@ -2,7 +2,7 @@ This is the distribution directory for exercises, a LaTeX package to typeset exe The package allows you to customize the layout of those environments. The optional points in exercises can be added automatically. In addition you’re able to hide the solutions. -This is exercises version 1.0, 19 September 2015. exercises is distributed +This is exercises version 1.1, 17 Mai 2020. exercises is distributed under the LaTeX Project Public License (LPPL). diff --git a/Master/texmf-dist/doc/latex/exercises/exercises.pdf b/Master/texmf-dist/doc/latex/exercises/exercises.pdf index 646c3a38beb..f28241e411e 100644 Binary files a/Master/texmf-dist/doc/latex/exercises/exercises.pdf and b/Master/texmf-dist/doc/latex/exercises/exercises.pdf differ diff --git a/Master/texmf-dist/source/latex/exercises/exercises.dtx b/Master/texmf-dist/source/latex/exercises/exercises.dtx index d818e495e6d..4ec2313f34e 100644 --- a/Master/texmf-dist/source/latex/exercises/exercises.dtx +++ b/Master/texmf-dist/source/latex/exercises/exercises.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2015 by Roger Jud +% Copyright (C) 2000 by Roger Jud % ------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{exercises}[2015/09/19 v1.0 .dtx exercises file] +%\ProvidesPackage{exercises}[2000/05/17 v1.1 .dtx exercises file] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -29,7 +29,7 @@ filecolor=black,% linkcolor=black,% urlcolor=black,% } -\usepackage[printsolution=true]{exercises}[2015/09/19] +\usepackage[printsolution=true]{exercises}[2000/05/17] \usepackage[utf8]{inputenc} \usepackage[english]{babel} \usepackage{amsmath} @@ -71,6 +71,7 @@ urlcolor=black,% % % % \changes{v1.0}{2015/09/19}{Initial version} +% \changes{v1.1}{2000/05/17}{Add the command ifsolutionthenelse} % % \GetFileInfo{exercises.sty} % @@ -312,11 +313,55 @@ Sum of points: \totalpoints % % % +% \subsection{Print text depending on wether the solution is printed or not} +% With the command |\ifsolutionthenelse{}{}| you can print text depending on wether the solution is printed or not. % -% +% \iffalse +%<*example> +% \fi +\begin{latexcode} +\usepackage[printsolution=true]{exercises} +\ifsolutionthenelse{% + \subsection*{This is the header for the solutions}% + }% + {% + \subsection*{This is the header for the exercises}% + } +\end{latexcode} +% \iffalse +% +% \fi +% +% \emph{produces} +% +% \subsection*{This is the header for the solutions} +% +% +% \emph{while} % % % +% +% \iffalse +%<*example> +% \fi +\begin{latexcode} +\usepackage[printsolution=false]{exercises} +\ifsolutionthenelse{% + \subsection*{This is the header for the solutions}% + }% + {% + \subsection*{This is the header for the exercises}% + } +\end{latexcode} +% \iffalse +% +% \fi +% +% \emph{produces} +% +% \subsection*{This is the header for the exercises} +% % \StopEventually{\PrintChanges} % % \section[Implementation]{Implementation -- how I've done it (only in German)} @@ -923,7 +968,7 @@ Sum of points: \totalpoints % % \begin{macro}{\exercisenewpage} % \begin{macro}{\solutionnewpage} -% Die Befehle |exercisenewpage| und |solutionnewpage| erlauben es, einen Seitenumbruch in abhängigkeit der Lösungsausgabe einzufügen. +% Die Befehle |exercisenewpage| und |solutionnewpage| erlauben es, einen Seitenumbruch in Abhängigkeit der Lösungsausgabe einzufügen. % \begin{macrocode} \newcommand{\exercisenewpage}{\ifthenelse{\boolean{exercises@printsolution}}{}{\newpage}} % \end{macrocode} @@ -933,6 +978,19 @@ Sum of points: \totalpoints % \end{macrocode} % \end{macro} % \end{macro} +% +% +% +% \subsection{Befehl für die bedingte Textausgabe} +% +% \begin{macro}{\ifsolutionthenelse} +% Der Befehl |ifsolutionthenelse{}{}| erlaubt es, Text in Abhängigkeit der Lösungsausgabe auszugeben. +% \begin{macrocode} +\newcommand{\ifsolutionthenelse}[2]{\ifthenelse{\boolean{exercises@printsolution}}{#1}{#2}} +% \end{macrocode} +% +% \end{macro} + % % \Finale \endinput diff --git a/Master/texmf-dist/source/latex/exercises/exercises.ins b/Master/texmf-dist/source/latex/exercises/exercises.ins index 355319f2e6c..114e9e6cf0f 100644 --- a/Master/texmf-dist/source/latex/exercises/exercises.ins +++ b/Master/texmf-dist/source/latex/exercises/exercises.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2015 by Roger Jud +%% Copyright (C) 2020 by Roger Jud %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.2 of this license @@ -21,7 +21,7 @@ This is a generated file. -Copyright (C) 2015 by Roger Jud +Copyright (C) 2020 by Roger Jud This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.2 of this license diff --git a/Master/texmf-dist/tex/latex/exercises/exercises.sty b/Master/texmf-dist/tex/latex/exercises/exercises.sty index aca3fede546..8c2caa74f34 100644 --- a/Master/texmf-dist/tex/latex/exercises/exercises.sty +++ b/Master/texmf-dist/tex/latex/exercises/exercises.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2015 by Roger Jud +%% Copyright (C) 2020 by Roger Jud %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.2 of this license @@ -21,7 +21,7 @@ %% 1999/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{exercises}[2015/09/19 v1.0 .dtx exercises file] +\ProvidesPackage{exercises}[2000/05/17 v1.1 .dtx exercises file] \RequirePackage{verbatim} \RequirePackage{ifthen} \RequirePackage{kvoptions} @@ -195,6 +195,8 @@ }% \newcommand{\exercisenewpage}{\ifthenelse{\boolean{exercises@printsolution}}{}{\newpage}} \newcommand{\solutionnewpage}{\ifthenelse{\boolean{exercises@printsolution}}{\newpage}{}} +\newcommand{\ifsolutionthenelse}[2]{\ifthenelse{\boolean{exercises@printsolution}}{#1}{#2}} + \endinput %% %% End of file `exercises.sty'. -- cgit v1.2.3