From c18f29fc8bbdc114e808b53b99e9244054483190 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 4 Feb 2021 03:01:08 +0000 Subject: CTAN sync 202102040301 --- macros/latex/contrib/xsim/HISTORY | 1 + macros/latex/contrib/xsim/README | 2 +- macros/latex/contrib/xsim/xsim-manual.cls | 1 + macros/latex/contrib/xsim/xsim-manual.pdf | Bin 1353979 -> 1353988 bytes macros/latex/contrib/xsim/xsim-manual.tex | 2 +- macros/latex/contrib/xsim/xsim.sty | 21 +++++++++++---------- .../latex/contrib/xsim/xsim.style.layouts.code.tex | 8 ++++---- 7 files changed, 19 insertions(+), 16 deletions(-) (limited to 'macros/latex/contrib/xsim') diff --git a/macros/latex/contrib/xsim/HISTORY b/macros/latex/contrib/xsim/HISTORY index c898ca033c..83eaeb2efd 100644 --- a/macros/latex/contrib/xsim/HISTORY +++ b/macros/latex/contrib/xsim/HISTORY @@ -178,3 +178,4 @@ HISTORY: - various small fixes v0.20a 2021/02/01 - re-add missing `layouts' style - add example texsx-549540 + v0.20b 2021/02/02 - fix issue #78 diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README index 82ac42689c..0bca910fa0 100644 --- a/macros/latex/contrib/xsim/README +++ b/macros/latex/contrib/xsim/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -XSIM 2021/02/01 v0.20a +XSIM 2021/02/02 v0.20b XSIMVERB 2021/01/31 v0.3 eXercise Sheets IMproved diff --git a/macros/latex/contrib/xsim/xsim-manual.cls b/macros/latex/contrib/xsim/xsim-manual.cls index 600a7f60eb..f67e2754ae 100644 --- a/macros/latex/contrib/xsim/xsim-manual.cls +++ b/macros/latex/contrib/xsim/xsim-manual.cls @@ -997,6 +997,7 @@ \xsim@add@version{0.19b} {2020-04-04} \xsim@add@version{0.20} {2021-01-31} \xsim@add@version{0.20a} {2021-02-01} +\xsim@add@version{0.20b} {2021-02-02} % ---------------------------------------------------------------------------- \newrobustcmd*\xsimauxfileinfo{% diff --git a/macros/latex/contrib/xsim/xsim-manual.pdf b/macros/latex/contrib/xsim/xsim-manual.pdf index f78f19be58..02803ce557 100644 Binary files a/macros/latex/contrib/xsim/xsim-manual.pdf and b/macros/latex/contrib/xsim/xsim-manual.pdf differ diff --git a/macros/latex/contrib/xsim/xsim-manual.tex b/macros/latex/contrib/xsim/xsim-manual.tex index 329f602acf..00ad03acc8 100644 --- a/macros/latex/contrib/xsim/xsim-manual.tex +++ b/macros/latex/contrib/xsim/xsim-manual.tex @@ -1397,7 +1397,7 @@ yourself in order to achieve certain layouts\footnote{I plan to incorporate \expandable\command{IfExercisePropertyExist\TF}[\marg{property}\marg{true}% \marg{false}] Tests wether an exercise property with the name \meta{property} is defined. - \command{IfExercisePropertySet\TF}[\marg{property}\marg{true}\marg{false}] + \expandable\command{IfExercisePropertySet\TF}[\marg{property}\marg{true}\marg{false}] Tests wether the exercise property \meta{property} has been set for the current exercise. \expandable\command{GetExerciseProperty}[\marg{property}] diff --git a/macros/latex/contrib/xsim/xsim.sty b/macros/latex/contrib/xsim/xsim.sty index e1953059a7..157fd3eb82 100644 --- a/macros/latex/contrib/xsim/xsim.sty +++ b/macros/latex/contrib/xsim/xsim.sty @@ -29,10 +29,10 @@ \ExplSyntaxOn -\tl_const:Nn \c_xsim_date_tl {2021/02/01} +\tl_const:Nn \c_xsim_date_tl {2021/02/02} \tl_const:Nn \c_xsim_version_major_number_tl {0} \tl_const:Nn \c_xsim_version_minor_number_tl {20} -\tl_const:Nn \c_xsim_version_subrelease_tl {a} +\tl_const:Nn \c_xsim_version_subrelease_tl {b} \tl_const:Nx \c_xsim_version_number_tl { \c_xsim_version_major_number_tl . @@ -2485,6 +2485,7 @@ { \prg_return_true: } { \prg_return_false: } } +\prg_generate_conditional_variant:Nnn \xsim_if_parameter_set:nn {o} {T,F,TF} % ---------------------------------------------------------------------------- @@ -4625,13 +4626,13 @@ \NewExpandableDocumentCommand \IfExercisePropertyExistF {+m+m} { \IfExercisePropertyExistTF {#1} {} {#2} } -\NewDocumentCommand \IfExercisePropertySetTF {m+m+m} +\NewExpandableDocumentCommand \IfExercisePropertySetTF {m+m+m} { \xsim_if_property_set:eenTF {\ExerciseType} {\ExerciseID} {#1} {#2} {#3} } -\NewDocumentCommand \IfExercisePropertySetT {m+m} +\NewExpandableDocumentCommand \IfExercisePropertySetT {m+m} { \IfExercisePropertySetTF {#1} {#2} {} } -\NewDocumentCommand \IfExercisePropertySetF {m+m} +\NewExpandableDocumentCommand \IfExercisePropertySetF {m+m} { \IfExercisePropertySetTF {#1} {} {#2} } \NewExpandableDocumentCommand \GetExerciseProperty {m} @@ -4733,22 +4734,22 @@ { \xsim_input:oon { \ExerciseType } { \ExerciseID } {#1} } \NewExpandableDocumentCommand \IfExerciseParameterSetTF {+m+m+m} - { \xsim_if_parameter_set:nnTF {\ExerciseType} {#1} {#2} {#3} } + { \xsim_if_parameter_set:onTF {\ExerciseType} {#1} {#2} {#3} } \NewExpandableDocumentCommand \IfExerciseParameterSetT {+m+m} - { \IfExerciseParameterSetTF {#1} {#2} {} } + { \xsim_if_parameter_set:onT {\ExerciseType} {#1} {#2} } \NewExpandableDocumentCommand \IfExerciseParameterSetF {+m+m} - { \IfExerciseParameterSetTF {#1} {} {#2} } + { \xsim_if_parameter_set:onF {\ExerciseType} {#1} {#2} } \NewExpandableDocumentCommand \ExerciseParameterIfSetTF {+m+m+m+m} { \xsim_if_parameter_set:nnTF {#1} {#2} {#3} {#4} } \NewExpandableDocumentCommand \ExerciseParameterIfSetT {+m+m+m} - { \ExerciseParameterIfSetTF {#1} {#2} {#3} {} } + { \xsim_if_parameter_set:nnT {#1} {#2} {#3} } \NewExpandableDocumentCommand \ExerciseParameterIfSetF {+m+m+m} - { \ExerciseParameterIfSetTF {#1} {#2} {} {#3} } + { \xsim_if_parameter_set:nnF {#1} {#2} {#3} } \NewDocumentCommand \GetExerciseParameterTF {m+m+m} { \xsim_get_parameter_if_set:onTF {\ExerciseType} {#1} {#2} {#3} } diff --git a/macros/latex/contrib/xsim/xsim.style.layouts.code.tex b/macros/latex/contrib/xsim/xsim.style.layouts.code.tex index 31f5810bce..778ad66eb0 100644 --- a/macros/latex/contrib/xsim/xsim.style.layouts.code.tex +++ b/macros/latex/contrib/xsim/xsim.style.layouts.code.tex @@ -11,12 +11,12 @@ % Copyright 2017--2020 Clemens Niederberger % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 +% conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/05/04 or later. % % This work has the LPPL maintenance status `maintained'. % @@ -25,7 +25,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % ---------------------------------------------------------------------------- -\xsimstyle{layouts}[2019/10/12] +\xsimstyle{layouts}[2021/02/02] \RequirePackage{needspace} -- cgit v1.2.3