exsheets (27sep19)

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

5 files changed, 20 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets-listings.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets-listings.sty
index 8e77c4aff43..40d20de90cb 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets-listings.sty
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets-listings.sty
@@ -8,7 +8,7 @@
 % Web:    https://bitbucket.org/cgnieder/exsheets/
 % E-Mail: contact@mychemistry.eu
 % ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -138,7 +138,7 @@
 
 \NewLstQuSolPair{lstquestion}{question}{lstsolution}{solution}
 
-\tex_endinput:D
+\file_input_stop:
 
 HISTORY
 2013/09/18 - first draft, see http://tex.stackexchange.com/a/133969/5049
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
index 73136dadac1..b323a8cc4eb 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
@@ -8,7 +8,7 @@
 % Web:    http://www.mychemistry.eu/forums/forum/exsheets
 % E-Mail: contact@mychemistry.eu
 % ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -28,8 +28,8 @@
 \RequirePackage { expl3 , xparse }
 \ExplSyntaxOn
 
-\tl_const:Nn \c_exsheets_date_tl    {2017/02/08}
-\tl_const:Nn \c_exsheets_version_tl {0.21i}
+\tl_const:Nn \c_exsheets_date_tl    {2019/09/27}
+\tl_const:Nn \c_exsheets_version_tl {0.21j}
 \tl_const:Nn \c_exsheets_info_tl
   {Yet~ another~ package~ for~ the~ creation~ of~ exercise~ sheets~ and~ exams.}
 
@@ -118,7 +118,7 @@
   }
 
 \msg_new:nnn {exsheets} {loading-configurations}
-  { Loading~ custom~ configurations~ file~ `exsheets_configurations.cgf'. }
+  { Loading~ custom~ configurations~ file~ `exsheets_configurations.cfg'. }
 
 \msg_new:nnn {exsheets} {deprecated-command}
   {
@@ -2489,9 +2489,9 @@
             =
           \use:c { l__exsheets_counter_#1_int }
         }
-      &&
-      !\int_compare_p:n
-        { \use:c { l__exsheets_counter_#1_int } = 0 }
+      % &&
+      % !\int_compare_p:n
+      %   { \use:c { l__exsheets_counter_#1_int } = 0 }
     }
     {#2}
   }
@@ -2752,7 +2752,7 @@
       { \exsheets_write_blank:n {#1} }
       {
         \bool_if:NTF \l__exsheets_blank_width_bool
-          { \__exsheets_blank_skip:N \l__exsheets_blank_dim }
+          { \__exsheets_blank_skip:V \l__exsheets_blank_dim }
           {
             \__exsheets_blank_skip:n
               { \box_wd:N \l__exsheets_blank_box }
@@ -2760,7 +2760,7 @@
       }
   }
   
-\cs_new_protected:Npn \__exsheets_blank_skip:N #1
+\cs_new_protected:Npn \__exsheets_blank_skip:n #1
   {
     \bool_if:NTF \l__exsheets_blank_width_bool
       { \dim_set:Nn \l__exsheets_tmpa_dim {#1} }
@@ -2791,7 +2791,7 @@
       }
       { \exsheets_write_blank:n { \skip_horizontal:N \l__exsheets_tmpa_dim } }
   }
-\cs_generate_variant:Nn \__exsheets_blank_skip:N { n }
+\cs_generate_variant:Nn \__exsheets_blank_skip:n { V }
 
 % the following code from Heiko Oberdieck in d.c.t.t served as inspiration
 % and basis for the \blank command:
@@ -2965,7 +2965,7 @@
       }
   }
 
-\tex_endinput:D
+\file_input_stop:
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 HISTORY:
@@ -3224,6 +3224,7 @@ HISTORY:
 2016/10/25 v0.21g      - smaller steps when creating the blank lines
 2016/11/28 v0.21h      - bug in \exsheets@used@id fixed
 2017/02/08 v0.21i      - adapt to l3sort integration into l3kernel
+2019/09/27 v0.21j      - fix bug #44
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO:
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_configurations.cfg b/Master/texmf-dist/tex/latex/exsheets/exsheets_configurations.cfg
index e5f7eb0046c..9af630de96b 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets_configurations.cfg
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_configurations.cfg
@@ -5,10 +5,10 @@
 % 
 % ----------------------------------------------------------------------------
 % Clemens Niederberger
-% Web:    http://www.mychemistry.eu/forums/forum/exsheets
+% Web:    https://bitbucket.org/cgnieder/exsheets/
 % E-Mail: contact@mychemistry.eu
 % ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg
index 3badcdbbf44..856601f095f 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg
@@ -8,7 +8,7 @@
 % Web:    https://bitbucket.org/cgnieder/exsheets/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -358,4 +358,4 @@
     attach           = { main[hc,vc] number[hc,vc] (0pt,0pt) }
   }
 
-\tex_endinput:D
+\file_input_stop:
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
index e7100ce4d63..a003c966879 100644
--- a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
+++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def
@@ -8,7 +8,7 @@
 % Web:    https://bitbucket.org/cgnieder/exsheets/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -471,4 +471,4 @@
       }
   }
 
-\tex_endinput:D
+\file_input_stop: