summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-18 20:04:53 +0000
committerKarl Berry <karl@freefriends.org>2024-03-18 20:04:53 +0000
commit21ccace31d42de9b654d0afad8bbb8ca81b15565 (patch)
tree34c46c589c598cdb7959f0f8b4ffff52f7235806
parent73bdad80e82086613893847844a9076ccf6f6d53 (diff)
proflycee (18mar24)
git-svn-id: svn://tug.org/texlive/trunk@70697 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdfbin1626650 -> 1640551 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex4
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zipbin267204 -> 1970139 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty4
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-analyse.tex84
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex12
6 files changed, 95 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
index e51248bb1db..64015339722 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex
index 8c7da1f8464..55981358f1b 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex
+++ b/Master/texmf-dist/doc/latex/proflycee/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/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
index a6db38f942d..49365d4b1cf 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
index 05945a83b16..f714774351b 100644
--- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
+++ b/Master/texmf-dist/tex/latex/proflycee/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/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-analyse.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-analyse.tex
index 34547386542..5e1f246ab3f 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-analyse.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/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/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex
index 950c59a4a8a..e817af767ea 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/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