diff options
author | Norbert Preining <norbert@preining.info> | 2021-01-19 03:01:36 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-01-19 03:01:36 +0000 |
commit | 07549467cd23db09b2150c50bc9f93f10f08764a (patch) | |
tree | 38a43c82095b328a9dc8be00dd5bc86781eb6966 /macros/latex/contrib/profcollege | |
parent | 62b141a25b6f63cb4cc626d1a005ecf67c19e5cd (diff) |
CTAN sync 202101190301
Diffstat (limited to 'macros/latex/contrib/profcollege')
-rw-r--r-- | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf | bin | 1645335 -> 1643198 bytes | |||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationComposition1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationLaurent1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationLaurent1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationPose1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationPose1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationSoustraction1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationSymbole1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationSymbole1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/PfC-EquationTerme1.tex (renamed from macros/latex/contrib/profcollege/latex/EquationTerme1.tex) | 0 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/latex/ProfCollege.sty | 14 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp | 25 |
9 files changed, 25 insertions, 14 deletions
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf Binary files differindex a95f7c6250..7bdee3edec 100644 --- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf +++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf diff --git a/macros/latex/contrib/profcollege/latex/EquationComposition1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex index b513a6b116..b513a6b116 100644 --- a/macros/latex/contrib/profcollege/latex/EquationComposition1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationComposition1.tex diff --git a/macros/latex/contrib/profcollege/latex/EquationLaurent1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationLaurent1.tex index 347afc0e8d..347afc0e8d 100644 --- a/macros/latex/contrib/profcollege/latex/EquationLaurent1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationLaurent1.tex diff --git a/macros/latex/contrib/profcollege/latex/EquationPose1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationPose1.tex index e34d382a58..e34d382a58 100644 --- a/macros/latex/contrib/profcollege/latex/EquationPose1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationPose1.tex diff --git a/macros/latex/contrib/profcollege/latex/EquationSoustraction1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex index 034aa7e2ed..034aa7e2ed 100644 --- a/macros/latex/contrib/profcollege/latex/EquationSoustraction1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationSoustraction1.tex diff --git a/macros/latex/contrib/profcollege/latex/EquationSymbole1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationSymbole1.tex index 4faec4767a..4faec4767a 100644 --- a/macros/latex/contrib/profcollege/latex/EquationSymbole1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationSymbole1.tex diff --git a/macros/latex/contrib/profcollege/latex/EquationTerme1.tex b/macros/latex/contrib/profcollege/latex/PfC-EquationTerme1.tex index f3930d0408..f3930d0408 100644 --- a/macros/latex/contrib/profcollege/latex/EquationTerme1.tex +++ b/macros/latex/contrib/profcollege/latex/PfC-EquationTerme1.tex diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty index fa057b58b1..30aa5d3e9d 100644 --- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty +++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty @@ -58,7 +58,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/01 v0.88 Aide pour l'utilisation de LaTeX au collège] +\ProvidesPackage{ProfCollege}[2021/01/18 v0.89 Aide pour l'utilisation de LaTeX au collège] \RequirePackage{mathtools}%Amélioration des rendus \RequirePackage{amssymb} @@ -6396,12 +6396,12 @@ vardef Positions(expr Step)= \definecolor{Cfleches}{RGB}{100,100,100}% -\input{EquationSoustraction1}% -\input{EquationTerme1}% -\input{EquationComposition1}% -\input{EquationPose1}% -\input{EquationSymbole1}% -\input{EquationLaurent1} +\input{PfC-EquationSoustraction1}% +\input{PfC-EquationTerme1}% +\input{PfC-EquationComposition1}% +\input{PfC-EquationPose1}% +\input{PfC-EquationSymbole1}% +\input{PfC-EquationLaurent1} \newcommand{\ResolEquation}[5][]{% \useKVdefault[ClesEquation]% diff --git a/macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp b/macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp index 1408cbbce1..222df57419 100644 --- a/macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp +++ b/macros/latex/contrib/profcollege/metapost/PfC-Geometrie.mp @@ -1,8 +1,6 @@ -%Author : Christophe Poulain -%Licence : Released under the LaTeX Project Public License v1.3c -% or later, see http://www.latex-project.org/lppl.txtf %=============================================== %% PfC-Geometrie +%% christophe.poulain@melusine.eu.org %%=============================================== %------------------------------------------------ % Appel fichier @@ -168,10 +166,23 @@ vardef cercles(text t)= _T[n]:=p_; fi; endfor; - path Cer; - if n=1 : Cer=fullcircle scaled (2*rayon) shifted _t[1]; - elseif n=2 : Cer=fullcircle scaled (2*abs(_t[1]-_t[2])) shifted _t[1]; - elseif n=3 : Cer=cercles(CentreCercleC(_t[1],_t[2],_t[3]),_t[1]); + if typetrace="3D":%centre aa passant par bb dans le plan (ccddee) généralement aa=cc + path Cer; + color ptcer[]; + for k=0 step 5 until 360 : + ptcer[k div 5]-_T[1]=Distance(_T[1],_T[2])*((_T[4]-_T[3])*cosd(k)/Distance(_T[3],_T[4])+(_T[5]-_T[3])*sind(k)/Distance(_T[3],_T[5])); + endfor; + Cer=Projette(ptcer0) + for k=0 step 5 until 360 : + ..Projette(ptcer[k div 5]) + endfor + ..cycle; + else: + path Cer; + if n=1 : Cer=fullcircle scaled (2*rayon) shifted _t[1]; + elseif n=2 : Cer=fullcircle scaled (2*abs(_t[1]-_t[2])) shifted _t[1]; + elseif n=3 : Cer=cercles(CentreCercleC(_t[1],_t[2],_t[3]),_t[1]); + fi fi Cer enddef; |