From c87eb506b8708a7899e3585f96fe8abdd5361752 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 2 Aug 2023 03:02:29 +0000 Subject: CTAN sync 202308020302 --- .../contrib/profcollege/doc/ProfCollege-doc.pdf | Bin 9132731 -> 9123899 bytes .../contrib/profcollege/latex/LogoNumberHive.png | Bin 54466 -> 0 bytes .../latex/contrib/profcollege/latex/PfCDobble.tex | 2 +- .../profcollege/latex/PfCLogoNumberHive.png | Bin 0 -> 54466 bytes .../latex/contrib/profcollege/latex/PfCdobble.lua | 82 +++++++++++++++++++++ .../contrib/profcollege/latex/ProfCollege.sty | 4 +- .../latex/contrib/profcollege/latex/dobblePfC.lua | 82 --------------------- macros/latex/contrib/siunitx/CHANGELOG.md | 10 ++- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 649679 -> 649877 bytes macros/latex/contrib/siunitx/siunitx-number.dtx | 4 +- macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 705584 -> 705593 bytes 12 files changed, 97 insertions(+), 89 deletions(-) delete mode 100644 macros/latex/contrib/profcollege/latex/LogoNumberHive.png create mode 100644 macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png create mode 100644 macros/latex/contrib/profcollege/latex/PfCdobble.lua delete mode 100644 macros/latex/contrib/profcollege/latex/dobblePfC.lua (limited to 'macros/latex') diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf index b804c418cc..fe2337ad5b 100644 Binary files a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf and b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf differ diff --git a/macros/latex/contrib/profcollege/latex/LogoNumberHive.png b/macros/latex/contrib/profcollege/latex/LogoNumberHive.png deleted file mode 100644 index 0ea4267931..0000000000 Binary files a/macros/latex/contrib/profcollege/latex/LogoNumberHive.png and /dev/null differ diff --git a/macros/latex/contrib/profcollege/latex/PfCDobble.tex b/macros/latex/contrib/profcollege/latex/PfCDobble.tex index c832caf892..2767a20c50 100644 --- a/macros/latex/contrib/profcollege/latex/PfCDobble.tex +++ b/macros/latex/contrib/profcollege/latex/PfCDobble.tex @@ -5,7 +5,7 @@ \NewDocumentCommand\dobble{m}{% \directlua{ - require('dobblePfC.lua') + require('PfCdobble.lua') dobble("#1"); }% }% diff --git a/macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png b/macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png new file mode 100644 index 0000000000..0ea4267931 Binary files /dev/null and b/macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png differ diff --git a/macros/latex/contrib/profcollege/latex/PfCdobble.lua b/macros/latex/contrib/profcollege/latex/PfCdobble.lua new file mode 100644 index 0000000000..06df34391b --- /dev/null +++ b/macros/latex/contrib/profcollege/latex/PfCdobble.lua @@ -0,0 +1,82 @@ +math.randomseed(os.time()) + +-- p=5, nombre de symboles "1+p+p^2=31" +symbole = {} + +function dobble(p) + -- p : nombre premier (génération de 1+p+p² cartes à partir + -- du même nombre de symboles + -- on va générer un tableau où chaque case correspond + -- à une carte et contient la liste des numéros de symbole à mettre + for i=1,1+p+p*p do + symbole[i] = "\\PfCListeSymboleDobble["..i.."]" + end + local cartes={}; + -- première carte + cartes[0]={}; + for i=0,p do + cartes[0][i]=i; + end + printcard(cartes[0],p); + -- p+p*p suivantes + for i=1,p do + -- p premières + cartes[i]={}; + for j=0,p do + if j==0 then + cartes[i][j]=0; + else + -- on place les symboles aléatoirement + table.insert(cartes[i],math.random(j),i*p+j); + end + end + printcard(cartes[i],p); + -- p*p suivantes + for j=1,p do + cartes[p+(i-1)*p+j]={}; + for k=0,p do + if k==0 then + cartes[p+(i-1)*p+j][k]=i; + else + -- on place les symboles aléatoirement + table.insert(cartes[p+(i-1)*p+j],math.random(k),(k)*p+((k*i+j-1)%p)+1); + end + end + printcard(cartes[p+(i-1)*p+j],p); + end + end + return cartes; +end + + +function printcard(carte,p) + -- prend une carte en entrée (tableau de p+1 éléments) + -- et génère le code tex d'une page à partir des images + -- nommées suivant le prefixe + tex.sprint("\\newpage\\begin{tikzpicture}[remember picture, overlay]\\coordinate(Or) at (current page.north west);"); + -- cadre de la carte + tex.sprint("\\ifboolKV[ClesDobble]{Cercle}{\\draw[line width=.2cm,PfCDobbleColor] (4,-4) circle (3.9cm);}{\\draw[line width=.2cm,PfCDobbleColor] ($(Or)+(0.1,-0.1)$) rectangle ($(Or)+(7.9,-7.9)$);}"); + -- entier aléatoire pour l'élément au centre + local has=intrand(p+1); + local compt=0; + for i=0,p do + -- l'image au contre + if i== has then + tex.sprint("\\node[scale="..scalerand(0.7,1)..",rotate="..intrand(360).."] at ($(Or)+(4,-4)$) {"..symbole[carte[i]+1].."};"); + else + -- les autres tout le tour, taille aléatoire, rayon variant, rotation aléatoire + tex.sprint("\\node[scale="..scalerand(0.7,1)..",rotate="..intrand(360).."] at ($("..(360/(p)*compt)..":"..scalerand(2.4,2.5)..")+(Or)+(4,-4)$) {"..symbole[carte[i]+1].."};"); + compt=compt+1; + end + end + tex.sprint("\\end{tikzpicture}"); +end + + +function intrand(p) -- retourne un entier entre 0 et p-1 + return math.floor(p*math.random()); +end + +function scalerand(a,b) -- retourne un nombre aléatoire entre a et b + return a+(b-a)*math.random(); +end diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty index c51b7afc58..1a1ef8f18d 100644 --- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty +++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty @@ -2,9 +2,9 @@ % licence : Released under the LaTeX Project Public License v1.3c % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e}% -\def\filedate{2023/08/01}% +\def\filedate{2023/08/02}% \let\PfCfiledate\filedate% -\def\fileversion{0.99-z-p}% +\def\fileversion{0.99-z-q}% \let\PfCfileversion\fileversion% \ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]% diff --git a/macros/latex/contrib/profcollege/latex/dobblePfC.lua b/macros/latex/contrib/profcollege/latex/dobblePfC.lua deleted file mode 100644 index 06df34391b..0000000000 --- a/macros/latex/contrib/profcollege/latex/dobblePfC.lua +++ /dev/null @@ -1,82 +0,0 @@ -math.randomseed(os.time()) - --- p=5, nombre de symboles "1+p+p^2=31" -symbole = {} - -function dobble(p) - -- p : nombre premier (génération de 1+p+p² cartes à partir - -- du même nombre de symboles - -- on va générer un tableau où chaque case correspond - -- à une carte et contient la liste des numéros de symbole à mettre - for i=1,1+p+p*p do - symbole[i] = "\\PfCListeSymboleDobble["..i.."]" - end - local cartes={}; - -- première carte - cartes[0]={}; - for i=0,p do - cartes[0][i]=i; - end - printcard(cartes[0],p); - -- p+p*p suivantes - for i=1,p do - -- p premières - cartes[i]={}; - for j=0,p do - if j==0 then - cartes[i][j]=0; - else - -- on place les symboles aléatoirement - table.insert(cartes[i],math.random(j),i*p+j); - end - end - printcard(cartes[i],p); - -- p*p suivantes - for j=1,p do - cartes[p+(i-1)*p+j]={}; - for k=0,p do - if k==0 then - cartes[p+(i-1)*p+j][k]=i; - else - -- on place les symboles aléatoirement - table.insert(cartes[p+(i-1)*p+j],math.random(k),(k)*p+((k*i+j-1)%p)+1); - end - end - printcard(cartes[p+(i-1)*p+j],p); - end - end - return cartes; -end - - -function printcard(carte,p) - -- prend une carte en entrée (tableau de p+1 éléments) - -- et génère le code tex d'une page à partir des images - -- nommées suivant le prefixe - tex.sprint("\\newpage\\begin{tikzpicture}[remember picture, overlay]\\coordinate(Or) at (current page.north west);"); - -- cadre de la carte - tex.sprint("\\ifboolKV[ClesDobble]{Cercle}{\\draw[line width=.2cm,PfCDobbleColor] (4,-4) circle (3.9cm);}{\\draw[line width=.2cm,PfCDobbleColor] ($(Or)+(0.1,-0.1)$) rectangle ($(Or)+(7.9,-7.9)$);}"); - -- entier aléatoire pour l'élément au centre - local has=intrand(p+1); - local compt=0; - for i=0,p do - -- l'image au contre - if i== has then - tex.sprint("\\node[scale="..scalerand(0.7,1)..",rotate="..intrand(360).."] at ($(Or)+(4,-4)$) {"..symbole[carte[i]+1].."};"); - else - -- les autres tout le tour, taille aléatoire, rayon variant, rotation aléatoire - tex.sprint("\\node[scale="..scalerand(0.7,1)..",rotate="..intrand(360).."] at ($("..(360/(p)*compt)..":"..scalerand(2.4,2.5)..")+(Or)+(4,-4)$) {"..symbole[carte[i]+1].."};"); - compt=compt+1; - end - end - tex.sprint("\\end{tikzpicture}"); -end - - -function intrand(p) -- retourne un entier entre 0 et p-1 - return math.floor(p*math.random()); -end - -function scalerand(a,b) -- retourne un nombre aléatoire entre a et b - return a+(b-a)*math.random(); -end diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 235ce5fbfa..d246599ef5 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.3.1] - 2023-08-01 + +### Fixed + +- Suppress alignment token in formatted asymmetric uncertainty (see issue + [\#679](https://github.com/josephwright/siunitx/issues/679)) + ## [v3.3.0] - 2023-07-31 ### Added @@ -1971,7 +1978,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.0...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.1...HEAD +[v3.3.1]: https://github.com/josephwright/siunitx/compare/v3.3.0...v3.3.1 [v3.3.0]: https://github.com/josephwright/siunitx/compare/v3.2.9...v3.3.0 [v3.2.9]: https://github.com/josephwright/siunitx/compare/v3.2.8...v3.2.9 [v3.2.8]: https://github.com/josephwright/siunitx/compare/v3.2.7...v3.2.8 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index fdc1658a42..669eb11190 100644 Binary files a/macros/latex/contrib/siunitx/siunitx-code.pdf and b/macros/latex/contrib/siunitx/siunitx-code.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index faf216ac67..7ee8fc1653 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -4407,13 +4407,13 @@ { + \exp_not:N \@@_output_uncert_augment:nnnn - {#4} {#1} {#4} {#2} + {#4} {#1} {#4} { } } \char_generate:nn { `\_ } { 8 } { - \exp_not:N \@@_output_uncert_augment:nnnn - {#5} {#1} {#5} {#2} + {#5} {#1} {#5} { } } \exp_not:N \@@_output_uncertainty_unaligned:n {#2} } diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 52dacc5c54..765062ae21 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -122,7 +122,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2023-07-31} {3.3.0} +\ProvidesExplPackage {siunitx} {2023-08-01} {3.3.1} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index 299ec6f781..c92c1d87cf 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ -- cgit v1.2.3