summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-30 21:05:17 +0000
committerKarl Berry <karl@freefriends.org>2023-11-30 21:05:17 +0000
commit345654654ff7d496bd0c7a5b88203623205276b4 (patch)
tree58e8178f0b22eaf8799d3b9332554447b68acfa7 /Master
parent041d3b19fe327bd3c72b84d74999ef7c91b04a3d (diff)
proflycee (30nov23)
git-svn-id: svn://tug.org/texlive/trunk@69008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdfbin1425491 -> 1418840 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex272
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zipbin1622442 -> 1615785 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/README.md13
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty3
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-listings.tex29
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex14
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-pythontex.tex3
8 files changed, 39 insertions, 295 deletions
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
index 8f6e135b5bf..c35a8814428 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
deleted file mode 100644
index 32cea1a647c..00000000000
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.tex
+++ /dev/null
@@ -1,272 +0,0 @@
-% !TeX TXS-program:compile = txs:///arara
-% arara: lualatex: {shell: yes, synctex: no, interaction: batchmode}
-% arara: pythontex: {rerun: always}
-% arara: lualatex: {shell: yes, synctex: no, interaction: batchmode}
-% 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.00f}
-\def\PLdate{18 novembre 2023}
-\usepackage{amsfonts}
-\usepackage{ProfLycee}
-\useproflyclib{piton,minted,pythontex,ecritures}
-\usepackage[math-style=french]{fourier-otf}
-\usepackage{mathrsfs}%pour mathscr
-\usepackage{awesomebox}
-\usepackage[lua]{tkz-euclide}
-\usepackage{tkz-tab}
-\tikzstyle{every picture}+=[remember picture]
-\usetikzlibrary{hobby}
-\usepackage[group-minimum-digits=4]{siunitx}
-\sisetup{locale=FR}
-\usepackage{enumitem}
-\usepackage{fancyvrb}
-\usepackage{fancyhdr}
-\usepackage{tabularray}
-\usepackage{multicol}
-\DeclareMathSymbol{;}\mathbin{operators}{'73} %espacement avec ;
-%fancy
-\fancyhf{}
-\renewcommand{\headrulewidth}{0pt}
-\lfoot{\sffamily \small [ProfLycee]}
-\cfoot{\sffamily \small - \thepage{} -}
-\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
-
-\usepackage{graphics}
-\usepackage{hologo}
-\providecommand\tikzlogo{Ti\textit{k}Z}
-\providecommand\TeXLive{\TeX{}Live\xspace}
-\providecommand\PSTricks{\textsf{PSTricks}\xspace}
-\let\pstricks\PSTricks
-\let\TikZ\tikzlogo
-\newcommand\TableauDocumentation{%
- \begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]},cells={font=\huge\sffamily}}
- {\LaTeX} & {\hologo{pdfLaTeX}} & {\hologo{LuaLaTeX}} & {\TikZ} & {\TeXLive} & {\hologo{MiKTeX}} \\
- \end{tblr}
-}
-\usepackage{simplekv}
-\usepackage{menukeys}
-\let\tab\relax
-\usepackage{tabto}
-\usepackage{pgf,pgfplots}
-\pgfplotsset{compat=newest,xlabel near ticks,ylabel near ticks}
-\usepackage{listofitems}
-\usepackage{xintexpr}
-\usepackage{codehigh}
-\usepackage{scontents}
-\usepackage{hyperref}
-\urlstyle{same}
-\hypersetup{pdfborder=0 0 0}
-\usepackage{geometry}
-\geometry{margin=1.5cm}
-\usepackage{babel}
-\usepackage{newverbs}
-
-\input{ProfLycee-doc-macropreamb.tex}
-
-\input{ProfLycee-doc-pagegarde.tex}
-
-\newpage
-
-\phantomsection
-\hypertarget{matoc}{}
-
-\tableofcontents
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Introduction}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-introduction.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Liste des commandes}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-listecommandes.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Écritures mathématiques}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-ecritures.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour l'analyse}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-outilsanalyse.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils graphiques}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-outilsgraphiques.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Présentation de codes}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-prescodes.tex}
-
-\pagebreak
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour la géométrie}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-outilsgeom.tex}
-
-\pagebreak
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour la géométrie analytique}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-outilsgeomanalyt.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour les statistiques}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-stats.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour les probabilités}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-probas.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Outils pour l'arithmétique}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-arithm.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Écritures, simplifications}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-simplif.tex}
-
-\pagebreak
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Jeux et récréations}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-jeuxrecreat.tex}
-
-\newpage
-
-\phantom{t}\par\vfill\par
-\begin{PART}
- \begin{center}
- \Huge\MakeUppercase{Historique}
- \end{center}
-\end{PART}
-\par\vfill\par\phantom{t}
-
-\newpage
-
-\input{ProfLycee-doc-historique.tex}
-
-\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
index e0d82ba9100..36689daea7a 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/doc/latex/proflycee/README.md b/Master/texmf-dist/doc/latex/proflycee/README.md
index 11502d6f774..bdafe102e41 100644
--- a/Master/texmf-dist/doc/latex/proflycee/README.md
+++ b/Master/texmf-dist/doc/latex/proflycee/README.md
@@ -1,13 +1,10 @@
You are a french mathematics teacher ?
proflycee may be a useful package to daily use of LaTeX.
-
-----------------
-
+-----------------------------------------------------------------------------
Vous êtes un enseignant de mathématiques en lycée ?
proflycee est un package qui pourra vous aider à utiliser LaTeX au quotidien.
+-----------------------------------------------------------------------------
-----------------
-
-Author : Cédric Pierquet
-email : cpierquet@outlook.fr
-Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+Author.....: Cédric Pierquet
+email......: cpierquet@outlook.fr
+Licence....: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
index cd11a8d3d54..1a9535be022 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}[2023/11/18 3.00f Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2023/11/30 3.00g Aide pour l'utilisation de LaTeX en lycee]
+% 3.00g Amélioration de la marge Gauche dans le PseudoCode
% 3.00f Conversion d'une écriture décimale périodique en fraction (avec rédaction éventuelle)
% 3.00e Ajout des 'machines à transformer' + Correction d'un nom de commande (cc ProfCollege ^^)
% 3.00d Ajout de commandes pour des chateaux de cartes et des allumettes
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-listings.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-listings.tex
index c6be201f710..81495669baf 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-listings.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-listings.tex
@@ -2,6 +2,7 @@
% Copyright 2023 Cédric Pierquet
% Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+%3.00g Amélioration marge gauche PseudoCode
%2.7.5 Ajout de clés pour PythonLst + Couleurs optionnelles pour PseudoCode
%2.7.3 Correction de la couleur des bordures
%2.5.8 Styles alternatifs + Modification marges
@@ -91,19 +92,24 @@
\tcbset{stylepythonlstlineos/.style={%
stylepythonlst,
- listing options={style=PLpython,xleftmargin=16pt,numbers=left}
+ listing options={style=PLpython,xleftmargin=\PythonCodeXLeft,numbers=left}
}
}
+\newlength{\PythonCodeXLeft}
+\setlength{\PythonCodeXLeft}{14pt}
+
%test v3 avec simplekv
\defKV[CodePythonLst]{%
Largeur=\def\CodePythonLstLarg{#1},%
- PremLigne=\def\CodePythonLstFirstLine{#1}
+ PremLigne=\def\CodePythonLstFirstLine{#1},
+ EspaceNum=\setlength{\PythonCodeXLeft}{#1}
}
\setKVdefault[CodePythonLst]{%
Largeur=\linewidth,%
- PremLigne=1
+ PremLigne=1,%
+ EspaceNum=14pt
}
\NewDocumentEnvironment{CodePythonLst}{ s O{} m }%nouvelle version avec clés listings
@@ -115,7 +121,7 @@
\tcblisting{stylepythonlst,listing options={style=PLpython,xleftmargin=0pt,numbers=none},width=\CodePythonLstLarg,#3}
}%
{%
- \tcblisting{stylepythonlst,listing options={style=PLpython,xleftmargin=16pt,numbers=left,firstnumber=\CodePythonLstFirstLine},width=\CodePythonLstLarg,#3}
+ \tcblisting{stylepythonlst,listing options={style=PLpython,xleftmargin=\PythonCodeXLeft,numbers=left,firstnumber=\CodePythonLstFirstLine},width=\CodePythonLstLarg,#3}
}%
}%
{%
@@ -194,7 +200,7 @@
}%
{%
\tcblisting{StylPythonB,
- listing options={style=PLpython,xleftmargin=16pt,numbers=left,firstnumber=\CodePythonLstFirstLine},%
+ listing options={style=PLpython,xleftmargin=\PythonCodeXLeft,numbers=left,firstnumber=\CodePythonLstFirstLine},%
underlay={%
\begin{tcbclipinterior}
\draw[draw=none,fill=lightgray!25] (interior.south west) rectangle ([xshift=1.3em]interior.north west) ;
@@ -245,7 +251,7 @@
keepspaces = true,
tabsize = 4,
numbersep = 10pt,
- xleftmargin = 14pt,
+ xleftmargin = \PseudoCodeXLeft,
numbers = left,
morestring = [b]",
showstringspaces = false,
@@ -267,15 +273,20 @@
escapeinside = {(*}{*)}
}
+\newlength{\PseudoCodeXLeft}
+\setlength{\PseudoCodeXLeft}{14pt}
+
\defKV[CodePseudoCodeLst]{%
Largeur=\def\CodePseudoCodeLstLarg{#1},%
- PremLigne=\def\CodePseudoCodeLstFirstLine{#1}
+ PremLigne=\def\CodePseudoCodeLstFirstLine{#1},%
+ EspaceNum=\setlength{\PseudoCodeXLeft}{#1}
}
\setKVdefault[CodePseudoCodeLst]{%
Largeur=\linewidth,%
PremLigne=1,%
- Couleur=false
+ Couleur=false,%
+ EspaceNum=14pt
}
%style tcbox pseudocode avec bannière hautdroite
@@ -406,7 +417,7 @@
%stringstyle = \color{red!75},
keepspaces = true,
tabsize = 4,
- xleftmargin = 1.5em,
+ xleftmargin = \PseudoCodeXLeft,
numbers = left,
morestring = [b]",
showstringspaces = false,
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex
index 87c152c1916..98bf7366097 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex
@@ -2,13 +2,17 @@
% Copyright 2023 Cédric Pierquet
% Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
-% 2.7.5 Argument optionnel pour les numéros de lignes + changement déclaration environnements
+%3.00g Modif mineure pour la marge gauche
+%2.7.5 Argument optionnel pour les numéros de lignes + changement déclaration environnements
%2.7.3 Correction de la couleur des bordures
%2.5.8 Style alternatif + Modification marges
%%------PYTHONMINTED
%clés
+%\newlength{\MintedCodeXLeft}
+%\setlength{\MintedCodeXLeft}{14pt}
+
\defKV[CodePythonMinted]{%
Largeur=\def\CodePythonMintedLarg{#1},%
PremLigne=\def\CodePythonMintedPremLigne{#1}
@@ -30,7 +34,7 @@
\tcbset{pytminted/.style={%
listing engine=minted,minted style=colorful,
minted language=python,listing only,
- minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=16pt,linenos,numbersep=10pt},
+ minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=14pt,linenos,numbersep=10pt},
}
}
@@ -57,7 +61,7 @@
}
}%
{%
- \tcblisting{listing engine=minted,minted style=colorful,minted language=python,listing only,minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=16pt,linenos,numbersep=10pt,firstnumber=\CodePythonMintedPremLigne},,enhanced,width=\CodePythonMintedLarg,#3,colframe=CouleurVertForet,colback=CouleurVertForet!5,boxrule=1.25pt,sharp corners=downhill,arc=12pt,before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
+ \tcblisting{listing engine=minted,minted style=colorful,minted language=python,listing only,minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=14pt,linenos,numbersep=10pt,firstnumber=\CodePythonMintedPremLigne},,enhanced,width=\CodePythonMintedLarg,#3,colframe=CouleurVertForet,colback=CouleurVertForet!5,boxrule=1.25pt,sharp corners=downhill,arc=12pt,before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
left=0.6em,top=\baselineskip,bottom=2mm,right=5mm,%
attach boxed title to top right={yshift=-\tcboxedtitleheight},
boxed title style={
@@ -111,7 +115,7 @@
\tcbset{pytmintedalt/.style={%
listing engine=minted,minted style=colorful,
minted language=python,listing only,
- minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=16pt,linenos,numbersep=10pt},
+ minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=14pt,linenos,numbersep=10pt},
underlay={%
\begin{tcbclipinterior}
\draw[draw=none,fill=lightgray!25] (interior.south west) rectangle ([xshift=1.3em]interior.north west) ;
@@ -131,7 +135,7 @@
{%
\tcblisting{listing engine=minted,minted style=colorful,
minted language=python,listing only,
- minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=16pt,linenos,numbersep=10pt,firstnumber=\CodePythonMintedPremLigne},
+ minted options={tabsize=4,fontsize=\footnotesize,autogobble,xleftmargin=14pt,linenos,numbersep=10pt,firstnumber=\CodePythonMintedPremLigne},
underlay={%
\begin{tcbclipinterior}
\draw[draw=none,fill=lightgray!25] (interior.south west) rectangle ([xshift=1.3em]interior.north west) ;
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-pythontex.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-pythontex.tex
index ba19e702233..8f865f0020c 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-pythontex.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-pythontex.tex
@@ -24,6 +24,9 @@
EspacementVertical=1
}
+\newlength{\PythontexCodeXLeft}
+\setlength{\PythontexCodeXLeft}{14pt}
+
\newenvironment{ConsolePythontex}[2][]
{%
\useKVdefault[envpythonconsole]%