geradwp (25apr22)

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

1 files changed, 149 insertions, 91 deletions

diff --git a/Master/texmf-dist/tex/latex/geradwp/geradwp.cls b/Master/texmf-dist/tex/latex/geradwp/geradwp.cls
index fd2bcb5fc80..d17dfaf3596 100644
--- a/Master/texmf-dist/tex/latex/geradwp/geradwp.cls
+++ b/Master/texmf-dist/tex/latex/geradwp/geradwp.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a stripped version of the original file.
 %% 
-%% Copyright 2021 GERAD, HEC Montreal
+%% Copyright 2022 GERAD, HEC Montreal
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -28,7 +28,7 @@
 %% geradwp.pdf and the derived files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{geradwp}[2021/08/11 v1.0 Class for the Cahiers du GERAD series]
+\ProvidesClass{geradwp}[2022/04/25 v1.1 Class for the Cahiers du GERAD series]
 \RequirePackage{ifthen}
 
 \newboolean{GD@isWebVersion}
@@ -37,6 +37,7 @@
 \newboolean{GD@needsSmallHeadSep}
 \newboolean{GD@isFinalImpression}
 \newboolean{GD@isPostPublication}
+\newboolean{GD@isSupplement}
 \newboolean{GD@isRevised}
 \newboolean{GD@needsminitabs}
 
@@ -46,6 +47,7 @@
 \setboolean{GD@needsSmallHeadSep}{false}
 \setboolean{GD@isFinalImpression}{false}
 \setboolean{GD@isPostPublication}{false}
+\setboolean{GD@isSupplement}{false}
 \setboolean{GD@isRevised}{false}
 \setboolean{GD@needsminitabs}{false}
 
@@ -76,6 +78,9 @@
 \DeclareOption{gdpostpub}{%
 \setboolean{GD@isPostPublication}{true}
 }
+\DeclareOption{gdsupplement}{%
+\setboolean{GD@isSupplement}{true}
+}
 \DeclareOption{gdrevised}{%
 \setboolean{GD@isRevised}{true}
 }
@@ -100,13 +105,12 @@
 \RequirePackage{multirow}
 \RequirePackage{array}
 \RequirePackage[font={footnotesize,bf,sf}]{caption}
-\RequirePackage{color}
+\RequirePackage{xcolor}
 \RequirePackage{enumitem}
 \ifthenelse{\boolean{GD@needsminitabs}}{%
 \RequirePackage{float}
 }{}
 
-\definecolor{gris}{rgb}{0.44,0.44,0.44} % color pkg setup
 \captionsetup[table]{skip=5pt} % caption pkg setup
 
 \newlength{\GD@authitemsep}
@@ -114,6 +118,7 @@
 \newlength{\GD@affilitemsep}
 \newlength{\GD@affiltopsep}
 \newlength{\GD@titleminipage@hspace}
+\newlength{\GD@coverpage@vspace}
 \ifthenelse{\boolean{GD@isPlainVersion}}{%
 \setlength{\GD@authitemsep}{0pt}
 \setlength{\GD@authtopsep}{12pt}
@@ -146,7 +151,6 @@ includehead}
 bmargin=2cm,%
 lmargin=3cm,%
 rmargin=3cm,%
-nofoot,%
 headsep=30pt,%
 includehead}
 }{}
@@ -224,16 +228,19 @@ includehead}
 \popQED\endtrivlist\@endpefalse
 }
 
-\newcommand{\gd@annee}{}
-\newcommand{\gd@mois}{}
-\newcommand{\gd@month}{}
-\newcommand{\gd@numero}{}
-\newcommand{\gd@titre}{}
-\newcommand{\gd@auteurs@short}{}
-\newcommand{\gd@auteurs@copyright}{}
+\newcommand{\gd@year}{}
+\newcommand{\gd@month@fr}{}
+\newcommand{\gd@month@en}{}
+\newcommand{\gd@number}{}
+\newcommand{\gd@title}{}
+\newcommand{\gd@authors@short}{}
+\newcommand{\gd@authors@copyright}{}
 \newcommand{\gd@postpubcitation}{}
 \newcommand{\gd@postpubcitation@url}{}
