exsheets (10apr13)

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

3 files changed, 97 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/latex/exsheets/README b/Master/texmf-dist/doc/latex/exsheets/README
index 8bf29bafce0..02c40c8c448 100644
--- a/Master/texmf-dist/doc/latex/exsheets/README
+++ b/Master/texmf-dist/doc/latex/exsheets/README
@@ -1,14 +1,14 @@
 --------------------------------------------------------------------------
-EXSHEETS v0.8a - 2013/04/04
+EXSHEETS v0.9a - 2013/04/08
 
 bundled packages:
 the EXSHEETS package
   Yet another package for the creation of exercise sheets
-the TRANSLATIONS package v0.8a
+the TRANSLATIONS package v0.9a
   a simple translator
 the CNTFORMATS package v0.4
   A different way to read counters.
-the TASKS package v0.8a
+the TASKS package v0.9
   Horizontal columned lists.
 
 All mentioned packages are described in exsheets_en.pdf
diff --git a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
index fe8fc148d19..f459bbf0559 100644
--- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
+++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
diff --git a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
index dc93fd78468..6d2ff8a691d 100644
--- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
+++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
@@ -105,9 +105,9 @@
   lastvariant, midrule, NewQuSolPair, numberofquestions,
   points, PrintIfIncludeActiveF, PrintIfIncludeActiveT, PrintIfIncludeActiveTF,
     printsolutions, PrintSolutionsF, PrintSolutionsTF, PrintSolutionsT,
-  questionsincludedlast, QuestionNumber, RenewQuSolPair, rightarrow,
+  questionsincludedlast, QuestionNumber, RenewQuSolPair, rightarrow, rlap,
   s, sample, setlength, SetQuestionProperties, SetupExSheets, SetVariations,
-    spacing, square, sumpoints,
+    spacing, square, startnewitemline, sumpoints,
   tabcolsep, textcite, textcolor, toprule, totalpoints,
   variant, vary
 }
@@ -1398,14 +1398,16 @@ following macro:
 \secidx*{Include from External Files}
 
 \section{Own Question/Solution Pairs}
-\noindent\sinceversion{0.3}\ExSheets provides he possibility to create new
+\noindent\changedversion{0.9}\ExSheets provides he possibility to create new
 environments that behave like the \code{question} and \code{solution} environments.
 This would allow, for example, to define a \code{question*}/\code{solution*}
 environment pair for bonus questions. The following commands may be used in the
 document preamble:
 \begin{beschreibung}
- \Befehl{NewQuSolPair}{<question>}\oa{<question options>}\ma{<solution>}\oa{<solution options>}
- \Befehl{RenewQuSolPair}{<question>}\oa{<question options>}\ma{<solution>}\oa{<solution options>}
+ \Befehl{NewQuSolPair}{<question>}\oa{<question options>}\oa{<general options>}%
+   \ma{<solution>}\oa{<solution options>}\oa{<general options>}
+ \Befehl{RenewQuSolPair}{<question>}\oa{<question options>}\oa{<general options>}%
+   \ma{<solution>}\oa{<solution options>}\oa{<general options>}
 \end{beschreibung}
 The standard environments are defined as follows:
 \begin{beispiel}[code only]
@@ -1447,7 +1449,8 @@ be some more lines: \blank[width=5\linewidth]{}
 The options are these:
 \begin{beschreibung}
  \Option[blank]{style}{line|wave|dline|dotted|dashed}\Default{line}
-   The style of the line.
+   The style of the line. This uses the corresponding command from the \paket{ulem}
+   package and is the whole reason why \ExSheets loads it in the first place.
  \Option[blank]{scale}{<num>}\Default{1}
    Scales the width of the blank by factor \code{<num>} unless the width is
    explicitly set.
@@ -1664,6 +1667,23 @@ The following examples use a sample text defined as follows:
  A `simple' heading. \sample
 \end{question}
 
+\subsubsection{The `empty' Instance}
+\sinceversion{0.9a}
+\begin{beispiel}[code only]
+ \DeclareInstance{exsheets-heading}{empty}{default}
+  {
+    runin = true ,
+    above = \parskip ,
+    below = \parskip ,
+    attach           =
+      { main[l,vc] points[l,vc] (\linewidth + \marginparsep,0pt) } 
+  }
+\end{beispiel}
+\SetupExSheets{headings=empty}
+\begin{question}{1}
+ An `empty' heading. \sample
+\end{question}
+
 \subsubsection{The `block-rev' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{block-rev}{default}
