From b5a2e1693a20452ed082823402d3c619eebc6599 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 5 Apr 2020 03:02:36 +0000 Subject: CTAN sync 202004050302 --- macros/latex/contrib/ehhline/README | 4 +-- macros/latex/contrib/ehhline/ehhline.sty | 10 +++--- macros/latex/contrib/xsim/README | 2 +- macros/latex/contrib/xsim/code/xsim.base.code.tex | 8 ++++- .../latex/contrib/xsim/code/xsim.blanks.code.tex | 2 +- .../contrib/xsim/code/xsim.exercises.code.tex | 1 + macros/latex/contrib/xsim/code/xsim.sty | 4 +-- .../contrib/xsim/code/xsim.templates.code.tex | 2 +- .../xsim/doc/examples/xsim.texsx-350028.pdf | Bin 95065 -> 130569 bytes .../xsim/doc/examples/xsim.texsx-350028.tex | 3 +- .../xsim/doc/examples/xsim.texwelt-23968.pdf | Bin 46008 -> 46008 bytes .../xsim/doc/examples/xsim.texwelt-23968.tex | 6 +++- macros/latex/contrib/xsim/doc/xsim-manual.cls | 34 +++++++++++++++------ macros/latex/contrib/xsim/doc/xsim.history | 4 ++- macros/latex/contrib/xsim/doc/xsim_manual.pdf | Bin 1233842 -> 1269638 bytes macros/latex/contrib/xsim/doc/xsim_manual.tex | 28 +++++++++++++---- 16 files changed, 75 insertions(+), 33 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/ehhline/README b/macros/latex/contrib/ehhline/README index b7b22c7fe3..a12c8b41d3 100644 --- a/macros/latex/contrib/ehhline/README +++ b/macros/latex/contrib/ehhline/README @@ -2,8 +2,8 @@ Package ehhline extend \hhline command with a !{...} token, which allows build line with LaTeX command. Version 1.0 (2019-05-13): first public release +Version 1.1 (2020-04-04): bugfix – now |!{...}| works correctly - -Copyright (C) 2015-2019, Robert Ryszard Paciorek +Copyright (C) 2015-2020, Robert Ryszard Paciorek This is free software distributed under terms of The MIT License. diff --git a/macros/latex/contrib/ehhline/ehhline.sty b/macros/latex/contrib/ehhline/ehhline.sty index 4bfbe9e4d1..fb06abc402 100644 --- a/macros/latex/contrib/ehhline/ehhline.sty +++ b/macros/latex/contrib/ehhline/ehhline.sty @@ -1,4 +1,4 @@ -% Copyright (c) 2015-2019 Robert Ryszard Paciorek +% Copyright (c) 2015-2020 Robert Ryszard Paciorek % % MIT License % @@ -21,6 +21,7 @@ % SOFTWARE. % Version 1.0 (2019-05-13): first public release +% Version 1.1 (2020-04-04): bugfix – now |!{...}| works correctly \NeedsTeXFormat{LaTeX2e} @@ -33,10 +34,9 @@ \AtBeginDocument{ \patchcmd{\HH@loop}{\PackageWarning{hhline}}{% \ifx\@tempb!\def\next#1#2{% - \gdef\HH@height{\dimen\thr@@}% - \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi - \HH@add - {#2}% + \@tempswafalse\gdef\HH@height{\dimen\thr@@}% + \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi% + \HH@add{#2}% \HH@let!}\else \PackageWarning{hhline} }{}{\PackageWarning{ehhline}{Error patch HH@loop}} diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README index 3d29077438..5923c8045b 100644 --- a/macros/latex/contrib/xsim/README +++ b/macros/latex/contrib/xsim/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -XSIM 2020/03/19 v0.19a +XSIM 2020/04/04 v0.19b XSIMVERB 2019/12/29 v0.1a eXercise Sheets IMproved diff --git a/macros/latex/contrib/xsim/code/xsim.base.code.tex b/macros/latex/contrib/xsim/code/xsim.base.code.tex index 3bcfb21d36..fd478455f6 100644 --- a/macros/latex/contrib/xsim/code/xsim.base.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.base.code.tex @@ -216,7 +216,11 @@ % #2: item % #3: value \cs_new_protected:Npn \xsim_attribute_set:nnn #1#2#3 - { \cs_gset:cpx {____xsim_attribute_ \tl_to_str:n {#1::#2} :} { \exp_not:n {#3} } } + { + \cs_gset:cpx + {____xsim_attribute_ \tl_to_str:n {#1::#2} :} + { \exp_not:n { \exp_not:n {#3} } } + } \cs_generate_variant:Nn \xsim_attribute_set:nnn {nnx} % #1: attribute @@ -279,3 +283,5 @@ % ---------------------------------------------------------------------------- \file_input_stop: 2020/03/15 - alternative to property lists for performance optimizations +2020/03/22 - fix bug in new attribute mechanism which was a problem when + `no-files` has been used diff --git a/macros/latex/contrib/xsim/code/xsim.blanks.code.tex b/macros/latex/contrib/xsim/code/xsim.blanks.code.tex index e2cc6c584c..6cb2f3b252 100644 --- a/macros/latex/contrib/xsim/code/xsim.blanks.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.blanks.code.tex @@ -127,7 +127,7 @@ { \skip_horizontal:N \l__xsim_blank_line_minimum_length_dim } } } -\cs_generate_variant:Nn \__xsim_blank_skip:n { V } +\cs_generate_variant:Nn \__xsim_blank_skip:n {V} % ---------------------------------------------------------------------------- \file_input_stop: diff --git a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex index 9ba49c6803..5314369ffa 100644 --- a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex @@ -41,6 +41,7 @@ \int_gzero_new:N \g_xsim_max_id_int \tl_new:N \l_xsim_current_id_tl \tl_new:N \g_xsim_exercise_id_tl +\tl_new:N \g_xsim_exercise_type_tl \tl_new:N \ExerciseID \tl_new:N \ExerciseType \bool_new:N \l____xsim_print_bool diff --git a/macros/latex/contrib/xsim/code/xsim.sty b/macros/latex/contrib/xsim/code/xsim.sty index 9ab9d38680..cc30ae9052 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 {2020/03/19} +\tl_const:Nn \c_xsim_date_tl {2020/04/04} \tl_const:Nn \c_xsim_version_major_number_tl {0} \tl_const:Nn \c_xsim_version_minor_number_tl {19} -\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 . diff --git a/macros/latex/contrib/xsim/code/xsim.templates.code.tex b/macros/latex/contrib/xsim/code/xsim.templates.code.tex index 35bd173bba..f14d7fc87e 100644 --- a/macros/latex/contrib/xsim/code/xsim.templates.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.templates.code.tex @@ -25,7 +25,7 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % ---------------------------------------------------------------------------- -\XSIMmodule{templates}{properties of exercises} +\XSIMmodule{templates}{templates for typesetting exercises} \xsim_load_modules:n {base} diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.pdf b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.pdf index ef781218a8..36645464fc 100644 Binary files a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.pdf and b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.pdf differ diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.tex b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.tex index ebe090413c..8f49a92f60 100644 --- a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.tex +++ b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-350028.tex @@ -1,7 +1,6 @@ % http://tex.stackexchange.com/q/350028/ \documentclass{book} - -\usepackage{xsimverb} +\usepackage[T1]{fontenc} \usepackage{xsim} \usepackage[most]{tcolorbox} \tcbuselibrary{skins,breakable} diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.pdf b/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.pdf index 726cbcddb4..e9816a9793 100644 Binary files a/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.pdf and b/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.pdf differ diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.tex b/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.tex index e967f7f826..bf205bb7fb 100644 --- a/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.tex +++ b/macros/latex/contrib/xsim/doc/examples/xsim.texwelt-23968.tex @@ -7,7 +7,11 @@ % new environment: \NewDocumentEnvironment{shortsolution}{+b} - {\SetExerciseProperty{shortsolution}{#1}} + {% + \edef\ExerciseType{\csname g_xsim_exercise_type_tl\endcsname}% + \edef\ExerciseID{\csname g_xsim_exercise_id_tl\endcsname}% + \SetExerciseProperty{shortsolution}{#1}% + } {} % we'll use a description list for the list of short solutions: diff --git a/macros/latex/contrib/xsim/doc/xsim-manual.cls b/macros/latex/contrib/xsim/doc/xsim-manual.cls index c3353f6c4e..c1d198ab04 100644 --- a/macros/latex/contrib/xsim/doc/xsim-manual.cls +++ b/macros/latex/contrib/xsim/doc/xsim-manual.cls @@ -29,7 +29,7 @@ % please ignore the contents of this file -- it is not a good example for % coding... % -\ProvidesClass{xsim-manual}[2020/02/23] +\ProvidesClass{xsim-manual}[2020/04/04] \LoadClass[load-preamble,add-index]{cnltx-doc} \RequirePackage{imakeidx} @@ -38,8 +38,10 @@ \RequirePackage{geometry} \geometry{ - left = 3.8cm , - right = 2.8cm + left = 3.5cm , + right = 3cm , + marginparwidth = 3cm , + marginparsep = 2mm } \setcnltx{ @@ -247,19 +249,20 @@ module-sep = {\texttt{/}}% } - +\renewcommand*\versionnoteformat{\tiny\sffamily\RaggedRight} \RequirePackage[en-US]{datetime2} \DTMlangsetup[en-US]{abbr} \newrobustcmd*\xsim@add@version[2]{\csdef{xsimversion#1}{\DTMdate{#2}}} \renewrobustcmd*\sinceversion[1]{% - \cnltx@version@note{\GetTranslation{cnltx-introduced}~#1 (\csuse{xsimversion#1})}% + \cnltx@version@note{\GetTranslation{cnltx-introduced} #1 (\csuse{xsimversion#1})}% } \renewrobustcmd*\changedversion[1]{% - \cnltx@version@note{\GetTranslation{cnltx-changed}~#1 (\csuse{xsimversion#1})}% + \cnltx@version@note{\GetTranslation{cnltx-changed} #1 (\csuse{xsimversion#1})}% } -\newnote*\sincechanged[2]{\GetTranslation{cnltx-introduced}~#1 - (\csuse{xsimversion#1}), changed with version~#2 (\csuse{xsimversion#2})} +\newnote*\sincechanged[2]{% + \GetTranslation{cnltx-introduced} #1, + changed with version #2 (\csuse{xsimversion#2})} \RequirePackage{xsimverb} \ExplSyntaxOn @@ -814,6 +817,14 @@ { http \c_colon_str //golatex.de/viewtopic,p, \l_tmpa_tl .html } { \color {white} [forum] } } + \tl_if_in:nnT {#1} {issues} + { + \tl_set:Nn \l_tmpa_tl {#1} + \tl_replace_once:Nnn \l_tmpa_tl {-} {/} + \space \href + { https \c_colon_str //github.com/cgnieder/ \l_tmpa_tl } + { \color {white} [github] } + } } \ExplSyntaxOff @@ -844,7 +855,8 @@ title=\xsim@example@title{##1}% ] \bookmark[level=2,dest=examplefile.\arabic{examplefile}]{\xsim@example@bookmark{##1}}% - \lstinputlisting[style=cnltx,firstline=7,lastline=15,firstnumber=7]{\xsim@example@texfile@path{##1}} + \lstinputlisting[ + style=cnltx,firstline=7,lastline=15,firstnumber=7]{\xsim@example@texfile@path{##1}}% \tcblower \fbox{% \href @@ -928,7 +940,8 @@ \xsim@add@example{texwelt-23968}{Long and short solutions} \xsim@add@example{golatex-80640}{Different versions for students and teachers} \xsim@add@example{golatex-91339}{Another custom layout with rules} - +\xsim@add@example{issues-49}{Different ideas for exams} + % ---------------------------------------------------------------------------- % layouts: @@ -971,6 +984,7 @@ \xsim@add@version{0.18} {2020-02-23} \xsim@add@version{0.19} {2020-03-16} \xsim@add@version{0.19a} {2020-03-19} +\xsim@add@version{0.19b} {2020-04-04} % ---------------------------------------------------------------------------- \newrobustcmd*\xsimauxfileinfo{% diff --git a/macros/latex/contrib/xsim/doc/xsim.history b/macros/latex/contrib/xsim/doc/xsim.history index b72b43baa5..f1b0f860f7 100644 --- a/macros/latex/contrib/xsim/doc/xsim.history +++ b/macros/latex/contrib/xsim/doc/xsim.history @@ -153,4 +153,6 @@ HISTORY: correct values when exercises (of different types) are nested - new load-time option `debug' - only for development - v0.19a 2020/03/18 - fix missing-variant-bug introduced with the last update + v0.19a 2020/03/19 - fix missing-variant-bug introduced with the last update + v0.19b 2020/04/04 - fix bug in new attribute mechanism which was a problem + when `no-files` has been used diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.pdf b/macros/latex/contrib/xsim/doc/xsim_manual.pdf index 9f8ec3ae69..dad403c26a 100644 Binary files a/macros/latex/contrib/xsim/doc/xsim_manual.pdf and b/macros/latex/contrib/xsim/doc/xsim_manual.pdf differ diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.tex b/macros/latex/contrib/xsim/doc/xsim_manual.tex index d3adf284d9..7b1df9ed5d 100644 --- a/macros/latex/contrib/xsim/doc/xsim_manual.tex +++ b/macros/latex/contrib/xsim/doc/xsim_manual.tex @@ -73,7 +73,17 @@ using an up to date \TeX\ distribution, anyway. still change. However, I will try my best to keep the interface stable. \end{bewareofthedog} -\section{Motivation and Background} +I'm currently thinking to make the option \option{no-files} the default +behavior of \xsim. There is a poll and discussion regarding this question on +\xsim's github page if you like to give your opinion on this. + +\begin{bewareofthedog} + The whole collection mechanism is likely to change completely in the + not-so-far future (let's say sometime in the six months from April~2020 or + so). +\end{bewareofthedog} + +\section{Motivation, Background} It has been quite a while since I first published \pkg{exsheets}~\cite{pkg:exsheets} in June 2012. Since then it has gained a @@ -916,11 +926,11 @@ If you know type and \property{id} of an exercise you can (re-)insert every existing exercise, \ie, every exercise whose external file exists. \begin{commands} \command{printexercise}[\marg{type}\marg{csv of ids}] - \changedversion{0.17a}Inserts the exercise or exercises of type + \changedversion{0.17}Inserts the exercise or exercises of type \meta{type} with the \property{id}s or \property{ID}s given in \meta{csv of ids}. \command{xprintexercise}[\marg{type}\marg{csv of ids}] - \sincechanged{0.16}{0.17a}The same as \cs{printexercise} but expands + \sincechanged{0.16}{0.17}The same as \cs{printexercise} but expands \meta{type} and the items of \meta{csv of ids} before it uses them. \end{commands} \begin{example} @@ -929,6 +939,12 @@ existing exercise, \ie, every exercise whose external file exists. \section{Collecting Exercises}\label{sec:collecting-exercises} +\begin{bewareofthedog} + The whole collection mechanism is likely to change completely in the + not-so-far future (let's say sometime in the six months from April~2020 or + so). +\end{bewareofthedog} + \subsection{Background} \xsim\ knows the concept of \enquote{exercise collections}. A collection of exercises can be useful when you want to print a certain group of exercises @@ -1555,11 +1571,11 @@ yourself in order to achieve certain layouts\footnote{I plan to incorporate \item \code{\#6}: the \property{bonus-points} property of the exercise \end{itemize} \command{XSIMprint}[\Marg{exercise|solution}\marg{type}\marg{id}] - \sincechanged{0.16}{0.17a}Inserts the either the exercise or the solution + \sincechanged{0.16}{0.17}Inserts the either the exercise or the solution of type \meta{type} with the \property{id} or \property{ID} \meta{id}. \command{XSIMxprint}[\Marg{exercise|solution}\marg{type}\marg{id}] - \sincechanged{0.16}{0.17a}The same as \cs{XSIMprint} but expands - \meta{type} and \meta{id} before it uses them. + The same as \cs{XSIMprint} but expands \meta{type} and \meta{id} before it + uses them.\sincechanged{0.16}{0.17} \expandable\command{XSIMtranslate}[\marg{keyword}] Delivers the translation of \meta{keyword} according to the current document language (in the meaning of a \pkg{babel}~\cite{pkg:babel} or -- cgit v1.2.3