matapli (23mar21) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58636 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 58 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/matapli/matapli.cls b/Master/texmf-dist/tex/latex/matapli/matapli.cls
index 67e580521f2..f8e6e5b9106 100644
--- a/Master/texmf-dist/tex/latex/matapli/matapli.cls
+++ b/Master/texmf-dist/tex/latex/matapli/matapli.cls
@@ -17,8 +17,8 @@
 % on lance la syntax LaTeX3
 \ExplSyntaxOn
 \ProvidesExplClass{matapli}
-{2021/01/20}
-{1.0}
+{2021/03/22}
+{1.1}
 {SMAI class for the French jornal MATAPLI}
 
 % classe de base
@@ -28,7 +28,7 @@
 \RequirePackage{iftex}
 \RequirePackage{latexsym,amssymb,subfig,amsthm,mathtools}
 % pour la fonte
-% cas différent si on utilise LuaLaTeX ou non 
+% cas différent si on utilise LuaLaTeX ou non
 \ifluatex
 %\RequirePackage[sfdefault,scaled=.85]{FiraSans}
 %\RequirePackage{newtxsf}
@@ -48,7 +48,9 @@
 \RequirePackage{graphicx}
 % paramétrer les haut et bas de page
 \RequirePackage{fancyhdr}
-% pour quelques symboles 
+% symboles par exemple pour \Telefon
+\RequirePackage{marvosym}
+% pour quelques symboles
 \RequirePackage{eurosym}
 % gestion de la composition multicolonne
 \RequirePackage{multicol}
@@ -347,7 +349,29 @@ unicode]{hyperref}
     \leaders\hrule height1pt\hfill
     \MakeUppercase{Table des matières}}
   \etocsettocdepth{2}
-  \localtableofcontents}
+\begingroup
+\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
+\renewcommand*\etocmulticolsep{0ex}
+\renewcommand*\etoccolumnsep{0em}
+\etocsetstyle {section}
+{}
+{\leavevmode\leftskip 0cm\relax}
+{\bfseries\normalsize
+\etocifnumbered{\makebox[.6cm][l]{\etocnumber}}{}%
+\etocname\nobreak\leaders\hbox to.2cm{\hss.}\hfill\nobreak
+\rlap{\makebox[0.6cm]{\mdseries\etocpage}}
+\par}
+{}
+\etocsetstyle {subsection}
+{}
+{\leavevmode\leftskip 0.3cm\relax }
+{\mdseries\normalsize\makebox[0.6cm][l]{\etocnumber}%
+\etocname\nobreak\leaders\hbox to.2cm{\hss.}\hfill\nobreak
+\rlap{\makebox[0.6cm]{\etocpage}}
+\par}
+{}
+  \localtableofcontents
+\endgroup}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -457,7 +481,7 @@ unicode]{hyperref}
   }{ % sinon
     \iow_open:Nn \g_auxfile_iow {\jobname-chap\int_use:N \g__matapli_articles_int.aux}
   }
