summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-01 21:56:07 +0000
committerKarl Berry <karl@freefriends.org>2021-02-01 21:56:07 +0000
commit656203b693fed8135d9382674edb90ba92d32be2 (patch)
tree13b6f619ed6cdb4a63134a68b0b69e980f94d161 /Master
parent4f9de1dfebdc66d367d730252d6f224d37e96ee6 (diff)
profcollege (31jan21)
git-svn-id: svn://tug.org/texlive/trunk@57589 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdfbin1643198 -> 1702509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.zipbin1055913 -> 1216103 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/README2
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty1168
4 files changed, 864 insertions, 306 deletions
diff --git a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf b/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf
index 7bdee3edec6..941ccd943fc 100644
--- a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf
+++ b/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.zip b/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.zip
index ffd4e8dd82a..b11824f7d50 100644
--- a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.zip
+++ b/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profcollege/README b/Master/texmf-dist/doc/latex/profcollege/README
index 1c43726c9dc..4b103d0a8fd 100644
--- a/Master/texmf-dist/doc/latex/profcollege/README
+++ b/Master/texmf-dist/doc/latex/profcollege/README
@@ -10,4 +10,4 @@ profcollege is a useful package to daily use of LaTeX.
Author : Christophe Poulain
email : chrpoulain@gmail.com
-Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
index 30aa5d3e9d2..121428955bd 100644
--- a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
+++ b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
@@ -2,6 +2,7 @@
% Licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
%%%%%%%
+% 90 : Reprise d'une partie de la doc. Quelques ajouts.
% 87-88 : amélioration \Thales. \Labyrinthe.
% 85 : passage à lua.
% 75 : plein de choses que j'ai oubliées :(
@@ -58,7 +59,7 @@
% 19 : Modification AAntécédent dans Affine + Amélioration Pythagore (Cas des triangles rectangles isocèles, dans le calcul de la longueur d'un côté)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2021/01/18 v0.89 Aide pour l'utilisation de LaTeX au collège]
+\ProvidesPackage{ProfCollege}[2021/01/30 v0.90 Aide pour l'utilisation de LaTeX au collège]
\RequirePackage{mathtools}%Amélioration des rendus
\RequirePackage{amssymb}
@@ -124,7 +125,7 @@
\RequirePackage{tikz}
% https://tex.stackexchange.com/questions/349259/curved-arrow-describing-a-step-in-a-equation-derivation
%https://tex.stackexchange.com/questions/58656/best-way-to-draw-a-chevron-diagram-using-tikz
-\usetikzlibrary{calc,arrows,tikzmark,chains,positioning,shapes.symbols}
+\usetikzlibrary{calc,arrows,tikzmark,chains,positioning,shapes.symbols,babel}
\RequirePackage{suffix}%pour la commande étoilée
@@ -137,9 +138,9 @@
\RequirePackage{stackengine}
\RequirePackage[thicklines]{cancel}
-\ifpdftex
-\RequirePackage[babel=true,kerning=true]{microtype}%Pour gérer le souci du ; dans tikz avec pdftex...
-\fi
+%\ifpdftex
+%\RequirePackage[babel=true,kerning=true]{microtype}%Pour gérer le souci du ; dans tikz avec pdftex...
+%\fi
% https://stackoverflow.com/questions/3391103/how-to-make-the-grayed-round-box-using-tiks
\RequirePackage{environ}
@@ -674,7 +675,7 @@
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie4]
- $\square$ \textbf{Le nombre de \ListeFlash[1,5] est :}
+ $\square$ \textbf{\ListeFlash[1,5] est le nombre des :}
\tcbox[BoiteExpression]{\phantom{1500000}}
\end{tcolorbox}
\end{CadreNombre}
@@ -712,22 +713,22 @@
\tcbox[BoiteExpression]{\ListeFlash[1,1]}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie1]
- $\square$ \textbf{Convertis la en \ListeFlash[1,2] :}
+ $\square$ \textbf{Convertis-la en \ListeFlash[1,2] :}
\tcbox[BoiteExpression]{\phantom{1500000000}}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie2]
- $\square$ \textbf{Convertis la en \ListeFlash[1,3] :}
+ $\square$ \textbf{Elle peut aussi s'écrire \ListeFlash[1,3] }
\tcbox[BoiteExpression]{\phantom{1500000000}}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie3]
- $\square$ \textbf{Ajoute lui \ListeFlash[1,4] :}
+ $\square$ \textbf{Ajoute-lui \ListeFlash[1,4] :}
\tcbox[BoiteExpression]{\phantom{\hbox to5em{1500000}}}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie4]
- $\square$ \textbf{Enlève lui \ListeFlash[1,5] :}
+ $\square$ \textbf{Enlève-lui \ListeFlash[1,5] :}
\tcbox[BoiteExpression]{\phantom{\hbox to5em{1500000}}}
\end{tcolorbox}
\end{CadreNombre}
@@ -760,17 +761,17 @@
\tcbox[BoiteExpression]{\num{\ListeFlash[1,1]}}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie1]
- \textbf{\'Ecriture en fraction décimale :}
+ $\square$ \textbf{\'Ecriture en fraction décimale :}
\tcbox[BoiteExpression]{$\dfrac{\phantom{1000000}}{\phantom{1000000}}$}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie2]
- \begin{tabular}{c}
+ $\square$ \begin{tabular}{c}
\textbf{Partie}\\
\textbf{entière}
\end{tabular} \textbf{: }
\tcbox[BoiteExpression]{\phantom{100000}}\hfill%
- \begin{tabular}{c}
+ $\square$ \begin{tabular}{c}
\textbf{Partie}\\
\textbf{décimale}
\end{tabular} \textbf{: }
@@ -778,12 +779,12 @@
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie3]
- \textbf{\useKV[ClesFlash]{Operation} le par
+ $\square$ \textbf{\useKV[ClesFlash]{Operation}-le par
\ListeFlash[1,2] :} \tcbox[BoiteExpression]{\phantom{1000000000}}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie4]
- \textbf{Trouve le nombre entier le plus proche :} \tcbox[BoiteExpression]{\phantom{10000000}}
+ $\square$ \textbf{Trouve le nombre entier le plus proche :} \tcbox[BoiteExpression]{\phantom{10000000}}
\end{tcolorbox}
\end{CadreNombre}
}
@@ -794,15 +795,15 @@
\tcbox[BoiteExpression]{\ListeFlash[1,1]}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie1]
- $\square$ \textbf{Ajoute lui}
+ $\square$ \textbf{Ajoute-lui}
\tcbox[BoiteExpression]{\ListeFlash[1,2]}\hfill$\square$
- \textbf{Soustrais lui} \tcbox[BoiteExpression]{\ListeFlash[1,3]}
+ \textbf{Soustrais-lui} \tcbox[BoiteExpression]{\ListeFlash[1,3]}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie2]
- $\square$ \textbf{Multiplie le par }
+ $\square$ \textbf{Multiplie-le par }
\tcbox[BoiteExpression]{\ListeFlash[1,4]}\hfill$\square$
- \textbf{Divise le par } \tcbox[BoiteExpression]{\ListeFlash[1,5]}
+ \textbf{Divise-le par } \tcbox[BoiteExpression]{\ListeFlash[1,5]}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie3]
@@ -824,22 +825,22 @@
\tcbox[BoiteExpression]{\ListeFlash[1,1]}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie1]
- $\square$ \textbf{Ajoute lui}
+ $\square$ \textbf{Ajoute-lui}
\tcbox[BoiteExpression]{\ListeFlash[1,2]}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie2]
- $\square$ \textbf{Soustrais lui}
+ $\square$ \textbf{Soustrais-lui}
\tcbox[BoiteExpression]{\ListeFlash[1,3]}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie3]
- $\square$ \textbf{Multiplie la par}
+ $\square$ \textbf{Multiplie-la par}
\tcbox[BoiteExpression]{\ListeFlash[1,4]}
\end{tcolorbox}
\ifboolKV[ClesFlash]{Pause}{\pause}{}
\begin{tcolorbox}[ExpressionSerie4]
- $\square$ \textbf{\'Evalue la lorsque} \tcbox[BoiteExpression]{\ListeFlash[1,5]}
+ $\square$ \textbf{\'Evalue-la lorsque} \tcbox[BoiteExpression]{\ListeFlash[1,5]}
\end{tcolorbox}
\end{CadreNombre}
}
@@ -1112,7 +1113,7 @@
%%%%%%%%%%%%%
%%% Fractions
%%%%%%%%%%%%%
-\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Couleur=green,Reponse=false,Multiple=1}
+\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1}
\def\MPFractionRegulier#1#2#3#4#5{
% #1 rayon, #2 nb côtés, #3 num, #4 deno, #5 couleur
@@ -1141,7 +1142,7 @@
fi;
\end{mplibcode}
\else
-\begin{mpost}[mpsettings={input PfC-Geometrie;}]
+\begin{mpost}
pair O,A[],B[];
O=u*(0,0);
path cc,cd;
@@ -1166,6 +1167,62 @@
\fi
}
+\def\MPFractionRegulierH#1#2#3#4#5#6{%
+ % #1 rayon, #2 nb côtés, #3 num, #4 deno, #5 couleur
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ pair O,A[],B[];
+ O=u*(0,0);
+ path cc,cd;
+ cc=cercles(O,#1);
+ for k=0 upto #2:
+ A[k]=pointarc(cc,k*(360/#2));
+ endfor;
+ cd=polygone(A0 for k=1 upto #2-1:,A[k] endfor);
+ for k=0 upto #4-1:
+ B[k]=point(k*(#2/#4)) of cd;
+ endfor;
+ drawoptions(withpen pencircle scaled#6);
+ draw hachurage(O--arccercle(B[0],B[#3],O)--cycle,1.5*360/#2,0.25,0) withcolor #5;
+ clip currentpicture to cd;
+ drawoptions(withpen pencircle scaled#6);
+ draw polygone(A0 for k=1 upto #2:,A[k] endfor);
+ if #4>1:
+ for k=0 upto #4-1:
+ draw segment(O,B[k]) cutafter cd;
+ endfor;
+ drawoptions();
+ fi;
+ \end{mplibcode}
+ \else
+\begin{mpost}
+ pair O,A[],B[];
+ O=u*(0,0);
+ path cc,cd;
+ cc=cercles(O,#1);
+ for k=0 upto #2:
+ A[k]=pointarc(cc,k*(360/#2));
+ endfor;
+ cd=polygone(A0 for k=1 upto #2-1:,A[k] endfor);
+ for k=0 upto #4-1:
+ B[k]=point(k*(#2/#4)) of cd;
+ endfor;
+ drawoptions(withpen pencircle scaled#6);
+ draw hachurage(O--arccercle(B[0],B[#3],O)--cycle,1.5*360/#2,0.25,0) withcolor #5;
+ clip currentpicture to cd;
+ drawoptions(withpen pencircle scaled#6);
+ draw polygone(A0 for k=1 upto #2:,A[k] endfor);
+ if #4>1:
+ for k=0 upto #4-1:
+ draw segment(O,B[k]) cutafter cd;
+ endfor;
+ drawoptions();
+ fi;
+ \end{mpost}
+ \fi
+}
+
\def\MPFractionRectangle#1#2#3#4#5#6{%
% #1 longueur, #2 largeur, #3 num, #4 deno, #5 couleur, #6 multiple
\ifluatex
@@ -1208,7 +1265,7 @@
fi;
\end{mplibcode}
\else
-\begin{mpost}[mpsettings={input PfC-Geometrie;}]
+\begin{mpost}
pair A,B,C,D,M[],N[],R[],S[];
A=(1,1);
B-A=(#1,0);
@@ -1248,6 +1305,96 @@
\fi
}
+\def\MPFractionRectangleH#1#2#3#4#5#6#7{%
+ % #1 longueur, #2 largeur, #3 num, #4 deno, #5 couleur, #6 multiple
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ pair A,B,C,D,M[],N[],R[],S[];
+ A=(1,1);
+ B-A=(#1,0);
+ C-B=(0,#2);
+ D-C=A-B;
+ numeric parts;
+ parts=(#4 div #6);
+ for k=0 upto parts:
+ M[k]=(k/parts)[A,B];
+ N[k]=(k/parts)[D,C];
+ endfor;
+ if #6>1:
+ for k=0 upto #6:
+ R[k]=(k/#6)[A,D];
+ S[k]=(k/#6)[B,C];
+ endfor;
+ fi;
+ if #6=1:
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(A,M[#3],N[#3],D),45,0.25,0) withcolor #5;
+ else:
+ DDiv=#3 div parts;
+ MMod=#3 mod parts;
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(A,B,S[DDiv],R[DDiv]),45,0.25,0) withcolor #5;
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(R[DDiv],(xpart(M[MMod]),ypart(R[DDiv])),(xpart(M[MMod]),ypart(R[DDiv+1])),R[DDiv+1]),45,0.25,0) withcolor #5;
+ fi;
+ drawoptions(withpen pencircle scaled#7);
+ draw polygone(A,B,C,D);
+ for k=1 upto (parts-1):
+ draw segment(M[k],N[k]);
+ endfor;
+ if #6>1:
+ for k=1 upto (#6-1):
+ draw segment(R[k],S[k]);
+ endfor;
+ drawoptions();
+ fi;
+ \end{mplibcode}
+ \else
+\begin{mpost}
+ pair A,B,C,D,M[],N[],R[],S[];
+ A=(1,1);
+ B-A=(#1,0);
+ C-B=(0,#2);
+ D-C=A-B;
+ numeric parts;
+ parts=(#4 div #6);
+ for k=0 upto parts:
+ M[k]=(k/parts)[A,B];
+ N[k]=(k/parts)[D,C];
+ endfor;
+ if #6>1:
+ for k=0 upto #6:
+ R[k]=(k/#6)[A,D];
+ S[k]=(k/#6)[B,C];
+ endfor;
+ fi;
+ if #6=1:
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(A,M[#3],N[#3],D),45,0.25,0) withcolor #5;
+ else:
+ DDiv=#3 div parts;
+ MMod=#3 mod parts;
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(A,B,S[DDiv],R[DDiv]),45,0.25,0) withcolor #5;
+ drawoptions(withpen pencircle scaled#7);
+ draw hachurage(polygone(R[DDiv],(xpart(M[MMod]),ypart(R[DDiv])),(xpart(M[MMod]),ypart(R[DDiv+1])),R[DDiv+1]),45,0.25,0) withcolor #5;
+ fi;
+ drawoptions(withpen pencircle scaled#7);
+ draw polygone(A,B,C,D);
+ for k=1 upto (parts-1):
+ draw segment(M[k],N[k]);
+ endfor;
+ if #6>1:
+ for k=1 upto (#6-1):
+ draw segment(R[k],S[k]);
+ endfor;
+ drawoptions();
+ fi;
+ \end{mpost}
+ \fi
+}
+
\def\MPFractionDisque#1#2#3#4{%
\ifluatex
\mplibforcehmode
@@ -1266,7 +1413,7 @@
endfor;
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={input PfC-Geometrie;}]
+ \begin{mpost}
pair A,B[];
A=(0,0);
path cc;
@@ -1283,6 +1430,47 @@
\fi
}
+\def\MPFractionDisqueH#1#2#3#4#5{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ pair A,B[];
+ A=(0,0);
+ path cc;
+ cc=cercles(A,#1);
+ for k=0 upto (#3-1):
+ B[k]=pointarc(cc,(360/#3)*k);
+ endfor;
+ drawoptions(withpen pencircle scaled#5);
+ draw hachurage(A--B0--arccercle(B[0],B[#2],A)--cycle,1.5*360/#3,0.25,0) withcolor #4;
+ drawoptions(withpen pencircle scaled#5);
+ draw cc;
+ for k=0 upto (#3-1):
+ draw segment(A,B[k]);
+ endfor;
+ drawoptions();
+ \end{mplibcode}
+ \else
+ \begin{mpost}
+ pair A,B[];
+ A=(0,0);
+ path cc;
+ cc=cercles(A,#1);
+ for k=0 upto (#3-1):
+ B[k]=pointarc(cc,(360/#3)*k);
+ endfor;
+ drawoptions(withpen pencircle scaled#5);
+ draw hachurage(A--B0--arccercle(B[0],B[#2],A)--cycle,1.5*360/#3,0.25,0) withcolor #4;
+ drawoptions(withpen pencircle scaled#5);
+ draw cc;
+ for k=0 upto (#3-1):
+ draw segment(A,B[k]);
+ endfor;
+ drawoptions();
+ \end{mpost}
+ \fi
+}
+
\def\MPFractionSegment#1#2#3#4{
\ifluatex
\mplibforcehmode
@@ -1301,7 +1489,7 @@
endfor;
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={input PfC-Geometrie;}]
+ \begin{mpost}
pair A,C,B[];
A=(0,0);
C-A=(#1,0);
@@ -1327,7 +1515,11 @@
%dénominateur est \ListeFraction[2].
\ifboolKV[ClesFraction]{Regulier}{%
\ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
- \MPFractionRegulier{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
+ \ifboolKV[ClesFraction]{Hachures}{%
+ \MPFractionRegulierH{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}%
+ }{%
+ \MPFractionRegulier{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
+ }
}{%
\ifboolKV[ClesFraction]{Segment}{%
\ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
@@ -1335,10 +1527,18 @@
}{
\ifboolKV[ClesFraction]{Rectangle}{%rectangle
\ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
- \MPFractionRectangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}%
+ \ifboolKV[ClesFraction]{Hachures}{%
+ \MPFractionRectangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}{\useKV[ClesFraction]{Epaisseur}}%
+ }{%
+ \MPFractionRectangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}%
+ }
}{%disque
\ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
- \MPFractionDisque{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
+ \ifboolKV[ClesFraction]{Hachures}{%
+ \MPFractionDisqueH{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}%
+ }{%
+ \MPFractionDisque{\useKV[ClesFraction]{Rayon}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
+ }%
}%
}%
}%
@@ -1406,13 +1606,13 @@
%%%%%%%%%%%%%%%%%%
%% QCM
%%%%%%%%%%%%%%%%%%
-\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=2cm,Couleur=gray!15,Titre=false,Nom=Réponse,Alph=false,VF=false}
+\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=2cm,Couleur=gray!15,Titre=false,Nom=Réponse,Alph=false,VF=false,Depart=1,Alterne=false}
\newlength{\LargeurQCM}
\newcounter{QuestionQCM}
\newcommand\QCM[2][]{%
- \setcounter{QuestionQCM}{0}
\useKVdefault[ClesQCM]%
\setKV[ClesQCM]{#1}%
+ \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
\setsepchar[*]{,*&}\ignoreemptyitems%
\readlist*\ListeQCM{#2}%
\ifboolKV[ClesQCM]{VF}{%
@@ -1425,8 +1625,8 @@
\multicolumn{1}{c|}{}&Vrai&Faux\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2=\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2=\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
}\\
}%
\hline%
@@ -1452,8 +1652,6 @@
}%
}
-
-
%%%%%%%%%%%%%%%%%%%%%
%%%% Somme des angles
%%%%%%%%%%%%%%%%%%%%%
@@ -2706,7 +2904,7 @@
%%%%%%%%%%%%%%%
%Nombre Premier
%%%%%%%%%%%%%%%
-\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,Diviseurs=false}
+\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill}
\newcommand\Decomposition[2][]{%
\useKVdefault[ClesNombrePremier]%
@@ -2720,6 +2918,7 @@
\ifboolKV[ClesNombrePremier]{Arbre}{\MPArbre{#2}}{}%
\ifboolKV[ClesNombrePremier]{ArbreComplet}{\MPArbreComplet{#2}}{}%
\ifboolKV[ClesNombrePremier]{Diviseurs}{\ListeDiviseur{#2}}{}%
+ \ifboolKV[ClesNombrePremier]{DiviseursT}{\ListeDiviseurT{#2}}{}%
\ifboolKV[ClesNombrePremier]{ArbreVide}{\MPArbreVide{#2}}{}%
}
@@ -3253,11 +3452,11 @@ vardef Positions(expr Step)=
\else
\renewcommand{\arraystretch}{1.5}
\begin{tabular}{c|c}
- \PremierMultipleVide{#1}{0}&\hbox to1cm{\dotfill}\\
+ \PremierMultipleVide{#1}{0}&\hbox to1cm{\useKV[ClesNombrePremier]{Dot}}\\
\xintFor* ##1 in {\xintSeq {1}{\premier}}\do
- {\hbox to1cm{\dotfill}&\hbox
- to1cm{\dotfill}\xintifboolexpr{##1<\premier}{\\}{\\\hbox
- to1cm{\dotfill}\\}}%
+ {\hbox to1cm{\useKV[ClesNombrePremier]{Dot}}&\hbox
+ to1cm{\useKV[ClesNombrePremier]{Dot}}\xintifboolexpr{##1<\premier}{\\}{\\\hbox
+ to1cm{\useKV[ClesNombrePremier]{Dot}}\\}}%
\end{tabular}
\renewcommand{\arraystretch}{1}
\fi
@@ -3385,6 +3584,56 @@ vardef Positions(expr Step)=
et \num{\the\anp}%
}
+\newcount\anpT\newcount\bnpT\newcount\cnpT\newcount\dnpT%
+
+\newcommand\ListeDiviseurT[1]{%#1 : le nombre entier à tester
+ \anpT=#1%
+ \bnpT=2\relax%
+ %On compte les diviseurs propres.
+ \cnpT=0\relax%
+ \whiledo{\bnpT<\anpT}{%
+ \modulo{\the\anpT}{\the\bnpT}{}%
+ \ifnum\remainder=0%
+ \cnpT=\numexpr\cnpT+1
+ \fi%
+ \bnpT=\numexpr\bnpT+1%
+ }%
+ \ifodd\cnpT
+ \begin{tabular}{c|c}
+ 1&\num{#1}\\
+ \xintFor* ##1 in {\xintSeq {1}{\fpeval{(\cnpT+1)/2}}}\do{%
+ \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\xintifboolexpr{\dnpT=\fpeval{#1/\dnpT}}{}{\num{\fpeval{#1/\dnpT}}}\\
+ }
+ \end{tabular}
+ \else
+ \begin{tabular}{c|c}
+ 1&\num{#1}\\
+ \xintFor* ##1 in {\xintSeq {1}{\fpeval{\cnpT/2}}}\do{%
+ \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\num{\fpeval{#1/\dnpT}}\\
+ }
+ \end{tabular}
+ \fi
+}
+
+\newcommand\DiviseurNumero[2]{%
+ % #1 nb entier à tester
+ % #2 no du diviseur (à part 1 et #1)
+ \anpT=#1%
+ \bnpT=2\relax%
+ %On compte les diviseurs propres.
+ \cnpT=0\relax%
+ \whiledo{\bnpT<\anpT}{%
+ \modulo{\the\anpT}{\the\bnpT}{}%
+ \ifnum\remainder=0%
+ \cnpT=\numexpr\cnpT+1%
+ \ifnum\cnpT=\numexpr#2-1%
+ \dnpT=\bnpT%
+ \bnpT=\anpT%
+ \fi%
+ \fi%
+ \bnpT=\numexpr\bnpT+1%
+ }%
+}
%%%%%%%%%%%%%%%%%%%
% Simplification
@@ -3480,8 +3729,8 @@ vardef Positions(expr Step)=
\ifthenelse{\pgcd=\number#2 \OR \pgcd=\the\valabsdeno}{%
\divide\numerateur by \denominateur\num{\the\numerateur}
}{%\divide\numerateur by\pgcd%
- %\divide\denominateur by\pgcd%
- \ensuremath{\frac{\num{\the\numerateur}_{\mbox{\tiny$\div\num{\number\pgcd}$}}}{\num{\the\denominateur}_{\mbox{\tiny$\div\num{\number\pgcd}$}}}}
+ % \divide\denominateur by\pgcd%
+ \ensuremath{\frac{\num{\the\numerateur}_{\mbox{\tiny$\div\num{\number\pgcd}$}}}{\num{\the\denominateur}_{\mbox{\tiny$\div\num{\number\pgcd}$}}}}%
}
\else
\ifnum\denominateur=1\relax
@@ -3583,7 +3832,7 @@ vardef Positions(expr Step)=
\ppcm=\numexpr#1*#2/\pgcd\relax
}
-\setKVdefault[ClesThales]{Calcul=true,Propor=false,Segment=false,Figure=false,Figurecroisee=false,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false}
+\setKVdefault[ClesThales]{Calcul=true,Droites=false,Propor=false,Segment=false,Figure=false,Figurecroisee=false,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false}
%On définit la figure à utiliser
\def\MPFigThales#1#2#3#4#5{
@@ -4041,8 +4290,16 @@ vardef Positions(expr Step)=
\newcommand{\TTThales}[6][]{%
\useKVdefault[ClesThales]%
\setKV[ClesThales]{#1}%
- Dans le triangle \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2#3#4$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#5$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la
- droite} \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#2#3)$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#6$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la droite} \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#2#4)$}.%
+ \ifboolKV[ClesThales]{Droites}{%
+ Les droites $(#3#5)$ et $(#4#6)$ sont sécantes en $#2$.%
+ }{%
+ Dans le triangle \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2#3#4$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#5$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la
+ droite}
+ \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#3]$}{$(#2#3)$}},
+ \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#6$} est un
+ point \ifboolKV[ClesThales]{Segment}{du segment}{de la droite}
+ \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#4]$}{$(#2#4)$}}.%
+ }
\\Comme les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#5#6)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#4)$} sont parallèles, alors \ifboolKV[ClesThales]{Propor}{le tableau%
\[\begin{array}{c|c|c}
\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}\\
@@ -4050,9 +4307,9 @@ vardef Positions(expr Step)=
\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}\\
\end{array}
\]
- est un tableau de proportionnalité d'après le théorème de Thalès.%
+ est un tableau de proportionnalité\ifboolKV[ClesThales]{Segment}{.}{ d'après le théorème de Thalès.}%
}{%
- le théorème de Thalès permet d'écrire :%
+ \ifboolKV[ClesThales]{Segment}{on a :}{le théorème de Thalès permet d'écrire :}%
\[\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}}\]%
}
}
@@ -4634,8 +4891,15 @@ vardef Positions(expr Step)=
%%%%
\newcommand{\ReciThales}[6][]{%
- Dans le triangle $#2#3#4$, $#5$ est un point \ifboolKV[ClesThales]{Segment}{du segment $[#2#3]$}{de la
- droite $(#2#3)$}, $#6$ est un point \ifboolKV[ClesThales]{Segment}{du segment $[#2#4]$}{de la droite $(#2#4)$}.
+ \ifboolKV[ClesThales]{Droites}{%
+ Les droites $(#3#5)$ et $(#4#6)$ sont sécantes en $#2$.
+ }{%
+ Dans le triangle $#2#3#4$, $#5$ est un point
+ \ifboolKV[ClesThales]{Segment}{du segment $[#2#3]$}{de la
+ droite $(#2#3)$}, $#6$ est un point
+ \ifboolKV[ClesThales]{Segment}{du segment $[#2#4]$}{de la droite
+ $(#2#4)$}.
+ } %
\ifboolKV[ClesThales]{Propor}{Le tableau $\begin{array}{c|c}
#2#5&#2#6\\
\hline
@@ -4661,10 +4925,10 @@ vardef Positions(expr Step)=
\num{#3}\times\num{#6}&=\num{\fpeval{#3*#6}}&&&\num{#4}\times\num{#5}&=\num{\fpeval{#4*#5}}
\end{align*}
\xintifboolexpr{\NumA = \NumB}{Comme les produits en croix sont
- égaux alors
+ égaux, alors
$\dfrac{\NomA\NomM}{\NomA\NomB}=\dfrac{\NomA\NomN}{\NomA\NomC}$.\\[0.5em]%
}{%
- Comme les produits en croix sont différents alors
+ Comme les produits en croix sont différents, alors
$\dfrac{\NomA\NomM}{\NomA\NomB}\not=\dfrac{\NomA\NomN}{\NomA\NomC}$.\\%
}%
}{%
@@ -5155,8 +5419,8 @@ vardef Positions(expr Step)=
\cos(\ang{#5})&=\frac{\num{#3}}{\NomA\NomC}\\
\NomA\NomC&=\frac{\num{#3}}{\cos(\ang{#5})}\\
\NomA\NomC&\IfInteger{\fpeval{round(\fpeval{#3/cosd(#5)},2)}}{=}{\approx}\num{\fpeval{round(\fpeval{#3/cosd(#5)},\useKV[ClesTrigo]{Precision})}}~\text{\useKV[ClesTrigo]{Unite}}%
- \end{align*}
- }
+ \end{align*}%
+ }%
\xdef\ResultatTrigo{\fpeval{round(\fpeval{#3/cosd(#5)},\useKV[ClesTrigo]{Precision})}}%
\else%on calcule l'angle
\ifboolKV[ClesTrigo]{Propor}{%
@@ -5220,7 +5484,7 @@ vardef Positions(expr Step)=
\sin(\widehat{\NomB\NomA\NomC})&=\frac{\num{#3}}{\num{#4}}\\
\widehat{\NomB\NomA\NomC}&\IfInteger{\fpeval{round(\fpeval{asind(#3/#4)},2)}}{=}{\approx}\ang{\fpeval{round(\fpeval{asind(#3/#4)})}}%
\end{align*}%
- }{
+ }{%
\begin{align*}
\sin(\widehat{\NomB\NomA\NomC})&=\frac{\NomB\NomC}{\NomA\NomC}\\
\sin(\widehat{\NomB\NomA\NomC})&=\frac{\num{#3}}{\num{#4}}\\
@@ -5374,7 +5638,7 @@ vardef Positions(expr Step)=
\newcommand\DonneeMin{}%
\newcommand\EffectifMax{}%
-\setKVdefault[ClesStat]{Tableau=false,Frequence=false,EffectifTotal=false,Etendue=false,Moyenne=false,SET=false,Mediane=false,Total=false,Concret=false,Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif(s),Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,TableauVide=false,Graphique=false,Batons=true,Unitex=0.5,Unitey=0.5,Rayon=3cm,AffichageAngle=false,Liste=false,ECC=false,Coupure=10}
+\setKVdefault[ClesStat]{Tableau=false,Frequence=false,EffectifTotal=false,Etendue=false,Moyenne=false,SET=false,Mediane=false,Total=false,Concret=false,Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif(s),Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,TableauVide=false,Graphique=false,Batons=true,Unitex=0.5,Unitey=0.5,Rayon=3cm,AffichageAngle=false,Liste=false,ECC=false,Coupure=10,ColorTab=gray!15}
% La construction du tableau
\def\addtotok#1#2{#1\expandafter{\the#1#2}}
@@ -5384,9 +5648,9 @@ vardef Positions(expr Step)=
\tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}%
\foreachitem\compteur\in\ListeComplete{\expandafter\updatetoks\compteur\nil}%
\[%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
+ \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
\hline%
- \rowcolor{gray!15}\the\tabtoksa\\\hline%
+ \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa\\\hline%
\the\tabtoksb\\\hline%
\ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}\\\hline}{}%
\ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}\\\hline}{}%
@@ -5400,9 +5664,9 @@ vardef Positions(expr Step)=
\tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}%
\foreachitem\compteur\in\ListeComplete{\expandafter\updatetoks\compteur\nil}%
\[%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
+ \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
\hline%
- \rowcolor{gray!15}\the\tabtoksa&Total\\\hline%
+ \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa&Total\\\hline%
\the\tabtoksb&\ifboolKV[ClesStat]{TableauVide}{}{\num{\EffectifTotal}}%
\\\hline%
\ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{100}\\\hline}{}%
@@ -5418,9 +5682,9 @@ vardef Positions(expr Step)=
\tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}%
\foreachitem\compteur\in\ListeComplete{\expandafter\updatetoksq\compteur\nil}%
\[%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
+ \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
\hline%
- \rowcolor{gray!15}\the\tabtoksa\\\hline%
+ \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa\\\hline%
\the\tabtoksb\\\hline%
\ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}\\\hline}{}%
\ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}\\\hline}{}%
@@ -5434,9 +5698,9 @@ vardef Positions(expr Step)=
\tabtoksa{\useKV[ClesStat]{Donnee}}\tabtoksb{\useKV[ClesStat]{Effectif}}%
\foreachitem\compteur\in\ListeComplete{\expandafter\updatetoksq\compteur\nil}%
\[%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
+ \begin{tabular}{|>{\columncolor{\useKV[ClesStat]{ColorTab}}}c|*{\number\numexpr\ListeCompletelen+1}{>{\centering\arraybackslash}p{\useKV[ClesStat]{Largeur}}|}}%
\hline%
- \rowcolor{gray!15}\the\tabtoksa&Total\\\hline%
+ \rowcolor{\useKV[ClesStat]{ColorTab}}\the\tabtoksa&Total\\\hline%
\the\tabtoksb&\num{\EffectifTotal}\\\hline%
\ifboolKV[ClesStat]{Frequence}{Fréquence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculFrequence{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{100}\\\hline}{}%
\ifboolKV[ClesStat]{Angle}{Angle (\si{\degree})\xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\CalculAngle{##1}}}&\ifboolKV[ClesStat]{TableauVide}{}{360}\\\hline}{}%
@@ -6278,7 +6542,6 @@ vardef Positions(expr Step)=
%%%%%%%%%%%%%%%
\setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,Entier=false,Lettre=x,Solution=false,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Pose=false,Equivalence=false}
-
\newcommand\rightcomment[4]%
{\begin{tikzpicture}[remember picture,overlay]
\draw[Cfleches,-stealth]
@@ -6542,8 +6805,7 @@ vardef Positions(expr Step)=
%%%%%%%%%%%%%%%%%%%%
%%% Proportionnalité
%%%%%%%%%%%%%%%%%%%%
-\setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur
- B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white}%Tableau=false :
+\setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white,ColorTab=gray!15}%Tableau=false :
%inutile ?
\def\Updatetoksmath#1/#2\nil{\addtotok\tabtoksa{&#1}\addtotok\tabtoksb{&#2}}%
@@ -6557,7 +6819,7 @@ vardef Positions(expr Step)=
}%
\xdef\LongListe{\ListeValeurlen}%
\renewcommand{\arraystretch}{\useKV[ClesPropor]{Stretch}}%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeValeurlen}{>{\centering\arraybackslash}p{\useKV[ClesPropor]{Largeur}}|}}%
+ \begin{tabular}{|>{\columncolor{\useKV[ClesPropor]{ColorTab}}}c|*{\number\numexpr\ListeValeurlen}{>{\centering\arraybackslash}p{\useKV[ClesPropor]{Largeur}}|}}%
\multicolumn{1}{c}{\TikzPHD\setcounter{NbPropor}{1}}\xintFor* ##1 in {\xintSeq {1}{\ListeValeurlen}}\do{&\multicolumn{1}{c}{\TikzPH}}\\%
\hhline{*{\number\numexpr\ListeValeurlen+1}{-}}%
\the\tabtoksa\\%
@@ -6686,7 +6948,7 @@ vardef Positions(expr Step)=
%%%%%%%%%%%
%% Application : pourcentage
%%%%%%%%%%%
-\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Unite=g,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,MotReduction=diminution,AideTableau=false,ColorFill=white}
+\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Unite=g,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,MotReduction=diminution,AideTableau=false,ColorFill=white,ColorTab=gray!15}
\newcommand\Pourcentage[3][]{%
\useKVdefault[ClesPourcentage]%
@@ -6698,10 +6960,11 @@ vardef Positions(expr Step)=
}{%
Calculons ce que représente la \useKV[ClesPourcentage]{MotReduction} de \num{#2}~\%.
\ifboolKV[ClesPourcentage]{AideTableau}{%
- \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}
- \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}
+ \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}%
+ \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}%
+ \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}%
\begin{center}
- \Propor[GrandeurA=\NomA,GrandeurB=\NomB]{/#3,#2/100}
+ \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{/#3,#2/100}
\end{center}
\FlecheCoefInv{\tiny$\times\num{\fpeval{#2/100}}$}%
On obtient une \useKV[ClesPourcentage]{MotReduction} de $\num{\fpeval{#2/100}}\times\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*#2/100}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}. Donc un total de $\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}-\num{\fpeval{#3*#2/100}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*(1-#2/100)}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.%
@@ -6719,8 +6982,9 @@ vardef Positions(expr Step)=
\ifboolKV[ClesPourcentage]{AideTableau}{%
\xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}%
\xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}%
+ \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}%
\begin{center}%
- \Propor[GrandeurA=\NomA,GrandeurB=\NomB]{/#3,#2/100}%
+ \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{/#3,#2/100}%
\end{center}%
\FlecheCoefInv{\tiny$\times\num{\fpeval{#2/100}}$}%
On obtient une augmentation de $\num{\fpeval{#2/100}}\times\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*#2/100}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.\\Donc un total de $\num{#3}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}+\num{\fpeval{#3*#2/100}}\ifboolKV[ClesPourcentage]{Concret}{~\text{\useKV[ClesPourcentage]{Unite}}}{}=\num{\fpeval{#3*(1+#2/100)}}$\ifboolKV[ClesPourcentage]{Concret}{~\useKV[ClesPourcentage]{Unite}}{}.%
@@ -6730,9 +6994,10 @@ vardef Positions(expr Step)=
}
}{%
\ifboolKV[ClesPourcentage]{Calculer}{%
- \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}
- \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}
- \Propor[GrandeurA=\NomA,GrandeurB=\NomB]{#2/#3,/100}%
+ \xdef\NomA{\useKV[ClesPourcentage]{GrandeurA}}%
+ \xdef\NomB{\useKV[ClesPourcentage]{GrandeurB}}%
+ \xdef\NomColorTab{\useKV[ClesPourcentage]{ColorTab}}%
+ \Propor[GrandeurA=\NomA,GrandeurB=\NomB,ColorTab=\NomColorTab]{#2/#3,/100}%
\xdef\colorfill{\useKV[ClesPourcentage]{ColorFill}}%
\FlechesPB{2}{1}{\scriptsize$\times\num{\fpeval{#3/100}}$}%
\FlechesPH{1}{2}{\scriptsize$\div\num{\fpeval{#3/100}}$}%
@@ -6748,7 +7013,7 @@ vardef Positions(expr Step)=
%%%%%%%%%%%%%
%Lien : ratio
%%%%%%%%%%%%%
-\setKVdefault[ClesRatio]{Figure=false,Longueur=5cm,TexteTotal=quantité,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,NombreUn}
+\setKVdefault[ClesRatio]{Figure=false,Longueur=5cm,TexteTotal=quantité,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,ColorTab=gray!15}
\newcommand\MPTest[9][]{%
% #2 : Longueur de la barre unité
@@ -6924,7 +7189,7 @@ vardef Positions(expr Step)=
\foreachitem\compteur\in\ListeRatio{\expandafter\updateratiotoks\compteur\nil}%
\xdef\LongListe{\ListeRatiolen}%
\renewcommand{\arraystretch}{\useKV[ClesRatio]{Stretch}}%
- \begin{tabular}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeRatiolen}{>{\centering\arraybackslash}p{\useKV[ClesRatio]{Largeur}}|}l}
+ \begin{tabular}{|>{\columncolor{\useKV[ClesRatio]{ColorTab}}}c|*{\number\numexpr\ListeRatiolen}{>{\centering\arraybackslash}p{\useKV[ClesRatio]{Largeur}}|}l}
\ifboolKV[ClesRatio]{Nom}{%
\hhline{~*{\number\numexpr\ListeRatiolen}{-}}
\multicolumn{1}{c|}{}\the\tabtoksc\\
@@ -6982,12 +7247,13 @@ vardef Positions(expr Step)=
\itemtomacro\ListeRatio[2]\NbDeux
\xintifboolexpr{\ListeRatiolen>2}{\itemtomacro\ListeRatio[3]\NbTrois}{\newcommand\NbTrois{}}
\MPTest[#1]{\useKV[ClesRatio]{Longueur}}{\NbUn}{\NbDeux}{\NbTrois}{\the\toklisteratio}{\useKV[ClesRatio]{CouleurUn}}{\useKV[ClesRatio]{CouleurDeux}}{\useKV[ClesRatio]{CouleurTrois}}%
- }{}%
- \ifboolKV[ClesRatio]{Tableau}{%
- \setsepchar[*]{,*/}\ignoreemptyitems%
- \readlist*\ListeRatio{#2}%
- \buildtabratio%
- }{}%
+ }{%
+ \ifboolKV[ClesRatio]{Tableau}{%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\ListeRatio{#2}%
+ \buildtabratio%
+ }{}%
+ }%
}%
%%%%%%%%%%%%%%%
@@ -9015,9 +9281,9 @@ vardef Positions(expr Step)=
\def\Updatetoksrepere#1/#2/#3\nil{\addtotok\toklistepointrepere{#1,#2,"#3",}}
\def\Updatetoksespace#1/#2/#3/#4\nil{\addtotok\toklistepointespace{#1,#2,#3,"#4",}}
-\newtoks\toklistepointrepere
-\newtoks\toklistepointdroite
-\newtoks\toklistepointespace
+\newtoks\toklistepointrepere%
+\newtoks\toklistepointdroite%
+\newtoks\toklistepointespace%
% Pour construire le repère de l'espace
\def\buildespace{%
@@ -9057,6 +9323,9 @@ vardef Positions(expr Step)=
drawarrow Projette(A)--Projette(1.5[D,A]);
drawarrow Projette(C)--Projette(1.5[D,C]);
drawarrow Projette(E)--Projette(1.5[D,E]);
+ label.bot(btex $x$ etex,Projette(1.5[D,A]));
+ label.top(btex $y$ etex,Projette(1.5[D,C]));
+ label.top(btex $z$ etex,Projette(1.5[D,E]));
label.ulft(btex 1 etex,Projette((1/#2)[D,A]));
label.bot(btex 1 etex,Projette((1/#4)[D,C]));
label.lft(btex 1 etex,Projette((1/#6)[D,E]));
@@ -9073,6 +9342,9 @@ vardef Positions(expr Step)=
drawarrow Projette(D)--Projette(1.5[A,D]) dashed evenly;
drawarrow Projette(B)--Projette(1.5[A,B]);
drawarrow Projette(F)--Projette(1.5[A,F]);
+ label.lrt(btex $x$ etex,Projette(1.5[A,D]));
+ label.top(btex $y$ etex,Projette(1.5[A,B]));
+ label.top(btex $z$ etex,Projette(1.5[A,F]));
label.ulft(btex 1 etex,Projette((1/#2)[A,D]));
label.bot(btex 1 etex,Projette((1/#4)[A,B]));
label.lft(btex 1 etex,Projette((1/#6)[A,F]));
@@ -10233,20 +10505,248 @@ vardef Positions(expr Step)=
}
}
+%%%%%%%%%
+% Ecritures d'unités
+%%%%%%%%%%
+\setKVdefault[Unites]{m=false,km=false,hm=false,dam=false,dm=false,cm=true,mm=false,g=true,kg=false,hg=false,dag=false,dg=false,cg=false,mg=false,kmh=true,ms=false,kgm=false,gcm=true,L=true,kL=false,hL=false,daL=false,dL=false,cL=false,mL=false,l=true,kl=false,hl=false,dal=false,dl=false,cl=false,ml=false}
+
+\newcommand\Lg[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{km}{%
+ \SI{#2}{\km}%
+ }{\ifboolKV[Unites]{hm}{%
+ \SI{#2}{\hecto\metre}%
+ }{\ifboolKV[Unites]{dam}{%
+ \SI{#2}{\deca\metre}%
+ }{\ifboolKV[Unites]{dm}{%
+ \SI{#2}{\dm}%
+ }{\ifboolKV[Unites]{m}{%
+ \SI{#2}{\m}%
+ }{\ifboolKV[Unites]{mm}{%
+ \SI{#2}{\mm}%
+ }{\SI{#2}{\cm}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\newcommand\Masse[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{kg}{%
+ \SI{#2}{\kg}%
+ }{\ifboolKV[Unites]{hg}{%
+ \SI{#2}{\hecto\gram}%
+ }{\ifboolKV[Unites]{dag}{%
+ \SI{#2}{\deca\gram}%
+ }{\ifboolKV[Unites]{dg}{%
+ \SI{#2}{\deci\gram}%
+ }{\ifboolKV[Unites]{cg}{%
+ \SI{#2}{\centi\gram}%
+ }{\ifboolKV[Unites]{mg}{%
+ \SI{#2}{\milli\gram}%
+ }{\SI{#2}{\gram}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\newcommand\Capa[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{kL}{%
+ \SI{#2}{\kilo\liter}%
+ }{\ifboolKV[Unites]{hL}{%
+ \SI{#2}{\hecto\liter}%
+ }{\ifboolKV[Unites]{daL}{%
+ \SI{#2}{\deca\liter}%
+ }{\ifboolKV[Unites]{dL}{%
+ \SI{#2}{\deci\liter}%
+ }{\ifboolKV[Unites]{cL}{%
+ \SI{#2}{\centi\liter}%
+ }{\ifboolKV[Unites]{mL}{%
+ \SI{#2}{\milli\liter}%
+ }{\SI{#2}{\liter}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\newcommand\Aire[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{km}{%
+ \SI{#2}{\square\km}%
+ }{\ifboolKV[Unites]{hm}{%
+ \SI{#2}{\square\hecto\metre}%
+ }{\ifboolKV[Unites]{dam}{%
+ \SI{#2}{\square\deca\metre}%
+ }{\ifboolKV[Unites]{dm}{%
+ \SI{#2}{\square\dm}%
+ }{\ifboolKV[Unites]{m}{%
+ \SI{#2}{\square\metre}%
+ }{\ifboolKV[Unites]{mm}{%
+ \SI{#2}{\square\mm}%
+ }{\SI{#2}{\square\cm}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\newcommand\Vol[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{km}{%
+ \SI{#2}{\cubic\km}%
+ }{\ifboolKV[Unites]{hm}{%
+ \SI{#2}{\cubic\hecto\metre}%
+ }{\ifboolKV[Unites]{dam}{%
+ \SI{#2}{\cubic\deca\metre}%
+ }{\ifboolKV[Unites]{dm}{%
+ \SI{#2}{\cubic\dm}%
+ }{\ifboolKV[Unites]{m}{%
+ \SI{#2}{\cubic\metre}%
+ }{\ifboolKV[Unites]{mm}{%
+ \SI{#2}{\cubic\mm}%
+ }{\SI{#2}{\cubic\cm}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\newcommand\Vitesse[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{ms}{%
+ \SI[per-mode=symbol]{#2}{\meter\per\second}%
+ }{%
+ \SI[per-mode=symbol]{#2}{\kilo\meter\per\hour}%
+ }%
+}%
+
+\newcommand\MasseVol[2][]{%
+ \useKVdefault[Unites]%
+ \setKV[Unites]{#1}%
+ \ifboolKV[Unites]{kgm}{%
+ \SI[per-mode=symbol]{#2}{\kilo\gram\per\cubic\metre}%
+ }{%
+ \SI[per-mode=symbol]{#2}{\gram\per\cubic\centi\metre}%
+ }%
+}%
+
%%%%%%%%%
%% Tableaux d'unités
%%%%%%%%%
-\setKVdefault[ClesTableaux]{Decimaux=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Classes=false,Nombres=false,Metre=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,Colonnes=false}
+\setKVdefault[ClesTableaux]{Entiers=false,Decimaux=false,Milliards=false,Millions=false,Milliers=true,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Classes=false,Nombres=false,Metre=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,Colonnes=false,Prefixes=false}
\newcommand\Tableau[1][]{%
- \useKVdefault[ClesTableaux]
- \setKV[ClesTableaux]{#1}
- \ifboolKV[ClesTableaux]{Decimaux}{%
+ \useKVdefault[ClesTableaux]%
+ \setKV[ClesTableaux]{#1}%
+ \ifboolKV[ClesTableaux]{Prefixes}{%
\setlength{\tabcolsep}{0.01\tabcolsep}
\begin{center}
- \begin{tabular}{|*{12}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}
- \ifboolKV[ClesTableaux]{Partie}{\multicolumn{12}{c}{\bfseries Partie Entière}&\multicolumn{1}{c}{\cellcolor{gray!15},}&\multicolumn{3}{c}{\bfseries Partie décimale}\\}{}
- \ifboolKV[ClesTableaux]{Classes}{\hline\multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}&\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}&\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe des milliers}&\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe des unités}&&&&\\}{}
+ \begin{tabular}{|*{12}{>{\centering\arraybackslash}m{3.25em}|}>{\columncolor{gray!15},}{c}|*{12}{>{\centering\arraybackslash}m{3.25em}|}}
+ \ifboolKV[ClesTableaux]{Partie}{%
+ \multicolumn{12}{c}{\bfseries Partie entière}
+ &\multicolumn{1}{c}{\cellcolor{gray!15},}%
+ &\multicolumn{12}{c}{\bfseries Partie décimale}\\}{}
+ \ifboolKV[ClesTableaux]{Classes}{%
+ \hline%
+ \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe
+ des milliards}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe
+ des millions}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe
+ des milliers}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe
+ des unités}%
+ &&&&&&&&&&&&&\\}{}
+ \hline
+ %
+ &%
+ &\fontsize{8.5}{8.5}\selectfont giga%
+ &%
+ &%
+ &\fontsize{8.5}{8.5}\selectfont méga%
+ &%
+ &%
+ &\fontsize{8.5}{8.5}\selectfont kilo%
+ &\fontsize{8.5}{8.5}\selectfont hecto%
+ &\fontsize{8.5}{8.5}\selectfont déca%
+ &\fontsize{8.5}{8.5}\selectfont unités%
+ &%
+ &\fontsize{8.5}{8.5}\selectfont deci%
+ &\fontsize{8.5}{8.5}\selectfont centi%
+ &\fontsize{8.5}{8.5}\selectfont milli%
+ &%
+ &%
+ &\fontsize{8.5}{8.5}\selectfont micro%
+ &%
+ &%
+ &\fontsize{8.5}{8.5}\selectfont nano%
+ &%
+ &%
+ &\\
+ \ifboolKV[ClesTableaux]{Nombres}{%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont $\times10^{9}$%
+ &%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont $\times10^{6}$%
+ &%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont $\times10^3$%
+ &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^2$%
+ &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^1$%
+ &\fontsize{4.5}{4.5}\selectfont $\times\num{1}$%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-1}$%
+ &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-2}$%
+ &\fontsize{4.5}{4.5}\selectfont$\times\num{10}^{-3}$%
+ &%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-6}$%
+ &%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont $\times\num{10}^{-9}$%
+ &
+ &
+ &\\
+ }{}
+ \hline
+ &&&&&&&&&&&&&&&&&&&&&&&&\\
+ &&&&&&&&&&&&&&&&&&&&&&&&\\
+ \end{tabular}
+ \end{center}
+ \setlength{\tabcolsep}{100\tabcolsep}
+ }{}%
+ \ifboolKV[ClesTableaux]{Entiers}{%
+ \setlength{\tabcolsep}{0.01\tabcolsep}
+ \begin{center}
+ \begin{tabular}{|*{12}{>{\centering\arraybackslash}m{4.75em}|}}
+ \ifboolKV[ClesTableaux]{Classes}{\hline\multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe
+ des milliards}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe
+ des millions}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe
+ des milliers}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe des unités}\\}{}
\hline
\fontsize{4.5}{4.5}\selectfont centaines de milliards%
&\fontsize{4.5}{4.5}\selectfont dizaines de milliards%
@@ -10259,11 +10759,7 @@ vardef Positions(expr Step)=
&\fontsize{4.5}{4.5}\selectfont unités de milliers%
&\fontsize{4.5}{4.5}\selectfont centaines%
&\fontsize{4.5}{4.5}\selectfont dizaines%
- &\fontsize{4.5}{4.5}\selectfont unités%
- &%
- &\fontsize{4.5}{4.5}\selectfont dixièmes%
- &\fontsize{4.5}{4.5}\selectfont centièmes%
- &\fontsize{4.5}{4.5}\selectfont millièmes\\
+ &\fontsize{4.5}{4.5}\selectfont unités\\%
\ifboolKV[ClesTableaux]{Nombres}{%
\fontsize{4.5}{4.5}\selectfont \num{100000000000}%
&\fontsize{4.5}{4.5}\selectfont \num{10000000000}%
@@ -10277,6 +10773,87 @@ vardef Positions(expr Step)=
&\fontsize{4.5}{4.5}\selectfont \num{100}%
&\fontsize{4.5}{4.5}\selectfont \num{10}%
&\fontsize{4.5}{4.5}\selectfont \num{1}%
+ \\
+ }{}
+ \hline
+ &&&&&&&&&&&\\
+ &&&&&&&&&&&\\
+ \end{tabular}
+ \end{center}
+ \setlength{\tabcolsep}{100\tabcolsep}
+ }{}%
+ \ifboolKV[ClesTableaux]{Decimaux}{%
+ \setlength{\tabcolsep}{0.01\tabcolsep}
+ \ifboolKV[ClesTableaux]{Milliards}{%
+ \newcolumntype{X}{|*{12}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}%
+ }{\ifboolKV[ClesTableaux]{Millions}{%
+ \newcolumntype{X}{|*{9}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}%
+ }{\newcolumntype{X}{|*{6}{>{\centering\arraybackslash}m{4.75em}|}>{\columncolor{gray!15},}{c}|*{3}{>{\centering\arraybackslash}m{4.75em}|}}%
+ }
+ }
+ \begin{center}
+ \begin{tabular}{X}
+ \ifboolKV[ClesTableaux]{Partie}{%
+ \ifboolKV[ClesTableaux]{Milliards}{\multicolumn{12}{c}{\bfseries Partie entière}}{\ifboolKV[ClesTableaux]{Millions}{\multicolumn{9}{c}{\bfseries Partie entière}}{\multicolumn{6}{c}{\bfseries Partie entière}}}
+ &\multicolumn{1}{c}{\cellcolor{gray!15},}%
+ &\multicolumn{3}{c}{\bfseries Partie décimale}\\}{}
+ \ifboolKV[ClesTableaux]{Classes}{%
+ \hline%
+ \ifboolKV[ClesTableaux]{Milliards}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurG}}Classe des milliards}\uppercase{&}\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}\uppercase{&}}{}
+ \ifboolKV[ClesTableaux]{Millions}{\multicolumn{3}{|c}{\cellcolor{\useKV[ClesTableaux]{CouleurM}}Classe des millions}\uppercase{&}}{}
+ \multicolumn{3}{|c|}{\cellcolor{\useKV[ClesTableaux]{Couleurm}}Classe
+ des milliers}%
+ &\multicolumn{3}{c|}{\cellcolor{\useKV[ClesTableaux]{Couleuru}}Classe
+ des unités}%
+ &&&&\\}{}
+ \hline
+ \ifboolKV[ClesTableaux]{Milliards}{%
+ \fontsize{4.5}{4.5}\selectfont centaines de milliards%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de milliards%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de milliards%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont centaines de millions%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de millions%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de millions%
+ \uppercase{&}
+ }{}
+ \ifboolKV[ClesTableaux]{Millions}{%
+ \fontsize{4.5}{4.5}\selectfont centaines de millions%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont dizaines de millions%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont unités de millions%
+ \uppercase{&}
+ }{}
+ \fontsize{4.5}{4.5}\selectfont centaines de milliers%
+ &\fontsize{4.5}{4.5}\selectfont dizaines de milliers%
+ &\fontsize{4.5}{4.5}\selectfont unités de milliers%
+ &\fontsize{4.5}{4.5}\selectfont centaines%
+ &\fontsize{4.5}{4.5}\selectfont dizaines%
+ &\fontsize{4.5}{4.5}\selectfont unités%
+ &%
+ &\fontsize{4.5}{4.5}\selectfont dixièmes%
+ &\fontsize{4.5}{4.5}\selectfont centièmes%
+ &\fontsize{4.5}{4.5}\selectfont millièmes\\
+ \ifboolKV[ClesTableaux]{Nombres}{%
+ \ifboolKV[ClesTableaux]{Milliards}{%
+ \fontsize{4.5}{4.5}\selectfont\num{100000000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont\num{10000000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont\num{1000000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{100000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{10000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{1000000}%
+ \uppercase{&}%
+ }{}
+ \ifboolKV[ClesTableaux]{Millions}{%
+ \fontsize{4.5}{4.5}\selectfont \num{100000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{10000000}%
+ \uppercase{&}\fontsize{4.5}{4.5}\selectfont \num{1000000}%
+ \uppercase{&}%
+ }{}
+ \fontsize{4.5}{4.5}\selectfont \num{100000}%
+ &\fontsize{4.5}{4.5}\selectfont \num{10000}%
+ &\fontsize{4.5}{4.5}\selectfont \num{1000}%
+ &\fontsize{4.5}{4.5}\selectfont \num{100}%
+ &\fontsize{4.5}{4.5}\selectfont \num{10}%
+ &\fontsize{4.5}{4.5}\selectfont \num{1}%
&%
&\fontsize{4.5}{4.5}\selectfont \num{0,1} ou $\dfrac{\strut1}{\strut10}$%
&\fontsize{4.5}{4.5}\selectfont \num{0,01} ou $\dfrac{\strut1}{\strut100}$%
@@ -10284,8 +10861,16 @@ vardef Positions(expr Step)=
\\
}{}
\hline
- &&&&&&&&&&&&&&&\\
- &&&&&&&&&&&&&&&\\
+ \ifboolKV[ClesTableaux]{Milliards}{%
+ \uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}}{} %
+ \ifboolKV[ClesTableaux]{Millions}{%
+ \uppercase{&}\uppercase{&}\uppercase{&}}{}
+ &&&&&&&&&\\
+ \ifboolKV[ClesTableaux]{Milliards}{%
+ \uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}\uppercase{&}}{} %
+ \ifboolKV[ClesTableaux]{Millions}{%
+ \uppercase{&}\uppercase{&}\uppercase{&}}{}
+ &&&&&&&&&\\
\end{tabular}
\end{center}
\setlength{\tabcolsep}{100\tabcolsep}
@@ -10331,212 +10916,185 @@ vardef Positions(expr Step)=
}
{}
\ifboolKV[ClesTableaux]{Carre}{%
- \[\renewcommand{\arraystretch}{1.15}\ifboolKV[ClesTableaux]{Colonnes}{\begin{tabular}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}}{\begin{tabular}{|*{7}{p{2.5mm}p{2.5mm}|}}}
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate
- (B);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate
- (C);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate
- (D);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate
- (E);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate
- (F);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
-\hline
-\multicolumn{2}{|c|}{km$^2$}&\multicolumn{2}{c|}{hm$^2$}&\multicolumn{2}{c|}{dam$^2$}&\multicolumn{2}{c|}{m$^2$}&\multicolumn{2}{c|}{dm$^2$}&\multicolumn{2}{c|}{cm$^2$}&\multicolumn{2}{c|}{mm$^2$}\\
-\hline
-&&&&&&&&&&&&&\\
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (G1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em]
- (F1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em]
- (E1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em]
- (D1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em]
- (C1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em]
- (B1);}}&%
-\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (A1);}}\\%
-\end{tabular}
-\]
-\ifboolKV[ClesTableaux]{Fleches}{%
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{100}$}(B);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{100}$}(C);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{100}$}(D);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{100}$}(E);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{100}$}(F);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{100}$}(G);}
-%bas
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{100}$}(B1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{100}$}(C1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{100}$}(D1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{100}$}(E1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{100}$}(F1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{100}$}(G1);}
-}{}
- }
- {}
+ \[\renewcommand{\arraystretch}{1.15}%
+ \ifboolKV[ClesTableaux]{Colonnes}{%
+ \newcolumntype{X}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}%
+ }{%
+ \newcolumntype{X}{|*{7}{p{2.5mm}p{2.5mm}|}}
+ }
+ \begin{tabular}{X}
+ \multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
+ \hline
+ \multicolumn{2}{|c|}{km$^2$}&\multicolumn{2}{c|}{hm$^2$}&\multicolumn{2}{c|}{dam$^2$}&\multicolumn{2}{c|}{m$^2$}&\multicolumn{2}{c|}{dm$^2$}&\multicolumn{2}{c|}{cm$^2$}&\multicolumn{2}{c|}{mm$^2$}\\
+ \hline
+ &&&&&&&&&&&&&\\
+ \multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (G1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (F1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (E1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (D1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (C1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (B1);}}%
+ &\multicolumn{2}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=0.6em] (A1);}}\\%
+ \end{tabular}
+ \]
+ \ifboolKV[ClesTableaux]{Fleches}{%
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{100}$}(B);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{100}$}(C);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{100}$}(D);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{100}$}(E);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{100}$}(F);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{100}$}(G);}
+ % bas
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{100}$}(B1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{100}$}(C1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{100}$}(D1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{100}$}(E1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{100}$}(F1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{100}$}(G1);}
+ }{}%
+ }%
+ {}%
\ifboolKV[ClesTableaux]{Cube}{%
- {\setlength{\tabcolsep}{0.625\tabcolsep}
-\[\renewcommand{\arraystretch}{1.15}\ifboolKV[ClesTableaux]{Colonnes}{\begin{tabular}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}}{\begin{tabular}{|*{7}{p{2.5mm}p{2.5mm}p{2.5mm}|}}}
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate
- (B);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate
- (C);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate
- (D);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate
- (E);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate
- (F);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
-\hline
-\multicolumn{3}{|c|}{km$^3$}&\multicolumn{3}{c|}{hm$^3$}&\multicolumn{3}{c|}{dam$^3$}&\multicolumn{3}{c|}{m$^3$}&\multicolumn{3}{c|}{dm$^3$}&\multicolumn{3}{c|}{cm$^3$}&\multicolumn{3}{c|}{mm$^3$}\\
-\hline
-&&&&&&&&&&&&&&&&&&&&\\
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (G1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate
- (F1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate
- (E1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate
- (D1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate
- (C1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate
- (B1);}}&%
-\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (A1);}}\\%
-\end{tabular}
-\]
-\setlength{\tabcolsep}{1.6\tabcolsep}}
-\ifboolKV[ClesTableaux]{Fleches}{%
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150]
- (A) to node[above, midway]{$\times\mbox{\num{1000}}$}(B);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to
- node[above, midway]{$\times\mbox{\num{1000}}$}(C);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to
- node[above, midway]{$\times\mbox{\num{1000}}$}(D);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to
- node[above, midway]{$\times\mbox{\num{1000}}$}(E);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to
- node[above, midway]{$\times\mbox{\num{1000}}$}(F);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to
- node[above, midway]{$\times\mbox{\num{1000}}$}(G);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(B1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(C1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(D1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(E1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(F1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to
- node[below, midway]{$\div\mbox{\num{1000}}$}(G1);}
-}{}
+ \setlength{\tabcolsep}{0.625\tabcolsep}%
+ \ifboolKV[ClesTableaux]{Colonnes}{%
+ \newcolumntype{X}{|*{7}{p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}!{\color{gray!50}\vrule}p{2.5mm}|}}%
+ }{%
+ \newcolumntype{X}{|*{7}{p{2.5mm}p{2.5mm}p{2.5mm}|}}%
+ }
+ \[\renewcommand{\arraystretch}{1.15}
+ \begin{tabular}{X}
+ \multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
+ \hline
+ \multicolumn{3}{|c|}{km$^3$}&\multicolumn{3}{c|}{hm$^3$}&\multicolumn{3}{c|}{dam$^3$}&\multicolumn{3}{c|}{m$^3$}&\multicolumn{3}{c|}{dm$^3$}&\multicolumn{3}{c|}{cm$^3$}&\multicolumn{3}{c|}{mm$^3$}\\
+ \hline
+ &&&&&&&&&&&&&&&&&&&&\\
+ \multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (G1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (F1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (E1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (D1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (C1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (B1);}}%
+ &\multicolumn{3}{c}{\tikz[remember picture,overlay,yshift=\ht\strutbox]{\coordinate (A1);}}\\%
+ \end{tabular}
+ \]
+ \setlength{\tabcolsep}{1.6\tabcolsep}
+ \ifboolKV[ClesTableaux]{Fleches}{%
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150]
+ (A) to node[above, midway]{$\times\mbox{\num{1000}}$}(B);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to
+ node[above, midway]{$\times\mbox{\num{1000}}$}(C);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to
+ node[above, midway]{$\times\mbox{\num{1000}}$}(D);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to
+ node[above, midway]{$\times\mbox{\num{1000}}$}(E);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to
+ node[above, midway]{$\times\mbox{\num{1000}}$}(F);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to
+ node[above, midway]{$\times\mbox{\num{1000}}$}(G);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(B1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(C1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(D1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(E1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(F1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to
+ node[below, midway]{$\div\mbox{\num{1000}}$}(G1);}
+ }{}
}
{}
\ifboolKV[ClesTableaux]{Litre}{%
- \[\renewcommand{\arraystretch}{1.15}\begin{tabular}{|*{7}{p{7.5mm}|}}
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (B);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (C);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (D);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (E);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (F);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
-\hline
-\multicolumn{1}{|c|}{kL}&\multicolumn{1}{c|}{hL}&\multicolumn{1}{c|}{daL}&\multicolumn{1}{c|}{L}&\multicolumn{1}{c|}{dL}&\multicolumn{1}{c|}{cL}&\multicolumn{1}{c|}{mL}\\
-\hline
-&&&&&&\\
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (F1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (E1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (D1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (C1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (B1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\%
-\end{tabular}
-\]
-\ifboolKV[ClesTableaux]{Fleches}{%
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);}
-%bas
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);}
-}{}
- }
- {}
+ \[\renewcommand{\arraystretch}{1.15}%
+ \begin{tabular}{|*{7}{p{7.5mm}|}}
+ \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
+ \hline
+ \multicolumn{1}{|c|}{kL}&\multicolumn{1}{c|}{hL}&\multicolumn{1}{c|}{daL}&\multicolumn{1}{c|}{L}&\multicolumn{1}{c|}{dL}&\multicolumn{1}{c|}{cL}&\multicolumn{1}{c|}{mL}\\
+ \hline
+ &&&&&&\\
+ \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}}
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (E1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (D1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (C1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (B1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\%
+ \end{tabular}
+ \]
+ \ifboolKV[ClesTableaux]{Fleches}{%
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);}
+ % bas
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);}
+ }{}%
+ }{}%
\ifboolKV[ClesTableaux]{Gramme}{%
- \[\renewcommand{\arraystretch}{1.15}\begin{tabular}{|*{7}{p{7.5mm}|}}
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (B);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (C);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (D);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (E);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate
- (F);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}\\%
-\hline
-\multicolumn{1}{|c|}{kg}&\multicolumn{1}{c|}{hg}&\multicolumn{1}{c|}{dag}&\multicolumn{1}{c|}{g}&\multicolumn{1}{c|}{dg}&\multicolumn{1}{c|}{cg}&\multicolumn{1}{c|}{mg}\\
-\hline
-&&&&&&\\
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (F1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (E1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (D1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (C1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em]
- (B1);}}&%
-\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\%
-\end{tabular}
-\]
-\ifboolKV[ClesTableaux]{Fleches}{%
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);}
-%bas
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);}
-\tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);}
-}{}%
- }%
- {}%
+ \[\renewcommand{\arraystretch}{1.15}%
+ \begin{tabular}{|*{7}{p{7.5mm}|}}
+ \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (A);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (B);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (C);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (D);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (E);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (F);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate (G);}}
+ \\%
+ \hline
+ \multicolumn{1}{|c|}{kg}&\multicolumn{1}{c|}{hg}&\multicolumn{1}{c|}{dag}&\multicolumn{1}{c|}{g}&\multicolumn{1}{c|}{dg}&\multicolumn{1}{c|}{cg}&\multicolumn{1}{c|}{mg}\\
+ \hline
+ &&&&&&\\
+ \multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (G1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (F1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (E1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (D1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (C1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (B1);}}%
+ &\multicolumn{1}{c}{\tikz[remember picture,overlay]{\coordinate[yshift=1em] (A1);}}\\%
+ \end{tabular}
+ \]
+ \ifboolKV[ClesTableaux]{Fleches}{%
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (A) to node[above, midway]{\small$\times\mbox{10}$}(B);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (B) to node[above, midway]{\small$\times\mbox{10}$}(C);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (C) to node[above, midway]{\small$\times\mbox{10}$}(D);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (D) to node[above, midway]{\small$\times\mbox{10}$}(E);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (E) to node[above, midway]{\small$\times\mbox{10}$}(F);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=30,in=150] (F) to node[above, midway]{\small$\times\mbox{10}$}(G);}
+% % bas
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (A1) to node[below, midway]{\small$\div\mbox{10}$}(B1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (B1) to node[below, midway]{\small$\div\mbox{10}$}(C1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (C1) to node[below, midway]{\small$\div\mbox{10}$}(D1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (D1) to node[below, midway]{\small$\div\mbox{10}$}(E1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (E1) to node[below, midway]{\small$\div\mbox{10}$}(F1);}
+ \tikz[remember picture, overlay]{\draw[gray,->,>=latex,out=-150,in=-30] (F1) to node[below, midway]{\small$\div\mbox{10}$}(G1);}
+ }{}%
+ }{}%
}% \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 03:41:24 +0000