summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-02-18 23:54:20 +0000
committerKarl Berry <karl@freefriends.org>2013-02-18 23:54:20 +0000
commitcdbdc383307e5585391076143f1a790aeacc220f (patch)
treea3e871fe7b71b22ebd83570d7886bae823bbefae
parent1f1d4332f1e59e5e4f7c988ad31b1a11a92b1ffe (diff)
exsheets (18feb13)
git-svn-id: svn://tug.org/texlive/trunk@29155 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/exsheets/README2
-rw-r--r--Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdfbin669830 -> 673470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex31
-rw-r--r--Master/texmf-dist/tex/latex/exsheets/exsheets.sty40
-rw-r--r--Master/texmf-dist/tex/latex/exsheets/translations.sty4
5 files changed, 58 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/exsheets/README b/Master/texmf-dist/doc/latex/exsheets/README
index fcb6240ceae..a493117fefd 100644
--- a/Master/texmf-dist/doc/latex/exsheets/README
+++ b/Master/texmf-dist/doc/latex/exsheets/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-EXSHEETS v0.7a - 2013/01/21
+EXSHEETS v0.7b - 2013/02/17
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 3e953bde7ac..469aa546192 100644
--- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
+++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
index 34ea299cfee..e5e9ce18ae7 100644
--- a/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
+++ b/Master/texmf-dist/doc/latex/exsheets/exsheets_en.tex
@@ -97,14 +97,15 @@
blank, bigstar, bottomrule,
checkedchoicebox, choice, choicebox, citetitle, cmd, color, correct,
DeclareInstance, DeclareTemplateInterface, DeclareQuestionProperty,
- DebugExSheets, endspacing, examspace, ForEachQuestion, GetQuestionProperty,
- grade, includequestions, iflastquestion,
- midrule, NewQuSolPair, numberofquestions, points,
- PrintIfIncludeActiveF, PrintIfIncludeActiveT, PrintIfIncludeActiveTF,
+ DebugExSheets,
+ endspacing, examspace, ForEachQuestion, GetQuestionProperty, grade,
+ includequestions, iflastquestion, lastvariant, midrule, NewQuSolPair,
+ numberofquestions,
+ points, PrintIfIncludeActiveF, PrintIfIncludeActiveT, PrintIfIncludeActiveTF,
printsolutions, PrintSolutionsF, PrintSolutionsTF, PrintSolutionsT,
- QuestionNumber, RenewQuSolPair, rightarrow, s, sample, setlength,
- SetQuestionProperties, SetupExSheets, SetVariations, spacing, square,
- sumpoints,
+ QuestionNumber, RenewQuSolPair, rightarrow,
+ s, sample, setlength, SetQuestionProperties, SetupExSheets, SetVariations,
+ spacing, square, sumpoints,
tabcolsep, textcite, textcolor, toprule, totalpoints,
variant, vary
}
@@ -456,7 +457,7 @@ margin next to the when the option is described.
The third type aren't options at all, actually. However, thanks to the great
\paket{xtemplate} package you are able to define your own instances of some of
-the objects used be \ExSheets. This is explained in a little more detail in
+the objects used by \ExSheets. This is explained in a little more detail in
part~\ref{part:style} on page~\pageref{part:style}\,ff.
\secidx*{Setup}
@@ -689,9 +690,9 @@ of the respective counter. \code{1}: \cmd{arabic}, \code{a}: \cmd{alph}, \code{A
\end{beispiel}
Since the strings associated with the counters are replaced one has to hide them
if they are actually wanted in the counter format. The easiest way would to
-interrupt them by an empty group.
+hide them in braces.
\begin{beispiel}
- \SetupExSheets{counter-format=s{}ection\,se~q{}uestion\,(qu[a])}
+ \SetupExSheets{counter-format={section}\,se~{question}\,(qu[a])}
\begin{question}
A question with a yet differently formatted number.
\end{question}
@@ -1075,16 +1076,26 @@ purpose \ExSheets provides the following commands:
This command is the one actually used in the document. It has a number of
required arguments equal to the number set with \cmd*{SetVariations}. All of
its arguments are discarded except the one specified with \cmd*{variant}.
+ \Befehl{lastvariant}\newline% TODO: richtige version einfügen!
+ \sinceversion{0.7b}Each time \cmd{vary} is called it stores the value it
+ chose in \cmd{lastversion}. This might be convenient to use if one
+ otherwise would have to repeatedly write the same \cmd{vary}.
\end{beschreibung}
\begin{beispiel}
\SetVariations{6}%
\variant{6}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\variant{1}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\variant{5}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\variant{2}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\variant{4}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\variant{3}\vary{A}{B}{C}{D}{E}{F}
+ (last variant: \lastvariant)
\end{beispiel}
\secidx*{Variations}
diff --git a/Master/texmf-dist/tex/latex/exsheets/exsheets.sty b/Master/texmf-dist/tex/latex/exsheets/exsheets.sty
index 6ac2e4dddc0..8ad8e86a9a7 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{2013/01/21}
-\def\exsheets@version{0.7a}
+\def\exsheets@date{2013/02/17}
+\def\exsheets@version{0.7b}
\RequirePackage { expl3 , xparse }
\ProvidesExplPackage
@@ -50,6 +50,7 @@
\int_new:N \l__exsheets_tmpb_int
\int_new:N \l__exsheets_tmpc_int
\int_new:N \l__exsheets_tmpd_int
+\int_new:N \l__exsheets_tmpe_int
\dim_new:N \l__exsheets_tmpa_dim
\seq_new:N \l__exsheets_tmpa_seq
\fp_new:N \l__exsheets_tmpa_fp
@@ -570,7 +571,11 @@
{ \int_use:N \l__exsheets_tmpa_int }
}
\cs_set:cpn { __exsheets_variation_ \int_to_roman:n { #1 } :n } ##1
- { ##1 \use:c { __exsheets_variation_ \int_to_roman:n { #1 + 1 } :n } }
+ {
+ ##1
+ \cs_set:Npn \exsheets_last_variant: { ##1 }
+ \use:c { __exsheets_variation_ \int_to_roman:n { #1 + 1 } :n }
+ }
}
{
\msg_warning:nnxx { exsheets } { variant }
@@ -580,6 +585,8 @@
\cs_new:Npn \exsheets_vary:w
{ \__exsheets_variation_i:n }
+
+\cs_new:Npn \exsheets_last_variant: { }
\cs_new:Npn \__exsheets_generate_variation_auxiliary:n #1
{
@@ -604,6 +611,9 @@
\NewDocumentCommand \vary { }
{ \exsheets_vary:w }
+\NewDocumentCommand \lastvariant { }
+ { \exsheets_last_variant: }
+
% initiate: two variations, first is default
\SetVariations { 2 }
\variant { 1 }
@@ -1484,12 +1494,24 @@
}
{
\int_gincr:N \g__exsheets_questions_id_int
+ \int_set:Nn \l__exsheets_tmpa_int
+ {
+ \int_mod:nn
+ { \g__exsheets_questions_id_int }
+ { \g__exsheets_selection_number_int }
+ }
+ \int_compare:nT { \l__exsheets_tmpa_int = 0 }
+ {
+ \int_set_eq:NN
+ \l__exsheets_tmpa_int
+ \g__exsheets_selection_number_int
+ }
\exp_args:NNx
- \prop_get:NnN \g__exsheets_questions_id_prop
- { \int_use:N \g__exsheets_questions_id_int }
- \l_tmpa_tl
+ \prop_get:NnN \g__exsheets_selected_questions_prop
+ { \int_use:N \l__exsheets_tmpa_int }
+ \l__exsheets_tmpa_tl
\bool_if:NF \l__exsheets_include_all_bool
- { \__exsheets_select_question_by_id:V \l_tmpa_tl }
+ { \__exsheets_select_question_by_id:V \l__exsheets_tmpa_tl }
}
}
}
@@ -1573,6 +1595,9 @@
\cs_new:Npn \__exsheets_save_solution:n #1
{
% save for later use
+ \bool_if:NTF \l__exsheets_include_all_bool
+ { \int_set:Nn \l__exsheets_tmpe_int { \g__exsheets_questions_id_int -1 } }
+ { \int_set_eq:NN \l__exsheets_tmpe_int \g__exsheets_questions_id_int }
\prop_gput:Nff \g__exsheets_solutions_content_prop
{ \int_use:N \g__exsheets_questions_id_int }
{ #1 }
@@ -2406,6 +2431,7 @@ HISTORY:
than before
2013/01/21 v0.7a - added option `auto-label' and questions key `label',
also added question properties `ref' and `pageref'
+2013/02/17 v0.7b - bug fix: question selection by ID now works again
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/exsheets/translations.sty b/Master/texmf-dist/tex/latex/exsheets/translations.sty
index 09338cc1452..143a1ab2688 100644
--- a/Master/texmf-dist/tex/latex/exsheets/translations.sty
+++ b/Master/texmf-dist/tex/latex/exsheets/translations.sty
@@ -244,9 +244,11 @@
\@onlypreamble\LoadDictionary
\newrobustcmd*\LoadDictionaryFor[2]{%
- \@trnslt@load@dictionary@for{#1}{#2}}
+ \@trnslt@load@dictionary@for{#2}{#1}}
\@onlypreamble\LoadDictionaryFor
+% #1: name
+% #2: lang
\def\@trnslt@load@dictionary@for#1#2{%
\AtBeginDocument{%
\InputIfFileExists{#1-\@trnslt@language{#2}.trsl}