summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-10 21:03:54 +0000
committerKarl Berry <karl@freefriends.org>2020-08-10 21:03:54 +0000
commit9677ca1d39adeaddf111e115ac33eab370a56678 (patch)
tree3e8b4a15f3e45c32183ab60f995904ab034da67a
parentdc7cba3d7b221b82725446f2bd826b6f7a2bebbe (diff)
frpseudocode (10aug20)
git-svn-id: svn://tug.org/texlive/trunk@56088 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/frpseudocode/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdfbin62553 -> 67360 bytes
-rw-r--r--Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex28
-rw-r--r--Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty60
4 files changed, 86 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/frpseudocode/README.md b/Master/texmf-dist/doc/latex/frpseudocode/README.md
index 1285a0df1ac..0fcdb8ab0a9 100644
--- a/Master/texmf-dist/doc/latex/frpseudocode/README.md
+++ b/Master/texmf-dist/doc/latex/frpseudocode/README.md
@@ -26,3 +26,8 @@ This is a WIP, there might be some unknown issues. You can report these issues b
## License
Made under The LaTeX Project Public License 1.3c
+
+## Changelog
+
+2020-08-03 : Initial release
+2020-08-09 : Changed algorithm title to french
diff --git a/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf b/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf
index be66949dae1..5e5d7995fa1 100644
--- a/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf
+++ b/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex b/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex
index de0de6846e5..09e8a8c9fbd 100644
--- a/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex
+++ b/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex
@@ -6,7 +6,7 @@
\begin{algorithm}
\caption{Algorithme d'Euclide}
\begin{algorithmic}[1]
-\Procedure{Euclide}{$a,b$}
+\Function{Euclide}{$a, b$}
\Comment{PGCD de a et b}
\State $r\gets a\bmod b$
\While{$r\not=0$}\Comment{Si r = 0, on a la réponse}
@@ -15,6 +15,32 @@
\State $r\gets a\bmod b$
\EndWhile
\State \Return $b$\Comment{Le PGCD est b}
+\EndFunction
+\end{algorithmic}
+\end{algorithm}
+
+\begin{algorithm}
+\caption{Démonstration boucle pour}
+\begin{algorithmic}[1]
+\Procedure{AfficheurMultiple}{$str$}
+\Comment{Démo boucle pour}
+\State $r\gets a\bmod b$
+\For{$i < 15$}
+\State Afficher $str$ \Comment{On affiche la chaîne}
+\EndFor
+\EndProcedure
+\end{algorithmic}
+\end{algorithm}
+
+\begin{algorithm}
+\caption{Démonstration boucle pour - 2}
+\begin{algorithmic}[1]
+\Procedure{AfficheurMultiple}{$str$}
+\Comment{Démo boucle pour}
+\State $r\gets a\bmod b$
+\ForFT{$i$}{$0$}{$15$}
+\State Afficher $str$ \Comment{On affiche la chaîne}
+\EndFor
\EndProcedure
\end{algorithmic}
\end{algorithm}
diff --git a/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty b/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty
index 4ad5dd260d2..72b656c25ae 100644
--- a/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty
+++ b/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty
@@ -1,26 +1,74 @@
%% @author Oliver Irwin
-%% 2020-08-03
-\ProvidesPackage{frpseudocode}[2020/08/03 French Pseudocode 0.1.1]
+%% 2020-08-10
+\ProvidesPackage{frpseudocode}[2020-08-10 French Pseudocode 0.3.0]
+\RequirePackage{algpseudocode}
+
+%% Global mod
+\floatname{algorithm}{Algorithme}
%% Functions %%
\algrenewcommand\algorithmicprocedure{\textbf{procédure}}
\algrenewcommand\algorithmicfunction{\textbf{fonction}}
\algrenewcommand\algorithmicreturn{\textbf{renvoyer}}
+\algrenewtext{Procedure}[2]%
+{\algorithmicprocedure\ \textproc{#1}\ifthenelse{\equal{#2}{}}{}{(#2)}\ :}
+
+\algrenewtext{Function}[2]%
+{\algorithmicfunction\ \textproc{#1}\ifthenelse{\equal{#2}{}}{}{(#2)}\ :}
+
+%% Inputs
+\algrenewcommand\algorithmicrequire{\textbf{Requiert : }}
+\algrenewcommand\algorithmicensure{\textbf{Vérifier : }}
+
%% Control Instructions %%
\algrenewcommand\algorithmicwhile{\textbf{Tant que}}
+\algnewcommand\algorithmicwhilem{\textbf{tant que}}
\algrenewcommand\algorithmicdo{\textbf{Faire}}
+\algnewcommand\algorithmicdom{\textbf{faire}}
\algrenewcommand\algorithmicend{\textbf{Fin}}
\algrenewcommand\algorithmicfor{\textbf{Pour}}
\algrenewcommand\algorithmicforall{\textbf{Pour tout}}
-\algnewcommand\algorithmicfrom{\textbf{de}}
+\algnewcommand\algorithmicfrom{\textbf{de }}
\algnewcommand\algorithmicto{\textbf{à}}
+\algnewcommand\algorithmicform{\textbf{pour}}
+
+\algrenewcommand\algorithmicrepeat{\textbf{Répéter}}
+\algrenewcommand\algorithmicuntil{\textbf{Jusqu'à}}
+
+\algdef{SE}[FORFT]{ForFT}{EndFor}[3]{}%
+
+%% Change commands
+\algrenewtext{ForFT}[3]%
+{\algorithmicfor\ #1 \algorithmicfrom #2 \algorithmicto\ #3,\ \algorithmicdom\ :}
-\algrenewtext{For}[3]%
-{\algorithmicfor\ #1 \algorithmicfrom #2 \algorithmicto\ #3 \algorithmicdo}
+\algrenewtext{For}[1]%
+{\algorithmicfor\ #1,\ \algorithmicdom\ :}
+
+\algrenewtext{EndFor}[0]%
+{\algorithmicend\ \algorithmicform}
+
+\algrenewtext{While}[1]%
+{\algorithmicwhile\ #1,\ \algorithmicdom\ :}
+
+\algrenewtext{EndWhile}[0]%
+{\algorithmicend\ \algorithmicwhilem}
%% Conditionnals %%
\algrenewcommand\algorithmicif{\textbf{Si}}
+\algnewcommand\algorithmicifm{\textbf{si}}
\algrenewcommand\algorithmicelse{\textbf{Sinon}}
-\algrenewcommand\algorithmicthen{\textbf{Alors}}
+\algrenewcommand\algorithmicthen{\textbf{alors}}
+\newcommand{\algorithmicelsif}{\algorithmicelse\ \algorithmicif}
+
+\algrenewtext{ElsIf}[1]%
+{\algorithmicelse ,\ \algorithmicifm\ #1}
+
+\algrenewtext{EndIf}[0]%
+{\algorithmicend\ \algorithmicifm}
+
+%% Logical
+%\algrenewcommand{\algorithmicnot}{\textbf{non}}
+%\algrenewcommand{\algorithmicand}{\textbf{et}}
+%\algrenewcommand{\algorithmicor}{\textbf{ou}} \ No newline at end of file