summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex')
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex62
1 files changed, 31 insertions, 31 deletions
diff --git a/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex b/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
index fa7363c750..4038ecd1b0 100644
--- a/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
@@ -123,7 +123,7 @@
}
\newcount\anpdc\newcount\bnpdc\newcount\cnpdc\newcount\dnpdc%
-\newcount\DivCom
+\newcount\PfCDivCom%
\newcommand\DiviseurCommun[2]{%
% #1 : le premier nombre entier
% #2 : le deuxi\`eme nombre entier
@@ -131,50 +131,50 @@
\cnpdc=#2%
\bnpdc=2\relax%
\dnpdc=\numexpr#1+1\relax%
- \DivCom=1\relax%
+ \PfCDivCom=1\relax%
\whiledo{\bnpdc<\dnpdc}{%
\modulo{\the\anpdc}{\the\bnpdc}\relax
\ifnum\remainder=0%
\modulo{\the\cnpdc}{\the\bnpdc}
\ifnum\remainder=0%
- \DivCom=\bnpdc%
+ \PfCDivCom=\bnpdc%
\bnpdc=\anpdc%
\else%
- \DivCom=1%
+ \PfCDivCom=1%
\fi
\else%
- \DivCom=1%
+ \PfCDivCom=1%
\fi
\bnpdc=\numexpr\bnpdc+1\relax%
}%
}
-\newcommand\LongueSimplification[2]{%
- \xdef\NumerateurDiv{#1}%
- \xdef\DenominateurDiv{#2}%
+\NewDocumentCommand\LongueSimplification{mm}{%
+ \xdef\PfCNumerateurDiv{#1}%
+ \xdef\PfCDenominateurDiv{#2}%
\ifboolKV[ClesSimplification]{Impose}{%
- \DivCom=\useKV[ClesSimplification]{Nombre}%
+ \PfCDivCom=\useKV[ClesSimplification]{Nombre}%
}{%
\DiviseurCommun{#1}{#2}%
}%
\ifboolKV[ClesSimplification]{Debut}{%
\ensuremath{%
- \whiledo{\DivCom>1}{%
- \frac{\mathcolor{PfCSimpliCol}{\num{\the\DivCom}}\times\num{\fpeval{\NumerateurDiv/\the\DivCom}}}{\mathcolor{PfCSimpliCol}{\num{\the\DivCom}}\times\num{\fpeval{\DenominateurDiv/\the\DivCom}}}=\frac{\num{\fpeval{\NumerateurDiv/\DivCom}}}{\num{\fpeval{\DenominateurDiv/\DivCom}}}%
- \xdef\NumerateurDiv{\fpeval{\NumerateurDiv/\DivCom}}%
- \xdef\DenominateurDiv{\fpeval{\DenominateurDiv/\DivCom}}%
- \DiviseurCommun{\NumerateurDiv}{\DenominateurDiv}%
- \xintifboolexpr{\DivCom>1}{=}{}%
+ \whiledo{\PfCDivCom>1}{%
+ \frac{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}%
+ \xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}%
+ \xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}%
+ \DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}%
+ \xintifboolexpr{\PfCDivCom>1}{=}{}%
}%
}%
}{%
\ensuremath{%
- \whiledo{\DivCom>1}{%
- \frac{\num{\fpeval{\NumerateurDiv/\the\DivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\DivCom}}}{\num{\fpeval{\DenominateurDiv/\the\DivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\DivCom}}}=\frac{\num{\fpeval{\NumerateurDiv/\DivCom}}}{\num{\fpeval{\DenominateurDiv/\DivCom}}}%
- \xdef\NumerateurDiv{\fpeval{\NumerateurDiv/\DivCom}}%
- \xdef\DenominateurDiv{\fpeval{\DenominateurDiv/\DivCom}}%
- \DiviseurCommun{\NumerateurDiv}{\DenominateurDiv}%
- \xintifboolexpr{\DivCom>1}{=}{}%
+ \whiledo{\PfCDivCom>1}{%
+ \frac{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}%
+ \xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}%
+ \xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}%
+ \DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}%
+ \xintifboolexpr{\PfCDivCom>1}{=}{}%
}%
}%
}%
@@ -186,7 +186,7 @@
\newcounter{NbFrac}%
\setcounter{NbFrac}{0}%
-\newcommand\Simplification[3][]{%
+\NewDocumentCommand\Simplification{omm}{%
\stepcounter{NbFrac}%
\useKVdefault[ClesSimplification]%
\setKV[ClesSimplification]{#1}%
@@ -198,15 +198,15 @@
\setbox2=\hbox{\Listeb[1,1]}%
\setbox3=\hbox{\Listea[1,3]}%
\setbox4=\hbox{\Listeb[1,3]}%
- \ensuremath{%
- \frac{\tikzmarknode[anchor=north]{A-\theNbFrac}{\Listea[1,1]}{}}{\tikzmarknode[anchor=south]{B-\theNbFrac}{\Listeb[1,1]}{}}=\frac{\tikzmarknode[anchor=north]{C-\theNbFrac}{\Listea[1,3]}{}}{\tikzmarknode[anchor=south]{D-\theNbFrac}{\Listeb[1,3]}{}}%
- }%
- \begin{tikzpicture}[remember picture,overlay]%
- \draw[out=45,in=135,-stealth,transform canvas={yshift=0.25em}]
- let
- \p1=(pic cs:A-\theNbFrac),
- \p2=(pic cs:C-\theNbFrac)
- in (pic cs:A-\theNbFrac) to node[midway,above]{\Listea[1,2]}(\x2,\y1);
+ \ensuremath{%
+ \frac{\tikzmarknode[anchor=north]{A-\theNbFrac}{\Listea[1,1]}{}}{\tikzmarknode[anchor=south]{B-\theNbFrac}{\Listeb[1,1]}{}}=\frac{\tikzmarknode[anchor=north]{C-\theNbFrac}{\Listea[1,3]}{}}{\tikzmarknode[anchor=south]{D-\theNbFrac}{\Listeb[1,3]}{}}%
+ }%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \draw[out=45,in=135,-stealth,transform canvas={yshift=0.25em}]
+ let
+ \p1=(pic cs:A-\theNbFrac),
+ \p2=(pic cs:C-\theNbFrac)
+ in (pic cs:A-\theNbFrac) to node[midway,above]{\Listea[1,2]}(\x2,\y1);
\draw[out=-45,in=-135,-stealth,transform canvas={yshift=-0.25em}] (pic cs:B-\theNbFrac) to node[midway,below]{\Listeb[1,2]}(pic cs:D-\theNbFrac);%
\end{tikzpicture}%
}{%