@@ -1737,7 +1757,6 @@ The following examples use a sample text defined as follows:
  A `block-nr' heading. \sample
 \end{question}
 
-\newpage% FIXME
 \subsubsection{The `block-nr-wp' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{block-nr-wp}{default}
@@ -1868,7 +1887,6 @@ The following examples use a sample text defined as follows:
  A `runin-nr-wp' heading. \sample
 \end{question}
 
-\newpage% FIXME
 \subsubsection{The `inline' Instance}
 \sinceversion{0.5}
 \begin{beispiel}[code only]
@@ -1916,7 +1934,6 @@ Text before
 \end{question}
  Text after
 
-\newpage% FIXME
 \subsubsection{The `inline-nr' Instance}
 \sinceversion{0.5}
 \begin{beispiel}[code only]
@@ -2107,6 +2124,7 @@ primarily is for. If you don't need this feature you're better off using traditi
 part~\ref{part:cntformats}}, \paket{xtemplate} and \paket{environ}.
 
 \section{How it works}
+\subsection{The Basics}
 The \code{tasks} environment is similar to a list like \code{enumerate} but not
 the same:
 \begin{itemize}
@@ -2162,7 +2180,41 @@ number of columns used by the environment is specified.
  \task \sample
  \task \s\par\s
 \end{tasks}
- 
+
+\subsection{Introducing a New Row}
+\noindent\sinceversion{0.9}Sometimes it may come in handy if the current
+row of items could be terminated and a new one is started. This is possible
+with the following command:
+\begin{beschreibung}
+ \Befehl{startnewitemline}
+\end{beschreibung}
+\begin{beispiel}[code only]
+ \begin{tasks}(4)
+  \task the first
+  \task the second
+  \task the third
+  \task the fourth
+  \task \rlap{the fifth item is way too long for this so we start a new row} \startnewitemline
+  \task the sixth
+  \task the seventh
+  \task \rlap{the eighth item also is too long} \startnewitemline
+  \task the nineth
+  \task the tenth
+ \end{tasks}
+\end{beispiel}
+\begin{tasks}(4)
+ \task the first
+ \task the second
+ \task the third
+ \task the fourth
+ \task \rlap{the fifth item is way too long for this so we start a new row} \startnewitemline
+ \task the sixth
+ \task the seventh
+ \task \rlap{the eighth item also is too long} \startnewitemline
+ \task the nineth
+ \task the tenth
+\end{tasks}
+
 \section{Available Options}\secidx[Options]{\Tasks}[tasks]\label{sec:tasks:options}
 The \Tasks package has one package option which also is called when you load
 \ExSheets with the \key{load-tasks} option.
@@ -2176,15 +2228,20 @@ The environment itself has some more options, namely these:
 \begin{beschreibung}
  \Option{style}{<instance>}\Default{}
    Choose the instance to be used. Read more on this in section~\ref{sec:tasks}.
- \Option{label}{<label specs>}\Default{}
-   Sets a custom label. The letters \code{tsk} are replaced with the task-counter.
-   An optional argument directly following these letters specifies the counter format:
-   \code{1}: \cmd{arabic}, \code{a}: \cmd{alph}, \code{A}: \cmd{Alph}, \code{r}:
-   \cmd{roman} and \code{R}: \cmd{Roman}.
- \Option{label-width}{<dim>}\Default{3ex}
+ \Option{counter-format}{<counter specs>}\Default{}
+   \sinceversion{0.9}Sets a custom label. The letters \code{tsk} are replaced
+   with the task-counter. An optional argument directly following these letters
+   specifies the counter format: \code{1}: \cmd{arabic}, \code{a}: \cmd{alph},
+   \code{A}: \cmd{Alph}, \code{r}: \cmd{roman} and \code{R}: \cmd{Roman}.
+ \Option{label-format}{<code>}\Default{}
+   \changedversion{0.9}Can be used to apply a formatting like, \emph{e.g.},
+   \cmd*{bfseries} to the labels.
+ \Option{label}{<code>}\Default{}
+   \changedversion{0.9}Overwrite the automatic label to a custom one.
+ \Option{label-width}{<dim>}\Default{1em}
    Sets the width of the item labels.
- \Option{label-offset}{<dim>}\Default{1ex}
-   \sinceversion{0.7}Sets the offset, i.e., the distance between label and item.
+ \Option{label-offset}{<dim>}\Default{.3333em}
+   \sinceversion{0.7}Sets the offset, \emph{i.e.}, the distance between label and item.
  \Option{label-align}{left|right|center}\Default{left}
    \sinceversion{0.7}Determines how the labels are aligned within the label-box
    whose width is set with \key{label-width}
@@ -2192,6 +2249,8 @@ The environment itself has some more options, namely these:
    Sets the skip before the list.
  \Option{after-skip}{<skip>}\Default{0pt}
    Sets the skip after the list.
+ \Option{after-item-skip}{<skip>}\Default{1ex plus 1ex minus 1ex}
+   \sinceversion{0.9}This vertical skip is inserted between rows of items.
  \Option{resume}{\default{true}|false}\Default{false}
    The enumeration will resume from a previous \code{tasks} environment. In order
    to use this option properly you shouldn't mix different \code{tasks} environments
@@ -2204,7 +2263,7 @@ These options can also be set using a setup command:
 
 Now the same list as above but with three columns and a different label:
 \begin{beispiel}[code only]
- \begin{tasks}[label=(tsk[r]),label-width=4ex](3)
+ \begin{tasks}[counter-format=(tsk[r]),label-width=4ex](3)
   \task \sample
   \task \s\ \s
   \task \s
@@ -2212,7 +2271,7 @@ Now the same list as above but with three columns and a different label:
   \task \s\par\s
  \end{tasks}
 \end{beispiel}
-\begin{tasks}[label=(tsk[r]),label-width=4ex](3)
+\begin{tasks}[counter-format=(tsk[r]),label-width=4ex](3)
  \task \sample
  \task \s\ \s
  \task \s
@@ -2225,7 +2284,7 @@ Let's use it inside a question:
  % since settings are local the following ones will be lost
  % outside this example; see the appendix how the solution
  % appears there
- \settasks{label=qu.tsk,label-width=5ex}
+ \settasks{counter-format=qu.tsk,label-width=5ex}
  \begin{question}[type=exam]{4}
   I have these two tasks for you. Shall we begin?
   \begin{tasks}(2)
@@ -2286,6 +2345,8 @@ It is possible to add custom environments that work like the \code{tasks} enviro
    new item. Default for \code{<separator>} is \cmd{task}, default for
    \code{<cols>} is \code{1}. The \code{<options>} are the ones described in
    section~\ref{sec:tasks:options}.
+ \Befehl{RenewTasks}[<options>]{<name>}\oa{<separator}\da{<cols>}\newline
+   Renew environment previously defined with \cmd{NewTasks}.
 \end{beschreibung}
 The \code{tasks} environment is defined as follows:
 \begin{beispiel}[code only]
@@ -2296,7 +2357,7 @@ The separator does not have to be a control sequence:
 \begin{beispiel}
  % preamble:
  % \usepackage{dingbat}
- \NewTasks[label=\footnotesize\leftthumbsup]{done}[*]
+ \NewTasks[label=\footnotesize\leftthumbsup,label-width=1.3em]{done}[*]
  \begin{done}
   * First task
   * Second Task
@@ -2358,9 +2419,10 @@ of their usage.
     enumerate       : boolean   = true    ,
     label           : tokenlist           ,
     indent          : length    = 2.5em   ,
-    label-format    : tokenlist = tsk[a]) ,
-    label-width     : length    = 3ex     ,
-    label-offset    : length    = 1ex     ,
+    counter-format  : tokenlist = tsk[a]) ,
+    label-format    : tokenlist           ,
+    label-width     : length    = 1em     ,
+    label-offset    : length    = .3333em ,
     after-item-skip : skip      = 1ex plus 1ex minus 1ex
   }
 \end{beispiel}
@@ -2373,15 +2435,18 @@ This is rather brief this time:
  % available when `load-tasks=true':
  % ITEMIZE:
  \DeclareInstance{tasks}{itemize}{default}
-   { enumerate    = false }
+   {
+     enumerate   = false ,
+     label-width = 1.125em
+   }
  % ENUMERATE:
  \DeclareInstance{tasks}{enumerate}{default}
-   { label-format = tsk. }
+   { counter-format = tsk. }
  % MULTIPLECHOICE:
  \DeclareInstance{tasks}{multiplechoice}{default}
    {
-     enumerate    = false       ,
-     label        = \choicebox  ,
+     enumerate = false       ,
+     label     = \choicebox  ,
    }
 \end{beispiel}
 \secidx*{The `tasks' Object}