From df84dac3a029b2a89061bd8ea322e33b2e64879f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Jan 2013 22:29:56 +0000 Subject: exsheets (7jan13) git-svn-id: svn://tug.org/texlive/trunk@28760 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/exsheets/README | 4 ++-- .../texmf-dist/doc/latex/exsheets/exsheets_en.pdf | Bin 654042 -> 654046 bytes .../texmf-dist/doc/latex/exsheets/exsheets_en.tex | 2 +- Master/texmf-dist/tex/latex/exsheets/exsheets.sty | 19 ++++++++++++------- .../tex/latex/exsheets/exsheets_headings.cfg | 2 +- .../tex/latex/exsheets/exsheets_headings.def | 2 +- .../tex/latex/exsheets/exsheets_tasks.cfg | 2 +- .../tex/latex/exsheets/exsheets_tasks.def | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Master/texmf-dist/doc/latex/exsheets/README b/Master/texmf-dist/doc/latex/exsheets/README index 6e757340b4d..7c9d557ddf5 100644 --- a/Master/texmf-dist/doc/latex/exsheets/README +++ b/Master/texmf-dist/doc/latex/exsheets/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -EXSHEETS v0.6a - 2012/12/23 +EXSHEETS v0.6b - 2013/01/06 bundled packages: the EXSHEETS package @@ -15,7 +15,7 @@ Clemens Niederberger Web: https://bitbucket.org/cgnieder/exsheets/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2012 Clemens Niederberger +Copyright 2011-2013 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/doc/latex/exsheets/exsheets_en.pdf b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf index c45db3ede3d..64a94e6559f 100644 Binary files a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf and b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex index 25dd1be0929..9147ad61bda 100644 --- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex +++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex @@ -12,7 +12,7 @@ % Web: https://bitbucket.org/cgnieder/exsheets/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2012 Clemens Niederberger +% Copyright 2011-2013 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.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty index d6dc571d378..7c939d9de03 100644 --- a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty +++ b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/exsheets/ % E-Mail: contact@mychemistry.eu % ---------------------------------------------------------------------------- -% Copyright 2011-2012 Clemens Niederberger +% Copyright 2011-2013 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -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/23} -\def\exsheets@version{0.6a} +\def\exsheets@date{2013/01/06} +\def\exsheets@version{0.6b} \RequirePackage { expl3 , xparse } \ProvidesExplPackage @@ -1356,8 +1356,8 @@ { \cs_new:Npn \prop_length:N #1 { - \prop_length:NN #1 \l__exsheets_tmpa_int - \int_use:N \l__exsheets_tmpa_int + \prop_length:NN #1 \l_tmpa_int + \int_use:N \l_tmpa_int } } @@ -1384,6 +1384,11 @@ { \bool_set_true:N \l__exsheets_questions_deactivate_bool \file_input_if_exist:n { ##1 } + \prop_length:NN + \g__exsheets_selected_questions_prop + \l__exsheets_tmpa_int + \int_gsub:Nn \g__exsheets_questions_id_int + { \l__exsheets_tmpa_int } \bool_if:NT \l__exsheets_questions_debug_bool { \colorbox { exsheetsdebugcolor } @@ -1437,7 +1442,6 @@ \cs_new:Npn \__exsheets_select_question_by_id:n #1 { -% \clist_show:N \l__exsheets_include_id_clist \clist_if_in:NnTF \l__exsheets_include_id_clist { #1 } @@ -1445,6 +1449,7 @@ { \bool_gset_false:N \g__exsheets_questions_use_bool } } +% TODO: don't select questions whose topics or classes aren't chosen \cs_new:Npn \__exsheets_select_question_random:n #1 { \bool_if:NT \l__exsheets_include_random_bool @@ -2359,7 +2364,7 @@ HISTORY: translations 2012/12/23 v0.6a - bug fix: labels and items of {tasks} weren't joined at their baselines - +2013/01/06 v0.6b - bug fix: ID counting fixed in \includequestions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % TODO: diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.cfg index 5d195010c8b..bb60744ab98 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-2012 Clemens Niederberger +% Copyright 2011-2013 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.def b/Master/texmf-dist/tex/latex/exsheets/exsheets_headings.def index 7c1637de0a5..f81c8e4344d 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-2012 Clemens Niederberger +% Copyright 2011-2013 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_tasks.cfg b/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.cfg index 54de030795b..b99fdda993f 100644 --- a/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.cfg +++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.cfg @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/exsheets/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2012 Clemens Niederberger +% Copyright 2011-2013 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_tasks.def b/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.def index e5f9faf8311..facab8e6553 100644 --- a/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.def +++ b/Master/texmf-dist/tex/latex/exsheets/exsheets_tasks.def @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/exsheets/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2012 Clemens Niederberger +% Copyright 2011-2013 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 -- cgit v1.2.3