3 files changed, 77 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/exsheets/README b/Master/texmf-dist/doc/latex/exsheets/README
index 0a082e1f372..9d490dd6f14 100644
--- a/Master/texmf-dist/doc/latex/exsheets/README
+++ b/Master/texmf-dist/doc/latex/exsheets/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-EXSHEETS v0.4 - 2012/11/08
+EXSHEETS v0.5 - 2012/12/02
 
 bundled packages:
 the EXSHEETS package
diff --git a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
index 16fb782c201..7676d1c0572 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 1c7fdfe63f1..9add39fd108 100644
--- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
+++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
@@ -198,7 +198,6 @@
 
 % ----------------------------------------------------------------------------
 % example definitions that have to be done in the preamble:
-\DeclareQuestionProperty{points}
 \DeclareQuestionProperty{notes}
 \DeclareQuestionProperty{reference}
 \DeclareQuestionProperty{topic}
@@ -940,9 +939,12 @@ Please be aware that the labels must be processed in a previous \LaTeX\ run befo
 
 \subsubsection{Print by \texorpdfstring{\acs{id}}{ID}}\label{ssec:ids}\secidx[print!by ID]{solutions}
 Now comes the best part: you can also print selected solutions! Every question
-has an \acs{id}. To see which \acs{id} a question has you can call the following command:
+has an \acs{id}. To see which \acs{id} a question has you can call the following
+command:
 \begin{beschreibung}
  \Befehl{DebugExSheets}{true|false}
+ \befehl{CurrentQuestionID} \sinceversion{0.4a}expands to the current question
+   \acs{id} (after two expansions).
 \end{beschreibung}
 Let's create some more questions and take a look what this command does:
 \begin{beispiel}
@@ -1057,14 +1059,16 @@ Now the commands for recovering the properties:
    Of course the property must have been declared before.
 \end{beschreibung}
 
-Let's say we have declared the properties \code{points}, \code{notes}, \code{reference}
-and \code{topic}. Then we can do the following:
+Let's say we have declared the properties \code{notes}, \code{reference}
+and \code{topic}. By default the property \code{points} is available and gets the
+value of the optional argument of the \code{question} environment.
+
+We can now do the following:
 \begin{beispiel}
  % uses `biblatex'
  \begin{question}[ID=center,topic=LaTeX]{3}
   Explain how you could center text in a \LaTeX\ document.
   \SetQuestionProperties{
-    points    = 3,
     topic     = \TeX/\LaTeX ,
     notes     = {How to center text.},
     reference = {\textcite{companion}}}
@@ -1078,7 +1082,6 @@ and \code{topic}. Then we can do the following:
  \begin{question}[ID=knuthbooks,topic=LaTeX]{2}
   Name two books by D.\,E.\,Knuth.
   \SetQuestionProperties{
-    points    = 2,
     topic     = \TeX/\LaTeX ,
     notes     = {Books by Knuth.},
     reference = {\textcite{knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e}}}
@@ -1549,6 +1552,7 @@ of their usage. The options are listed in the definition for the template interf
  \DeclareTemplateInterface{exsheets-heading}{default}{3}
   {
     % option         : type      = default
+    inline           : boolean   = false ,
     runin            : boolean   = false ,
     indent-first     : boolean   = false ,
     toc-reversed     : boolean   = false ,
@@ -1752,6 +1756,7 @@ available through the option \key{headings}{<instance>}.
  A `block-nr-wp' heading. \sample
 \end{question}
 
+\newpage% FIXME
 \subsubsection{The `runin-rev' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{runin-rev}{default}
@@ -1793,6 +1798,7 @@ available through the option \key{headings}{<instance>}.
  A `runin-wp' heading. \sample
 \end{question}
 
+\newpage% FIXME
 \subsubsection{The `runin-wp-rev' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{runin-wp-rev}{default}
@@ -1814,7 +1820,6 @@ available through the option \key{headings}{<instance>}.
  A `runin-wp-rev' heading. \sample
 \end{question}
 
-\newpage
 \subsubsection{The `runin-nr' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{runin-nr}{default}
@@ -1868,6 +1873,70 @@ available through the option \key{headings}{<instance>}.
  A `runin-nr-wp' heading. \sample
 \end{question}
 
+\subsubsection{The `inline' Instance}
+\sinceversion{0.5}
+\begin{beispiel}[code only]
+ \DeclareInstance{exsheets-heading}{inline}{default}
+  {
+    inline           = true ,
+    number-pre-code  = \space ,
+    number-post-code = \space ,
+    join             =
+      {
+        main[r,vc]title[r,vc](0pt,0pt) ;
+        main[r,vc]number[l,vc](0pt,0pt)
+      }
+  }
+\end{beispiel}
+\SetupExSheets{headings=inline}
+Text before
+\begin{question}{1}
+ An `inline' heading. \sample
+\end{question}
+ Text after
+
+\subsubsection{The `inline-wp' Instance}
+\sinceversion{0.5}
+\begin{beispiel}[code only]
+ \DeclareInstance{exsheets-heading}{inline-wp}{default}
+  {
+    inline           = true ,
+    number-pre-code  = \space ,
+    number-post-code = \space ,
+    points-pre-code  = ( ,
+    points-post-code = )\space ,
+    join             =
+      {
+        main[r,vc]title[r,vc](0pt,0pt) ;
+        main[r,vc]number[l,vc](0pt,0pt) ;
+        main[r,vc]points[l,vc](0pt,0pt)
+      }
+  }
+\end{beispiel}
+\SetupExSheets{headings=inline-wp}
+Text before
+\begin{question}{1}
+ An `inline-wp' heading. \sample
+\end{question}
+ Text after
+
+\subsubsection{The `inline-nr' Instance}
+\sinceversion{0.5}
+\begin{beispiel}[code only]
+ \DeclareInstance{exsheets-heading}{inline-nr}{default}
+  {
+    inline           = true ,
+    number-post-code = \space ,
+    join             = { main[r,vc]number[l,vc](0pt,0pt) }
+  }
+\end{beispiel}
+\SetupExSheets{headings=inline-nr}
+Text before
+\begin{question}{1}
+ An `inline-nr' heading. \sample
+\end{question}
+ Text after
+
 \subsubsection{The `centered' Instance}
 \begin{beispiel}[code only]
  \DeclareInstance{exsheets-heading}{centered}{default}