From 0f03ca814ab978d0512924e48832baf35ecbcef4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Jan 2024 21:33:53 +0000 Subject: proflycee (6jan24) git-svn-id: svn://tug.org/texlive/trunk@69318 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/proflycee/ProfLycee-doc.pdf | Bin 1450770 -> 1462171 bytes .../doc/latex/proflycee/ProfLycee-doc.tex | 4 +- .../doc/latex/proflycee/ProfLycee-docctan.zip | Bin 1652549 -> 244653 bytes .../texmf-dist/tex/latex/proflycee/ProfLycee.sty | 3 +- .../latex/proflycee/proflycee-tools-complexes.tex | 19 ++++++-- .../latex/proflycee/proflycee-tools-graphiques.tex | 48 +++++++++++++++++++++ 6 files changed, 68 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf index 7928e78fefe..9a4c081b3e5 100644 Binary files a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf and b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex index 806a31ab3ba..afc99386a33 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.01b} -\def\PLdate{2 janvier 2024} +\def\PLversion{3.01c} +\def\PLdate{4 janvier 2024} \usepackage{amsfonts} \usepackage{ProfLycee} \useproflyclib{piton,minted,pythontex,ecritures} diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip index f1a104f2dac..e62b07aa74e 100644 Binary files a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip and b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip differ diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty index d1c9f5a0867..402bc94a184 100644 --- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty +++ b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty @@ -3,7 +3,8 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfLycee}[2024/01/02 3.01b Aide pour l'utilisation de LaTeX en lycee] +\ProvidesPackage{ProfLycee}[2024/01/04 3.01c Aide pour l'utilisation de LaTeX en lycee] +% 3.01c Ajout des splines en mode génération (sans forcément tracer) % 3.01b Ajout de la division euclidienne + correction du bugs mineurs % 3.01a Ajout des courbes ECC/FCC + paramètres par interpolation % 3.00g Amélioration de la marge Gauche dans le PseudoCode diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-complexes.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-complexes.tex index ca64c0ac400..fedb4bfcfc2 100644 --- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-complexes.tex +++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-complexes.tex @@ -1,5 +1,5 @@ % proflycee-tools-complexes.tex -% Copyright 2023 Cédric Pierquet +% Copyright 2023 Cédric Pierquet (expérimental) % Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \NewDocumentCommand\PartieReelle{ D<>{} m O{\PartReRes} }{% @@ -59,14 +59,27 @@ \PartieReelle{#3}[\tmpreB]% \PartieImaginaire{#2}[\tmpimA]% \PartieImaginaire{#3}[\tmpimB]% - \xdef\tmpreCalc{(\tmpreA)+(\tmpreB)}% + %\xdef\tmpreCalc{(\tmpreA)+(\tmpreB)}% \xdef\xinttmpreCalc{\xinteval{(\tmpreA)+(\tmpreB)}}% - \xdef\tmpimCalc{(\tmpimA)+(\tmpimB)}% + %\xdef\tmpimCalc{(\tmpimA)+(\tmpimB)}% \xdef\xinttmpimCalc{\xinteval{(\tmpimA)+(\tmpimB)}}% %\xinttmpreCalc\text{ et }\xinttmpimCalc. \AffComplexe[#1]% } +\NewDocumentCommand\DifferenceComplexes{ O{} m m }{% + \PartieReelle{#2}[\tmpreA]% + \PartieReelle{#3}[\tmpreB]% + \PartieImaginaire{#2}[\tmpimA]% + \PartieImaginaire{#3}[\tmpimB]% + %\xdef\tmpreCalc{(\tmpreA)-(\tmpreB)}% + \xdef\xinttmpreCalc{\xinteval{(\tmpreA)-(\tmpreB)}}% + %\xdef\tmpimCalc{(\tmpimA)-(\tmpimB)}% + \xdef\xinttmpimCalc{\xinteval{(\tmpimA)-(\tmpimB)}}% + %\xinttmpreCalc\text{ et }\xinttmpimCalc. + \AffComplexe[#1]% +} + \NewDocumentCommand\ProduitComplexes{ O{} m m }{% \PartieReelle{#2}[\tmpreA]% \PartieReelle{#3}[\tmpreB]% diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-graphiques.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-graphiques.tex index f6695cacd20..c7208604bfb 100644 --- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-graphiques.tex +++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-graphiques.tex @@ -86,6 +86,54 @@ }% } +%générer les splines +\defKV[genspline]{% + NumDebut=\def\tmpsplinenumdeb{#1},% + NumFin=\def\tmpsplinenumfin{#1} +} + +\setKVdefault[genspline]{% + NumDebut=1,% + NumFin=dernier +} + +\NewDocumentCommand\GenereSplineTikz{ D<>{} m O{\CourbeSplineTikz} }{% + %1=liste + %2=num point début + %3=num point fin + \useKVdefault[genspline]% + \setKV[genspline]{#1}% + \setsepchar[.]{§./}% + \readlist*\SPLlistepoints{#2}% + %les données + \xintifboolexpr{\tmpsplinenumdeb < 1}{\def\tmpsplinenumdeb{1}}{}% + \IfStrEq{\tmpsplinenumfin}{dernier}{\def\tmpsplinenumfin{\SPLlistepointslen}}{}% + \xintifboolexpr{\tmpsplinenumfin > \SPLlistepointslen}{\def\tmpsplinenumfin{\SPLlistepointslen}}{}% + \extractcoeff{\SPLcoeffs}{\tmpsplinenumdeb}% + %nb de calculs + \def\SPLnbsplines{\inteval{\tmpsplinenumfin-1}}% + %extraction des coordonnées + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,1]\xa% + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,2]\ya% + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,3]\fprimea% + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,1]\xb% + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,2]\yb% + \itemtomacro\SPLlistepoints[\tmpsplinenumdeb,3]\fprimeb% + \xdef#3{(\xa,\ya) ..controls +({atan \fprimea}:{(\xb-\xa)/\COEFFA}) and +({-180 + atan \fprimeb}:{(\xb-\xa)/\COEFFA}).. (\xb,\yb)}% + \foreach \i in {\tmpsplinenumdeb,...,\SPLnbsplines}{% + %extraction des coeffs de compensation + \extractcoeff{\SPLcoeffs}{\i}% + \def\j{\inteval{\i+1}}% + \itemtomacro\SPLlistepoints[\i,1]\xa% + \itemtomacro\SPLlistepoints[\i,2]\ya% + \itemtomacro\SPLlistepoints[\i,3]\fprimea% + \itemtomacro\SPLlistepoints[\j,1]\xb% + \itemtomacro\SPLlistepoints[\j,2]\yb% + \itemtomacro\SPLlistepoints[\j,3]\fprimeb% + \xdef#3{#3 ..controls +({atan \fprimea}:{(\xb-\xa)/\COEFFA}) and +({-180 + atan \fprimeb}:{(\xb-\xa)/\COEFFB}).. (\xb,\yb)}% + }% +} + %splines en tikz avec ..controls \defKV[spline]{% Epaisseur=\def\SPLepaisseur{#1},% -- cgit v1.2.3