summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/profcollege/latex/PfCCalisson.tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/profcollege/latex/PfCCalisson.tex')
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalisson.tex12
1 files changed, 8 insertions, 4 deletions
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalisson.tex b/macros/latex/contrib/profcollege/latex/PfCCalisson.tex
index 60c424bdff..929b1fb28e 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCalisson.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCalisson.tex
@@ -1,7 +1,7 @@
%%%
% Calisson
%%%
-\setKVdefault[Calisson]{Taille=3,Solution=false,Rayon=5cm,Couleur=red}%
+\setKVdefault[Calisson]{Taille=3,Solution=false,Rayon=5cm,Couleur=red,CouleurTrace=black}%
\def\UpdatetoksCalissong#1\nil{\addtotok\tokcalissonlistetracesg{,"#1"}}%
\def\UpdatetoksCalissongDepart#1\nil{\addtotok\tokcalissonlistetracesg{"#1"}}%
@@ -143,8 +143,10 @@
boolean Solution;
Solution:=\useKV[Calisson]{Solution};
%
- color CouleurSolution;
+ color CouleurSolution,CouleurTrace;
CouleurSolution:=\useKV[Calisson]{Couleur};
+ CouleurTrace:=\useKV[Calisson]{CouleurTrace};
+ %
%
Rayon=\useKV[Calisson]{Rayon};
Taille=\useKV[Calisson]{Taille};
@@ -219,12 +221,14 @@
Depla:=Hor;
%
vardef LesTracesg(text t)=
+ drawoptions(withcolor CouleurTrace);
trace polygone(A,B,C,D,E,F) withpen pencircle scaled 2;
for k=1 upto 2*Taille-1:
trace (point(k*length Gauche/(2*Taille)) of Gauche)--(point(k*length Droit/(2*Taille)) of Droit) dashed evenly;
trace (point(k*length Haut/(2*Taille)) of Haut)--(point(k*length Bas/(2*Taille)) of Bas) dashed evenly;
trace (point(k*length TopGauche/(2*Taille)) of TopGauche)--(point(k*length BasDroit/(2*Taille)) of BasDroit) dashed evenly;
endfor;
+ drawoptions(withcolor CouleurTrace);
n:=0;
for p_=t:
n:=n+1;
@@ -236,7 +240,7 @@
fi;
if (Retiens="0") or (Retiens="f"):
elseif Retiens="t":
- trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2;
+ trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2 withcolor CouleurTrace;
elseif Retiens="s":
if Solution:
trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2 withcolor CouleurSolution;
@@ -263,7 +267,7 @@
% fill ((fullcircle scaled 3mm) shifted M[n]);
if (Retiens="0") or (Retiens="f"):
elseif Retiens="t":
- trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2;
+ trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2 withcolor CouleurTrace;
elseif Retiens="s":
if Solution:
trace (chemin(Depla,E) shifted (M[n]-E)) withpen pencircle scaled 2 withcolor CouleurSolution;