summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-08-11 03:01:02 +0000
committerNorbert Preining <norbert@preining.info>2020-08-11 03:01:02 +0000
commitc61c8a61c19de450cc1b0fe5010769090a42740b (patch)
treec5b3251600afccb5b21413c1b0b506efa5879788 /macros
parent37ce19e9251a5b38afadffc633acc6b03f03cc48 (diff)
CTAN sync 202008110301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/README.md2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-inner-simplelines.pdfbin100652 -> 100087 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-sidebarwithminiframes.pdfbin128595 -> 128025 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-splitwithminiframes.pdfbin113431 -> 112846 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-twolines.pdfbin112710 -> 112140 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerinnerthemesimplelines.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesidebarwithminiframes.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesplitwithminiframes.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemetwolines.sty25
-rw-r--r--macros/latex/contrib/frpseudocode/README.md5
-rw-r--r--macros/latex/contrib/frpseudocode/frpseudocode-example.pdfbin62553 -> 67360 bytes
-rw-r--r--macros/latex/contrib/frpseudocode/frpseudocode-example.tex28
-rw-r--r--macros/latex/contrib/frpseudocode/frpseudocode.sty60
13 files changed, 106 insertions, 20 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/README.md b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/README.md
index 43212cff89..3cfe1bb5b2 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/README.md
@@ -5,7 +5,7 @@
Author: Louis Stuart (louisstuart96@gmail.com)
-Version: 2019-05-07 v1.01
+Version: 2020-08-10 v1.02a
This package bundle is distributed under the LaTeX Project Public License, version 1.3c or later. See [LICENSE](https://github.com/louisstuart96/beamerauxtheme/blob/master/LICENSE) for detailed information.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-inner-simplelines.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-inner-simplelines.pdf
index abfdaaaaab..9d45d8dc47 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-inner-simplelines.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-inner-simplelines.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-sidebarwithminiframes.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-sidebarwithminiframes.pdf
index f60eda5f38..a7d9147651 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-sidebarwithminiframes.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-sidebarwithminiframes.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-splitwithminiframes.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-splitwithminiframes.pdf
index 82c5a8b40e..b8f98ccdce 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-splitwithminiframes.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-splitwithminiframes.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-twolines.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-twolines.pdf
index 2a140f5b87..6bf1d77895 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-twolines.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/doc/example-outer-twolines.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerinnerthemesimplelines.sty b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerinnerthemesimplelines.sty
index 0a8bc6551b..b88e86e89c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerinnerthemesimplelines.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerinnerthemesimplelines.sty
@@ -13,7 +13,7 @@
%
% The Current Maintainer of this work is Louis Stuart.
-\ProvidesPackage{beamerinnerthemesimplelines}[2019-05-07 v1.01 Beamer supplementary inner themes]
+\ProvidesPackage{beamerinnerthemesimplelines}[2020/08/10 v1.02a Beamer supplementary inner themes]
\mode<presentation>
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesidebarwithminiframes.sty b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesidebarwithminiframes.sty
index 37c46a0c24..3d4ebd8830 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesidebarwithminiframes.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesidebarwithminiframes.sty
@@ -13,7 +13,7 @@
%
% The Current Maintainer of this work is Louis Stuart.
-\ProvidesPackage{beamerouterthemesidebarwithminiframes}[2019-05-07 v1.01 Beamer supplementary outer themes]
+\ProvidesPackage{beamerouterthemesidebarwithminiframes}[2020/08/10 v1.02a Beamer supplementary outer themes]
\DeclareOption{hideallsubsections}{%
\PackageWarning{beamerouterthemesidebarwithminiframes}%
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesplitwithminiframes.sty b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesplitwithminiframes.sty
index 79e73bee1e..21b3bc21ce 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesplitwithminiframes.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemesplitwithminiframes.sty
@@ -13,7 +13,7 @@
%
% The Current Maintainer of this work is Louis Stuart.
-\ProvidesPackage{beamerouterthemesplitwithminiframes}[2019-05-07 v1.01 Beamer supplementary outer themes]
+\ProvidesPackage{beamerouterthemesplitwithminiframes}[2020/08/10 v1.02a Beamer supplementary outer themes]
\mode<presentation>
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemetwolines.sty b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemetwolines.sty
index 7269bfa77e..7dea557ac8 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemetwolines.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerauxtheme/themes/beamerouterthemetwolines.sty
@@ -13,7 +13,7 @@
%
% The Current Maintainer of this work is Louis Stuart.
-\ProvidesPackage{beamerouterthemetwolines}[2019-05-07 v1.01 Beamer supplementary outer themes]
+\ProvidesPackage{beamerouterthemetwolines}[2020/08/10 v1.02a Beamer supplementary outer themes]
\mode<presentation>
@@ -24,30 +24,37 @@
\setbeamercolor{section in head/foot shaded}{use=section in head/foot,fg=section in head/foot.fg!40!bg}
\setbeamercolor{subsection in head/foot shaded}{use=subsection in head/foot,fg=subsection in head/foot.fg!40!bg}
+\def\twolines@section@wd{}
+\def\twolines@subsection@wd{}
+
\defbeamertemplate*{section in head/foot}{two lines}{%
\leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsectionhead\hskip1ex}%
- \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{section in head/foot}
+ \edef\twolines@section@wd{\the\wd\@tempboxa}%
+ \begin{beamercolorbox}[wd=\twolines@section@wd,ht=2.5ex,dp=1.125ex]{section in head/foot}
\box\@tempboxa
\end{beamercolorbox}%
}
\defbeamertemplate*{section in head/foot shaded}{two lines}{%
\leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsectionhead\hskip1ex}%
- \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{section in head/foot shaded}
+ \edef\twolines@section@wd{\the\wd\@tempboxa}%
+ \begin{beamercolorbox}[wd=\twolines@section@wd,ht=2.5ex,dp=1.125ex]{section in head/foot shaded}
\box\@tempboxa
\end{beamercolorbox}%
}
\defbeamertemplate*{subsection in head/foot}{two lines}{%
\leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsubsectionhead\hskip1ex}%
- \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{subsection in head/foot}
+ \edef\twolines@subsection@wd{\the\wd\@tempboxa}%
+ \begin{beamercolorbox}[wd=\twolines@subsection@wd,ht=2.5ex,dp=1.125ex]{subsection in head/foot}
\box\@tempboxa
\end{beamercolorbox}%
}
\defbeamertemplate*{subsection in head/foot shaded}{two lines}{%
\leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsubsectionhead\hskip1ex}%
- \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{subsection in head/foot shaded}
+ \edef\twolines@subsection@wd{\the\wd\@tempboxa}%
+ \begin{beamercolorbox}[wd=\twolines@subsection@wd,ht=2.5ex,dp=1.125ex]{subsection in head/foot shaded}
\box\@tempboxa
\end{beamercolorbox}%
}
@@ -61,7 +68,7 @@
\hbox{%
\usebeamerfont{section in head/foot}%
\hyperlink{Navigation##3}{%
- \ifnum\c@section=##1%
+ \ifnum\c@section=##1\relax%
{\usebeamertemplate{section in head/foot}}%
\else%
{\usebeamertemplate{section in head/foot shaded}}%
@@ -70,14 +77,14 @@
}%
\fi%
}%
- \def\beamer@subsectionentry##1##2##3##4##5##6{}%
+ \def\beamer@subsectionentry##1##2##3##4##5{}%
\def\slideentry##1##2##3##4##5##6{}%
\dohead%
}
\long\def\insertsubsectionnavigationline{%
\def\sectionentry##1##2##3##4##5{}%
- \def\beamer@subsectionentry##1##2##3##4##5##6{%
+ \def\beamer@subsectionentry##1##2##3##4##5{%
\ifnum##1=\c@part%
\def\insertpartheadnumber{##1}%
\def\insertsectionheadnumber{##2}%
@@ -87,7 +94,7 @@
\usebeamerfont{subsection in head/foot}%
\hyperlink{Navigation##4}{%
\ifnum\c@section=##2%
- \ifnum\c@subsection=##3%
+ \ifnum\c@subsection=##3\relax%
{\usebeamertemplate{subsection in head/foot}}%
\else%
{\usebeamertemplate{subsection in head/foot shaded}}%
diff --git a/macros/latex/contrib/frpseudocode/README.md b/macros/latex/contrib/frpseudocode/README.md
index 1285a0df1a..0fcdb8ab0a 100644
--- a/macros/latex/contrib/frpseudocode/README.md
+++ b/macros/latex/contrib/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/macros/latex/contrib/frpseudocode/frpseudocode-example.pdf b/macros/latex/contrib/frpseudocode/frpseudocode-example.pdf
index be66949dae..5e5d7995fa 100644
--- a/macros/latex/contrib/frpseudocode/frpseudocode-example.pdf
+++ b/macros/latex/contrib/frpseudocode/frpseudocode-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/frpseudocode/frpseudocode-example.tex b/macros/latex/contrib/frpseudocode/frpseudocode-example.tex
index de0de6846e..09e8a8c9fb 100644
--- a/macros/latex/contrib/frpseudocode/frpseudocode-example.tex
+++ b/macros/latex/contrib/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/macros/latex/contrib/frpseudocode/frpseudocode.sty b/macros/latex/contrib/frpseudocode/frpseudocode.sty
index 4ad5dd260d..72b656c25a 100644
--- a/macros/latex/contrib/frpseudocode/frpseudocode.sty
+++ b/macros/latex/contrib/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