texlive[72622] Master/texmf-dist: profmaquette (22oct24)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 22 22:38:40 CEST 2024
Revision: 72622
https://tug.org/svn/texlive?view=revision&revision=72622
Author: karl
Date: 2024-10-22 22:38:39 +0200 (Tue, 22 Oct 2024)
Log Message:
-----------
profmaquette (22oct24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf
trunk/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip
trunk/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
Modified: trunk/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty 2024-10-22 20:38:31 UTC (rev 72621)
+++ trunk/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty 2024-10-22 20:38:39 UTC (rev 72622)
@@ -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/10/17}%
+\def\filedate{2024/10/21}%
\let\PfMfiledate\filedate%
-\def\fileversion{0.99-h}%
+\def\fileversion{0.99-i}%
\let\PfMfileversion\fileversion%
\ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]%
@@ -78,7 +78,7 @@
\setKVdefault[Kholle]{Sujet=1,Numero=1,Date=15,Niveau=TSI-1,Code=\jobname,Lieu=Lyc\'ee
du Hainaut (Valenciennes),NomEleve=Albert Einstein,CR=false}%
\setKVdefault[CAN]{Date=\today,Niveau=6,Duree=9,CoefQ=0.4,CoefR=0.35,CoefJ=0.1}%
-\setKVdefault[ClesExercices]{Open,NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,Grilles=false,Cinq=false,Huit=false,TitreSol=false,NonUtilise=false,Profile=false,AEntretenir=false,Fragile=false,AvecIndications=false,ACompleter=false,Aide=0,Score=0,EchelleSeyes=8,Ajout={},TitreCorrige=Corrigé de l'exercice,Interieur=false}%
+\setKVdefault[ClesExercices]{Open,NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,Grilles=false,Cinq=false,Huit=false,TitreSol=false,NonUtilise=false,Profile=false,AEntretenir=false,Fragile=false,AvecIndications=false,ACompleter=false,Aide=0,Score=0,EchelleSeyes=8,Ajout={},TitreCorrige=Corrigé de l'exercice,Interieur=false,NombreEleves=0,Categorie=0}%
%\defKV[ClesExercices]{AMCReponses=\ifboolKV[Boulot]{AMC}{\setKV[ClesExercices]{Open=false}}{}}%
\defKV[ClesExercices]{TitreSolution=\setKV[ClesExercices]{TitreSol}}%
\defKV[ClesExercices]{Source=\setKV[ClesExercices]{AffichageSource}}%
@@ -1446,7 +1446,15 @@
\NewDocumentCommand{\PfMAffichageLogos}{}{%
\ifboolKV[ClesExercices]{Calculatrice}{}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\cancel{\faCalculator}};\stepcounter{PfMNbLogo}}%
\ifboolKV[ClesExercices]{Oral}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faBullhorn};\stepcounter{PfMNbLogo}}{}
- }%
+ %
+ \ifnum\fpeval{\useKV[ClesExercices]{NombreEleves}}=1\relax
+ \node[colLogo,fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faUser};\stepcounter{PfMNbLogo}
+ \else%
+ \ifnum\fpeval{\useKV[ClesExercices]{NombreEleves}}>1\relax
+ \node[colLogo,fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faUsers};\stepcounter{PfMNbLogo}%
+ \fi%
+ \fi%
+}
%
\NewDocumentCommand{\PfMAffichageCompetencesTravaillees}{}{%
\ifboolKV[ClesExercices]{AffichageCompetence}{%
@@ -2190,7 +2198,7 @@
\NewDocumentCommand\Complement{+m}{%
\ifboolKV[Boulot]{CAN}{%
- \expandafter\xdef\csname CNReponse\endcsname{#1}%
+ \expandafter\xdef\csname CNReponse\endcsname{\noexpand #1}%
}{%
\begin{center}
#1%
@@ -3610,6 +3618,18 @@
anchor=west,
xshift=\kvtcb at leftlower,
] at (frame.north west){\color{colLogo}\resizebox{1em}{!}{\carreEntoure{}}~\Large\bfseries\sffamily\useKV[Fiche]{NomExercice}\ifboolKV[ClesExercices]{Numerote}{ \thePfMExo}{}\ifboolKV[ClesExercices]{AffichageTitre}{\ifboolKV[ClesExercices]{Numerote}{.~}{\xdef\PfMTitiLgNE{\useKV[Fiche]{NomExercice}}\IfStrEq{\PfMTitiLgNE}{}{}{.~}}\useKV[ClesExercices]{Titre}}{}};
+ \node[%
+ name=B,
+ fill=ColExoFiche,
+ anchor=east,
+ xshift=-\kvtcb at leftlower,
+ ] at (frame.north east){\color{colLogo}\Large\bfseries\sffamily\ifnum\fpeval{\useKV[ClesExercices]{Categorie}}=1\relax
+ Spécialistes%
+ \else
+ \ifnum\fpeval{\useKV[ClesExercices]{Categorie}}=2\relax
+ Non spécialistes
+ \fi
+ \fi};
%%
\useKV[ClesExercices]{Ajout}%
%%
@@ -5105,7 +5125,7 @@
\def\empty at list{}
% Macro pour définir une nouvelle liste
-\newcommand\definelist[2]{\def#1{#2}}
+\newcommand\PfMdefinelist[2]{\def#1{#2}}
% Macro pour ajouter un élément en fin de liste
\newcommand\push[2]{%
@@ -5306,7 +5326,7 @@
}
\makeatother
\newcommand\initEnsemblede{%
- \definelist{\EnsembleDe}{%
+ \PfMdefinelist{\EnsembleDe}{%
{2,4,6,8,10,12},%
{1,3,5,7,9,11},%
{2,3,5,7,11,13},%
@@ -5322,11 +5342,11 @@
\newcommand\initpremiers{%
- \definelist{\listpremiers}{13,17,19,23,29,31,37,41,43,47}%
+ \PfMdefinelist{\listpremiers}{13,17,19,23,29,31,37,41,43,47}%
}
\newcommand\initPremiers{%
- \definelist{\listPremiers}{71,73,79,83,89,97,101,103,107,109,113,127,131,137,139}%
+ \PfMdefinelist{\listPremiers}{71,73,79,83,89,97,101,103,107,109,113,127,131,137,139}%
}
\newcommand\getpremier{%
@@ -5345,7 +5365,7 @@
}
\newcommand\initalpha{%
- \definelist{\alphas}{b,c,d,e,f}
+ \PfMdefinelist{\alphas}{b,c,d,e,f}
}
\newcommand\getalpha{%
\randomextract{\alphas}{\alphaA}%
@@ -5352,12 +5372,12 @@
}%
\newcommand\initsommet{%
- \definelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ?
+ \PfMdefinelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ?
N,O,P,Q,R,S,T,U,V,W,X,Y,Z}%
}
\newcommand\initsommetrep{%
- \definelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ?
+ \PfMdefinelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ?
N,P,Q,R,S,T,U,V,W,X,Y,Z}%
}
@@ -5440,7 +5460,7 @@
\randomextract{\sommets}{\pM}%
}
-\definelist{\quadruplets}{%
+\PfMdefinelist{\quadruplets}{%
{2{,}8,9{,}6,6,8},%10
{3{,}2,12{,}6,5,12},%13
{6{,}6,11{,}2,5,12},%13
@@ -5470,7 +5490,7 @@
{24{,}6,32{,}8,16{,}8,37{,}4}%41
}%
-\definelist{\Quadruplets}{%pour un fonctionnement avec \fpeval
+\PfMdefinelist{\Quadruplets}{%pour un fonctionnement avec \fpeval
{2.8,9.6,6,8},%10
{3.2,12.6,5,12},%13
{6.6,11.2,5,12},%13
@@ -5500,7 +5520,7 @@
{24.6,32.8,16.8,37.4}%41
}%
-\definelist{\tripletspytha}{{2{,}8,9{,}6,10},{6,8,10},%10
+\PfMdefinelist{\tripletspytha}{{2{,}8,9{,}6,10},{6,8,10},%10
{3{,}2,12{,}6,13},{5,12,13},%13
{6{,}6,11{,}2,13},{7{,}8,10{,}4,13},%13
{4{,}2,14{,}4,15},{9,12,15},%15
@@ -5517,12 +5537,12 @@
{24{,}6,32{,}8,41},{26{,}6,31{,}2,41}%41
}%
-\definelist{\tripletspythaentier}{%
+\PfMdefinelist{\tripletspythaentier}{%
{3,4,5},{5,12,13},{6,8,10},{7,24,25},{8,15,17},{9,12,15},{9,40,41},{10,24,26},{11,60,61},{12,16,20},{12,35,37},{13,84,85},{14,48,50},{15,20,25},{15,36,39},{16,30,34},{16,63,65},{18,24,30},{18,80,82},{20,21,29},{20,48,52},{21,28,35},{21,72,75},{24,32,40},{24,45,51},{24,70,74},{25,60,65},{27,36,45},{28,45,53},{28,96,100},{30,40,50},{30,72,78},{32,60,68},{33,44,55},{33,56,65},{35,84,91},{36,48,60},{36,77,85},{39,52,65},{39,80,89},{40,42,58},{40,75,85},{42,56,70},{45,60,75},{48,55,73},{48,64,80},{51,68,85},{54,72,90},{57,76,95},{60,63,87},{60,80,100},{65,72,97}}%%d'après villement.gerard.free.fr
\newcommand\initcarre{%
- \definelist{\carres}{4,9,16,25,36,49,64,81,100}%
+ \PfMdefinelist{\carres}{4,9,16,25,36,49,64,81,100}%
}
\newcommand\getcarre{%
\randomextract{\carres}{\carreA}
@@ -5530,7 +5550,7 @@
%2009-2018
% Source https://ec.europa.eu/eurostat/databrowser/view/ENV_AIR_GGE__custom_743354/default/table?lang=en
-\definelist{\GazSerreEu}{%
+\PfMdefinelist{\GazSerreEu}{%
{{la },Belgique,131038.46,123642.9},%
{{la },Bulgarie,58617.88,58595.07},%
{{le },Danemark,65734.85,51299.75},%
@@ -5554,7 +5574,7 @@
\extract{\GazSerrePays}{1}{\ConsoBPaysGS}%
}
- \definelist{\VehiculesINSEE}{%
+ \PfMdefinelist{\VehiculesINSEE}{%
{2012,13132,22264,8111,15242},%
{2013,12853,22712,8028,15020},%
{2014,12778,23134,8049,14905},%
More information about the tex-live-commits
mailing list.