algorithm2e 4.01 (15dec09)

git-svn-id: svn://tug.org/texlive/trunk@16417 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 2771 insertions, 1657 deletions

diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.pdf b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.pdf
index 8514e67750d..b0a7c08dd82 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.pdf
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.pdf
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.tex
index 7e48dd68c9b..3bc2c09baed 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e.tex
@@ -1,29 +1,30 @@
 %  algorithm2e.tex --- doc of the package file for algorithms
 %  
-%  (c) 1996-2005 Christophe Fiorio, Tu-Berlin, Germany
+%  (c) 1995-1997 Christophe Fiorio, Tu-Berlin, Germany
+%  (c) 1998-2009 Christophe Fiorio, Montpellier 2 University, France
 %  
 %  Report bugs and comments to:
-%  fiorio@math.tu-berlin.de
+%  christophe.fiorio@univ-montp2.fr
 %
-%  $Id: algorithm2e.tex,v 1.36 2005/10/04 12:36:40 fiorio Exp fiorio $
+%  $Id: algorithm2e.tex,v 1.38 2009/12/15 08:54:36 cfiorio Exp $
 %
 \documentclass[a4paper]{article}
 
 \usepackage{a4wide}
-\usepackage{varioref}
-\usepackage{makeidx}
 \usepackage[
-   colorlinks%
-%   ,linktocpage%This puts the link on page number.
-   ,plainpages=false%This forces a unique identification of pages.
-   ,hypertexnames=true%This is necessary to have exact link on Index page.
-%   ,pdfpagelabels%
-   ,naturalnames
-   ,hyperindex
+  colorlinks%
+  ,linktocpage%This puts the link on page number.
+%  ,plainpages=false%This forces a unique identification of pages.
+%  ,hypertexnames=true%This is necessary to have exact link on Index page.
+%  ,pdfpagelabels%
+  ,hyperindex
 ]{hyperref}
-%\usepackage[naturalnames,hyperindex]{hyperref}
+
+\renewcommand{\subsectionautorefname}{section}
+\renewcommand{\subsubsectionautorefname}{section}
+\usepackage{makeidx}
 \usepackage{moreverb}
-\usepackage[boxed]{algorithm2e}
+\usepackage[boxed,commentsnumbered]{algorithm2e}
 
 
 \def\no{n$^\circ$}
@@ -61,13 +62,21 @@
 \newcommand{\optgerman}{\textsf{german}\index{german@\textsf{german}|textit}\xspace}
 \newcommand{\optportuguese}{\textsf{portuguese}\index{portuguese@\textsf{portuguese}|textit}\xspace}
 \newcommand{\optczech}{\textsf{czech}\index{czech@\textsf{czech}|textit}\xspace}
+\newcommand{\optitaliano}{\textsf{italiano}\index{italiano@\textsf{italiano}|textit}\xspace}
+\newcommand{\optslovak}{\textsf{slovak}\index{slovak@\textsf{slovak}|textit}\xspace}
 \newcommand{\optboxed}{\textsf{boxed}\index{boxed@\textsf{boxed}|textit}\xspace}
+\newcommand{\optboxruled}{\textsf{boxruled}\index{boxruled@\textsf{boxruled}|textit}\xspace}
 \newcommand{\optruled}{\textsf{ruled}\index{ruled@\textsf{ruled}|textit}\xspace}
+\newcommand{\opttworuled}{\textsf{tworuled}\index{tworuled@\textsf{tworuled}|textit}\xspace}
 \newcommand{\optalgoruled}{\textsf{algoruled}\index{algoruled@\textsf{algoruled}|textit}\xspace}
 \newcommand{\optplain}{\textsf{plain}\index{plain@\textsf{plain}|textit}\xspace}
 \newcommand{\optlined}{\textsf{lined}\index{lined@\textsf{lined}|textit}\xspace}
 \newcommand{\optvlined}{\textsf{vlined}\index{vlined@\textsf{vlined}|textit}\xspace}
 \newcommand{\optnoline}{\textsf{noline}\index{noline@\textsf{noline}|textit}\xspace}
+\newcommand{\optlinesnumbered}{\textsf{linesnumbered}\index{linesnumbered@\textsf{linesnumbered}|textit}\xspace}
+\newcommand{\optlinesnumberedhidden}{\textsf{linesnumberedhidden}\index{linesnumberedhidden@\textsf{linesnumberedhidden}|textit}\xspace}
+\newcommand{\optcommentsnumbered}{\textsf{commentsnumbered}\index{commentsnumbered@\textsf{commentsnumbered}|textit}\xspace}
+\newcommand{\optinoutnumbered}{\textsf{inoutnumbered}\index{inoutnumbered@\textsf{inoutnumbered}|textit}\xspace}
 \newcommand{\opttitlenumbered}{\textsf{titlenumbered}\index{titlenumbered@\textsf{titlenumbered}|textit}\xspace}
 \newcommand{\opttitlenotnumbered}{\textsf{titlenotnumbered}\index{titlenotnumbered@\textsf{titlenotnumbered}|textit}\xspace}
 \newcommand{\optresetcount}{\textsf{resetcount}\index{resetcount@\textsf{resetcount}|textit}\xspace}
@@ -82,15 +91,25 @@
 \newcommand{\optfillcomment}{\textsf{fillcomment}\index{fillcomment@\textsf{fillcomment}|textit}\xspace}
 \newcommand{\optnofillcomment}{\textsf{nofillcomment}\index{nofillcomment@\textsf{nofillcomment}|textit}\xspace}
 \newcommand{\optdotocloa}{\textsf{dotocloa}\index{dotocloa@\textsf{dotocloa}|textit}\xspace}
+\newcommand{\optendfloat}{\textsf{endfloat}\index{endfloat@\textsf{endfloat}|textit}\xspace}
+\newcommand{\optnorelsize}{\textsf{norelsize}\index{norelsize@\textsf{norelsize}|textit}\xspace}
+\newcommand{\optonelanguage}{\textsf{onelanguage}\index{onelanguage@\textsf{onelanguage}|textit}\xspace}
+\newcommand{\optrightnl}{\textsf{rightnl}\index{rightnl@\textsf{rightnl}|textit}\xspace}
+\newcommand{\optprocnumbered}{\textsf{procnumbered}\index{procnumbered@\textsf{procnumbered}|textit}\xspace}
+\newcommand{\optoldcommands}{\textsf{oldcommands}\index{oldcommands@\textsf{oldcommands}|textit}\xspace}
+\newcommand{\optnokwfunc}{\textsf{nokwfunc}\index{nokwfunc@\textsf{nokwfunc}|textit}\xspace}
 %
 \newcommand{\Optfrench}{\textsf{french}\index{french@\textsf{french}|textbf}\xspace}
 \newcommand{\Optenglish}{\textsf{english}\index{english@\textsf{english}|textbf}\xspace}
 \newcommand{\Optgerman}{\textsf{german}\index{german@\textsf{german}|textit}\xspace}
 \newcommand{\Optportugues}{\textsf{portugues}\index{portugues@\textsf{portugues}|textit}\xspace}
-\newcommand{\Optczech}{\textsf{czech}\index{czech@\textsf{french}|textbf}\xspace}
+\newcommand{\Optczech}{\textsf{czech}\index{czech@\textsf{czech}|textbf}\xspace}
+\newcommand{\Optitaliano}{\textsf{italiano}\index{italiano@\textsf{italiano}|textbf}\xspace}
+\newcommand{\Optslovak}{\textsf{slovak}\index{slovak@\textsf{slovak}|textbf}\xspace}
 \newcommand{\Optboxed}{\textsf{boxed}\index{boxed@\textsf{boxed}|textbf}\xspace}
 \newcommand{\Optboxruled}{\textsf{boxruled}\index{boxruled@\textsf{boxruled}|textbf}\xspace}
 \newcommand{\Optruled}{\textsf{ruled}\index{ruled@\textsf{ruled}|textbf}\xspace}
+\newcommand{\Opttworuled}{\textsf{tworuled}\index{tworuled@\textsf{tworuled}|textbf}\xspace}
 \newcommand{\Optalgoruled}{\textsf{algoruled}\index{algoruled@\textsf{algoruled}|textbf}\xspace}
 \newcommand{\Optplain}{\textsf{plain}\index{plain@\textsf{plain}|textbf}\xspace}
 \newcommand{\Optlined}{\textsf{lined}\index{lined@\textsf{lined}|textbf}\xspace}
@@ -114,6 +133,13 @@
 \newcommand{\Optfillcomment}{\textsf{fillcomment}\index{fillcomment@\textsf{fillcomment}|textbf}\xspace}
 \newcommand{\Optnofillcomment}{\textsf{nofillcomment}\index{nofillcomment@\textsf{nofillcomment}|textbf}\xspace}
 \newcommand{\Optdotocloa}{\textsf{dotocloa}\index{dotocloa@\textsf{dotocloa}|textbf}\xspace}
+\newcommand{\Optendfloat}{\textsf{endfloat}\index{endfloat@\textsf{endfloat}|textbf}\xspace}
+\newcommand{\Optnorelsize}{\textsf{norelsize}\index{norelsize@\textsf{norelsize}|textbf}\xspace}
+\newcommand{\Optonelanguage}{\textsf{onelanguage}\index{onelanguage@\textsf{onelanguage}|textbf}\xspace}
+\newcommand{\Optrightnl}{\textsf{rightnl}\index{rightnl@\textsf{rightnl}|textbf}\xspace}
+\newcommand{\Optprocnumbered}{\textsf{procnumbered}\index{procnumbered@\textsf{procnumbered}|textbf}\xspace}
+\newcommand{\Optoldcommands}{\textsf{oldcommands}\index{oldcommands@\textsf{oldcommands}|textbf}\xspace}
+\newcommand{\Optnokwfunc}{\textsf{nokwfunc}\index{nokwfunc@\textsf{nokwfunc}|textbf}\xspace}
 %%%
 \newcommand{\ExampleOfAlgo}[1]{%
   \begin{minipage}{.4\textwidth}%
@@ -126,21 +152,21 @@
   \end{minipage}%
 }
 %%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\algocfversion}{release 3.9}
-\title{algorithm2e.sty --- package for algorithms\\ {\large\algocfversion}}
-\author{ (c) 1996--2005 Christophe Fiorio, LIRM Montpellier, France\\ \\
-  Report bugs and comments to fiorio@lirmm.fr\\
+\newcommand{\algocfversion}{release 4.01} \title{algorithm2e.sty --- package for algorithms\\
+  {\large\algocfversion}}
+\author{(c) 1995-1997 Christophe Fiorio, Tu-Berlin, Germany\\
+  (c) 1998-2009 Christophe Fiorio, LIRMM, Montpellier 2 University, France\\
+  Report bugs and comments to christophe.fiorio@univ-montp2.fr\\
   algorithm2esty-annonce@lirmm.fr mailing list for announcements\\
-  algorithm2esty-discussion@lirmm.fr mailing list for discussion\thanks{The author is very grateful
-    to David Carlisle, one of the authors of the LaTeX Companion book, for his advices} \thanks{Martin Blais (blais@IRO.UMontreal.CA) for his
-    suggestions} \thanks{David A. Bader (dbader@eece.unm.edu) for his new option
-    \texttt{noend}} \thanks{Gilles Geeraerts (gigeerae@ulb.ac.be) for his new
-    command \texttt{SetKwIfElseIf}} \thanks{Ricardo Fukasawa (fukasawa@globo.com)
-  for the portuguese keywords} \thanks{Christian Icking 
-  (christian.icking@fernuni-hagen.de) for the german translation of keywords} 
-  \thanks{Arnaud Giersch (giersch@icps.u-strasbg.fr) for his suggestions and corrections on SetKwComments}
-\thanks{and the many users as Jean-Baptiste Rouquier
-  (jean-baptiste.rouquier@ens-lyon.fr) for their remarks} } \date{febuary 10 2005}
+  algorithm2esty-discussion@lirmm.fr mailing list for discussion\thanks{The author is very grateful to David
+    Carlisle, one of the authors of the LaTeX Companion book, for his advices} \thanks{Martin Blais for his
+    suggestions} \thanks{David A. Bader for his new option \texttt{noend}} \thanks{Gilles Geeraerts for his new
+    command \texttt{SetKwIfElseIf}} \thanks{Ricardo Fukasawa for the portuguese keywords} \thanks{Christian Icking
+    for the german translation of keywords} \thanks{Arnaud Giersch for his suggestions and corrections on
+    SetKwComments} \thanks{Nathan Tallent for his $\backslash$SetKwHangingKw macro} \thanks{and the many users as
+    Jean-Baptiste Rouquier for their remarks} }
+
+\date{december 14 2009}
 
 \makeindex
 
@@ -153,11 +179,10 @@
 
 \section{Introduction}
 
-Algorithm2e is an environment for writing algorithms in \LaTeX2e{}.  An
-algorithm is defined as a floating object like figures.  It provides
-macros that allow you to create different sorts of key words, thus a
-set of predefined key words is given. You can also change the typography
-of the keywords.
+Algorithm2e is an environment for writing algorithms in \LaTeX2e{}.  An algorithm is defined as a floating object
+like figures.  It provides macros that allow you to create different sorts of key words, thus a set of predefined
+key words is given. You can also change the typography of the keywords. See \autoref{longexample} for two long
+examples of algorithms written with this package.
 
 
 You can subscribe to \texttt{algorithm2e-announce} mailing list to receive
@@ -170,12 +195,15 @@ In order to subscribe to the mailing lists you have to send an email to
   Name} or\\\texttt{subscribe algorithm2e-discussion Firstname
   Name} in the body of the message.\makeatother
 
+Changes from one release to the next are indicated in release notes at the beginning of the packages. For release
+4.0, changes are indicated at the end of this document.
+
 \section{How to use it: abstract}
 
 You must set
 \texttt{$\backslash$usepackage[\emph{options}]\{algorithm2e\}} before 
 \texttt{$\backslash$begin\{document\}} command. The available options
-are described in section~\ref{sec_options}.
+are described in \autoref{sec_options}.
 
 
 The optional arguments [Hhtbp] works like those of figure environment.  The
@@ -186,11 +214,11 @@ place a blank and put the algorithm on the following page.
 
 
 Here is a quick example\footnote{For longer and more complexe examples
-  see Section~\protect\ref{longexample}}:
+  see \protect\autoref{longexample}}:
 
 \begin{verbatim}
 \begin{algorithm}[H]
-  \SetLine
+  \SetAlgoLined
   \KwData{this text}
   \KwResult{how to write algorithm with \LaTeX2e }
   
@@ -211,7 +239,7 @@ Here is a quick example\footnote{For longer and more complexe examples
 which gives
 
 \begin{algorithm}[H]
-  \SetLine
+  \SetAlgoLined
   \KwData{this text}
   \KwResult{how to write algorithm with \LaTeX2e }
   
@@ -233,98 +261,127 @@ only those with a macro beginning a block should not end with \almac{;}.
 Note then that you can always use the \almac{;} command in math mode
 to set a small space.
 
-The caption works as in a figure environment and is used by
-\almac{listofalgorithms} as a reference name for the list of
-algorithms. You can also use the title macro given with the package, but
-this macro doesn't insert an entry in the list of algorithms. 
-\bigskip
+The caption works as in a figure environment, except that it should be located at the end of the algorithm. It is
+used by \almac{listofalgorithms} as a reference name for the list of algorithms. You can also use the title macro
+given with the package, but this macro doesn't insert an entry in the list of algorithms.
+%%%%%%%%%%%%%
+\section{Two more detailed examples}\label{longexample}
 
-There are six text types in an algorithm environment:
-\begin{enumerate}
-\item The keywords (\textbf{Kw}): Macros which usually indicate words
-  of the language. Some are predefined and given with \emph{the
-    algorithm package}. 
 
-  The user can define his own language keywords by using the
-  different macros presented in section~\ref{sec_deflanguage} (see
-  below for a short, non exhaustive list). He can also define simple
-  keywords with the \almacpp{SetKw}{Kw}{thetext} macro.
-\item The Functions: (\textbf{Func}) Macros defined by the user which
-  denote local functions or other algorithms defined in the text. 
+The \autoref{algo_disjdecomp} and \autoref{IR} are written with this package.
 
-  They are defined using \almacpp{SetKwFunction}{KwFn}{Fn} where
-  $\backslash$KwFn will be the macro and \FuncSty{Fn} the text
-  printed.
-\item The Arguments (\textbf{Arg}): The arguments of the \emph{Kw} or
-  \emph{Func} macros.
-\item The procedure and function name environment style (\textbf{ProcNameSty}):
-  The type style of the caption of \emph{procedure} and \emph{function}
-  environment.
-\item The arguments of procedure and function environments style
-  (\textbf{ProcArgSty}): the type style of the argument of \emph{procedure} and
-  \emph{function} environments.
-\item Data (\textbf{Data}): A type of text different from the default.
-  You can use it as you want, and can be useful for example to emphasize a Data
-  structure or denotes some important variables.
+\subsection{Algorithm disjoint decomposition}
 
-  They are defined with the help of the
-  \almacpp{SetKwData}{KwDat}{data} macro, where $\backslash$KwDat will
-  be the macro and \DataSty{data} the text printed.
-\item The text (the default): All the remaining text of the algorithm.
-\end{enumerate}
+Here we suppose that we have done:
+\begin{verbatim}
+\usepackage[lined,boxed,commentsnumbered]{algorithm2e}
+\end{verbatim}\index{lined|textit,algonl|textit,boxed|textit}
+
+\noindent The \autoref{algo_disjdecomp} was written in \LaTeX2e code as presented next page. You can label lines,
+and for example \autoref{forins} denotes the second \texttt{For} (see \almac{label} command in the example). Notice
+also some ways of doing comments at lines~\ref{lt}, \ref{ut}, \ref{cmt} and \ref{lelse}. Star comment commands are
+for comment on lines of code, else comment is a line by itself as at \autoref{cmt}. The different option in star
+comments defines if it is left (\texttt{l} and \texttt{h}) or right justified (\texttt{r} and \texttt{f}). The
+first ones (\texttt{l} and \texttt{r}) add $;$ at the end of line code, the second ones (\texttt{f} and \texttt{h})
+doesn't. These last are useful when used in side comment (introduced by \texttt{()}) of alternatives of loops keyword
+commands.
+\RestyleAlgo{boxed}\LinesNumbered\input{algorithm2e_exAlgoDisjdecomp.tex}\par
+\vspace{-10ex}\noindent\fbox{%
+  \begin{minipage}[c]{\textwidth}%
+    \verbatiminput{algorithm2e_exAlgoDisjdecomp.tex}%
+  \end{minipage}\label{code:algodisjdecom}%
+}%
 
-Note that if you define macros outside the algorithm environment they
-are available in all the document and, in particular, you can use them
-inside all algorithms without redefining them. Be careful you can't
-use macros beginning a block outside an algorithm environment.
-\bigskip
+\clearpage
+\subsection{Algorithm: IntervalRestriction}
+\def\theAlgoLine{\arabic{AlgoLine}}
 
-Here are some language keywords predefined in the package\footnote{See
-  Section~\protect\ref{predefkeywords} for a complete list of all
-  predefined macros such as $\backslash$\texttt{uIf}, ...}:
+Here we suppose we that have done:
+\begin{verbatim}
+\usepackage[ruled,vlined]{algorithm2e}
+\end{verbatim}
+\index{ruled|textit,vlined|textit}
 
-\begin{itemize}
-\item $\backslash$KwData\{input\}\macind{KwData},
-  $\backslash$KwResult\{output\}\macind{KwResult},
-  $\backslash$KwIn\{input\}\macind{KwIn},
-  $\backslash$KwOut\{output\}\macind{KwOut}
-\item $\backslash$KwTo\macind{KwTo},
-  $\backslash$KwRet\{[value]\}\macind{KwRet}
-\item $\backslash$Begin\{block inside\}\macind{Begin}
-\item $\backslash$eIf\{condition\}\{then block\}\{else block\}\macind{eIf}, 
-  $\backslash$If\{condition\}\{then block\}\macind{If}
-\item $\backslash$Switch\{condition\}\{Switch block\}\macind{Switch},
-  $\backslash$Case\{a case\}\{case block\}\macind{Case},
-  $\backslash$Other\{otherwise block\}\macind{Other}
-\item $\backslash$For\{condition\}\{text loop\}\macind{For}
-\item $\backslash$While\{condition\}\{text loop\}\macind{While}
-\item $\backslash$Repeat\{end condition\}\{text loop\}\macind{Repeat}
-\end{itemize}
-%%%%%%%%%%%%%
-\section{Compatibility issues with other packages}
+The \LaTeX2e code on next page gives \autoref{IR}. Here lines are not autonumbered but you can number them
+individually with \almac{nl} command as for \autoref{InRes1} or \autoref{InRes2}. You even can set your own
+reference with \almac{nlset} command and get back this reference by simply using classical \almac{ref}. For
+example \texttt{$\backslash$ref\{InResR\}} gives \ref{InResR}.\par
+\RestyleAlgo{algoruled}\SetAlgoVlined\LinesNotNumbered\input{algorithm2e_exIR.tex}
+\noindent\fbox{%
+  \begin{minipage}[c]{\textwidth}%
+    \verbatiminput{algorithm2e_exIR.tex}%
+  \end{minipage}\label{code:algoIR}%
+}%
+\par
+\clearpage
 
-At this time, \algocfversion has no known compatibility problem with other
-packages. Nevertheless, when use with some packages, you need to specify some
-particular options, either from \texttt{algorithm2e} package or from the other
-packages.
 
+
+%%%%%%%%%%%%%
+\section{Compatibility issues}
+
+Compatibily with other packages improven by changing name of internal macros. Algorithm2e can now be used with
+almost all package, as \texttt{elsart}\index{elsart}, \texttt{hermes}\index{hermes},
+\texttt{arabtex}\index{arabtex} for example, if this last is loaded after algorithm2e package. So, at this time,
+\algocfversion has few known compatibility problem with other packages. The packages or classes that are known to
+be not compatible with \texttt{algorithm2e} package is:
+\begin{itemize}
+\item \texttt{ascelike}\index{ascelike}
+\item \texttt{pstcol}\index{pstcol}
+\end{itemize}
+Nevertheless, when use with some packages, some of their options cannot be used, or you need to specify some
+particular options (as \optalgoe to change name of environment if \texttt{algorithm} is already defined by the
+class), either from \texttt{algorithm2e} package or from the other packages.
 \begin{description}
-\item[hyperref] if you want to compile in \LaTeX, you have to use it with
-  \texttt{naturalnames} option. You don't need to specify it if you compile with
-  \texttt{pdflatex}.
+\item[hyperref\index{hyperref}] if you want to compile in Pdf\LaTeX, you must not use \texttt{naturalnames} option. 
+  \textbf{Beware} this has changed from release 3 where you should use it!
+\item[article-hermes\index{article-hermes}] is not compatible with relsize used by \texttt{algorithm2e} package, so
+  you have to use \optnorelsize option to get algorithm works with \texttt{article-hermes} class.
 \end{description}
+Note also that, if you use packages changing the way references are printed, you must define labels of algorithm
+\textbf{after} the caption to ensure a correct printing. You cannot use \almac{label} inside a caption without
+errors.
 
+\medskip
+From release $4.0$, some commands have been renamed to have consistent naming (CamlCase syntax) and old commands
+are no more available. If you doesn't want to change your mind or use old latex files, you have to use
+\Optoldcommands option to enable old commands back. Here are these commands:
+\begin{itemize}
+\item \almac{SetNoLine} becomes \almac{SetAlgoNoLine}
+\item \almac{SetVline}  becomes \almac{SetAlgoVlined}
+\item \almac{Setvlineskip}  becomes \almac{SetVlineSkip}
+\item \almac{SetLine}   becomes \almac{SetAlgoLined}
+\item \almac{dontprintsemicolon} becomes \almac{DontPrintSemicolon}
+\item \almac{printsemicolon} becomes \almac{PrintSemicolon}
+\item \almac{incmargin} becomes \almac{IncMargin}
+\item \almac{decmargin} becomes \almac{DecMargin}
+\item \almac{setnlskip} becomes \almac{SetNlSkip}
+\item \almac{Setnlskip} becomes \almac{SetNlSkip}
+\item \almac{setalcapskip} becomes \almac{SetAlCapSkip}
+\item \almac{setalcaphskip} becomes \almac{SetAlCapHSkip}
+\item \almac{nlSty} becomes \almac{NlSty}
+\item \almac{Setnlsty} becomes \almac{SetNlSty}
+\item \almac{linesnumbered} becomes \almac{LinesNumbered}
+\item \almac{linesnotnumbered} becomes \almac{LinesNotNumbered}
+\item \almac{linesnumberedhidden} becomes \almac{LinesNumberedHidden}
+\item \almac{showln} becomes \almac{ShowLn}
+\item \almac{showlnlabel} becomes \almac{ShowLnLabel}
+\item \almac{nocaptionofalgo} becomes \almac{NoCaptionOfAlgo}
+\item \almac{restorecaptionofalgo} becomes \almac{RestoreCaptionOfAlgo}
+\item \almac{restylealgo} becomes \almac{RestyleAlgo}
+\item \almac{gIf} macros and so on do no more exist
+\end{itemize}
 
 %%%%%%%%%%%%%
 \section{Environments defined in the package\label{sec_envi}}
 
 This package provides 4 environments :
 \begin{description}
-\item[algorithm :] the main environment, the one you will used most of the
+\item[algorithm:] the main environment, the one you will used most of the
   time. 
-\item[algorithm* :] same as the precedent, but used in a two columns text, puts
+\item[algorithm*:] same as the precedent, but used in a two columns text, puts
   the algorithm across the two columns.
-\item[procedure :] This environment works like algorithm environment but:
+\item[procedure:] This environment works like algorithm environment but:
   \begin{itemize}
   \item the \texttt{ruled} (or \texttt{algoruled}) style is recommended.
   \item the caption now writes \textbf{Procedure name...}
@@ -335,86 +392,122 @@ This package provides 4 environments :
   \item label now puts the name (the text before the braces in the caption) of
     the procedure or function as reference (not the number like a classic
     algorithm environment).
+  \item name of the procedure or function set in caption is automatically defined as a KwFunction and so can be
+    used as a macro. For example, if inside a procedure environment you set \almacp{caption}{myproc()}, you can use
+    $\backslash$\texttt{myproc} macro in you main text. Beware that the macro is only defined after the
+    \almac{caption}!
+  \item \optnokwfunc unable the feature described above in function and procedure environment. Useful if you use
+    name of procedure or function that cannot be a command name as a math display for example.
   \end{itemize}
-\item[procedure* :] same as the precedent, but used in a two columns text outs the
+\item[procedure*:] same as the precedent, but used in a two columns text outs the
   procedure across the two columns.
-\item[function :] as the precedent but with \textbf{Function} instead of
+\item[function:] as the precedent but with \textbf{Function} instead of
   procedure in the title.
-\item[function* :] same as the precedent, but used in a two columns text outs the
+\item[function*:] same as the precedent, but used in a two columns text outs the
   function across the two columns.
 \end{description}
 
+If you don't like algorithm or look for something else, you can change the name of algorithm by using command
+below:
+\begin{description}
+\item[\almacppp{SetAlgorithmName}{algorithmname}{algorithmautorefname}{list of algorithms name}] which redefines
+  name of the algorithms and the sentence list of algorithms. Example: \almacpp{SetAlgorithmName}{Protocol}{List of
+    protocols} if you prefer protocol than algorithm. Second argument is the name that \almac{autoref}, from
+  \texttt{hyperref}\index{hyperref} package, will use.
+\end{description}
+The same exists for procedure and function environment, the difference is that list of algorithms is not change and
+keep its original name:
+\begin{description}
+\item[\Almacpp{SetAlgoProcName}{aname}{anautorefname}] sets the name of Procedure printed by procedure environment
+  (the environment prints Procedure by default). Second argument is the name that \almac{autoref}, from
+  \texttt{hyperref}\index{hyperref} package, will use.
+\item[\Almacpp{SetAlgoFuncName}{aname}{anautorefname}] sets the name of Function printed by procedure environment
+  (the environment prints Function by default).  Second argument is the name that \almac{autoref}, from
+  \texttt{hyperref}\index{hyperref} package, will use.
+\end{description}
+
 %%%%%%%%%%%%%
 
 \section{The options of the package\label{sec_options}}
 
 \begin{description}
-\item[\optalgoe :] changes the name of environment algorithm into algorithm2e
+\item[\optalgoe:] changes the name of environment algorithm into algorithm2e
   and so allows to use the package with some journal style which already define
   an algorithm environment. Changes also the command name for the list of
   algorithms, it becomes \Almac{listofalgorithmes}
-\item[\optslide :] require package color. Hack for slide class in order to have
-  correct margins.
-\item[\Optenglish :] the default.
-\item[\Optfrench :] to have for example \textsl{algorithme\ :} instead of
-  \textsl{algorithm:}.
-\item[\Optgerman :] to have for example \textsl{Prozedur\ :} instead of
-  \textsl{procedure:}.
-\medskip
-\item[\Optportugues :] to have for example \textsl{Algoritmo:} instead of
-  \textsl{algorithm:}.
+\item[\optslide:] require package color. To be used with slide class in order to have correct margins.
+\item[\Optnorelsize:] starting from this release v4.00, algorithm2e package uses relsize package in order to get
+  relative size for lines numbers; but it seems that some rare classes (such as inform1.cls) are not compatible
+  with relsize; to have algorithm2e working, this option makes algorithm2e not to load relsize package and go back
+  to previous definition by using \scriptsize font for lines numbers.
 \medskip
-\item[\Optczech :] to have for example \textsl{Algoritmus:} instead of
+\item[\Optenglish:] the default.
+\item[\Optfrench:] to have for example \textsl{algorithme\ :} instead of \textsl{algorithm:}.
+\item[\Optgerman:] to have for example \textsl{Prozedur\ :} instead of \textsl{procedure:}.  \medskip
+\item[\Optportugues:] to have for example \textsl{Algoritmo:} instead of \textsl{algorithm:}.  \medskip
+\item[\Optczech:] to have for example \textsl{Algoritmus:} instead of
   \textsl{algorithm:}.
+\item[\Optonelanguage:] allows, if using standard keywords listed below, to switch from one language to another
+  without changing keywords by using appropriate language option:
+  \begin{itemize}
+  \item \texttt{KwIn, KwOut, KwData, KwResult}
+  \item \texttt{KwTo KwFrom}
+  \item \texttt{KwRet, Return}
+  \item \texttt{Begin}
+  \item \texttt{Repeat}
+  \item \texttt{If, ElseIf, Else}
+  \item \texttt{Switch, Case, Other}
+  \item \texttt{For, ForPar, ForEach, ForAll, While}
+  \end{itemize}
 \medskip
-
 \item[\Optfigure :] algorithms are put in classical figures and so are numbered as
   figures and putted in the $\backslash$\texttt{listoffigures}.\par
+\item[\Optendfloat:] endfloat packages doesn't allow float environment inside other environment. So using it with
+  figure option of algorithm2e makes error. This option enables a new environment algoendfloat to be used instead
+  of algorithm environment that put algorithm at the end. algoendfloat environment make algorithm acting as
+  endfloat figures. This option load endfloat package, so it is required to have it.
 \medskip
-
 \item[\optalgopart :] algorithms are numbered within part numbers.
 \item[\optalgochapter :] algorithms are numbered within chapter numbers.
 \item[\optalgosection :] (default) algorithms are numbered within section numbers.
+\item[\Optprocnumbered:]  makes the procedure and function to be numbered as algorithm.
 \medskip
-
 \item[\Optboxed :] to have algorithms enclosed in a box.
-\item[\Optboxruled :] to have algorithms enclosed in a box and caption above
-  and boxed to.
-\item[\Optruled :] to have algorithms with a line at the top and the
-  bottom. Note that the
-  caption is not centered under the algorithm anymore but is set at
-  the beginning of the algorithm.
+\item[\Optboxruled :] surround algorithm by a box, puts caption above and add a line after caption.
+\item[\Optruled :] to have algorithms with a line at the top and the bottom. Note that the caption is not centered
+  under the algorithm anymore but is set at the beginning of the algorithm.
 \item[\Optalgoruled :] as above but with extra spaces after the rules.
+\item[\Opttworuled:] tworuled acts like ruled but doesn't put a line after the title.
 \item[\Optplain :] the default, with no feature.
 \medskip
-
-\item[\Optlined:] \almac{SetLine} becomes the default, see
-  section~\ref{sec_styleoptions} for explanations about the
-  \almac{SetLine} macros.
-\item[\Optvlined:] \almac{SetVline} becomes the default, see
-  section~\ref{sec_styleoptions} for explanations about the
-  \almac{SetVline} macros.
+\item[\Optlined:] \almac{SetAlgoLined} becomes the default, see
+  \autoref{sec_styleoptions} for explanations about the
+  \almac{SetAlgoLined} macros.
+\item[\Optvlined:] \almac{SetAlgoVlined} becomes the default, see
+  \autoref{sec_styleoptions} for explanations about the
+  \almac{SetAlgoVlined} macros.
 \item[\Optnoline:]  \almac{SetNoline} becomes the default, see
-  section~\ref{sec_styleoptions} for explanations about the
+  \autoref{sec_styleoptions} for explanations about the
   \almac{SetNoline} macros.
 \medskip
 \item[\Optlinesnumbered:] lines of the algorithms are numbered except for
   comments and input/output (KwInput and KwInOut). You must use \almacp{nllabel}{label}
   to label thoses lines.
-\item[\Optlinesnumberedhidden:] lines of the algorithms are numbered as \Optlinesnumbered but
-  numbers are not shown. \almac{showln} and \almacp{showlnlabel}{label} show the number on line they are
+\item[\Optlinesnumberedhidden:] lines of the algorithms are numbered as \optlinesnumbered but
+  numbers are not shown. \almac{ShowLn} and \almacp{ShowLnLabel}{label} show the number on line they are
   put.
 \item[\Optcommentsnumbered:] makes comments be numbered if numbering is active.
 \item[\Optinoutnumbered:] makes data input/output be numbered if numbering is active.
+\item[\Optrightnl:] put lines numbers to the right of the algorithm instead of left.
 \medskip
-\item[\Opttitlenumbered :] \almacp{Titleofalgo}{title}
+\item[\Opttitlenumbered :] \almacp{TitleOfAlgo}{title}
   prints \textsl{Algorithm n: thetitle} where \emph{n} is the counter
   of the algo.\\
-  \textbf{Beware}: \almac{Titleofalgo} don't insert an entry in the
-  list of algorithms.  So do not use \almac{Titleofalgo} with a caption.
+  \textbf{Beware}: \almac{TitleOfAlgo} don't insert an entry in the
+  list of algorithms.  So do not use \almac{TitleOfAlgo} with a caption.
   Both increment the counter of the algorithms.
 \item[\Opttitlenotnumbered (default)] the macro
-  \texttt{$\backslash$Titleofalgo\{title\}} doesn't number the algorithm.
+  \texttt{$\backslash$TitleOfAlgo\{title\}} doesn't number the algorithm.
 \medskip
 
 \item[\Optresetcount] the line numbers are reset to 0 at the beginning of
@@ -435,78 +528,401 @@ This package provides 4 environments :
   \texttt{tocbibind} if not already done and so list of figures and list of tables are also added in
   the toc. If you want to control which ones of the lists will be added in the toc, please load
   package \texttt{tocbibind} before package algorithm and give it the options you want.
-\item[\Optscright (default)] right justified side comments (side comments are flushed to the righr) 
+\item[\Optscright (default)] right justified side comments (side comments are flushed to the right) 
 \item[\Optscleft] left justified side comments (side comments are put right after the code line) 
 \item[\Optfillcomment (default)] end mark of comment is flushed to the right so comments fill all
   the width of text
 \item[\Optnofillcomment] end mark of comment is put right after the comment
+\item[\Optnokwfunc] unable the setting in \almac{KwFunction} of procedure's or function's name (see \autoref{sec_envi})
+  of function and procedure environment. Useful if you use name of procedure or function that cannot be a command
+  name as a math display for example.
 \end{description}
 
 
 %%%%%%%%%%%%%
 
-\section{The macros provided with the package}
+\section{Typesetting}
+
+There are six text types in an algorithm environment:
+\begin{enumerate}
+\item The keywords (\textbf{Kw}): Macros which usually indicate words
+  of the language. Some are predefined and given with \emph{the
+    algorithm package}. 
+
+  The user can define his own language keywords by using the
+  different macros presented in \autoref{sec_deflanguage} (see
+  below for a short, non exhaustive list). He can also define simple
+  keywords with the \almacpp{SetKw}{Kw}{thetext} macro.
+\item The Functions: (\textbf{Func}) Macros defined by the user which
+  denote local functions or other algorithms defined in the text. 
+
+  They are defined using \almacpp{SetKwFunction}{KwFn}{Fn} where
+  $\backslash$KwFn will be the macro and \FuncSty{Fn} the text
+  printed.
+\item The Arguments (\textbf{Arg}): The arguments of the \emph{Kw} or
+  \emph{Func} macros.
+\item The procedure and function name environment style (\almac{ProcNameSty}):
+  The type style of the caption of \emph{procedure} and \emph{function}
+  environment.
+\item The arguments of procedure and function environments style
+  (\almac{ProcArgSty}): the type style of the argument of \emph{procedure} and
+  \emph{function} environments.
+\item Data (\textbf{Data}): A type of text different from the default.
+  You can use it as you want, and can be useful for example to emphasize a Data
+  structure or denotes some important variables.
+
+  They are defined with the help of the
+  \almacpp{SetKwData}{KwDat}{data} macro, where $\backslash$KwDat will
+  be the macro and \DataSty{data} the text printed.
+\item The text (the default): All the remaining text of the algorithm.
+\end{enumerate}
+
+
+%%%%%%%%%%%%%
+
+\section{Commands provided with the package}
+
+Note that if you define macros outside the algorithm environment they are available in all the document and, in
+particular, you can use them inside all algorithms without redefining them. Be careful you can't use macros
+beginning a block outside an algorithm environment.
 
 %----------
-\subsection{Typesetting macros}
+\subsection{basic typesetting commands}\label{sec:basiccommands}
 
 \begin{description}
 \item[\Almac{;}] marks the end of a line. \textbf{Don't forget it !}. By
-  default, it prints a `;'. You can change this with \almac{dontprintsemicolon}.
-\item[\Almacp{Titleofalgo}{thetitle}] prints: ``Algorithm \no:
-  thetitle'' in the typography and size defined by \almac{SetTitleSty}.
-  Puts a vertical space below.\\ 
-  Beware: \almac{Titleofalgo} doesn't insert an entry in the list of
-  algorithms.  So don't use \almac{Titleofalgo} with \almac{caption}. Both
-  increment the counter of the algorithms.\\ 
-  {\small note:\emph{with the \optfrench option prints
-      \emph{Algorithme \no :}}}
-\item[\Almac{listofalgorithms}] inserts the list of all algorithms
-  having a \emph{caption}.
+  default, it prints a `;'. You can change this with \almac{DontPrintSemicolon}.
+\item[\Almac{DontPrintSemicolon}] the `;' are no more printed at the
+  end of each line.
+\item[\Almac{PrintSemicolon}] prints a `; ' at the end of each
+  line (by default)
 \item[\Almac{BlankLine}] prints a blank line. In fact puts a
   vertical space of one \texttt{ex}.
 \item[\Almac{Indp}] indents plus $\rightarrow$ the text is shifted to the right.
 \item[\Almac{Indm}] indents minus $\rightarrow$ the text is shifted to the left.
+\end{description}
+
+%----------
+\subsection{algorithm environment, caption, list of algorithms, ...}\label{sec:titlemacros}
+
+\subsubsection{caption, title and changind reference of algorithms}
+\label{sec:captionmacros}
+
+Algorithm environment are float environment. So you can use classical \almac{caption}, \almacp{listofalgorithms},
+\Almac{label}. If you want a title but not a caption (for example to not add an enter in the list of algorithm)
+you have \almacp{TitleOfAlgo}. And if you want to name your algorithm and not number it, you can change the
+reference of it by using \almacp{SetAlgoRefName}{ref}:
+
+\begin{description}
+\item[\Almacp{caption}{thetitle}] works as classical caption of figures. It inserts an entry in the list of
+  algorithms. Should be the standard way to put title of algorithms. 
+\item[\Almacp{TitleOfAlgo}{thetitle}] prints: ``Algorithm \no: thetitle'' in the typography and size defined by
+  \almac{SetTitleSty}. Puts a vertical space below.\\
+  Beware: \almac{TitleOfAlgo} doesn't insert an entry in the list of algorithms.  So don't use \almac{TitleOfAlgo}
+  with \almac{caption}. Both increment the counter of the algorithms.\\
+  {\small note:\emph{with the \optfrench option prints \emph{Algorithme \no :}}}
+\item[\Almac{listofalgorithms}] inserts the list of all algorithms
+  having a \emph{caption}.
+\item[\Almacp{SetAlgoRefName}{ref}] which changes the default ref (number of the algorithm) by the name given in
+  parameter. For example \almacp{SetAlgoRefName}{QXY} sets reference of the algorithm to \texttt{QXY}. If you label
+  your algorithm and reference it, you will get \texttt{QXY}. On the same manner, entry in the list of algorithm
+  will name it \texttt{QXY}.
+\item[\Almacp{SetAlgoRefRelativeSize}{relative integer}] which sets the output size of reference in list of
+  algorithms for references set by \almac{SetAlgoRefName}. The default is \almacp{SetAlgoRefRelativeSize}{-2}.
+\end{description}
+
+\subsubsection{setting style and layout of algorithm, caption and title}
+\label{sec:captionstyle}
+
+The following commands help you to define the style and the layout of the caption:
+\begin{description}
+\item[\almacp{SetAlgoCaptionSeparator}{sep}] which sets the separator between title of algorithms (\textbf{Algorithm
+    1}) and the name of the algorithm. By default it's ':' and caption looks like "\textbf{Algorithm 2: name}" but now you
+  can change it by using for example \SetAlgoCaptionSeparator{.} which will give "\textbf{Algorithm 3. name}".
+\item[\Almac{AlCapSkip}] is the dimension of the distance between algorithm body and caption in
+  \emph{plain} and \emph{boxed} mode. You can change by hands or by using \almacp{SetAlCapSkip}{0ex}.
+\item[\Almacp{SetAlCapSkip}{length}] sets the lenght of \almac{AlCapSkip}) dimension between
+  algorithm body and caption.
+\item[\Almacp{SetAlCapHSkip}{length}] sets the horizontal skip before Algorithm: in caption when used in ruled algorithm.
+\item[\Almacpp{SetTitleSty}{type style}{type size}] sets the
+  typography and size of the titles defined with the macro
+  \almacp{TitleOfAlgo}{} (not with $\backslash$caption).
+\item[\Almac{NoCaptionOfAlgo}] doesn't print Algorithm and its number
+  in the caption. This macros is \textbf{ONLY} active for
+  \emph{``\optalgoruled''} or \emph{``\optruled''} algorithms and for
+  the next algorithm. For example, it is useful when the algorithm
+  just describes a function and you only want to display the name of
+  the function in the caption.
+\item[\Almac{RestoreCaptionOfAlgo}] restores correct captions that was
+  corrupted by a \almac{NoCaptionOfAlgo} macro.
+\item[\Almacp{SetAlgoCaptionLayout}{style}] sets global style of the caption; style must be the name of a macro taking one
+  argument (the text of the caption). Examples below show how to use it:
+  \begin{itemize}
+  \item \almacp{SetAlgoCaptionLayout}{centerline} to have centered caption;
+  \item \almacp{SetAlgoCaptionLayout}{textbf} to have bold caption.
+  \end{itemize}
+  If you want to apply two styles in the same time, such as centered bold, you have to define you own macro and
+  then use \almac{SetAlgoCaptionLayout} with its name. \almac{AlCapFnt} and \almac{AlCapNameFnt} can change the
+  font used in caption, beware of interactions between this three commands.
+\end{description}
+
+Note that two length control the layout of ruled, algoruled, boxruled algorithms
+caption. \Almac{interspacetitleruled} and \Almac{interspaceboxruled} are described \autoref{sec_styleoptions}.
+
+%----------
+\subsection{line numbering}\label{sec:linenumbering}
+
+\subsubsection{labelling and numbering lines}
+\label{sec:refline}
+
+\texttt{AlgoLine} is the counter used to number the lines. It's a standard counter, so \LaTeX commands works with
+it. 
+
+\optlinesnumbered, \optlinesnumberedhidden and \optcommentsnumbered (see above \autoref{sec_options}) are the
+options controlling auto-numbering of lines. You can also control this feature manually and precisely with the
+following commands:
+\begin{description}
+\item[\Almac{LinesNumbered}] makes lines of the following algorithms be auto-numbered. This command corresponds to
+  \optlinesnumbered option.
+\item[\Almac{LinesNumberedHidden}] makes lines of the following algorithms be auto-numbered, but numbers stay
+  hidden. You have to use \almac{ShowLn} and \almac{ShowLnLabel} to see them. This command corresponds to
+  \optlinesnumberedhidden option.
+\item[\Almac{LinesNotNumbered}] makes lines of the following algorithms no be auto-numbered.
 \item[\Almacp{nllabel}{label}] macro for labelling lines when auto-numbering is active.
-\item[\Almac{nl}]   numbers the line: must \textsc{begin} the line.
-\item[\Almacp{lnl}{label}] numbers and labels the line : must
-  \textsc{begin} the line. So you can refer to the number of the line by
-  the following command: \almacp{ref}{label}
-\item[\Almacp{nlset}{} and \almacpp{lnlset}{}{}] work as \almac{nl}
-  and \almacp{lnl}{} except that the additional argument is the
-  number (text) to put at the begin of the line.
-\item[\Almac{showln}] shows number of the line when \Optlinesnumberedhidden is activated.
-\item[\Almacp{showln}{label}] same as precedent but with a label.
-\item[\Almacp{KwSty}{$<$text$>$}] set $<$text$>$ in keyword type style.
-\item[\Almacp{FuncSty}{$<$text$>$}] set $<$text$>$ in function type style.
-\item[\Almacp{ArgSty}{$<$text$>$}] set $<$text$>$ in argument type
-  style.
-\item[\Almacp{DataSty}{$<$text$>$}] sets $<$text$>$ in data typography.
-\item[\Almacp{CommentSty}{$<$text$>$}] sets $<$text$>$ in comment typography.
+\item[\Almac{nl}] numbers the line: must \textsc{begin} the line. You can use \almac{label} to label the line and
+  reference it further.
+\item[\Almacp{lnl}{label}] numbers and labels the line : must \textsc{begin} the line. Do a
+  \textbf{Beware} this has changed from release 3\almac{nl}\almacp{label}{label} in one time. Prefer to use a
+  classical \almac{label} as it is more readable.
+\item[\Almacp{nlset}{text}] works as \almac{nl} except that the additional argument is the text to put at the
+  beginning of the line. This text becomes the reference if you label it and \almac{ref} will print it instead of
+  classical number.
+\item[\almacpp{lnlset}{text}{label}] works for \almac{nlset} as \almac{lnl} for \almac{nl}. Prefer to use a
+  classical \almac{label} as it is more readable.
+\item[\Almac{ShowLn}] shows number of the line when \optlinesnumberedhidden is activated.
+\item[\Almacp{ShowLn}{label}] same as precedent but with a label. Prefer to use \almac{ShowLn} with a classical
+  \almac{label}.
+\end{description}
+
+\subsubsection{setting style of lines}
+\label{sec:linestyle}
+
+The following command allows you to change the way line numbers are printed:
+\begin{description}
+\item[\Almacppp{SetNlSty}{$<$font$>$}{$<$txt before$>$}{$<$txt after$>$}] defines how to print line numbers:\\
+  will print \{$<$font$>$ $<$txt bef$>$ thelinenumber $<$txt aft$>$\}. \\
+  By default \almacppp{SetNlSty}{textbf}{}{}.
+\item[\Almacp{SetNlSkip}{length}] sets the value of the space between the line numbers and the text, by default
+  1em.
+\item[\Almacp{SetAlgoNLRelativeSize}{number}] sets the relative size of line numbers. By default, line numbers are
+    two size smaller than algorithm text. Use this macro to change this behavior. For example,
+    \almacp{SetAlgoNlRelativeSize}{$0$} sets it to the same size, \almacp{SetAlgoNlRelativeSize}{$-1$} to one size
+    smaller and \almacp{SetAlgoNlRelativeSize}{$1$} to one size bigger.
+\end{description}
+
+%----------
+
+\subsection{standard styles}\label{sec:styles}
+
+\subsubsection{standard font shapes and styles}
+\label{sec:fntsty}
+
+Almost every text in algorithm has his own style that can be customized. The following commands correspond to the
+different styles used by the package. They can be customized by using corresponding ``\texttt{$\backslash$Set}
+commands'' (see \autoref{sec:setfntsty})
+\begin{description}
 \item[\Almac{AlFnt}] is used at the beginning of the body of algorithm in order to define the fonts
   used for typesetting algorithms. You can use it elsewhere you want to typeset text as algorithm\\
-  For example you can do \verb+\SetAlFnt{\small\sf}+ to have algorithms typeset in small sf font.
+  For example you can do \SetAlFnt{$\backslash$small$\backslash$sf} to have algorithms typeset in small sf font.
   Default is nothing so algorithm is typeset as the text of the document.
-\item[\Almac{AlCapFnt}] is used at the beginning of the caption in order to define the fonts used
-  for typesetting algorithms. You can use it elsewhere you want to typeset text as algorithm\\
-  For example you can do \verb+\SetAlCapFnt{\large\em}+ to have cpation typeset in large em font.
-  Default is nothing so caption is typeset as the text of the document.
-\item[\Almacp{AlTitleFnt}{$<$text$>$}] is used to typeset \{Algorithm: \} in the
-  caption. You can use it to have text typeset as \{Algorithm:\} of captions.
-  Default is textbf.\par Default can be redefined by
-  \verb+\SetAlTitleFnt{font}+.
+\medskip
+
+\item[\Almacp{KwSty}{$<$text$>$}] sets $<$text$>$ in keyword type style.
+\item[\Almacp{FuncSty}{$<$text$>$}] sets $<$text$>$ in function type style.
+\item[\Almacp{ArgSty}{$<$text$>$}] sets $<$text$>$ in argument type
+  style.
+\item[\Almacp{DataSty}{$<$text$>$}] sets $<$text$>$ in data typography.
+\item[\Almacp{CommentSty}{$<$text$>$}] sets $<$text$>$ in comment typography.
+\item[\Almacp{NlSty}{$<$text$>$}] sets $<$text$>$ in number line typography.
+\medskip
+
+\item[\Almacp{ProcNameSty}{$<$text$>$}] sets $<$text$>$ in caption typography of procedure and function environment (by
+  default the same as \almacp{AlCapSty}).
+\item[\Almacp{ProcArgSty}{$<$text$>$}] sets $<$text$>$ in argument typography of procedure and function environment
+  (by default the same as \almacp{AlCapNameSty}).
+\end{description}
+
+\subsubsection{caption and title font style}
+\label{sec:captionsty}
+
+\almac{AlCapSty}, \almac{AlCapNameSty}, \almac{AlCapFnt}, \almac{AlCapNameFnt} and corresponding
+``\texttt{$\backslash$Set} commands'' (see \autoref{sec:setcaptionfntsty}) \almac{SetAlCapSty},
+\almac{SetAlCapNameSty}, \almac{SetAlCapFnt}, \almac{SetAlCapNameFnt} control the way caption is
+printed. \almac{AlCapSty} and \almac{AlCapFnt} are used to define style and font shape of ``\texttt{Algorithm
+  \#:}'' in caption. \almac{AlCapNameSty} and \almac{AlCapNameFnt} are used to define style and font shape of the
+caption text. In fact a caption \almacp{my algorithm} is printed as follow :\\
+\almacp{AlCapSty}{\almacp{AlCapFnt}{Algorithm \#:}}\almacp{AlCapNameSty}{\almacp{AlCapNameFnt}{my algorithm}}.\\
+By default, \almac{AlCapSty} is \texttt{textbf} and \almac{AlCapFnt} is nothing. \almac{AlCapNameSty} keeps text as
+it is, and \almac{AlCapNameFnt} do nothing.
+\begin{description}
+\item[\Almacp{AlCapSty}{$<$text$>$}] sets $<$text$>$ in caption title typography, that is the same used, together
+  with \almac{AlCapFnt}, to print \texttt{Algorithm \#:}, more precisely it is printed as follow:\\
+  \almacp{AlCapSty}{\almacp{AlCapFnt}{Algorithm \#:}}\\
+  which gives actually ``\AlCapSty{\AlCapFnt Algorithm \#:}''. By default \almac{AlCapSty} is \texttt{textbf}.
+\item[\Almacp{AlCapNameSty}{$<$text$>$}] sets $<$text$>$ in caption name typography, that is the same used,
+  together with \almac{AlCapNameFnt} to print the name of caption you set by calling \almacp{caption}{name}. More
+  precisely it is printed as follow:\\
+  \almacp{AlCapNameSty}{\almacp{AlCapNameFnt}{name}}\\
+  which gives ``\AlCapNameSty{\AlCapNameFnt name}''. By default \almac{AlCapNameSty} is \texttt{textnormal} which
+  means print in standard text.
+\item[\Almacp{AlCapFnt}{$<$text$>$}] sets $<$text$>$ in font shape of caption title, that is the same used,
+  together with \almac{AlCapSty}, to print \texttt{Algorithm \#:}, more precisely it is printed as follow:\\
+  \almacp{AlCapSty}{\almacp{AlCapFnt}{Algorithm \#:}}\\
+  which gives actually ``\AlCapSty{\AlCapFnt Algorithm \#:}''. By default \almac{AlCapFnt} is \almac{relax} which
+  means keep text as it is.
+\item[\Almacp{AlCapNameFnt}{$<$text$>$}] sets $<$text$>$ in caption name typography, that is the same used,
+  together with \almac{AlCapNameSty} to print the name of caption you set by calling \almacp{caption}{name}. More
+  precisely it is printed as follow:\\
+  \almacp{AlCapNameSty}{\almacp{AlCapNameFnt}{name}}\\
+  which gives ``\AlCapNameSty{\AlCapNameFnt name}''. By default \almac{AlCapNameFnt} is \almac{relax} which means
+  keep text as it is.
+\medskip
+
+\item[\Almacp{AlTitleSty}{$<$text$>$}] is used to typeset ``\texttt{Algorithm \#:}'' in title, together with
+  \almac{AlTitleFnt}. You can use it to have text as your titles. Precisely, titles are typeset as follow:\\
+  \almacp{AlTitleSty}{\almacp{AlTitleFnt}{Algorithm \#:}}.
+\item[\Almacp{AlTitleFnt}{$<$text$>$}] is used to typeset ``\texttt{Algorithm \#:}'' in title, together with
+  \almac{AlTitleSty}. You can use it to have text as your titles. Precisely, titles are typeset as follow:\\
+  \almacp{AlTitleSty}{\almacp{AlTitleFnt}{Algorithm \#:}}.
+\end{description}
+
+\subsubsection{setting font standard font shapes and styles}
+\label{sec:setfntsty}
+
+With the following commands you can customize the style and have the look you want for your algorithms:
+\begin{description}
+\item[\Almacp{SetAlFnt}{$<$font$>$}] define the fonts used for typesetting algorithms. 
+\end{description}
+You have to give commands to set the font in argument. You can use it elsewhere you want to typeset text as
+algorithm. For example you can do \almacp{SetAlFnt}{$\backslash$\texttt{small}$\backslash$\texttt{sf}} to have
+algorithms typeset in small sf font.
+
+The next ones require to give in parameter name of a macro (whithout $\backslash$) which takes one argument. For
+example, \almacp{SetAlCapFnt}{textbf} (see \autoref{sec:captionstyle}) defines the default behaviour of
+\almac{AlCapFnt}. If you want to do more complicated thing, you should define your own macro and give it to
+\almac{SetAlCapFnt} or \almac{SetAlCapNameFnt}. Here are two examples:
+\begin{itemize}
+\item $\backslash$\texttt{newcommand\{}$\backslash$\texttt{mycapfn\}[1]\{}$\backslash$\texttt{tiny \#1\}}\almacp{SetAlCapNameFnt}{mycapfnt}
+\item $\backslash$\texttt{newcommand\{}$\backslash$\texttt{mycapfn\}[1]\{}$\backslash$\texttt{textsl\{}$\backslash$\texttt{small \#1\}\}}\almacp{SetAlCapNameFnt}{mycapfnt}
+\end{itemize}
+Here is the complete list of these macros:
+\begin{description}
+\item[\Almacp{SetKwSty}{$<$font$>$}] sets the Kw typography to $<$font$>$ (by
+  default: \textbf{textbf}).
+\item[\Almacp{SetFuncSty}{$<$font$>$}]  sets the function typography 
+(by default:  \textbf{texttt}).
+\item[\Almacp{SetArgSty}{$<$font$>$}]  sets the argument typography (by
+  default: \textbf{emph}).
+\item[\Almacp{SetDataSty}{$<$font$>$}]  sets the data typography (by
+  default: \textbf{textsf}).
+\item[\Almacp{SetCommentSty}{$<$font$>$}]  sets the comment text typography (by
+  default: \textbf{texttt}).
+\item[\Almacp{SetNlSty}{$<$font$>$}] sets the number line typography (by default:
+  \textbf{$\backslash$relsize\{-2\}})
+\medskip
+
+\item[\Almacp{SetProcNameSty}{$<$font$>$}] sets caption typography of procedure and function environment (by
+  default the same as \almacp{AlCapSty}).
+\item[\Almacp{SetProcArgSty}{$<$font$>$}] sets argument typography of procedure and function environment (by
+  default the same as \almacp{AlCapNameSty}).
+\end{description}
+
+\subsubsection{setting caption and title font style}
+\label{sec:setcaptionfntsty}
+
+The following commands allow to redefine \texttt{Fnt} macros. This ones requires to give directly commands that
+define the font shape you want. They works as \almacp{SetAlFnt} described above. For example you can do 
+\almacp{SetAlCapFnt}{$\backslash$\texttt{large}$\backslash$\texttt{color\{red\}}} to have \texttt{Algorithm \#:} in
+caption printed in large red font.
+\begin{description}
+\item[\Almacp{SetAlCapFnt}{$<$font$>$}] sets the font used for  \{algorithm: \}
+  in caption of algorithm (default is set to \almac{relax}).
+\item[\Almacp{SetAlCapNameFnt}{$<$font$>$}] sets the font used by caption text. Default is \almac{relax} and text is
+  kept as it is.
+\item[\Almacp{SetAlTitleFnt}{$<$font$>$}] sets the font used in \almac{TitleOfAlgo} command (default is
+  set to \texttt{$\backslash$relax}, so text is kept as it is).
 \end{description}
 
+The next commands allow to redefine \texttt{Sty} macros for caption or title. As ``\texttt{$\backslash$Set}
+commands'' of basic font style (see \autoref{sec:setfntsty}), they require a name of a command in argument,
+this command have to take one argument, the text to be typeset. Examples of use:
+\begin{itemize}
+\item $\backslash$\texttt{newcommand\{}$\backslash$\texttt{mycapfn\}[1]\{}$\backslash$\texttt{tiny \#1\}}\almacp{SetAlCapNameFnt}{mycapfnt}
+\item $\backslash$\texttt{newcommand\{}$\backslash$\texttt{mycapfn\}[1]\{}$\backslash$\texttt{textsl\{}$\backslash$\texttt{small \#1\}\}}\almacp{SetAlCapNameFnt}{mycapfnt}
+\end{itemize}
+
+Now the commands:
+\begin{description}
+\item[\Almacp{SetAlCapSty}{$<$commandname$>$}:] sets the command that will be used by \almac{AlCapSty} to define
+  style of \texttt{Algorithm \#:} in caption. The argument is a name of a command (without $\backslash$). This
+  command have to take one argument, the text to be formatted. Default is set to: \almacp{SetAlCapSty}{textbf}.
+\item[\Almacp{SetAlCapNameSty}{$<$commandname$>$}:] sets the command that will be used by \almac{AlCapNameSty} to
+  define style of caption text. The argument is a name of a command (without $\backslash$). This command have to
+  take one argument, the text to be formatted. Default is set to: \almacp{SetAlCapSty}{textnormal}.
+\item[\Almacp{SetAlTitleSty}{$<$commandname$>$}] sets the command that will be used by \almac{AlTitleSty} to define
+  style of algorithm title given by \almac{TitleOfAlgo} (default is set to \almacp{SetAlTitleSty}{textbf}).
+
+
+%                               You can redefine \AlCapFnt and \AlCapNameFnt by giving macro to \Set commands. For
+%                               example, you can do \SetAlCapFnt{\large} to see Algorithm printed in \large font.
+%                               You can redefine \AlCapSty, \AlCapFnt, \AlCapNameSty and \AlCapNameFnt with the
+%                               corresponding \Set command. For the Sty commands, you have to give in parameter
+%                               name of a macro (whithout \)  which takes one argument. For example,
+%                               \SetAlCapFnt{textbf} defines the default behaviour. If you want to do more
+%                               complicated thing, you should define your own macro and give it to \SetAlCapFnt or
+%                               \SetAlCapNameFnt. Here are two examples:
+%                               - \newcommand{\mycapsty}[1]{\tiny #1}\SetAlCapNameSty{mycapsty}
+%                               - \newcommand{\mycapsty}[1]{\textsl{\small #1}}\SetAlCapNameSty{mycapsty}
+%                               Or you can combine the two, for the last example you can also do:
+%                               \SetAlCapNameSty{textsl}\SetAlCapNameFnt{\small}
+%                               Thanks to Jan Stilhammer who gives me the idea of \AlCapNameFnt.
+
+%                      * ADD: - \AlTitleSty and \SetAlTitleSty commands to set a style for title. These commands
+%                               are defined from a macro taking the text in argument, as \textbf for example. 
+%                               To set the TitleSty you have to give name of the macro (without the '\') 
+%                               to \SetAlTitleSty. For example \SetAlTitleSty{textbf} to set \textbf style.
+\end{description}
+
+Note that by combining \texttt{Fnt} and \texttt{Sty} macros you can define almost all styles easily. For example,
+the last example above can be define in a simplier way that previously presented by doing:
+\begin{itemize}
+\item \almacp{SetAlCapNameSty}{textsl}\almacp{SetAlCapNameFnt}{$\backslash$small}
+\end{itemize}
+
 %----------
-\subsection{Restyling macros\label{sec_styleoptions}}
+\subsection{controlling the layout of algorithms\label{sec_styleoptions}}
 
 \begin{description}
-\item[\Almacp{restylealgo}{style}] change the layout of the algorithms as do
+\item[\Almacp{RestyleAlgo}{style}] change the layout of the algorithms as do
   options \emph{boxed}, \emph{boxruled}, \emph{ruled} and \emph{algoruled}.
-\item[\Almac{linesnumbered}] makes lines of the following algorithms be auto-numbered.
-\item[\Almac{linesnumberedhidden}] makes lines of the following algorithms be auto-numbered, but
-  numbers stay hidden. You have to use \almac{showln} and \almac{showlnlabel} to see them.
-\item[\Almac{linesnotnumbered}] makes lines of the following algorithms no be auto-numbered.
+\item[\Almacp{RestyleAlgo}{style}] sets the style of the following algorithms 
+  to that given by this macro (\optplain, \optboxed, \optruled, \optalgoruled)
+  unlike those indicated in the options of the package (see options of
+  the package).
+\item[\Almac{SetAlgoVlined}] prints a vertical line followed by a little
+  horizontal line between the start and the end of each block. Looks
+  like that : \rule{0.4pt}{3mm}\rule{0.5mm}{0.4pt}
+\item[\Almac{SetNoline}] Doesn't print vertical lines (by default).
+  The block is marked with keywords such as \emph{begin}, \emph{end}.
+\item[\Almac{SetAlgoLined}] prints vertical lines between bloc start-end
+  keywords as \emph{begin}, \emph{end}.
+\item[\Almac{SetAlgoLongEnd}] acts like \optlongend option.
+\item[\Almac{SetAlgoShortEnd}] acts like \optshortend option.
+\item[\Almac{SetAlgoNoEnd}] acts like \optnoend option.
+\item[\Almacpp{SetInd}{before rule space}{after rule space}] sets the size of the space before the vertical rule
+  and after. In \almac{NoLine} mode the indentation space is the sum of these two values, by default 0.5em and 1em
+\item[\Almacp{Setvlineskip}{length}] sets the value of the vertical space after the little horizontal line which
+  closes a block in \optvlined mode.
 \item[\Almacp{SetAlgoSkip}{skip command}] Algorithms puts extra vertical space
   before and after to avoid having text bumping lines of boxed or ruled
   algorithms. By default, this is a \smallskip. You can change this value with
@@ -523,88 +939,60 @@ This package provides 4 environments :
   before and after the core of the algorithm. So text is put right after the lines in boxed or ruled style. To put an
   extra space, use \Almacp{SetAlgoInsideSkip}{skip command}, for example \Almacp{SetAlgoInsideSkip}{smallskip}, like for
   \Almacp{SetAlgoSkip}{skip command}.
-\item[\Almac{AlCapSkip}] is the dimension of the distance between algorithm body and caption in
-  \emph{plain} and \emph{boxed} mode. You can change by hands or by using \almacp{setalcapskip}{0ex}.
-\item[\Almacp{setalcapskip}{length}] set the lenght of \almac{AlCapSkip}) dimension between
-  algorithm body and caption.
-\item[\Almacp{setalcaphskip}{length}] set the horizontal skip before Algorithm: in caption when used in ruled algorithm.
-\item[\Almac{dontprintsemicolon}] the `;' are no more printed at the
-  end of each line.
-\item[\Almac{printsemicolon}] prints a `; ' at the end of each
-  line (by default)
-\item[\Almac{SetVline}] prints a vertical line followed by a little
-  horizontal line between the start and the end of each block. Looks
-  like that : \rule{0.4pt}{3mm}\rule{0.5mm}{0.4pt}
-\item[\Almac{SetNoline}] Doesn't print vertical lines (by default).
-  The block is marked with keywords such as \emph{begin}, \emph{end}.
-\item[\Almac{SetLine}] prints vertical lines between bloc start-end
-  keywords as \emph{begin}, \emph{end}.
-\item[\Almacp{SetKwSty}{$<$font$>$}] sets the Kw typography to $<$font$>$ (by
-  default: \textbf{textbf}).
-\item[\Almacp{SetFuncSty}{$<$font$>$}]  sets the function typography 
-(by default:  \textbf{texttt}).
-\item[\Almacp{SetArgSty}{$<$font$>$}]  sets the argument typography (by
-  default: \textbf{emph}).
-\item[\Almacp{SetProcNameSty}{$<$font$>$}] sets caption typography of procedure
-  and function environment (by default the same as \Almacp{FuncSty}).
-\item[\Almacp{SetProcArgSty}{$<$font$>$}] sets argument typography of procedure
-  and function environment (by default the same as \Almacp{ArgSty}).
-\item[\Almacp{SetDataSty}{$<$font$>$}]  sets the data typography (by
-  default: \textbf{textsf}).
-\item[\Almacp{SetCommentSty}{$<$font$>$}]  sets the comment text typography (by
-  default: \textbf{texttt}).
-\item[\Almacp{SetAlFnt}{$<$font$>$}] sets the font used by algorithm text.
-\item[\Almacp{SetAlCapFnt}{$<$font$>$}] sets the font used by caption text.
-\item[\Almacp{SetAlTitleFnt}{$<$font$>$}] sets the font used for \{algorithm: \}
-  in caption or tile of algorithm (default is set to \texttt{textbf}).
-\item[\Almacppp{Setnlsty}{$<$font$>$}{$<$txt before$>$}{$<$txt after$>$}]
-  defines how to print line numbers:\\ will print \{$<$font$>$ $<$txt
-  bef$>$ thelinenumber $<$txt aft$>$\}. \\ By default
-  \almacppp{Setnlsty}{textbf}{}{}.
-\item[\Almacpp{SetTitleSty}{type style}{type size}] sets the
-  typography and size of the titles defined with the macro
-  \almacp{Titleofalgo}{} (not with $\backslash$caption).
-\item[\Almac{nocaptionofalgo}] doesn't print Algorithm and its number
-  in the caption. This macros is \textbf{ONLY} active for
-  \emph{``\optalgoruled''} or \emph{``\optruled''} algorithms and for
-  the next algorithm. For example, it is useful when the algorithm
-  just describes a function and you only want to display the name of
-  the function in the caption.
-\item[\Almac{restorecaptionofalgo}] restores correct captions that was
-  corrupted by a \almac{nocaptionofalgo} macro.
-\item[\Almacp{restylealgo}{style}] sets the style of the following algorithms 
-  to that given by this macro (\optplain, \optboxed, \optruled, \optalgoruled)
-  unlike those indicated in the options of the package (see options of
-  the package).
-\item[\Almacpp{SetInd}{before rule space}{after rule space}] sets
-  the size of the space before the vertical rule and after. In
-  \almac{NoLine} mode the indentation space is the sum of these two
-  values, by default 0.5em and 1em
-\item[\Almacp{Setvlineskip}{length}] sets the value of the vertical space after
-  the little horizontal line which closes a block in \optvlined mode.
-\item[\Almacp{Setnlskip}{length}] sets the value of the space
-  between the line numbers and the text, by default 1em.
-\item[\Almac{algomargin}] this is the value of the margin of all
-  algorithms. You can change it by setting:
-  $\backslash$\texttt{setlength\{}\almac{algomargin}\texttt{\}\{2em\}}
-  for example. The default value is the sum of the two dimensions
-  \almac{leftskip} and \almac{parindent} when the algorithm2e package
-  is loaded. Note that if you change this value, it will take effect
-  with the next algorithm environment. So even if you change it
-  \emph{inside} an algorithm environment, it will not affect the
-  current algorithm.
-\item[\Almacp{incmargin}{length}] increases the size of the
-  \almac{algomargin} by the length given in argument.
-\item[\Almacp{decmargin}{length}] decreases the size of the
-  \almac{algomargin} by the length given in argument.
-\item[\Almacp{decmargin}{length}] decreases the size of the
-  \almac{algomargin} by the length given in argument.
-\item[\Almac{SetSideCommentLeft}] equivalent to \optscleft option.
-\item[\Almac{SetSideCommentRight}] equivalent to \optscright option.
-\item[\Almac{SetFillComment}] equivalent to \optfillcomment option.
-\item[\Almac{SetNoFillComment}] equivalent to \optnofillcomment option.
+\item[\Almac{algomargin}] this is the value of the margin of all algorithms. You can change it by setting:
+  $\backslash$\texttt{setlength\{}\almac{algomargin}\texttt{\}\{2em\}} for example. The default value is the sum of
+  the two dimensions \almac{leftskip} and \almac{parindent} when the algorithm2e package is loaded. Note that if
+  you change this value, it will take effect with the next algorithm environment. So even if you change it
+  \emph{inside} an algorithm environment, it will not affect the current algorithm.
+\item[\Almacp{IncMargin}{length}] increases the size of the \almac{algomargin} by the length given in argument.
+\item[\Almacp{DecMargin}{length}] decreases the size of the \almac{algomargin} by the length given in argument.
+\item[\Almacp{DecMargin}{length}] decreases the size of the \almac{algomargin} by the length given in argument.
+\item[\almacp{SetAlgoNlRelativeSize}{number}] sets the relative size of line number (see
+  \autoref{sec:linenumbering}) for more details on this command.
+\item[\almacp{SetAlgoCaptionLayout}{style}] sets the global style of caption (see \autoref{sec:titlemacros} for
+  more details). 
+\end{description}
+
+Some length are used to set the layout of ruled, algoruled and boxruled algorithms caption. These length have no
+particular macro to set them but can be changed by classical \almac{setlength} commmand:
+\begin{description}
+\item[interspacetitleruled] (2pt by defaut) which controls the vertical space between rules and title in ruled and
+  algoruled algorithms.
+\item[interspaceboxruled] (2\almac{lineskip} by default) which controls the vertical space between rules and title in
+  boxruled algorithms.
 \end{description}
 
+%----------
+\subsection{comments}
+\label{sec:comments}
+
+There are two ways to do comments in algorithm :
+\begin{enumerate}
+\item by using a comment macro defined by \almacppp{SetKwComment}{command}{right mark}{left mark} (see below) like
+  \almac{tcc};
+\item by using side comment, it means comment put in between (\ ) after control command like if-then-else, for,
+  ... macros.
+\end{enumerate}
+
+At \autoref{sec:commentsmacros}, you can see how \almac{tcc} is defined and at
+\autoref{sec:ifthenelsemacros} you can look at some examples how to use it with \texttt{if then else} like
+commands and finally you can look at \autoref{sec:defcommentsmacros} how to define comments and explanations on
+the different macros and ways of printing comments. Note also that comments are not numbered by default when using
+\optlinesnumbered option. You have to set \optcommentsnumbered to number them also.
+
+The following macro control how comment are typeseted. 
+\begin{description}
+\item[\Almac{SetSideCommentLeft}] right justified side comments (side comments are flushed to the right),
+  equivalent to \optscleft option.
+\item[\Almac{SetSideCommentRight}] left justified side comments (side comments are put right after the code line) ,
+  equivalent to \optscright option.
+\item[\Almac{SetFillComment}] end mark of comment is flushed to the right so comments fill all the width of text,
+  equivalent to \optfillcomment option.
+\item[\Almac{SetNoFillComment}] end mark of comment is put right after the comment, equivalent to \optnofillcomment
+  option.
+\end{description}
+
+
 
 %*******************************************************************
 
@@ -612,20 +1000,27 @@ This package provides 4 environments :
 
 Here are the english keywords predefined in the package. There are other
 language predefined macros provided, such as french keywords, see
-section~\ref{sec_lang} for a list of other language keywords. All these keywords
+\autoref{sec_lang} for a list of other language keywords. All these keywords
 are defined using macros provided by the package and described in
-section~\ref{sec_deflanguage}.
+\autoref{sec_deflanguage}.
 
 %\subsection{english keywords}
 
+%----------
+\subsection{Input, output macros...}\label{sec:inputmacros}
+
+\begin{itemize}
+\item $\backslash$KwIn\{input\}\macind{KwIn}
+\item $\backslash$KwOut\{output\}\macind{KwOut}
+\item $\backslash$KwData\{input\}\macind{KwData}
+\item $\backslash$KwResult\{output\}\macind{KwResult}
+\end{itemize}
+
+%----------
+\subsection{basic keywords and blocks}
+\label{sec:basickeywords}
+
 \begin{enumerate}
-\item Input, output macros...
-  \begin{itemize}
-  \item $\backslash$KwData\{input\}\macind{KwData}
-  \item $\backslash$KwResult\{output\}\macind{KwResult}
-  \item $\backslash$KwIn\{input\}\macind{KwIn}
-  \item $\backslash$KwOut\{output\}\macind{KwOut}
-  \end{itemize}
 \item One simple common keyword:
   \begin{itemize}
   \item $\backslash$KwTo\macind{KwTo}
@@ -640,98 +1035,125 @@ section~\ref{sec_deflanguage}.
   \item $\backslash$Begin\{block inside\}\macind{Begin}
   \item $\backslash$Begin(\textit{begin comment})\{block inside\}\macind{Begin}
   \end{itemize}
-\item Comments:
-  \begin{itemize}
-  \item $\backslash$tcc\{line(s) of comment\}\macind{tcc}: comment ``à la'' C
-  \item $\backslash$tcc*\{right justified side comment\}\macind{tcc*}: comment ``à la'' C
-  \item $\backslash$tcc*[r]\{right justified side comment\}\macind{tcc*[r]}: comment ``à la'' C
-  \item $\backslash$tcc*[l]\{left justified side comment\}\macind{tcc*[l]}: comment ``à la'' C
-  \item $\backslash$tcc*[h]\{left justified comment to be put in place\}\macind{tcc*[h]}: comment ``à la'' C
-  \item $\backslash$tcc*[f]\{right justified comment to be put in place\}\macind{tcc*[f]}: comment ``à la'' C
-  \item $\backslash$tcp\{line(s) of comment\}\macind{tcp}: comment ``à la'' C++
-  \item $\backslash$tcp*\{right justified side comment\}\macind{tcp*}: comment ``à la'' C++
-  \item $\backslash$tcp*[r]\{right justified side comment\}\macind{tcp*[r]}: comment ``à la'' C++
-  \item $\backslash$tcp*[l]\{left justified side comment\}\macind{tcp*[l]}: comment ``à la'' C++
-  \item $\backslash$tcp*[h]\{left justified comment to be put in place\}\macind{tcp*[h]}: comment ``à la'' C++
-  \item $\backslash$tcp*[f]\{right justified comment to be put in place\}\macind{tcp*[f]}: comment ``à la'' C++
-  \end{itemize}
-\item "if-then-else" macros:
-  \begin{itemize}
-  \item $\backslash$If\{condition\}\{then block\}\macind{If}
-  \item $\backslash$If(\textit{then comment})\{condition\}\{then block\}\macind{If}
-  \item $\backslash$uIf\{condition\}\{then block without end\}\macind{uIf}
-  \item $\backslash$uIf(\textit{then comment})\{condition\}\{then block without end\}\macind{uIf}
-  \item $\backslash$lIf\{condition\}\{then's line text\}\macind{lIf}
-  \item $\backslash$lIf(\textit{if comment})\{condition\}\{then's line text\}\macind{lIf}
-  \item $\backslash$ElseIf\{elseif block\}\macind{ElseIf}
-  \item $\backslash$ElseIf(\textit{elseif comment})\{elseif block\}\macind{ElseIf}
-  \item $\backslash$uElseIf\{elseif block without end\}\macind{uElseIf}
-  \item $\backslash$uElseIf(\textit{elseif comment})\{elseif block without end\}\macind{uElseIf}
-  \item $\backslash$lElseIf\{elseif's line text\}\macind{lElseIf}
-  \item $\backslash$lElseIf(\textit{elseif comment})\{elseif's line text\}\macind{lElseIf}
-  \item $\backslash$Else\{else block\}\macind{Else}
-  \item $\backslash$Else(\textit{else comment})\{else block\}\macind{Else}
-  \item $\backslash$uElse\{else block without end\}\macind{uElse}
-  \item $\backslash$uElse(\textit{else comment})\{else block without end\}\macind{uElse}
-  \item $\backslash$lElse\{else's line text\}\macind{lElse}
-  \item $\backslash$lElse(\textit{else comment})\{else's line text\}\macind{lElse}
-  \item $\backslash$eIf\{condition\}\{then block\}\{else block\}\macind{eIf}
-  \item $\backslash$eIf(\textit{then comment})\{condition\}\{then block\}(\textit{else comment})\{else block\}\macind{eIf}
-  \item $\backslash$eIf(\textit{then comment})\{condition\}\{then block\}\{else block\}\macind{eIf}
-  \item $\backslash$eIf\{condition\}\{then block\}(\textit{else comment})\{else block\}\macind{eIf}
-  \end{itemize}
-\item multiple condition selection:
-  \begin{itemize}
-  \item $\backslash$Switch(\textit{switch comment})\{condition\}\{Switch block\}\macind{Switch}
-  \item $\backslash$Switch\{condition\}\{Switch block\}\macind{Switch}
-  \item $\backslash$Case\{a case\}\{case block\}\macind{Case}
-  \item $\backslash$Case(\textit{case comment})\{a case\}\{case block\}\macind{Case}
-  \item $\backslash$uCase\{a case\}\{case block without end\}\macind{uCase}
-  \item $\backslash$uCase(\textit{case comment})\{a case\}\{case block without end\}\macind{uCase}
-  \item $\backslash$lCase\{a case\}\{case's line\}\macind{lCase}
-  \item $\backslash$lCase(\textit{case comment})\{a case\}\{case's line\}\macind{lCase}
-  \item $\backslash$Other\{otherwise block\}\macind{Other}
-  \item $\backslash$Other(\textit{other comment})\{otherwise block\}\macind{Other}
-  \item $\backslash$lOther\{otherwise's line\}\macind{lOther}
-  \item $\backslash$lOther(\textit{other comment})\{otherwise's line\}\macind{lOther}
-  \end{itemize}
-\item loops with "end condition" test at the beginning:
-  \begin{itemize}
-  \item $\backslash$For\{condition\}\{text loop\}\macind{For}
-  \item $\backslash$For(\textit{for comment})\{condition\}\{text loop\}\macind{For}
-  \item $\backslash$lFor\{condition\}\{line text loop\}\macind{lFor}
-  \item $\backslash$lFor(\textit{for comment})\{condition\}\{line text loop\}\macind{lFor}
-  \end{itemize}
-  \begin{itemize}
-  \item $\backslash$While\{condition\}\{text loop\}\macind{While}
-  \item $\backslash$While(\textit{while comment})\{condition\}\{text loop\}\macind{While}
-  \item $\backslash$lWhile\{condition\}\{line text loop\}\macind{lWhile}
-  \item $\backslash$lWhile(\textit{while comment})\{condition\}\{line text loop\}\macind{lWhile}
-  \end{itemize}
-  \begin{itemize}
-  \item $\backslash$ForEach\{condition\}\{text loop\}\macind{ForEach}
-  \item $\backslash$ForEach(\textit{foreach comment})\{condition\}\{text loop\}\macind{ForEach}
-  \item $\backslash$lForEach\{condition\}\{line text loop\}\macind{lForEach}
-  \item $\backslash$lForEach(\textit{foreach comment})\{condition\}\{line text loop\}\macind{lForEach}
-  \end{itemize}
-  \begin{itemize}
-  \item $\backslash$ForAll\{condition\}\{text loop\}\macind{ForAll}
-  \item $\backslash$ForAll(\textit{forall comment})\{condition\}\{text loop\}\macind{ForAll}
-  \item $\backslash$lForAll\{condition\}\{line text loop\}\macind{lForAll}
-  \item $\backslash$lForAll(\textit{forall comment})\{condition\}\{line text loop\}\macind{lForAll}
-  \end{itemize}
-\item loops with "end condition" test at the end:
-  \begin{itemize}
-  \item $\backslash$Repeat\{end condition\}\{text loop\}\macind{Repeat}
-  \item $\backslash$Repeat(\textit{repeat comment})\{end condition\}\{text loop\}(\textit{until comment})\macind{Repeat}
-  \item $\backslash$Repeat(\textit{repeat comment})\{end condition\}\{text loop\}\macind{Repeat}
-  \item $\backslash$Repeat\{end condition\}\{text loop\}(\textit{until comment})\macind{Repeat}
-  \item $\backslash$lRepeat\{end condition\}\{line text loop\}\macind{lRepeat}
-  \item $\backslash$lRepeat(\textit{repeat comment})\{end condition\}\{line text loop\}\macind{lRepeat}
-  \end{itemize}
 \end{enumerate}
 
-Here we describe how they are obtained:
+%----------
+\subsection{comments}
+\label{sec:commentsmacros}
+
+\begin{itemize}
+\item $\backslash$tcc\{line(s) of comment\}\macind{tcc}: comment ``à la'' C
+\item $\backslash$tcc*\{right justified side comment\}\macind{tcc*}: comment ``à la'' C
+\item $\backslash$tcc*[r]\{right justified side comment, ends the line (default)\}\macind{tcc*[r]}: comment ``à la'' C
+\item $\backslash$tcc*[l]\{left justified side comment, ends the line\}\macind{tcc*[l]}: comment ``à la'' C
+\item $\backslash$tcc*[h]\{left justified comment, without end line; useful with "if-then-else" macros for
+  example\}\macind{tcc*[h]}: comment ``à la'' C
+\item $\backslash$tcc*[f]\{right justified comment, without end line; useful with "if-then-else" macros for
+  example\}\macind{tcc*[f]}: comment ``à la'' C
+\item $\backslash$tcp\{line(s) of comment\}\macind{tcp}: comment ``à la'' C++
+\item $\backslash$tcp*\{right justified side comment\}\macind{tcp*}: comment ``à la'' C++
+\item $\backslash$tcp*[r]\{right justified side comment, ends the line (default)\}\macind{tcp*[r]}: comment ``à la'' C++
+\item $\backslash$tcp*[l]\{left justified side comment, ends the line\}\macind{tcp*[l]}: comment ``à la'' C++
+\item $\backslash$tcp*[h]\{left justified comment, without end line; useful with "if-then-else" macros for
+  example\}\macind{tcp*[h]}: comment ``à la'' C++
+\item $\backslash$tcp*[f]\{right justified comment, without end line; useful with "if-then-else" macros for
+  example\}\macind{tcp*[f]}: comment ``à la'' C++
+\end{itemize}
+
+You can see some examples of this macros with \texttt{if then else} at the end of \autoref{sec:ifthenelsemacros}.
+
+%----------
+\subsection{if-then-else macros}
+\label{sec:ifthenelsemacros}
+
+\begin{itemize}
+\item $\backslash$If\{condition\}\{then block\}\macind{If}
+\item $\backslash$If(\textit{then comment})\{condition\}\{then block\}\macind{If}
+\item $\backslash$uIf\{condition\}\{then block without end\}\macind{uIf}
+\item $\backslash$uIf(\textit{then comment})\{condition\}\{then block without end\}\macind{uIf}
+\item $\backslash$lIf\{condition\}\{then's line text\}\macind{lIf}
+\item $\backslash$lIf(\textit{if comment})\{condition\}\{then's line text\}\macind{lIf}
+\item $\backslash$ElseIf\{elseif block\}\macind{ElseIf}
+\item $\backslash$ElseIf(\textit{elseif comment})\{elseif block\}\macind{ElseIf}
+\item $\backslash$uElseIf\{elseif block without end\}\macind{uElseIf}
+\item $\backslash$uElseIf(\textit{elseif comment})\{elseif block without end\}\macind{uElseIf}
+\item $\backslash$lElseIf\{elseif's line text\}\macind{lElseIf}
+\item $\backslash$lElseIf(\textit{elseif comment})\{elseif's line text\}\macind{lElseIf}
+\item $\backslash$Else\{else block\}\macind{Else}
+\item $\backslash$Else(\textit{else comment})\{else block\}\macind{Else}
+\item $\backslash$uElse\{else block without end\}\macind{uElse}
+\item $\backslash$uElse(\textit{else comment})\{else block without end\}\macind{uElse}
+\item $\backslash$lElse\{else's line text\}\macind{lElse}
+\item $\backslash$lElse(\textit{else comment})\{else's line text\}\macind{lElse}
+\item $\backslash$eIf\{condition\}\{then block\}\{else block\}\macind{eIf}
+\item $\backslash$eIf(\textit{then comment})\{condition\}\{then block\}(\textit{else comment})\{else block\}\macind{eIf}
+\item $\backslash$eIf(\textit{then comment})\{condition\}\{then block\}\{else block\}\macind{eIf}
+\item $\backslash$eIf\{condition\}\{then block\}(\textit{else comment})\{else block\}\macind{eIf}
+\end{itemize}
+
+%----------
+\subsection{multiple condition selection:}
+\label{sec:switchmacros}
+
+\begin{itemize}
+\item $\backslash$Switch(\textit{switch comment})\{condition\}\{Switch block\}\macind{Switch}
+\item $\backslash$Switch\{condition\}\{Switch block\}\macind{Switch}
+\item $\backslash$Case\{a case\}\{case block\}\macind{Case}
+\item $\backslash$Case(\textit{case comment})\{a case\}\{case block\}\macind{Case}
+\item $\backslash$uCase\{a case\}\{case block without end\}\macind{uCase}
+\item $\backslash$uCase(\textit{case comment})\{a case\}\{case block without end\}\macind{uCase}
+\item $\backslash$lCase\{a case\}\{case's line\}\macind{lCase}
+\item $\backslash$lCase(\textit{case comment})\{a case\}\{case's line\}\macind{lCase}
+\item $\backslash$Other\{otherwise block\}\macind{Other}
+\item $\backslash$Other(\textit{other comment})\{otherwise block\}\macind{Other}
+\item $\backslash$lOther\{otherwise's line\}\macind{lOther}
+\item $\backslash$lOther(\textit{other comment})\{otherwise's line\}\macind{lOther}
+\end{itemize}
+
+%----------
+\subsection{loops with "end condition" test at the beginning}
+\label{sec:loopfor}
+
+\begin{itemize}
+\item $\backslash$For\{condition\}\{text loop\}\macind{For}
+\item $\backslash$For(\textit{for comment})\{condition\}\{text loop\}\macind{For}
+\item $\backslash$lFor\{condition\}\{line text loop\}\macind{lFor}
+\item $\backslash$lFor(\textit{for comment})\{condition\}\{line text loop\}\macind{lFor}
+\end{itemize}
+\begin{itemize}
+\item $\backslash$While\{condition\}\{text loop\}\macind{While}
+\item $\backslash$While(\textit{while comment})\{condition\}\{text loop\}\macind{While}
+\item $\backslash$lWhile\{condition\}\{line text loop\}\macind{lWhile}
+\item $\backslash$lWhile(\textit{while comment})\{condition\}\{line text loop\}\macind{lWhile}
+\end{itemize}
+\begin{itemize}
+\item $\backslash$ForEach\{condition\}\{text loop\}\macind{ForEach}
+\item $\backslash$ForEach(\textit{foreach comment})\{condition\}\{text loop\}\macind{ForEach}
+\item $\backslash$lForEach\{condition\}\{line text loop\}\macind{lForEach}
+\item $\backslash$lForEach(\textit{foreach comment})\{condition\}\{line text loop\}\macind{lForEach}
+\end{itemize}
+\begin{itemize}
+\item $\backslash$ForAll\{condition\}\{text loop\}\macind{ForAll}
+\item $\backslash$ForAll(\textit{forall comment})\{condition\}\{text loop\}\macind{ForAll}
+\item $\backslash$lForAll\{condition\}\{line text loop\}\macind{lForAll}
+\item $\backslash$lForAll(\textit{forall comment})\{condition\}\{line text loop\}\macind{lForAll}
+\end{itemize}
+
+\subsection{loops with "end condition" test at the end}
+\label{sec:loprepeat}
+
+\begin{itemize}
+\item $\backslash$Repeat\{end condition\}\{text loop\}\macind{Repeat}
+\item $\backslash$Repeat(\textit{repeat comment})\{end condition\}\{text loop\}(\textit{until comment})\macind{Repeat}
+\item $\backslash$Repeat(\textit{repeat comment})\{end condition\}\{text loop\}\macind{Repeat}
+\item $\backslash$Repeat\{end condition\}\{text loop\}(\textit{until comment})\macind{Repeat}
+\item $\backslash$lRepeat\{end condition\}\{line text loop\}\macind{lRepeat}
+\item $\backslash$lRepeat(\textit{repeat comment})\{end condition\}\{line text loop\}\macind{lRepeat}
+\end{itemize}
+
+%----------
+\subsection{how default keywords are obtained}
+\label{sec:defaultkeyworddefinition}
 
 \begin{enumerate}
 \item \almacpp{SetKwInput}{KwData}{Data}\par
@@ -753,19 +1175,17 @@ Here we describe how they are obtained:
 \item \almacppp{SetKwRepeat}{Repeat}{repeat}{until}
 \end{enumerate}
 
-%----------
-\subsection{To define your own language keywords}\label{sec_deflanguage}
+%*******************************************************************
+
+\section{To define your own language keywords}\label{sec_deflanguage}
 Note that all these macros verify if the keywords are already defined and do a
 renewcommand if they are. So you can overload the default definitions of this
 package with your own.
+
+%----------
+\subsection{to define Input, output macros...}\label{sec:definputmacros}
+
 \begin{description}
-\item[\Almacpp{SetKw}{Kw}{thetext}] defines the macro \almac{Kw} which
-  defines a keyword \emph{thetext} and prints it in keyword
-  typography. It can take one argument: $backslash$Kw\{arg\}. If so,
-  \emph{arg} is printed in argument typography.
-\item[\Almacpp{SetKwData}{Kw}{thetext}] defines the macro \almacp{Kw}
-  which defines a data text. Prints \emph{thetext} in data typography.
-  Note that this macros can takes one argument as function macros.
 \item[\Almacpp{SetKwInput}{Kw}{input}] defines the macro
   \almacp{Kw}{arg} which prints \emph{input} followed by `:' in key
   word typography, and behind the argument \emph{arg}. Typically used
@@ -779,18 +1199,54 @@ package with your own.
   macros defined previously by \almacpp{SetKwInOut}{Kw}{input}. The
   new position is fixed depending on the size of the text \emph{input}
   given in argument.
-\item[\Almacppp{SetKwInParam}{Kw}{text1}{text2}] defines the macro
-  \almacpp{Kw}{name}{arg} which prints \emph{name} followed by
-  \emph{text1} in key word typography, behind the argument \emph{arg},
-  followed by \emph{text2} in key word typography. Typically used when
-  the algorithm described a function in order to define a macro which
-  allows to give the name of the function and to show its arguments.
-  Note that \emph{arg} will be shifted so that all the text is
-  vertically aligned and to the right of
-  \emph{text1}.\\
-  Example $\backslash$SetKwInParam\{Func\}\{(\}\{)\} defines macro
-  $\backslash$Func and $\backslash$Func\{function\}\{arg1, arg2, arg3\}
-  gives \KwSty{function(}arg1, arg2, arg3\KwSty{)}.
+\end{description}
+
+%----------
+\subsection{to define basic keywords or blocks}\label{sec:defbasickeywords}
+
+\begin{description}
+\item[\Almacpp{SetKw}{Kw}{thetext}] defines the macro \almac{Kw} which
+  defines a keyword \emph{thetext} and prints it in keyword
+  typography. It can take one argument: $backslash$Kw\{arg\}. If so,
+  \emph{arg} is printed in argument typography.
+\item[\Almacpp{SetKwData}{Kw}{thetext}] defines the macro \almacp{Kw}
+  which defines a data text. Prints \emph{thetext} in data typography.
+  Note that this macros can takes one argument as function macros.
+\item[\Almacpp{SetKwHangingKw}{name}{text}] (hanging indent with keyword): This creates a hanging indent much like
+  \Almac{SetKwInput}, except that it removes the trailing `:' and does not reset numbering.  It can be used for
+  example to create \textbf{let} declarations.
+\begin{verbatim}
+   text --------------   <= [text] is placed at left
+        --------------   <= hanging determined by [text]
+\end{verbatim}
+% \item[\Almacppp{SetKwInParam}{Kw}{text1}{text2}] defines the macro
+%   \almacpp{Kw}{name}{arg} which prints \emph{name} followed by
+%   \emph{text1} in key word typography, behind the argument \emph{arg},
+%   followed by \emph{text2} in key word typography. Typically used when
+%   the algorithm described a function in order to define a macro which
+%   allows to give the name of the function and to show its arguments.
+%   Note that \emph{arg} will be shifted so that all the text is
+%   vertically aligned and to the right of
+%   \emph{text1}.\\
+%   Example $\backslash$SetKwInParam\{Func\}\{(\}\{)\} defines macro
+%   $\backslash$Func and $\backslash$Func\{function\}\{arg1, arg2, arg3\}
+%   gives \KwSty{function(}arg1, arg2, arg3\KwSty{)}.
+\item[\Almacppp{SetKwBlock}{Begin}{begin}{end}] defines a macro
+  \almacp{Begin}{txt} which denotes a block. The text is surrounded by
+  the words \emph{begin} and \emph{end} in keyword typography and
+  shifted to the right (indented). In \almac{Vline}\emph{ or }%
+  \almac{Line}\emph{ mode} a straight vertical line is added.\\
+  \verb+\Begin(side text){text}+ gives also text in a block surrounded by \emph{begin} and
+  \emph{end}, but \emph{side text} if put after the \emph{begin} keyword. Combined with
+  \Almac{tcc*[f]} macro, it allows you to put comments on the same line as \emph{begin}.
+\end{description}
+
+\subsection{to define keywords as function}
+\label{sec:deffunction}
+
+If you want describe the function by an algorithm, use instead \emph{function} or \emph{procedure} environment.
+
+\begin{description}
 \item[\Almacpp{SetKwFunction}{KwFn}{Fn}] defines a macro
   \almacp{KwFn}{arg} which prints \emph{Fn} in Function typography and
   its argument \emph{arg} in argument typography, surrounded by a pair
@@ -812,14 +1268,13 @@ package with your own.
   \almacp{DoThat}{toto} (for a function defined by
   \almacpp{SetKwFunction}{Dothat}{Do that}), you will obtain
   \FuncSty{Do That(\ArgSty{toto})}.
-\item[\Almacppp{SetKwBlock}{Begin}{begin}{end}] defines a macro
-  \almacp{Begin}{txt} which denotes a block. The text is surrounded by
-  the words \emph{begin} and \emph{end} in keyword typography and
-  shifted to the right (indented). In \almac{Vline}\emph{ or }%
-  \almac{Line}\emph{ mode} a straight vertical line is added.\\
-  \verb+\Begin(side text){text}+ gives also text in a block surrounded by \emph{begin} and
-  \emph{end}, but \emph{side text} if put after the \emph{begin} keyword. Combined with
-  \Almac{tcc*[f]} macro, it allows you to put comments on the same line as \emph{begin}.
+\end{description}
+
+%----------
+\subsection{to define comments}
+\label{sec:defcommentsmacros}
+
+\begin{description}
 \item[\Almacppp{SetKwComment}{Comment}{start}{end}] defines a macr
   \almacp{Comment}{text comment} which writes \emph{text comment} between
   \emph{start} and \emph{end}. Note that \emph{start} or \emph{end} can be
@@ -833,8 +1288,13 @@ package with your own.
   mark is put, and line is not terminated (is up to you to put \verb+\;+ to end the line).\\
   \verb+\Comment*[f]{side comment text}+ same as the previous one but with side comment text right
   justified.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\end{description}
+
+%----------
+\subsection{to define if-then-else macros}
+\label{sec:defifthenelsemacros}
+
+\begin{description}
 \item[\almacphuit{SetKwIF}{If}{ElseIf}{Else}{if}{then}{else if}{else}{endif}]
   defines several macros to give the opportunity to write all
   if-then-else-elseif-endif possibilities:
@@ -868,7 +1328,7 @@ package with your own.
 %     \end{minipage}$\Longrightarrow$%
 %     \begin{minipage}{.4\textwidth}%
 %       \begin{algorithm}[H]
-%         \SetLine
+%         \SetAlgLined
 %         \uIf{condition}{
 %           if's block\;
 %         }
@@ -882,34 +1342,37 @@ package with your own.
   \item \almacppp{eIf}{cond}{Then's text}{Else's text}\\
     equivalent to the use of \almac{uIf} followed by \almac{Else}.
   \end{itemize}
-  
-  The macros which begin with a `l' {\small (l as line)} denote that the text
-  passed in argument will be printed on the same line while with the others the
-  text is printed in a block and shifted. You should put \almac{;} at the end of
-  ``l macros''.
+\end{description}
+
+The macros which begin with a `l' {\small (l as line)} denote that the text passed in argument will be printed on
+the same line while with the others the text is printed in a block and shifted. You should put \almac{;} at the end
+of ``l macros''.
 
-  The macros which begin with a `u' {\small (u as uncomplete)} denote that the text
-  passed in argument will be printed in a block not terminated by endif. They
-  are useful to chain different alternatives.
+The macros which begin with a `u' {\small (u as uncomplete)} denote that the text passed in argument will be
+printed in a block not terminated by endif. They are useful to chain different alternatives.
 
-  The keywords \emph{then} and \emph{else} are automatically printed.
-  \emph{cond} is always printed in argument typography just behind the
-  keyword if.
+The keywords \emph{then} and \emph{else} are automatically printed.  \emph{cond} is always printed in argument
+typography just behind the keyword if.
 
-  All this macros can be combined with () and \almac{Comment*} macros to put comments after main
-  keywords as If, Else or ElseIf (see list of predefined keywords above and example below).
+All this macros can be combined with () and \almac{Comment*} macros to put comments after main keywords as If, Else
+or ElseIf (see list of predefined keywords above and example below).
 
-  Some examples with \verb+\SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{endif}+
-  the default definition given in the package:\par\smallskip
-\ExampleOfAlgo{algorithm2e_ex01.tex}\par---\par
+Some examples with \verb+\SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{endif}+ the default definition given
+in the package:\par\smallskip \ExampleOfAlgo{algorithm2e_ex01.tex}\par---\par
 \ExampleOfAlgo{algorithm2e_ex02.tex}\par---\par
 %\ExampleOfAlgo{algorithm2e_ex03.tex}\par---\par
 \ExampleOfAlgo{algorithm2e_ex04.tex}\par---\par
 \ExampleOfAlgo{algorithm2e_ex05.tex}\par---\par
 \ExampleOfAlgo{algorithm2e_ex06.tex}\par---\par
-\ExampleOfAlgo{algorithm2e_ex07.tex}
-\restylealgo{boxed}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ExampleOfAlgo{algorithm2e_ex07.tex}\par
+\RestyleAlgo{boxed}
+
+
+%----------
+\subsection{to define multiple condition selection:}
+\label{sec:defswitchmacros}
+
+\begin{description}
 \item[\Almacphuit{SetKwSwitch}{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{endsw}]
   defines several macros to give a complete Switch-do-case-otherwise
   environment:
@@ -921,14 +1384,19 @@ package with your own.
   \item \almacp{Other}{Otherwise's text}
   \item \almacp{lOther}{Otherwise's text}
   \end{itemize}
-  The keywords \emph{do} and \emph{endsw} are automatically
-  printed.  \emph{iden} and \emph{cond} are always printed in argument
-  typography just behind the keywords Switch, Case and Otherwise. Here is an
-  example with the default keywords:\par\smallskip
-  \ExampleOfAlgo{algorithm2e_exswitch.tex}
+\end{description}
+
+The keywords \emph{do} and \emph{endsw} are automatically printed.  \emph{iden} and \emph{cond} are always printed
+in argument typography just behind the keywords Switch, Case and Otherwise. Here is an example with the default
+keywords:\par\smallskip \ExampleOfAlgo{algorithm2e_exswitch.tex}
+
+As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
 
-  As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
+%----------
+\subsection{to define loops with "end condition" test at the beginning}
+\label{sec:defloopfor}
 
+\begin{description}
 \item[\Almacpppp{SetKwFor}{For}{for}{do}{endfor}]
   defines a loop environment with stop-test done at the beginning of
   the loop.
@@ -936,12 +1404,17 @@ package with your own.
     \item \almacpp{For}{loop's condition}{For's text}
     \item \almacpp{lFor}{loop's condition}{For's text}
   \end{itemize}
-  The keywords \emph{do} and \emph{endfor} are automatically printed.
-  The loop condition is printed in argument typography. For example:\par\smallskip
-  \ExampleOfAlgo{algorithm2e_exfor.tex}
+\end{description}
 
-  As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
+The keywords \emph{do} and \emph{endfor} are automatically printed.  The loop condition is printed in argument
+typography. For example:\par\smallskip \ExampleOfAlgo{algorithm2e_exfor.tex}
 
+As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
+
+\subsection{to define loops with "end condition" test at the end}
+\label{sec:defloprepeat}
+
+\begin{description}
 \item[\Almacppp{SetKwRepeat}{Repeat}{repeat}{until}]
   defines a repeat-until environment (loop with stop-test at the end
   of the loop):
@@ -949,220 +1422,20 @@ package with your own.
   \item \almacpp{Repeat}{end loop condition}{the loop}
   \item \almacpp{lRepeat}{end loop condition}{only one line}
   \end{itemize}
-  It prints the loop condition behind the \emph{until} after the text
-  of the loop.For example:\par\smallskip
-  \ExampleOfAlgo{algorithm2e_exrepeat.tex}
-
-  As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
 \end{description}
 
-\clearpage
-\section{Two complete examples}\label{longexample}
-
-
-The algorithms~\ref{algo_disjdecomp} and~\ref{IR} are written with this package.
-
-\subsection{Algorithm~\protect\ref{algo_disjdecomp} : disjoint decomposition}
-
-Here we suppose that we have done:
-\begin{verbatim}
-\usepackage[lined,algonl,boxed]{algorithm2e}
-\end{verbatim}
-\index{lined|textit,algonl|textit,boxed|textit}
-
-\noindent The algorithm was written in \LaTeX2e code as follow:\par\bigskip
-\noindent\begin{boxedverbatim}
-\incmargin{1em}
-\restylealgo{boxed}\linesnumbered
-\begin{algorithm}
-  \SetKwData{Left}{left}
-  \SetKwData{This}{this}
-  \SetKwData{Up}{up}
-  \SetKwFunction{Union}{Union}
-  \SetKwFunction{FindCompress}{FindCompress}
-  \SetKwInOut{Input}{input}
-  \SetKwInOut{Output}{output}
-  \caption{disjoint decomposition}
-
-  \Input{A bitmap $Im$ of size $w\times l$}
-  \Output{A partition of the bitmap}
-  \BlankLine
-  \emph{special treatment of the first line}\;
-  \For{$i\leftarrow 2$ \KwTo $l$}{
-    \emph{special treatment of the first element of line $i$}\;
-    \For{$j\leftarrow 2$ \KwTo $w$}{\nllabel{forins}
-      \Left$\leftarrow$ \FindCompress{$Im[i,j-1]$}\;
-      \Up$\leftarrow$ \FindCompress{$Im[i-1,]$}\;
-      \This$\leftarrow$ \FindCompress{$Im[i,j]$}\;
-      \If{\Left compatible with \This}{
-        \lIf{\Left $<$ \This}{\Union{\Left,\This}}\;
-        \lElse{\Union{\This,\Left}}
-      }
-      \If{\Up compatible with \This}{
-        \lIf{\Up $<$ \This}{\Union{\Up,\This}}\;
-        \lElse{\Union{\This,\Up}}
-      }
-    }
-  \lForEach{element $e$ of the line $i$}{\FindCompress{p}}
-  }
-  \label{algo_disjdecomp}
-\end{algorithm}
-\decmargin{1em}
-\end{boxedverbatim}
-\par\bigskip
-
-\noindent which gives the algorithme~\vref{algo_disjdecomp} where
-line~\ref{forins} denotes the second \texttt{For}: 
-
-%\def\theAlgoLine{\thealgocf.\arabic{AlgoLine}}
-\incmargin{1em}
-\restylealgo{boxed}\linesnumbered
-\begin{algorithm}
-  \SetLine
-  \SetKwData{Left}{left}
-  \SetKwData{This}{this}
-  \SetKwData{Up}{up}
-  \SetKwFunction{Union}{Union}
-  \SetKwFunction{FindCompress}{FindCompress}
-  \SetKwInOut{Input}{input}
-  \SetKwInOut{Output}{output}
-  \caption{disjoint decomposition}
-
-  \Input{a bitmap $im$ of size $w\times l$.}
-  \Output{A partition of the bitmap.}
-  \BlankLine
-  \emph{special treatment of the first line}\;
-  \For{$i\leftarrow 2$ \KwTo $l$}{
-    \emph{special treatment of the first element of line $i$}\;
-    \For{$j\leftarrow 2$ \KwTo $w$}{\nllabel{forins}
-      \Left$\leftarrow$ \FindCompress{$Im[i,j-1]$}\;
-      \Up$\leftarrow$ \FindCompress{$Im[i-1,]$}\;
-      \This$\leftarrow$ \FindCompress{$Im[i,j]$}\;
-      \If{\Left compatible with \This}{
-        \lIf{\Left $<$ \This}{\Union{{\Left,\This}}}\;
-        \lElse{\Union{\This,\Left}}
-      }
-      \If{\Up compatible with \This}{
-        \lIf{\Up $<$ \This}{\Union{\Up,\This}}\;
-        \lElse{\Union{\This,\Up}}
-      }
-    }
-  \lForEach{element $e$ of the line $i$}{\FindCompress{p}}
-  }
-  \label{algo_disjdecomp}
-\end{algorithm}
-\decmargin{1em}
-\linesnotnumbered
-
-\clearpage
-\subsection{Algorithm~\protect\ref{IR} : IntervalRestriction}
-\def\theAlgoLine{\arabic{AlgoLine}}
-
-Here we suppose we that have done:
-\begin{verbatim}
-\usepackage[ruled,vlined]{algorithm2e}
-\end{verbatim}
-\index{ruled|textit,vlined|textit}
-
-\noindent and the \LaTeX2e code is:\par\bigskip
-\noindent\begin{boxedverbatim}
-\begin{algorithm}
-\dontprintsemicolon
-\KwData{$G=(X,U)$ such that $G^{tc}$ is an order.}
-\KwResult{$G'=(X,V)$ with $V\subseteq U$ such that $G'^{tc}$ is an
-interval order.}
-\Begin{
-  $V \longleftarrow U$\;
-  $S \longleftarrow \emptyset$\; 
-  \For{$x\in X$}{ 
-    $NbSuccInS(x) \longleftarrow 0$\;
-    $NbPredInMin(x) \longleftarrow 0$\;
-    $NbPredNotInMin(x) \longleftarrow |ImPred(x)|$\;
-    }
-  \For{$x \in X$}{
-    \If{$NbPredInMin(x) = 0$ {\bf and} $NbPredNotInMin(x) = 0$}{
-      $AppendToMin(x)$}
-    } 
-    \lnl{InRes1}\While{$S \neq \emptyset$}{
-    \lnlset{InResR}{REM}%
-    remove $x$ from the list of $T$ of maximal index\;
-    \lnl{InRes2}\While{$|S \cap  ImSucc(x)| \neq |S|$}{ 
-      \For{$ y \in  S-ImSucc(x)$}{
-        \{ remove from $V$ all the arcs $zy$ : \}\;
-        \For{$z \in  ImPred(y) \cap  Min$}{
-          remove the arc $zy$ from $V$\;
-          $NbSuccInS(z) \longleftarrow NbSuccInS(z) - 1$\;
-          move $z$ in $T$ to the list preceding its present list\;
-          \{i.e. If $z \in T[k]$, move $z$ from $T[k]$ to 
-           $T[k-1]$\}\;
-          }
-        $NbPredInMin(y) \longleftarrow 0$\;
-        $NbPredNotInMin(y) \longleftarrow 0$\;
-        $S \longleftarrow S - \{y\}$\;
-        $AppendToMin(y)$\;
-        }
-      }
-    $RemoveFromMin(x)$\;
-    }
-  }  
-\caption{IntervalRestriction\label{IR}}
-\end{algorithm}
-\end{boxedverbatim}
-\par\bigskip
-
-\noindent which give us the algorithm~\vref{IR} with line~\ref{InRes1} and line~\ref{InResR}.
-
-\restylealgo{algoruled}
-\begin{algorithm}
-\dontprintsemicolon
-\SetVline
-\KwData{$G=(X,U)$ such that $G^{tc}$ is an order.}
-\KwResult{$G'=(X,V)$ with $V\subseteq U$ such that $G'^{tc}$ is an
-interval order.}
-\Begin{
-  $V \longleftarrow U$\;
-  $S \longleftarrow \emptyset$\; 
-  \For{$x\in X$}{ 
-    $NbSuccInS(x) \longleftarrow 0$\;
-    $NbPredInMin(x) \longleftarrow 0$\;
-    $NbPredNotInMin(x) \longleftarrow |ImPred(x)|$\;
-    }
-  \For{$x \in X$}{
-    \If{$NbPredInMin(x) = 0$ {\bf and} $NbPredNotInMin(x) = 0$}{
-      $AppendToMin(x)$}
-    } 
-    \lnl{InRes1}\While{$S \neq \emptyset$}{
-    \lnlset{InResR}{REM}%
-    remove $x$ from the list of $T$ of maximal index\;
-    \lnl{InRes2}\While{$|S \cap  ImSucc(x)| \neq |S|$}{ 
-      \For{$ y \in  S-ImSucc(x)$}{
-        \{ remove from $V$ all the arcs $zy$ : \}\;
-        \For{$z \in  ImPred(y) \cap  Min$}{
-          remove the arc $zy$ from $V$\;
-          $NbSuccInS(z) \longleftarrow NbSuccInS(z) - 1$\;
-          move $z$ in $T$ to the list preceding its present list\;
-          \{i.e. If $z \in T[k]$, move $z$ from $T[k]$ to 
-           $T[k-1]$\}\;
-          }
-        $NbPredInMin(y) \longleftarrow 0$\;
-        $NbPredNotInMin(y) \longleftarrow 0$\;
-        $S \longleftarrow S - \{y\}$\;
-        $AppendToMin(y)$\;
-        }
-      }
-    $RemoveFromMin(x)$\;
-    }
-  }  
-\caption{IntervalRestriction\label{IR}}
-\end{algorithm}
+It prints the loop condition behind the \emph{until} after the text of the loop.For example:\par\smallskip
+\ExampleOfAlgo{algorithm2e_exrepeat.tex}
 
+As for If-then-elseif-else-endif macro, you can use () to put comments after main keywords.
 
+%\clearpage
 \section{Other language predefined keywords}\label{sec_lang}
 
 \subsection{french keywords}
 
 Hey, I am a frenchy , so I have defined the same as in
-section~\ref{predefkeywords} but in french.
+\autoref{predefkeywords} but in french.
 
 \begin{enumerate}
 \item $\backslash$Donnees\{donn\'ees\}\macind{Donnees}\par
@@ -1308,6 +1581,8 @@ Here we describe how they are obtained:
   $\backslash$lCaso\{a case\}\{case's line\}\macind{lCaso}\par
   $\backslash$Outro\{otherwise block\}\macind{Outro}\par
   $\backslash$lOutro\{otherwise's line\}\macind{lOutro}
+\item $\backslash$Para\{condition\}\{text loop\}\macind{Para}\par
+  $\backslash$lPara\{condition\}\{line text loop\}\macind{lPara}
 \item $\backslash$ParaPar\{condition\}\{text loop\}\macind{ParaPar}\par
   $\backslash$lParaPar\{condition\}\{line text loop\}\macind{lParaPar}
 \item $\backslash$ParaCada\{condition\}\{text loop\}\macind{ParaCada}\par
@@ -1341,6 +1616,68 @@ Here we describe how they are obtained:
 \item \almacppp{SetKwRepeat}{Repita}{repita}{at\'{e}}%
 \end{enumerate}
 
+\subsection{Italian keywords}
+
+\begin{itemize}
+\item $\backslash$KwIng\{Ingresso\}\macind{KwIng}\par
+ $\backslash$KwUsc\{Uscita\}\macind{KwUsc}\par
+ $\backslash$KwDati\{Dati\}\macind{KwDati}\par
+ $\backslash$KwRisult\{Risultato\}\macind{KwRisult}
+\item $\backslash$KwA\macind{a}\par
+ $\backslash$KwRitorna\{ritorna\}\macind{KwRitorna}\par
+ $\backslash$Ritorna\{ritorna\}\macind{Ritorna}
+\item $\backslash$Inizio\{inside block\}\macind{Inizio}
+\item $\backslash$Ripeti\{stop condition\}\{text loop\}\macind{Ripeti}\par
+  $\backslash$lRipeti\{stop condition\}\{line of the loop\}\macind{lRipeti}
+\item $\backslash$eSea\{condition\}\{then block\}\{else block\}\macind{eSea}\par
+ $\backslash$\{condition\}\{then block\}\macind{Sea}\par
+ $\backslash$uSea\{condition\}\{then block without end\}\macind{uSea}\par
+ $\backslash$lSea\{condition\}\{then's line text\}\macind{lSea}\par
+ $\backslash$AltSe\{else block\}\macind{AltSe}\par
+ $\backslash$uAltSe\{else block without else\}\macind{uAltSe}\par
+ $\backslash$lAltSe\{else's line text\}\macind{lAltSe}\par
+ $\backslash$Altrimenti\{condition\}\{elseif block\}\macind{Altrimenti}\par
+ $\backslash$uAltrimenti\{condition\}\{elseif block without end\}\macind{uAltrimenti}\par
+ $\backslash$lAltrimenti\{condition\}\{elseif's line text\}\macind{lAltrimenti}
+\item $\backslash$Switch\{condition\}\{Switch block\}\macind{Switch}\par
+  $\backslash$Case\{a case\}\{case block\}\macind{Case}\par
+  $\backslash$uCase\{a case\}\{case block without end\}\macind{uCase}\par
+  $\backslash$lCase\{a case\}\{case's line\}\macind{lCase}\par
+  $\backslash$Other\{otherwise block\}\macind{Other}\par
+  $\backslash$lOther\{otherwise's line\}\macind{lOther}
+\item $\backslash$Per\{condition\}\{text loop\}\macind{Per}\par
+  $\backslash$lPer\{condition\}\{line text loop\}\macind{lPer}
+\item $\backslash$PerPar\{condition\}\{text loop\}\macind{PerPar}\par
+  $\backslash$lPerPar\{condition\}\{line text loop\}\macind{lPerPar}
+\item $\backslash$PerCiascun\{condition\}\{text loop\}\macind{PerCiascun}\par
+  $\backslash$lPerCiascun\{condition\}\{line text loop\}\macind{lPerCiascun}
+\item $\backslash$PerTutti\{condition\}\{text loop\}\macind{PerTutti}\par
+  $\backslash$lPerTutti\{condition\}\{line text loop\}\macind{lPerTutti}
+\item $\backslash$Finche\{stop condition\}\{text loop\}\macind{Finche}\par
+  $\backslash$lFinche\{stop condition\}\{text loop\}\macind{lFinche}
+\end{itemize}
+
+Here we describe how they are obtained:
+
+\begin{enumerate}
+\item \almacpp{SetKwInput}{KwIng}{Ingresso}
+\item \almacpp{SetKwInput}{KwUsc}{Uscita}
+\item \almacpp{SetKwInput}{KwDati}{Dati}
+\item \almacpp{SetKwInput}{KwRisult}{Risultato}
+\item \almacpp{SetKw}{KwA}{a}
+\item \almacpp{SetKw}{KwRitorna}{ritorna}
+\item \almacpp{SetKw}{Ritorna}{ritorna}
+\item \almacppp{SetKwBlock}{Inizio}{inizio}{fine}
+\item \almacppp{SetKwRepeat}{Ripeti}{ripeti}{finché}
+\item \almacphuit{SetKwIF}{Sea}{AltSe}{Altrimenti}{se}{allora}{altrimenti se}{allora}{fine se}
+\item \almacphuit{SetKwSwitch}{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{endsw}
+\item \almacpppp{SetKwFor}{Per}{per}{fai}{fine per}
+\item \almacpppp{SetKwFor}{PerPar}{per}{fai in parallelo}{fine per}
+\item \almacpppp{SetKwFor}{PerCiascun}{per ciascun}{fai}{fine per ciascun}
+\item \almacpppp{SetKwFor}{PerTutti}{per tutti i}{fai}{fine per tutti}
+\item \almacpppp{SetKwFor}{Finche}{finché}{fai}{fine finché}
+\end{enumerate}
+
 \subsection{Some Czech keywords}
 
 Here are some czech keywords, please feel free to send me the others.
@@ -1364,7 +1701,6 @@ How they are obtained:
 \end{enumerate}
 
 
-
 \section{Known bugs}\label{sec_bugs}
 
 \begin{itemize}
@@ -1372,6 +1708,200 @@ How they are obtained:
 \end{itemize}
 
 \clearpage
+\appendix
+\section*{Release notes}\label{sec:relnotes}
+
+\begin{verbatim}
+% - december 14 2009 - revision 4.01
+% * ADD : new command \SetKwHangingKw{Name}{text} (hanging indent with keyword): This creates a
+%         hanging indent much like \texttt{SetKwInput}, except that it removes the trailing `:'
+%         and does not reset numbering.
+% - november 17 2009  - revision 4.00 -
+% * CHANGE : IMPORTANT : some commands have been renamed to have consistent naming (CamlCase
+%            syntax) and old commands are no more available. If you doesn't want to change
+%            your mind or use old latex files, you can use oldcommands option to enable old
+%            commands back.
+%            text. Here are these commands:
+%            - \SetNoLine becomes \SetAlgoNoLine
+%            - \SetVline  becomes \SetAlgoVlined
+%            - \Setvlineskip  becomes \SetVlineSkip
+%            - \SetLine   becomes \SetAlgoLined
+%            - \dontprintsemicolon becomes \DontPrintSemicolon
+%            - \printsemicolon becomes \PrintSemicolon
+%            - \incmargin becomes \IncMargin
+%            - \decmargin becomes \DecMargin
+%            - \setnlskip becomes \SetNlSkip
+%            - \Setnlskip becomes \SetNlSkip
+%            - \setalcapskip becomes \SetAlCapSkip
+%            - \setalcaphskip becomes \SetAlCapHSkip
+%            - \nlSty becomes \NlSty
+%            - \Setnlsty becomes \SetNlSty
+%            - \linesnumbered becomes \LinesNumbered
+%            - \linesnotnumbered becomes \LinesNotNumbered
+%            - \linesnumberedhidden becomes \LinesNumberedHidden
+%            - \showln becomes \ShowLn
+%            - \showlnlabel becomes \ShowLnLabel
+%            - \nocaptionofalgo becomes \NoCaptionOfAlgo
+%            - \restorecaptionofalgo becomes \RestoreCaptionOfAlgo
+%            - \restylealgo becomes \RestyleAlgo
+%            - gIf macros and so on do no more exist
+% * NEW: - Compatibily with other packages improven by changing name of internal
+%          macros. Algorithm2e can now be used with arabtex for example, if this last is
+%          loaded after algorithm2e package.
+% * ADD: - OPTION endfloat: endfloat packages doesn't allow float environment inside other
+%          environment. So using it with figure option of algorithm2e makes error. This
+%          option enables a new environment algoendfloat to be used instead of algorithm
+%          environment that put algorithm at the end. algoendfloat environment make
+%          algorithm acting as endfloat figures. This option requires endfloat packages.
+% * ADD: - OPTION norelsize: starting from this release (v4.00), algorithm2e package uses
+%          relsize package in order to get relative size for lines numbers; but it seems
+%          that some rare classes (such as inform1.cls) are not compatible with relsize; to
+%          have algorithm2e working, this option makes algorithm2e not to load relsize
+%          package and go back to previous definition by using \scriptsize font for lines
+%          numbers.
+% * ADD: - OPTION onelanguage: allow, if using standard keywords listed below, to switch
+%          from one language to another without changing keywords by using appropriate
+%          language option :
+%          . KwIn, KwOut, KwData, KwResult
+%          . KwTo KwFrom
+%          . KwRet, Return
+%          . Begin
+%          . Repeat
+%          . If, ElseIf, Else
+%          . Switch, Case, Other
+%          . For, ForPar, ForEach, ForAll, While
+%          .
+% * ADD: - OPTION rightnl: put lines numbers to the right of the algorithm instead of left.
+% * ADD:   new commands \setRightLinesNumbers and \setLeftLinesNumbers which sets the lines
+%          numbers to the right or to the left of the algorithm.
+% * ADD/FIX: rules of ruled, algoruled, tworuled styles used rules of different sizes! This
+%            is now fixed. Moreover size of the rules is now controlled by a length and so
+%            can be customized by the user.
+%            \algoheightrule is the height of the rules and can be changed via \setlength
+%            \algoheightruledefault is the default height of he rules (0.8pt)
+%            \algotitleheightrule is the height of the rule that comes just after the
+%            caption in ruled and algoruled style; it can be changed via \setlength
+%            \algotitleheightruledefault is the default height of this rules (0.8pt)
+%            Thanks to Philippe Dumas who reports the bug and make the suggestion.
+% * ADD: - \SetAlgoCaptionSeparator which sets the separator between Algorithm 1 and the
+%          title. By default it's ':' and caption looks like "Algorithm 2: title" but now
+%          you can change it by using for example \SetAlgoCaptionSeparator{.} which will
+%          give "Algorithm 3. title"
+% * ADD: - \SetAlgoLongEnd and \SetAlgoShortEnd and \SetAlgoNoEnd commands which act as
+%          corresponding package options
+% * ADD: - OPTIONS italiano and slovak as new language (thanks to Roberto Posenato and
+%          Miroslav Binas) 
+% * ADD: - \AlCapSty, \AlCapNameSty, \AlCapFnt, \AlCapNameFnt and corresponding "set macro" 
+%          \SetAlCapSty, \SetAlCapNameSty, \SetAlCapFnt, \SetAlCapNameFnt which control the
+%          way caption is printed. Sty macro use command taking one parameter as argument, 
+%          Fnt macros use directly command. In Fact caption is printed as follow :
+%          \AlCapSty{\AlCapFnt Algorithm 1:}\AlCapNameSty{\AlCapNameFnt my algorithm}
+%          By default, \AlCapSty is textbf and \AlCapFnt is nothing. \AlCapNameSty keep text 
+%          as it is, and \AlCapNameFnt do nothing also.
+%          You can redefine \AlCapFnt and \AlCapNameFnt by giving macro to \Set commands. For
+%          example, you can do \SetAlCapFnt{\large} to see Algorithm printed in \large font.
+%          You can redefine \AlCapSty, \AlCapFnt, \AlCapNameSty and \AlCapNameFnt with the
+%          corresponding \Set command. For the Sty commands, you have to give in parameter
+%          name of a macro (whithout \)  which takes one argument. For example,
+%          \SetAlCapFnt{textbf} defines the default behaviour. If you want to do more
+%          complicated thing, you should define your own macro and give it to \SetAlCapFnt or
+%          \SetAlCapNameFnt. Here are two examples:
+%          - \newcommand{\mycapsty}[1]{\tiny #1}\SetAlCapNameSty{mycapsty}
+%          - \newcommand{\mycapsty}[1]{\textsl{\small #1}}\SetAlCapNameSty{mycapsty}
+%          Or you can combine the two, for the last example you can also do:
+%          \SetAlCapNameSty{textsl}\SetAlCapNameFnt{\small}
+%          Thanks to Jan Stilhammer who gives me the idea of \AlCapNameFnt.
+% * CHANGE \AlTitleFnt to match definition of all other Fnt macros and add a \AlTitleSty 
+%          macro (see below) . Now you set \AlTitleFnt by calling \SetAlTitleFnt with 
+%          directly a macro without parameter in argument:
+%          Example: \SetAlTitleFnt{\small} to set title in small font.
+% * ADD: - \AlTitleSty and \SetAlTitleSty commands to set a style for title. These commands
+%          are defined from a macro taking the text in argument, as \textbf for example. 
+%          To set the TitleSty you have to give name of the macro (without the '\') 
+%          to \SetAlTitleSty. For example \SetAlTitleSty{textbf} to set \textbf style.
+% * ADD: - new command \SetAlgorithmName{algorithmname}{list of algorithms name} which
+%          redefines name of the algorithms and the sentence list of algorithms. Second
+%          argument is the name that \autoref, from hyperref package, will use. Example:
+%          \SetAlgorithmName{Protocol}{List of protocols} if you prefer protocol than
+%          algorithm.
+% * ADD: - new \SetAlgoRefName{QXY} which change the default ref (number of the algorithm) by
+%          the name given in parameter (QXY in the example). 
+% * ADD: - new command \SetAlgoRefRelativeSize{-2} which sets the output size of refs, defined
+%          by \SetAlgoRefName, used in list of algorithms.
+% * ADD: - two dimensions to control the layout of caption in ruled, algoruled and boxruled
+%          algorithms:
+%          - interspacetitleruled (2pt by defaut) which controls the vertical space between
+%            rules and title in ruled and algoruled algorithms.
+%          - interspaceboxruled (2\lineskip by default) which controls the vertical space
+%            between rules and title in boxruled algorithms.
+%          These two dimensions can be changed by using \setlength command.
+% * ADD: - With the fix (see below) of procedure and function environments, a new feature has
+%          been added: the name of the procedure or function set in caption is automatically
+%          defined as a KwFunction and so can be used as a macro. For example, if inside a
+%          procedure environment you set \caption{myproc()}, you can use \myproc macro in you
+%          main text. Beware that the macro is only defined after the \caption!
+% * ADD: - OPTION nokwfunc to unable the new feature described above in function and
+%          procedure environment. Useful if you use name of procedure or function that cannot
+%          be a command name as a math display for example.
+% * ADD: - \SetAlgoNlRelativeSize{number} command which sets the relative size of line
+%          numbers. By default, line numbers are two size smaller than algorithm text. Use
+%          this macro to change this behavior. For example, \SetAlgoNlRelativeSize{0} sets it
+%          to the same size, \SetAlgoNlRelativeSize{-1} to one size smaller and
+%          \SetAlgoNlRelativeSize{1} to one size bigger
+% * ADD: - \SetAlgoProcName{aname} command which sets the name of Procedure printed by
+%          procedure environment (the environment prints Procedure by default). Second
+%          argument is the name that \autoref, from hyperref package, will use. 
+% * ADD: - \SetAlgoFuncName{aname} command which sets the name of Function printed by
+%          procedure environment (the environment prints Function by default). Second
+%          argument is the name that \autoref, from hyperref package, will use. 
+% * ADD: - \SetAlgoCaptionLayout{style} command which sets style of the caption; style must
+%          be the name of a macro taking one argument (the text of the caption). Examples
+%          below show how to use it:
+%          . \SetAlgoCaptionLayout{centerline} to have centered caption
+%          . \SetAlgoCaptionLayout{textbf} to have bold caption
+%          If you want to apply two styles in the same time, such as centered bold, you have
+%          to define you own macro and then use \SetAlgoCaptionLayout with its name.
+% * ADD: - OPTION procnumbered: which makes the procedure and function to be numbered as
+%          algorithm
+% * ADD: - OPTIONS tworuled and boxruled
+%          these are two new layouts: tworuled acts like ruled but doesn't put a line after
+%          caption ; boxruled surround algorithm by a box, puts caption above and add a line
+%          after caption.
+% * REMOVE: - SetKwInParam has been deleted since not useful itself because of different
+%           macros which can do the same in a better and a more consistent way as
+%           SetKwFunction or SetKw.
+% * FIX: - line number is now correctly vertically aligned with math display.
+% * FIX: - references with hyperref. No more same identifier or missing name error. BUT now
+%          you must NOT use naturalnames option of hyperref packages if you do PdfLaTeX
+% * FIX: - autoref with hyperref package (thanks to Jörg Sommer who notices the problem).
+% * FIX: - titlenumbered was not working! fixed.
+% * FIX: - Else(){} acted like uElse. Corrected.
+% * FIX: - noend management: when a block was inside another and end of block was following
+%          each other, a blank line was added: it's now corrected.
+% * FIX: - Function and Procedure environment was no more working as defined originally: the
+%          label was no more name of the procedure, it acts always as if procumbered option
+%          has been used.
+% * FIX: - line numbers had a fixed size which can be bigger than algorithm text accordingly
+%          to \AlFnt set (see also new command \SetAlgoNlRelativeSize above)
+% * FIX: - semicolon in comments when dontprintsemicolon is used.
+% * FIX: - listofalgorithms adds a vertical space before first algo of a chapter as for
+%          listoffigures or listoftables
+% * FIX: - listofalgorithms with twocolumns mode and some classes which don't allow onecolumn
+%          and so don't define \if@restonecol as prescribed in LaTeX (sig-alternate for
+%          example)
+% * FIX: - algorithm2e now works with elsart cls and some more classes.
+% * FIX: - blocks defined by SetKwBlock act now as other blocks (if for instance) and don't
+%          write end in vlined mode, instead they print a small horizontal line as required
+%          by the option.
+% * FIX: - underfull hbox warning at each end of algorithm environment removed.
+%
+% * INTERNAL CHANGE: - short end keyword are deduce from long end keyword by keeping the
+%                      first one. Allows to avoid double definition.
+% * INTERNAL CHANGE: - procedure, function and algorithm are now resolved by the same
+%          environment to avoid code duplication. 
+\end{verbatim}
+
+\clearpage
 \listofalgorithms
 \clearpage
 \printindex
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex01.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex01.tex
index 2f3cd8f37fe..083de70a63e 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex01.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex01.tex
@@ -1,4 +1,4 @@
-\SetVline
+\SetAlgoVlined
 \eIf{cond1}{
   a line\;
   a line\;
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex02.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex02.tex
index 0bd5bbde6ff..4162e95621e 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex02.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex02.tex
@@ -1,4 +1,4 @@
-\SetNoline
+\SetAlgoNoLine
 \If{cond2}{
   second if\;
   second if\;
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex05.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex05.tex
index 2a18cd54dbb..6ee3f6f29ad 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex05.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex05.tex
@@ -1,4 +1,4 @@
-\SetVline
+\SetAlgoVlined
 \lIf{cond5}{cond5 true}\;
 \uElseIf{cond51}{
   cond 5 false\;
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex06.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex06.tex
index e5b31973c8c..b9837cbd40f 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex06.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_ex06.tex
@@ -1,4 +1,4 @@
-\SetLine
+\SetAlgoLined
 \uIf{cond6}{
   cond6 is ok\;
   always ok\;
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exAlgoDisjdecomp.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exAlgoDisjdecomp.tex
new file mode 100644
index 00000000000..abb2cc3c5e4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exAlgoDisjdecomp.tex
@@ -0,0 +1,30 @@
+\IncMargin{1em}
+\begin{algorithm}
+  \SetKwData{Left}{left}\SetKwData{This}{this}\SetKwData{Up}{up}
+  \SetKwFunction{Union}{Union}\SetKwFunction{FindCompress}{FindCompress}
+  \SetKwInOut{Input}{input}\SetKwInOut{Output}{output}
+
+  \Input{A bitmap $Im$ of size $w\times l$}
+  \Output{A partition of the bitmap}
+  \BlankLine
+  \emph{special treatment of the first line}\;
+  \For{$i\leftarrow 2$ \KwTo $l$}{
+    \emph{special treatment of the first element of line $i$}\;
+    \For{$j\leftarrow 2$ \KwTo $w$}{\label{forins}
+      \Left$\leftarrow$ \FindCompress{$Im[i,j-1]$}\;
+      \Up$\leftarrow$ \FindCompress{$Im[i-1,]$}\;
+      \This$\leftarrow$ \FindCompress{$Im[i,j]$}\;
+      \If(\tcp*[h]{O(\Left,\This)==1}){\Left compatible with \This}{\label{lt}
+        \lIf{\Left $<$ \This}{\Union{\Left,\This}}\;
+        \lElse{\Union{\This,\Left}\;}
+      }
+      \If(\tcp*[f]{O(\Up,\This)==1}){\Up compatible with \This}{\label{ut}
+        \lIf{\Up $<$ \This}{\Union{\Up,\This}}\;
+        \tcp{\This is put under \Up to keep tree as flat as possible}\label{cmt}
+        \lElse{\Union{\This,\Up}}\tcp*[r]{\This linked to \Up}\label{lelse}
+      }
+    }
+    \lForEach{element $e$ of the line $i$}{\FindCompress{p}}
+  }
+  \caption{disjoint decomposition}\label{algo_disjdecomp}
+\end{algorithm}\DecMargin{1em}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exIR.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exIR.tex
new file mode 100644
index 00000000000..1415f65e915
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exIR.tex
@@ -0,0 +1,40 @@
+\begin{algorithm}
+\DontPrintSemicolon
+\KwData{$G=(X,U)$ such that $G^{tc}$ is an order.}
+\KwResult{$G'=(X,V)$ with $V\subseteq U$ such that $G'^{tc}$ is an
+interval order.}
+\Begin{
+  $V \longleftarrow U$\;
+  $S \longleftarrow \emptyset$\; 
+  \For{$x\in X$}{ 
+    $NbSuccInS(x) \longleftarrow 0$\;
+    $NbPredInMin(x) \longleftarrow 0$\;
+    $NbPredNotInMin(x) \longleftarrow |ImPred(x)|$\;
+    }
+  \For{$x \in X$}{
+    \If{$NbPredInMin(x) = 0$ {\bf and} $NbPredNotInMin(x) = 0$}{
+      $AppendToMin(x)$}
+    } 
+    \nl\While{$S \neq \emptyset$}{\label{InRes1}
+    \nlset{REM} remove $x$ from the list of $T$ of maximal index\;\label{InResR}
+    \lnl{InRes2}\While{$|S \cap  ImSucc(x)| \neq |S|$}{ 
+      \For{$ y \in  S-ImSucc(x)$}{
+        \{ remove from $V$ all the arcs $zy$ : \}\;
+        \For{$z \in  ImPred(y) \cap  Min$}{
+          remove the arc $zy$ from $V$\;
+          $NbSuccInS(z) \longleftarrow NbSuccInS(z) - 1$\;
+          move $z$ in $T$ to the list preceding its present list\;
+          \{i.e. If $z \in T[k]$, move $z$ from $T[k]$ to 
+           $T[k-1]$\}\;
+          }
+        $NbPredInMin(y) \longleftarrow 0$\;
+        $NbPredNotInMin(y) \longleftarrow 0$\;
+        $S \longleftarrow S - \{y\}$\;
+        $AppendToMin(y)$\;
+        }
+      }
+    $RemoveFromMin(x)$\;
+    }
+  }  
+\caption{IntervalRestriction\label{IR}}
+\end{algorithm}
diff --git a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exfor.tex b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exfor.tex
index 305f020d53e..d8667fc333b 100644
--- a/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exfor.tex
+++ b/Master/texmf-dist/doc/latex/algorithm2e/algorithm2e_exfor.tex
@@ -1,4 +1,4 @@
-\SetLine
+\SetAlgoLined
 \ForAll{elements of $S_1$}{
   remove an element e from $S_1$\;
   put e in the set $S_2$\;
diff --git a/Master/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty b/Master/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
index e4532553afc..4377fa87fdf 100644
--- a/Master/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
+++ b/Master/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
@@ -1,5 +1,6 @@
 %  algorithm2e.sty --- style file for algorithms
-%% Copyright 1996-2005 Christophe Fiorio
+%                      almost everything can be customized by users. See the document for more explanations
+%% Copyright 1996-2008 Christophe Fiorio
 %
 % This program may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.2
@@ -9,42 +10,360 @@
 % and version 1.2 or later is part of all distributions of LaTeX 
 % version 1999/12/01 or later.
 %
-% This program consists of the files algorithm2e.sty and algorithm2e.tex
+% This program consists of the files algorithm2e.sty and algorithm2e.tex and algorithm2e-compatibility.sty
 %  
 %  Report bugs and comments to:
-%  fiorio@lirmm.fr
+%  - algorithm2e-announce@lirmm.fr  mailing list for announcement about releases^^J%
+%  - algorithm2e-discussion@lirmm.fr mailing list for discussion about package^^J%
+%  subscribe by emailing sympa@lirmm.fr with 'subscribe <list> <firstname name>'^^J%
 %
-%  $Id: algorithm2e.sty,v 3.9 2005/10/04 12:34:52 fiorio Exp $
+%  $Id: algorithm2e.sty,v 4.1 2009/12/15 08:54:08 cfiorio Exp $
 %
 %  PACKAGES REQUIRED:
 %
-%  - float  (in contrib/supported/float)
-%  - ifthen (in base)
-%  - xspace (in packages/tools)
+%  - float   (in contrib/supported/float)
+%  - ifthen  (in base)
+%  - xspace  (in packages/tools)
+%  - relsize (in contrib/misc/relsize.sty)
 %
-%%%%%%%%%%%%%%%  Release 3.9
+%%%%%%%%%%%%%%%  Release 4.01
+%
+%   Package options: 
+%   ---------------
+%   - oldcommands                      : to use old command names
+%   - french, english, german, 
+%     portuguese, czech, italiano,
+%     slovak                           : for the name of the algorithm and some keyword code
+%   - onelanguage                      : to simply switch keyword from one language to another without changing
+%                                        keyword commands
+%   - boxed, boxruled, ruled, tworuled, 
+%     algoruled, plain                 : layout of the algorithm
+%   - algo2e                           : environment is algorithm2e instead of algorithms and \listofalgorithmes
+%                                        instead of \listofalgorithms
+%   - slide                            : to use when making slides
+%   - noline,lined,vlined              : how block are designed.
+%   - shortend, longend, noend         : short or long end keyword as endif for e.g.
+%   - linesnumbered                    : auto numbering of the algorithm's lines
+%   - linesnumberedhidden              : to hide autonumbered lines (show number on a line with \ShowLn
+%   - commentsnumbered, inoutnumbered  : to autonumber comments and inout keywords (by defaut not numbered)
+%   - rightnl                          : to have line number on the right instead of on the left as default
+%   - algonl                           : line numbers preceded by algo number
+%   - scright, scleft                  : right or left justified side comments
+%   - fillcomment, nofillcomment       : end mark of comment is flushed to the right so comments fill the line
+%   - dotocloa                         : add an entry in the toc for list of algorithms (require tocbibind package)
+%   - endfloat                         : add algoendfloat environment pushing algorithm so written to the end of document
+%   - resetcount, noresetcount         : start value of line numbers.
+%   - algopart,algochapter,algosection : algo numbering within part, chapter or section
+%   - titlenumbered,titlenotnumbered   : numbering of title set by \Titleofalgo
+%   - figure                           : algorithms are figures, numbered as figures, and put in the list of figures.
+%   - procnumbered                     : procedure or function are numbered as algorithm
+%   - nokwfunc                         : procedure or function name doens't become a command
+%   - norelsize                        : don't use relsize package (useful if it breaks the compatibily)
+%  
+%   defaults are; english,plain,resetcount,titlenotnumbered
+%
+%%%%%%%%%%%%%%
+%
+%   Short summary  
+%   -------------
+%  
+%   algorithm is an environment for writing algorithm in LaTeX2e.
+%   Almost all is customizable. You can add keywords, change style, change the layout, ...
+%   It provide macros that allow you to create differents sorts of key words, therefore a set of predefined key
+%   word is gived.
+%
+%   IT should be used as follows
+%
+%   \begin{algorithm}
+%       ...
+%       ...
+%   \end{algorithm}
+%
+%
+%   IMPORTANT : each line MUST end with \;
+%
+%   Note that if you define macros outside algorithm environment they
+%   are avaible in all the document and particulary you can use then
+%   inside all algorithms without re-define them.
+%  
+%   an example:
+%
+%   \begin{algorithm}
+%     \SetAlgoLined
+%     \KwIn{this text}
+%     \KwOut{how to write algorithm with \LaTeX2e }
+%     
+%     initialization\;
+%     \While{not at end of this document}{
+%       read current section\;
+%       \eIf{understand}{
+%         go to next section\;
+%         current section becomes this one\;
+%         }{
+%         go back to the beginning of current section\;
+%         }
+%       }
+%     \caption{How to write algorithm}
+%   \end{algorithm}
+%
+%
+%%%%%%%%%%%%%%         predefined keywords
+%
+%     \KwIn{input}
+%     \KwOut{output}
+%     \KwData{input}
+%     \KwResult{output}
+%     \KwTo                                       % a simple keyword
+%     \KwFrom                                     % a simple keyword
+%     \KwRet{[value]}
+%     \Return{[value]}
+%     \Begin{block inside}
+%     \eIf{condition}{Then Block}{Else block}     % in blocks
+%     \If{condition}{Then block}                  % in a block
+%     \uIf{condition}{Then block}                 % in a block unended
+%     \lIf{condition}{Else text}                  % on the same line
+%     \Else{inside Else}                          % in a block
+%     \lElse{Else text}                           % on the same line        
+%     \uElse{Else text}                           % in a block unended
+%     \ElseIf{inside Elseif}                      % in a block
+%     \lElseIf{Elseif text}                       % on the same line        
+%     \uElseIf{Elseif text}                       % in a block unended
+%     \Switch{Condition}{Switch block}
+%     \Case{a case}{case block}                   % in a block
+%     \lCase{a case}{case text}                   % on the same line
+%     \Other{otherwise block}                     % in a block
+%     \lOther{otherwise block}                    % on the same line
+%     \For{condition}{text loop}                  % in a block
+%     \lFor{condition}{text}                      % on the same line
+%     \ForEach{condition}{text loop}              % in a block
+%     \lForEach{condition}{text}                  % on the same line
+%     \ForPar{condition}{text loop}               % in a block
+%     \lForPar{condition}{text}                   % on the same line
+%     \While{condition}{text loop}                % in a block
+%     \lWhile{condition}{text loop}               % on the same line
+%     \Repeat{End condition}{text loop}           % in a block
+%     \lRepeat{condition}{text}                   % on the same line
+%
+%%%%%%%%%%%%%%
 %
 %   History: 
 %
+%   - december 14 2009 - revision 4.01
+%                     * ADD : new command \SetKwHangingKw{Name}{text} (hanging indent with keyword): This creates a
+%                             hanging indent much like \texttt{SetKwInput}, except that it removes the trailing `:'
+%                             and does not reset numbering.
+%
+%   - november 17 2009  - revision 4.00 -
+%
+%                      * CHANGE : IMPORTANT : some commands have been renamed to have consistent naming (CamlCase
+%                                 syntax) and old commands are no more available. If you doesn't want to change
+%                                 your mind or use old latex files, you can use oldcommands option to enable old
+%                                 commands back.
+%                                 text. Here are these commands:
+%                                 - \SetNoLine becomes \SetAlgoNoLine
+%                                 - \SetVline  becomes \SetAlgoVlined
+%                                 - \Setvlineskip  becomes \SetVlineSkip
+%                                 - \SetLine   becomes \SetAlgoLined
+%                                 - \dontprintsemicolon becomes \DontPrintSemicolon
+%                                 - \printsemicolon becomes \PrintSemicolon
+%                                 - \incmargin becomes \IncMargin
+%                                 - \decmargin becomes \DecMargin
+%                                 - \setnlskip becomes \SetNlSkip
+%                                 - \Setnlskip becomes \SetNlSkip
+%                                 - \setalcapskip becomes \SetAlCapSkip
+%                                 - \setalcaphskip becomes \SetAlCapHSkip
+%                                 - \nlSty becomes \NlSty
+%                                 - \Setnlsty becomes \SetNlSty
+%                                 - \linesnumbered becomes \LinesNumbered
+%                                 - \linesnotnumbered becomes \LinesNotNumbered
+%                                 - \linesnumberedhidden becomes \LinesNumberedHidden
+%                                 - \showln becomes \ShowLn
+%                                 - \showlnlabel becomes \ShowLnLabel
+%                                 - \nocaptionofalgo becomes \NoCaptionOfAlgo
+%                                 - \restorecaptionofalgo becomes \RestoreCaptionOfAlgo
+%                                 - \restylealgo becomes \RestyleAlgo
+%                                 - gIf macros and so on do no more exist
+%                      * NEW: - Compatibily with other packages improven by changing name of internal
+%                               macros. Algorithm2e can now be used with arabtex for example, if this last is
+%                               loaded after algorithm2e package.
+%                      * ADD: - OPTION endfloat: endfloat packages doesn't allow float environment inside other
+%                               environment. So using it with figure option of algorithm2e makes error. This
+%                               option enables a new environment algoendfloat to be used instead of algorithm
+%                               environment that put algorithm at the end. algoendfloat environment make
+%                               algorithm acting as endfloat figures. This option requires endfloat packages.
+%                      * ADD: - OPTION norelsize: starting from this release (v4.00), algorithm2e package uses
+%                               relsize package in order to get relative size for lines numbers; but it seems
+%                               that some rare classes (such as inform1.cls) are not compatible with relsize; to
+%                               have algorithm2e working, this option makes algorithm2e not to load relsize
+%                               package and go back to previous definition by using \scriptsize font for lines
+%                               numbers.
+%                      * ADD: - OPTION onelanguage: allow, if using standard keywords listed below, to switch
+%                               from one language to another without changing keywords by using appropriate
+%                               language option :
+%                               . KwIn, KwOut, KwData, KwResult
+%                               . KwTo KwFrom
+%                               . KwRet, Return
+%                               . Begin
+%                               . Repeat
+%                               . If, ElseIf, Else
+%                               . Switch, Case, Other
+%                               . For, ForPar, ForEach, ForAll, While
+%                               .
+%                      * ADD: - OPTION rightnl: put lines numbers to the right of the algorithm instead of left.
+%                      * ADD:   new commands \setRightLinesNumbers and \setLeftLinesNumbers which sets the lines
+%                               numbers to the right or to the left of the algorithm.
+%                      * ADD: - new kind of keywords : KwArray used to define arrays:
+%                               \SetKwArray{Kw}{array} defines an array keywords Kw called array and printed in
+%                               DataSty style when call with \Kw. It can be used with one argument which
+%                               denotes the element index: \Kw{n} prints array[n] with array in DataSty and n in
+%                               ArgSty.
+%                      * ADD/FIX: rules of ruled, algoruled, tworuled styles used rules of different sizes! This
+%                                 is now fixed. Moreover size of the rules is now controlled by a length and so
+%                                 can be customized by the user.
+%                                 \algoheightrule is the height of the rules and can be changed via \setlength
+%                                 \algoheightruledefault is the default height of he rules (0.8pt)
+%                                 \algotitleheightrule is the height of the rule that comes just after the
+%                                 caption in ruled and algoruled style; it can be changed via \setlength
+%                                 \algotitleheightruledefault is the default height of this rules (0.8pt)
+%                                 Thanks to Philippe Dumas who reports the bug and make the suggestion.
+%                      * ADD: - \SetAlgoCaptionSeparator which sets the separator between Algorithm 1 and the
+%                               title. By default it's ':' and caption looks like "Algorithm 2: title" but now
+%                               you can change it by using for example \SetAlgoCaptionSeparator{.} which will
+%                               give "Algorithm 3. title"
+%                      * ADD: - \SetAlgoLongEnd and \SetAlgoShortEnd and \SetAlgoNoEnd commands which act as
+%                               corresponding package options
+%                      * ADD: - OPTIONS italiano and slovak as new language (thanks to Roberto Posenato and
+%                               Miroslav Binas) 
+%                      * CHANGE: - Fnt and Sty macro to have consistent use and naming (see below)
+%                      * ADD: - \AlCapSty, \AlCapNameSty, \AlCapFnt, \AlCapNameFnt, \ProcSty, \ProcFnt,
+%                               \ProcNameSty, \ProcNameFnt, \ProcArgSty, ProcArgFnt and corresponding "set macro" 
+%                               \SetAlCapSty, \SetAlCapNameSty, \SetAlCapFnt, \SetAlCapNameFnt, \SetProcSty,
+%                               \SetProcFnt, \SetProcNameSty, \SetProcNameFnt, \SetProcArgSty, \SetProcArgFnt which
+%                               control the way caption is printed. Sty macro use command taking one parameter as
+%                               argument, Fnt macros use directly command. In Fact caption is printed as follow :
+%                               \AlCapSty{\AlCapFnt Algorithm 1:}\AlCapNameSty{\AlCapNameFnt my algorithm}
+%                               By default, \AlCapSty is textbf and \AlCapFnt is nothing. \AlCapNameSty keep text 
+%                               as it is, and \AlCapNameFnt do nothing also.
+%                               You can redefine \AlCapFnt and \AlCapNameFnt by giving macro to \Set commands. For
+%                               example, you can do \SetAlCapFnt{\large} to see Algorithm printed in \large font.
+%                               You can redefine \AlCapSty, \AlCapFnt, \AlCapNameSty and \AlCapNameFnt with the
+%                               corresponding \Set command. For the Sty commands, you have to give in parameter
+%                               name of a macro (whithout \)  which takes one argument. For example,
+%                               \SetAlCapFnt{textbf} defines the default behaviour. If you want to do more
+%                               complicated thing, you should define your own macro and give it to \SetAlCapFnt or
+%                               \SetAlCapNameFnt. Here are two examples:
+%                               - \newcommand{\mycapsty}[1]{\tiny #1}\SetAlCapNameSty{mycapsty}
+%                               - \newcommand{\mycapsty}[1]{\textsl{\small #1}}\SetAlCapNameSty{mycapsty}
+%                               Or you can combine the two, for the last example you can also do:
+%                               \SetAlCapNameSty{textsl}\SetAlCapNameFnt{\small}
+%                               Thanks to Jan Stilhammer who gives me the idea of \AlCapNameFnt.
+%                      * CHANGE \AlTitleFnt to match definition of all other Fnt macros and add a \AlTitleSty 
+%                               macro (see below) . Now you set \AlTitleFnt by calling \SetAlTitleFnt with 
+%                               directly a macro without parameter in argument:
+%                               Example: \SetAlTitleFnt{\small} to set title in small font.
+%                      * ADD: - \AlTitleSty and \SetAlTitleSty commands to set a style for title. These commands
+%                               are defined from a macro taking the text in argument, as \textbf for example. 
+%                               To set the TitleSty you have to give name of the macro (without the '\') 
+%                               to \SetAlTitleSty. For example \SetAlTitleSty{textbf} to set \textbf style.
+%                      * ADD: - new command \SetAlgorithmName{algorithmname}{list of algorithms name} which
+%                               redefines name of the algorithms and the sentence list of algorithms. Second
+%                               argument is the name that \autoref, from hyperref package, will use. Example:
+%                               \SetAlgorithmName{Protocol}{List of protocols} if you prefer protocol than
+%                               algorithm.
+%                      * ADD: - new \SetAlgoRefName{QXY} which change the default ref (number of the algorithm) by
+%                               the name given in parameter (QXY in the example). 
+%                      * ADD: - new command \SetAlgoRefRelativeSize{-2} which sets the output size of refs, defined
+%                               by \SetAlgoRefName, used in list of algorithms.
+%                      * ADD: - two dimensions to control the layout of caption in ruled, algoruled and boxruled
+%                               algorithms:
+%                               - interspacetitleruled (2pt by defaut) which controls the vertical space between
+%                                 rules and title in ruled and algoruled algorithms.
+%                               - interspaceboxruled (2\lineskip by default) which controls the vertical space
+%                                 between rules and title in boxruled algorithms.
+%                               These two dimensions can be changed by using \setlength command.
+%                      * ADD: - With the fix (see below) of procedure and function environments, a new feature has
+%                               been added: the name of the procedure or function set in caption is automatically
+%                               defined as a KwFunction and so can be used as a macro. For example, if inside a
+%                               procedure environment you set \caption{myproc()}, you can use \myproc macro in you
+%                               main text. Beware that the macro is only defined after the \caption!
+%                      * ADD: - OPTION nokwfunc to unable the new feature described above in function and
+%                               procedure environment. Useful if you use name of procedure or function that cannot
+%                               be a command name as a math display for example.
+%                      * ADD: - \SetAlgoNlRelativeSize{number} command which sets the relative size of line
+%                               numbers. By default, line numbers are two size smaller than algorithm text. Use
+%                               this macro to change this behavior. For example, \SetAlgoNlRelativeSize{0} sets it
+%                               to the same size, \SetAlgoNlRelativeSize{-1} to one size smaller and
+%                               \SetAlgoNlRelativeSize{1} to one size bigger
+%                      * ADD: - \SetAlgoProcName{aname} command which sets the name of Procedure printed by
+%                               procedure environment (the environment prints Procedure by default). Second
+%                               argument is the name that \autoref, from hyperref package, will use.
+%                      * ADD: - \SetAlgoFuncName{aname} command which sets the name of Function printed by
+%                               procedure environment (the environment prints Function by default). Second
+%                               argument is the name that \autoref, from hyperref package, will use. 
+%                      * ADD: - \SetAlgoCaptionLayout{style} command which sets style of the caption; style must
+%                               be the name of a macro taking one argument (the text of the caption). Examples
+%                               below show how to use it:
+%                               . \SetAlgoCaptionLayout{centerline} to have centered caption
+%                               . \SetAlgoCaptionLayout{textbf} to have bold caption
+%                               If you want to apply two styles in the same time, such as centered bold, you have
+%                               to define you own macro and then use \SetAlgoCaptionLayout with its name.
+%                      * ADD: - OPTION procnumbered: which makes the procedure and function to be numbered as
+%                               algorithm
+%                      * ADD: - OPTIONS tworuled and boxruled
+%                               these are two new layouts: tworuled acts like ruled but doesn't put a line after
+%                               caption ; boxruled surround algorithm by a box, puts caption above and add a line
+%                               after caption.
+%                      * REMOVE: - SetKwInParam has been deleted since not useful itself because of different
+%                                macros which can do the same in a better and a more consistent way as
+%                                SetKwFunction or SetKw.
+%                      * FIX: - line number is now correctly vertically aligned with math display.
+%                      * FIX: - references with hyperref. No more same identifier or missing name error. BUT now
+%                               you must NOT use naturalnames option of hyperref packages if you do PdfLaTeX
+%                      * FIX: - autoref with hyperref package (thanks to Jörg Sommer who notices the problem).
+%                      * FIX: - titlenumbered was not working! fixed.
+%                      * FIX: - Else(){} acted like uElse. Corrected.
+%                      * FIX: - noend management: when a block was inside another and end of block was following
+%                               each other, a blank line was added: it's now corrected.
+%                      * FIX: - Function and Procedure environment was no more working as defined originally: the
+%                               label was no more name of the procedure, it acts always as if procumbered option
+%                               has been used.
+%                      * FIX: - line numbers had a fixed size which can be bigger than algorithm text accordingly
+%                               to \AlFnt set (see also new command \SetAlgoNlRelativeSize above)
+%                      * FIX: - semicolon in comments when dontprintsemicolon is used.
+%                      * FIX: - listofalgorithms adds a vertical space before first algo of a chapter as for
+%                               listoffigures or listoftables
+%                      * FIX: - listofalgorithms with twocolumns mode and some classes which don't allow onecolumn
+%                               and so don't define \if@restonecol as prescribed in LaTeX (sig-alternate for
+%                               example)
+%                      * FIX: - algorithm2e now works with elsart cls and some more classes.
+%                      * FIX: - blocks defined by SetKwBlock act now as other blocks (if for instance) and don't
+%                               write end in vlined mode, instead they print a small horizontal line as required
+%                               by the option.
+%                      * FIX: - underfull hbox warning at each end of algorithm environment removed.
+%
+%                      * INTERNAL CHANGE: - short end keyword are deduce from long end keyword by keeping the
+%                                           first one. Allows to avoid double definition.
+%                      * INTERNAL CHANGE: - procedure, function and algorithm are now resolved by the same
+%                               environment to avoid code duplication. 
+%
 %   - October  04 2005  - revision 3.9 -
-%                      * ADD: - \setalcaphskip command which set the horizontal skip before Algorithm: in caption when
-%                               used in ruled algorithm.
-%                      * ADD: - SetAlgoInsideSkip command which allows to add an extra vertical space before and after
-%                               the core of the algorithm (ie: \SetAlgoInsideSkip{bigskip}) 
-%                      * CHANGE: - caption, when used with figure option, is no more controlled by algorithm2e package
-%                                  and so follows the exact behaviour of figures. The drawback is that you cannot change
-%                                  the typo with AlTitleFnt or CapFnt. The avantage is that if you use caption package,
-%                                  it works.
+%                      * ADD: - \setalcaphskip command which sets the horizontal skip before Algorithm: in caption
+%                               when used in ruled algorithm.
+%                      * ADD: - \SetAlgoInsideSkip command which allows to add an extra vertical space before and
+%                               after the core of the algorithm (ie: \SetAlgoInsideSkip{bigskip}) 
+%                      * CHANGE: - caption, when used with figure option, is no more controlled by algorithm2e
+%                                  package and so follows the exact behaviour of figures. The drawback is that you
+%                                  cannot change the typo with AlTitleFnt or CapFnt. The avantage is that if you
+%                                  use caption package, it works.
 %                      * FIX: - problem with numbering line and pdflatex
 %                      * FIX: - error when algorithm2e package was used with beamer and listings together
 %   - February 12 2005  - revision 3.8 -
 %                      * FIX: - extra line with noend option.
 %   - February 10 2005  - revision 3.7 -
-%                      * ADD: - sidecomment: different macros allowing to put text right after code
-%                               on the same line. They are defined in the same time comment macros
-%                               are defined with a star after the macro name. By default comments
-%                               are right justified but this can be change with appropriate option
-%                               in the macro. Ex:
+%                      * ADD: - sidecomment: different macros allowing to put text right after code on the same
+%                               line. They are defined in the same time comment macros are defined with a star
+%                               after the macro name. By default comments are right justified but this can be
+%                               change with appropriate option in the macro. Ex:
 %                               . default: \tcc*{side comment}
 %                               . same as previous: \tcc*[r]{side comment}
 %                               . left justify: \tcc*[l]{side comment}
@@ -52,57 +371,52 @@
 %                                       comment (; by default) and don't end the line.
 %                               . flushed: \tcc*[f]{side comment} same as the precedent but right
 %                                 justified
-%                      * ADD: - scright OPTION (default): right justified side comments (side comments
+%                      * ADD: - OPTION scright (default): right justified side comments (side comments
 %                               are flushed to the righr)
-%                      * ADD: - scleft OPTION: left justified side comments (side comments are
-%                               put right after the code line)
+%                      * ADD: - OPTION scleft: left justified side comments (side comments are put right after the
+%                               code line)
 %                      * ADD: - \SetSideCommentLeft acts as scleft option
 %                      * ADD: - \SetSideCommentRight acts as scright option
-%                      * ADD: - block like macro side text: all macro defining a block allows now
-%                               to put text right after key words by putting text into (). Done to
-%                               be used with sidecomment macros, but all text can be used. Ex:
-%                               \eIf(\tcc*[f]{then comment}){test}{then text}(else side text){else text}
-%                      * ADD: - fillcomment OPTION (default): end mark of comment is flushed to the
-%                               right so comments fill all the width of text
-%                      * ADD: - nofillcomment OPTION: end mark of comment is put right after the
-%                               comment
+%                      * ADD: - block like macro side text: all macro defining a block allows now to put text right
+%                               after key words by putting text into (). Done to be used with sidecomment macros,
+%                               but all text can be used. 
+%                               Ex: \eIf(\tcc*[f]{then comment}){test}{then text}(else side text){else text}
+%                      * ADD: - OPTION fillcomment (default): end mark of comment is flushed to the right so
+%                               comments fill all the width of text.
+%                      * ADD: - OPTION nofillcomment: end mark of comment is put right after the comment.
 %                      * ADD: - \SetNoFillComment acts as nofillcomment option.
 %                      * ADD: - \SetFillComment acts as fillcomment option.
-%                      * ADD: - dotocloa OPTION which adds an entry in the toc for the list of
-%                               algorithms. This option load package tocbibind if not already done
-%                               and so list of figures and list of tables are also added in the toc.
-%                               If you want to control which ones of the lists will be added in the
-%                               toc, please load package tocbibind before package algorithm and give
-%                               it the options you want.
+%                      * ADD: - OPTION dotocloa: which adds an entry in the toc for the list of algorithms. This
+%                               option load package tocbibind if not already done and so list of figures and list
+%                               of tables are also added in the toc. If you want to control which ones of the lists
+%                               will be added in the toc, please load package tocbibind before package algorithm
+%                               and give it the options you want.
 %                      * FIX: - vertical spacing for uif macro with noend option
 %                      * FIX: - all the compatibility problems between caption and other packages
-%                      * FIX: - typographical differences between list of algorithms and other lists
-%                               when in report or book 
+%                      * FIX: - typographical differences between list of algorithms and other lists  when in
+%                               report or book 
 %
 %   - January 24 2005  - revision 3.6 -
-%                      * FIX: - vertical spacing and space characters at the beginning or end of
-%                               comments.
-%                               line numbers of comments not in the nlsty.
+%                      * FIX: - vertical spacing and space characters at the beginning or end of comments.
+%                               line numbers of comments not in the NlSty.
 %                               Thanks to Arnaud Giersch for his comments and suggestions.
-%                      * FIX: - Set*Sty macro: the styles defined was not protected and was modified
-%                               by surrounding context. For example KwTo in a \For{}{} was in bold AND
-%                               italic instead of just in bold.
+%                      * FIX: - Set*Sty macro: the styles defined was not protected and was modified by surrounding
+%                               context. For example KwTo in a \For{}{} was in bold AND italic instead of just in
+%                               bold.
 %                      * FIX: - line number misplacement after \Indp
 %
 %   - January 21 2005  - revision 3.5 -
-%                      * ADD: - hidden numbering of the lines. Lines are auto-numbered but numbers
-%                               are shown only on lines you specify:
-%                               * linesnumberedhidden option or \linesnumberedhidden macro activate
-%                                 this functionnality.
-%                               * \showln and \showlnlabel{lab} macros make the number visible on
-%                                 the line. \showlnlabel{lab} allows to set a label for this line.
-%                               Thanks to Samson de Jager who makes this suggestion and provides the
-%                               macros.
+%                      * ADD: - hidden numbering of the lines. Lines are auto-numbered but numbers are shown only
+%                               on lines you specify:
+%                               * linesnumberedhidden option or \LinesNumberedHidden macro activate this
+%                                 functionnality.
+%                               * \ShowLn and \ShowLnLabel{lab} macros make the number visible on the
+%                               line. \ShowLnLabel{lab} allows to set a label for this line. 
+%                               Thanks to Samson de Jager who makes this suggestion and provides the macros.
 %                      * ADD: - \AlCapFnt and \SetAlCapFnt which allow to have a different font for
 %                               caption. Works like \AlFnt and \SetAlFnt and by default is the same.
-%                      * ADD: - \AlCapSkip skip length. This vertical space is added before caption
-%                               in plain ou boxed mode. It allows to change distance between text
-%                               and caption.
+%                      * ADD: - \AlCapSkip skip length. This vertical space is added before caption in plain ou
+%                               boxed mode. It allows to change distance between text and caption.
 %                      * FIX: - caption compatible with IEEEtran class. 
 %                      * FIX: - some vertical spacing error with \uIf macros (Thanks to Arnaud Giersch)
 %                      * FIX: - Procedure and Function: lines are also numbered like algorithms
@@ -116,7 +430,7 @@
 %                               and [naturalnames] option of hyperref package is used.
 %                      * FIX: - algorithm[H] had problem in an list environment - corrected
 %                      * FIX: - interline was not so regular in nested blocks - corrected
-%                      * ADD  - \Setvlineskip macro which set the vertical skip after the little horizontal 
+%                      * ADD  - \SetVlineSkip macro which sets the vertical skip after the little horizontal 
 %                               rule which closes a block in Vlined mode. By default 0.8ex
 %
 %   - June 11 2004     - revision 3.2 - AUTO NUMBERING LINES !!!
@@ -127,82 +441,62 @@
 %                             - commentsnumbered option: makes comments be numbered
 %                             - inoutnumbered option: makes data input/output be numbered
 %                             - \nllabel{lab} labels the line so you can cite with \ref{lab}
-%                             - \linesnumbered make the following algorithms having auto-numbered lines
+%                             - \LinesNumbered make the following algorithms having auto-numbered lines
 %                             - \linesnotnumbered make the following algorithms having no auto-numbered lines
-%                      * Change: algo2e option renames listofalgorithm in listofalgorithme
+%                      * Change: algo2e option renames listofalgorithms in listofalgorithmes
 %                      * FIX: new solution for compatibility with color package, more robust and not tricky.
 %                             Many thanks to David Carlisle for his advices
 %
 %   - June 09 2004     - revision 3.1 -
-%                      * Change: \SetKwSwitch command defines an additionnal
-%                                macro \uCase and \Case prints end
-%                      * Change: now macros SetKw* do a renewcommand if the
-%                                keyword is already defined. So you can redefine
-%                                default definition at your own convenience or
-%                                change your definition without introducing a
-%                                new macro and changing your text.
+%                      * Change: \SetKwSwitch command defines an additionnal macro \uCase and \Case prints end
+%                      * Change: now macros SetKw* do a renewcommand if the keyword is already defined. So you can
+%                                redefine default definition at your own convenience or change your definition
+%                                without introducing a new macro and changing your text.
 %                      * ADD: new macro \SetKwIF which do \SetKwIf and
 %                             \SetKwIfElseIf.The following default definition has been added:
 %                             \SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{endif}
 %                             and so you get the macros;
-%                             \If \eIf \lIf \uIf \ElseIf \uElseIf \lElseIf \Else
-%                             \uElse \lElse
-%                      * ADD: new macro \SetAlgoSkip which allow to fix the
-%                             vertical skip before and after the algorithms.
-%                             Default is smallskip, do \SetAlgoSkip{} if you
-%                             don't want an extra space or \SetAlgoSkip{medskip}
-%                             or \SetAlgoSkip{bigskip} if you want bigger space.
-%                      * ADD: macro \SetKwIf defines in addition a new macro
-%                             \uElse  (depending on wat name you
+%                             \If \eIf \lIf \uIf \ElseIf \uElseIf \lElseIf \Else \uElse \lElse
+%                      * ADD: new macro \SetAlgoSkip which allow to fix the vertical skip before and after the
+%                             algorithms. Default is smallskip, do \SetAlgoSkip{} if you don't want an extra space
+%                             or \SetAlgoSkip{medskip} or \SetAlgoSkip{bigskip} if you want bigger space.
+%                      * ADD: macro \SetKwIf defines in addition a new macro \uElse  (depending on wat name you
 %                             have given in #2 arg).
-%                      * ADD: macro \SetKwIfElseIf defines in addition a new macro
-%                             \uElse and \ugElseIf (depending on what name you
-%                             have given in #2 and #3 arg).
-%                      * Change: baseline of algorithm is now top, so two
-%                                algorithms can be put side by side.
-%                      * FIX: Compatibility with color package solved. The problem
-%                             was due to a redefinition of standard macros by color package
-%                             This solves compatibility problem with other packages
-%                             as pstcol or colortbl.
-%                             (notified by Dirk Fressmann, Antti Tarvainen and Koby Crammer)
-%                      * Fix: extra little shift to the right with boxed style
-%                             algorithm removed (notified by P. Tanovski)
+%                      * ADD: macro \SetKwIfElseIf defines in addition a new macro \uElse and \ugElseIf (depending
+%                             on what name you have given in #2 and #3 arg).
+%                      * Change: baseline of algorithm is now top, so two algorithms can be put side by side.
+%                      * FIX: Compatibility with color package solved. The problem was due to a redefinition of
+%                             standard macros by color package. This solves compatibility problem with other
+%                             packages as pstcol or colortbl. (notified by Dirk Fressmann, Antti Tarvainen and Koby
+%                             Crammer)
+%                      * Fix: extra little shift to the right with boxed style algorithm removed (notified by
+%                             P. Tanovski)
 %                      * Fix: algoln option was buggy (notified bye Jiaying Shen)
-%                      * Fix: german and portuges option didn't work due to bad
-%                             typo (notified by Martin Sievers, Thorsten Vitt
-%                             and Jeronimo Pellegrini)
+%                      * Fix: german and portuges option didn't work due to bad typo (notified by Martin Sievers,
+%                             Thorsten Vitt and Jeronimo Pellegrini)
 %                      
 %   - February 13 2004 - revision 3.0 -
-%                      * Major revision which makes the package independent from
-%                        float.sty, so now
-%                        - algorithm* works better, in particular can be used in
-%                          multicols environments
+%                      * Major revision which makes the package independent from float.sty, so now
+%                        - algorithm* works better, in particular can be used in multicols environments
 %                        - (known bug corrected)
-%                          [H] works now for all sort of environment but is
-%                          handled differently for classic environment and star
-%                          environment (algorithm, figure, procedure and
-%                          function). For star environment, H acts like for
-%                          classical figure environment, so it doesn't stay here
+%                          [H] works now for all sort of environment but is handled differently for classic
+%                          environment and star environment (algorithm, figure, procedure and function). For star
+%                          environment, H acts like for classical figure environment, so it doesn't stay here
 %                          absolutely.
 %                        - (known bug corrected)
-%                          you can use now floatflt package with algorithm
-%                          package and even with figure option. Beware that if
-%                          you want to put an algorithm inside a floatingfigure,
-%                          it cannot be floating, so [H] is required and then
-%                          figure option should not be used, since standard
-%                          figure[H] are still floating with LaTeX.
-%                      * boxruled: a new style added. Possible now since no
-%                        style no more defined by the float package.
-%                      * nocaptionofalgo: dosen't print Algorithm #: in the
-%                        caption for algorithm in ruled or algoruled style.
-%                        note: this is just documentation of a macro which was
-%                        already in the package.
+%                          you can use now floatflt package with algorithm package and even with figure
+%                          option. Beware that if you want to put an algorithm inside a floatingfigure, it cannot
+%                          be floating, so [H] is required and then figure option should not be used, since
+%                          standard figure[H] are still floating with LaTeX.
+%                      * boxruled: a new style added. Possible now since no style no more defined by the float
+%                        package.
+%                      * nocaptionofalgo: dosen't print Algorithm #: in the caption for algorithm in ruled or
+%                        algoruled style.
+%                        note: this is just documentation of a macro which was already in the package.
 %   - December 14 2003 - revision 2.52 -
 %                      * output message shorter
-%                      * french keyword macro \PourTous was missing for
-%                        longend option, it has been added.
-%                      * TitleofAlgo prints Function or Procedure in
-%                        corresponding environments.
+%                      * french keyword macro \PourTous was missing for longend option, it has been added.
+%                      * TitleofAlgo prints Function or Procedure in corresponding environments.
 %
 %   - October 27 2003  - revision 2.51 - Revision submitted to CTAN archive
 %                      * correction of a minor which make caption in procedure
@@ -214,43 +508,31 @@
 %                        don't do it for algorithm2e package, so we do it)
 %
 %   - October 17 2003  - revision 2.50 - first revision for CTAN archive
-%
-%                      * add \AlFnt and \SetAlFnt{font} macros:
-%                        \AlFnt is used at the beginning of the caption and the
-%                        body of algorithm in order to define the fonts used
-%                        for typesetting algorithms. You can use it elsewhere
-%                        you want to typeset text as algorithm. For example
-%                        you can do \SetAlFnt{\small\sf} to have algorithms
-%                        typeset in small sf font. Default is nothing so
+%                      * add \AlFnt and \SetAlFnt{font} macros: \AlFnt is used at the beginning of the caption and
+%                        the body of algorithm in order to define the fonts used for typesetting algorithms. You
+%                        can use it elsewhere you want to typeset text as algorithm. For example you can do
+%                        \SetAlFnt{\small\sf} to have algorithms typeset in small sf font. Default is nothing so
 %                        algorithm is typeset as the text of the document.
-%                      * add \AlTitleFnt{text} and \SetAlTitleFnt{font} macros:
-%                        The {Algorithm: } in the caption is typeset with
-%                        \AlTitleFnt{Algorithm:}. You can use it to have text
-%                        typeset as {Algorithm:} of captions. Default is
-%                        textbf.
-%                        Default can be redefined by \SetAlTitleFnt{font}.
-%                      * add CommentSty typo for text comment.
-%                      * add some compatibility with hyperref package (still
-%                        an error on multiply defined refs but pdf correctly
-%                        generated)
-%                      * flush text to left in order to have correct
-%                        indentation even with class as amsart which center
-%                        all figures
-%                      * add german, portugues and czech options for title of
-%                        algorithms and typo.
-%                      * add portuguese translation of predefined keywords
-%                      * add czech translation of some predefined keywords
+%                      * add \AlTitleFnt{text} and \SetAlTitleFnt{font} macros: The {Algorithm: } in the caption is
+%                        typeset with \AlTitleFnt{Algorithm:}. You can use it to have text typeset as {Algorithm:}
+%                        of captions. Default is textbf.  Default can be redefined by \SetAlTitleFnt{font}, for
+%                        example you can do \SetAlTitleFnt{emph}
+%                      * add CommentSty typo for text comment.  
+%                      * add some compatibility with hyperref package (still an error on multiply defined refs but
+%                        pdf correctly generated)
+%                      * flush text to left in order to have correct indentation even with class as amsart which
+%                        center all figures
+%                      * add german, portugues and czech options for title of algorithms and typo.
+%                      * add portuguese translation of predefined keywords * add czech translation of some
+%                        predefined keywords
 %
 %   - December 23 2002 - revision 2.40
 %                      * add some french keyword missing
-%                      * add function* and procedure* environment like
-%                        algorithme* environment: print in one column even
-%                        if twocolumn option is specified for the document.
-%                      * add a new macro \SetKwComment to define macro which
-%                        writes comments in the text. First argument is the
-%                        name of the macro, second is the text put before the
-%                        comment, third is the text put at the end of the
-%                        comment.Default are \tcc and \tcp
+%                      * add function* and procedure* environment like algorithme* environment: print in one column
+%                        even if twocolumn option is specified for the document.
+%                      * add a new macro \SetKwComment to define macro which writes comments in the text. First
+%                        argument is the name of the macro, second is the text put before the comment, third is the
+%                        text put at the end of the comment.Default are \tcc and \tcp
 %                      * add new options to change the way algo are numbered:
 %                        [algopart] algo are numbered within part (counter must exist)
 %                        [algochapter] algo are numbered within chapter
@@ -266,7 +548,7 @@
 %                        else
 %                             i;
 %                        end
-%                      * Also added \gIf \gElsIf \gElse.
+%                      * Also added \gIf \gElseIf \gElse.
 %
 %   - January 02 2001 - revision 2.38
 %                      * bugs related to the caption in procedure and function
@@ -361,132 +643,6 @@
 %   -----------
 %   - no more known bugs... all are corrected!
 %
-%%%%%%%%%%%%%%
-%
-%   Package options: 
-%   ---------------
-%   - french, english, german, portuguese, czech  : for the name of the algorithm, e.g.
-%   - boxed, boxruled, ruled, algoruled, plain    : layout of the algorithm
-%   - algo2e                           : environment is algorithm2e instead of algorithms 
-%                                        and \listofalgorithmes instead of \listofalgorithms
-%   - slide                            : to use when making slides
-%   - noline,lined,vlined              : how block are designed.
-%   - linesnumbered                    : auto numbering of the algorithm's lines
-%   - algopart,algochapter,algosection : algo numbering within part, chapter or section
-%   - titlenumbered,titlenotnumbered   : numbering of title set by \Titleofalgo
-%   - figure                           : algorithms are figures, numbered as figures, and put in the list of figures.
-%   - resetcount, noresetcount         : start value of line numbers.
-%   - algonl                           : line numbers preceded by algo number
-%   - shortend, longend, noend         : short or long end keyword as endif for e.g.
-%  
-%   defaults are; english,plain,resetcount,titlenotnumbered
-%
-%%%%%%%%%%%%%%
-%
-%   Short summary  
-%   -------------
-%  
-%   algorithm is an environment for writing algorithm in LaTeX2e
-%   It provide macros that allow you to create differents
-%   sorts of key words, therefore a set of predefined key word
-%   is gived.
-%
-%   IT should be used as follows
-%
-%   \begin{algorithm}
-%       ...
-%       ...
-%   \end{algorithm}
-%
-%
-%   IMPORTANT : each line MUST end with \;
-%
-%   Note that if you define macros outside algorithm environment they
-%   are avaible in all the document and particulary you can use then
-%   inside all algorithms without re-define them.
-%  
-%   an example:
-%
-%   \begin{algorithm}[H]
-%     \SetLine
-%     \AlgData{this text}
-%     \AlgResult{how to write algorithm with \LaTeX2e }
-%     
-%     initialization\;
-%     \While{not at end of this document}{
-%       read current section\;
-%       \eIf{understand}{
-%         go to next section\;
-%         current section becomes this one\;
-%         }{
-%         go back to the beginning of current section\;
-%         }
-%       }
-%     \caption{How to write algorithm}
-%   \end{algorithm}
-%
-%
-%%%%%%%%%%%%%%         predefined english keywords
-%
-%     \AlgData{input}
-%     \AlgResult{output}
-%     \KwIn{input}
-%     \KwOut{output}
-%     \KwData{input}
-%     \KwResult{output}
-%     \Ret{[value]}
-%     \KwTo                                       % a simple keyword
-%     \Begin{block inside}
-%     \If{condition}{Then block}                  % in a block
-%     \uIf{condition}{Then block}                 % in a block unended
-%     \Else{inside Else}                          % in a block
-%     \eIf{condition}{Then Block}{Else block}     % in blocks
-%     \lIf{condition}{Else text}                  % on the same line
-%     \lElse{Else text}                           % on the same line        
-%     \Switch{Condition}{Switch block}
-%     \Case{a case}{case block}                   % in a block
-%     \lCase{a case}{case text}                   % on the same line
-%     \Other{otherwise block}                     % in a block
-%     \lOther{otherwise block}                    % on the same line
-%     \For{condition}{text loop}                  % in a block
-%     \lFor{condition}{text}                      % on the same line
-%     \ForEach{condition}{text loop}              % in a block
-%     \lForEach{condition}{text}                  % on the same line
-%     \Repeat{End condition}{text loop}           % in a block
-%     \lRepeat{condition}{text}                   % on the same line
-%     \While{condition}{text loop}                % in a block
-%     \lWhile{condition}{text loop}               % on the same line
-%
-%
-%%%%%%%%%%%%%%        predefined french keywords
-%
-%     \AlgDonnees{input}
-%     \AlgRes{input}
-%     \Donnees{input}
-%     \Res{input}
-%     \Retour[valeur]}
-%     \Deb{block inside}
-%     \KwA                                          % un mot clef simple
-%     \Si{condition}{Bloc du Alors}                 % Dans un bloc
-%     \uSi{condition}{Bloc du Alors}                % Dans un bloc non termine
-%     \eSi{condition}{Bloc du Alors}{Bloc du Sinon} % Dans un bloc
-%     \lSi{condition}{texte du Alors}               % sur la meme ligne
-%     \lSinon{texte du Sinon}                       % sur la meme ligne
-%     \Suivant{Condition}{Bloc de l'instruction}
-%     \Cas{cas}{Bloc de ce cas}                     % Dans un bloc
-%     \lCas{cas}{Bloc de ce cas}                    % sur la meme ligne
-%     \Autres{Bloc de l'alternative}                % Dans un bloc
-%     \lAutres{Bloc de l'alternative}               % sur la meme ligne
-%     \Pour{condition}{texte de la boucle}          % Dans un bloc
-%     \lPour{condition}{texte}                      % sur la meme ligne
-%     \PourCh{condition}{texte de la boucle}          % Dans un bloc
-%     \lPourCh{condition}{texte}                      % sur la meme ligne
-%     \Repeter{End condition}{texte de la boucle}   % Dans un bloc
-%     \lRepeter{condition}{texte}                   % sur la meme ligne
-%     \Tq{condition}{texte de la boucle}            % Dans un bloc
-%     \lTq{condition}{texte de la boucle}           % sur la meme ligne
-%
-%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % for more complete informations you can see algorithm2e.tex
@@ -496,255 +652,365 @@
 %
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 %
-\ProvidesPackage{algorithm2e}[2005/10/04 v3.9 algorithms environments]
+\ProvidesPackage{algorithm2e}[2008/00/00 v3.10 algorithms environments]
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%% Initial Code %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \@makeother\*% some package redefined it as a letter (as color.sty)
+\def\@firstword#1 #2\@nil{#1}% an useful fonction
 %
 % definition of commands which can be redefined in options of the package.
 %
-\newcounter{AlgoLine}
-\setcounter{AlgoLine}{0}
-%
-\newcommand{\listalgorithmcfname}{}
-\newcommand{\algorithmcfname}{}
-\newcommand{\algocf@typo}{}
-\newcommand{\@algocf@procname}{}
-\newcommand{\@algocf@funcname}{}
-\newcommand{\@algocf@titleofalgoname}{\algorithmcfname}
+\newcounter{AlgoLine}%
+\setcounter{AlgoLine}{0}%
+%
+\newcommand{\algocf@algocfref}{\relax}%
+\newcommand{\listalgorithmcfname}{}%
+\newcommand{\algorithmcfname}{}%
+\@ifundefined{algorithmautorefname}{\newcommand{\algorithmautorefname}{algorithm}}{\renewcommand{\algorithmautorefname}{algorithm}}%
+\newcommand{\algorithmcflinename}{}%
+\newcommand{\algocf@typo}{}%
+\newcommand{\@algocf@procname}{}\newcommand{\procedureautorefname}{}%
+\newcommand{\SetAlgoProcName}[2]{\renewcommand{\@algocf@procname}{#1}\renewcommand{\procedureautorefname}{#2}}%
+\newcommand{\@algocf@funcname}{}\newcommand{\functionautorefname}{}%
+\newcommand{\SetAlgoFuncName}[2]{\renewcommand{\@algocf@funcname}{#1}\renewcommand{\functionautorefname}{#2}}%
+\newcommand{\@algocf@titleofalgoname}{\algorithmcfname}%
 \newcommand{\@algocf@algotitleofalgo}{%
-  \renewcommand{\@algocf@titleofalgoname}{\algorithmcfname}}
+  \renewcommand{\@algocf@titleofalgoname}{\algorithmcfname}}%
 \newcommand{\@algocf@proctitleofalgo}{%
-  \renewcommand{\@algocf@titleofalgoname}{\algocf@procname}}
+  \renewcommand{\@algocf@titleofalgoname}{\algocf@procname}}%
+%
+\newcommand{\algocf@style}{plain}%
+\newcommand{\@ResetCounterIfNeeded}{}%
+\newcommand{\@titleprefix}{}%
+%
+\newcommand{\algocf@numbering}[1]{\newcommand{\algocf@within}{#1}}%
+%
+\newcommand{\defaultsmacros@algo}{\algocf@defaults@shortend}%
 %
-\newcommand{\algocf@style}{plain}
-\newcommand{\@ResetCounterIfNeeded}{}
-\newcommand{\@titleprefix}{}
+\newcommand{\algocf@list}{loa}%
+\newcommand{\algocf@float}{algocf}%
 %
-\newcommand{\algocf@numbering}[1]{\newcommand{\algocf@within}{#1}}
+\newcommand{\algocf@envname}{algorithm}%
+\newcommand{\algocf@listofalgorithms}{listofalgorithms}%
 %
-\newcommand{\defaultsmacros@algo}{\algocf@defaults@shortend}
 %
-\newcommand{\algocf@list}{loa}
-\newcommand{\algocf@float}{algocf}
+%% redefine chapter so that it adds a vspace in the loa as the original does for lof and lot
+\let\algocf@original@chapter=\chapter%
+\def\chapter{\expandafter\addtocontents{loa}{\protect\addvspace{10\p@}}\algocf@original@chapter}%
 %
-\newcommand{\algocf@envname}{algorithm}
-\newcommand{\algocf@listofalgorithms}{listofalgorithms}
+%% if@restonecol is defined in article and book but some other classes don't define it and we need it, so we do
+\ifx\if@restonecol\relax\else\newif\if@restonecol\fi%
 %
 %
 %%%%%%%%%%%%%%%%%%%%%% Declaration of Options %%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-\RequirePackage{ifthen}
+\RequirePackage{ifthen}%
+%
+\newboolean{algocf@nokwfunc}\setboolean{algocf@nokwfunc}{false}%
+\DeclareOption{nokwfunc}{%
+  \setboolean{algocf@nokwfunc}{true}%
+}%
+%
+\newboolean{algocf@oldcommands}\setboolean{algocf@oldcommands}{false}%
+\DeclareOption{oldcommands}{%
+  \setboolean{algocf@oldcommands}{true}%
+}%
+%
+\newboolean{algocf@leftlinenumber}\setboolean{algocf@leftlinenumber}{true}%
+\newcommand{\setLeftLinesNumbers}{\setboolean{algocf@leftlinenumber}{true}}%
+\newcommand{\setRightLinesNumbers}{\setboolean{algocf@leftlinenumber}{false}}%
+\DeclareOption{rightnl}{%
+  \setRightLinesNumbers%
+}%
+%
+\newboolean{algocf@endfloat}\setboolean{algocf@endfloat}{false}%
+\DeclareOption{endfloat}{%
+  \setboolean{algocf@endfloat}{true}%
+  \newcounter{postalgo}\setcounter{postalgo}{0}%
+}%
+%
+\newboolean{algocf@procnumbered}\setboolean{algocf@procnumbered}{false}%
+\DeclareOption{procnumbered}{%
+  \setboolean{algocf@procnumbered}{true}%
+}%
 %
 \DeclareOption{algo2e}{%
-  \renewcommand{\algocf@envname}{algorithm2e}
-  \renewcommand{\algocf@listofalgorithms}{listofalgorithmes}
-}
+  \renewcommand{\algocf@envname}{algorithm2e}%
+  \renewcommand{\algocf@listofalgorithms}{listofalgorithmes}%
+}%
 %
-\newboolean{algocf@slide}\setboolean{algocf@slide}{false}
+\newboolean{algocf@slide}\setboolean{algocf@slide}{false}%
 \DeclareOption{slide}{%
   \setboolean{algocf@slide}{true}%
-}
+}%
 %
-\DeclareOption{figure}{
-\renewcommand{\algocf@list}{lof}
-\renewcommand{\algocf@float}{figure}
-}
+\DeclareOption{figure}{%
+\renewcommand{\algocf@list}{lof}%
+\renewcommand{\algocf@float}{figure}%
+}%
+%
+\newboolean{algocf@optonelanguage}\setboolean{algocf@optonelanguage}{false}%
+\DeclareOption{onelanguage}{\setboolean{algocf@optonelanguage}{true}}%
+%
+\newcommand{\algocf@languagechoosen}{english}%
 %
 \DeclareOption{english}{%
 \renewcommand{\listalgorithmcfname}{List of Algorithms}%
 \renewcommand{\algorithmcfname}{Algorithm}%
+\renewcommand{\algorithmautorefname}{algorithm}%
+\renewcommand{\algorithmcflinename}{line}%
 \renewcommand{\algocf@typo}{}%
-\renewcommand{\@algocf@procname}{Procedure}
-\renewcommand{\@algocf@funcname}{Function}
-}
+\renewcommand{\@algocf@procname}{Procedure}%
+\renewcommand{\@algocf@funcname}{Function}%
+\renewcommand{\procedureautorefname}{procedure}%
+\renewcommand{\functionautorefname}{function}%
+\renewcommand{\algocf@languagechoosen}{english}%
+}%
 %
 \DeclareOption{french}{%
 \renewcommand{\listalgorithmcfname}{Liste des Algorithmes}%
 \renewcommand{\algorithmcfname}{Algorithme}%
+\renewcommand{\algorithmautorefname}{algorithme}%
+\renewcommand{\algorithmcflinename}{ligne}%
 \renewcommand{\algocf@typo}{\ }%
-\renewcommand{\@algocf@procname}{Procédure}
-\renewcommand{\@algocf@funcname}{Fonction}
-}
+\renewcommand{\@algocf@procname}{Procédure}%
+\renewcommand{\@algocf@funcname}{Fonction}%
+\renewcommand{\procedureautorefname}{procédure}%
+\renewcommand{\functionautorefname}{fonction}%
+\renewcommand{\algocf@languagechoosen}{french}%
+}%
 %
 \DeclareOption{czech}{%
 \renewcommand{\listalgorithmcfname}{Seznam algoritm\v{u}}%
 \renewcommand{\algorithmcfname}{Algoritmus}%
+\renewcommand{\algorithmautorefname}{\algorithmcfname}%
+\renewcommand{\algorithmcflinename}{Radek}%
 \renewcommand{\algocf@typo}{}%
-\renewcommand{\@algocf@procname}{Procedura}
-\renewcommand{\@algocf@funcname}{Funkce}
-}
+\renewcommand{\@algocf@procname}{Procedura}%
+\renewcommand{\@algocf@funcname}{Funkce}%
+\renewcommand{\procedureautorefname}{\@algocf@procname}%
+\renewcommand{\functionautorefname}{\@algocf@funcname}%
+\renewcommand{\algocf@languagechoosen}{czech}%
+}%
 %
 \DeclareOption{german}{%
 \renewcommand{\listalgorithmcfname}{Liste der Algorithmen}%
 \renewcommand{\algorithmcfname}{Algorithmus}%
+\renewcommand{\algorithmautorefname}{\algorithmcfname}%
+\renewcommand{\algorithmcflinename}{Zeile}%
 \renewcommand{\algocf@typo}{\ }%
 \renewcommand{\@algocf@procname}{Prozedur}%
 \renewcommand{\@algocf@funcname}{Funktion}%
-}
+\renewcommand{\procedureautorefname}{\@algocf@procname}%
+\renewcommand{\functionautorefname}{\@algocf@funcname}%
+\renewcommand{\algocf@languagechoosen}{german}%
+}%
 %
-\DeclareOption{portugues}{%
+\DeclareOption{portuguese}{%
 \renewcommand{\listalgorithmcfname}{Lista de Algoritmos}%
 \renewcommand{\algorithmcfname}{Algoritmo}%
+\renewcommand{\algorithmautorefname}{algoritmo}%
+\renewcommand{\algorithmcflinename}{linha}%
 \renewcommand{\algocf@typo}{}%
-\renewcommand{\@algocf@procname}{Procedimento}
-\renewcommand{\@algocf@funcname}{Fun\c{c}\~{a}o}
-}
+\renewcommand{\@algocf@procname}{Procedimento}%
+\renewcommand{\@algocf@funcname}{Fun\c{c}\~{a}o}%
+\renewcommand{\procedureautorefname}{procedimento}%
+\renewcommand{\functionautorefname}{fun\c{c}\~{a}o}%
+\renewcommand{\algocf@languagechoosen}{portuguese}%
+}%
+%
+\DeclareOption{italiano}{%
+\renewcommand{\listalgorithmcfname}{Elenco degli algoritmi}%
+\renewcommand{\algorithmcfname}{Algoritmo}%
+\renewcommand{\algorithmautorefname}{algoritmo}%
+\renewcommand{\algorithmcflinename}{riga}%
+\renewcommand{\algocf@typo}{}%
+\renewcommand{\@algocf@procname}{Procedura}%
+\renewcommand{\@algocf@funcname}{Funzione}%
+\renewcommand{\procedureautorefname}{procedura}%
+\renewcommand{\functionautorefname}{funzione}%
+\renewcommand{\algocf@languagechoosen}{italiano}%
+}%
+\DeclareOption{slovak}{%
+\renewcommand{\listalgorithmcfname}{Zoznam algoritmov}%
+\renewcommand{\algorithmcfname}{Algoritmus}%
+\renewcommand{\algorithmautorefname}{\algorithmcfname}%
+\renewcommand{\algorithmcflinename}{Radek}%
+\renewcommand{\algocf@typo}{}%
+\renewcommand{\@algocf@procname}{Proced\'{u}ra}%
+\renewcommand{\@algocf@funcname}{Funkcia}%
+\renewcommand{\procedureautorefname}{\@algocf@procname}%
+\renewcommand{\functionautorefname}{\@algocf@funcname}%
+\renewcommand{\algocf@languagechoosen}{slovak}%
+}%
 %
 % OPTIONs plain, boxed, ruled, algoruled & boxruled
 %
-\newcommand{\algocf@style@plain}{\renewcommand{\algocf@style}{plain}}
-\newcommand{\algocf@style@boxed}{\renewcommand{\algocf@style}{boxed}}
-\newcommand{\algocf@style@ruled}{\renewcommand{\algocf@style}{ruled}}
-\newcommand{\algocf@style@algoruled}{\renewcommand{\algocf@style}{algoruled}}
-\newcommand{\algocf@style@boxruled}{\renewcommand{\algocf@style}{boxruled}}
-\newcommand{\restylealgo}[1]{\csname algocf@style@#1\endcsname}
-\DeclareOption{plain}{\algocf@style@plain}
-\DeclareOption{boxed}{\algocf@style@boxed}
-\DeclareOption{ruled}{\algocf@style@ruled}
-\DeclareOption{algoruled}{\algocf@style@algoruled}
-\DeclareOption{boxruled}{\algocf@style@boxruled}
+\newcommand{\algocf@style@plain}{\renewcommand{\algocf@style}{plain}}%
+\newcommand{\algocf@style@boxed}{\renewcommand{\algocf@style}{boxed}}%
+\newcommand{\algocf@style@ruled}{\renewcommand{\algocf@style}{ruled}}%
+\newcommand{\algocf@style@algoruled}{\renewcommand{\algocf@style}{algoruled}}%
+\newcommand{\algocf@style@boxruled}{\renewcommand{\algocf@style}{boxruled}}%
+\newcommand{\algocf@style@tworuled}{\renewcommand{\algocf@style}{tworuled}}%
+\newcommand{\RestyleAlgo}[1]{\csname algocf@style@#1\endcsname}%
+\DeclareOption{plain}{\algocf@style@plain}%
+\DeclareOption{boxed}{\algocf@style@boxed}%
+\DeclareOption{ruled}{\algocf@style@ruled}%
+\DeclareOption{algoruled}{\algocf@style@algoruled}%
+\DeclareOption{boxruled}{\algocf@style@boxruled}%
+\DeclareOption{tworuled}{\algocf@style@tworuled}%
 %
 % OPTIONs algopart,algochapter & algosection
 %
-\DeclareOption{algopart}{\algocf@numbering{part}}       %algo part numbered
-\DeclareOption{algochapter}{\algocf@numbering{chapter}} %algo chapter numbered
-\DeclareOption{algosection}{\algocf@numbering{section}} %algo section numbered
+\DeclareOption{algopart}{\algocf@numbering{part}}%       %algo part numbered
+\DeclareOption{algochapter}{\algocf@numbering{chapter}}% %algo chapter numbered
+\DeclareOption{algosection}{\algocf@numbering{section}}% %algo section numbered
 %
 % OPTIONs resetcount & noresetcount
 %
-\DeclareOption{resetcount}{\renewcommand{\@ResetCounterIfNeeded}{\setcounter{AlgoLine}{0}}}
-\DeclareOption{noresetcount}{\renewcommand{\@ResetCounterIfNeeded}{}}
+\DeclareOption{resetcount}{\renewcommand{\@ResetCounterIfNeeded}{\setcounter{AlgoLine}{0}}}%
+\DeclareOption{noresetcount}{\renewcommand{\@ResetCounterIfNeeded}{}}%
 %
 % OPTION linesnumbered
 %
-\newboolean{algocf@linesnumbered}\setboolean{algocf@linesnumbered}{false}
-\newcommand{\algocf@linesnumbered}{\relax}
+\newboolean{algocf@linesnumbered}\setboolean{algocf@linesnumbered}{false}%
+\newcommand{\algocf@linesnumbered}{\relax}%
 \DeclareOption{linesnumbered}{%
-  \setboolean{algocf@linesnumbered}{true}
-  \renewcommand{\algocf@linesnumbered}{\everypar={\nl}}
-}
+  \setboolean{algocf@linesnumbered}{true}%
+  \renewcommand{\algocf@linesnumbered}{\everypar={\nl}}%
+}%
 %
 % OPTION linesnumberedhidden
 %
 \DeclareOption{linesnumberedhidden}{%
-  \setboolean{algocf@linesnumbered}{true}
-  \renewcommand{\algocf@linesnumbered}{\everypar{\stepcounter{AlgoLine}}}
-}
+  \setboolean{algocf@linesnumbered}{true}%
+  \renewcommand{\algocf@linesnumbered}{\everypar{\stepcounter{AlgoLine}}}%
+}%
 %
 % OPTION commentsnumbered inoutnumbered
 %
-\newboolean{algocf@commentsnumbered}\setboolean{algocf@commentsnumbered}{false}
-\DeclareOption{commentsnumbered}{\setboolean{algocf@commentsnumbered}{true}}
-\newboolean{algocf@inoutnumbered}\setboolean{algocf@inoutnumbered}{false}
-\DeclareOption{inoutnumbered}{\setboolean{algocf@inoutnumbered}{true}}
+\newboolean{algocf@commentsnumbered}\setboolean{algocf@commentsnumbered}{false}%
+\DeclareOption{commentsnumbered}{\setboolean{algocf@commentsnumbered}{true}}%
+\newboolean{algocf@inoutnumbered}\setboolean{algocf@inoutnumbered}{false}%
+\DeclareOption{inoutnumbered}{\setboolean{algocf@inoutnumbered}{true}}%
 %
 % OPTIONs titlenumbered & titlenotnumbered
 %
 \DeclareOption{titlenumbered}{%
   \renewcommand{\@titleprefix}{%
-    \refstepcounter{algocf@float}%
-    \AlTitleFnt{\@algocf@titleofalgoname\
-      \expandafter\csname the\algocf@float\endcsname\algocf@typo : }}%
-}
+    \refstepcounter{\algocf@float}%
+    \AlTitleSty{\AlTitleFnt\@algocf@titleofalgoname\ \expandafter\csname the\algocf@float\endcsname\algocf@typo: }%
+  }%
+}%
 %
 \DeclareOption{titlenotnumbered}{\renewcommand{\@titleprefix}{%
-    \AlTitleFnt{\@algocf@titleofalgoname\algocf@typo : }}%
-}
-%
-% OPTIONs lined, vlined & noline
-%
-\DeclareOption{lined}{\AtBeginDocument{\SetLine}}    % \SetLine
-\DeclareOption{vlined}{\AtBeginDocument{\SetVline}}  % \SetVline
-\DeclareOption{noline}{\AtBeginDocument{\SetNoline}} % \Setnoline (default)
+    \AlTitleSty{\AlTitleFnt\@algocf@titleofalgoname\algocf@typo: }}%
+}%
 %
 % OPTIONs algonl
 % line numbered with the counter of the algorithm
 %
-\DeclareOption{algonl}{\renewcommand{\theAlgoLine}{\expandafter\csname the\algocf@float\endcsname.\arabic{AlgoLine}}}
+\DeclareOption{algonl}{\renewcommand{\theAlgoLine}{\expandafter\csname the\algocf@float\endcsname.\arabic{AlgoLine}}}%
+%
+% OPTIONs lined, vlined & noline
+%
+\DeclareOption{lined}{\AtBeginDocument{\SetAlgoLined}}%   \SetAlgoLined
+\DeclareOption{vlined}{\AtBeginDocument{\SetAlgoVlined}}% \SetAlgoVlined
+\DeclareOption{noline}{\AtBeginDocument{\SetAlgoNoLine}}%\SetAlgoNoLine (default)
 %
 % OPTIONs longend, shotend & noend
 %
-\DeclareOption{longend}{%
-\renewcommand{\defaultsmacros@algo}{\algocf@defaults@longend}}
-\DeclareOption{shortend}{%
-\renewcommand{\defaultsmacros@algo}{\algocf@defaults@shortend}}
-\newboolean{algocf@optnoend}\setboolean{algocf@optnoend}{false}
-\DeclareOption{noend}{%
-  \setboolean{algocf@optnoend}{true}%
-  \renewcommand{\defaultsmacros@algo}{\algocf@defaults@noend}}
+\DeclareOption{longend}{\AtBeginDocument{\SetAlgoLongEnd}}%  \SetAlgoLongEnd
+\DeclareOption{shortend}{\AtBeginDocument{\SetAlgoShortEnd}}%\SetAlgoShortEnd
+\DeclareOption{noend}{\AtBeginDocument{\SetAlgoNoEnd}}%      \SetAlgoNoEnd
 %
 % OPTION dotoc
 %
-\newboolean{algocf@dotocloa}\setboolean{algocf@dotocloa}{false}
+\newboolean{algocf@dotocloa}\setboolean{algocf@dotocloa}{false}%
 \DeclareOption{dotocloa}{%
-  \setboolean{algocf@dotocloa}{true}
+  \setboolean{algocf@dotocloa}{true}%
 }
 %
 % OPTION comments
 %
-\newboolean{algocf@optfillcomment}\setboolean{algocf@optfillcomment}{true}
+\newboolean{algocf@optfillcomment}\setboolean{algocf@optfillcomment}{true}%
 \DeclareOption{nofillcomment}{%
   \setboolean{algocf@optfillcomment}{false}%
-}
+}%
 \DeclareOption{fillcomment}{%
   \setboolean{algocf@optfillcomment}{true}%
-}
+}%
 %
 % OPTION sidecommments
 %
-\newboolean{algocf@scleft}\setboolean{algocf@scleft}{false}
+\newboolean{algocf@scleft}\setboolean{algocf@scleft}{false}%
 \DeclareOption{scleft}{%
   \setboolean{algocf@scleft}{true}%
-}
+}%
 \DeclareOption{sright}{% default
   \setboolean{algocf@scleft}{false}%
-}
+}%
+%
+% OPTION norelsize
+%
+\newboolean{algocf@norelsize}\setboolean{algocf@norelsize}{false}%
+\DeclareOption{norelsize}{%
+  \setboolean{algocf@norelsize}{true}%
+}%
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%% Execution of Options %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-\ExecuteOptions{english,plain,resetcount,titlenotnumbered}
+\ExecuteOptions{english,plain,resetcount,titlenotnumbered,lined,shortend}%
 %
-\ProcessOptions
+\ProcessOptions%
 %
-\@algocf@algotitleofalgo % fix name for \Titleofalgo to \algorithmcfname by default
+\@algocf@algotitleofalgo% fix name for \TitleOfAlgo to \algorithmcfname by default
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%% Package Loading %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%\RequirePackage{float}[2001/11/08]
 %
-\RequirePackage{xspace}
+\RequirePackage{xspace}%
 %
-\ifthenelse{\boolean{algocf@slide}}{\RequirePackage{color}}{}
+\ifthenelse{\boolean{algocf@endfloat}}{%
+  \RequirePackage{endfloat}%
+}{\relax}%
+%
+\ifthenelse{\boolean{algocf@norelsize}}{%
+  \newcommand{\relsize}[1]{\scriptsize}%
+}{%
+  \RequirePackage{relsize}%
+}%
+%
+\ifthenelse{\boolean{algocf@slide}}{\RequirePackage{color}}{}%
 %
 
 \AtEndOfPackage{%
   \ifthenelse{\boolean{algocf@dotocloa}}{%
     \renewcommand{\listofalgorithmes}{\tocfile{\listalgorithmcfname}{loa}}%
-  }{\relax}
-}
-
+  }{\relax}%
+}%
+%
 % if loa in toc required, load tocbibind package if not already done.
 \ifthenelse{\boolean{algocf@dotocloa}}{%
   \ifx\@tocextra\undefined%
-  \RequirePackage{tocbibind}
+  \RequirePackage{tocbibind}%
   \fi%
-}
-
+}%
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Main Part %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-\newcommand{\algocf@name}{algorithm2e}
-\newcommand{\algocf@date}{october 04 2005}
-\newcommand{\algocf@version}{Release 3.9}
-\newcommand{\algocf@id}{\algocf@version\space -- \algocf@date\space --}
+\newcommand{\algocf@name}{algorithm2e}%
+\newcommand{\algocf@date}{december 14 2009}%
+\newcommand{\algocf@version}{Release 4.01}%
+\newcommand{\algocf@id}{\algocf@version\space -- \algocf@date\space --}%
 \typeout{********************************************************^^JPackage `\algocf@name'\space\algocf@id^^J%
          - algorithm2e-announce@lirmm.fr  mailing list for announcement about releases^^J%
          - algorithm2e-discussion@lirmm.fr mailing list for discussion about package^^J%
          subscribe by emailing sympa@lirmm.fr with 'subscribe <list> <firstname name>'^^J%
-         - Author: Christophe Fiorio (fiorio@lirmm.fr)^^J********************************************************}
+         - Author: Christophe Fiorio (fiorio@lirmm.fr)^^J********************************************************}%
 %%
 %%
 %%
@@ -757,135 +1023,133 @@
    % algorithm2e package but act as Hcounter was defined. To avoid errors we
    % defined \theHalgocf ourself
 %%%%
-% \@ifundefined{theHalgocf}{\def\theHalgocf{\thealgocf}}{}%
-% \@ifundefined{theHAlgoLine}{\def\theHAlgoLine{\theAlgoLine}}{}%
-% \@ifundefined{theHalgocf}{\def\theHalgocf{\thealgocf}}{}%
-% \@ifundefined{theHAlgoLine}{\def\theHAlgoLine{\thealgocf}}{}%
-% \@ifundefined{toclevel@algocf}{\def\toclevel@algocf{0}}{}%
+%
+\@ifundefined{theHalgocf}{\def\theHalgocf{\thealgocf}}{}%
+\@ifundefined{theHAlgoLine}{\def\theHAlgoLine{\theAlgoLine}}{}%
+\@ifundefined{theHalgocfproc}{\def\theHalgocfproc{0}}{}%
+\@ifundefined{theHalgocffunc}{\def\theHalgocffunc{0}}{}%
+\@ifundefined{toclevel@algocf}{\def\toclevel@algocf{0}}{}%
+%
+% autoref from hyperref needs an autorefname, so we give it.
+\def\AlgoLineautorefname{\algorithmcflinename}%
+\def\algocfautorefname{\algorithmautorefname}%
+\def\algocfprocautorefname{\procedureautorefname}%
+\def\algocffuncautorefname{\functionautorefname}%
 %%
 %%
 %%
-\newcommand{\@defaultskiptotal}{0.5em}%\Setnlskip{0.5em}
-\newskip\skiptotal\skiptotal=0.5em%\Setnlskip{0.5em}
-\newskip\skiprule
-\newskip\skiphlne
-\newskip\skiptext
-\newskip\skiplength
-\newskip\algomargin
-\newskip\skipalgocfslide\skipalgocfslide=1em
-\newdimen\algowidth
-\newdimen\inoutsize
-\newdimen\inoutline
+\newcommand{\@defaultskiptotal}{0.5em}%
+\newskip\skiptotal\skiptotal=0.5em%
+\newskip\skiplinenumber\skiplinenumber=\hsize\advance\skiplinenumber by-\skiptotal%
+\newskip\skiprule%
+\newskip\skiphlne%
+\newskip\skiptext%
+\newskip\skiplength%
+\newskip\algomargin%
+\newskip\skipalgocfslide\skipalgocfslide=1em%
+\newdimen\algowidth%
+\newdimen\inoutsize%
+\newdimen\inoutline%
+\newdimen\interspacetitleruled\setlength{\interspacetitleruled}{2pt}%
+\newdimen\interspacealgoruled\setlength{\interspacealgoruled}{2pt}%
+\newdimen\interspacetitleboxruled\setlength{\interspacetitleboxruled}{2\lineskip}%
 %
 \newcommand{\@algoskip}{\smallskip}%
 \newcommand{\SetAlgoSkip}[1]{\renewcommand{\@algoskip}{\csname#1\endcsname}}%
 \newcommand{\@algoinsideskip}{\relax}%
 \newcommand{\SetAlgoInsideSkip}[1]{\renewcommand{\@algoinsideskip}{\csname#1\endcsname}}%
 %
-\newsavebox{\algocf@inoutbox}
-\newsavebox{\algocf@inputbox}
+\newsavebox{\algocf@inoutbox}%
+\newsavebox{\algocf@inputbox}%
 %%
 %%
-\newcommand{\arg@e}{}
-\newcommand{\arg@space}{\ }
-\newcommand{\BlankLine}{\vskip 1ex}
+\newcommand{\arg@e}{}%
+\newcommand{\arg@space}{\ }%
+\newcommand{\BlankLine}{\vskip 1ex}%
 %%
-\newcommand{\vespace}{1ex}
+\newcommand{\vespace}{1ex}%
 \newcommand{\SetInd}[2]{%
 \skiprule=#1%
 \skiptext=#2%
-\skiplength=\skiptext\advance\skiplength by \skiprule\advance\skiplength by 0.4pt}
+\skiplength=\skiptext\advance\skiplength by \skiprule\advance\skiplength by 0.4pt}%
 \SetInd{0.5em}{1em}
-\algomargin=\leftskip\advance\algomargin by \parindent
-\newcommand{\incmargin}[1]{\advance\algomargin by #1}
-\newcommand{\decmargin}[1]{\advance\algomargin by -#1}
-\newcommand{\Setnlskip}[1]{%
-\renewcommand{\@defaultskiptotal}{#1}%
-\setlength{\skiptotal}{#1}}
-\newcommand{\setnlskip}[1]{\Setnlskip{#1}}%kept for compatibility issue
+\algomargin=\leftskip\advance\algomargin by \parindent%
+\newcommand{\IncMargin}[1]{\advance\algomargin by #1}%
+\newcommand{\DecMargin}[1]{\advance\algomargin by -#1}%
+\newcommand{\SetNlSkip}[1]{%
+  \renewcommand{\@defaultskiptotal}{#1}%
+  \setlength{\skiptotal}{#1}}%
 %%
-\newskip\AlCapSkip\AlCapSkip=0ex
-\newskip\AlCapHSkip\AlCapSkip=0ex
-\newcommand{\setalcapskip}[1]{\setlength{\AlCapSkip}{#1}}
-\newcommand{\setalcaphskip}[1]{\setlength{\AlCapHSkip}{#1}}
-\setalcaphskip{.5\algomargin}
+\newskip\AlCapSkip\AlCapSkip=0ex%
+\newskip\AlCapHSkip\AlCapSkip=0ex%
+\newcommand{\SetAlCapSkip}[1]{\setlength{\AlCapSkip}{#1}}%
+\newcommand{\SetAlCapHSkip}[1]{\setlength{\AlCapHSkip}{#1}}%
+\SetAlCapHSkip{.5\algomargin}%
 %%
 %%
-\newcommand{\Indentp}[1]{\advance\leftskip by #1}
-\newcommand{\Indp}{\advance\leftskip by 1em}
-\newcommand{\Indpp}{\advance\leftskip by 0.5em}
-\newcommand{\Indm}{\advance\leftskip by -1em}
-\newcommand{\Indmm}{\advance\leftskip by -0.5em}
+\newcommand{\Indentp}[1]{\advance\leftskip by #1}%
+\newcommand{\Indp}{\advance\leftskip by 1em}%
+\newcommand{\Indpp}{\advance\leftskip by 0.5em}%
+\newcommand{\Indm}{\advance\leftskip by -1em}%
+\newcommand{\Indmm}{\advance\leftskip by -0.5em}%
 %%
 %%
 %% Line Numbering
 %%
 %%
 % number line style
-\newcommand{\nlSty}[1]{\textnormal{\textbf{#1}}}% default definition
-\newcommand{\Setnlsty}[3]{\renewcommand{\nlSty}[1]{\textnormal{\csname#1\endcsname{#2##1#3}}}}
-%
-%
-\newcommand{\algocf@nlhlabel}[2]{%
-  \immediate\write\@auxout{%
-    \string\newlabel{#1}{%
-      {#2}% current label
-      {\thepage}% page
-      {}% current label string
-%      {AlgoLine\thealgocfline.\theAlgoLine}% current Href
-      {AlgoLine\thealgocfline.\theAlgoLine}% current Href
-      {}%
-    }%
-  }%
-}
+\newcommand{\algocf@nlrelsize}{-2}\newcommand{\SetAlgoNlRelativeSize}[1]{\renewcommand{\algocf@nlrelsize}{#1}}%
+\newcommand{\NlSty}[1]{\textnormal{\textbf{\relsize{\algocf@nlrelsize}#1}}}% default definition
+\newcommand{\SetNlSty}[3]{\renewcommand{\NlSty}[1]{\textnormal{\csname#1\endcsname{\relsize{\algocf@nlrelsize}#2##1#3}}}}%
 %
 % nl definitions
 %
+\newsavebox{\algocf@nlbox}%
+\newcommand{\algocf@printnl}[1]{%
+  \ifthenelse{\boolean{algocf@leftlinenumber}}{%
+    \skiplinenumber=\skiptotal\advance\skiplinenumber by\leftskip%
+    \strut\raisebox{0pt}{\llap{\NlSty{#1}\kern\skiplinenumber}}\ignorespaces%
+  }{%
+    \sbox\algocf@nlbox{\NlSty{#1}}%
+    \skiplinenumber=\hsize\advance\skiplinenumber by-\leftskip\advance\skiplinenumber by-\skiptext%
+    \advance\skiplinenumber by\algomargin\advance\skiplinenumber by.3em\advance\skiplinenumber by-\wd\algocf@nlbox%
+    \strut\raisebox{0pt}{\rlap{\kern\skiplinenumber\NlSty{#1\ignorespaces}}}\ignorespaces%
+  }%
+}%
+\newcommand{\algocf@nl@sethref}[1]{%
+  \renewcommand{\theHAlgoLine}{\thealgocfproc.#1}%
+  \hyper@refstepcounter{AlgoLine}\gdef\@currentlabel{#1}%
+}%
 \newcommand{\nl}{%
-  \@ifundefined{href}{% if not hyperref then do a simple refstepcounter
+  \@ifundefined{hyper@refstepcounter}{% if not hyperref then do a simple refstepcounter
     \refstepcounter{AlgoLine}%
   }{% else if hyperref, do the anchor so 2 lines in two differents algorithms cannot have the same href
-%    \stepcounter{AlgoLine}\Hy@raisedlink{\hyper@anchorstart{AlgoLine\thealgocfline.\theAlgoLine}\hyper@anchorend}%
-    \stepcounter{AlgoLine}\Hy@raisedlink{\hyper@anchorstart{AlgoLine\thealgocfline.\theAlgoLine}\hyper@anchorend}%
+    \stepcounter{AlgoLine}\algocf@nl@sethref{\theAlgoLine}%
   }% now we can do the line numbering
-  \strut\vadjust{\kern-\dp\strutbox\vtop to \dp\strutbox{%
-      \baselineskip\dp\strutbox\vss\llap{\scriptsize{\nlSty{\theAlgoLine}\hskip\skiptotal}}\null}}%
+  \algocf@printnl{\theAlgoLine}%
 }%
-\newcommand{\nllabel}[1]{%
-  \@ifundefined{href}{\label{#1}}{\algocf@nlhlabel{#1}{\theAlgoLine}}}%
 %
-\newcommand{\enl}{;%
-  \@ifundefined{href}{% if not hyperref then do a simple refstepcounter
+\newcommand{\nllabel}[1]{\label{#1}}%
+%
+\newcommand{\enl}{%
+  \@ifundefined{hyper@refstepcounte}{% if not hyperref then do a simple refstepcounter
     \refstepcounter{AlgoLine}%
   }{% else if hyperref, do the anchor so 2 lines in two differents algorithms cannot have the same href
-%    \stepcounter{AlgoLine}\Hy@raisedlink{\hyper@anchorstart{AlgoLine\thealgocfline.\theAlgoLine}\hyper@anchorend}%
-    \stepcounter{AlgoLine}\Hy@raisedlink{\hyper@anchorstart{AlgoLine\thealgocfline.\theAlgoLine}\hyper@anchorend}%
+    \stepcounter{AlgoLine}\algocf@nl@sethref{\theAlgoLine}%
   }% now we can do the line numbering
-  \hfill\rlap{%
-  \scriptsize{\nlSty{\theAlgoLine}}}\par}
-\newcommand{\nlset}[1]{%
-  \hskip 0pt\llap{%
-  \scriptsize{\nlSty{#1}}\hskip\skiptotal}\ignorespaces}
-%
-% lnl definitions
-%
-\@ifundefined{href}{% if not hyperref
-  \newcommand{\lnl}[1]{\nl\label{#1}\ignorespaces}%
-}{%                   else hyperref
-  \newcommand{\lnl}[1]{\nl\algocf@nlhlabel{#1}{\theAlgoLine}\ignorespaces}%
+  \skiplinenumber=\hsize\advance\skiplinenumber by-\leftskip%
+  \strut\raisebox{0pt}{\rlap{\kern\skiplinenumber\strut\NlSty{\theAlgoLine}}}\ignorespaces%
 }
+%% nlset
+\newcommand{\nlset}[1]{%
+  \@ifundefined{hyper@refstepcounter}{\protected@edef\@currentlabel{#1}}{\algocf@nl@sethref{#1}}\algocf@printnl{#1}%
+}%
 %
-% nlset
+%% lnl definitions
+\newcommand{\lnl}[1]{\nl\label{#1}}%
 %
-\@ifundefined{href}{%
-  \newcommand{\lnlset}[2]{\nlset{#2}\protected@edef\@currentlabel{#2}\label{#1}}%
-}{%else hyperref
-  \newcommand{\lnlset}[2]{\nlset{#2}%
-    \Hy@raisedlink{\hyper@anchorstart{AlgoLine.#2}\hyper@anchorend}\algocf@nlhlabel{#1}{#2}%
-    \ignorespaces%
-  }%
-}
-
+%% lnlset
+\newcommand{\lnlset}[2]{\nlset{#2}\label{#1}}%
 %
 % set char put at end of each line
 %
@@ -894,22 +1158,23 @@
 %
 % end of line definition
 %
-\newcommand{\@endalgoln}{\algocf@endline\par}% default definition: printsemicolon
-\newcommand{\dontprintsemicolon}{\renewcommand{\@endalgoln}{\par}}
-\newcommand{\printsemicolon}{\renewcommand{\@endalgoln}{\algocf@endline\par}}
+\newcommand{\@endalgocfline}{\algocf@endline}% default definition: printsemicolon
+\newcommand{\DontPrintSemicolon}{\renewcommand{\@endalgocfline}{\relax}}%
+\newcommand{\PrintSemicolon}{\renewcommand{\@endalgocfline}{\algocf@endline}}%
+\newcommand{\@endalgoln}{\@endalgocfline\hfill\strut\par}%
 %
 % line numbering
 %
-\newcommand{\linesnumbered}{\setboolean{algocf@linesnumbered}{true}\renewcommand{\algocf@linesnumbered}{\everypar={\nl}}}
-\newcommand{\linesnotnumbered}{%
+\newcommand{\LinesNumbered}{\setboolean{algocf@linesnumbered}{true}\renewcommand{\algocf@linesnumbered}{\everypar={\nl}}}%
+\newcommand{\LinesNotNumbered}{%
   \setboolean{algocf@linesnumbered}{false}%
   \renewcommand{\algocf@linesnumbered}{\relax}%
-}
+}%
 %
-\newcommand{\linesnumberedhidden}{%
-  \setboolean{algocf@linesnumbered}{true}\renewcommand{\algocf@linesnumbered}{\everypar{\stepcounter{AlgoLine}}}}
-\newcommand{\showln}{\nlset{\theAlgoLine}\ignorespaces} % display the line number on this line (without labelling)
-\newcommand{\showlnlabel}[1]{\lnlset{#1}{\theAlgoLine}\ignorespaces} % display the line number and label this line
+\newcommand{\LinesNumberedHidden}{%
+  \setboolean{algocf@linesnumbered}{true}\renewcommand{\algocf@linesnumbered}{\everypar{\stepcounter{AlgoLine}}}}%
+\newcommand{\ShowLn}{\nlset{\theAlgoLine}\ignorespaces}% display the line number on this line (without labelling)
+\newcommand{\ShowLnLabel}[1]{\lnlset{#1}{\theAlgoLine}\ignorespaces}% display the line number and label this line
 %
 %%
 %
@@ -918,12 +1183,37 @@
 %
 % Styling text commands
 %
-\newcommand{\AlTitleFnt}[1]{\textbf{#1}\unskip}% default definition
-\newcommand{\SetAlTitleFnt}[1]{\renewcommand{\AlTitleFnt}[1]{\csname#1\endcsname{##1}\unskip}}%
 \newcommand{\AlFnt}{\relax}% default definition
 \newcommand{\SetAlFnt}[1]{\renewcommand{\AlFnt}{#1}}%
-\newcommand{\AlCapFnt}{\AlFnt{}}% default definition
+\newcommand{\AlTitleFnt}{\relax}% default definition
+\newcommand{\SetAlTitleFnt}[1]{\renewcommand{\AlTitleFnt}{#1}}%
+%
+\newcommand{\AlCapFnt}{\relax}% default definition
 \newcommand{\SetAlCapFnt}[1]{\renewcommand{\AlCapFnt}{#1}}%
+\newcommand{\AlCapNameFnt}{\relax}% default definition
+\newcommand{\SetAlCapNameFnt}[1]{\renewcommand{\AlCapNameFnt}{#1}}%
+%
+\newcommand{\ProcFnt}{\relax}% default definition
+\newcommand{\SetProcFnt}[1]{\renewcommand{\ProcFnt}{#1}}%
+\newcommand{\ProcNameFnt}{\relax}% default definition
+\newcommand{\SetProcNameFnt}[1]{\renewcommand{\ProcNameFnt}{#1}}%
+\newcommand{\ProcArgFnt}{\relax}% default definition
+\newcommand{\SetProcArgFnt}[1]{\renewcommand{\ProcArgFnt}{#1}}%
+%
+\newcommand{\AlTitleSty}[1]{\textbf{#1}\unskip}% default definition
+\newcommand{\SetAlTitleSty}[1]{\renewcommand{\AlTitleSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
+\newcommand{\AlCapSty}[1]{\textnormal{\textbf{#1}}\unskip}% default definition
+\newcommand{\SetAlCapSty}[1]{\renewcommand{\AlCapSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
+\newcommand{\AlCapNameSty}[1]{\textnormal{#1}\unskip}% default definition
+\newcommand{\SetAlCapNameSty}[1]{\renewcommand{\AlCapNameSty}[1]{\textnormal{\csname #1\endcsname{##1}}\unskip}}%
+%
+\newcommand{\ProcSty}[1]{\AlCapSty{#1}}%
+\newcommand{\SetProcSty}[1]{\renewcommand{\ProcSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
+\newcommand{\ProcNameSty}[1]{\AlCapNameSty{#1}}%
+\newcommand{\SetProcNameSty}[1]{\renewcommand{\ProcNameSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
+\newcommand{\ProcArgSty}[1]{\AlCapNameSty{#1}}%
+\newcommand{\SetProcArgSty}[1]{\renewcommand{\ProcArgSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
+%
 \newcommand{\KwSty}[1]{\textnormal{\textbf{#1}}\unskip}% default definition
 \newcommand{\SetKwSty}[1]{\renewcommand{\KwSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
 \newcommand{\ArgSty}[1]{\textnormal{\emph{#1}}\unskip}%\SetArgSty{emph}
@@ -936,80 +1226,110 @@
 \newcommand{\SetCommentSty}[1]{\renewcommand{\CommentSty}[1]{\textnormal{\csname#1\endcsname{##1}}\unskip}}%
 \newcommand{\TitleSty}[1]{#1\unskip}%\SetTitleSty{}{}
 \newcommand{\SetTitleSty}[2]{\renewcommand{\TitleSty}[1]{%
-\csname#1\endcsname{\csname#2\endcsname##1}}\unskip}
+\csname#1\endcsname{\csname#2\endcsname##1}}\unskip}%
 %
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Block basic commands
 %
-\newcommand{\al@push}[1]{\advance\skiptotal by #1\moveright #1}
-\newcommand{\al@pop}[1]{\advance\skiptotal by -#1}
-\newcommand{\al@addskiptotal}{\advance\skiptotal by 0.4pt\advance\hsize by -0.4pt}  % 0.4 pt=width of \vrule
-\newcommand{\al@subskiptotal}{\advance\skiptotal by -0.4pt\advance\hsize by 0.4pt} % 0.4 pt=width of \vrule
+\newcommand{\algocf@push}[1]{\advance\skiptotal by #1\moveright #1}%
+\newcommand{\algocf@pop}[1]{\advance\skiptotal by -#1}%
+\newcommand{\algocf@addskiptotal}{\advance\skiptotal by 0.4pt\advance\hsize by -0.4pt}% 0.4 pt=width of \vrule
+\newcommand{\algocf@subskiptotal}{\advance\skiptotal by -0.4pt\advance\hsize by 0.4pt}% 0.4 pt=width of \vrule
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% group of instructions definition
 %
 \skiphlne=.8ex%
-\newcommand{\Setvlineskip}[1]{\skiphlne=#1}
-\newcommand{\V@line}[1]{%     no vskip in between boxes but a strut to separate them, 
+\newcommand{\SetVlineSkip}[1]{\skiphlne=#1}%
+%
+%% block with a vertical line end by a little horizontal line
+\newcommand{\algocf@Vline}[1]{%     no vskip in between boxes but a strut to separate them, 
   \strut\par\nointerlineskip% then interblock space stay the same whatever is inside it
-  \al@push{\skiprule}%        move to the right before the vertical rule
+  \algocf@push{\skiprule}%        move to the right before the vertical rule
   \hbox{\vrule%
-    \vtop{\al@push{\skiptext}%move the right after the rule
-      \vtop{\al@addskiptotal\advance\hsize by -\skiplength #1}\Hlne}}\vskip\skiphlne% inside the block
-  \al@pop{\skiprule}%\al@subskiptotal% restore indentation
+    \vtop{\algocf@push{\skiptext}%move the right after the rule
+      \vtop{\algocf@addskiptotal\advance\hsize by -\skiplength #1}\Hlne}}\vskip\skiphlne% inside the block
+  \algocf@pop{\skiprule}%\algocf@subskiptotal% restore indentation
   \nointerlineskip}% no vskip after
 %
-\newcommand{\V@sline}[1]{%    no vskip in between boxes but a strut to separate them, 
+%% block with a vertical line
+\newcommand{\algocf@Vsline}[1]{%    no vskip in between boxes but a strut to separate them, 
   \strut\par\nointerlineskip% then interblock space stay the same whatever is inside it
-  \al@push{\skiprule}%        move to the right before the vertical rule
+  \algocf@push{\skiprule}%        move to the right before the vertical rule
   \hbox{\vrule%               the vertical rule
-    \vtop{\al@push{\skiptext}%move the right after the rule
-      \vtop{\al@addskiptotal\advance\hsize by -\skiplength #1}}}% inside the block
-  \al@pop{\skiprule}}% restore indentation
-  %\nointerlineskip}%  no vskip after
+    \vtop{\algocf@push{\skiptext}%move the right after the rule
+      \vtop{\algocf@addskiptotal\advance\hsize by -\skiplength #1}}}% inside the block
+  \algocf@pop{\skiprule}}% restore indentation
 %
-\newcommand{\H@lne}{\hrule height 0.4pt depth 0pt width .5em}
+\newcommand{\algocf@Hlne}{\hrule height 0.4pt depth 0pt width .5em}%
 %
-\newcommand{\No@line}[1]{%    no vskip in between boxes but a strut to separate them, 
+%% block without line
+\newcommand{\algocf@Noline}[1]{%    no vskip in between boxes but a strut to separate them, 
   \strut\par\nointerlineskip% then interblock space stay the same whatever is inside it
-  \al@push{\skiprule}%
+  \algocf@push{\skiprule}%
   \hbox{%
-    \vtop{\al@push{\skiptext}%
+    \vtop{\algocf@push{\skiptext}%
       \vtop{\advance\hsize by -\skiplength #1}}}% inside the block
-  \al@pop{\skiprule}}%
-  %\nointerlineskip}% no vskip after
+  \algocf@pop{\skiprule}%
+  % \nointerlineskip% no vskip after
+}%
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
 %% default=NoLine
 %
-\newcommand{\a@@block}[2]{\No@line{##1}\KwSty{##2}\par}
-\newcommand{\a@block}[2]{\a@@block{#1}{#2}} % this to be redefined as a@group in
-                                            % case of noend option
-\newcommand{\a@group}[1]{\No@line{##1}}
-\newcommand{\Hlne}{}
+\newcommand{\algocf@group}[1]{\algocf@Noline{##1}}% group: set of instruction depending from another (ex: then part of the If)
+\newcommand{\algocf@@block}[2]{\algocf@Noline{##1}\KwSty{##2}\par}% block: group with a end keyword.
+\newcommand{\algocf@block}[2]{\algocf@@block{#1}{#2}}% command that will be used and redefined accordingly to noend option
+\newcommand{\algocf@setBlock}{%
+  \ifthenelse{\boolean{algocf@optnoend}}{%     if no end option
+    \renewcommand{\algocf@block}[2]{\algocf@group{##1}}%     block will be a group
+  }{%                                          else
+    \renewcommand{\algocf@block}[2]{\algocf@@block{##1}{##2}}% block stays a block
+  }%
+}%
+%
+\newcommand{\Hlne}{}% little hrizontal line ending a block in vline mode
+%
+\newcommand{\@algocf@endoption}[1]{#1}%
+\newboolean{algocf@optnoend}\setboolean{algocf@optnoend}{false}%
 %
+\newcommand{\SetAlgoLongEnd}{%%%%%%%%%%%%%%%%%%%%%%%%% Long End
+  \setboolean{algocf@optnoend}{false}%
+  \renewcommand{\@algocf@endoption}[1]{##1}%
+  \algocf@setBlock}%
 %
-\newcommand{\SetNoline}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Noline
-\renewcommand{\a@@block}[2]{\No@line{##1}\KwSty{##2}\strut\par}%
-\renewcommand{\a@group}[1]{\No@line{##1}}
-\renewcommand{\Hlne}{}}
+\newcommand{\SetAlgoShortEnd}{%%%%%%%%%%%%%%%%%%%%%%%% ShortEnd
+  \setboolean{algocf@optnoend}{false}%
+  \renewcommand{\@algocf@endoption}[1]{\@firstword##1 \@nil}%
+  \algocf@setBlock}%
 %
-\newcommand{\SetVline}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Vline
-\renewcommand{\a@@block}[2]{\V@line{##1}}%
-\renewcommand{\a@group}[1]{\V@sline{##1}\strut\ignorespaces}
-\renewcommand{\Hlne}{\H@lne}}
+\newcommand{\SetAlgoNoEnd}{%%%%%%%%%%%%%%%%%%%%%%%%%%% NoEnd
+  \setboolean{algocf@optnoend}{true}%
+  \renewcommand{\@algocf@endoption}[1]{}%
+  \algocf@setBlock}%
+%
+\newcommand{\SetAlgoNoLine}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Noline
+\renewcommand{\algocf@@block}[2]{\algocf@Noline{##1}\KwSty{##2}\strut\par}%
+\renewcommand{\algocf@group}[1]{\algocf@Noline{##1}}%
+\renewcommand{\Hlne}{}}%
 %
-\newcommand{\SetLine}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Line
-\renewcommand{\a@@block}[2]{\strut\V@sline{##1}\KwSty{##2}\strut\par}% no skip after a block so garantie at least a line
-\renewcommand{\a@group}[1]{\V@sline{##1}\strut\ignorespaces}
-\renewcommand{\Hlne}{}}
+\newcommand{\SetAlgoVlined}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Vline
+\renewcommand{\algocf@@block}[2]{\algocf@Vline{##1}}%
+\renewcommand{\algocf@group}[1]{\algocf@Vsline{##1}\ifthenelse{\boolean{algocf@optnoend}}{\relax}{\strut\ignorespaces}}%
+\renewcommand{\Hlne}{\algocf@Hlne}}%
+%
+\newcommand{\SetAlgoLined}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Line
+\renewcommand{\algocf@@block}[2]{\strut\algocf@Vsline{##1}\KwSty{##2}\strut\par}% no skip after a block so garantie at least a line
+\renewcommand{\algocf@group}[1]{\algocf@Vsline{##1}\ifthenelse{\boolean{algocf@optnoend}}{\relax}{\strut\ignorespaces}}%
+\renewcommand{\Hlne}{}}%
 %
 \newcommand{\SetNothing}{%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Noline
-\renewcommand{\a@@block}[2]{\No@line{##1}\par}%
+\renewcommand{\algocf@@block}[2]{\algocf@Noline{##1}\par}%
 %\long
-\renewcommand{\a@group}[1]{\No@line{##1}}
-\renewcommand{\Hlne}{}}
+\renewcommand{\algocf@group}[1]{\algocf@Noline{##1}}%
+\renewcommand{\Hlne}{}}%
 %
 %%
 %%
@@ -1025,7 +1345,7 @@
 %
 \newcommand{\algocf@newinout}{\par\parindent=\wd\algocf@inoutbox}% to put right indentation after a \\ in the KwInOut
 \newcommand{\SetKwInOut}[2]{%
-  \sbox\algocf@inoutbox{\hbox{\KwSty{#2}\algocf@typo:\ }}%
+  \sbox\algocf@inoutbox{\KwSty{#2}\algocf@typo:}%
   \expandafter\ifx\csname InOutSizeDefined\endcsname\relax% if first time used
     \newcommand\InOutSizeDefined{}\setlength{\inoutsize}{\wd\algocf@inoutbox}%
   \else% else keep the larger dimension
@@ -1033,8 +1353,8 @@
   \fi% the dimension of the box is now defined.
   \@ifundefined{#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
   \expandafter\algocf@mkcmd\csname#1\endcsname[1]{%
-    \ifthenelse{\boolean{algocf@inoutnumbered}}{\relax}{\everypar={\relax}}
-    {\let\\\algocf@newinout\hangindent=\wd\algocf@inoutbox\hangafter=1\parbox[t]{\inoutsize}{\KwSty{#2}\hfill:\mbox{\ }}##1\par}
+    \ifthenelse{\boolean{algocf@inoutnumbered}}{\relax}{\everypar={\relax}}%
+    {\let\\\algocf@newinout\hangindent=\wd\algocf@inoutbox\hangafter=1\parbox[t]{\inoutsize}{\KwSty{#2}\algocf@typo\hfill:}~##1\par}%
     \algocf@linesnumbered% reset the numbering of the lines
   }}%
 %
@@ -1043,7 +1363,7 @@
 \newcommand{\ResetInOut}[1]{%
   \sbox\algocf@inoutbox{\hbox{\KwSty{#1}\algocf@typo:\ }}%
   \setlength{\inoutsize}{\wd\algocf@inoutbox}%
-  }
+  }%
 %
 % 
 %%%
@@ -1063,7 +1383,31 @@
   \expandafter\algocf@mkcmd\csname @#1\endcsname[1]{\DataSty{#2(}\ArgSty{##1}\DataSty{)}}%
   \expandafter\algocf@mkcmd\csname#1\endcsname{%
     \@ifnextchar\bgroup{\csname @#1\endcsname}{\DataSty{#2}\xspace}}%
-  }
+  }%
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% tallent:
+%
+% Add following macros:
+%   \SetKwHangingKw:  [kw] ------------   <= hanging determined by [kw]
+%                          ------------
+% Should act like a combination of \SetKwInput and \SetKw.
+% Based on \SetKwInput:
+%   - remove ':' at end of keyword
+%   - do not reset numbering
+%   - use separate savebox
+\newsavebox{\algocf@hangingbox}
+\newcommand{\algocf@newhanging}{\par\parindent=\wd\algocf@hangingbox}% to put right indentation after a \\ in the KwInput
+\newcommand{\SetKwHangingKw}[2]{%
+  \@ifundefined{#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
+  \expandafter\algocf@mkcmd\csname#1\endcsname[1]{%
+    \sbox\algocf@hangingbox{\hbox{\KwSty{#2}\algocf@typo\ }}%
+    {\let\\\algocf@newhanging\hangindent=\wd\algocf@hangingbox\hangafter=1\unhbox\algocf@hangingbox##1\;}%
+  }%
+}%
+%
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Comments macros
@@ -1074,10 +1418,10 @@
 % comment.
 %
 % first side comment justification
-\newcommand{\SetSideCommentLeft}{\setboolean{algocf@scleft}{true}}
-\newcommand{\SetSideCommentRight}{\setboolean{algocf@scleft}{false}}
-\newcommand{\SetNoFillComment}{\setboolean{algocf@optfillcomment}{false}}
-\newcommand{\SetFillComment}{\setboolean{algocf@optfillcomment}{true}}
+\newcommand{\SetSideCommentLeft}{\setboolean{algocf@scleft}{true}}%
+\newcommand{\SetSideCommentRight}{\setboolean{algocf@scleft}{false}}%
+\newcommand{\SetNoFillComment}{\setboolean{algocf@optfillcomment}{false}}%
+\newcommand{\SetFillComment}{\setboolean{algocf@optfillcomment}{true}}%
 %
 % next comment and side comment
 %
@@ -1094,7 +1438,7 @@
 \newboolean{algocf@altsidecomment}\setboolean{algocf@altsidecomment}{false}%
 \newcommand{\algocf@scpar}{\ifthenelse{\boolean{algocf@altsidecomment}}{\relax}{\par}}%
 \newcommand{\algocf@sclfill}{\ifthenelse{\boolean{algocf@scleft}}{\algocf@fillcomment}{\relax}}%
-\newcommand{\algocf@scrfill}{\ifthenelse{\boolean{algocf@scleft}}{\relax}{\hfill}}
+\newcommand{\algocf@scrfill}{\ifthenelse{\boolean{algocf@scleft}}{\relax}{\hfill}}%
 \newcommand{\algocf@startsidecomment}{\usebox\algocf@inputbox}%
 \newcommand{\algocf@endsidecomment}{\algocf@endmarkcomment\algocf@scpar}%
 \newcommand{\algocf@endstartsidecomment}{%
@@ -1138,13 +1482,14 @@
       \renewcommand{\algocf@endmarkcomment}{#3}%
       \let\\\algocf@endstartsidecomment%
       % here is the comment
-      \ifthenelse{\boolean{algocf@altsidecomment}}{\relax}{\algocf@endline\ }%
+      %\ifthenelse{\boolean{algocf@altsidecomment}}{\relax}{\algocf@endline\ }%
+      \ifthenelse{\boolean{algocf@altsidecomment}}{\relax}{\@endalgocfline\ }%
       \algocf@scrfill\algocf@startsidecomment\CommentSty{%
         \strut\ignorespaces##1\strut\algocf@sclfill#3}\algocf@scpar%
     }%
     \algocf@linesnumbered% reset the numbering of the lines
   }
-  \expandafter\algocf@mkcmd\csname#1\endcsname{\@ifstar{\csname algocf@#1@star\endcsname}{\csname algocf@#1\endcsname}}
+  \expandafter\algocf@mkcmd\csname#1\endcsname{\@ifstar{\csname algocf@#1@star\endcsname}{\csname algocf@#1\endcsname}}%
 }%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1156,18 +1501,30 @@
   \expandafter\algocf@mkcmd\csname @#1\endcsname[1]{\KwSty{#2} \ArgSty{##1}}%
   \expandafter\algocf@mkcmd\csname#1\endcsname{%
     \@ifnextchar\bgroup{\csname @#1\endcsname}{\KwSty{#2}\xspace}}%
-  }
+  }%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % KwFunction
 %
 \newcommand{\SetKwFunction}[2]{%
-  \@ifundefined{#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
-  \expandafter\algocf@mkcmd\csname @#1\endcsname[1]{\FuncSty{#2(}\ArgSty{##1}\FuncSty{)}}%
-  \expandafter\algocf@mkcmd\csname#1\endcsname{%
+%%% use of gdef since newcommand doesn't manage to define the macro when SetKwFunction is used in \algocf@caption@proc
+  \expandafter\gdef\csname @#1\endcsname##1{\FuncSty{#2(}\ArgSty{##1}\FuncSty{)}}%
+  \expandafter\gdef\csname#1\endcsname{%
     \@ifnextchar\bgroup{\csname @#1\endcsname}{\FuncSty{#2}\xspace}}%
-}
+}%
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% KwTab
+%
+\newcommand{\SetKwArray}[2]{%
+%%% use of gdef since newcommand doesn't manage to define the macro when SetKwFunction is used in \algocf@caption@proc
+  \expandafter\gdef\csname @#1\endcsname##1{\DataSty{#2[}\ArgSty{##1}\DataSty{]}}%
+  \expandafter\gdef\csname#1\endcsname{%
+    \@ifnextchar\bgroup{\csname @#1\endcsname}{\DataSty{#2}\xspace}}%
+}%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -1176,19 +1533,19 @@
 \newcommand{\SetKwBlock}[3]{%
 \@ifundefined{algocf@#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not? 
-\expandafter\def\csname#1\endcsname{ %Begin
-  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}
+\expandafter\def\csname#1\endcsname{%Begin
+  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#1opt\endcsname(##1)##2{% \Begin(){}
-  \KwSty{#2} ##1\a@group{##2}\KwSty{#3}%
+  \KwSty{#2} ##1\algocf@block{##2}{\@algocf@endoption{#3}}%
   \@ifnextchar({\csname algocf@#1end\endcsname}{\par}}%
 % without side text at the beginning
 \expandafter\algocf@mkcmd\csname algocf@#1\endcsname[1]{% \Begin{}
-  \KwSty{#2}\a@group{##1}\KwSty{#3}\@ifnextchar({\csname algocf@#1end\endcsname}{\par}}%
+  \KwSty{#2}\algocf@block{##1}{\@algocf@endoption{#3}}\@ifnextchar({\csname algocf@#1end\endcsname}{\par}}%
 % side text at the end
 \expandafter\def\csname algocf@#1end\endcsname(##1){% \Begin{}
   \ ##1\par}%
-}
+}%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -1198,60 +1555,59 @@
 %%%% Switch
 \@ifundefined{algocf@#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not? 
-\expandafter\def\csname#1\endcsname{ %Switch
-  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}
+\expandafter\def\csname#1\endcsname{%Switch
+  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#1opt\endcsname(##1)##2##3{% \Switch(){}{}
-  \KwSty{#4} \ArgSty{##2} \KwSty{#5} ##1\a@block{##3}{#8}}%
+  \KwSty{#4} \ArgSty{##2} \KwSty{#5} ##1\algocf@block{##3}{\@algocf@endoption{#8}}}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#1\endcsname[2]{% \Switch{}{}
-  \KwSty{#4} \ArgSty{##1} \KwSty{#5}\a@block{##2}{#8}}%
+  \KwSty{#4} \ArgSty{##1} \KwSty{#5}\algocf@block{##2}{\@algocf@endoption{#8}}}%
 % side text at the end
 \expandafter\def\csname algocf@#1end\endcsname(##1){% \Switch{}{}()
-  
-}
-
+}%
+%
 %%%% Case
 \@ifundefined{algocf@#2}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not?
-\expandafter\def\csname#2\endcsname{ %Case
-  \@ifnextchar({\csname algocf@#2opt\endcsname}{\csname algocf@#2\endcsname}}
-\expandafter\def\csname u#2\endcsname{ %uCase
-  \@ifnextchar({\csname algocf@u#2opt\endcsname}{\csname algocf@u#2\endcsname}}
-\expandafter\def\csname l#2\endcsname{ %lCase
-  \@ifnextchar({\csname algocf@l#2opt\endcsname}{\csname algocf@l#2\endcsname}}
+\expandafter\def\csname#2\endcsname{%Case
+  \@ifnextchar({\csname algocf@#2opt\endcsname}{\csname algocf@#2\endcsname}}%
+\expandafter\def\csname u#2\endcsname{%uCase
+  \@ifnextchar({\csname algocf@u#2opt\endcsname}{\csname algocf@u#2\endcsname}}%
+\expandafter\def\csname l#2\endcsname{%lCase
+  \@ifnextchar({\csname algocf@l#2opt\endcsname}{\csname algocf@l#2\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#2opt\endcsname(##1)##2##3{% \Case(){}{}
-  \KwSty{#6} \ArgSty{##2} ##1\a@block{##3}{#8}}%
+  \KwSty{#6} \ArgSty{##2} ##1\algocf@block{##3}{\@algocf@endoption{#8}}}%
 \expandafter\def\csname algocf@u#2opt\endcsname(##1)##2##3{% \uCase(){}{}
-  \KwSty{#6} \ArgSty{##2} ##1\a@group{##3}}%
+  \KwSty{#6} \ArgSty{##2} ##1\algocf@group{##3}}%
 \expandafter\def\csname algocf@l#2opt\endcsname(##1)##2##3{% \lCase(){}{}
   \KwSty{#6} \ArgSty{##2} ##3\algocf@endline\ ##1\par}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#2\endcsname[2]{% \Case{}{}
-  \KwSty{#6} \ArgSty{##1}\a@block{##2}{#8}}%
+  \KwSty{#6} \ArgSty{##1}\algocf@block{##2}{\@algocf@endoption{#8}}}%
 \expandafter\algocf@mkcmd\csname algocf@u#2\endcsname[2]{% \uCase{}{}
-  \KwSty{#6} \ArgSty{##1}\a@group{##2}}%
+  \KwSty{#6} \ArgSty{##1}\algocf@group{##2}}%
 \expandafter\algocf@mkcmd\csname algocf@l#2\endcsname[2]{% \lCase{}{}
   \KwSty{#6} \ArgSty{##1} ##2}%
 %%%% Other
 \@ifundefined{algocf@#3}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
-% side text or not? 
-\expandafter\def\csname#3\endcsname{ %Other
-  \@ifnextchar({\csname algocf@#3opt\endcsname}{\csname algocf@#3\endcsname}}
-\expandafter\def\csname l#3\endcsname{ %Other
-  \@ifnextchar({\csname algocf@l#3opt\endcsname}{\csname algocf@l#3\endcsname}}
+% side text or not?
+\expandafter\def\csname#3\endcsname{%Other
+  \@ifnextchar({\csname algocf@#3opt\endcsname}{\csname algocf@#3\endcsname}}%
+\expandafter\def\csname l#3\endcsname{%Other
+  \@ifnextchar({\csname algocf@l#3opt\endcsname}{\csname algocf@l#3\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#3opt\endcsname(##1)##2{% \Other(){}{}
-  \KwSty{#7} ##1\a@block{##2}{#8}}%
+  \KwSty{#7} ##1\algocf@block{##2}{\@algocf@endoption{#8}}}%
 \expandafter\def\csname algocf@l#3opt\endcsname(##1)##2{% \Other(){}{}
   \KwSty{#7} ##2\algocf@endline\ ##1\par}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#3\endcsname[1]{% default
-  \KwSty{#7}\a@block{##1}{#8}}% 
+  \KwSty{#7}\algocf@block{##1}{\@algocf@endoption{#8}}}%
 \expandafter\algocf@mkcmd\csname algocf@l#3\endcsname[1]{% ldefault
   \KwSty{#7} ##1}%
-}
+}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % If macros
@@ -1262,9 +1618,9 @@
 \@ifundefined{#1@ifthen}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 \expandafter\algocf@mkcmd\csname #1@ifthen\endcsname[1]{%
   \KwSty{#4} \ArgSty{##1} \KwSty{#5}}%
-\expandafter\algocf@mkcmd\csname #1@endif\endcsname[1]{\a@block{##1}{#8}}%
-\expandafter\algocf@mkcmd\csname #1@noend\endcsname[1]{\a@group{##1}}%
-\expandafter\algocf@mkcmd\csname #1@else\endcsname[1]{\a@group{##1}\KwSty{#7}}%
+\expandafter\algocf@mkcmd\csname #1@endif\endcsname[1]{\algocf@block{##1}{\@algocf@endoption{#8}}}%
+\expandafter\algocf@mkcmd\csname #1@noend\endcsname[1]{\algocf@group{##1}}%
+\expandafter\algocf@mkcmd\csname #1@else\endcsname[1]{\algocf@group{##1}\KwSty{#7}}%
 \@ifundefined{#2@elseif}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 \expandafter\algocf@mkcmd\csname #2@elseif\endcsname[1]{%
   \KwSty{#6} \ArgSty{##1} \KwSty{#5}}%
@@ -1275,7 +1631,7 @@
 \@ifundefined{algocf@#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not?
 \expandafter\def\csname#1\endcsname{%
-  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}
+  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#1opt\endcsname(##1)##2##3{% \If(){}{}
   \csname #1@ifthen\endcsname{##2} ##1\csname #1@endif\endcsname{##3}}%
@@ -1287,32 +1643,32 @@
 %
 % side text or not?
 \expandafter\def\csname e#1\endcsname{%
-  \@ifnextchar({\csname algocf@e#1opt\endcsname}{\csname algocf@e#1optif\endcsname}}
+  \@ifnextchar({\csname algocf@e#1thenopt\endcsname}{\csname algocf@e#1then\endcsname}}%
 % with side text after if
-\expandafter\def\csname algocf@e#1opt\endcsname(##1)##2##3{% \eIf()
+\expandafter\def\csname algocf@e#1thenopt\endcsname(##1)##2##3{% \eIf()
   \csname #1@ifthen\endcsname{##2} ##1\csname #1@else\endcsname{##3}%
-  \csname algocf@e#1opte\endcsname}
+  \csname algocf@e#1thenelse\endcsname}%
 % without side text after if
-\expandafter\def\csname algocf@e#1optif\endcsname##1##2{% \eIf()
+\expandafter\def\csname algocf@e#1then\endcsname##1##2{% \eIf()
   \csname #1@ifthen\endcsname{##1}\csname #1@else\endcsname{##2}%
-  \csname algocf@e#1opte\endcsname}%
+  \csname algocf@e#1thenelse\endcsname}%
 % side text after else or not ?
-\expandafter\def\csname algocf@e#1opte\endcsname{% 
-  \@ifnextchar({\csname algocf@e#1optopt\endcsname}{\csname algocf@e#1\endcsname}}
+\expandafter\def\csname algocf@e#1thenelse\endcsname{%
+  \@ifnextchar({\csname algocf@e#1elseopt\endcsname}{\csname algocf@e#1else\endcsname}}%
 % else with a side text
-\expandafter\def\csname algocf@e#1optopt\endcsname(##1)##2{% 
-  ##1\csname #1@endif\endcsname{##2}}
+\expandafter\def\csname algocf@e#1elseopt\endcsname(##1)##2{% 
+  ##1\csname #1@endif\endcsname{##2}}%
 % else without side text
-\expandafter\algocf@mkcmd\csname algocf@e#1\endcsname[1]{% 
-  \csname #1@endif\endcsname{##1}}
+\expandafter\algocf@mkcmd\csname algocf@e#1else\endcsname[1]{%
+  \csname #1@endif\endcsname{##1}}%
 %
 %%%% If then 
 %
 % side text or not?
 \expandafter\def\csname l#1\endcsname{% lif
-  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}
+  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}%
 \expandafter\def\csname u#1\endcsname{% uif
-  \@ifnextchar({\csname algocf@u#1opt\endcsname}{\csname algocf@u#1\endcsname}}
+  \@ifnextchar({\csname algocf@u#1opt\endcsname}{\csname algocf@u#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@l#1opt\endcsname(##1)##2##3{% \lIf(){}{}
   \csname #1@ifthen\endcsname{##2} ##3\algocf@endline\ ##1\par}%
@@ -1329,41 +1685,41 @@
 \@ifundefined{algocf@#2}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not?
 \expandafter\def\csname#2\endcsname{% ElseIf
-  \@ifnextchar({\csname algocf@#2opt\endcsname}{\csname algocf@#2\endcsname}}
+  \@ifnextchar({\csname algocf@#2opt\endcsname}{\csname algocf@#2\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#2opt\endcsname(##1)##2##3{% \ElseIf(){}{}
-  \csname #2@elseif\endcsname{##2} ##1\csname #1@endif\endcsname{##3}}
+  \csname #2@elseif\endcsname{##2} ##1\csname #1@endif\endcsname{##3}}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#2\endcsname[2]{% \ElseIf{}{}
-  \csname #2@elseif\endcsname{##1}\csname #1@endif\endcsname{##2}}
+  \csname #2@elseif\endcsname{##1}\csname #1@endif\endcsname{##2}}%
 %
 %%%% ElseIf
 %
 % side text or not?
 \expandafter\def\csname l#2\endcsname{% lElseIf
-  \@ifnextchar({\csname algocf@l#2opt\endcsname}{\csname algocf@l#2\endcsname}}
+  \@ifnextchar({\csname algocf@l#2opt\endcsname}{\csname algocf@l#2\endcsname}}%
 \expandafter\def\csname u#2\endcsname{% uElseIf
-  \@ifnextchar({\csname algocf@u#2opt\endcsname}{\csname algocf@u#2\endcsname}}
+  \@ifnextchar({\csname algocf@u#2opt\endcsname}{\csname algocf@u#2\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@l#2opt\endcsname(##1)##2##3{% \lElseIf(){}{}
-  \csname #2@elseif\endcsname{##2} ##3\algocf@endline\ ##1\par}
+  \csname #2@elseif\endcsname{##2} ##3\algocf@endline\ ##1\par}%
 \expandafter\def\csname algocf@u#2opt\endcsname(##1)##2##3{% \uElseIf(){}{}
-  \csname #2@elseif\endcsname{##2} ##1\csname #1@noend\endcsname{##3}}
+  \csname #2@elseif\endcsname{##2} ##1\csname #1@noend\endcsname{##3}}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@l#2\endcsname[2]{% \lElseIf{}{}
   \csname #2@elseif\endcsname{##1} ##2}%
 \expandafter\algocf@mkcmd\csname algocf@u#2\endcsname[2]{% \uElseIf{}{}
-  \csname #2@elseif\endcsname{##1}\csname #1@noend\endcsname{##2}}
+  \csname #2@elseif\endcsname{##1}\csname #1@noend\endcsname{##2}}%
 %
 %%%% Else {} endif
 %
 \@ifundefined{algocf@#3}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not?
 \expandafter\def\csname#3\endcsname{% Else
-  \@ifnextchar({\csname algocf@#3opt\endcsname}{\csname algocf@#3\endcsname}}
+  \@ifnextchar({\csname algocf@#3opt\endcsname}{\csname algocf@#3\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#3opt\endcsname(##1)##2{% \Else(){}
-  \csname #3@else\endcsname\ ##1\csname #1@endif\endcsname{##2}}
+  \csname #3@else\endcsname\ ##1\csname #1@endif\endcsname{##2}}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#3\endcsname[1]{% \Else{}
   \csname #3@else\endcsname\csname #1@endif\endcsname{##1}}%
@@ -1372,29 +1728,19 @@
 %
 % side text or not?
 \expandafter\def\csname l#3\endcsname{% lElse
-  \@ifnextchar({\csname algocf@l#3opt\endcsname}{\csname algocf@l#3\endcsname}}
+  \@ifnextchar({\csname algocf@l#3opt\endcsname}{\csname algocf@l#3\endcsname}}%
 \expandafter\def\csname u#3\endcsname{% uElse
-  \@ifnextchar({\csname algocf@u#3opt\endcsname}{\csname algocf@u#3\endcsname}}
+  \@ifnextchar({\csname algocf@u#3opt\endcsname}{\csname algocf@u#3\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@l#3opt\endcsname(##1)##2{% \lElse(){}
-  \csname #3@else\endcsname\ ##2\algocf@endline\ ##1\par}
-\expandafter\def\csname algocf@#3opt\endcsname(##1)##2{% \uElse(){}
-  \csname #3@else\endcsname\ ##1\csname #1@noend\endcsname{##2}}
+  \csname #3@else\endcsname\ ##2\algocf@endline\ ##1\par}%
+\expandafter\def\csname algocf@u#3opt\endcsname(##1)##2{% \uElse(){}
+  \csname #3@else\endcsname\ ##1\csname #1@noend\endcsname{##2}}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@l#3\endcsname[1]{% \lElse{}
   \csname #3@else\endcsname\ ##1}%
 \expandafter\algocf@mkcmd\csname algocf@u#3\endcsname[1]{% \uElse{}
   \csname #3@else\endcsname\csname #1@noend\endcsname{##1}}%
-}
-%
-% old for backward compatibility
-\newcommand{\SetKwIf}[6]{%
-  \SetKwIF{#1}{cf@dumb}{#2}{#3}{#4}{cf@dumb}{#5}{#6}%
-  \typeout{**** WARNING: SetKwIf deprecated: use SetKwIF instead*****^^J}%
-}%
-\newcommand{\SetKwIfElseIf}[8]{%
-  \SetKwIF{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
-  \typeout{**** WARNING: SetKwIfElseIf deprecated: use SetKwIF instead*****^^J}%
 }%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1404,21 +1750,21 @@
 \newcommand{\SetKwFor}[4]{%
 \@ifundefined{algocf@#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
 % side text or not? 
-\expandafter\def\csname#1\endcsname{ %For
-  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}
-\expandafter\def\csname l#1\endcsname{ %For
-  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}
+\expandafter\def\csname#1\endcsname{%For
+  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}%
+\expandafter\def\csname l#1\endcsname{%For
+  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#1opt\endcsname(##1)##2##3{% \For(){}{}
-  \KwSty{#2} \ArgSty{##2} \KwSty{#3} ##1\a@block{##3}{#4}}%
+  \KwSty{#2} \ArgSty{##2} \KwSty{#3} ##1\algocf@block{##3}{\@algocf@endoption{#4}}}%
 \expandafter\def\csname algocf@l#1opt\endcsname(##1)##2##3{% \lFor(){}{}
-  \KwSty{#2} \ArgSty{##2} \KwSty{#3} ##3\algocf@endline\ ##1\par}
+  \KwSty{#2} \ArgSty{##2} \KwSty{#3} ##3\algocf@endline\ ##1\par}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#1\endcsname[2]{% \For{}{}
-  \KwSty{#2} \ArgSty{##1} \KwSty{#3}\a@block{##2}{#4}}%
+  \KwSty{#2} \ArgSty{##1} \KwSty{#3}\algocf@block{##2}{\@algocf@endoption{#4}}}%
 \expandafter\algocf@mkcmd\csname algocf@l#1\endcsname[2]{% \lFor{}{}
   \KwSty{#2} \ArgSty{##1} \KwSty{#3} ##2}%
-}
+}%
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -1426,14 +1772,14 @@
 %
 \newcommand{\SetKwRepeat}[3]{%
 \@ifundefined{algocf@#1}{\let\algocf@mkcmd=\newcommand}{\let\algocf@mkcmd=\renewcommand}%
-% side text or not? 
-\expandafter\def\csname#1\endcsname{ %Repeat
-  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}
-\expandafter\def\csname l#1\endcsname{ %lRepeat
-  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}
+% side text or not?
+\expandafter\def\csname#1\endcsname{% Repeat
+  \@ifnextchar({\csname algocf@#1opt\endcsname}{\csname algocf@#1\endcsname}}%
+\expandafter\def\csname l#1\endcsname{% lRepeat
+  \@ifnextchar({\csname algocf@l#1opt\endcsname}{\csname algocf@l#1\endcsname}}%
 % with side text
 \expandafter\def\csname algocf@#1opt\endcsname(##1)##2##3{% \Repeat(){}{}
-  \KwSty{#2} ##1\a@group{##3}\KwSty{#3} \ArgSty{##2}%
+  \KwSty{#2} ##1\algocf@group{##3}\KwSty{#3} \ArgSty{##2}%
   \@ifnextchar({\csname algocf@#1optopt\endcsname}{\@endalgoln}%
 }%
 \expandafter\def\csname algocf@#1optopt\endcsname(##1){% \Repeat(){}{}()
@@ -1442,12 +1788,12 @@
   \KwSty{#2} ##3 \KwSty{#3} \ArgSty{##2}\algocf@endline\ ##1\par}%
 % without side text
 \expandafter\algocf@mkcmd\csname algocf@#1\endcsname[2]{% \Repeat{}{}
-  \KwSty{#2}\a@group{##2}\KwSty{#3} \ArgSty{##1}
+  \KwSty{#2}\algocf@group{##2}\KwSty{#3} \ArgSty{##1}%
   \@ifnextchar({\csname algocf@#1optopt\endcsname}{\@endalgoln}%
 }%
 \expandafter\algocf@mkcmd\csname algocf@l#1\endcsname[2]{% \lRepeat{}{}
   \KwSty{#2} ##2 \KwSty{#3} \ArgSty{##1}}%
-}
+}%
 %
 % 
 %
@@ -1463,7 +1809,14 @@
 % #2 is the text given in argument by the user in the \caption macro
 %
 %%%%% text of caption
-\newcommand{\algocf@captiontext}[2]{#1\algocf@typo: \AlCapFnt{}#2} % text of caption
+\newcommand{\algocf@captionlayout}[1]{#1}%
+\newcommand{\SetAlgoCaptionLayout}[1]{%
+  \renewcommand{\algocf@captionlayout}[1]{\csname #1\endcsname{##1}}}%
+\newcommand{\algocf@capseparator}{:}%
+\newcommand{\SetAlgoCaptionSeparator}[1]{\renewcommand{\algocf@capseparator}{#1}}%
+\newcommand{\algocf@captiontext}[2]{%
+  \algocf@captionlayout{\AlCapSty{\AlCapFnt #1\algocf@typo\algocf@capseparator}\nobreakspace%
+    \AlCapNameSty{\AlCapNameFnt{}#2}}}% text of caption
 %
 %%%%% default caption of algorithm: used if no specific style caption is defined
 \newcommand{\algocf@makecaption}[2]{%
@@ -1477,146 +1830,209 @@
     \hbox to\hsize{\hfil\box\@tempboxa\hfil}% else caption is centered
   \fi%
   \addtolength{\hsize}{-\algomargin}%
-}
+}%
 %
-\newsavebox\algocf@capbox
+\newsavebox\algocf@capbox%
 \newcommand{\algocf@makecaption@plain}[2]{%
   \global\sbox\algocf@capbox{\algocf@makecaption{#1}{#2}}}%
 \newcommand{\algocf@makecaption@boxed}[2]{%
   \addtolength{\hsize}{-\algomargin}%
-  \global\sbox\algocf@capbox{\algocf@makecaption{#1}{#2}}
+  \global\sbox\algocf@capbox{\algocf@makecaption{#1}{#2}}%
   \addtolength{\hsize}{\algomargin}%
  }%
 %
+\newcommand{\algocf@makecaption@tworuled}[2]{\algocf@makecaption@ruled{#1}{#2}}%
 \newcommand{\algocf@makecaption@algoruled}[2]{\algocf@makecaption@ruled{#1}{#2}}%
 \newcommand{\algocf@makecaption@boxruled}[2]{\algocf@makecaption@ruled{#1}{#2}}%
 \newcommand{\algocf@makecaption@ruled}[2]{%
   \global\sbox\algocf@capbox{\hskip\AlCapHSkip% .5\algomargin%
     \parbox[t]{\hsize}{\algocf@captiontext{#1}{#2}}}% then caption is not centered
-}
+}%
 %
+\newlength{\algoheightruledefault}\setlength{\algoheightruledefault}{0.8pt}%
+\newlength{\algoheightrule}\setlength{\algoheightrule}{\algoheightruledefault}%
+\newlength{\algotitleheightruledefault}\setlength{\algotitleheightruledefault}{0.8pt}%
+\newlength{\algotitleheightrule}\setlength{\algotitleheightrule}{\algotitleheightruledefault}%
 \newcommand{\algocf@caption@plain}{\vskip\AlCapSkip\box\algocf@capbox}%
 \newcommand{\algocf@caption@boxed}{\vskip\AlCapSkip\box\algocf@capbox}%
-\newcommand{\algocf@caption@ruled}{\box\algocf@capbox\kern2pt\hrule height.8pt depth0pt\kern2pt}%
+\newcommand{\algocf@caption@ruled}{\box\algocf@capbox\kern\interspacetitleruled\hrule  height\algotitleheightrule depth0pt\kern\interspacealgoruled}%
+\newcommand{\algocf@caption@tworuled}{\box\algocf@capbox\kern\interspacetitleruled}%
 \newcommand{\algocf@caption@algoruled}{\algocf@caption@ruled}%
 \newcommand{\algocf@caption@boxruled}{%
   \addtolength{\hsize}{-0.8pt}%
   \hbox to\hsize{%
     \vrule%\hskip-0.35pt%
     \vbox{%
-      \hrule\vskip2\lineskip%
-      \hbox to\hsize{\unhbox\algocf@capbox\hfill}\vskip2\lineskip%
+      \hrule\vskip\interspacetitleboxruled%
+      \hbox to\hsize{\unhbox\algocf@capbox\hfill}\vskip\interspacetitleboxruled%
     }% 
     %\hskip-0.35pt%
     \vrule%
-  }\vskip-2\lineskip\nointerlineskip%
+  }\nointerlineskip%
   \addtolength{\hsize}{0.8pt}%
-}
+}%
 %
 %
 %%%% set caption for the environment
-
+\newcommand{\algocf@captionref}{%
+  \renewcommand{\fnum@algocf}[1]{\AlCapSty{\AlCapFnt\algorithmcfname\nobreakspace\algocf@algocfref}}%
+  \addtocounter{algocf}{-1}% \caption do a refstepcounter, so we restore the precedent value
+  \let\old@thealgocf=\thealgocf\renewcommand{\thealgocf}{{\relsize{\algocf@refrelsize}\algocf@algocfref}}%
+  \gdef\@currentlabel{\algocf@algocfref}% let the label use the new ref
+}%
+%
+% Unfortunatly, we also need our own caption to set some specific stuff for special references. But after these
+% settings, we call the original caption.
+%
+\long\def\algocf@caption@algo#1[#2]#3{%
+  \ifthenelse{\equal{\algocf@algocfref}{\relax}}{}{\algocf@captionref}%
+  \@ifundefined{hyper@refstepcounter}{\relax}{% if hyper@refstepcounter undefind, no hyperref, else...
+    \ifthenelse{\equal{\algocf@algocfref}{\relax}}{\renewcommand{\theHalgocf}{\thealgocf}}{% take algocf as Href
+      \renewcommand{\theHalgocf}{\algocf@algocfref}}%else if SetAlgoRefName done, take this name as ref.
+    \hyper@refstepcounter{algocf}%set algocf as category of ref
+  }%
+  \algocf@latexcaption{#1}[#2]{#3}% call original caption
+}%
+%
 % beamer define is own caption overrinding latex caption!
 % as we need it, we have put here the original definition
+% to handle manual ref, unfortunately we have to add one line to handle algocf@algocfref
 \long\def\algocf@latexcaption#1[#2]#3{% original definition of caption
-  \par
+  \par%
   \addcontentsline{\csname ext@#1\endcsname}{#1}%
   {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}%
-  \begingroup
-  \@parboxrestore
-  \if@minipage
-    \@setminipage
-  \fi
-  \normalsize
-  \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+  \begingroup%
+  \@parboxrestore%
+  \if@minipage%
+    \@setminipage%
+  \fi%
+  \normalsize%
+  \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par%
   \endgroup%
-}
-
-\ifx\beamer@makecaption\undefined%
-\else% beamer detected
+}%
+%
+% \ifx\beamer@makecaption\undefined%
+% \else% beamer detected
 \ifx\@makecaption\undefined%
 \newcommand{\@makecaption}[2]{\relax}%
 \fi%
-\fi
+%%
 
 %
 % more and more packages redefine \@caption instead of just \@makecaption which makes algorithm2e
 % caption not works since based on standard \@caption. So we force the definition of \@caption to be
 % the standard one (the one from LaTeX) inside algorithm environment.
 %
+% unfortunately, makecaption is called with \ignorespace #3 so 
+% we can't do the @currentlabel definition inside \algocf@captionproctext
+\long\def\algocf@caption@proc#1[#2]#3{%
+  \ifthenelse{\boolean{algocf@nokwfunc}}{\relax}{%
+    \SetKwFunction{\algocf@captname#3@}{\algocf@captname#3@}%
+  }%
+  % we tell hyperref to use algocfproc as category and to take the appropriate ref.
+  \ifthenelse{\boolean{algocf@func}}{\def\@proc@func{algocffunc}}{\def\@proc@func{algocfproc}}%
+  \@ifundefined{hyper@refstepcounter}{\relax}{% if hyper@refstepcounter undefind, no hyperref, else...
+    \ifthenelse{\boolean{algocf@procnumbered}}{% 
+      \expandafter\def\csname theH\@proc@func\endcsname{\algocf@captname#3@}%if procnumbered, take \thealgocf as ref
+    }{%
+      \expandafter\def\csname theH\@proc@func\endcsname{\algocf@captname#3@}%else take procedure or function name
+    }%
+    \hyper@refstepcounter{\@proc@func}%
+  }%
+  \ifthenelse{\boolean{algocf@procnumbered}}{\relax}{%
+    \addtocounter{algocf}{-1}% \caption do a refstepcounter, so we restore the precedent value
+    \gdef\@currentlabel{\algocf@captname#3@}% let the label be the name of the function, not the counter
+  }%
+  \ifthenelse{\equal{\algocf@captparam#2@}{\arg@e}}{% if no paramater, we remove the ()
+    \algocf@latexcaption{#1}[\algocf@procname\nobreakspace\algocf@captname#2@]{#3}%
+  }{%                                                 else we give the complete name
+    \algocf@latexcaption{#1}[\algocf@procname\nobreakspace#2]{#3}%
+  }%
+}%
+%%
+%%% setcaption
 \newcommand{\algocf@setcaption}{%
+  \ifthenelse{\boolean{algocf@procenvironment}}{% if proc environment, caption text must be changed
+    \let\algocf@oldcaptiontext=\algocf@captiontext%
+    \renewcommand{\algocf@captiontext}[2]{%
+      \algocf@captionproctext{##1}{##2}%
+    }%
+  }{}%
   \let\algocf@savecaption=\@caption%
-  \let\@caption=\algocf@latexcaption%
+  \ifthenelse{\boolean{algocf@procenvironment}}{\let\@caption=\algocf@caption@proc}{\let\@caption=\algocf@caption@algo}%
   \let\algocf@oldmakecaption=\@makecaption%
   \renewcommand{\@makecaption}[2]{%
-    \expandafter\csname algocf@makecaption@\algocf@style\endcsname{##1}{##2}}%
-}
+    \expandafter\csname algocf@makecaption@\algocf@style\endcsname{##1}{##2}%
+  }%
+}%
 %
 %%%%% reset caption
 %
 % since we have force the LaTeX caption for algorithm environment, we must go back to the caption
 % used in the text.
 \newcommand{\algocf@resetcaption}{%
-  \let\@caption=\algocf@savecaption%
-  \let\@makecaption=\algocf@oldmakecaption%
-}
+  \ifthenelse{\boolean{algocf@procenvironment}}{% if proc environment
+    \let\thealgocf=\old@thealgocf% restore normal counter printing
+    \let\algocf@captiontext=\algocf@oldcaptiontext% restore normal caption text
+  }{}%
+  \let\@caption=\algocf@savecaption% now restore caption outside algo/proc/func environment
+  \let\@makecaption=\algocf@oldmakecaption% and restore makecaption outside outside algo/proc/func environment
+  \algocf@resetfnum%
+}%
 %
 %%%%% nocaptionofalgo and restorecaptionofalgo --
-\newcommand{\nocaptionofalgo}{%
+\newcommand{\NoCaptionOfAlgo}{%
   \let\@old@algocf@captiontext=\algocf@captiontext%
-  \renewcommand{\algocf@captiontext}[2]{\AlCapFnt{}##2}%
-}
-\newcommand{\restorecaptionofalgo}{%
+  \renewcommand{\algocf@captiontext}[2]{\AlCapNameSty{\AlCapNameFnt{}##2}}%
+}%
+\newcommand{\RestoreCaptionOfAlgo}{%
   \let\algocf@captiontext=\@old@algocf@captiontext%
-}
+}%
 %
 % ----------------------  algocf environment
 %
-\newcounter{algocfline}                    % new counter to make lines numbers be internally 
-\setcounter{algocfline}{0}                 % different in different algorithms
+\newcounter{algocfline}%                    % new counter to make lines numbers be internally 
+\setcounter{algocfline}{0}%                 % different in different algorithms
+\newcounter{algocfproc}% counter to count all algo environment (proc, func), just used by hyperref to avoir "same
+\setcounter{algocfproc}{0}% identifier" error caused by algocf being set to '-' for procedure or function or not
+  % changed if no caption is given.
 %
 \expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist
-\newcounter{algocf}                        % just define a new counter
-\renewcommand\thealgocf{\@arabic\c@algocf} % and the way it is printed
-\else%                                    else
-\newcounter{algocf}[\algocf@within]        % counter is numbered within \algocf@within
-\renewcommand\thealgocf{\csname the\algocf@within\endcsname.\@arabic\c@algocf}
-\fi
-%
-\def\fps@algocf{htbp}         % default
-\def\ftype@algocf{10}         % float type
+\newcounter{algocf}%                        % just define a new counter
+\renewcommand{\thealgocf}{\@arabic\c@algocf}% and the way it is printed
+\else%                                     else
+\newcounter{algocf}[\algocf@within]%        % counter is numbered within \algocf@within
+\renewcommand\thealgocf{\csname the\algocf@within\endcsname.\@arabic\c@algocf}%
+\fi%
+%
+\def\fps@algocf{htbp}%        % default
+\def\ftype@algocf{10}%        % float type
 \def\ext@algocf{\algocf@list} % loa by default, lof if figure option used
-\def\fnum@algocf{{\AlCapFnt\AlTitleFnt{\algorithmcfname\nobreakspace\thealgocf}}}
+\newcommand{\fnum@algocf}[1]{\AlCapSty{\AlCapFnt\algorithmcfname\nobreakspace\thealgocf}}%
+\newcommand{\algocf@resetfnum}{\renewcommand{\fnum@algocf}[1]{\AlCapSty{\AlCapFnt\algorithmcfname\nobreakspace\thealgocf}}}%
 \newenvironment{algocf}%      % float environment for algorithms
                {\@float{algocf}}%
-               {\end@float}
+               {\end@float}%
 \newenvironment{algocf*}%     % float* environment for algorithms
-               {\@dblfloat{algocf}}
-               {\end@dblfloat}
-
-\ifx\l@chapter\undefined%
-\newcommand\listofalgocfs{    % list of algorithms
-    \section*{\listalgorithmcfname}%
-      \@mkboth{\MakeUppercase\listalgorithmcfname}%
-              {\MakeUppercase\listalgorithmcfname}%
-    \@starttoc{loa}%
-    }
-\else%
+               {\@dblfloat{algocf}}%
+               {\end@dblfloat}%
+%
+\def\algocf@seclistalgo{}%
+\ifx\l@chapter\undefined\let\algocf@seclistalgo=\section\else\let\algocf@seclistalgo=\chapter\fi%
+\@ifundefined{if@restonecol}{\newif\if@restonecol}\relax%
 \newcommand\listofalgocfs{%
-    \if@twocolumn
-      \@restonecoltrue\onecolumn
-    \else
-      \@restonecolfalse
-    \fi
-    \chapter*{\listalgorithmcfname}%
-      \@mkboth{\MakeUppercase\listalgorithmcfname}%
-              {\MakeUppercase\listalgorithmcfname}%
-    \@starttoc{loa}%
-    \if@restonecol\twocolumn\fi
-    }
-\fi
-
-
+     \ifx\algocf@seclistalgo\chapter%
+      \if@twocolumn\@restonecoltrue\onecolumn\else\@restonecolfalse\fi%
+    \fi%
+     \algocf@seclistalgo*{\listalgorithmcfname}%
+       \@mkboth{\MakeUppercase\listalgorithmcfname}%
+               {\MakeUppercase\listalgorithmcfname}%
+     \@starttoc{loa}%
+    \ifx\algocf@seclistalgo\chapter%
+      \if@restonecol\twocolumn\fi%
+    \fi%
+}
+%
 \newcommand*\l@algocf{\@dottedtocline{1}{1em}{2.3em}}% line of the list
 %
 % ----------------------  algorithm environment
@@ -1628,53 +2044,71 @@
 %%%%%%%
 %%
 %
-\newsavebox\algocf@algoframe
+\newsavebox\algocf@algoframe%
 \def\@algocf@pre@plain{\relax}%  action to be done before printing the algo.
 \def\@algocf@post@plain{\relax}% action to be done after printing the algo.
 \def\@algocf@capt@plain{bottom}% where the caption should be localized.
 \def\@algocf@pre@boxed{\noindent\begin{lrbox}{\algocf@algoframe}}
 \def\@algocf@post@boxed{\end{lrbox}\framebox[\hsize]{\box\algocf@algoframe}\par}%
 \def\@algocf@capt@boxed{under}%
-\def\@algocf@pre@ruled{\hrule height.8pt depth0pt\kern2pt}%
-\def\@algocf@post@ruled{\kern2pt\hrule\relax}%
+\def\@algocf@pre@ruled{\hrule height\algoheightrule depth0pt\kern\interspacetitleruled}%
+\def\@algocf@post@ruled{\kern\interspacealgoruled\hrule height\algoheightrule\relax}%
 \def\@algocf@capt@ruled{top}%
-\def\@algocf@pre@algoruled{\hrule height.8pt depth0pt\kern2pt}%
-\def\@algocf@post@algoruled{\kern2pt\hrule\relax}%
+\def\@algocf@pre@algoruled{\hrule height\algoheightrule depth0pt\kern\interspacetitleruled}%
+\def\@algocf@post@algoruled{\kern\interspacealgoruled\hrule height\algoheightrule \relax}%
 \def\@algocf@capt@algoruled{top}%
+\def\@algocf@pre@tworuled{\hrule height\algoheightrule depth0pt\kern\interspacetitleruled}%
+\def\@algocf@post@tworuled{\kern\interspacealgoruled\hrule height\algoheightrule\relax}%
+\def\@algocf@capt@tworuled{top}%
 \def\@algocf@pre@boxruled{\noindent\begin{lrbox}{\algocf@algoframe}}%
 \def\@algocf@post@boxruled{\end{lrbox}\framebox[\hsize]{\box\algocf@algoframe}\par}%
 \def\@algocf@capt@boxruled{above}%
 %
+\newcommand{\noalgocaption}{\def\@algocf@capt@ruled{none}}
+%
 %% before algocf or figure environment
 \newcommand{\@algocf@init@caption}{%
-  \@algocf@algotitleofalgo% fix name for \Titleofalgo to \algorithmcfname
+  \ifthenelse{\boolean{algocf@procenvironment}}{% if we are inside a procedure/function environment
+    \@algocf@proctitleofalgo% set Titleofalgo to Procedure: or Function:
+                            % accordingly to the environment
+    \let\old@thealgocf=\thealgocf\ifthenelse{\boolean{algocf@procnumbered}}{\relax}{%
+      \renewcommand{\thealgocf}{-}}%
+  }{% else inside environment algorithm
+    \@algocf@algotitleofalgo% fix name for \Titleofalgo to \algorithmcfname
+  }%
   \algocf@setcaption%       set caption to our caption style
 }%
+%
+\newcommand{\@algofloatboxreset}{\@setminipage}
 \newcommand{\@algocf@init}{%
   \refstepcounter{algocfline}%
+  \stepcounter{algocfproc}%to have a different counter for each environment and being abble to make the difference
+    %between href of algoline in different algorithms.
   \ifthenelse{\boolean{algocf@optnoend}}{%
-      \renewcommand{\a@block}[2]{\a@group{##1}}%
+      \renewcommand{\algocf@block}[2]{\algocf@group{##1}}%
     }{%
-      \renewcommand{\a@block}[2]{\a@@block{##1}{##2}}%
+      \renewcommand{\algocf@block}[2]{\algocf@@block{##1}{##2}}%
     }%
-}
+}%
 %% after the end of algocf or figure environment
 \newcommand{\@algocf@term@caption}{%
   \algocf@resetcaption% restore original caption
 }%
+%
 \newcommand{\@algocf@term}{%
   \setboolean{algocf@algoH}{false}% no H by default
   \ifthenelse{\boolean{algocf@optnoend}}{%
-      \renewcommand{\a@block}[2]{\a@@block{##1}{##2}}
-    }{%
-      \renewcommand{\a@block}[2]{\a@group{##1}}%
-    }%
-}
+    \renewcommand{\algocf@block}[2]{\algocf@@block{##1}{##2}}%
+  }{%
+    \renewcommand{\algocf@block}[2]{\algocf@group{##1}}%
+  }%
+  \SetAlgoRefName{\relax}%
+}%
 %
 %%%%%%%%%%%%%%%%%
 %% makethealgo: macro which print effectively the algo in its box
 %% 
-\newsavebox\algocf@algobox
+\newsavebox\algocf@algobox%
 \newcommand{\algocf@makethealgo}{%
   \vtop{%
     % place caption above if needed  bye the style
@@ -1694,10 +2128,10 @@
     % postcommand according to the style
     \csname @algocf@post@\algocf@style\endcsname%
     % place caption under if needed  bye the style
-     \ifthenelse{\equal{\csname @algocf@capt@\algocf@style\endcsname}{under}}
+     \ifthenelse{\equal{\csname @algocf@capt@\algocf@style\endcsname}{under}}%
      {\csname algocf@caption@\algocf@style\endcsname}{}%
   }%
-}
+}%
 %%%%%%%%%%%%%%%%%%%
 %
 %% at the beginning of algocf or figure environment
@@ -1712,88 +2146,116 @@
   \addtolength{\hsize}{-1.5\algomargin}%
   \let\@mathsemicolon=\;\def\;{\ifmmode\@mathsemicolon\else\@endalgoln\fi}%
   \raggedright\AlFnt{}%
-  \ifthenelse{\boolean{algocf@slide}}{\incmargin{\skipalgocfslide}}{}%
+  \ifthenelse{\boolean{algocf@slide}}{\IncMargin{\skipalgocfslide}}{}%
   \@algoinsideskip%
-  %
-}
+}%
 %
 %% at the end of algocf or figure environment
 \newcommand{\@algocf@finish}{%
   \@algoinsideskip%
   \egroup%end of vtop which contain all the text
-  \egroup%end of hbox wich contains [margin][vtop]
-  \ifthenelse{\boolean{algocf@slide}}{\decmargin{\skipalgocfslide}}{}%
+  \hfill\egroup%end of hbox wich contains [margin][vtop]
+  \ifthenelse{\boolean{algocf@slide}}{\DecMargin{\skipalgocfslide}}{}%
   %
   \egroup%end of main vbox
   \end{lrbox}%
-  %\egroup% end of algo box
   \algocf@makethealgo% print the algo
   \@algoskip%
   % restore dimension and macros
   \setlength{\hsize}{\algowidth}%
   \lineskip\normallineskip\setlength{\skiptotal}{\@defaultskiptotal}%
   \let\;=\@mathsemicolon%  
-  %
-}
+}%
+%
 %%%%%%%%%%%%%%%%%%%%
 %% basic definition of the environment algorithm
 %%
-
-\newboolean{algocf@algoH}\setboolean{algocf@algoH}{false}
+%
+\newboolean{algocf@procenvironment}\setboolean{algocf@procenvironment}{false}%
+\newboolean{algocf@func}\setboolean{algocf@func}{false}%
+\newboolean{algocf@algoH}\setboolean{algocf@algoH}{false}%
+\newboolean{algocf@algostar}\setboolean{algocf@algostar}{false}%
+%
+%%% environment for {algorithm}[H]
 \newenvironment{algocf@Here}{\noindent%
   \def\@captype{algocf}% if not defined, caption exit with an error
-%  \hbox\bgroup%
-  \begin{minipage}{\hsize}
+  \begin{minipage}{\hsize}%
 }{%
-  \end{minipage}
-%  \egroup%
+  \end{minipage}%\par%
 }%
-\newenvironment{\algocf@envname}[1][htbp]{%
+%%% real algorithm environment which manages H and * option
+%    \let\algocf@originalfloatboxreset=\@floatboxreset%
+%    \let\@floatboxreset=\@algofloatboxreset%
+\newenvironment{algocf@algorithm}[1][htbp]{
    \@algocf@init%
-   \ifthenelse{\equal{\algocf@float}{figure}}%
-     {\begin{figure}[#1]}%
-   {\@algocf@init@caption\ifthenelse{\equal{#1}{H}}%
-     {\setboolean{algocf@algoH}{true}\begin{algocf@Here}}%
-     {\begin{algocf}[#1]}%
-   }%
-    \@algocf@start% 
-    \@ResetCounterIfNeeded%
-    \algocf@linesnumbered%
+   \ifthenelse{\equal{\algocf@float}{figure}}{% if option figure set
+     \ifthenelse{\boolean{algocf@algostar}}{% if algorithm* with figure option
+       \begin{figure*}[#1]% call figure*
+     }{% else algorithm environment with figure option
+       \begin{figure}[#1]%  call figure
+     }%
+   }{% else normal algorithm environment
+     \@algocf@init@caption%
+     \ifthenelse{\equal{#1}{H}}{% if [H] algorithm
+       \if@twocolumn\@latex@error{[H] in two columns mode is not allowed for algorithms}\fi% TODO: SCREAM if H in two colums!
+       \setboolean{algocf@algoH}{true}\begin{algocf@Here}% call corresponding environment
+     }{% else floating algorithm environment
+       \ifthenelse{\boolean{algocf@algostar}}{% if algorithm*
+         \begin{algocf*}[#1]% call algocf*
+       }{% else algorithm environment
+         \begin{algocf}[#1]%  call algcf
+       }%
+     }%
+   }% fin test option figure ou pas
+   \@algocf@start% 
+   \@ResetCounterIfNeeded%
+   \algocf@linesnumbered\ignorespaces%
 }{%
-    \@algocf@finish%
-    \ifthenelse{\equal{\algocf@float}{figure}}%
-     {\end{figure}}%
-   {\@algocf@term@caption\ifthenelse{\boolean{algocf@algoH}}%
-     {\end{algocf@Here}}%
-     {\end{algocf}}%
-   }%
-   \@algocf@term
-}
-%%%
-%%% algorithm*
-%%%
+  \@algocf@finish%
+  \ifthenelse{\equal{\algocf@float}{figure}}{%
+     \ifthenelse{\boolean{algocf@algostar}}{% if algorithm* with figure option
+       \end{figure*}% call figure*
+     }{% else algorithm environment with figure option
+       \end{figure}%  call figure
+     }%
+  }{%
+    \@algocf@term@caption%
+    \ifthenelse{\boolean{algocf@algoH}}{% if [H] algorithm
+       \end{algocf@Here}\par% call corresponding environment
+     }{% else floating algorithm environment
+       \ifthenelse{\boolean{algocf@algostar}}{% if algorithm*
+         \end{algocf*}% call algocf*
+       }{% else algorithm environment
+         \end{algocf}%  call algocf
+       }%
+     }%
+  }%
+  \@algocf@term\ignorespacesafterend%
+}%
+%
+%%% user algorithm environment
+\newenvironment{\algocf@envname}[1][htbp]{%
+  \setboolean{algocf@algostar}{false}%
+  \setboolean{algocf@procenvironment}{false}\gdef\algocfautorefname{\algorithmautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
+}{%
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
+%%% user algorithm* environment
 \newenvironment{\algocf@envname*}[1][htbp]{%
-  \@algocf@init%
-  \ifthenelse{\equal{\algocf@float}{figure}}%
-    {\begin{figure*}[#1]}%
-    {\begin{algocf*}[#1]}%
-     \@algocf@start%
-     \@ResetCounterIfNeeded%
-     \algocf@linesnumbered%
-}{
-     \@algocf@finish%
-  \ifthenelse{\equal{\algocf@float}{figure}}%
-  {\end{figure*}}%
-  {\end{algocf*}}%
-  \@algocf@term%
-}
+  \setboolean{algocf@algostar}{true}%
+  \setboolean{algocf@procenvironment}{false}\gdef\algocfautorefname{\algorithmautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
+}{%
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
 %
 %%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %
 \expandafter\newcommand\csname\algocf@listofalgorithms\endcsname{%
-  \ifthenelse{\equal{\algocf@float}{figure}}{\listoffigures}{\listofalgocfs}
-}
+  \ifthenelse{\equal{\algocf@float}{figure}}{\listoffigures}{\listofalgocfs}%
+}%
 %%%
 %%%
 %
@@ -1802,10 +2264,6 @@
 %
 % -- new style (used in particular in the caption of function and procedure environments)
 %
-\newcommand{\ProcNameSty}[1]{\FuncSty{#1}}%
-\newcommand{\SetProcNameSty}[1]{\renewcommand{\ProcNameSty}[1]{\textnormal{\csname#1\endcsname{##1}}}}
-\newcommand{\ProcArgSty}[1]{\ArgSty{#1}}%
-\newcommand{\SetProcArgSty}[1]{\renewcommand{\ProcArgSty}[1]{\textnormal{\csname#1\endcsname{##1}}}}
 % three macros to extract parts of the caption
 \gdef\algocf@captname#1(#2)#3@{#1}  % keep characters before the first brace
 \gdef\algocf@captparam#1(#2)#3@{#2} % keep character in between the braces
@@ -1813,110 +2271,139 @@
 %
 %%% Text of caption for Procedure or Function
 \newcommand{\algocf@captionproctext}[2]{%
-  {\AlCapFnt{}\AlTitleFnt{\algocf@procname} %
-  \ProcNameSty{\algocf@captname #2@}% Name of the procedure in ProcName Style. 
-  \ifthenelse{\equal{\algocf@captparam #2@}{\arg@e}}{}% if no argument, write nothing
-  {%                                                else put arguments in ProcArgSty:
-    \ProcNameSty{(}\ProcArgSty{\algocf@captparam #2@}\ProcNameSty{)}%
-  }% endif
-  \algocf@captother #2@%
-  }
-}
-%%%% set caption for the environment
-% unfortunately, makecaption is called with \ignorespace #3 so 
-% we can't do the @currentlabel definition inside \algocf@captionproctext
-\long\def\algocf@caption@proc#1[#2]#3{% 
-  \gdef\@currentlabel{\algocf@captname #3@}%
-  \algocf@old@caption{#1}[\algocf@procname\nobreakspace #2]{\ #3}%
-}%
-\newcommand{\algocf@setcaptionproc}{%
-  \let\algocf@oldcaptiontext=\algocf@captiontext%
-  \renewcommand{\algocf@captiontext}[2]{%
-    \algocf@captionproctext{##1}{##2}}%
-  \let\algocf@old@caption=\@caption%
-  \let\@caption=\algocf@caption@proc%
-}
-%%%%% reset caption
-\newcommand{\algocf@resetcaptionproc}{%
-  \let\algocf@captiontext=\algocf@oldcaptiontext%
-  \let\@caption=\algocf@old@caption%
-}
+  {%
+    \ProcSty{\ProcFnt\algocf@procname\ifthenelse{\boolean{algocf@procnumbered}}{\nobreakspace\thealgocf\algocf@typo\algocf@capseparator}{\relax}}%
+    \nobreakspace\ProcNameSty{\ProcNameFnt\algocf@captname #2@}% Name of the procedure in ProcName Style. 
+    \ifthenelse{\equal{\algocf@captparam #2@}{\arg@e}}{}{% if no argument, write nothing
+      \ProcNameSty{\ProcNameFnt(}\ProcArgSty{\ProcArgFnt\algocf@captparam #2@}\ProcNameSty{\ProcNameFnt)}%else put arguments in ProcArgSty:
+    }% endif
+    \algocf@captother #2@%
+  }%
+}%
 %
 %
-%%%%% algocf@proc is the generic environment for procedure and function environment.
+% -- procedure and function environments are defined from algocf@algorithm environment
 %
-\newboolean{algocf@procstar}\setboolean{algocf@procstar}{false}
-\newenvironment{algocf@proc}[1][htbp]{%
-    \@algocf@proctitleofalgo% set Titleofalgo to Procedure: or Function:
-                            % accordingly to the environment
-    \let\old@thealgocf=\thealgocf%\renewcommand{\thealgocf}{--}%
-    \algocf@setcaptionproc%   set the text of caption to proc
-    \algocf@setcaption%       set caption to our caption style
-    \refstepcounter{algocfline}%
-    \ifthenelse{\equal{\algocf@float}{figure}}{%
-      \ifthenelse{\boolean{algocf@procstar}}{\begin{figure*}[#1]}{\begin{figure}[#1]}%
-    }{%
-      \ifthenelse{\boolean{algocf@procstar}}%
-         {\begin{algocf*}[#1]}%
-         {\ifthenelse{\equal{#1}{H}}%
-            {\setboolean{algocf@algoH}{true}\begin{algocf@Here}}%
-            {\begin{algocf}[#1]}%
-         }%
-    }%
-       \@algocf@start%
-       \@ResetCounterIfNeeded%
-       \algocf@linesnumbered%
+\newenvironment{procedure}[1][htbp]{%
+  \setboolean{algocf@algostar}{false}%
+  \setboolean{algocf@procenvironment}{true}\setboolean{algocf@func}{false}%
+  \newcommand{\algocf@procname}{\@algocf@procname}\gdef\algocfprocautorefname{\procedureautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
 }{%
-       \@algocf@finish%
-    \ifthenelse{\equal{\algocf@float}{figure}}{%
-      \ifthenelse{\boolean{algocf@procstar}}{\end{figure*}}{\end{figure}}%
-    }{%
-      \ifthenelse{\boolean{algocf@procstar}}
-         {\end{algocf*}}
-         {\ifthenelse{\boolean{algocf@algoH}}
-            {\end{algocf@Here}}%
-            {\end{algocf}}%
-         }%
-    }%
-    \let\thealgocf=\old@thealgocf%
-    \@algocf@term% restore original caption and H boolean
-    \algocf@resetcaptionproc%
-}
-
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
+\newenvironment{function}[1][htbp]{%
+  \setboolean{algocf@algostar}{false}%
+  \setboolean{algocf@procenvironment}{true}\setboolean{algocf@func}{true}%
+  \newcommand{\algocf@procname}{\@algocf@funcname}\gdef\algocffuncautorefname{\functionautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
+}{%
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
 %
-% -- procedure and function environments are defined from algocf@proc environment
+\newenvironment{procedure*}[1][htbp]{%
+  \setboolean{algocf@algostar}{true}%
+  \setboolean{algocf@procenvironment}{true}\setboolean{algocf@func}{false}%
+  \newcommand{\algocf@procname}{\@algocf@procname}\gdef\algocfprocautorefname{\procedureautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
+}{%
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
+\newenvironment{function*}[1][htbp]{%
+  \setboolean{algocf@algostar}{true}%
+  \setboolean{algocf@procenvironment}{true}\setboolean{algocf@func}{true}%
+  \newcommand{\algocf@procname}{\@algocf@funcname}\gdef\algocffuncautorefname{\functionautorefname}%
+  \begin{algocf@algorithm}[#1]\ignorespaces%
+}{%
+  \end{algocf@algorithm}\ignorespacesafterend%
+}%
 %
-\newenvironment{procedure}[1][htbp]%
-{\setboolean{algocf@procstar}{false}%
- \newcommand{\algocf@procname}{\@algocf@procname}\begin{algocf@proc}[#1]}%
-{\end{algocf@proc}}
-\newenvironment{function}[1][htbp]%
-{\setboolean{algocf@procstar}{false}%
- \newcommand{\algocf@procname}{\@algocf@funcname}\begin{algocf@proc}[#1]}%
-{\end{algocf@proc}}
 %
-\newenvironment{procedure*}[1][htbp]%
-{\setboolean{algocf@procstar}{true}%
- \newcommand{\algocf@procname}{\@algocf@procname}\begin{algocf@proc}[#1]}%
-{\end{algocf@proc}}
-\newenvironment{function*}[1][htbp]%
-{\setboolean{algocf@procstar}{true}%
- \newcommand{\algocf@procname}{\@algocf@funcname}\begin{algocf@proc}[#1]}%
-{\end{algocf@proc}}
+%%%%%%%%%%%%%%%%%%%%
+%% definition of algondfloat environment
+%%
+\ifthenelse{\boolean{algocf@endfloat}}{% if endfloat option then
+\newcommand{\algoplace}{% macro which is used to writhe algorithm about there
+   \begin{center}%
+     [\algorithmcfname~\thepostfig\ about here.]%
+   \end{center}%
+}%
+\newcommand{\algoendfloat}{% use as a \begin{algoendfloat} environment to start scanning of line
+%  \immediate\openout\@mainfff\jobname.fff%
+  \efloat@condopen{fff}
+  \efloat@iwrite{fff}{\string\begin{\algocf@envname}}%
+    \if@domarkers%
+       \ifthenelse{\equal{\algocf@list}{lof}}{%
+         \addtocounter{postfig}{1}%
+       }{%
+         \addtocounter{postalgo}{1}%
+       }%
+       \algoplace%
+    \fi%
+    \bgroup%
+    \let\do\ef@makeinnocent\dospecials%
+    \ef@makeinnocent\^^L% and whatever other special cases
+    \endlinechar`\^^M \catcode`\^^M=12 \ef@xalgocfendfloat}%
+}{\relax}%%%% end of endfloat option ifthenelse
+%% some macros useful for endfloat option that cannot be defined inside the ifthenelse
+%scan algoendfloat algorithm and write the text into .fff file
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\ef@xalgocfendfloat#1^^M{% scan the lines inside algoendfloat environment being read by latex
+   \def\test{#1}% test is the line being currently scan by latex
+   \ifx\test\ef@endalgocftest% if it is \end{algoendfloat}
+     \def\next{% define next as to not continue the scan and write \end{algorithm} into .fff file
+       \egroup\end{algoendfloat}%
+       \efloat@iwrite{fff}{\string\end{\algocf@envname}}%
+       \efloat@iwrite{fff}{\string\efloatseparator}%
+       \efloat@iwrite{fff}{ }%
+     }%
+     \else% else write the current line being scanned by latex and set next to continue the scan
+       \efloat@iwrite{fff}{#1}%
+       \let\next\ef@xalgocfendfloat%
+     \fi% endif
+     \next}% next is continue if it was else condition, else it does not continue the scan and write end to file
+}%
+% test if the scan is finish by looking at the string \end{algoendfloat}
+{\escapechar=-1%
+ \xdef\ef@endalgocftest{\string\\end\string\{algoendfloat\string\}}%
+}%
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % 
-\newcommand{\Titleofalgo}[1]{\@titleprefix\TitleSty{#1}\par\smallskip}
+\newcommand{\TitleOfAlgo}[1]{\@titleprefix\ 
+  \TitleSty{#1}\par\smallskip}%
+%
+\newcommand{\SetAlgorithmName}[3]{%
+  \renewcommand{\listalgorithmcfname}{#3}%
+  \renewcommand{\algorithmcfname}{#1}%
+  \renewcommand{\algorithmautorefname}{#2}%
+}%
 %
+\newcommand{\algocf@refrelsize}{-2}\newcommand{\SetAlgoRefRelativeSize}[1]{\renewcommand{\algocf@refrelsize}{#1}}%
+\newcommand{\SetAlgoRefName}[1]{%
+  \renewcommand{\algocf@algocfref}{#1}%
+}%
 %
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% 
 % -------------------------   Default Definitions
 %
 %%
 %%
 %
-\newcommand{\algocf@defaults@common}{
+\SetKwComment{tcc}{/* }{ */}%
+\SetKwComment{tcp}{// }{}%
+%
+%\newcommand{\algocf@defaults@common}{
+%
+%
+% french keywords
+%
 %\SetKwInOut{AlgDonnees}{Donn\'ees}\SetKwInOut{AlgRes}{R\'esultat}
 \SetKwInput{Donnees}{Donn\'ees}%
 \SetKwInput{Res}{R\'esultat}%
@@ -1927,10 +2414,16 @@
 \SetKwBlock{Deb}{d\'ebut}{fin}%
 \SetKwRepeat{Repeter}{r\'ep\'eter}{jusqu'\`a}%
 %
-\SetKwComment{tcc}{/* }{ */}
-\SetKwComment{tcp}{// }{}
+\SetKwIF{Si}{SinonSi}{Sinon}{si}{alors}{sinon si}{sinon}{fin si}%
+\SetKwSwitch{Suivant}{Cas}{Autre}{suivant}{faire}{cas o\`u}{autres cas}{fin d'alternative}%
+\SetKwFor{Pour}{pour}{faire}{fin pour}%
+\SetKwFor{PourPar}{pour}{faire en parallèle}{fin pour}%
+\SetKwFor{PourCh}{pour chaque}{faire}{fin pour chaque}%
+\SetKwFor{PourTous}{pour tous les}{faire}{fin pour tous}%
+\SetKwFor{Tq}{tant que}{faire}{fin tq}%
+%
+% english keywords
 %
-%\SetKwInOut{AlgData}{Data}\SetKwInOut{AlgResult}{Result}
 \SetKwInput{KwIn}{Input}%
 \SetKwInput{KwOut}{Output}%
 \SetKwInput{KwData}{Data}%
@@ -1941,10 +2434,16 @@
 \SetKwBlock{Begin}{begin}{end}%
 \SetKwRepeat{Repeat}{repeat}{until}%
 %
+\SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{end if}%
+\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{end switch}%
+\SetKwFor{For}{for}{do}{end for}%
+\SetKwFor{ForPar}{for}{do in parallel}{end forpar}
+\SetKwFor{ForEach}{foreach}{do}{end foreach}%
+\SetKwFor{ForAll}{forall the}{do}{end forall}%
+\SetKwFor{While}{while}{do}{end while}%
+%
 % --- German keywords
 %
-% \SetKwInOut{AlgDaten}{Daten}%AlgData
-% \SetKwInOut{AlgErgebnis}{Ergebnis}%AlgResult
 \SetKwInput{Ein}{Eingabe}%KwIn
 \SetKwInput{Aus}{Ausgabe}%KwOut
 \SetKwInput{Daten}{Daten}%KwData
@@ -1955,16 +2454,22 @@
 \SetKwBlock{Beginn}{Beginn}{Ende}%Begin
 \SetKwRepeat{Wiederh}{wiederhole}{bis}%Repeat
 %
+\SetKwIF{Wenn}{SonstWenn}{Sonst}{wenn}{dann}{sonst wenn}{sonst}{Ende wenn}%gIf
+\SetKwSwitch{Unterscheide}{Fall}{Anderes}{unterscheide}{tue}{Fall}{sonst}{Ende Unt.}%Switch
+\SetKwFor{Fuer}{f\"ur}{tue}{Ende f\"ur}%For
+\SetKwFor{FuerPar}{f\"ur}{tue gleichzeitig}{Ende gleichzeitig}%ForPar
+\SetKwFor{FuerJedes}{f\"ur jedes}{tue}{Ende f\"ur}%ForEach
+\SetKwFor{FuerAlle}{f\"ur alle}{tue}{Ende f\"ur}%ForAll
+\SetKwFor{Solange}{solange}{tue}{Ende solange}%While
+%
 % --- Czech keywords
 %
-% \SetKwInOut{AlgVst}{Vstup}\SetKwInOut{AlgVyst}{V\'{y}stup}
 \SetKwInput{Vst}{Vstup}%
 \SetKwInput{Vyst}{V\'{y}stup}%
 \SetKwInput{Vysl}{V\'{y}sledek}%
 %
 % --- Portuguese keywords
 %
-% \SetKwInOut{AlgDados}{Dados}\SetKwInOut{AlgResultado}{Result.}
 \SetKwInput{Entrada}{Entrada}%
 \SetKwInput{Saida}{Sa\'{i}da}%
 \SetKwInput{Dados}{Dados}%
@@ -1974,44 +2479,7 @@
 \SetKw{Retorna}{retorna}%
 \SetKwBlock{Inicio}{in\'{i}cio}{fim}%
 \SetKwRepeat{Repita}{repita}{at\'{e}}%
-% --- End 
-}
-%
-%
-\newcommand{\algocf@defaults@longend}{%
-\algocf@defaults@common
-\SetKwIF{gSi}{gSinonSi}{gSinon}{si}{alors}{sinon si}{sinon}{finsi}%
-\SetKwIF{Si}{SinonSi}{Sinon}{si}{alors}{sinon si}{sinon}{finsi}%
-\SetKwSwitch{Suivant}{Cas}{Autre}{suivant}{faire}{cas o\`u}{autres cas}{fin d'alternative}%
-\SetKwFor{Pour}{pour}{faire}{finpour}%
-\SetKwFor{PourPar}{pour}{faire en parallèle}{finpour}%
-\SetKwFor{PourCh}{pour chaque}{faire}{finprch}%
-\SetKwFor{PourTous}{pour tous les}{faire}{finprts}%
-\SetKwFor{Tq}{tant que}{faire}{fintq}%
-%
-\SetKwIF{gIf}{gElsIf}{gElse}{if}{then}{else if}{else}{endif}%
-\SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{endif}%
-\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{endsw}%
-\SetKwFor{For}{for}{do}{endfor}%
-\SetKwFor{ForPar}{for}{do in parallel}{endfpar}
-\SetKwFor{ForEach}{foreach}{do}{endfch}%
-\SetKwFor{ForAll}{forall the}{do}{endfall}%
-\SetKwFor{While}{while}{do}{endw}%
-%
-% --- German for longend
-%
-\SetKwIF{gWenn}{gSonstWenn}{gSonst}{wenn}{dann}{sonst wenn}{sonst}{Ende-wenn}%gIf
-\SetKwIF{Wenn}{SonstWenn}{Sonst}{wenn}{dann}{sonst wenn}{sonst}{Ende-wenn}%gIf
-\SetKwSwitch{Unterscheide}{Fall}{Anderes}{unterscheide}{tue}{Fall}{sonst}{Ende-Unt.}%Switch
-\SetKwFor{Fuer}{f\"ur}{tue}{Ende-f\"ur}%For
-\SetKwFor{FuerPar}{f\"ur}{tue gleichzeitig}{Ende-gleichzeitig}%ForPar
-\SetKwFor{FuerJedes}{f\"ur jedes}{tue}{Ende-f\"ur}%ForEach
-\SetKwFor{FuerAlle}{f\"ur alle}{tue}{Ende-f\"ur}%ForAll
-\SetKwFor{Solange}{solange}{tue}{Ende-solange}%While
-%
-% --- Portuguese
 %
-\SetKwIF{gSe}{gSenaoSe}{gSenao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim se}%
 \SetKwIF{Se}{SenaoSe}{Senao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim se}%
 \SetKwSwitch{Selec}{Caso}{Outro}{selecione}{fa\c{c}a}{caso}{sen\~{a}o}{fim selec}%
 \SetKwFor{Para}{para}{fa\c{c}a}{fim para}%
@@ -2019,104 +2487,150 @@
 \SetKwFor{ParaCada}{para cada}{fa\c{c}a}{fim para cada}%
 \SetKwFor{ParaTodo}{para todo}{fa\c{c}a}{fim para todo}%
 \SetKwFor{Enqto}{enquanto}{fa\c{c}a}{fim enqto}%
-}
-%
-%
-\newcommand{\algocf@defaults@shortend}{%
-\algocf@defaults@common
-\SetKwIF{gSi}{gSinonSi}{gSinon}{si}{alors}{sinon si}{sinon}{fin}%
-\SetKwIF{Si}{SinonSi}{Sinon}{si}{alors}{sinon si}{sinon}{fin}%
-\SetKwSwitch{Suivant}{Cas}{Autre}{suivant}{faire}{cas o\`u}{autres cas}{fin}%
-\SetKwFor{Pour}{pour}{faire}{fin}%
-\SetKwFor{PourPar}{pour}{faire en parallèle}{fin}%
-\SetKwFor{PourCh}{pour chaque}{faire}{fin}%
-\SetKwFor{PourTous}{pour tous les}{faire}{fin}%
-\SetKwFor{Tq}{tant que}{faire}{fin}%
-%
-%
-\SetKwIF{gIf}{gElsIf}{gElse}{if}{then}{else if}{else}{end}%
-\SetKwIF{If}{ElseIf}{Else}{if}{then}{else if}{else}{end}%
-\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{end}%
-\SetKwFor{For}{for}{do}{end}%
-\SetKwFor{ForPar}{for}{do in parallel}{end}
-\SetKwFor{ForEach}{foreach}{do}{end}%
-\SetKwFor{ForAll}{forall}{do}{end}%
-\SetKwFor{While}{while}{do}{end}%
-%
-% --- German for shortend
-%
-\SetKwIF{gWenn}{gSonstWenn}{gSonst}{wenn}{dann}{sonst wenn}{sonst}{Ende}%gIf
-\SetKwIF{Wenn}{SonstWenn}{Sonst}{wenn}{dann}{sonst wenn}{sonst}{Ende}%gIf
-\SetKwSwitch{Unterscheide}{Fall}{Anderes}{unterscheide}{tue}{Fall}{sonst}{}%Switch
-\SetKwFor{Fuer}{f\"ur}{tue}{Ende}%For
-\SetKwFor{FuerPar}{f\"ur}{tue gleichzeitig}{Ende}%ForPar
-\SetKwFor{FuerJedes}{f\"ur jedes}{tue}{Ende}%ForEach
-\SetKwFor{FuerAlle}{f\"ur alle}{tue}{Ende}%ForAll
-\SetKwFor{Solange}{solange}{tue}{Ende}%While
-%
-% --- Portuguese
-%
-\SetKwIF{gSe}{gSenaoSe}{gSenao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim}%
-\SetKwIF{Se}{SenaoSe}{Senao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim}%
-\SetKwSwitch{Selec}{Caso}{Outro}{selecione}{fa\c{c}a}{caso}{sen\~{a}o}{fim}%
-\SetKwFor{Para}{para}{fa\c{c}a}{fim}%
-\SetKwFor{ParaPar}{para}{fa\c{c}a em paralelo}{fim}
-\SetKwFor{ParaCada}{para cada}{fa\c{c}a}{fim}%
-\SetKwFor{ParaTodo}{para todo}{fa\c{c}a}{fim}%
-\SetKwFor{Enqto}{enquanto}{fa\c{c}a}{fim}%
-}
 %
+% --- Italian keywords
 %
-\newcommand{\algocf@defaults@noend}{%
-\renewcommand{\a@block}[2]{\a@group{##1}}
-\algocf@defaults@common
-\SetKwIF{gSi}{gSinonSi}{gSinon}{si}{alors}{sinon si}{sinon}{}%
-\SetKwIF{Si}{SinonSi}{Sinon}{si}{alors}{sinon si}{sinon}{}%
-\SetKwSwitch{Suivant}{Cas}{Autre}{suivant}{faire}{cas où}{autres cas}{}%
-\SetKwFor{Pour}{pour}{faire}{}%
-\SetKwFor{PourPar}{pour}{faire en parallèle}{}%
-\SetKwFor{PourCh}{pour chaque}{faire}{}%
-\SetKwFor{PourTous}{pour tous les}{faire}{}%
-\SetKwFor{Tq}{tant que}{faire}{}%
-%
-\SetKwIF{gIf}{gElsIf}{gElse}{if}{then}{else if}{else}{}%
-\SetKwIF{If}{ElsIf}{Else}{if}{then}{else if}{else}{}%
-\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{}%
-\SetKwFor{For}{for}{do}{}%
-\SetKwFor{ForPar}{for}{do in parallel}{}
-\SetKwFor{ForEach}{foreach}{do}{}%
-\SetKwFor{ForAll}{forall}{do}{}%
-\SetKwFor{While}{while}{do}{}%
-% --- German for noend
-\SetKwIF{gWenn}{gSonstWenn}{gSonst}{wenn}{dann}{sonst wenn}{sonst}{}%gIf
-\SetKwIF{Wenn}{SonstWenn}{Sonst}{wenn}{dann}{sonst wenn}{sonst}{}%gIf
-\SetKwSwitch{Unterscheide}{Fall}{Anderes}{unterscheide}{tue}{Fall}{sonst}{}%Switch
-\SetKwFor{Fuer}{f\"ur}{tue}{}%For
-\SetKwFor{FuerPar}{f\"ur}{tue gleichzeitig}{}%ForPar
-\SetKwFor{FuerJedes}{f\"ur jedes}{tue}{}%ForEach
-\SetKwFor{FuerAlle}{f\"ur alle}{tue}{}%ForAll
-\SetKwFor{Solange}{solange}{tue}{}%While
-% --- Portuguese
-\SetKwIF{gSe}{gSenaoSe}{gSenao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{}%
-\SetKwIF{Se}{SenaoSe}{Senao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{}%
-\SetKwSwitch{Selec}{Caso}{Outro}{selecione}{fa\c{c}a}{caso}{sen\~{a}o}{}%
-\SetKwFor{Para}{para}{fa\c{c}a}{}%
-\SetKwFor{ParaPar}{para}{fa\c{c}a em paralelo}{}
-\SetKwFor{ParaCada}{para cada}{fa\c{c}a}{}%
-\SetKwFor{ParaTodo}{para todo}{fa\c{c}a}{}%
-\SetKwFor{Enqto}{enquanto}{fa\c{c}a}{}%
-}
+\SetKwInput{KwIng}{Ingresso}%
+\SetKwInput{KwUsc}{Uscita}%
+\SetKwInput{KwDati}{Dati}%
+\SetKwInput{KwRisult}{Risultato}%
+\SetKw{KwA}{a}%
+\SetKw{KwRitorna}{ritorna}%
+\SetKw{Ritorna}{ritorna}%
+\SetKwBlock{Inizio}{inizio}{fine}%
+\SetKwRepeat{Ripeti}{ripeti}{finché}%
 %
-%%
-%%
-%%
+\SetKwIF{Sea}{AltSe}{Altrimenti}{se}{allora}{altrimenti se}{allora}{fine se}%
+\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{endsw}%
+\SetKwFor{Per}{per}{fai}{fine per}%
+\SetKwFor{PerPar}{per}{fai in parallelo}{fine per}%
+\SetKwFor{PerCiascun}{per ciascun}{fai}{fine per ciascun}%
+\SetKwFor{PerTutti}{per tutti i}{fai}{fine per tutti}%
+\SetKwFor{Finche}{finché}{fai}{fine finché}%
 %
-% default macros are:
-\defaultsmacros@algo
-\SetNoline
+% --- End 
+%}
+%
+%\algocf@defaults@common
+%
+% option onelanguage redefinition
+%
+\ifthenelse{\boolean{algocf@optonelanguage}\AND\equal{\algocf@languagechoosen}{french}}{%
+\SetKwInput{KwIn}{Entr\'ees}%
+\SetKwInput{KwOutSortie}{Sorties}%
+\SetKwInput{KwData}{Donn\'ees}%
+\SetKwInput{KwResult}{R\'esultat}%
+\SetKw{KwTo}{\`a}%
+\SetKw{KwRet}{retourner}%
+\SetKw{Return}{retourner}%
+\SetKwBlock{Begin}{d\'ebut}{fin}%
+\SetKwRepeat{Repeat}{r\'ep\'eter}{jusqu'\`a}%
+%
+\SetKwIF{If}{ElseIf}{Else}{si}{alors}{sinon si}{sinon}{fin si}%
+\SetKwSwitch{Switch}{Case}{Other}{suivant}{faire}{cas o\`u}{autres cas}{fin d'alternative}%
+\SetKwFor{For}{pour}{faire}{fin pour}%
+\SetKwFor{ForPar}{pour}{faire en parallèle}{fin pour}%
+\SetKwFor{ForEach}{pour chaque}{faire}{fin pour chaque}%
+\SetKwFor{ForAll}{pour tous les}{faire}{fin pour tous}%
+\SetKwFor{While}{tant que}{faire}{fin tq}%
+}{}%
+\ifthenelse{\boolean{algocf@optonelanguage}\AND\equal{\algocf@languagechoosen}{german}}{%
+\SetKwInput{KwIn}{Eingabe}%KwIn
+\SetKwInput{KwOut}{Ausgabe}%KwOut
+\SetKwInput{KwData}{Daten}%KwData
+\SetKwInput{KwResult}{Ergebnis}%KwResult
+\SetKw{KwTo}{bis}%KwTo
+\SetKw{KwRet}{zur\"uck}%KwRet
+\SetKw{Return}{zur\"uck}%Return
+\SetKwBlock{Begin}{Beginn}{Ende}%Begin
+\SetKwRepeat{Repeat}{wiederhole}{bis}%Repeat
+%
+\SetKwIF{If}{ElseIf}{Else}{wenn}{dann}{sonst wenn}{sonst}{Ende wenn}%gIf
+\SetKwSwitch{Switch}{Case}{Other}{unterscheide}{tue}{Fall}{sonst}{Ende Unt.}%Switch
+\SetKwFor{For}{f\"ur}{tue}{Ende f\"ur}%For
+\SetKwFor{ForPar}{f\"ur}{tue gleichzeitig}{Ende gleichzeitig}%ForPar
+\SetKwFor{ForEach}{f\"ur jedes}{tue}{Ende f\"ur}%ForEach
+\SetKwFor{ForAll}{f\"ur alle}{tue}{Ende f\"ur}%ForAll
+\SetKwFor{While}{solange}{tue}{Ende solange}%While
+}{}%
+\ifthenelse{\boolean{algocf@optonelanguage}\AND\equal{\algocf@languagechoosen}{portugues}}{%
+\SetKwInput{KwIn}{Entrada}%
+\SetKwInput{KwOut}{Sa\'{i}da}%
+\SetKwInput{KwData}{Dados}%
+\SetKwInput{KwResult}{Resultado}%
+\SetKw{KwTo}{at\'{e}}
+\SetKw{KwRet}{retorna}%
+\SetKw{Return}{retorna}%
+\SetKwBlock{Begin}{in\'{i}cio}{fim}%
+\SetKwRepeat{Repeat}{repita}{at\'{e}}%
+%
+\SetKwIF{If}{ElseIf}{Else}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim se}%
+\SetKwSwitch{Switch}{Case}{Other}{selecione}{fa\c{c}a}{caso}{sen\~{a}o}{fim selec}%
+\SetKwFor{For}{para}{fa\c{c}a}{fim para}%
+\SetKwFor{ForPar}{para}{fa\c{c}a em paralelo}{fim para}
+\SetKwFor{ForEach}{para cada}{fa\c{c}a}{fim para cada}%
+\SetKwFor{ForAll}{para todo}{fa\c{c}a}{fim para todo}%
+\SetKwFor{While}{enquanto}{fa\c{c}a}{fim enqto}%
+}{}%
+\ifthenelse{\boolean{algocf@optonelanguage}\AND\equal{\algocf@languagechoosen}{italiano}}{%
+\SetKwInput{KwIn}{Ingresso}%
+\SetKwInput{KwOut}{Uscita}%
+\SetKwInput{KwData}{Dati}%
+\SetKwInput{KwResult}{Risultato}%
+\SetKw{KwTo}{a}%
+\SetKw{KwRet}{ritorna}%
+\SetKw{Return}{ritorna}%
+\SetKwBlock{Begin}{inizio}{fine}%
+\SetKwRepeat{Repeat}{ripeti}{finché}%
+%
+\SetKwIF{If}{ElseIf}{Else}{se}{allora}{altrimenti se}{allora}{fine se}%
+\SetKwSwitch{Switch}{Case}{Other}{switch}{do}{case}{otherwise}{endsw}%
+\SetKwFor{For}{per}{fai}{fine per}%
+\SetKwFor{ForPar}{per}{fai in parallelo}{fine per}%
+\SetKwFor{ForEach}{per ciascun}{fai}{fine per ciascun}%
+\SetKwFor{ForAll}{per tutti i}{fai}{fine per tutti}%
+\SetKwFor{While}{finché}{fai}{fine finché}%
+}{}%
+%
+%%%% old commands compatibility
+%
+\ifthenelse{\boolean{algocf@oldcommands}}{%
+\newcommand{\SetNoLine}{\SetAlgoNoLine}%
+\newcommand{\SetVline}{\SetAlgoVlined}%
+\newcommand{\SetLine}{\SetAlgoLined}%
+%
+\newcommand{\dontprintsemicolon}{\DontPrintSemicolon}%
+\newcommand{\printsemicolon}{\PrintSemicolon}%
+\newcommand{\incmargin}[1]{\IncMargin{#1}}%
+\newcommand{\decmargin}[1]{\DecMargin{-#1}}%
+\newcommand{\setnlskip}[1]{\SetNlSkip{#1}}%
+\newcommand{\Setnlskip}[1]{\SetNlSkip{#1}}%
+\newcommand{\setalcapskip}[1]{\SetAlCapSkip{#1}}%
+\newcommand{\setalcaphskip}[1]{\SetAlCapHSkip{#1}}%
+\newcommand{\nlSty}[1]{\NlSty{#1}}%
+\newcommand{\Setnlsty}[3]{\SetNlSty{#1}{#2}{#3}}%
+\newcommand{\linesnumbered}{\LinesNumbered}%
+\newcommand{\linesnotnumbered}{\LinesNotNumbered}%
+\newcommand{\linesnumberedhidden}{\LinesNumberedHidden}%
+\newcommand{\showln}{\ShowLn}%
+\newcommand{\showlnlabel}[1]{\ShowLnLabel{#1}}%
+\newcommand{\nocaptionofalgo}{\NoCaptionOfAlgo}%
+\newcommand{\restorecaptionofalgo}{\RestoreCaptionOfAlgo}%
+\newcommand{\restylealgo}[1]{\RestyleAlgo{#1}}%
+%
+\newcommand{\Titleofalgo}[1]{\TitleOfAlgo{#1}}%
+\SetKwIF{gSi}{gSinonSi}{gSinon}{si}{alors}{sinon si}{sinon}{fin si}%
+\SetKwIF{gIf}{gElsIf}{gElse}{if}{then}{else if}{else}{end if}%
+\SetKwIF{gIf}{gElseIf}{gElse}{if}{then}{else if}{else}{end if}%
+\SetKwIF{gWenn}{gSonstWenn}{gSonst}{wenn}{dann}{sonst wenn}{sonst}{Ende wenn}%gIf
+\SetKwIF{gSe}{gSenaoSe}{gSenao}{se}{ent\~{a}o}{sen\~{a}o se}{sen\~{a}o}{fim se}%
+\SetKwIF{gSea}{gAltSe}{gAltrimenti}{se}{allora}{altrimenti se}{allora}{fine se}%
+}{%
+  \relax%
+}%
 %
 %
 %
 %%
 %%%
-%%%% END
+%%%% END
\ No newline at end of file