From 7da4243862494d1fc7478956362f4da6d80f4f7e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 21 Oct 2019 03:00:45 +0000 Subject: CTAN sync 201910210300 --- macros/latex/contrib/xsim/README | 2 +- .../contrib/xsim/code/xsim.collections.code.tex | 18 +++++++++--------- .../contrib/xsim/code/xsim.environments.code.tex | 4 ++-- .../contrib/xsim/code/xsim.exercises.code.tex | 7 +++---- macros/latex/contrib/xsim/code/xsim.goals.code.tex | 8 ++++---- .../latex/contrib/xsim/code/xsim.grades.code.tex | 2 +- .../contrib/xsim/code/xsim.interface.code.tex | 4 ++-- .../latex/contrib/xsim/code/xsim.random.code.tex | 6 +++--- .../contrib/xsim/code/xsim.solutions.code.tex | 12 ++++++------ macros/latex/contrib/xsim/code/xsim.sty | 4 ++-- macros/latex/contrib/xsim/code/xsim.tags.code.tex | 2 +- .../contrib/xsim/code/xsim.templates.code.tex | 4 ++-- macros/latex/contrib/xsim/doc/xsim.history | 16 +++++++++------- macros/latex/contrib/xsim/doc/xsim_manual.pdf | Bin 1229192 -> 1229199 bytes 14 files changed, 45 insertions(+), 44 deletions(-) (limited to 'macros/latex/contrib/xsim') diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README index 5cdaaaffdb..da372c2449 100644 --- a/macros/latex/contrib/xsim/README +++ b/macros/latex/contrib/xsim/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -XSIM 2019/10/13 v0.14 +XSIM 2019/10/19 v0.14a eXercise Sheets IMproved diff --git a/macros/latex/contrib/xsim/code/xsim.collections.code.tex b/macros/latex/contrib/xsim/code/xsim.collections.code.tex index b7d348e0d5..3f5d2a1b86 100644 --- a/macros/latex/contrib/xsim/code/xsim.collections.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.collections.code.tex @@ -62,7 +62,7 @@ % #1: collection name \cs_new_protected:Npn \xsim_new_collection:n #1 { - \xsim_if_collection_exists:nTF {#1} + \xsim_if_collection_exist:nTF {#1} { \msg_error:nnn {xsim} {collection-exists} {#1} } { \xsim_verbose:n { Declaring~ new~ collection~ `#1'. } @@ -73,7 +73,7 @@ } % #1: collection name -\prg_new_conditional:Npnn \xsim_if_collection_exists:n #1 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_collection_exist:n #1 {T,F,TF} { \prop_if_in:NnTF \g__xsim_collections_prop {#1} { \prg_return_true: } @@ -124,7 +124,7 @@ \cs_new_protected:Npn \xsim_start_collection:nn #1#2 { \group_begin: - \xsim_if_collection_exists:nF {#1} + \xsim_if_collection_exist:nF {#1} { \msg_error:nnn {xsim} {unknown-collection} {#1} } \xsim_activate_collection:nn {#1} {#2} \xsim_setup:x { \xsim_get_parameter:nn {#2} {exercise-env} /print = false } @@ -136,7 +136,7 @@ \cs_new_protected:Npn \xsim_start_collection:n #1 { \group_begin: - \xsim_if_collection_exists:nF {#1} + \xsim_if_collection_exist:nF {#1} { \msg_error:nnn {xsim} {unknown-collection} {#1} } \xsim_activate_collection:n {#1} \xsim_foreach_exercise_type:n @@ -284,7 +284,7 @@ \l__xsim_print_collection_choice_tl {both} { - \xsim_if_exercise_exists:nnT {##1} {####1} + \xsim_if_exercise_exist:nnT {##1} {####1} { \bool_set_true:N \l__xsim_tmpa_bool } } { @@ -292,7 +292,7 @@ { xsim_if_ \l__xsim_print_collection_choice_tl - _exists:nnT + _exist:nnT } {##1} {####1} @@ -315,9 +315,9 @@ \l__xsim_print_collection_choice_tl {both} { - \xsim_if_exercise_exists:nnT {##1} {####1} + \xsim_if_exercise_exist:nnT {##1} {####1} { \xsim_insert:nnnn {##1} {####1} {} {exercise} } - \xsim_if_solution_exists:nnT {##1} {####1} + \xsim_if_solution_exist:nnT {##1} {####1} { \xsim_insert:nnnn {##1} {####1} {} {solution} } } { @@ -325,7 +325,7 @@ { xsim_if_ \l__xsim_print_collection_choice_tl - _exists:nnT + _exist:nnT } {##1} {####1} diff --git a/macros/latex/contrib/xsim/code/xsim.environments.code.tex b/macros/latex/contrib/xsim/code/xsim.environments.code.tex index 2aacf63f51..daaae03211 100644 --- a/macros/latex/contrib/xsim/code/xsim.environments.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.environments.code.tex @@ -308,7 +308,7 @@ % #1: type % #2: id % #3: exercise|solution -\prg_new_protected_conditional:Npnn \xsim_if_exists:nnn #1#2#3 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_exist:nnn #1#2#3 {T,F,TF} { \xsim_if_write_to_files:TF { @@ -334,7 +334,7 @@ % #4: exercise|solution \cs_new_protected:Npn \xsim_insert:nnnn #1#2#3#4 { - \xsim_if_exists:nnnTF {#1} {#2} {#4} + \xsim_if_exist:nnnTF {#1} {#2} {#4} { \xsim_verbose:n { Inserting~ #4~ type~ `#1'~ id~ `#2'. } diff --git a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex index 0de63e0460..9eb469fee4 100644 --- a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex @@ -377,14 +377,13 @@ % #1: type % #2: id -\prg_new_conditional:Npnn \xsim_if_exercise_exists:nn #1#2 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_exercise_exist:nn #1#2 {T,F,TF} { - \__xsim_set_file_signature:nnn {#1} {#2} {exercise} - \file_if_exist:VTF \l__xsim_file_path_and_name_tl + \xsim_if_exist:nnnTF {#1} {#2} {exercise} { \prg_return_true: } { \prg_return_false: } } -\cs_generate_variant:Nn \xsim_if_exercise_exists:nnT {VV} +\cs_generate_variant:Nn \xsim_if_exercise_exist:nnT {VV} % #1: type % #2: options diff --git a/macros/latex/contrib/xsim/code/xsim.goals.code.tex b/macros/latex/contrib/xsim/code/xsim.goals.code.tex index 98847ae129..c03fe14483 100644 --- a/macros/latex/contrib/xsim/code/xsim.goals.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.goals.code.tex @@ -39,7 +39,7 @@ % #1: name \cs_new_protected:Npn \xsim_declare_exercise_goal:n #1 { - \xsim_if_goal_exists:nF {#1} + \xsim_if_goal_exist:nF {#1} { \xsim_verbose:n { Declaring~ new~ goal~ `#1'. } \xsim_declare_property:nnnn @@ -66,7 +66,7 @@ } } -\prg_new_conditional:Npnn \xsim_if_goal_exists:n #1 {p,T,F,TF} +\prg_new_conditional:Npnn \xsim_if_goal_exist:n #1 {p,T,F,TF} { \seq_if_in:NnTF \l__xsim_goals_seq {#1} { \prg_return_true: } @@ -78,7 +78,7 @@ % #3: goal \cs_new_protected:Npn \xsim_update_goal:nnn #1#2#3 { - \xsim_if_goal_exists:nT {#3} + \xsim_if_goal_exist:nT {#3} { \fp_gadd:cn {g__xsim_goal_#3_fp} { \xsim_get_property:nnn {#1} {#2} {#3} + 0 } @@ -105,7 +105,7 @@ % #4: value \cs_new_protected:Npn \xsim_addto_goal:nnnn #1#2#3#4 { - \xsim_if_goal_exists:nT {#3} + \xsim_if_goal_exist:nT {#3} { \xsim_verbose:n { Adding~ `#4'~ to~ `#3'~ goal~ of~ #1~ #2 } \fp_gadd:cn {g__xsim_goal_#3_fp} {#4} diff --git a/macros/latex/contrib/xsim/code/xsim.grades.code.tex b/macros/latex/contrib/xsim/code/xsim.grades.code.tex index e8a75cf85b..bfcecf92b2 100644 --- a/macros/latex/contrib/xsim/code/xsim.grades.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.grades.code.tex @@ -100,7 +100,7 @@ % #4: code after grade requirement if != 1 \cs_new_protected:Npn \xsim_get_grade_goal:nnnn #1#2#3#4 { - \xsim_if_goal_exists:nTF {#2} + \xsim_if_goal_exist:nTF {#2} { \xsim_get_grade:nnnn {#1} diff --git a/macros/latex/contrib/xsim/code/xsim.interface.code.tex b/macros/latex/contrib/xsim/code/xsim.interface.code.tex index 3331f6278a..0c1251d113 100644 --- a/macros/latex/contrib/xsim/code/xsim.interface.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.interface.code.tex @@ -54,7 +54,7 @@ % ---------------------------------------------------------------------------- \ProvideDocumentCommand \IfExistSolutionTF {+m+m} - { \xsim_if_solution_exists:ooTF {\ExerciseType} {\ExerciseID} {#1} {#2} } + { \xsim_if_solution_exist:ooTF {\ExerciseType} {\ExerciseID} {#1} {#2} } \NewDocumentCommand \IfExistSolutionT {+m} { \IfExistSolutionTF {#1} {} } @@ -460,7 +460,7 @@ \NewDocumentCommand \ProvideExerciseTagging {m} { - \xsim_if_tag_type_exists:nTF {#1} + \xsim_if_tag_type_exist:nTF {#1} { \msg_warning:nnn {xsim} {tag-exists} {#1} } { \xsim_new_tag_type:n {#1} } } diff --git a/macros/latex/contrib/xsim/code/xsim.random.code.tex b/macros/latex/contrib/xsim/code/xsim.random.code.tex index 7cdaa0a948..7a0eeb297d 100644 --- a/macros/latex/contrib/xsim/code/xsim.random.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.random.code.tex @@ -109,7 +109,7 @@ % #3: csv list of excluded ids \cs_new_protected:Npn \xsim_print_random_list:nnn #1#2#3 { - \xsim_if_collection_exists:nTF {#1} + \xsim_if_collection_exist:nTF {#1} { \int_gincr:N \g__xsim_random_list_id_int \int_compare:nNnTF { \xsim_collection_count:n {#1} } = {0} @@ -231,7 +231,7 @@ \c__xsim_print_random_exercise_tl } { - \xsim_if_exercise_exists:VVT + \xsim_if_exercise_exist:VVT \l__xsim_tmpb_tl \l__xsim_tmpa_tl { @@ -253,7 +253,7 @@ \c__xsim_print_random_solution_tl } { - \xsim_if_solution_exists:VVT + \xsim_if_solution_exist:VVT \l__xsim_tmpb_tl \l__xsim_tmpa_tl { diff --git a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex index 23e48d75f4..edb954e838 100644 --- a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex @@ -80,14 +80,14 @@ % #1: type % #2: id -\prg_new_protected_conditional:Npnn \xsim_if_solution_exists:nn #1#2 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_solution_exist:nn #1#2 {T,F,TF} { - \xsim_if_exists:nnnTF {#1} {#2} {solution} + \xsim_if_exist:nnnTF {#1} {#2} {solution} { \prg_return_true: } { \prg_return_false: } } -\cs_generate_variant:Nn \xsim_if_solution_exists:nnT {VV,oo} -\cs_generate_variant:Nn \xsim_if_solution_exists:nnTF {oo} +\cs_generate_variant:Nn \xsim_if_solution_exist:nnT {VV,oo} +\cs_generate_variant:Nn \xsim_if_solution_exist:nnTF {oo} % #1: type % #2: options @@ -236,7 +236,7 @@ % #4: code \cs_new_protected:Npn \xsim_if_this_solution_do:nnnn #1#2#3#4 { - \xsim_if_solution_exists:nnT {#1} {#2} + \xsim_if_solution_exist:nnT {#1} {#2} { \__xsim_printsolutions_check_conditions:nnnT {#1} {#2} {#3} {#4} } } @@ -393,7 +393,7 @@ collection/false .code:n = \__xsim_printsolutions_condition:nn {per-collection} {false} , collection/unknown .code:n = - \xsim_if_collection_exists:nT {#1} + \xsim_if_collection_exist:nT {#1} { \__xsim_printsolutions_condition:nn {per-collection} {true} \tl_set:Nn \l__xsim_printsolutions_collection_tl {#1} diff --git a/macros/latex/contrib/xsim/code/xsim.sty b/macros/latex/contrib/xsim/code/xsim.sty index 59992c37d8..a11fe99ada 100644 --- a/macros/latex/contrib/xsim/code/xsim.sty +++ b/macros/latex/contrib/xsim/code/xsim.sty @@ -29,10 +29,10 @@ \ExplSyntaxOn -\tl_const:Nn \c_xsim_date_tl {2019/10/13} +\tl_const:Nn \c_xsim_date_tl {2019/10/19} \tl_const:Nn \c_xsim_version_major_number_tl {0} \tl_const:Nn \c_xsim_version_minor_number_tl {14} -\tl_const:Nn \c_xsim_version_subrelease_tl {} +\tl_const:Nn \c_xsim_version_subrelease_tl {a} \tl_const:Nx \c_xsim_version_number_tl { \c_xsim_version_major_number_tl . diff --git a/macros/latex/contrib/xsim/code/xsim.tags.code.tex b/macros/latex/contrib/xsim/code/xsim.tags.code.tex index 52ac1b519a..e63174a0cc 100644 --- a/macros/latex/contrib/xsim/code/xsim.tags.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.tags.code.tex @@ -87,7 +87,7 @@ } % #1: tag type -\prg_new_protected_conditional:Npnn \xsim_if_tag_type_exists:n #1 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_tag_type_exist:n #1 {T,F,TF} { \seq_if_in:NnTF \l__xsim_tag_types_seq {#1} { \prg_return_true: } diff --git a/macros/latex/contrib/xsim/code/xsim.templates.code.tex b/macros/latex/contrib/xsim/code/xsim.templates.code.tex index 2f167a23a4..c5c08b8d9b 100644 --- a/macros/latex/contrib/xsim/code/xsim.templates.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.templates.code.tex @@ -53,7 +53,7 @@ \prop_put:cnn {l__xsim_#1_template_prop} {#2} {#3} } -\prg_new_conditional:Npnn \xsim_if_template_exists:nn #1#2 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_template_exist:nn #1#2 {T,F,TF} { \prop_if_in:cnTF {l__xsim_#1_template_prop} {#2} { \prg_return_true: } @@ -159,7 +159,7 @@ % #2: template name \cs_new_protected:Npn \xsim_use_template:nn #1#2 { - \xsim_if_template_exists:nnTF {#1} {#2} + \xsim_if_template_exist:nnTF {#1} {#2} { \__xsim_get_template:nn {#1} {#2} } { \msg_warning:nnnnn {xsim} {unknown-template} {#1} {#2} {default} diff --git a/macros/latex/contrib/xsim/doc/xsim.history b/macros/latex/contrib/xsim/doc/xsim.history index 8be4a79e36..efeac6f181 100644 --- a/macros/latex/contrib/xsim/doc/xsim.history +++ b/macros/latex/contrib/xsim/doc/xsim.history @@ -117,13 +117,15 @@ HISTORY: v0.13 2019/10/06 - experimental package option `no-files' v0.14 2019/10/13 - new exercise parameters `exercise-heading' and `solution-heading' - - new options `exercise/heading' and `solution/heading' as + - new options `exercise/heading' and `solution/heading' as interface for setting the new parameters - - new command \GetExerciseHeadingF for using the new + - new command \GetExerciseHeadingF for using the new parameters in environment templates - - change the environment template `default' to use the new + - change the environment template `default' to use the new \GetExerciseHeadingF and output a \par at the end - - make argument of \xsimsetup long - - new template `minimal' - - new option `load-style' - - new example `texwelt-23968' (long and short solutions) + - make argument of \xsimsetup long + - new template `minimal' + - new option `load-style' + - new example `texwelt-23968' (long and short solutions) + v0.14a 2019/10/19 - fix \xsim_if_exercise_exist:nnTF to obey the `no-files' + option diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.pdf b/macros/latex/contrib/xsim/doc/xsim_manual.pdf index 96ec4408f9..161f44a9a1 100644 Binary files a/macros/latex/contrib/xsim/doc/xsim_manual.pdf and b/macros/latex/contrib/xsim/doc/xsim_manual.pdf differ -- cgit v1.2.3