profmaquette (3may24)

git-svn-id: svn://tug.org/texlive/trunk@71161 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 60 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.pdf b/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.pdf
index b6afbc2fbbc..655d73fe6ee 100644
--- a/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.pdf
+++ b/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.zip b/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.zip
index ef4275d545f..460f5a1bbd5 100644
--- a/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.zip
+++ b/Master/texmf-dist/doc/latex/profmaquette/ProfMaquette-doc.zip
diff --git a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
index 9564aec94cf..9aa462bb76f 100644
--- a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
+++ b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.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{2024/04/28}%
+\def\filedate{2024/05/02}%
 \let\PfMfiledate\filedate%
-\def\fileversion{0.93}%
+\def\fileversion{0.94}%
 \let\PfMfileversion\fileversion%
 
 \ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]%
@@ -37,6 +37,7 @@
 
 \makeatletter
 \gdef\PfMFontSize{\@ptsize}
+%\gdef\PfMFontSize{\f@size}
 \makeatother
 %définition des clés
 \RequirePackage{simplekv}%
@@ -240,6 +241,15 @@
     \repeat
 }%
 
+% On bloque la graine de fabrication des nombres aléatoires.
+\ExplSyntaxOn
+\cs_new_eq:NN \PfMGraineAlea \sys_gset_rand_seed:n
+\ExplSyntaxOff
+
+\ExplSyntaxOn
+\cs_new_eq:NN \PfMChoisisGraineAlea \int_rand:n
+\ExplSyntaxOff
+
 %% Gestion de l'affichage ou pas des item (Pour élèves PAP) par exemple
 % Code by egreg : https://tex.stackexchange.com/questions/627250/hide-specific-item-in-a-list
 \ExplSyntaxOn
@@ -1924,7 +1934,7 @@
 \setsepchar{,}%
 \readlist*\ListePetitsObjets{bonbons,billes,biscuits,gommes,clous,vis,cahiers,trousses}%
 \readlist*\ListeFruits{pommes,poires,abricots,cerises,fraises,framboises,noix,pêches,nectarines,myrtilles,oranges,mandarines,kiwis}%
-\readlist*\ListeVariables{a,b,c,m,n,p,r,s,t,x,y,z}%
+\readlist*\ListeVariables{a,b,c,\ell,m,n,p,r,s,t,x,y,z}%
 
 \makeatletter
 \def\ExoCANWrite{%
@@ -3353,14 +3363,15 @@
   }{%
     \ifnum\thePfMMaquette=1\relax%
     \else%
-      \ifnum\PfMFontSize=0\relax%
-        \fontsize{10}{\fpeval{1.2*10}}%
-      \else\ifnum\PfMFontSize=1\relax%
-          \fontsize{11}{\fpeval{1.2*11}}%
-        \else%
-          \fontsize{12}{\fpeval{1.2*12}}%
-        \fi%
-      \fi%
+      %\ifnum\PfMFontSize=0\relax%
+      %  \fontsize{10}{\fpeval{1.2*10}}%
+      %\else\ifnum\PfMFontSize=1\relax%
+      %    \fontsize{11}{\fpeval{1.2*11}}%
+      %  \else%
+      %    \fontsize{12}{\fpeval{1.2*12}}%
+      %  \fi%
+      %\fi%
+      \fontsize{\fpeval{10+\PfMFontSize}}{\fpeval{1.2*(10+\PfMFontSize)}}%
       \selectfont%
       \renewcommand{\JustifyingParindent}{\parindent}
       \justifying%
@@ -3392,6 +3403,7 @@
   \fi%
   \PfMBasculeDys%
   \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
+  \PfMChangerTailleCorrection%
 }%
 
 \NewDocumentCommand\PfMAffichageCorrectionColonnes{}{%
@@ -3421,7 +3433,7 @@
   \stepcounter{PfMMaquette}%
   % options de boulot
   \IfHookExistsTF{env/Maquette/after}{\RemoveFromHook{env/Maquette/after}[*]}{}%
-  \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]}{}%
+  %\IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]}{}%
   % \AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}%
   \useKVdefault[Boulot]%
   \setKV[Boulot]{#1}%
@@ -3447,14 +3459,15 @@
   \ifboolKV[Boulot]{CAN}{%
       \setKV[CAN]{#2}%
       %\ifboolKV[Boulot]{CorrigeSeul}{}{\TikzCAN}%
-      \PfMChangerTailleCorrection%
       \setcounter{PfMCNNumQ}{0}%
       \setlength{\PfMLargeurQuestion}{\useKV[CAN]{CoefQ}\linewidth}\setlength{\PfMLargeurReponse}{\useKV[CAN]{CoefR}\linewidth}\setlength{\PfMLargeurJury}{\useKV[CAN]{CoefJ}\linewidth}%
       \let\exercice\ExoCANWrite\let\endexercice\endExoCANWrite%
       \AddToHook{env/exercice/begin}{\setcounter{PfMAlea}{0}}%
       \AddToHook{env/Maquette/end}{%
+        \xdef\PfMAncienneGraine{\PfMChoisisGraineAlea{123456789}}
         \xdef\PfMCANTotalExo{\thePfMExo}%
         \setbox\PfMSauvegardeBox\vbox{%
+          \PfMGraineAlea{\thePfMMaquette}
           \setcounter{PfMExo}{0}%
           \renewcommand{\arraystretch}{2}%
           \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
@@ -3474,12 +3487,41 @@
         \TikzCANCor{#2}%
         \PfMAffichageCorrectionColonnes%
         \clearpage
+        \normalsize%
         \TikzCAN%
-        \usebox{\PfMSauvegardeBox}%
-      }{%
-        \TikzCAN%
-        \usebox{\PfMSauvegardeBox}%
-        \ifboolKV[Boulot]{CorrigeFin}{\ifboolKV[Boulot]{CorrigeInverse}{}{\clearpage
+        \PfMGraineAlea{\thePfMMaquette}%
+        \setcounter{PfMCNNumQ}{0}%
+          \setcounter{PfMExo}{0}%
+          \renewcommand{\arraystretch}{2}%
+          \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
+            \hhline{~---}%
+            \multicolumn{1}{c|}{}&\cellcolor{gray!15}\centering Question&\cellcolor{gray!15}\centering Réponse&\cellcolor{gray!15}\centering\arraybackslash Jury\\%
+            \hline%
+            \endhead%
+            \xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{%
+              \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\
+              \hline%
+            }%
+          \end{longtable}%
+          \renewcommand{\arraystretch}{1}%
+        }{%
+          \PfMGraineAlea{\PfMAncienneGraine}%
+          \TikzCAN%
+          \setcounter{PfMCNNumQ}{0}%
+        \setcounter{PfMExo}{0}%
+          \renewcommand{\arraystretch}{2}%
+          \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
+            \hhline{~---}%
+            \multicolumn{1}{c|}{}&\cellcolor{gray!15}\centering Question&\cellcolor{gray!15}\centering Réponse&\cellcolor{gray!15}\centering\arraybackslash Jury\\%
+            \hline%
+            \endhead%
+            \xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{%
+              \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\
+              \hline%
+            }%
+          \end{longtable}%
+          \renewcommand{\arraystretch}{1}%
+          \ifboolKV[Boulot]{CorrigeFin}{\ifboolKV[Boulot]{CorrigeInverse}{}{\clearpage
         \PfMPrepareCorrection{#1}%
         \TikzCANCor{#2}%
         \PfMAffichageCorrectionColonnes%