texlive[56088] Master/texmf-dist: frpseudocode (10aug20)

[commits+karl at tug.org]

Revision: 56088
          http://tug.org/svn/texlive?view=revision&revision=56088
Author:   karl
Date:     2020-08-10 23:03:54 +0200 (Mon, 10 Aug 2020)
Log Message:
-----------
frpseudocode (10aug20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/frpseudocode/README.md
    trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf
    trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex
    trunk/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty

Modified: trunk/Master/texmf-dist/doc/latex/frpseudocode/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/frpseudocode/README.md	2020-08-10 21:03:39 UTC (rev 56087)
+++ trunk/Master/texmf-dist/doc/latex/frpseudocode/README.md	2020-08-10 21:03:54 UTC (rev 56088)
@@ -26,3 +26,8 @@
 ## License
 
 Made under The LaTeX Project Public License 1.3c
+
+## Changelog
+
+2020-08-03 : Initial release
+2020-08-09 : Changed algorithm title to french

Modified: trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex	2020-08-10 21:03:39 UTC (rev 56087)
+++ trunk/Master/texmf-dist/doc/latex/frpseudocode/frpseudocode-example.tex	2020-08-10 21:03:54 UTC (rev 56088)
@@ -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,8 +15,34 @@
 \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}
+
 \end{document}
\ No newline at end of file

Modified: trunk/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty	2020-08-10 21:03:39 UTC (rev 56087)
+++ trunk/Master/texmf-dist/tex/latex/frpseudocode/frpseudocode.sty	2020-08-10 21:03:54 UTC (rev 56088)
@@ -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}}
 
-\algrenewtext{For}[3]%
-{\algorithmicfor\ #1 \algorithmicfrom #2 \algorithmicto\ #3 \algorithmicdo}
+\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}[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