diff options
Diffstat (limited to 'macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex')
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex b/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex index 7917c5138b..9fc7f3446d 100644 --- a/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex +++ b/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex @@ -44,9 +44,9 @@ \xdef\PfCRIRetiensListeDiviseurs{\PfCRIRetiensListeDiviseurs \the\anp,-\the\anp} \fi \fi -} +}% -\setKVdefault[RondeInfernale]{Solution=false,Relatifs=false,Etapes=4,Perso=false,Cles=false,Vide,Rayon=2.5cm,Rectangle=false}% +\setKVdefault[RondeInfernale]{Solution=false,Relatifs=false,Etapes=4,Perso=false,Cles=false,Vide,Rayon=2.5cm,Rectangle=false,Div=false,CDot=false}% \defKV[RondeInfernale]{Graine=\PfCGraineAlea{#1}} \defKV[RondeInfernale]{Cle=\setKV[RondeInfernale]{Cles}\setKV[RondeInfernale]{Vide=false}}% \defKV[RondeInfernale]{ListeOperations=\setKV[RondeInfernale]{Perso}}% @@ -232,8 +232,10 @@ \ifluatex \mplibforcehmode \begin{mplibcode} - boolean Vide,Rectangle,Perso; + boolean Vide,Rectangle,Perso,Div,CDot; Vide=\useKV[RondeInfernale]{Vide}; + Div=\useKV[RondeInfernale]{Div}; + CDot=\useKV[RondeInfernale]{CDot}; Rectangle=\useKV[RondeInfernale]{Rectangle}; Perso=\useKV[RondeInfernale]{Perso}; if Perso: @@ -265,9 +267,17 @@ for p_=t: n:=n+1; if p_="*": + if CDot: + label(TEX("$\cdot"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + else: label(TEX("$\times"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + fi; elseif p_="/": + if Div: + label(TEX("$:"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + else: label(TEX("$\div"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + fi; else: label(TEX("$"&p_&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); fi; @@ -280,17 +290,33 @@ n:=n+1; if n=nbcase: if p_="*": + if CDot: + label.bot(TEX("$\cdot"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + else: label.bot(TEX("$\times"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + fi; elseif p_="/": + if Div: + label.bot(TEX("$:"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + else: label.bot(TEX("$\div"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + fi; else: label.bot(TEX("$"&p_&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); fi; else: if p_="*": + if CDot: + label.top(TEX("$\cdot"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + else: label.top(TEX("$\times"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + fi; elseif p_="/": + if Div: + label.top(TEX("$:"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + else: label.top(TEX("$\div"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + fi; else: label.top(TEX("$"&p_&Nombre[n]&"$"),1/2[A[n-1],A[n]]); fi; @@ -378,9 +404,17 @@ for p_=t: n:=n+1; if p_="*": + if CDot: + label(LATEX("$\cdot"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + else: label(LATEX("$\times"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + fi; elseif p_="/": + if Div: + label(LATEX("$:"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + else: label(LATEX("$\div"&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); + fi; else: label(LATEX("$"&p_&Nombre[n]&"$"),rotation(A[nbcase-n],O,0.5*(360/nbcase))); fi; @@ -393,17 +427,33 @@ n:=n+1; if n=nbcase: if p_="*": + if CDot: + label.bot(LATEX("$\cdot"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + else: label.bot(LATEX("$\times"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + fi; elseif p_="/": + if Div: + label.bot(LATEX("$:"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + else: label.bot(LATEX("$\div"&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); + fi; else: label.bot(LATEX("$"&p_&Nombre[n]&"$"),1/2[A[n-1],A[0]]+u*(0,-1)); fi; else: if p_="*": + if CDot: + label.top(LATEX("$\cdot"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + else: label.top(LATEX("$\times"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + fi; elseif p_="/": + if Div: + label.top(LATEX("$:"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + else: label.top(LATEX("$\div"&Nombre[n]&"$"),1/2[A[n-1],A[n]]); + fi; else: label.top(LATEX("$"&p_&Nombre[n]&"$"),1/2[A[n-1],A[n]]); fi; |