-  \iow_now:Nn \g_auxfile_iow {\begin{center}} % on commence par centrer le texte
+  \iow_now:Nn \g_auxfile_iow {\begin{matapliauteurtitre}} % on commence par centrer le texte
     % on parcours tous les éléments des listes d'auteur·e·s
   \int_step_inline:nn {\tl_count:N \g__matapli_auteurs_first_last_names_list_tl}{
     %   % get the ##1-th element from \l_student_group_tl
@@ -515,7 +539,7 @@ unicode]{hyperref}
         \tl_if_empty:NTF{\l__matapli_photo_tl}{% pas de photo
           \tl_item:Nn \g__matapli_auteurs_minibio_list_tl {##1}
         }{% si photo
-          \noindent\begin{tabularx}{0.9\linewidth}{cp{0.7\linewidth}}
+          \noindent\begin{tabularx}{0.9\linewidth}{c>{\raggedright}p{0.7\linewidth}}
             \includegraphics[width=0.18\linewidth,valign=T]{\tl_item:Nn \g__matapli_auteurs_photo_list_tl {##1}} & \tl_item:Nn \g__matapli_auteurs_minibio_list_tl {##1}\par
 
             \tl_if_empty:NTF{\l__matapli_auteur_email_tl}{}{\textbf{Email~:}~\url{\tl_item:Nn \g__matapli_auteurs_email_list_tl {##1}}\par}
@@ -528,7 +552,7 @@ unicode]{hyperref}
       \end{matapli@auteur}
     }
   } % fin boucle auteurs
-  \iow_now:Nn \g_auxfile_iow {\end{center}}
+  \iow_now:Nn \g_auxfile_iow {\end{matapliauteurtitre}}
 \iow_close:N \g_auxfile_iow
 \tl_clear:N \g__matapli_auteurs_first_last_names_list_tl
 \tl_clear:N \g__matapli_auteurs_affiliation_list_tl
@@ -557,6 +581,19 @@ unicode]{hyperref}
 }
 \ExplSyntaxOff
 
+% environnement pour le formattage des auteur·e·s après le titre de l'article
+\newenvironment{matapliquote}%
+  {\list{}{\leftmargin=1in\rightmargin=1in}\item[]}%
+  {\endlist}
+\newenvironment{matapliauteurtitre}{
+  \begin{matapliquote}
+    \small
+  \itshape par :\vspace*{-0.4cm}\par
+  \hrulefill\vspace*{-0.3cm}
+  \flushright
+}
+{\end{matapliquote}\bigskip
+}
 
 % environnement interne de formattage de la présentation des auteur·e·s
 \newenvironment{matapli@auteur}[1]{%
@@ -568,6 +605,7 @@ unicode]{hyperref}
     boxrule=0pt,bottomrule=0.5pt,toprule=0.5pt}
   \medskip
   \begin{tcolorbox}[title={\large\bfseries #1}]%
+    \small
   }%
   {\end{tcolorbox}\medskip\clearpage}
 
@@ -588,20 +626,20 @@ unicode]{hyperref}
     \node[anchor=north west, text=white, font=\large\scshape\bfseries,
     minimum size=1in, inner xsep=5mm] at (current page.north
     west) {\leftmark};
-    \node[anchor=north east, minimum size=1in, inner
-    xsep=5mm] at (current page.north east)
-    {\rightmark};
+    %\node[anchor=north east, minimum size=1in, inner
+    %xsep=5mm] at (current page.north east)
+    %{\rightmark};
   \end{tikzpicture}
 }
 \fancyhead[O]{
   \begin{tikzpicture}[overlay, remember picture]%
     \fill[principale] ($(current page.north west)-(0.1\hoffset,-0.07\voffset)$) rectangle ($(current
     page.north east)+(0.1\hoffset,-0.8in)$);
-    \node[anchor=north east, text=white, font=\large\scshape\bfseries,
-    minimum size=1in, inner xsep=5mm] at (current page.north
-    east) {\leftmark};
-    \node[anchor=north west, minimum size=1in, inner
-    xsep=5mm] at (current page.north west)
+    %\node[anchor=north east, text=white, font=\large\scshape\bfseries,
+    %minimum size=1in, inner xsep=5mm] at (current page.north
+    %east) {\leftmark};
+    \node[anchor=north east, minimum size=1in, inner
+    xsep=5mm] at (current page.north east)
     {\rightmark};
   \end{tikzpicture}
 }
@@ -872,23 +910,23 @@ unicode]{hyperref}
 \newtcbtheorem[number within=chapter,
 number freestyle={\noexpand\arabic{\tcbcounter}},
 ]{theorem}{Théorème}%
-{   arc=0pt,outer
+{ breakable,  arc=0pt,outer
   arc=0pt,colback=gray!10!white,colframe=principale,
   boxsep=0pt,left=10pt,right=10pt,top=8pt,bottom=10pt,
   bottomtitle = 3pt, toptitle=3pt,
   boxrule=0pt,bottomrule=0.5pt,toprule=0.5pt,
-  fonttitle=\scshape\bfseries,
+  fonttitle=\scshape\bfseries\hypersetup{hidelinks},
   separator sign={~: }}{th}
 
 \newtcbtheorem[number within=chapter,
 number freestyle={\noexpand\arabic{\tcbcounter}},
 ]{definition}{Définition}%
-{   arc=0pt,outer
+{  breakable, arc=0pt,outer
   arc=0pt,colback=gray!10!white,colframe=secondaire,
   boxsep=0pt,left=10pt,right=10pt,top=8pt,bottom=10pt,
   bottomtitle = 3pt, toptitle=3pt,
   boxrule=0pt,bottomrule=0.5pt,toprule=0.5pt,
-  fonttitle=\scshape\bfseries,
+  fonttitle=\scshape\bfseries\hypersetup{hidelinks},
   separator sign={~: }}{def}
 
 \newtheorem{lemma}{Lemme}[chapter]