summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/proflycee
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-03-19 03:02:55 +0000
committerNorbert Preining <norbert@preining.info>2024-03-19 03:02:55 +0000
commit1b771c1e303b8274d871ee6bd4bdd5ba03bdd152 (patch)
tree812adf200ad09972163243b4e4341a3991852c14 /macros/latex/contrib/proflycee
parent9c8677e09c2c9b0d9593f26ed226411d68160a4e (diff)
CTAN sync 202403190302
Diffstat (limited to 'macros/latex/contrib/proflycee')
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdfbin1626650 -> 1640551 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex4
-rw-r--r--macros/latex/contrib/proflycee/tex/ProfLycee.sty4
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex84
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex12
5 files changed, 95 insertions, 9 deletions
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
index e51248bb1d..6401533972 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
index 8c7da1f846..55981358f1 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
@@ -5,8 +5,8 @@
% arara: lualatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
\documentclass[a4paper,french,11pt]{article}
-\def\PLversion{3.02f}
-\def\PLdate{7 mars 2024}
+\def\PLversion{3.03a}
+\def\PLdate{17 mars 2024}
\usepackage{amsfonts}
\usepackage{ProfLycee}
\useproflyclib{piton,minted,pythontex,ecritures,espace}
diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
index 05945a83b1..f714774351 100644
--- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty
+++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
@@ -3,7 +3,9 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2024/03/07 3.02f Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2024/03/17 3.03a Aide pour l'utilisation de LaTeX en lycee]
+% 3.03a Forme canonique + fonction homographique
+% 3.02g Correction de bugs avec les arbres de probas
% 3.02f Ajout de petits schémas type pour la géométrie dans l'espace + conformité avec piton
% 3.02e Présentation python dans la style 'thonny' + amélioration dans la gestion du gobble avec piton
% 3.02d Retenues pour les soustractions dans les opérations posées
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex
index 3454738654..5e1f246ab3 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex
@@ -882,4 +882,88 @@
}
\makeatother
+%===F.CANONIQUE & F.HOMOGRAPHIQUE
+\NewDocumentCommand\FormeCanonique{ s O{d} m m m }{%
+ \def\tmpcoeffalpha{-(#4)/(2*(#3))}%
+ \def\tmpcoeffbeta{(#3)*(-(#4)/(2*(#3)))^2+(#4)*(-(#4)/(2*(#3)))+(#5)}%
+ \def\coeffaconv{\ConversionFraction[#2]{#3}}%
+ \def\coeffalpha{\ConversionFraction[#2]{-(#4)/(2*(#3))}}%
+ \def\coeffalphamoins{\ConversionFraction[#2]{(#4)/(2*(#3))}}%
+ \def\coeffbeta{\ConversionFraction[#2]{(#3)*(-(#4)/(2*(#3)))^2+(#4)*(-(#4)/(2*(#3)))+(#5)}}%
+ \ensuremath{%
+ %on affiche a, sauf s'il vaut 1 ou -1
+ \xintifboolexpr{#3 == 1}{}{}%
+ \xintifboolexpr{#3 == -1}{-}{}%
+ \xintifboolexpr{#3 != -1 'and' #3 != 1}{\coeffaconv}{}%
+ \xintifboolexpr{\tmpcoeffalpha == 0}%
+ {%
+ x^2%
+ }%
+ {%
+ \IfBooleanTF{#1}%
+ {%
+ \xintifboolexpr{\tmpcoeffalpha < 0}%
+ {%
+ {\left(x\xintifboolexpr{\tmpcoeffalpha < 0}{-}{+}{\left(\coeffalpha\right)}\right)}^2%
+ }%
+ {%
+ {\left(x\xintifboolexpr{\tmpcoeffalpha > 0}{}{+}\coeffalphamoins\right)}^2%
+ }%
+ }%
+ {%
+ {\left(x\xintifboolexpr{\tmpcoeffalpha > 0}{}{+}\coeffalphamoins\right)}^2%
+ }%
+ }%
+ \xintifboolexpr{\tmpcoeffbeta == 0}%
+ {}%
+ {%
+ \xintifboolexpr{\tmpcoeffbeta > 0}{+}{}\coeffbeta%
+ }%
+ }%
+}
+
+\NewDocumentCommand\FonctionHomographique{ s O{t} m m m m }{%
+ \xintifboolexpr{#3 != 0}%
+ {%
+ \def\tmpcoeffSeul{(#3)/(#5)}%
+ \def\tmpcoeffNum{((#4)*(#5)-(#3)*(#6))/((#5)*(#5))}%
+ \def\tmpcoeffDenom{(#6)/(#5)}%
+ \ensuremath{%
+ \ConversionFraction[d]{\tmpcoeffSeul}%
+ +\dfrac%
+ {\ConversionFraction[#2]{\tmpcoeffNum}}%
+ {x%
+ \xintifboolexpr{#6 == 0}{}{%
+ \IfBooleanTF{#1}%
+ {%
+ \xintifboolexpr{\tmpcoeffDenom > 0}{-\left(\ConversionFraction[#2]{-(\tmpcoeffDenom)}\right)}{\ConversionFraction[#2]{\tmpcoeffDenom}}%
+ }%
+ {%
+ \xintifboolexpr{\tmpcoeffDenom > 0}{+}{}\ConversionFraction[#2]{\tmpcoeffDenom}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ {%
+ \def\tmpcoeffNum{(#4)/(#5)}%
+ \def\tmpcoeffDenom{(#6)/(#5)}%
+ \ensuremath{%
+ \dfrac%
+ {\ConversionFraction[#2]{\tmpcoeffNum}}%
+ {x%
+ \xintifboolexpr{#6 == 0}{}{%
+ \IfBooleanTF{#1}%
+ {%
+ \xintifboolexpr{\tmpcoeffDenom > 0}{-}{}\left(\ConversionFraction[#2]{-(\tmpcoeffDenom)}\right)%
+ }%
+ {%
+ \xintifboolexpr{\tmpcoeffDenom > 0}{+}{}\ConversionFraction[#2]{\tmpcoeffDenom}%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
index 950c59a4a8..e817af767e 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
@@ -318,7 +318,7 @@
\ifstrempty{\PLARBREDONNES[3,2]}
{\draw[PLfleche] (A11)--(A22) ;}
{%
- \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[2,3]}{\PLARBREDONNES[3,2]}{below=1pt}
+ \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[3,3]}{\PLARBREDONNES[3,2]}{below=1pt}
%\draw[PLfleche] (A11)--(A22) node[probas,PLetiquette,{\PLARBREDONNES[3,3]}] {{\PLARBREDONNES[3,2]}} ;
}%
\ifstrempty{\PLARBREDONNES[4,2]}
@@ -445,7 +445,7 @@
\ifstrempty{\PLARBREDONNES[3,2]}
{\draw[PLfleche] (A11)--(A22) ;}
{
- \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[2,3]}{\PLARBREDONNES[2,2]}{above=-1pt}
+ \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[3,3]}{\PLARBREDONNES[3,2]}{above=-1pt}
%\draw[PLfleche] (A11)--(A22) node[probas,PLetiquette,{\PLARBREDONNES[3,3]}] {{\PLARBREDONNES[3,2]}} ;
}
\ifstrempty{\PLARBREDONNES[4,2]}
@@ -609,7 +609,7 @@
\ifstrempty{\PLARBREDONNES[3,2]}
{\draw[PLfleche] (A11)--(A22) ;}
{%
- \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[2,3]}{\PLARBREDONNES[3,2]}{below=1pt}
+ \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[3,3]}{\PLARBREDONNES[3,2]}{below=1pt}
%\draw[PLfleche] (A11)--(A22) node[probas,PLetiquette,{\PLARBREDONNES[3,3]}] {{\PLARBREDONNES[3,2]}} ;
}%
\ifstrempty{\PLARBREDONNES[4,2]}
@@ -736,7 +736,7 @@
\ifstrempty{\PLARBREDONNES[3,2]}
{\draw[PLfleche] (A11)--(A22) ;}
{
- \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[2,3]}{\PLARBREDONNES[2,2]}{above=-1pt}
+ \IntPlaceProbasArbre{A11}{A22}{\PLARBREDONNES[3,3]}{\PLARBREDONNES[3,2]}{above=-1pt}
%\draw[PLfleche] (A11)--(A22) node[probas,PLetiquette,{\PLARBREDONNES[3,3]}] {{\PLARBREDONNES[3,2]}} ;
}
\ifstrempty{\PLARBREDONNES[4,2]}
@@ -905,7 +905,7 @@
\draw[thick,->,>=latex] (-4,0)--(4,0) ;
\draw[thick,densely dotted] (0,0)--(0,0.39894) ;
\draw[thick,domain=-4:4,samples=100,\GRPHPROBcoulcbe] plot (\x,{\densnorm{\x}}) ;
- \end{tikzpicture}
+ \end{tikzpicture}%
}
\NewDocumentCommand\LoiExpoGraphe{ O{} D<>{} m m m }{%1=options,2=optionstikz,3=l,4=a,5=b
@@ -933,7 +933,7 @@
\draw[thick,->,>=latex] (-0.2,0)--(3.8,0) ;
\draw[thick,->,>=latex] (0,-0.15)--(0,0.85) ;
\draw[thick,domain=0:3.8,samples=100,\GRPHPROBcoulcbe] plot (\x,{0.7*\densexpo{\x}}) ;
- \end{tikzpicture}
+ \end{tikzpicture}%
}
%%------aNp/Cnp