-\newcommand{\gd@revised}{}
+\newcommand{\gd@supplementname}{}
+\newcommand{\gd@revised@year}{}
+\newcommand{\gd@revised@month@fr}{}
+\newcommand{\gd@revised@month@en}{}
 
 \newcommand{\GD@cover}{%
 \ifthenelse{\boolean{GD@isFinalImpression}}{}{%
@@ -252,13 +259,18 @@ includehead}
 \ifthenelse{\boolean{GD@isWebVersion}}{% 
 
 \vspace*{54pt}
-{\noindent\LARGE\bfseries \gd@titre\par} %Title
-
+{\noindent\LARGE\bfseries \gd@title\par} %Title
+\ifthenelse{\boolean{GD@isSupplement}}%
+{{\noindent\LARGE\gd@supplementname\par}}{}
 \vspace*{18pt}
-{\noindent\Large\gd@auteurs@short\par} 
+{\noindent\Large\gd@authors@short\par}
+
+\vfill 
 }{}
 
-\vfill
+\ifthenelse{\boolean{GD@isPaperVersion}}{%
+\vspace*{\GD@coverpage@vspace}
+}{}
 \hspace*{\GD@titleminipage@hspace}
 \begin{minipage}[c][5.4cm][c]{7cm}
 {\ifthenelse{\boolean{GD@isWebVersion}}%
@@ -279,36 +291,38 @@ includehead}
 
 \newcommand{\GDcover@minipagetable@web}{%
 \begin{tabular}{p{.5cm}|p{5.5cm}}
-& \normalsize G--\gd@annee--\gd@numero
+& \normalsize G--\gd@year--\gd@number
 \ifthenelse{\boolean{GD@needsminitabs}}%
 {\\*[10pt]}%
 {\\*[8pt]}
-& \normalsize\gd@month\ \gd@annee
+& \normalsize\gd@month@en\ \gd@year
 \ifthenelse{\boolean{GD@isRevised}}{%
 \\
-&\normalsize Revised: \gd@revised
+&\normalsize Revised: \gd@revised@month@en\ \gd@revised@year
 }{}
 \end{tabular}
 }
 
 \newcommand{\GDcover@minipagetable@paper}{%
 \begin{tabular}{p{.5cm}|p{5.5cm}}
-\multicolumn{2}{p{6.5cm}}{\normalsize\bfseries \gd@titre
+\multicolumn{2}{p{6.5cm}}{\normalsize\bfseries \gd@title
 \ifthenelse{\boolean{GD@needsminitabs}}%
 {\vspace*{12.5pt}}%
 {\vspace*{10pt}}}\\
-& \normalsize\gd@auteurs@short \\ %Initials. Name
+\ifthenelse{\boolean{GD@isSupplement}}%
+{& \gd@supplementname\\*[10pt]}{}
+& \normalsize\gd@authors@short \\ %Initials. Name
 & \ifthenelse{\boolean{GD@needsminitabs}}%
 {\\*[15pt]}%
 {\\*[12pt]} 
-& \normalsize G--\gd@annee--\gd@numero
+& \normalsize G--\gd@year--\gd@number
 \ifthenelse{\boolean{GD@needsminitabs}}%
 {\\*[10pt]}%
 {\\*[8pt]}
-& \normalsize\gd@month\ \gd@annee
+& \normalsize\gd@month@en\ \gd@year
 \ifthenelse{\boolean{GD@isRevised}}{%
 \\
-&\normalsize Revised: \gd@revised
+&\normalsize Revised: \gd@revised@month@en\ \gd@revised@year
 }{}
 \end{tabular}
 }
@@ -328,12 +342,16 @@ un lien vers l'article publi\'{e} est ajout\'{e}.\\
 
 \medskip
 \scriptsize
-\textbf{Citation sugg\'{e}r\'{e}e :} \gd@auteurs@short~(\gd@mois\
-\gd@annee). \gd@titre, Rapport technique, Les Cahiers du GERAD G--
-\gd@annee--\gd@numero, GERAD, HEC Montr\'{e}al, Canada.\\
+\textbf{Citation sugg\'{e}r\'{e}e :} \gd@authors@short~(\gd@month@fr\
+\gd@year). \gd@title,
+\ifthenelse{\boolean{GD@isSupplement}}{\gd@supplementname .}{}
+Rapport technique, Les Cahiers du GERAD G--
+\gd@year--\gd@number, GERAD, HEC Montr\'{e}al, Canada.
+\ifthenelse{\boolean{GD@isRevised}}%
+{ Version r\'evis\'ee: \gd@revised@month@fr\ \gd@revised@year}{}\\
 
 \textbf{Avant de citer ce rapport technique,} veuillez visiter notre
-site Web (\url{https://www.gerad.ca/fr/papers/G-\gd@annee-\gd@numero})
+site Web (\url{https://www.gerad.ca/fr/papers/G-\gd@year-\gd@number})
 afin de mettre \`a jour vos donn\'ees de r\'ef\'erence, s'il a \'et\'e
 publi\'e dans une revue scientifique.\par
 \end{minipage}
@@ -347,12 +365,16 @@ the original pdf is removed and a link to the published article is
 added.\\ \\
 
 \scriptsize
-\textbf{Suggested citation:} \gd@auteurs@short~(\gd@month\ \gd@annee).
-\gd@titre, Technical report, Les Cahiers du GERAD G--\gd@annee--\gd@numero,
-GERAD, HEC Montr\'{e}al, Canada.\\
+\textbf{Suggested citation:} \gd@authors@short~(\gd@month@en\ \gd@year).
+\gd@title,
+\ifthenelse{\boolean{GD@isSupplement}}{\gd@supplementname .}{}
+Technical report, Les Cahiers du GERAD G--\gd@year--\gd@number,
+GERAD, HEC Montr\'{e}al, Canada.
+\ifthenelse{\boolean{GD@isRevised}}%
+{ Revised version: \gd@revised@month@en\ \gd@revised@year}{}\\
 
 \textbf{Before citing this technical report,} please visit our website
-(\url{https://www.gerad.ca/en/papers/G-\gd@annee-\gd@numero}) to update
+(\url{https://www.gerad.ca/en/papers/G-\gd@year-\gd@number}) to update
 your reference data, if it has been published in a scientific journal.
 \par
 \end{minipage}
@@ -370,8 +392,8 @@ recherche du Qu\'ebec -- Nature et technologies.
 
 \medskip
 D\'ep\^ot l\'egal -- Biblioth\`eque et Archives nationales du Qu\'ebec,
-\gd@annee\\
-\phantom{Depot legal} -- Biblioth\`eque et Archives Canada, \gd@annee
+\gd@year\\
+\phantom{Depot legal} -- Biblioth\`eque et Archives Canada, \gd@year
 \par
 \end{minipage}
 \hfill
@@ -384,8 +406,8 @@ the Fonds de recherche du Qu\'ebec -- Nature et technologies.
 
 \medskip
 Legal deposit -- Biblioth\`eque et Archives nationales du Qu\'ebec,
-\gd@annee\\
-\phantom{Legal deposit} -- Library and Archives Canada, \gd@annee\par
+\gd@year\\
+\phantom{Legal deposit} -- Library and Archives Canada, \gd@year\par
 \end{minipage}
 
 \hrule
@@ -456,10 +478,8 @@ added.\par
 \hrule
 \smallskip
 
-\noindent
-\begin{minipage}[t][2.1cm][l]{7.5cm}
+\noindent\begin{minipage}[t][2.1cm][l]{7.5cm}
 \scriptsize
-\medskip
 La publication de ces rapports de recherche est rendue possible gr\^ace
 au soutien de HEC Montr\'eal, Polytechnique Montr\'eal, Universit\'e
 McGill, Universit\'e du Qu\'ebec \`a Montr\'eal, ainsi que du Fonds de
@@ -467,13 +487,13 @@ recherche du Qu\'ebec -- Nature et technologies.
 
 \medskip
 D\'ep\^ot l\'egal -- Biblioth\`eque et Archives nationales du Qu\'ebec,
-2020\\
-\phantom{Depot legal} -- Biblioth\`eque et Archives Canada, 2020\par
+\gd@year\\
+\phantom{Depot legal} -- Biblioth\`eque et Archives Canada, \gd@year
+\par
 \end{minipage}
 \hfill
 \begin{minipage}[t][2.1cm][l]{7.5cm}
 \scriptsize
-\medskip
 The publication of these research reports is made possible
 thanks to the support of HEC Montr\'eal, Polytechnique Montr\'eal,
 McGill University, Universit\'e du Qu\'ebec \`a Montr\'eal, as well as
@@ -481,8 +501,8 @@ the Fonds de recherche du Qu\'ebec -- Nature et technologies.
 
 \medskip
 Legal deposit -- Biblioth\`eque et Archives nationales du Qu\'ebec,
-2020\\
-\phantom{Legal deposit} -- Library and Archives Canada, 2020\par
+\gd@year\\
+\phantom{Legal deposit} -- Library and Archives Canada, \gd@year\par
 \end{minipage}
 
 \hrule
@@ -525,7 +545,10 @@ www.gerad.ca\par
 }
 \parindent=0pt
 \sffamily
-{\LARGE\bfseries \gd@titre\par} %Title
+{\LARGE\bfseries \gd@title\par} %Title
+\ifthenelse{\boolean{GD@isSupplement}}%
+{{\LARGE\gd@supplementname\par}
+}{}
 \begin{minipage}[t][10cm][l]{7.5cm} 
 \vspace*{55pt}
 }
@@ -534,14 +557,14 @@ www.gerad.ca\par
 \vfill
 \end{minipage}
 \vfill
-{\bfseries \gd@month\ \gd@annee}\\*
+{\bfseries \gd@month@en\ \gd@year}\\*
 \ifthenelse{\boolean{GD@isRevised}}%
-{\\ \gd@revised \\}%
+{Revised: \gd@revised@month@en\ \gd@revised@year \\}%
 {}
 {\bfseries Les Cahiers du GERAD}\\
-{\bfseries G--\gd@annee--\gd@numero}\\
-{\footnotesize Copyright \copyright\ \gd@annee\ GERAD,
-\gd@auteurs@copyright}
+{\bfseries G--\gd@year--\gd@number}\\
+{\footnotesize Copyright \copyright\ \gd@year\ GERAD,
+\gd@authors@copyright}
 \vspace*{0.05cm}
 
 \hrule
@@ -598,47 +621,60 @@ investigate your claim.\par
 \newcommand{\GD@plain@titlepage@begin}{%
 \thispagestyle{empty}
 \sffamily
-{\sffamily\LARGE\bfseries\noindent\gd@titre\par}
+{\sffamily\LARGE\bfseries\noindent\gd@title\par}
+\ifthenelse{\boolean{GD@isSupplement}}%
+{{\noindent\LARGE\gd@supplementname\par}}{}
 }
 
 \newcommand{\GD@plain@pagetitle@end}{%
 \vspace*{12pt}
-{\noindent\gd@mois\ \gd@annee}
+{\noindent\gd@month@en\ \gd@year}
+\ifthenelse{\boolean{GD@isRevised}}%
+{\\ {\noindent Revised: \gd@revised@month@en\ \gd@revised@year}}{}
 \vspace*{30pt}
 }
 
-\newcommand{\GDannee}[1]{%
-\renewcommand{\gd@annee}{#1}
+\newcommand{\GDcoverpagewhitespace}[1]{%
+\setlength{\GD@coverpage@vspace}{#1}
 }
-\newcommand{\GDmois}[2]{%
-\renewcommand{\gd@mois}{#1}
-\renewcommand{\gd@month}{#2}
+
+\newcommand{\GDyear}[1]{%
+\renewcommand{\gd@year}{#1}
+}
+\newcommand{\GDmonth}[2]{%
+\renewcommand{\gd@month@fr}{#1}
+\renewcommand{\gd@month@en}{#2}
 }
-\newcommand{\GDnumero}[1]{%
-\renewcommand{\gd@numero}{#1}
+\newcommand{\GDnumber}[1]{%
+\renewcommand{\gd@number}{#1}
 }
-\newcommand{\GDtitre}[1]{%
-\renewcommand{\gd@titre}{#1}
+\newcommand{\GDtitle}[1]{%
+\renewcommand{\gd@title}{#1}
 }
-\newcommand{\GDauteursCourts}[1]{%
-\renewcommand{\gd@auteurs@short}{#1}
+\newcommand{\GDauthorsShort}[1]{%
+\renewcommand{\gd@authors@short}{#1}
 }
-\newcommand{\GDauteursCopyright}[1]{%
-\renewcommand{\gd@auteurs@copyright}{#1}
+\newcommand{\GDauthorsCopyright}[1]{%
+\renewcommand{\gd@authors@copyright}{#1}
 }
 \newcommand{\GDpostpubcitation}[2]{%
 \renewcommand{\gd@postpubcitation}{#1}
 \renewcommand{\gd@postpubcitation@url}{#2}
 }
-\newcommand{\GDrevised}[1]{%
-\renewcommand{\gd@revised}{#1}
+\newcommand{\GDsupplementname}[1]{%
+\renewcommand{\gd@supplementname}{#1}
+}
+\newcommand{\GDrevised}[3]{%
+\renewcommand{\gd@revised@month@fr}{#1}
+\renewcommand{\gd@revised@month@en}{#2}
+\renewcommand{\gd@revised@year}{#3}
 }
 
-\newcommand{\GDpageCouverture}{%
+\newcommand{\GDcoverpage}{%
 \ifthenelse{\boolean{GD@isPlainVersion}}{}{\GD@cover}
 }
 
-\newenvironment{GDpagetitre}{
+\newenvironment{GDtitlepage}{
 \ifthenelse{\boolean{GD@isPlainVersion}}%
 {\GD@plain@titlepage@begin}%
 {\GD@titlepage@begin} 
@@ -681,29 +717,33 @@ parsep=0pt}
 \setcounter{page}{2}
 \renewcommand{\thepage}{\roman{page}}
 \pagestyle{fancy}
-\lhead[
-\textcolor{gris}{\sffamily{\,}\thepage}\hfill
-\textcolor{gris}{\sffamily G--\gd@annee--\gd@numero}\hfill %
+\fancyhead[LO]{%
+\textcolor{gray}{\sffamily{\,} Les Cahiers du GERAD}\hfill
+\textcolor{gray}{\sffamily G--\gd@year--\gd@number}%
+\ifthenelse{\boolean{GD@isSupplement}}%
+{\textcolor{gray}{\sffamily\ -- \itshape \gd@supplementname}}%
+{} %
 \ifthenelse{\boolean{GD@isRevised}}%
-{{ -- \itshape Revised}}%
-{}
-\textcolor{gris}{\sffamily Les Cahiers du GERAD}
-{\large\strut}\color{gris}{\hrule}
-]
-{
-\textcolor{gris}{\sffamily{\,} Les Cahiers du GERAD}\hfill
-\textcolor{gris}{\sffamily G--\gd@annee--\gd@numero}\hfill %
+{\textcolor{gray}{\sffamily\ -- \itshape Revised}}%
+{}\hfill
+\textcolor{gray}{\sffamily\thepage}
+{\large\strut}\color{gray}{\hrule}
+}
+\fancyhead[LE]{%
+\textcolor{gray}{\sffamily{\,}\thepage}\hfill
+\textcolor{gray}{\sffamily G--\gd@year--\gd@number}%
+\ifthenelse{\boolean{GD@isSupplement}}%
+{\textcolor{gray}{\sffamily\ -- \itshape \gd@supplementname}}%
+{} %
 \ifthenelse{\boolean{GD@isRevised}}%
-{{ -- \itshape Revised}}%
-{}
-\textcolor{gris}{\sffamily\thepage}
-{\large\strut}\color{gris}{\hrule}
-}
-\chead[]{}
-\rhead[]{}
-\lfoot[]{}
-\cfoot[]{}
-\rfoot[]{} 
+{\textcolor{gray}{\sffamily\ -- \itshape Revised}}%
+{}\hfill
+\textcolor{gray}{\sffamily Les Cahiers du GERAD}
+{\large\strut}\color{gray}{\hrule}
+}
+\fancyhead[C]{}
+\fancyhead[R]{}
+\fancyfoot{} 
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
 \rmfamily
@@ -737,6 +777,24 @@ parsep=0pt}
 \rmfamily
 }
 }
+
+\newcommand{\GDtitre}[1]{\GDtitle{#1}}
+\newcommand{\GDmois}[2]{\GDmonth{#1}{#2}}
+\newcommand{\GDannee}[1]{\GDyear{#1}}
+\newcommand{\GDnumero}[1]{\GDnumber{#1}}
+\newcommand{\GDauteursCourts}[1]{\GDauthorsShort{#1}}
+\newcommand{\GDauteursCopyright}[1]{\GDauthorsCopyright{#1}}
+\newcommand{\GDpageCouverture}{\GDcoverpage}
+\newenvironment{GDpagetitre}{
+\ifthenelse{\boolean{GD@isPlainVersion}}%
+{\GD@plain@titlepage@begin}%
+{\GD@titlepage@begin} 
+}{
+\ifthenelse{\boolean{GD@isPlainVersion}}%
+{\GD@plain@pagetitle@end}%
+{\GD@titlepage@end} 
+}
+
 \endinput
 %%
 %% End of file `geradwp.cls'.