exsheets (6dec12)

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

1 files changed, 25 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
index 4d3c3481917..772c760b610 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
@@ -31,8 +31,8 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % ----------------------------------------------------------------------------
-\def\exsheets@date{2012/12/02}
-\def\exsheets@version{0.5}
+\def\exsheets@date{2012/12/06}
+\def\exsheets@version{0.5a}
 
 \RequirePackage { expl3 , xparse }
 \ProvidesExplPackage
@@ -63,9 +63,10 @@
 
 \msg_new:nnn { exsheets} { headings }
   {
-    You~requested~the~headings~instance~`#1'~which~is~not~defined.~Did~you~
-    forget~to~use~the~package~option~`load-headings'?~Anyway,~I~will~use~the~
-    instance~`block'~instead~and~pretend~nothing~happened.
+    You~requested~the~headings~instance~`#1'~\msg_line_context: \c_space_tl
+    which~is~not~defined.~Did~you~forget~to~use~the~package~option~
+    `load-headings'?~Anyway,~I~will~use~the~instance~`block'~instead~and~
+    pretend~nothing~happened.
   }
 
 \msg_new:nnn { exsheets } { random }
@@ -949,10 +950,7 @@
             ( !\g__exsheets_use_classes_bool && !\g__exsheets_use_topics_bool )
           }
           { \refstepcounter{question} }
-        \cs_if_exist:NT \chapter
-          { \int_set:Nn \l__exsheets_counter_ch_int { \arabic{chapter} } }
-        \int_set:Nn \l__exsheets_counter_sec_int { \arabic{section} }
-        \int_set:Nn \l__exsheets_counter_qu_int { \arabic{question} }
+        \__exsheets_get_sectioning_numbers:
         \bool_if:nT
           {
             (
@@ -1455,6 +1453,7 @@
     \bool_if:NT \l__exsheets_solutions_print_here_bool
       {
         \int_set:Nn \l__exsheets_counter_qu_int { \arabic{question} }
+        \__exsheets_get_sectioning_numbers:
         \__exsheets_solutions_name:VV
           \l__exsheets_qu_counter_interpretation_tl
           \l__exsheets_solutions_name_tl
@@ -1509,6 +1508,12 @@
 
 \cs_new_nopar:Npn \__exsheets_solutions_name:nn #1#2
   {
+    \tl_if_blank:VT \l__exsheets_solution_heading_instance_tl
+      {
+        \tl_set_eq:NN
+          \l__exsheets_solution_heading_instance_tl
+          \l__exsheets_heading_instance_tl
+      }
     \__exsheets_use_heading:Vnnnn
       \l__exsheets_solution_heading_instance_tl
       { #2 } { #1 } { 0 } { 0 }
@@ -1604,6 +1609,14 @@
 \int_new:N \l__exsheets_counter_sec_int
 \int_new:N \l__exsheets_counter_qu_int
 
+\cs_new:Npn \__exsheets_get_sectioning_numbers:
+  {
+    \cs_if_exist:NT \chapter
+      { \int_set:Nn \l__exsheets_counter_ch_int { \arabic{chapter} } }
+    \int_set:Nn \l__exsheets_counter_sec_int { \arabic{section} }
+    \int_set:Nn \l__exsheets_counter_qu_int { \arabic{question} }
+  }
+
 \cs_new:Npn \__exsheets_print_solution_if:nn #1#2
   {
     \exp_args:No \int_compare:nT { #2 }
@@ -2237,10 +2250,11 @@ HISTORY:
                          now no unwanted skip and no overfull hbox is produced
                        - env {task} now supports inner environments
 2012/12/02 v0.5        - added \CurrentQuestionID
+2012/12/06 v0.5a       - bug fix: solutions had wrong numbers with
+                         counter-format=se.qu and [print] option
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO:
 - points/decimal-marker, points/frac (?), points/format (?,im interface)
 - bug in {tasks} in {solution}: label werden nicht richtig upgedatet!
-- add possibility to choose different headings instances for questions and
-  solutions
\ No newline at end of file
+- bug: counter-format=se.qu und \begin{solution}[print]
\ No newline at end of file