summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex')
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex17
1 files changed, 14 insertions, 3 deletions
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex b/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
index b6d70fe28e..79ffe0f582 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
@@ -110,10 +110,13 @@
\def\MPCalculatrice#1#2#3{
% #1 Calcul %2 r\'eponse
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode%
\begin{mplibcode}%
input PfCCalculatrice;
LargeurEcran:=\useKV[ClesCalculatrice]{Largeur};
+ boolean Calcul;
+ Calcul=\useKV[ClesCalculatrice]{Calcul};
LCD(#1)(#2)(#3);
\end{mplibcode}
\else
@@ -123,15 +126,23 @@
\fi
}
-\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0,BL=0.775,Largeur=120}
+\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0,BL=0.775,Largeur=120,Calcul=false}
+
+\newtoks\toklistenombrecalculatrice
+\def\UpdatetoksCalculatrice#1\nil{\addtotok\toklistenombrecalculatrice{"\fpeval{#1}"}}
\newcommand\Calculatrice[2][]{%
\setstackgap{L}{\useKV[ClesCalculatrice]{BL}\baselineskip}%
\useKVdefault[ClesCalculatrice]%
\setKV[ClesCalculatrice]{#1}%
\ifboolKV[ClesCalculatrice]{Ecran}{%
- \setsepchar[*]{,*/}%
- \readlist\ListeCalc{#2}%
+ \ifboolKV[ClesCalculatrice]{Calcul}{%
+ \setsepchar[*]{,*ยง}%
+ \readlist\ListeCalc{#2}%
+ }{%
+ \setsepchar[*]{,*/}%
+ \readlist\ListeCalc{#2}%
+ }%
\MPCalculatrice{\ListeCalc[1,1]}{\ListeCalc[1,2]}{\useKV[ClesCalculatrice]{NbLignes}}%
}{%
\setsepchar[*]{,*/}%