summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl4
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.pdfbin634996 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/english/README-TRANSLATION.md5
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/dutch.pdfbin293059 -> 157578 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/english.pdfbin285361 -> 150396 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/example.pdfbin304513 -> 169097 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/french.pdfbin358415 -> 223683 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/german.pdfbin290076 -> 155070 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/issue.pdfbin2962880 -> 363659 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/examples/template.tex5
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc (renamed from Master/texmf-dist/doc/latex/nwejm/documentation/latexmkrc)0
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib (renamed from Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.bib)12
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdfbin0 -> 503012 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex (renamed from Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.tex)228
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/latexmkrc.tex17
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/nwejm-logo-NB.pdfbin147686 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/nwejm-logo.pdfbin479711 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/nwejm.cwl209
-rw-r--r--Master/texmf-dist/doc/latex/nwejm/nwejmart.cwl5
-rw-r--r--Master/texmf-dist/source/latex/nwejm/ltxdoc.cfg11
-rw-r--r--Master/texmf-dist/source/latex/nwejm/nwejm.drv45
-rw-r--r--Master/texmf-dist/source/latex/nwejm/nwejm.dtx1170
-rw-r--r--Master/texmf-dist/source/latex/nwejm/nwejm.ins101
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf317
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf249
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-cover-background.jpgbin0 -> 4889017 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-federation-recherche-math-npdc-logo.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-federation-recherche-math-npdc-logo.pdf)bin4118 -> 4118 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-fields-institute-logo.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-fields-institute-logo.pdf)bin146648 -> 146648 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-kwg-logo.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-kwg-logo.pdf)bin1187857 -> 1187857 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.pdfbin0 -> 11528 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.pdfbin0 -> 11536 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.pdf)bin1960518 -> 1960518 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.tex (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.tex)0
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-smf-logo.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-smf-logo.pdf)bin140012 -> 140012 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/images/nwejm-sml-logo.pdf (renamed from Master/texmf-dist/doc/latex/nwejm/nwejm-sml-logo.pdf)bin9287 -> 9287 bytes
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl39
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl39
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl39
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl39
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.bbx116
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.cbx140
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.cfg131
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.cls943
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.dbx34
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.lbx42
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejmart.cls330
46 files changed, 2057 insertions, 2213 deletions
diff --git a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl
index f383b4ee744..e44b98f5c0d 100644
--- a/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl
+++ b/Master/texmf-dist/doc/latex/nwejm/addons/completion/nwejm.cwl
@@ -198,7 +198,7 @@ dutch
\computerengineer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\classmaintainer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\fontdesigner{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\printingservice{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
+\graphicdesign{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\computerassistance{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\secretary{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\issuesetup{number=%<positive integer%>}#n
@@ -206,4 +206,4 @@ dutch
\inputarticle{file}#i
\inputarticle[path]{file}#i
\fontdesignertext{text}#n
-\printertext{text}#n
+\graphicdesigntext{text}#n
diff --git a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.pdf b/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.pdf
deleted file mode 100644
index eef95d0af55..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/english/README-TRANSLATION.md b/Master/texmf-dist/doc/latex/nwejm/english/README-TRANSLATION.md
new file mode 100644
index 00000000000..07d496fd45a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nwejm/english/README-TRANSLATION.md
@@ -0,0 +1,5 @@
+# Contributions welcome!
+
+Currently, the `yathesis` documentation is not translated in English. In case
+you're interested, please contact the maintainer:
+`denis.bitouze@lmpa.univ-littoral.fr`
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/dutch.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/dutch.pdf
index 45cc8d96e1a..664d179ca7f 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/dutch.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/dutch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/english.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/english.pdf
index 42290f7fc43..0a5d5921fa4 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/english.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/example.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/example.pdf
index ff286f3fa72..bc11ad85cc9 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/example.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/french.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/french.pdf
index 13ac938259b..ec9d7355346 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/french.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/french.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/german.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/german.pdf
index 3e887e43604..e725ccf6478 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/german.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/german.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
index a815cfa6c45..a97daa1d196 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/template.tex b/Master/texmf-dist/doc/latex/nwejm/examples/template.tex
index 9050da57a53..851bdaaef88 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/template.tex
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/template.tex
@@ -51,10 +51,11 @@
\keywords{}
%
% The Mathematical Subject Classification (MSC) are entered thanks to \msc
-% command,as a comma separated list.
+% command, as a comma separated list.
\msc{}
%
-% The title is made as usually.
+% The title is made as usually. Be aware that author(s) will be displayed or
+% updated only if a `biber' run (cf. `nwejm''s documentation for more details).
\maketitle
%
% Acknowledgments, if any, are entered thanks to \acknowledgments command (and
diff --git a/Master/texmf-dist/doc/latex/nwejm/documentation/latexmkrc b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc
index 3e6b294ce0d..3e6b294ce0d 100644
--- a/Master/texmf-dist/doc/latex/nwejm/documentation/latexmkrc
+++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/latexmkrc
diff --git a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.bib b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib
index d3b2118ba82..b376f128712 100644
--- a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.bib
+++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib
@@ -5,17 +5,17 @@
@Online{Bitouze,
Title = {Conférence \LaTeX{} \no6},
Author = {Bitouzé, Denis},
- Date = {2016-06-08},
+ Date = {2016-07-04},
Url = {http://gte.univ-littoral.fr/members/dbitouze/pub/latex/diapositives-cours-d/conference-n-6/downloadFile/file/en-ligne6.pdf},
Language = {french},
Organization = {Université du Littoral Côte d'Opale},
- Subtitle = {Bibliographie (biber/biblatex), citations d’extraits},
+ Subtitle = {Bibliographie (biber/biblatex), citations d'extraits},
}
@Online{Bitouze7,
Title = {Conférence \LaTeX{} \no7},
Author = {Bitouzé, Denis},
- Date = {2016-05-23},
+ Date = {2016-07-04},
Url = {http://gte.univ-littoral.fr/members/dbitouze/pub/latex/diapositives-cours-d/conference-n-7/downloadFile/file/en-ligne7.pdf},
Language = {french},
Organization = {Université du Littoral Côte d'Opale},
@@ -40,7 +40,7 @@
note = {Graduate Texts in Mathematics, No. 52},
publisher = {Springer-Verlag},
address = {New York},
- year = {1977}
+ date = {1977}
}
@Book{ laz1,
@@ -50,7 +50,7 @@
note = {Classical setting: line bundles and linear series},
publisher = {Springer-Verlag},
address = {Berlin},
- year = {2004}
+ date = {2004}
}
@Article{shin,
@@ -59,7 +59,7 @@
singularities},
journal = {Tokyo J. Math.},
volume = {12},
- year = {1989},
+ date = {1989},
number = {2},
pages = {375-385}
}
diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf
new file mode 100644
index 00000000000..7549b23b098
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.tex b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex
index 6d4801c965a..d3da3738658 100644
--- a/Master/texmf-dist/doc/latex/nwejm/documentation/french/nwejm-fr.tex
+++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex
@@ -8,12 +8,18 @@
\tcbset{index format=off}
%
\lstMakeShortInline[style=dbtex]|
+%
\tcbset{listing options={escapechar=+}}
%
\SetWatermarkColor{gray!10}%
\SetWatermarkFontSize{20mm}%
\SetWatermarkText{\MakeUppercase{travail en cours}}%
%
+\DeclareBibliographyCategory{examples}
+\DeclareBibliographyCategory{documentation}
+\addtocategory{examples}{shin,laz1,har}
+\addtocategory{documentation}{Bitouze,Bitouze7}
+
\addbibresource{nwejm-fr.bib}
%
\newacronym{nwejm}{nwejm}{North-Western European Journal of Mathematics}
@@ -25,17 +31,18 @@
\newtheorem[title=Fait,style=definition]{fact}
%
\DeclareMathOperator{\cat}{Cat}
-\newcommand{\mybinop}{\mathbin{@}}
+\newcommand{\mybinop}{\mathbin{*}}
%
\begin{document}
\title[Documentation de la classe \LaTeX{} du
\texorpdfstring{\nwejm}{NWEJM}]{Documentation de la classe \LaTeX{} du \nwejm*{}
- destinée aux auteurs}
+ destinée aux auteurs} \subtitle[short=Version 0.98a (06/01/2017)]{\small
+ Version 0.98a en date du 6 janvier 2017}
%
\author[%
affiliation={%
Université du Littoral Côte d'Opale, Laboratoire de mathématiques pures et
- appliquées (\nolinkurl{denis.bitouze@lmpa.univ-littoral.fr})%
+ appliquées (\nolinkurl{denis.bitouze@univ-littoral.fr})%
},%
]{Bitouzé, Denis}
%
@@ -47,6 +54,10 @@ affiliation={%
\DeclareFixedFootnote{\conseilslatex}{Et donne de façon subliminale quelques conseils
\LaTeX{}. On consultera \autocite{Ensenbach} pour un panorama plus complet des
commandes et extensions obsolètes (et autres erreurs).}
+\DeclareFixedFootnote{\suitecompilations}{Pour automatiser ces compilations, on
+ pourra recourir au \enquote{compilateur} \program{latexmk}, fourni par toute
+ distribution \TeX{} moderne, en s'aidant du fichier de configuration
+ \file{latexmkrc} joint à la présente classe.}
\section{Introduction}
\label{sec-introduction}
@@ -154,8 +165,14 @@ options de classe suivantes.
\begin{docCommand}{articlesetup}{\marg{options}}
Cette commande permet de configurer les \meta{options} de l'article en cours
- sous la forme clés/valeurs. La seule clé fournie pour l'instant est
- \refKey{gradient} (mais ceci peut être amené à changer).
+ sous la forme clés/valeurs.
+
+ La seule clé fournie pour l'instant est \refKey{gradient}.
+ \begin{docKey}{gradient}{=\docValue{grad}\textbar\docValue{nabla}}{pas
+ de valeur par défaut, initialement \docValue{grad}}
+ Cette clé permet de spécifier la façon dont est affiché le gradient grâce
+ à la commande \refCom{grad}.
+ \end{docKey}
\end{docCommand}
\begin{dbwarning}{Commande \protect\refCom{articlesetup} : pas en préambule !}{}
@@ -195,7 +212,7 @@ optionnel permettant de spécifier un \meta{(sous-)titre court} de l'article qui
figure alors à la place du (sous-)titre \enquote{normal} en titre courant et
dans la table des matières.
-\begin{bodycode}[listing options={deletekeywords={title,subtitle}}]
+\begin{bodycode}
\title[Le Traité du calcul des probabilités]{Le Traité du calcul des
probabilités et de ses applications}
\subtitle[Étendue et limites d'un projet borélien]{Étendue et limites
@@ -236,11 +253,6 @@ suivante. En cas d'auteurs multiples, il suffit de (et il faut) recourir
\end{enumerate}
\end{dbwarning}
-\begin{dbremark}{Affichage des prénoms et noms du ou des auteurs}{}
- Pour que les prénoms et noms du ou des auteurs soient affichés, il est
- nécessaire de recourir à la commande habituelle \refCom{maketitle}.
-\end{dbremark}
-
La commande \refCom{author} admet un argument optionnel permettant de spécifier
la ou les affiliations de l'auteur au moyen d'une des clés \refKey{affiliation}
et \refKey{affiliationtagged} suivantes.
@@ -273,7 +285,7 @@ et \refKey{affiliationtagged} suivantes.
% ]{"\meta{Nom$_2$}", "\meta{Prénom$_2$}"}
% \end{bodycode}
-\begin{bodycode}[listing options={deletekeywords={author}}]
+\begin{bodycode}
\author[
affiliation={Laboratoire \textsc{sphere}, Université Paris Diderot}
]{Bustamante, Martha-Cecilia}
@@ -292,6 +304,20 @@ et \refKey{affiliationtagged} suivantes.
virgules, la paire d'accolades l'entourant est obligatoire.
\end{dbwarning}
+\begin{dbwarning}{Affichage des prénoms et noms du ou des auteurs}{}
+ Pour que les prénoms et noms du ou des auteurs soient affichés, il est
+ nécessaire :
+ \begin{enumerate}
+ \item de recourir à la commande habituelle \refCom{maketitle} ;
+ \item de procéder à une suite de compilations\suitecompilations{} :
+ \begin{enumerate}
+ \item \hologo{pdfLaTeX} ;
+ \item \hologo{biber} ;
+ \item \hologo{pdfLaTeX}.
+ \end{enumerate}
+ \end{enumerate}
+\end{dbwarning}
+
\subsection{Résumé}
\label{sec-resume}
@@ -301,11 +327,21 @@ et \refKey{affiliationtagged} suivantes.
\subsection{Mots clés}
-\begin{docCommand}[doc description=\mandatory]{keywords}{\marg{mot(s) clé(s)}}
- Cette commande permet de spécifier le (ou les) \meta{mot(s) clé(s)} de
- l'article sous la forme d'une liste séparée par des virgules.
+\begin{docCommand}[doc description=\mandatory]{keywords}{\oarg{variante des mots clés}\marg{mots clés}}
+ Cette commande permet de spécifier les \meta{mots clés} de l'article sous la
+ forme d'une liste séparée par des virgules.
+
+ La propriété \enquote{\texttt{pdfkeywords}} du \File{PDF} produit contient
+ automatiquement les \meta{mots clés} spécifiés. Dans le cas où ceux-ci
+ contiennent des caractères non admis en propriétés des fichiers \file{PDF}
+ (notamment des mathématiques), on spécifiera en argument optionnel une
+ \meta{variante des mots clés} ne contenant que des caractères autorisés.
\end{docCommand}
+\begin{bodycode}[listing options={deletekeywords={[5]keywords}}]
+\keywords[N\string_p-space]{$\mathcal{N}_p$-space}
+\end{bodycode}
+
\subsection{\texorpdfstring{\acrfull{msc}}{MSC}}
\begin{docCommand}[doc description=\mandatory]{msc}{\marg{\acrshort{msc}}}
@@ -334,7 +370,7 @@ Le titre proprement dit de l'article, regroupant tous les éléments saisis à l
\end{itemize}
\end{docCommand}
-\begin{bodycode}[listing options={deletekeywords={title,subtitle,author,keywords},deletekeywords={[2]{first}}}]
+\begin{bodycode}[listing options={deletekeywords={[5]keywords}}]
\title[Le Traité du calcul des probabilités]{Le Traité du calcul des
probabilités et de ses applications}
\subtitle[Étendue et limites d'un projet borélien]{Étendue et limites
@@ -369,10 +405,10 @@ Le titre proprement dit de l'article, regroupant tous les éléments saisis à l
un article.
\end{docCommand}
-\begin{bodycode}[listing options={deletekeywords={author},deletekeywords={[2]{first,and}}}]
+\begin{bodycode}
\acknowledgments{%
The first author's research was supported by the Hungarian National
- Science Foundation Grants K81658 and K104183. Research conducted
+ Science Foundation Grants K81658 and K104183. Research conducted
while the second author enjoyed the hospitality of the Alfréd Rényi
Institute of Mathematics, and benefited from the \textsc{otka}
grant K109789.%
@@ -413,7 +449,7 @@ cf. par exemple][en français]{Bitouze}.
\begin{enumerate}
\item \emph{En préambule}, utiliser la commande \docAuxCommand{addbibresource}
pour indiquer le \meta{fichier bibliographique} à considérer :
-\begin{preamblecode}
+\begin{preamblecode}[listing options={alsolanguage={[biblatex]TeX}}]
\addbibresource{"\meta{fichier bibliographique}".bib}
\end{preamblecode}
\item Dans le corps du document, utiliser la commande
@@ -423,7 +459,7 @@ cf. par exemple][en français]{Bitouze}.
référence est alors affichée au fil du texte, mais avec moins de détails.}
du \Package*{biblatex} pour citer les références bibliographiques (pourvue
d'une \meta{clé}) :
-\begin{bodycode}
+\begin{bodycode}[listing options={alsolanguage={[biblatex]TeX}}]
\autocite{"\meta{clé}"}
\textcite{"\meta{clé}"}
\end{bodycode}
@@ -431,10 +467,7 @@ cf. par exemple][en français]{Bitouze}.
bibliographiques au moyen de la commande \refCom{printbibliography}.
\end{enumerate}
\item Procéder à une suite de compilations \hologo{pdfLaTeX}, \hologo{biber} et
- \hologo{pdfLaTeX}\footnote{Pour automatiser ces compilations, on pourra
- recourir au \enquote{compilateur} \program{latexmk}, fourni par toute
- distribution \TeX{} moderne, en s'aidant du fichier de configuration
- \file{latexmkrc} joint à la présente classe.}.
+ \hologo{pdfLaTeX}\suitecompilations.
\end{enumerate}
\begin{docCommand}{printbibliography}{}
@@ -446,38 +479,38 @@ cf. par exemple][en français]{Bitouze}.
Par exemple, si le \File{.bib} contient :
-\begin{bodycode}[listing only,listing options={morekeywords={Book,Article}}]
+\begin{bodycode}[listing only,listing options={alsolanguage={[biblatex]TeX},deletekeywords={[2]series}}]
@Book{ har,
author = {Hartshorne, Robin},
title = {Algebraic geometry},
note = {Graduate Texts in Mathematics, No. 52},
publisher = {Springer-Verlag},
address = {New York},
- year = {1977}
+ date = {1977}
}
@Book{ laz1,
author = {Lazarsfeld, Robert},
- title = {Positivity in algebraic geometry. {I}},
+ title = {Positivity in algebraic geometry. I},
volume = {48},
note = {Classical setting: line bundles and linear series},
publisher = {Springer-Verlag},
address = {Berlin},
- year = {2004}
+ date = {2004}
}
@Article{ shin,
author = {Shin, Kil-Ho},
- title = {{$3$}-dimensional {F}ano varieties with canonical
+ title = {$3$-dimensional Fano varieties with canonical
singularities},
journal = {Tokyo J. Math.},
volume = {12},
- year = {1989},
+ date = {1989},
number = {2},
- pages = {375-385}
+ pages = {375-385}
}
\end{bodycode}
alors, le source \file{.tex} suivant :
-\begin{bodycode}[listing only,listing options={deletekeywords={[1]{theorem},[2]{first,and,see}}}]
+\begin{bodycode}[listing only,listing options={alsolanguage={[biblatex]TeX},deletekeywords={[1]theorem},deletekeywords={[2]first,and,see,theorem},deletekeywords={[3]theorem}}]
The first assertion is a direct consequence of the Riemann-Roch
formula for threefolds\autocite[See e.g.][437]{har} and
Kawamata-Viehweg vanishing\autocite[theorem~4.3.1]{laz1}. For the
@@ -489,23 +522,21 @@ second assertion, see \textcite[theorem~(0.4)]{shin}.
donne le texte figurant dans l'encadré intitulé \enquote{Exemple de
bibliographie} \vpageref{biblio}.
-\begin{refsegment}
- \ExplSyntaxOn
- \makeatletter
- \defbibheading{origsectionnotintoc}[References]{%
- \__nwejm_section*{#1}%
- }
- \makeatother
- \ExplSyntaxOff
+\ExplSyntaxOn
+\makeatletter
+\defbibheading{origsectionnotintoc}[References]{%
+ \__nwejm_section*{#1}%
+}
+\makeatother
+\ExplSyntaxOff
\begin{bodycode}[text only,float,title={Exemple de bibliographie},label=biblio]
The first assertion is a direct consequence of the Riemann-Roch formula for
threefolds\autocite[See e.g.][437]{har} and Kawamata-Viehweg
vanishing\autocite[theorem~4.3.1]{laz1}. For the second assertion, see
\textcite[theorem~(0.4)]{shin}.
%
-\printbibliography[heading=origsectionnotintoc,segment=1]
+\printbibliography[heading=origsectionnotintoc,category=examples]
\end{bodycode}
-\end{refsegment}
\section{Commandes propres aux mathématiques}
\label{sec:comm-propr-aux}
@@ -576,7 +607,7 @@ La \nwejmauthorcl{} :
\subsection{Ensembles}
-\subsection{Ensembles courants}
+\subsubsection{Ensembles courants}
\begin{docCommand}{bbN}{}
Cette commande affiche l'ensemble des nombres entiers positifs :
@@ -609,7 +640,7 @@ La \nwejmauthorcl{} :
affiche \enquote{$\bbK$}.
\end{docCommand}
-\subsection{Ensembles définis}
+\subsubsection{Ensembles définis}
\begin{docCommand}{set}{\marg{définition}\oarg{caractérisation}}
Cette commande affiche l'ensemble défini par \meta{définition}, avec une
@@ -617,8 +648,8 @@ La \nwejmauthorcl{} :
que}.}.
\begin{bodycode}[listing and text]
\begin{align}
- \bbN & = \set{0,1,2,3,\dots} \\
- \bbZ & = \bbN\cup\set{-n}[n\in\bbN] \\
+ \bbN & = \set{0,1,2,3,\dots} \\
+ \bbZ & = \bbN\cup\set{-n}[n\in\bbN] \\
\bbQ & = \set{p/q}[p\in\bbZ,\ q\in\bbN^*] \\
\bbQ & = \set{\frac{p}{q}}[p\in\bbZ,\ q\in\bbN^*]
\end{align}
@@ -776,18 +807,18 @@ de délimiteurs au moyen de la commande \refCom{NewPairedDelimiter}.
\refKey{right} et \refKey{subscript}.
\begin{docKey}{left}{=\meta{délimiteur}}{pas de valeur par défaut,
initialement vide}
- Cette clé permet de spécifier le délimiteur gauche de la \meta{commande}
- créée par \refCom{NewPairedDelimiter}.
+ Cette clé permet de spécifier le \meta{délimiteur} gauche de la \meta{commande} ainsi
+ créée.
\end{docKey}
\begin{docKey}{right}{=\meta{délimiteur}}{pas de valeur par défaut,
initialement vide}
- Cette clé permet de spécifier le délimiteur droit de la \meta{commande}
- créée par \refCom{NewPairedDelimiter}.
+ Cette clé permet de spécifier le \meta{délimiteur} droit de la
+ \meta{commande} ainsi créée.
\end{docKey}
\begin{docKey}{subscript}{=\meta{indice}}{pas de valeur par défaut,
initialement vide}
- Cette clé permet de spécifier l'indice de la \meta{commande} créée par
- \refCom{NewPairedDelimiter}.
+ Cette clé permet de spécifier l'\meta{indice} de la \meta{commande} ainsi
+ créée.
\end{docKey}
\end{docCommand}
@@ -831,11 +862,6 @@ de délimiteurs au moyen de la commande \refCom{NewPairedDelimiter}.
passée à la clé \refKey{gradient} en argument de la commande
\refCom{articlesetup}.
\end{itemize}
- \begin{docKey}{gradient}{=\docValue{grad}\textbar\docValue{nabla}}{pas
- de valeur par défaut, initialement \docValue{grad}}
- Cette clé permet de spécifier la façon dont est affiché le gradient grâce
- à la commande \refCom{grad}.
- \end{docKey}
\end{docCommand}
\begin{docCommand}{Div}{}
@@ -876,7 +902,7 @@ usuelle \refCom{DeclareMathOperator}.
\begin{preamblecode}
\DeclareMathOperator{\cat}{Cat}
\end{preamblecode}
-\begin{bodycode}[listing and text,listing options={deletekeywords={[1]{example}},deletekeywords={[2]{all}}}]
+\begin{bodycode}[listing and text,listing options={deletekeywords={example},deletekeywords={[4]all}}]
A standard example is $\cat$, the $2$-category of all (small)
categories.
\end{bodycode}
@@ -899,15 +925,14 @@ le déclarer au moyen de la commande \refCom{BinaryOperators}.
des opérateurs les précédant.
\end{docCommand}
-\begin{preamblecode}
-\newcommand{\mybinop}{\mathbin{@}}
+\begin{preamblecode}[listing options={moretexcs={mybinop}}]
+\newcommand{\mybinop}{\mathbin{*}}
\end{preamblecode}
-\begin{bodycode}[listing and text]
-\begin{tabular}{l@{ : }l}
- $\grad \cdot F$ & bon \\
- $\grad \mybinop F$ & mauvais \\
- \BinaryOperators{\mybinop}%
- $\grad \mybinop F$ & bon (grâce à \verb|\BinaryOperators{\mybinop}|)
+\begin{bodycode}[listing and text,listing options={moretexcs={mybinop}}]
+\begin{tabular}{>{$}l<{$}@{ : }l}
+ \grad \cdot F & bon \\
+ \grad \mybinop F & mauvais \\ \BinaryOperators{\mybinop}%
+ \grad \mybinop F & bon (grâce à \verb|\BinaryOperators{\mybinop}|)
\end{tabular}
\end{bodycode}
@@ -997,7 +1022,7 @@ en forme variables. La \nwejmauthorcl{} fournit effectivement trois styles de
\begin{table}
\centering
% \setlength{\tymin}{\widthof{romain, terminé}}
- \begin{tabulary}{\linewidth}{LLLL}
+ \begin{tabulary}{\linewidth}{lLLL}
Style & Titre récurrent & Contenu & \enquote{Théorèmes} concernés \\\toprule
\docValue{theorem} & gras, romain, numéroté & italique
& théorèmes, corollaires, conjectures, propositions, lemmes, axiomes \\\midrule
@@ -1059,7 +1084,7 @@ pas, la commande \refCom{newtheorem} permet d'en créer de nouveaux.
de \meta{Nom} pour la langue correspondante.
\end{docKey}
-\begin{preamblecode}[listing options={deletekeywords={[1]{title,subtitle,definition}},morekeywords={[2]{title,subtitle}},morekeywords={[3]{definition}}}]
+\begin{preamblecode}
\newtheorem{article}
\newtheorem[title/french=Fait,style=definition]{fact}
\end{preamblecode}
@@ -1093,15 +1118,15 @@ hypothèse est introduite par la commande \docAuxCommand{item}.
Cet environnement compose une liste d'hypothèses.
\end{docEnvironment}
-\begin{bodycode}[listing and text,listing options={deletekeywords={[1]{label}}}]
-\begin{axiom}\label{mon-axiom}
+\begin{bodycode}[listing and text]
+\begin{axiom}\label{mon-axiome}
Chaque assertion suivante est admise.
\begin{assertions}
\item\label{rare-cher} Tout ce qui est rare est cher.
\item\label{cheval} Un cheval bon marché est rare.
\end{assertions}
\end{axiom}
-En vertu des \vref{rare-cher,cheval} de l'\vref{mon-axiom},
+En vertu des \vref{rare-cher,cheval} de l'\vref{mon-axiome},
un cheval bon marché est cher.
\end{bodycode}
@@ -1144,7 +1169,7 @@ Au \century{-1}, [...]. Plus tard, au \century{8}, [...]
négatif). Ainsi :
\begin{bodycode}[listing and text]
L'agriculture au \century*{-1} était [...].
-La poésie du \century*{19} aura marqué [...]
+La poésie du \century*{19} aura marqué [...].
\end{bodycode}
\end{docCommand}
@@ -1205,7 +1230,7 @@ commande \refCom{vref} de ce dernier très puissante.
\begin{docCommand}{vref}{\marg{label}}
Cette commande affiche le numéro d'un objet\footnote{Section, équation,
théorème, figure, tableau, etc.} labellisé par la commande
- \lstinline[deletekeywords={label}]+\label{+\meta{label}|}| et :
+ |\label{|\meta{label}|}| et :
\begin{itemize}
\item affiche (ou pas selon le contexte) le numéro de la page où se situe cet
objet\footnote{Fonctionnalité fournie par le \Package{varioref}.} ;
@@ -1218,7 +1243,7 @@ commande \refCom{vref} de ce dernier très puissante.
\Package{hyperref}.}.
\end{itemize}
\begin{bodycode}[listing and text]
-[...] on se reportera à la \vref{sec-canevas-de-fichier} pour un
+[...] on se reportera à l'\vref{sec-canevas-de-fichier} pour un
canevas de fichier source [...]
\end{bodycode}
\end{docCommand}
@@ -1232,37 +1257,38 @@ canevas de fichier source [...]
\subsection{\enquote{Équations} (non-)numérotées}
\label{sec:equat-non-numer}
-Pour les \enquote{équations}, le \Package*{amsmath} fournit les environnements
-mathématiques :
+Le lecteur, rompu à la composition de formules de mathématiques, connaît
+certainement le \Package*{amsmath} et les environnements qu'il fournit :
\begin{itemize}
\item |equation|, |align|, |gather|, |multline| et |flalign| qui numérotent
leur contenu ;
\item |equation*|, |align*|, |gather*|, |multline*| et |flalign*| qui \emph{ne}
numérotent \emph{pas} leur contenu ;
\end{itemize}
-les premiers étant à utiliser si (et seulement si, théoriquement) les contenus
+et utilise les premiers si (et seulement si, théoriquement) les contenus
correspondants font l'objet de références croisées.
-Avoir à choisir entre les versions étoilées ou pas présente au moins deux
+Avoir à choisir entre les versions numérotées ou pas présente au moins deux
inconvénients pour l'utilisateur :
\begin{enumerate}
-\item cela l'oblige à se poser à chaque fois la question de la
- numérotation de son équation ;
+\item cela l'oblige à se poser à chaque fois la question de la pertinence de la
+ numérotation de sa formule ;
\item son choix peut ultérieurement s'avérer caduc\footnote{Et donc nécessiter
de passer par exemple d'un environnement étoilé à un non-étoilé \aside*{donc
- avec ajout d'un label}.}
+ avec ajout d'un label}.}.
\end{enumerate}
-Pour pallier cela, le \Package{autonum} :
+Pour pallier cela, la \nwejmauthorcl{} charge automatiquement le
+\Package{autonum} qui :
\begin{enumerate}
\item permet de ne recourir qu'aux environnements non-étoilés ;
-\item assure automatiquement que les \enquote{équations} effectivement
- numérotées seront celles, et seulement celles, s'avérant faire l'objet de
- références croisées au sein du document.
+\item assure automatiquement que les formules effectivement numérotées seront
+ celles, et seulement celles, s'avérant faire l'objet de références croisées au
+ sein du document.
\end{enumerate}
-\begin{bodycode}[listing and text,listing options={deletekeywords={label}}]
-L'\vref{euler-identy} mérite une référence croisée.
-\begin{equation}\label{euler-identy}
+\begin{bodycode}[listing and text]
+L'\vref{euler-identity} mérite une référence croisée.
+\begin{equation}\label{euler-identity}
\E[\I\pi]+1=0
\end{equation}
C'est bien la seule ici.
@@ -1281,10 +1307,10 @@ Malheureusement.
Il est fréquent que des acronymes doivent figurer dans un article de
mathématiques et le \Package{glossaries} propose pour cela une fonctionnalité
à la fois très efficace et très simple : il suffit de recourir à ses commandes :
-\begin{description}
-\item[\refCom{newacronym}] pour \emph{définir} un acronyme :
-\item[\refCom{gls} (ou \refCom{acrshort})] pour \emph{afficher} un acronyme.
-\end{description}
+\begin{itemize}
+\item \refCom{newacronym} pour \emph{définir} un acronyme :
+\item \refCom{gls} (ou \refCom{acrshort}) pour \emph{afficher} un acronyme.
+\end{itemize}
\begin{docCommand}{newacronym}{\marg{clé}\marg{forme courte}\marg{forme longue}}
Cette commande, à utiliser de préférence en préambule, définit un acronyme
@@ -1314,10 +1340,10 @@ mathématiques et le \Package{glossaries} propose pour cela une fonctionnalité
\end{enumerate}
\end{docCommand}
-\begin{preamblecode}
+\begin{preamblecode}[listing options={alsolanguage={[glossaries]TeX}}]
\newacronym{bap}{bap}{bounded approximation property}
\end{preamblecode}
-\begin{bodycode}[listing and text]
+\begin{bodycode}[listing and text,listing options={alsolanguage={[glossaries]TeX}}]
\begin{enumerate}
\item \gls{bap},
\item \gls{bap}.
@@ -1356,7 +1382,7 @@ suivante, simple d'emploi.
pourra donc également l'utiliser dès que du texte est à citer de façon
informelle.
\end{itemize}
-\begin{bodycode}[listing and text]
+\begin{bodycode}[listing and text,listing options={alsolanguage={[csquotes]TeX}}]
Il lui répondit : \enquote{Courteline disait: \enquote{Passer
pour un idiot aux yeux d'un imbécile est une volupté de fin
gourmet.}}
@@ -1370,7 +1396,7 @@ Il lui répondit : \enquote{Courteline disait: \enquote{Passer
ajoutés\footnote{Au moyen de la commande \docAuxCommand{addbibresource}} et
y étant identifiée par la clé \meta{clé}.
-\begin{bodycode}[listing and text]
+\begin{bodycode}[listing and text,listing options={alsolanguage={[biblatex]TeX},alsolanguage={[csquotes]TeX},deletekeywords={[3]footnote}}]
\citeauthor{Bitouze} précise que :
\blockcquote{Bitouze}{%
\textins{Cette} commande compose les citations en détachant
@@ -1399,7 +1425,7 @@ permet de facilement afficher des adresses Web, aussi appelées
%
|_|, |~|, |&|, etc.) : ces caractères peuvent donc être saisis tels quels, sauf
si la commande \refCom{url} est utilisée dans l'argument d'une autre
-commande\footnote{Par exemple \protect\docAuxCommand*{foonote}.} auquel cas les
+commande\footnote{Par exemple \protect\docAuxCommand*{footnote}.} auquel cas les
caractères |#| et
%
\lstinline[commentstyle={}]+%+
@@ -1410,7 +1436,7 @@ sont alors à faire précéder de la commande \enquote{d'échappement} |\|
\begin{docCommand}{url}{\marg{adresse Web}}
Cette commande affiche l'\meta{adresse Web} saisie \emph{telle quelle} et fait
d'elle un lien hypertexte.
-\begin{bodycode}[listing and text,listing options={deletekeywords={url,math,nwejm,exemple,pdf}}]
+\begin{bodycode}[listing and text,listing options={alsolanguage={[hyperref]TeX},deletekeywords={[2]url}}]
Nous renvoyons aux instructions aux auteurs sur notre site Web
\url{http://math.univ-lille1.fr/~nwejm/#Authors}.
\end{bodycode}
@@ -1440,7 +1466,7 @@ versions étoilées de ces environnements qui composent ces listes \enquote{en
Cet environnement compose une liste \enquote{de description} en ligne.
\end{docEnvironment}
-\begin{bodycode}[listing and text,listing options={deletekeywords={url,math,url,pages}}]
+\begin{bodycode}[listing and text,listing options={alsolanguage={[hyperref]TeX},deletekeywords={math},deletekeywords={[2]url}}]
\begin{enumerate}
\item Les données que j’ai rassemblées [...]
\item Les données que j’ai recueillies sont
@@ -1477,7 +1503,7 @@ attaché au fichier \file{PDF} de la présente documentation\footnote{Pour
listing only,
listing file=../../examples/\attachfilename,
title={\attachfiletextlink\ \attachfile{../../examples/\attachfilename}},%
- listing options={deletekeywords={title,subtitle,author,keywords},deletekeywords={[2]{first}}}
+ listing options={alsolanguage={[biblatex]TeX},deletekeywords={[2]title,author,keywords},deletekeywords={[5]keywords}}
}
\section{Packages chargés (ou pas) par la
@@ -1705,7 +1731,7 @@ Les \meta{valeurs par défaut et initiale} d'une clé sont souvent précisées
\item[initialement] c'est-à-dire lorsque la clé \emph{n'est pas} employée.
\end{description}
%
-\printbibliography
+\printbibliography[category=documentation]
%
% \tcblistof{dbwarninglist}{Table des
% avertissements\addcontentsline{toc}{section}{Table des avertissements}}%
diff --git a/Master/texmf-dist/doc/latex/nwejm/latexmkrc.tex b/Master/texmf-dist/doc/latex/nwejm/latexmkrc.tex
deleted file mode 100644
index 3e6b294ce0d..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/latexmkrc.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-$pdf_mode = 1;
-
-$bibtex_use = 1;
-$bibtex = 'biber %O %B';
-
-$makeindex = 'texindy -L french';
-
-add_cus_dep('idx', 'ind', 0, 'texindy');
-sub texindy{
- system("texindy -L french \"$_[0].idx\"");
-}
-
-push @generated_exts, "aux", "idx", "ind", "lo*", "out", "toc", "acn", "acr",
-"alg", "bbl", "bcf", "fls", "gl*", "ist", "run.xml", "sbl*", "sl*", "sym*",
-"xdy", "unq", "mw", "*~" ;
-
-$clean_ext = "synctex.gz* run.xml tex.bak bbl bcf fdb_latexmk run tdo listing"
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-logo-NB.pdf b/Master/texmf-dist/doc/latex/nwejm/nwejm-logo-NB.pdf
deleted file mode 100644
index 1e6c7c58732..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-logo-NB.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-logo.pdf b/Master/texmf-dist/doc/latex/nwejm/nwejm-logo.pdf
deleted file mode 100644
index 7162865ca50..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-logo.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm.cwl b/Master/texmf-dist/doc/latex/nwejm/nwejm.cwl
deleted file mode 100644
index f383b4ee744..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm.cwl
+++ /dev/null
@@ -1,209 +0,0 @@
-# mode: nwejm.cls
-# denisbitouze, 23.12.2015
-#
-#include:class-book
-#include:latex-document
-#include:latex-mathsymbols
-#include:tex
-#include:xparse
-#include:l3keys2e
-#include:l3sort
-#include:nag
-#include:fontenc
-#include:inputenc
-#include:fontspec
-#include:graphicx
-#include:adjustbox
-#include:draftwatermark
-#include:xspace
-#include:csquotes
-#include:biblatex
-#include:array
-#include:booktabs
-#include:varioref
-#include:mathtools
-#include:mathrsfs
-#include:esvect
-#include:kpfonts
-#include:translations
-#include:fmtcount
-#include:geometry
-#include:babel
-#include:tocvsec2
-#include:etoc
-#include:microtype
-#include:datetime2
-#include:enumitem
-#include:pagegrid
-#include:amsthm
-#include:thmtools
-#include:hyperref
-#include:hypcap
-#include:bookmark
-#include:glossaries
-#include:cleveref
-#
-# Document class
-#keyvals:\documentclass/nwejmart
-french
-english
-ngerman
-dutch
-#endkeyvals
-#
-# Cover and title pages
-#
-# Title, etc.
-\title{title}#n
-\title[short title]{title}#n
-\subtitle{%<subtitle%>}#n*
-\subtitle[%<short subtitle%>]{%<subtitle%>}#n*
-#
-# Author
-\author{%<Last name%>, %<First name%>}#n
-\author[affiliation={%<affiliation%>}]{%<Last name%>, %<First name%>}#n
-\author[affiliation=[%<affiliation's tag%>]{%<affiliation%>}]{%<Last name%>, %<First name%>}#n
-\author[affiliationtagged={%<affiliation's tag%>}]{%<Last name%>, %<First name%>}#n
-#
-# Dates
-\dates{received=%<yyyy%>-%<mm%>-%<dd%>,accepted=%<yyyy%>-%<mm%>-%<dd%>,online=%<yyyy%>-%<mm%>-%<dd%>}#n
-#
-# Math commands
-\N#m
-\Z#m
-\D#m
-\Q#m
-\R#m
-\C#m
-\K#m
-\arccosh#m
-\arcsin#m
-\arcsinh#m
-\arctan#m
-\arctanh#m
-\Argch#m
-\Argsh#m
-\Argth#m
-\ch#m
-\cotan#m
-\curl#m
-\dif#m
-\Div#m
-\grad#m
-\E#m
-\I#m
-\rot#m
-\sh#m
-\supp#m
-\th#m
-\norm#m
-\lnorm#m
-\llnorm#m
-\lpnorm#m
-\supnorm#m
-\abs#m
-\prt#m
-\brk#m
-\brc#m
-\leqgeq#m
-\lrangle#m
-\set{%<set self-contained definition%>}#m
-\set{%<set definition%>}[%<such that...%>]#m
-\begin{axiom}
-\begin{assertions}
-\begin{conjecture}
-\begin{corollary}
-\begin{definition}
-\begin{example}
-\begin{hypotheses}
-\begin{proposition}
-\begin{lemma}
-\begin{notation}
-\begin{proof}
-\begin{remark}
-\begin{theorem}
-#
-\begin{axiom*}
-\begin{assertions*}
-\begin{conjecture*}
-\begin{corollary*}
-\begin{definition*}
-\begin{example*}
-\begin{hypotheses*}
-\begin{proposition*}
-\begin{lemma*}
-\begin{notation*}
-\begin{proof*}
-\begin{remark*}
-\begin{theorem*}
-#
-\end{axiom}
-\end{assertions}
-\end{conjecture}
-\end{corollary}
-\end{definition}
-\end{example}
-\end{hypotheses}
-\end{proposition}
-\end{lemma}
-\end{notation}
-\end{proof}
-\end{remark}
-\end{theorem}
-#
-\end{axiom*}
-\end{assertions*}
-\end{conjecture*}
-\end{corollary*}
-\end{definition*}
-\end{example*}
-\end{hypotheses*}
-\end{proposition*}
-\end{lemma*}
-\end{notation*}
-\end{proof*}
-\end{remark*}
-\end{theorem*}
-#
-\begin{description*}
-\begin{enumerate*}
-\begin{itemize*}
-#
-\end{description*}
-\end{enumerate*}
-\end{itemize*}
-# Miscellaneous commands
-\keywords{%<list of keywords%>}#n
-\msc{%<list of MSCs%>}#n
-\nwejm#n
-\nwejm*#n*
-\century{%<(positive or negative) integer%>}#n
-\century*{%<(positive or negative) integer%>}#n*
-\aside{%<interpolated clause%>}#n
-\aside*{%<interpolated clause%>}#n
-\acknowledgements{%<acknowledgments%>}#n
-\ie#n
-\ie*#n*
-\Ie#n
-\Ie*#n*
-\NewPairedDelimiter#n
-\articlesetup#n
-\BinaryOperators#n
-#
-\editorinchief{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\editor{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\fieldseditor{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\managingeditor{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\classdesigner{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\computerengineer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\classmaintainer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\fontdesigner{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\printingservice{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\computerassistance{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\secretary{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\issuesetup{number=%<positive integer%>}#n
-\journalsetup {publisher=%<publisher%>,address={%<address%>},phone=%<phone%>,email=%<email%>,url=%<url%>,issn=%<issn%>,isbn=%<isbn%>}#n
-\inputarticle{file}#i
-\inputarticle[path]{file}#i
-\fontdesignertext{text}#n
-\printertext{text}#n
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejmart.cwl b/Master/texmf-dist/doc/latex/nwejm/nwejmart.cwl
deleted file mode 100644
index 67175927679..00000000000
--- a/Master/texmf-dist/doc/latex/nwejm/nwejmart.cwl
+++ /dev/null
@@ -1,5 +0,0 @@
-# mode: nwejm.cls
-# denisbitouze, 23.12.2015
-#
-#include:nwejm
-
diff --git a/Master/texmf-dist/source/latex/nwejm/ltxdoc.cfg b/Master/texmf-dist/source/latex/nwejm/ltxdoc.cfg
deleted file mode 100644
index 42825d30887..00000000000
--- a/Master/texmf-dist/source/latex/nwejm/ltxdoc.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-\AtBeginDocument{%
- \OnlyDescription% Comment out for implementation details
- \EnableCrossrefs%
- \RecordChanges%
- % \GlossaryPrologue{%
- % }%
- \CodelineIndex%
-}%
-\AtEndDocument{%
- % \PrintIndex%
-}
diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.drv b/Master/texmf-dist/source/latex/nwejm/nwejm.drv
deleted file mode 100644
index b22dccd5e62..00000000000
--- a/Master/texmf-dist/source/latex/nwejm/nwejm.drv
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% This is file `nwejm.drv',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `driver')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
-\ProvidesFile{nwejm.dtx}
-\documentclass{ltxdoc}
-\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
-\usepackage[numbered]{hypdoc}
-
-\EnableCrossrefs
-\CodelineIndex
-\RecordChanges
-\begin{document}
- \DocInput{\jobname.dtx}
-\end{document}
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.drv'.
diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
index 605472aec3a..4910b922507 100644
--- a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
+++ b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
@@ -37,7 +37,7 @@ documenting the classes I've written.
\input l3docstrip.tex
\Msg{********************************************************}
\Msg{* Installation}
-\Msg{* Class: nwejm 2016/06/10 v0.97}
+\Msg{* Class: nwejm 2017/01/06 v0.98a}
\Msg{* for the journal}
\Msg{* "North-Western European Journal of Mathematics" (DB)}
\Msg{********************************************************}
@@ -54,7 +54,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
\endpreamble
\postamble
-Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
+Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -77,11 +77,6 @@ Running "make install" installs the files in the local TeX tree.
\def\NWEJM@addons{addons}
\def\NWEJM@documentation{documentation}
%
-\usedir{/}
-\generate{
- \nopreamble\nopostamble
- \file{README.md}{\from{\jobname.dtx}{readme}}
-}%
\usedir{tex/latex/\NWEJM@classname}
\generate{%
\file{\NWEJM@classname.cls}{\from{\jobname.dtx}{class}}
@@ -111,11 +106,11 @@ Running "make install" installs the files in the local TeX tree.
\file{\NWEJM@classname.drv}{\from{\jobname.dtx}{driver}}%
}%
\nopreamble\nopostamble
-% \usedir{doc/latex/\NWEJM@classname}
-% \generate{
-% \file{README.md}{\from{\jobname.dtx}{readme}}
-% }
-\usedir{doc/latex/\NWEJM@classname/\NWEJM@documentation}
+\usedir{doc/latex/\NWEJM@classname}
+\generate{
+ \file{README.md}{\from{\jobname.dtx}{readme}}
+}
+\usedir{doc/latex/\NWEJM@classname/french/\NWEJM@documentation}
\generate{
\file{latexmkrc}{\from{\jobname.dtx}{latexmkrc}}
}
@@ -159,6 +154,11 @@ Running "make install" installs the files in the local TeX tree.
%
%\maketitle
%
+% \changes{v0.98a}{2017/01/06}{Adjustments because of deprecated functions removed from \Package{expl3}.}%
+% \changes{v0.98a}{2017/01/06}{Fix wrong behavior of ×\grad× command.}%
+% \changes{v0.98a}{2017/01/06}{Fix theorems recurrent titles weren't displayed anymore.}%
+% \changes{v0.98}{2016/10/24}{Some bug fixes.}%
+% \changes{v0.98}{2016/10/24}{Cover pages handling.}%
% \changes{v0.97}{2016/06/10}{\Package{xy} declared incompatible with the
% current bundle. Instructions to authors added. Sections in appendices are
% lettered. The page numbers of standalone articles/issue are synchronized.}%
@@ -220,6 +220,7 @@ Running "make install" installs the files in the local TeX tree.
\RequirePackage{l3sort}
}{
}
+% \end{macrocode}
% \item e-\TeX{} tools for \LaTeX:
% \begin{macrocode}
\RequirePackage{etoolbox}
@@ -268,9 +269,16 @@ Running "make install" installs the files in the local TeX tree.
\msg_new:nnnn{nwejm}{Issue~number~needed}{Option~`#1'~needed!}
{Please~specify~`#1=<number>', ~otherwise~`<number>'~will~be~set~to
~`\int_use:N\c_@@_first_issue_number_int'.}%
-\msg_new:nnn{nwejm}{Wrong~main~file~name!}{The~ main~ file~ should~ be~ named~
- `\tl_use:N\c_@@_main_file_name_tl.tex',~ not~ `\jobname.tex'.~ Please~ rename~
+\msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{The~ issue's~ main~ file~
+ should~ be~ named~ `\tl_use:N\c_@@_main_file_name_tl.tex',~ not~
+ `\c_sys_jobname_str.tex'.~ Please~ rename~ the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Wrong~cover's~main~file~name!}{The~ cover~ file~
+ should~ /not/~ be~ named~ as~ the~ issue's~ main~ file~
+ `\tl_use:N\c_@@_main_file_name_tl.tex'.~ Please~ rename~
the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Main~file~needs~to~be~compiled!}{The~ issue's~ main~ file~
+ (`\tl_use:N\c_@@_main_file_name_tl.tex')~ should~ be~ compiled~ at~ least~
+ once~ before~ the~ cover~ can~ be~ generated.}%
\msg_new:nnnn{nwejmart}{Unknown~choice}{Choice~`#3'~invalid!}
{Please~specify~#1=#2.}%
\msg_new:nnn{nwejmart}{Unknown~tag}{There~ isn't~ any~ affiliation~ tagged~
@@ -337,6 +345,7 @@ Running "make install" installs the files in the local TeX tree.
\bool_new:N \g_@@_cover_bool
\bool_new:N \g_@@_coverpage_bool
\bool_new:N \g_@@_inside_pages_bool
+\bool_new:N \g_@@_show_binding_bool
% \end{macrocode}
%
% \begin{macrocode}
@@ -344,13 +353,8 @@ Running "make install" installs the files in the local TeX tree.
{
pagegrid .dim_gset:N = \g_@@_pagegrid_dim,
pagegrid .default:n = {\c_@@_pagegrid_dim},
- forauthors .code:n = {%
- \bool_gset_true:N \g_@@_for_authors_bool%
- \bool_gset_true:N \g_@@_inside_pages_bool%
- },%
- forprinter .bool_gset:N = \g_@@_for_printer_bool,
output .choice:,
- output / frontcover .code:n = {%
+ output / cover .code:n = {%
\bool_gset_true:N \g_@@_for_printer_bool%
\bool_gset_true:N \g_@@_cover_bool%
},%
@@ -358,10 +362,9 @@ Running "make install" installs the files in the local TeX tree.
\bool_gset_true:N \g_@@_for_printer_bool%
\bool_gset_true:N \g_@@_inside_pages_bool%
},%
- output / backcover .code:n = {%
- \bool_gset_true:N \g_@@_for_printer_bool%
- },%
- output / web .code:n = {%
+ binding .dim_gset:N = \g_@@_binding_dim,
+ showbinding .code:n = {%
+ \bool_gset_true:N \g_@@_show_binding_bool%
},%
}%
% \end{macrocode}
@@ -471,7 +474,6 @@ Running "make install" installs the files in the local TeX tree.
%
% \subsection{Class loading}
%
-% \begin{macrocode}
% As subsequent class, the \Cls{book} is loaded.
% \begin{macrocode}
\LoadClass { book }
@@ -536,20 +538,6 @@ Running "make install" installs the files in the local TeX tree.
% into two lists: one of the packages needed just by \nwejm{} (for both its logic
% and its layout) and one of packages useful for the end user.}
%
-% \begin{enumerate}
-% \item Selective filtering of error messages and warnings
-% \begin{macrocode}
-\RequirePackage{silence}
-% \end{macrocode}
-%
-% We filter harmless warnings (from \pkg{kpfonts}, \pkg{etex}, \pkg{etoc}).
-% \begin{macrocode}
-\WarningFilter[nwejm]{kpfonts}{With 'easyscsl' option, don't fit together}
-\WarningFilter[nwejm]{etex}{Extended allocation already in use}
-\WarningFilter[nwejm]{etoc}{package tocvsec2 detected and its modification of}
-\ActivateWarningFilters[nwejm]
-% \end{macrocode}
-%
% \item Detecting and warning about obsolete \LaTeX{} commands:
% \begin{macrocode}
\RequirePackage[l2tabu,orthodox]{nag}
@@ -560,7 +548,7 @@ Running "make install" installs the files in the local TeX tree.
% convenient for both \hologo{XeLaTeX} and \hologo{LuaLaTeX}, is loaded with
% ligatures à la \TeX{} by default enabled.
% \begin{macrocode}
-\pdftex_if_engine:TF
+\sys_if_engine_pdftex:TF
{
\RequirePackage[utf8]{inputenc}
}{
@@ -574,11 +562,6 @@ Running "make install" installs the files in the local TeX tree.
\RequirePackage[T1]{fontenc}
% \end{macrocode}
%
-% \item Compile \TeX{} pictures stand-alone or as part of a document:
-% \begin{macrocode}
-%<class>\RequirePackage[group=false,subpreambles,sort]{standalone}%
-% \end{macrocode}
-%
% \item Formatting both header and footers (pagestyle), and sections headers:
% \begin{macrocode}
\RequirePackage[pagestyles]{titlesec}%
@@ -636,7 +619,56 @@ Running "make install" installs the files in the local TeX tree.
%
% \item Extension of \LaTeX{}'s color facilities:
% \begin{macrocode}
-\RequirePackage[svgnames]{xcolor}%
+\RequirePackage{xcolor}%
+% \end{macrocode}
+%
+% Some of the packages are needed only when the cover has to be produced.
+% \begin{macrocode}
+%<class>\bool_if:NTF {\g_@@_cover_bool} {
+% \end{macrocode}
+%
+% \item Coloured boxes, for \LaTeX{} examples and theorems, etc.
+% \begin{macrocode}
+%<class> \RequirePackage{tcolorbox}
+% \end{macrocode}
+%
+% \item A single TikZ node for the whole page (used for cover crop marks)
+% \begin{macrocode}
+%<class> \RequirePackage{tikzpagenodes}
+%<class> \ExplSyntaxOff
+%<class> \usetikzlibrary{calc,backgrounds}
+%<class> \ExplSyntaxOn
+%<class> \tcbuselibrary{skins}
+%<class> \tcbset{_@@_title_cover/.style={%
+%<class> colback=white,
+%<class> colframe=blue!37!white,
+%<class> colupper=blue,
+%<class> width=14cm,
+%<class> fontupper=\fontsize{9mm}{9mm}\fontseries{bx}\selectfont\sffamily,
+%<class> halign=center,
+%<class> valign=center,
+%<class> % boxsep=3mm,
+%<class> boxrule=3mm,
+%<class> left=\c_zero_dim,
+%<class> right=\c_zero_dim,
+%<class> sharp~corners,
+%<class> rounded~corners=northwest,
+%<class> % draft
+%<class> }
+%<class> }
+% \end{macrocode}
+%
+% \item Macros for drawing graphs of graph theory (used for the backcover image)
+% \begin{macrocode}
+%<class> \RequirePackage{tkz-berge}
+%<class>}{
+% \end{macrocode}
+%
+% Typically, the \Package{standalone} is not used for the cover.
+% \item Compile \TeX{} pictures stand-alone or as part of a document:
+% \begin{macrocode}
+%<class>\RequirePackage[group=false,subpreambles,sort]{standalone}%
+%<class>}
% \end{macrocode}
%
% \item Define commands that appear not to eat spaces:
@@ -689,11 +721,6 @@ Running "make install" installs the files in the local TeX tree.
%<class-article>\RequirePackage[noDcommand]{kpfonts}
% \end{macrocode}
%
-% % \item Hooks to do actions on every page or on the current page:
-% % \begin{macrocode}
-% \RequirePackage{everypage}
-% % \end{macrocode}
-%
% \item Flexible and easy interface to page dimensions:
% \begin{macrocode}
\RequirePackage{geometry}
@@ -860,9 +887,9 @@ Running "make install" installs the files in the local TeX tree.
% two consecutive issues, are declared.
% \begin{macrocode}
\int_const:Nn \c_@@_first_issue_number_int { 1 }
-\int_const:Nn \c_@@_first_issue_year_int { 2016 }
+\int_const:Nn \c_@@_first_issue_year_int { 2015 }
\int_const:Nn \c_@@_first_issue_month_int { 1 }
-\int_const:Nn \c_@@_interval_in_months_int { 6 }
+\int_const:Nn \c_@@_interval_in_months_int { 12 }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -927,7 +954,7 @@ Running "make install" installs the files in the local TeX tree.
% \end{macrocode}
% For the printer.
% \begin{macrocode}
-\tl_const:Nn \c_@@_printer_string_tl {Printing~service}
+\tl_const:Nn \c_@@_graphicdesign_string_tl {Graphic~design}
% \end{macrocode}
% For configuration file.
% \begin{macrocode}
@@ -935,11 +962,16 @@ Running "make install" installs the files in the local TeX tree.
% \end{macrocode}
% For the front cover header texts.
% \begin{macrocode}
-\tl_const:Nn \c_@@_frontcover_header_left_string_tl {
- \int_use:N\g_@@_issue_year_int%
-}
-\tl_const:Nn \c_@@_frontcover_header_right_string_tl {
- Number\space\int_use:N\g_@@_issue_number_int%
+\bool_if:NT {\g_@@_cover_bool} {
+ \tl_const:Nn \c_@@_frontcover_left_string_tl {
+ Number\c_space_tl\c_@@_issue_number_tl%
+ }
+ \tl_const:Nn \c_@@_frontcover_right_string_tl {
+ \c_@@_issue_year_tl%
+ }
+ \tl_const:Nn \c_@@_frontcover_string_tl {
+ \c_@@_frontcover_left_string_tl\c_space_tl--\c_space_tl\c_@@_frontcover_right_string_tl%
+ }
}
% \end{macrocode}
% For the name of the directory containing the 3rd and 4th cover pages.
@@ -992,6 +1024,14 @@ Running "make install" installs the files in the local TeX tree.
\c_@@_journal_title_string_tl.~The~current~layout~may~not~be~the~final~one.%
}
% \end{macrocode}
+% For the cover's background image.
+% \begin{macrocode}
+\tl_const:Nn \c_@@_cover_background_image_tl {nwejm-cover-background.jpg}
+% \end{macrocode}
+% For the cover's background color in case the corresponding image is missing.
+% \begin{macrocode}
+\definecolor{_@@_cover_background_color_tl}{rgb}{0.16,0.22,0.56}
+% \end{macrocode}
% For the \textsc{msc}.
% \begin{macrocode}
\tl_const:Nn \c_@@_msc_string_tl {\textsc{msc}}
@@ -1020,6 +1060,12 @@ Running "make install" installs the files in the local TeX tree.
\tl_const:Nn \c_@@_issue_bib_path_string_tl {\c_@@_issue_bib_file_string_tl}
% \end{macrocode}
%
+% For the name of the file containing the issue's number and year used by the
+% file that produces the cover.
+% \begin{macrocode}
+\tl_const:Nn \c_@@_issue_number_year_file_string_tl {\c_@@_main_file_name_tl.iny}
+% \end{macrocode}
+%
% For the prefix of the bibliographic key of each article.
% \begin{macrocode}
\tl_const:Nn \c_@@_issue_bib_key_tl {\int_use:N \g_@@_issue_number_int}
@@ -1103,9 +1149,9 @@ Running "make install" installs the files in the local TeX tree.
% \end{macrocode}
%
% We define a \enquote{printer} layout offset dimension
-% "\c_@@_printer_layoutoffset_dim", fixed by the printer to be \SI{5}{\mm}.
+% "\c_@@_printer_layoutoffset_dim", fixed by the printer to be \SI{10}{\mm}.
% \begin{macrocode}
-\dim_const:Nn \c_@@_printer_layoutoffset_dim { 5mm}
+\dim_const:Nn \c_@@_printer_layoutoffset_dim { 10mm }
% \end{macrocode}
%
% We define a \enquote{potential} layout offset dimension which is non-zero (and
@@ -1157,19 +1203,18 @@ Running "make install" installs the files in the local TeX tree.
% \end{macrocode}
% and the corresponding binding dimensions:
% \begin{macrocode}
-\dim_const:Nn \c_@@_bindingoffset_a_dim {3mm}
-\dim_const:Nn \c_@@_bindingoffset_b_dim {3.5mm}
-\dim_const:Nn \c_@@_bindingoffset_c_dim {3.9mm}
-\dim_const:Nn \c_@@_bindingoffset_d_dim {4.1mm}
-\dim_const:Nn \c_@@_bindingoffset_e_dim {4.5mm}
-\dim_const:Nn \c_@@_bindingoffset_f_dim {5mm}
+\dim_const:Nn \c_@@_bindingoffset_a_dim {6mm}
+\dim_const:Nn \c_@@_bindingoffset_b_dim {7mm}
+\dim_const:Nn \c_@@_bindingoffset_c_dim {7.8mm}
+\dim_const:Nn \c_@@_bindingoffset_d_dim {8.2mm}
+\dim_const:Nn \c_@@_bindingoffset_e_dim {9mm}
+\dim_const:Nn \c_@@_bindingoffset_f_dim {10mm}
% \end{macrocode}
%
% In order to know the total pages number of the document (store in
% "\g_@@_total_page_number_int"), we need first to specify the
% \enquote{external} document whom \File{.aux} will be read.
% \begin{macrocode}
-\zexternaldocument[self]{\jobname}%
\int_new:N \g_@@_total_pages_number_int%
\int_new:N \g_@@_total_inside_pages_number_int%
% \end{macrocode}
@@ -1177,7 +1222,11 @@ Running "make install" installs the files in the local TeX tree.
% We extract the total pages number thanks to "\zref@extractdefault" from
% \Package{zref-totpages}.
% \begin{macrocode}
-\int_gset:Nn \g_@@_total_pages_number_int { \zref@extractdefault{selfLastPage}{abspage}{0} }
+\zexternaldocument[self]{\c_@@_main_file_name_tl}
+\int_gset:Nn \g_@@_total_pages_number_int
+{
+ \zref@extractdefault{selfLastPage}{abspage}{0}
+}
\int_gset:Nn \g_@@_total_inside_pages_number_int { \g_@@_total_pages_number_int - 4 }
% \end{macrocode}
%
@@ -1230,7 +1279,11 @@ Running "make install" installs the files in the local TeX tree.
% offset ("\g_@@_for_printer_bool" flag equals true).
% \begin{macrocode}
\bool_if:NTF {\g_@@_cover_bool} {
- \dim_const:Nn \c_@@_potential_bindingoffset_dim { \c_@@_printer_bindingoffset_dim }
+ \dim_compare:nTF {\g_@@_binding_dim > \c_zero_dim} {%
+ \dim_const:Nn \c_@@_potential_bindingoffset_dim { \g_@@_binding_dim }
+ }{
+ \dim_const:Nn \c_@@_potential_bindingoffset_dim { \c_@@_printer_bindingoffset_dim }
+ }
}{
\dim_const:Nn \c_@@_potential_bindingoffset_dim {\c_zero_dim}
}
@@ -1240,7 +1293,11 @@ Running "make install" installs the files in the local TeX tree.
% plus 2 times (top and bottom) the layout offset dimension (which turns to be
% non-zero iff the output is prepared for the printer).
% \begin{macrocode}
-\dim_const:Nn \c_@@_paperheight_dim { \c_@@_layoutheight_dim+2\c_@@_potential_layoutoffset_dim}
+\dim_const:Nn \c_@@_paperheight_dim {
+ \c_@@_layoutheight_dim
+ +
+ 2\c_@@_potential_layoutoffset_dim
+}
% \end{macrocode}
%
% The paper width is more complicated: it is the layout width dimension plus:
@@ -1260,7 +1317,8 @@ Running "make install" installs the files in the local TeX tree.
\c_@@_layoutwidth_dim
+
\c_@@_potential_layoutoffset_dim
- +\c_@@_potential_bindingoffset_dim
+ +
+ .5\c_@@_potential_bindingoffset_dim
}
}{
\dim_const:Nn \c_@@_paperwidth_dim {
@@ -1277,11 +1335,9 @@ Running "make install" installs the files in the local TeX tree.
\dim_const:Nn \c_@@_topmargin_dim { 20mm}
\dim_const:Nn \c_@@_topmargin_frontcover_dim {
\c_@@_topmargin_dim
- % + 30mm
}
\dim_const:Nn \c_@@_topmargin_inside_cover_dim {
\c_@@_topmargin_dim
- % +10mm
}
\dim_const:Nn \c_@@_topmargin_front_matter_dim {
\c_@@_topmargin_inside_cover_dim
@@ -1292,8 +1348,6 @@ Running "make install" installs the files in the local TeX tree.
\dim_const:Nn \c_@@_headsep_dim { 9.5mm}
\dim_const:Nn \c_@@_headsep_frontcover_dim {
\c_@@_headsep_dim
- % +31mm
- % -\c_@@_potential_layoutoffset_dim
}
\dim_const:Nn \c_@@_headsep_inside_frontcover_dim {
\c_@@_headsep_dim
@@ -1314,16 +1368,9 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\dim_const:Nn \c_@@_innermargin_dim { 23mm }
\dim_const:Nn \c_@@_outermargin_dim { 30mm }
-\dim_const:Nn \c_@@_inside_cover_box_width_dim { 150mm }%
-\dim_const:Nn \c_@@_innermargin_inside_cover_dim {
- (\c_@@_layoutwidth_dim - \c_@@_inside_cover_box_width_dim)/2
- - \c_@@_potential_bindingoffset_dim
- % + \c_@@_adjustmargin_dim
-}
-\dim_const:Nn \c_@@_outermargin_inside_cover_dim {
- (\c_@@_layoutwidth_dim - \c_@@_inside_cover_box_width_dim)/2
- % - \c_@@_adjustmargin_dim
-}
+\dim_const:Nn \c_@@_inside_cover_textwidth_dim { 145mm }%
+\dim_const:Nn \c_@@_outermargin_inside_frontcover_dim { 15mm }
+\dim_const:Nn \c_@@_outermargin_inside_backcover_dim { 10mm }
\dim_const:Nn \c_@@_innermargin_backcover_dim { 10mm }
\dim_const:Nn \c_@@_outermargin_backcover_dim { \c_@@_innermargin_backcover_dim }
\dim_const:Nn \c_@@_topmargin_backcover_dim { \c_@@_innermargin_backcover_dim }
@@ -1331,6 +1378,8 @@ Running "make install" installs the files in the local TeX tree.
\dim_const:Nn \c_@@_front_matter_extra_innermargin_dim { \c_zero_dim }
\dim_const:Nn \c_@@_front_matter_extra_outermargin_dim { \c_zero_dim }
\dim_const:Nn \c_@@_inside_cover_offset_dim { \c_zero_dim }%
+\dim_const:Nn \c_@@_logos_rectangle_thickness_dim { 3.1mm }
+\dim_const:Nn \c_@@_logos_rectangle_height_dim { 33mm }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1351,6 +1400,13 @@ Running "make install" installs the files in the local TeX tree.
}
% \end{macrocode}
%
+% When the inside pages are produced, the crop marks are shown.
+% \begin{macrocode}
+\bool_if:NT {\g_@@_inside_pages_bool} {
+ \geometry{showcrop}
+}
+% \end{macrocode}
+%
% \begin{macrocode}
%</class|class-article>
% \end{macrocode}
@@ -1362,35 +1418,24 @@ Running "make install" installs the files in the local TeX tree.
% We create a constant token list that contains the geometry of the front cover.
% \begin{macrocode}
\bool_if:NTF {\g_@@_cover_bool} {
- \dim_show:N \c_@@_topmargin_frontcover_dim
- \dim_show:N \c_@@_headsep_frontcover_dim
- \dim_show:N \c_@@_headheight_dim
\tl_const:Nn \c_@@_frontcover_geometry_tl {%
- ,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim}
- ,layoutvoffset=\c_@@_potential_layoutoffset_dim
- ,bindingoffset=\c_@@_potential_bindingoffset_dim
- ,top=\c_@@_topmargin_frontcover_dim
- ,top=\c_@@_topmargin_frontcover_dim
- ,headsep=\c_@@_headsep_frontcover_dim
- ,headheight=\c_@@_headheight_dim
- ,bottom=\c_@@_bottom_frontcover_dim
- ,footskip=\c_@@_footskip_dim
- ,outer=\c_@@_margin_frontcover_dim
- ,inner=\c_@@_potential_layoutoffset_dim
+ ,layoutheight=\c_@@_layoutheight_dim
+ ,layoutwidth=\c_@@_layoutwidth_dim
+ ,layoutoffset=\c_@@_potential_layoutoffset_dim
+ ,ignoreall%
,nomarginpar%
+ ,noheadfoot%
+ ,margin=\c_zero_dim
}%
}{
\tl_const:Nn \c_@@_frontcover_geometry_tl {%
- ,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim}
+ ,layoutheight=\c_@@_layoutheight_dim
+ ,layoutwidth=\c_@@_layoutwidth_dim
,layoutoffset=\c_@@_potential_layoutoffset_dim
- ,bindingoffset=\c_@@_potential_bindingoffset_dim
- ,top=\c_@@_topmargin_frontcover_dim
- ,headsep=\c_@@_headsep_frontcover_dim
- ,headheight=\c_@@_headheight_dim
- ,bottom=\c_@@_bottom_frontcover_dim
- ,footskip=\c_@@_footskip_dim
- ,hmargin=\c_@@_margin_frontcover_dim
+ ,ignoreall%
,nomarginpar%
+ ,noheadfoot%
+ ,margin=\c_zero_dim
}%
}
% \end{macrocode}
@@ -1401,32 +1446,26 @@ Running "make install" installs the files in the local TeX tree.
\bool_if:NTF {\g_@@_cover_bool} {
\tl_const:Nn \c_@@_inside_cover_geometry_tl {%
,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim}
- ,layoutvoffset=\c_@@_potential_layoutoffset_dim
- ,bindingoffset=\c_@@_potential_bindingoffset_dim
+ ,layoutoffset=\c_@@_potential_layoutoffset_dim
,top=\c_@@_topmargin_inside_cover_dim
,headheight=\c_@@_headheight_dim
,headsep=\c_@@_headsep_inside_frontcover_dim
,bottom=\c_@@_botmargin_dim
,footskip=\c_@@_footskip_dim
- ,inner=\c_@@_innermargin_inside_cover_dim-\c_@@_potential_layoutoffset_dim
- ,outer=\c_@@_outermargin_inside_cover_dim+\c_@@_potential_layoutoffset_dim
,nomarginpar%
+ ,textwidth=\c_@@_inside_cover_textwidth_dim
}%
}{
\tl_const:Nn \c_@@_inside_cover_geometry_tl {%
,layoutsize={\c_@@_layoutwidth_dim,\c_@@_layoutheight_dim}
,layoutoffset=\c_@@_potential_layoutoffset_dim
- ,bindingoffset=\c_@@_potential_bindingoffset_dim
,top=\c_@@_topmargin_inside_cover_dim
,headheight=\c_@@_headheight_dim
,headsep=\c_@@_headsep_inside_frontcover_dim
,bottom=\c_@@_botmargin_dim
,footskip=\c_@@_footskip_dim
- % ,inner=1cm
- % ,outer=1cm
- ,inner=\c_@@_innermargin_inside_cover_dim
- ,outer=\c_@@_outermargin_inside_cover_dim
,nomarginpar%
+ ,textwidth=\c_@@_inside_cover_textwidth_dim
}%
}
% \end{macrocode}
@@ -1516,27 +1555,27 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\bool_if:NF {\g_@@_coverpage_bool} {
\bool_if:NF {\g_@@_inside_pages_bool} {
- \preto\@enddocumenthook{
-% \end{macrocode}
-%
-% The inside front cover and front cover pages are numbered \enquote{i} and
-% \enquote{ii} hence the inside back cover and back cover pages are numbered
-% \enquote{iii} and \enquote{iv}.
-% \begin{macrocode}
- \cleardoublepage
- \pagenumbering{roman}%
- \setcounter{page}{\c_three}
-% \end{macrocode}
-%
-% On the backcover, we want the table of contents (displayed as a chapter,
-% therefore by default starting on a right page) to be displayed on a left page.
-% \begin{macrocode}
- \bool_gset_true:N \g_@@_backmatter_bool
- \g_@@_display_inside_backcover_tl
- \newpage
- \@openrightfalse
- \g_@@_display_backcover_tl
- }%
+% \preto\@enddocumenthook{
+% % \end{macrocode}
+% %
+% % The inside front cover and front cover pages are numbered \enquote{i} and
+% % \enquote{ii} hence the inside back cover and back cover pages are numbered
+% % \enquote{iii} and \enquote{iv}.
+% % \begin{macrocode}
+% \cleardoublepage
+% \pagenumbering{roman}%
+% \setcounter{page}{\c_three}
+% % \end{macrocode}
+% %
+% % On the backcover, we want the table of contents (displayed as a chapter,
+% % therefore by default starting on a right page) to be displayed on a left page.
+% % \begin{macrocode}
+% \bool_gset_true:N \g_@@_backmatter_bool
+% \g_@@_display_inside_backcover_tl
+% \newpage
+% \@openrightfalse
+% \g_@@_display_backcover_tl
+% }%
}%
}%
% \end{macrocode}
@@ -1594,57 +1633,11 @@ Running "make install" installs the files in the local TeX tree.
% \subsection{Front cover page style}
%
% \begin{macrocode}
- % \box_new:N \l_@@_journal_frontcover_logo_box
- % \box_new:N \l_@@_journal_volume_box
- % \AfterEndPreamble{%
- % \hbox_set:Nn \l_@@_journal_volume_box
- % {
- % \color{Navy}
- % \LARGE
- % \bfseries
- % \sffamily
- % \adjustbox{stack=l}{%
- % \c_@@_frontcover_header_left_string_tl
- % \\\c_@@_frontcover_header_right_string_tl
- % }
- % }
- % \hbox_set:Nn \l_@@_journal_frontcover_logo_box
- % {
- % \includegraphics[width=3cm]{ nwejm-logo }
- % }
- % \hbox_set_to_wd:Nnn \l_@@_journal_frontcover_logo_box { 1cm }
- % {
- % \box_move_down:nn
- % {
- % \box_ht:N \l_@@_journal_frontcover_logo_box / 2
- % -
- % \box_ht:N \l_@@_journal_volume_box / 2
- % }
- % {
- % \box_use:N \l_@@_journal_frontcover_logo_box
- % }
- % }
-% \box_set_ht:Nn \l_@@_journal_frontcover_logo_box { \c_zero_dim }
-% \box_set_dp:Nn \l_@@_journal_frontcover_logo_box { \c_zero_dim }
-% }
-%
\newpagestyle{@@_frontcover_ps}[]{%
\sethead
- {
- \color{Navy}
- \Large
- \bfseries
- \sffamily
- \adjustbox{stack=l}{%
- \c_@@_frontcover_header_left_string_tl
- \\\c_@@_frontcover_header_right_string_tl
- }
- }%
{}%
- {%
- % \l_@@_journal_frontcover_logo_box
- {\includegraphics[width=1cm]{ nwejm-logo }}
- }%
+ {}%
+ {}%
%
\setfoot%
{}%
@@ -1653,10 +1646,10 @@ Running "make install" installs the files in the local TeX tree.
}%
% \end{macrocode}
%
-% \subsection{Inside front cover page style}
+% \subsection{Inside cover page style}
%
% \begin{macrocode}
-\newpagestyle{@@_inside_frontcover_ps}[]{%
+\newpagestyle{@@_inside_cover_ps}[]{%
\sethead%
{}%
{}%
@@ -1702,59 +1695,6 @@ Running "make install" installs the files in the local TeX tree.
}%
% \end{macrocode}
%
-% \subsection{Inside back cover page style}
-%
-% \begin{macrocode}
-\newpagestyle{@@_inside_backcover_ps}[]{%
- \sethead%
- {}%
- {}%
- {}%
- %
- \setfoot%
- {}%
- {}%
- {}%
-}%
-% \end{macrocode}
-%
-% \subsection{Back cover page style}
-%
-% \begin{macrocode}
-\newpagestyle{@@_backcover_ps}[]{%
- \sethead
- {}%
- {}%
- {}%
- %
- \setfoot%
- {}%
- {}%
- {}%
-}%
-% \end{macrocode}
-%
-% We define crop marks.
-% \begin{macrocode}
-% \bool_if:NT {\g_@@_for_printer_bool} {%
-% \AddEverypageHook{%
-% \tikz[remember~picture,overlay] {%
-% \draw ([yshift=\c_@@_potential_layoutoffset_dim]current~page.south~west) -- +(0.25,0);
-% \draw ([xshift=\c_@@_potential_layoutoffset_dim]current~page.south~west) -- +(0,0.25);
-% %% lower right
-% \draw ([yshift=\c_@@_potential_layoutoffset_dim]current~page.south~east) -- +(-0.25,0);
-% \draw ([xshift=-\c_@@_potential_layoutoffset_dim-\c_@@_potential_bindingoffset_dim]current~page.south~east) -- +(0,0.25);
-% %% upper left
-% \draw ([yshift=-\c_@@_potential_layoutoffset_dim]current~page.north~west) -- +(0.25,0);
-% \draw ([xshift=\c_@@_potential_layoutoffset_dim]current~page.north~west) -- +(0,-0.25);
-% %% upper right
-% \draw ([yshift=-\c_@@_potential_layoutoffset_dim]current~page.north~east) -- +(-0.25,0);
-% \draw ([xshift=-\c_@@_potential_layoutoffset_dim-\c_@@_potential_bindingoffset_dim]current~page.north~east) -- +(0,-0.25);
-% }%
-% }%
-% }
-% \end{macrocode}
-%
% \begin{macrocode}
%</class>
% \end{macrocode}
@@ -1816,7 +1756,7 @@ Running "make install" installs the files in the local TeX tree.
\bfseries%
\adjustbox{stack=l}{%
\c_@@_journal_title_string_tl
-%<class> \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\space\int_use:N \g_@@_issue_number_int
+%<class> \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g_@@_issue_number_int
%<class-article> \mbox{}
}
}
@@ -1956,13 +1896,13 @@ Running "make install" installs the files in the local TeX tree.
%
% All these options, when used, must receive a value.
% \begin{macrocode}
- publisher .value_required:,
- address .value_required:,
- phone .value_required:,
- email .value_required:,
- url .value_required:,
- issn .value_required:,
- isbn .value_required:,
+ publisher .value_required:n = true,
+ address .value_required:n = true,
+ phone .value_required:n = true,
+ email .value_required:n = true,
+ url .value_required:n = true,
+ issn .value_required:n = true,
+ isbn .value_required:n = true,
}
% \end{macrocode}
% \end{macro}
@@ -2010,7 +1950,7 @@ Running "make install" installs the files in the local TeX tree.
%
% All these options, when used, must receive a value.
% \begin{macrocode}
- volume .value_required:,
+ volume .value_required:n = true,
% \end{macrocode}
%
% If "number" option is not used, its initial value is set to $0$.
@@ -2048,9 +1988,9 @@ Running "make install" installs the files in the local TeX tree.
%
% The following options, when used, must receive a value.
% \begin{macrocode}
- received .value_required:,
- accepted .value_required:,
- online .value_required:,
+ received .value_required:n = true,
+ accepted .value_required:n = true,
+ online .value_required:n = true,
}
% \end{macrocode}
% \end{macro}
@@ -2110,8 +2050,8 @@ Running "make install" installs the files in the local TeX tree.
%
% All these options, when used, must receive a value.
% \begin{macrocode}
- affiliation .value_required:,
- affiliationtagged .value_required:,
+ affiliation .value_required:n = true,
+ affiliationtagged .value_required:n = true,
}
% \end{macrocode}
% \end{macro}
@@ -2128,11 +2068,11 @@ Running "make install" installs the files in the local TeX tree.
title / english .tl_set:N = \l_@@_newtheorem_english_title_tl,
title / german .tl_set:N = \l_@@_newtheorem_german_title_tl,
title / dutch .tl_set:N = \l_@@_newtheorem_dutch_title_tl,
- title .value_required:,
- title / french .value_required:,
- title / english .value_required:,
- title / german .value_required:,
- title / dutch .value_required:,
+ title .value_required:n = true,
+ title / french .value_required:n = true,
+ title / english .value_required:n = true,
+ title / german .value_required:n = true,
+ title / dutch .value_required:n = true,
%
style .choice:,
style / theorem .code:n = {\_@@_theorem_style:n {theorem}},
@@ -2189,18 +2129,6 @@ Running "make install" installs the files in the local TeX tree.
}
% \end{macrocode}
%
-% We fix some strings for the PDF's metadata .
-% \begin{macrocode}
-\tl_new:N \l_@@_pdftitle_string_tl
-\tl_new:N \l_@@_pdfauthor_string_tl
-\tl_set:Nn \l_@@_pdftile_string_tl {
- \c_@@_journal_title_string_tl\space--\space{}N°\int_use:N\g_@@_issue_number_int
-}
-\tl_set:Nn \l_@@_pdfauthor_string_tl {
- \g_@@_nwejm_string_tl
-}
-% \end{macrocode}
-%
% \begin{macrocode}
\cs_new_protected:Nn \_@@_email:n
{
@@ -2302,9 +2230,9 @@ Running "make install" installs the files in the local TeX tree.
\_@@_citeauthor_no_giveninits:n {\c_@@_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex}%
]
\l_@@_people_affiliation_tl%
- \space%
+ \c_space_tl%
(\l_@@_people_country_tl)%
- % ,\space%
+ % ,\c_space_tl%
% \_@@_email:n {\l_@@_people_email_tl}
\DTLiflastrow{%
}{%
@@ -2341,7 +2269,7 @@ Running "make install" installs the files in the local TeX tree.
\exp_not:V\DTLcurrentindex}%
\tl_if_empty:NF \l_@@_people_email_tl
{
- \space(\_@@_email:n {\l_@@_people_email_tl})
+ \c_space_tl(\_@@_email:n {\l_@@_people_email_tl})
}
}
}
@@ -2351,6 +2279,44 @@ Running "make install" installs the files in the local TeX tree.
%
% \section{Displaying the front cover}
%
+% We create a control sequence for the binding text.
+% \begin{macrocode}
+\cs_new_protected:Nn \_@@_binding_text:n
+{
+ \Large
+ \color{white}
+ \bfseries
+ \sffamily
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90] at (current~page.#1)
+ {
+ \maxsizebox*{!}{\c_@@_potential_bindingoffset_dim}{\c_@@_journal_title_string_tl}
+ } ;
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90,anchor=east] at
+ ($ (current~page.south~#1)!.2!(current~page.north~#1) $)
+ {
+ \maxsizebox*{!}{\c_@@_potential_bindingoffset_dim}{\c_@@_frontcover_left_string_tl}
+ } ;
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90,anchor=west] at ($
+ (current~page.south~#1)!.8!(current~page.north~#1) $)
+ {
+ \maxsizebox*{!}{\c_@@_potential_bindingoffset_dim}{\c_@@_issue_year_tl}
+ } ;
+}
+\cs_new_protected:Nn \_@@_grWheelComplete:nn
+{
+ \begingroup%
+ \setkeys[GR]{cl}{#1}%
+ \grStar[#1]{#2}%
+ \pgfmathsetcounter{tkz@gr@a}{#2-1}%
+ \edef\tkz@auxctp{\thetkz@gr@a}%
+ \foreach \ia in {0,...,\tkz@auxctp}%
+ {\foreach \ib in {\ia,...,\tkz@auxctp}%
+ {\Edge(\cmdGR@cl@prefix\ia)(\cmdGR@cl@prefix\ib)}%
+ }%
+ \endgroup%
+}
+% \end{macrocode}
+%
% We create the variable that displays the front cover.
% \begin{macrocode}
\tl_new:N \g_@@_display_frontcover_tl%
@@ -2358,25 +2324,88 @@ Running "make install" installs the files in the local TeX tree.
\bool_gset_true:N \g_@@_frontcover_bool
\pagestyle{@@_frontcover_ps}%
\exp_after:wN\newgeometry\exp_after:wN{\c_@@_frontcover_geometry_tl}%
- \noindent%
- \bool_if:NTF {\g_@@_cover_bool} {
- \hspace*{-\c_@@_potential_layoutoffset_dim}
- }{
- \hspace*{-2\c_@@_potential_layoutoffset_dim}
- }
- {
- \mbox{}
- \vfill
- \begin{center}
- \Huge%
- \bfseries%
- \sffamily%
- \itshape%
- \color{Navy}%
- \c_@@_journal_front_cover_title_string_tl%
- \end{center}
- }
- \vfill%
+ \begin{tikzpicture}[remember~picture,overlay]
+ \NoAutoSpacing
+ \begin{pgfonlayer}{background}
+ \file_if_exist:nTF {\c_@@_cover_background_image_tl}{
+ \node[anchor=north~east,outer~sep=0pt,inner~sep=0pt] at (current~page.north~east) {
+ \reflectbox{%
+ \includegraphics[width=\paperheight,height=\c_@@_paperwidth_dim,angle=90]{
+ \c_@@_cover_background_image_tl
+ }%
+ }
+ };
+ }{
+ \fill[_@@_cover_background_color_tl] (current~page.north~east) rectangle
+ (current~page.south~west);
+ }
+ \end{pgfonlayer}
+ \_@@_binding_text:n {east}
+ \end{tikzpicture}
+ \begin{tikzpicture}[
+ remember~picture,
+ overlay,
+ shift={(current~page~text~area.center)},
+ scale=0.5,
+ every~node/.style={scale=0.5}
+ ]
+ \SetGraphShadeColor{white}{blue}{white}%
+ \tikzset{%
+ VertexStyle/.style = {%
+ shape = circle,%
+ fill = white,%
+ minimum~size = 3.5cm,%
+ draw%
+ }%
+ }%
+ \SetVertexNoLabel%
+ \_@@_grWheelComplete:nn {RA=9}{6}
+ \AssignVertexLabel{a}{%
+ \includegraphics[height=25mm]{nwejm-fields-institute-logo},%
+ \includegraphics[height=25mm]{nwejm-federation-recherche-math-npdc-logo},%
+ \includegraphics[height=10mm]{nwejm-kwg-logo},%
+ \includegraphics[height=20mm]{nwejm-smf-logo},%
+ \includegraphics[height=12mm]{nwejm-sml-logo},%
+ \includegraphics[height=25mm]{nwejm-logo}%
+ };%
+ \end{tikzpicture}
+ \begin{tikzpicture}[remember~picture,overlay]
+ % left horizontal lower white rule
+ \fill[white]
+ ([xshift=.95\c_@@_layoutwidth_dim,yshift=\c_@@_logos_rectangle_height_dim]current~page~text~area.south~west)
+ rectangle
+ ++(-.85\c_@@_layoutwidth_dim,\c_@@_logos_rectangle_thickness_dim)
+ ;
+ % left vertical white rule
+ \fill[white]
+ ([xshift=10mm,yshift=\c_@@_logos_rectangle_height_dim]current~page~text~area.south~west)
+ rectangle
+ ([xshift=10mm-\c_@@_logos_rectangle_thickness_dim,yshift=-\c_@@_logos_rectangle_height_dim+\c_@@_logos_rectangle_thickness_dim]current~page~text~area.north~west) ;
+ % left horizontal upper white rule
+ \fill[white]
+ ([xshift=.95\c_@@_layoutwidth_dim,yshift=-\c_@@_logos_rectangle_height_dim+\c_@@_logos_rectangle_thickness_dim]current~page~text~area.north~west)
+ rectangle
+ ([xshift=.6\c_@@_layoutwidth_dim,yshift=-\c_@@_logos_rectangle_height_dim]current~page~text~area.north~west) ;
+ % crop marks
+ \draw [white]
+ ([xshift=-2.5mm]current~page~text~area.north~west) --
+ ([xshift=-7.5mm]current~page~text~area.north~west);
+ \draw [white]
+ ([yshift=2.5mm]current~page~text~area.north~west) --
+ ([yshift=7.5mm]current~page~text~area.north~west);
+ \draw [white]
+ ([xshift=-2.5mm]current~page~text~area.south~west) --
+ ([xshift=-7.5mm]current~page~text~area.south~west);
+ \draw [white]
+ ([yshift=-2.5mm]current~page~text~area.south~west) --
+ ([yshift=-7.5mm]current~page~text~area.south~west);
+ % binding limit
+ \bool_if:NT {\g_@@_show_binding_bool} {
+ \draw[green]
+ ([xshift=-.5\c_@@_potential_bindingoffset_dim]current~page.north~east) --
+ ([xshift=-.5\c_@@_potential_bindingoffset_dim]current~page.south~east);
+ }
+ \end{tikzpicture}
\clearpage%
\bool_gset_false:N \g_@@_frontcover_bool
}
@@ -2389,31 +2418,42 @@ Running "make install" installs the files in the local TeX tree.
\tl_new:N \g_@@_display_inside_frontcover_tl%
\tl_gset:Nn \g_@@_display_inside_frontcover_tl {%
\bool_gset_true:N \g_@@_inside_frontcover_bool%
- \pagestyle{@@_inside_frontcover_ps}%
- \exp_after:wN\newgeometry\exp_after:wN{\c_@@_inside_cover_geometry_tl}%
+ \pagestyle{_@@_inside_cover_ps}%
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c_@@_inside_cover_geometry_tl
+ ,outer=\c_@@_outermargin_inside_frontcover_dim
+ }%
+ % \tikz[remember~picture,overlay] {%
+ % \draw [green]
+ % (current~page~text~area.south~west)
+ % rectangle
+ % (current~page~text~area.north~east)
+ % ;
+ % }
+ \setlist[description,1]{font=\scshape\bfseries}
\footnotesize%
\begin{multicols*}{2}
\setlength{\columnsep}{1mm}
\begin{description}[leftmargin=2em]
- \item[\textsc{\c_@@_editorinchief_string_tl}] \
+ \item[\c_@@_editorinchief_string_tl] \
\begin{description}[leftmargin=1em]
\@@_display_people_by_role:n {editorinchief}
\end{description}
\bigskip
\par
- \item[\textsc{\c_@@_associate_editors_string_tl}] \
+ \item[\c_@@_associate_editors_string_tl] \
\begin{description}[leftmargin=1em]
\@@_display_people_by_role:n {editor}
\end{description}
\bigskip
\par
- \item[\textsc{\c_@@_field_editor_string_tl}] \
+ \item[\c_@@_field_editor_string_tl] \
\begin{description}[leftmargin=1em]
\@@_display_people_by_role:n {fieldseditor}
\end{description}
\bigskip
\par
- \item[\textsc{\c_@@_managing_editor_string_tl}] \
+ \item[\c_@@_managing_editor_string_tl] \
\begin{description}[leftmargin=1em]
\@@_display_people_by_role:n {managingeditor}
\end{description}
@@ -2433,44 +2473,49 @@ Running "make install" installs the files in the local TeX tree.
\tl_new:N \g_@@_display_inside_backcover_tl%
\tl_gset:Nn \g_@@_display_inside_backcover_tl {%
\bool_gset_true:N \g_@@_inside_backcover_bool%
- \pagestyle{@@_inside_backcover_ps}%
- % \exp_after:wN\newgeometry\exp_after:wN{\c_@@_inside_cover_geometry_tl}%
- % \file_if_exist:nT { \c_@@_authors_instructions_file_tl } {%
- \bool_if:NTF {\g_@@_no_inside_backcover_bool} {
- \hbox{}
- }{%
- % \small%
- \begin{description}[leftmargin=1em]
- \item[\c_@@_authors_instructions_string_tl{}:] \
- \g_@@_authors_instructions_tl
- \item[\c_@@_editorial_secretariat_string_tl{}:] \ \par%
- % \l_@@_journal_publisher_tl%
- % \par%
- % \space\textendash{}\space%
- \@@_display_people_by_role:n { secretary }\par
- \l_@@_journal_address_tl\par%
- \c_@@_phone_string_tl{}:~\l_@@_journal_phone_tl{}\par%
- \_@@_email:n {\l_@@_journal_email_tl}
- \newline%
- % \space\textendash{}\space
- \url{\l_@@_journal_url_tl}
- \item[\c_@@_issn_string_tl{}:] \l_@@_journal_issn_tl
- \tl_if_empty:NF \l_@@_journal_isbn_tl
- {%
- \item[\c_@@_isbn_string_tl{}:] \l_@@_journal_isbn_tl
- }
- \item[\c_@@_latexclass_string_tl{}:]
- \@@_display_people_by_role:n { classdesigner }
- \item[\c_@@_computer_engineering_string_tl{}:] %\g_@@_printer_text_tl
- \@@_display_people_by_role:n { computerengineer }
- \item[\c_@@_printer_string_tl{}:] %\g_@@_printer_text_tl
- \@@_display_people_by_role:n { printingservice }
- \end{description}
- \g_@@_font_designer_text_tl
- }
- % }{%
- % \hbox{}
+ \pagestyle{_@@_inside_cover_ps}%
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c_@@_inside_cover_geometry_tl
+ ,outer=\c_@@_outermargin_inside_backcover_dim
+ }%
+ % \tikz[remember~picture,overlay] {%
+ % \draw [purple]
+ % (current~page~text~area.south~west)
+ % rectangle
+ % (current~page~text~area.north~east)
+ % ;
% }
+ \setlist[description,1]{font=\scshape\bfseries}
+ \begin{description}[leftmargin=1em]
+ \item[\c_@@_authors_instructions_string_tl{}:] \
+ \g_@@_authors_instructions_tl
+ \item[\c_@@_editorial_secretariat_string_tl{}:] \ \par%
+ % \l_@@_journal_publisher_tl%
+ % \par%
+ % \c_space_tl\textendash{}\c_space_tl%
+ \_@@_display_people_by_role:n { secretary }\par
+ \l_@@_journal_address_tl\par%
+ \c_@@_phone_string_tl{}:~\l_@@_journal_phone_tl{}\par%
+ \_@@_email:n {\l_@@_journal_email_tl}
+ \newline%
+ % \c_space_tl\textendash{}\c_space_tl
+ \url{\l_@@_journal_url_tl}
+ \tl_if_empty:NF \l_@@_journal_issn_tl
+ {%
+ \item[\c_@@_issn_string_tl{}:] \l_@@_journal_issn_tl
+ }
+ \tl_if_empty:NF \l_@@_journal_isbn_tl
+ {%
+ \item[\c_@@_isbn_string_tl{}:] \l_@@_journal_isbn_tl
+ }
+ \item[\c_@@_latexclass_string_tl{}:]
+ \_@@_display_people_by_role:n { classdesigner }
+ \item[\c_@@_computer_engineering_string_tl{}:] %\g_@@_printer_text_tl
+ \_@@_display_people_by_role:n { computerengineer }
+ \item[\c_@@_graphicdesign_string_tl{}:] %\g_@@_graphicdesign_text_tl
+ \_@@_display_people_by_role:n { graphicdesign }
+ \end{description}
+ \g_@@_font_designer_text_tl
\bool_gset_false:N \g_@@_inside_backcover_bool
}
% \end{macrocode}
@@ -2481,39 +2526,86 @@ Running "make install" installs the files in the local TeX tree.
\tl_new:N \g_@@_short_toc_tl%
% \end{macrocode}
%
-% The following code to get a framed TOC is borrowed from \pkg{etoc}'s
-% documentation.
-% \begin{macrocode}
-\tl_gset:Nn \g_@@_short_toc_tl {%
- \begingroup
- \etocstandardlines
- \etocsetnexttocdepth{chapter}
- \renewcommand{\etocbkgcolorcmd}{\color{Navy!5}}
- \renewcommand{\etocbelowtocskip}{0pt\relax}
- \fboxsep1ex
- \etocframedstyle [1]{\fbox{\makebox[.5\linewidth]{\etocfontminusone\c_@@_backcover_tableofcontents_string_tl}}}
- \tableofcontents
- \endgroup
-}
-% \end{macrocode}
-%
-% We compute the height of this framed TOC to know the place left on the page
-% for the collection of logos that will be displayed below.
% \begin{macrocode}
-% \newlength\toto
-% \setlength{\toto}{ \textheight - \heightof{\g_@@_short_toc_tl} }
\tl_new:N \g_@@_display_backcover_tl%
\tl_gset:Nn \g_@@_display_backcover_tl {%
\bool_gset_true:N \g_@@_backcover_bool
-% \end{macrocode}
-%
-% The following code is borrowed from \pkg{etoc}'s documentation.
-% \begin{macrocode}
-\g_@@_short_toc_tl
-\vfill{}
- \begin{center}
- \includegraphics[height=.4\textheight]{nwejm-logos-collection.pdf}
- \end{center}
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c_@@_frontcover_geometry_tl
+ ,layouthoffset=.5\c_@@_potential_bindingoffset_dim
+ }%
+ \bool_gset_true:N \g_@@_backcover_bool
+ \begin{tikzpicture}[remember~picture,overlay]
+ \NoAutoSpacing
+ \begin{pgfonlayer}{background}
+ \file_if_exist:nTF {\c_@@_cover_background_image_tl}{
+ \node[anchor=north~west,outer~sep=0pt,inner~sep=0pt] at (current~page.north~west) {
+ \includegraphics[width=\paperheight,height=\c_@@_paperwidth_dim,angle=90]{\c_@@_cover_background_image_tl}%
+ };
+ }{
+ \fill[_@@_cover_background_color_tl] (current~page.north~east) rectangle
+ (current~page.south~west);
+ }
+ \end{pgfonlayer}
+ \_@@_binding_text:n {west}
+ \end{tikzpicture}
+ \noindent%
+ \begin{tikzpicture}[remember~picture,overlay]
+ % journal title
+ \node [anchor=north,yshift=-\c_@@_layoutwidth_dim/20] at (current~page~text~area.north) {
+ \begin{tcolorbox}[_@@_title_cover]
+ North-Western~European\\[.5cm]
+ Journal~of~Mathematics
+ \end{tcolorbox}
+ };
+ % circular node for NWEJM logo
+ \node[anchor=center,circle,fill=white,minimum~size=8.2cm] at
+ ([yshift=-\c_@@_layoutheight_dim/2]current~page~text~area.north)
+ {\includegraphics[height=5.5cm]{nwejm-logo}};
+ % right vertical white rule
+ \fill[white]
+ ([xshift=-10mm,yshift=\c_@@_logos_rectangle_height_dim]current~page~text~area.south~east)
+ rectangle
+ ([xshift=-10mm+\c_@@_logos_rectangle_thickness_dim,yshift=\c_@@_logos_rectangle_height_dim+14cm]current~page~text~area.south~east) ;
+ % right horizontal white rule
+ \fill[white]
+ ([yshift=\c_@@_logos_rectangle_height_dim+\c_@@_logos_rectangle_thickness_dim]current~page~text~area.south~west)
+ rectangle
+ ([xshift=.35\c_@@_layoutwidth_dim,yshift=\c_@@_logos_rectangle_height_dim]current~page~text~area.south~west) ;
+ % number and year node
+ \node[anchor=base~east] at
+ ([xshift=-1.2cm,yshift=\c_@@_logos_rectangle_height_dim]current~page~text~area.south~east)
+ {\color{white}\bfseries\sffamily\c_@@_frontcover_string_tl} ;
+ % % white rectangle for university and laboratory logos
+ \fill [white]
+ ([yshift=\c_@@_logos_rectangle_height_dim-7.5mm]current~page~text~area.south~west)
+ rectangle (current~page.south~east);
+ % laboratory logo
+ \node[anchor=south~east] at ([xshift=-10mm]current~page~text~area.south~east)
+ {\includegraphics[height=.66\c_@@_logos_rectangle_height_dim]{logo-painleve}} ;
+ % university logo
+ \node[anchor=south~west] at (current~page~text~area.south~west)
+ {\includegraphics[height=.66\c_@@_logos_rectangle_height_dim]{logo-ul1-ufr-math}} ;
+ % crop marks
+ \draw [white]
+ ([xshift=2.5mm]current~page~text~area.north~east) --
+ ([xshift=7.5mm]current~page~text~area.north~east);
+ \draw [white]
+ ([yshift=2.5mm]current~page~text~area.north~east) --
+ ([yshift=7.5mm]current~page~text~area.north~east);
+ \draw
+ ([xshift=2.5mm]current~page~text~area.south~east) --
+ ([xshift=7.5mm]current~page~text~area.south~east);
+ \draw
+ ([yshift=-2.5mm]current~page~text~area.south~east) --
+ ([yshift=-7.5mm]current~page~text~area.south~east);
+ % binding limit
+ \bool_if:NT {\g_@@_show_binding_bool} {
+ \draw[green]
+ ([xshift=.5\c_@@_potential_bindingoffset_dim]current~page.north~west) --
+ ([xshift=.5\c_@@_potential_bindingoffset_dim]current~page.south~west);
+ }
+ \end{tikzpicture}
}
% \end{macrocode}
%
@@ -2537,7 +2629,7 @@ Running "make install" installs the files in the local TeX tree.
{
\tl_if_eq:NNF {\c_@@_date_received_tl} {#1} { \c_@@_dates_separator_tl }
\tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
- \c_@@_colon_tl\space
+ \c_@@_colon_tl\c_space_tl
\DTMdate{#2}%
}
}
@@ -2557,21 +2649,22 @@ Running "make install" installs the files in the local TeX tree.
% \section{Displaying the keywords}
%
% \begin{macro}{\keywords}
-% \begin{macro}{\l_@@_keywords_tl}
+% \begin{macro}{\g_@@_keywords_tl}
% The command for article's keywords is defined: the article's keywords is
-% store in "\l_@@_keywords_tl" for later use.
-% \begin{macrocode}
-\seq_new:N \l_@@_keywords_seq
-\tl_new:N \l_@@_keywords_tl
-\NewDocumentCommand \keywords { m } {
- \seq_clear:N \l_@@_keywords_seq
- \tl_clear:N \l_@@_keywords_tl
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- \seq_set_map:NNn \l_@@_keywords_seq \l_tmpa_seq {
- ##1
- }
- \tl_set:Nn \l_@@_keywords_tl { \seq_use:Nn \l_@@_keywords_seq {,~} }
-%<class-article> \hypersetup{pdfkeywords=\l_@@_keywords_tl}
+% store in "\g_@@_keywords_tl" for later use.
+% \begin{macrocode}
+\tl_new:N \g_@@_keywords_tl
+\NewDocumentCommand \keywords { O{} m } {
+ \tl_gclear:N \g_@@_keywords_tl
+ \tl_clear:N \l_tmpb_clist
+ \clist_set:Nn \l_tmpb_clist {#2}
+ \tl_set:Nn \g_@@_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } }
+%<class-article> \tl_if_empty:nTF {#1} {%
+%<class-article> \hypersetup{pdfkeywords={\g_@@_keywords_tl}}
+%<class-article> }{
+%<class-article> \clist_set:Nn \l_tmpb_clist {#1}
+%<class-article> \hypersetup{pdfkeywords={\clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ }}}
+%<class-article> }
}
% \end{macrocode}
% \end{macro}
@@ -2580,26 +2673,17 @@ Running "make install" installs the files in the local TeX tree.
% \section{Displaying the Mathematical Subject Classification (\textsc{msc})}
%
% \begin{macro}{\msc}
-% \begin{macro}{\l_@@_msc_tl}
+% \begin{macro}{\g_@@_msc_tl}
% The command for article's \textsc{msc} is defined: the article's \textsc{msc} is
-% store in "\l_@@_msc_tl" for later use.
+% store in "\g_@@_msc_tl" for later use.
% \begin{macrocode}
-\seq_new:N \l_@@_msc_seq
-\tl_new:N \l_@@_msc_tl
+\tl_new:N \g_@@_msc_tl
\NewDocumentCommand \msc { m } {
- \seq_clear:N \l_@@_msc_seq
- \tl_clear:N \l_@@_msc_tl
- %
- % does what the name suggests, set a sequence from the clist
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- % applies final arg to each element of second seq and stores result in first seq
- \seq_set_map:NNn \l_@@_msc_seq \l_tmpa_seq {
- ##1
- }
- %
- % \seq_use puts the items from the seq back in the input with ",~" as a separator
- \tl_set:Nn \l_@@_msc_tl {\seq_use:Nn \l_@@_msc_seq {,~}}
-%%<class-article> \hypersetup{pdfmsc=\l_@@_msc_tl}
+ \tl_gclear:N \g_@@_msc_tl
+ \tl_clear:N \l_tmpa_clist
+ \clist_set:Nn \l_tmpa_clist {#1}
+ \tl_set:Nn \g_@@_msc_tl { \clist_use:Nnnn \l_tmpa_clist { ,~ } { ,~ } { ,~ } }
+%%<class-article> \hypersetup{pdfmsc=\g_@@_msc_tl}
}
% \end{macrocode}
% \end{macro}
@@ -2611,9 +2695,22 @@ Running "make install" installs the files in the local TeX tree.
% needs the main file name to be fixed (chosen name: \enquote{issue}). If that's
% not the case an error is thrown.
% \begin{macrocode}
-%<class>\tl_new:N \l_@@_jobname_tl
-%<class>\tl_set:Nn \l_@@_jobname_tl {\jobname}
-%<class>\str_if_eq_x:nnF \l_@@_jobname_tl \c_@@_main_file_name_tl { \msg_error:nn{nwejm}{Wrong~main~file~name!} }
+%<class>\str_if_eq_x:nnTF \c_sys_jobname_str \c_@@_main_file_name_tl {
+%<class> \bool_if:NT {\g_@@_cover_bool} {
+%<class> \msg_error:nn{nwejm}{Wrong~cover's~main~file~name!}
+%<class> }
+%<class>}{
+%<class> \bool_if:NTF {\g_@@_cover_bool} {
+%<class> \file_if_exist:nTF { \c_@@_issue_number_year_file_string_tl }
+%<class> {
+%<class> \file_input:n {\c_@@_issue_number_year_file_string_tl}
+%<class> }{
+%<class> \msg_error:nn{nwejm}{Main~file~needs~to~be~compiled!}
+%<class> }
+%<class> }{
+%<class> \msg_error:nn{nwejm}{Wrong~issue's~main~file~name!}
+%<class> }
+%<class>}
% \end{macrocode}
%
% \begin{macrocode}
@@ -2645,13 +2742,12 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macro}{\classdesigner}
% \begin{macro}{\fontdesigner}
% \begin{macro}{\classmaintainer}
-% \begin{macro}{\printingservice}
+% \begin{macro}{\graphicdesign}
% \begin{macro}{\computerengineer}
% \begin{macro}{\secretary}
% We define some document-level commands that let the user specify
% respectively the editor(s) in chief, the fields editor, the managing editor,
% the editors, the class designer and maintainer(s), etc.
-%% \enquote{R\'{e}dacteur(s) en chef}.
% \begin{macrocode}
\NewDocumentCommand \editorinchief {mmmm}
{
@@ -2685,9 +2781,9 @@ Running "make install" installs the files in the local TeX tree.
{
\_@@_people:nnnnn {#1}{#2}{#3}{#4}{fontdesigner}
}
-\NewDocumentCommand \printingservice {mmmm}
+\NewDocumentCommand \graphicdesign {mmmm}
{
- \_@@_people:nnnnn {#1}{#2}{#3}{#4}{printingservice}
+ \_@@_people:nnnnn {#1}{#2}{#3}{#4}{graphicdesign}
}
\NewDocumentCommand \computerassistance {mmmm}
{
@@ -2722,12 +2818,6 @@ Running "make install" installs the files in the local TeX tree.
\keys_set:nn { nwejm/issuesetup } {#1}
% \end{macrocode}
%
-% We fix some of the PDF's metadata .
-% \begin{macrocode}
-\hypersetup{pdftitle=\l_@@_pdftitle_string_tl}
-\hypersetup{pdfauthor=\l_@@_pdfauthor_string_tl}
-% \end{macrocode}
-%
% We use here the fact that, if the "number", "month" or "year" options are not
% used, their corresponding "\g_@@_issue_number_int", "\g_@@_issue_month_int" or
% "\g_@@_issue_year_int" variables are equal to $0$ ($<1$).
@@ -2792,6 +2882,33 @@ Running "make install" installs the files in the local TeX tree.
\g_@@_issue_age_in_years_int + \c_@@_first_issue_year_int
}
}%
+% \end{macrocode}
+%
+% We fix some of the PDF's metadata.
+% \begin{macrocode}
+ \bool_if:NT {\g_@@_cover_bool} {
+ \hypersetup{
+ pdftitle=\c_@@_journal_title_string_tl\c_space_tl--\c_space_tl\c_@@_frontcover_left_string_tl\c_space_tl--\c_space_tl\int_use:N\g_@@_issue_year_int,
+ pdfauthor=\c_@@_journal_title_string_tl\c_space_tl(editor)
+ }
+ }
+% \end{macrocode}
+%
+% We write some data to an auxiliary file which be read by the file dedicated to
+% the cover pages production.
+% \begin{macrocode}
+ \iow_new:N \g_@@_issue_number_year_out_iow
+ \iow_open:Nn \g_@@_issue_number_year_out_iow {\c_@@_issue_number_year_file_string_tl}
+ \iow_now:Nx \g_@@_issue_number_year_out_iow {
+ \tl_const:Nn \token_to_str:N \c_@@_issue_number_tl {
+ \int_eval:n {\g_@@_issue_number_int}
+ }
+ \iow_newline:
+ \tl_const:Nn \token_to_str:N \c_@@_issue_year_tl {
+ \int_eval:n {\g_@@_issue_year_int}
+ }
+ }
+ \iow_close:N \g_@@_issue_number_year_out_iow
}
% \end{macrocode}
% \end{macro}
@@ -2866,7 +2983,7 @@ Running "make install" installs the files in the local TeX tree.
\def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}%
{\refpagename\ hiervoor}}%
\def\reftextcurrent {op~deze~\refpagename}%
- \def\reftextfaraway#1{op~\refpagename\space\pageref{#1}}
+ \def\reftextfaraway#1{op~\refpagename\c_space_tl\pageref{#1}}
}
\addto\extrasenglish{%
\def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}%
@@ -3105,6 +3222,7 @@ Running "make install" installs the files in the local TeX tree.
\cleardoublepage
% \end{macrocode}
%
+% \begin{macrocode}
\int_incr:N \l_author_int
\prop_gput_if_new:Nxn \g_authors_prop {author_\int_use:c {l_author_int}} {#2}
\IfNoValueF {#1}
@@ -3219,7 +3337,7 @@ Running "make install" installs the files in the local TeX tree.
\tl_gset:Nn \g_@@_citeauthor_tl {%
\DeclareNameAlias{labelname}{default}%
\group_begin:
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
}%
@@ -3251,7 +3369,7 @@ Running "make install" installs the files in the local TeX tree.
\AtNextCitekey{\defcounter{maxnames}{100}}
\group_begin:
\DeclareNameAlias{labelname}{default}%
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
\cs_set_eq:NN \multinamedelim \_@@_orig_multinamedelim
@@ -3395,11 +3513,11 @@ Running "make install" installs the files in the local TeX tree.
\c_@@_colon_tl
}
}
- \space\l_@@_keywords_tl.
+ \c_space_tl\g_@@_keywords_tl.
}
\tl_set:Nn \l_@@_msc_box_tl
{%
- \noindent\textbf{\c_@@_msc_string_tl}\c_@@_colon_tl\space\l_@@_msc_tl.
+ \noindent\textbf{\c_@@_msc_string_tl}\c_@@_colon_tl\c_space_tl\g_@@_msc_tl.
}
\tl_set:Nn \l_@@_abstract_box_tl
{%
@@ -3432,7 +3550,7 @@ Running "make install" installs the files in the local TeX tree.
}
\bool_if:nF { \tl_if_empty_p:N \g_@@_short_subtitle_tl }
{
- .\space\g_@@_short_subtitle_tl
+ .\c_space_tl\g_@@_short_subtitle_tl
}
}
% \end{macrocode}
@@ -3454,10 +3572,10 @@ Running "make install" installs the files in the local TeX tree.
{
\texorpdfstring{%
\AtNextCitekey{\defcounter{maxnames}{100}}
- \space\textendash\space\citeauthor{\g_@@_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g_@@_article_bib_key_tl}
}{}
}{%
- \space\textendash\space\citeauthor{\g_@@_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g_@@_article_bib_key_tl}
}%
}
}
@@ -3499,14 +3617,14 @@ Running "make install" installs the files in the local TeX tree.
%
\l_@@_abstract_box_tl%
\normalsize
-\tl_if_empty:NTF \l_@@_keywords_tl {
+\tl_if_empty:NTF \g_@@_keywords_tl {
\msg_warning:nn{nwejmart}{No~keyword}
}{
\l_@@_keywords_box_tl
\par%
\vskip .5em%
}
-\tl_if_empty:NTF \l_@@_msc_tl {
+\tl_if_empty:NTF \g_@@_msc_tl {
\msg_warning:nn{nwejmart}{No~MSC}
}{
\l_@@_msc_box_tl
@@ -3690,10 +3808,10 @@ Running "make install" installs the files in the local TeX tree.
%
\cs_new_protected:Nn \_@@_century_suffix:n
{
- \space{}
+ \c_space_tl{}
\GetTranslation{century}%
\int_compare:nNnT { #1 } < { 0 }{
- \space
+ \c_space_tl
\GetTranslation{before-christ}
}{
}
@@ -3845,7 +3963,6 @@ Running "make install" installs the files in the local TeX tree.
\cs_set_eq:NN \_@@_orig_newtheorem \newtheorem
\cs_new_protected:Nn \_@@_new_theorem:nnnnn
{
- \AtBeginDocument{%
\IfTranslation{English}{#1}{%
}{%
\DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
@@ -3862,11 +3979,10 @@ Running "make install" installs the files in the local TeX tree.
}{%
\DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
}
- }
- \_@@_orig_newtheorem{#1}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- \bool_if:NF {\g_@@_no_numbered_theorem_bool} {
- \_@@_orig_newtheorem*{#1_@@_nonumbered}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- }
+ \_@@_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \bool_if:NF {\g_@@_no_numbered_theorem_bool} {
+ \_@@_orig_newtheorem*{#1_@@_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ }
}
\cs_generate_variant:Nn \_@@_new_theorem:nnnnn { nVVVV }
% \end{macrocode}
@@ -3876,79 +3992,71 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\RenewDocumentCommand \newtheorem { O{} m }
{
- \tl_clear:N \l_@@_newtheorem_style_tl
- \tl_clear:N \l_@@_newtheorem_title_tl
- \tl_clear:N \l_@@_newtheorem_french_title_tl
- \tl_clear:N \l_@@_newtheorem_english_title_tl
- \tl_clear:N \l_@@_newtheorem_german_title_tl
- \tl_clear:N \l_@@_newtheorem_dutch_title_tl
- %
- \tl_set:Nn \l_@@_newtheorem_english_title_tl {
- #2
- }
- \tl_set:Nf \l_@@_newtheorem_french_title_tl {
- \l_@@_newtheorem_english_title_tl
- }
- \tl_set:Nf \l_@@_newtheorem_german_title_tl {
- \l_@@_newtheorem_english_title_tl
- }
- \tl_set:Nf \l_@@_newtheorem_dutch_title_tl {
- \l_@@_newtheorem_english_title_tl
- }
- \tl_set:Nn \l_@@_newtheorem_style_tl {
- theorem
- }
- \_@@_theorem_style:n {theorem}
- \IfNoValueF {#1}
- {
- \keys_set:nn { nwejm / newtheorem } { #1 }
- \tl_if_empty:NF \l_@@_newtheorem_title_tl {%
- \tl_set:Nf \l_@@_newtheorem_english_title_tl
- {
- \l_@@_newtheorem_title_tl
- }
- \tl_set:Nf \l_@@_newtheorem_french_title_tl
- {
- \l_@@_newtheorem_title_tl
- }
- \tl_set:Nf \l_@@_newtheorem_german_title_tl
- {
- \l_@@_newtheorem_title_tl
- }
- \tl_set:Nf \l_@@_newtheorem_dutch_title_tl
- {
- \l_@@_newtheorem_title_tl
+ \AtBeginDocument{
+ \tl_clear:N \l_@@_newtheorem_style_tl
+ \tl_clear:N \l_@@_newtheorem_title_tl
+ \tl_clear:N \l_@@_newtheorem_french_title_tl
+ \tl_clear:N \l_@@_newtheorem_english_title_tl
+ \tl_clear:N \l_@@_newtheorem_german_title_tl
+ \tl_clear:N \l_@@_newtheorem_dutch_title_tl
+ %
+ \tl_set:Nn \l_@@_newtheorem_english_title_tl {
+ #2
+ }
+ \tl_set:Nf \l_@@_newtheorem_french_title_tl {
+ \l_@@_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l_@@_newtheorem_german_title_tl {
+ \l_@@_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l_@@_newtheorem_dutch_title_tl {
+ \l_@@_newtheorem_english_title_tl
+ }
+ \tl_set:Nn \l_@@_newtheorem_style_tl {
+ theorem
+ }
+ \_@@_theorem_style:n {theorem}
+ \IfNoValueF {#1}
+ {
+ \keys_set:nn { nwejm / newtheorem } { #1 }
+ \tl_if_empty:NF \l_@@_newtheorem_title_tl {%
+ \tl_set:Nf \l_@@_newtheorem_english_title_tl
+ {
+ \l_@@_newtheorem_title_tl
+ }
+ \tl_set:Nf \l_@@_newtheorem_french_title_tl
+ {
+ \l_@@_newtheorem_title_tl
+ }
+ \tl_set:Nf \l_@@_newtheorem_german_title_tl
+ {
+ \l_@@_newtheorem_title_tl
+ }
+ \tl_set:Nf \l_@@_newtheorem_dutch_title_tl
+ {
+ \l_@@_newtheorem_title_tl
+ }
}
}
- }
- %
- \_@@_new_theorem:nVVVV
- {#2}
- {\l_@@_newtheorem_english_title_tl}
- {\l_@@_newtheorem_french_title_tl}
- {\l_@@_newtheorem_german_title_tl}
- {\l_@@_newtheorem_dutch_title_tl}
+ %
+ \_@@_new_theorem:nVVVV
+ {#2}
+ {\l_@@_newtheorem_english_title_tl}
+ {\l_@@_newtheorem_french_title_tl}
+ {\l_@@_newtheorem_german_title_tl}
+ {\l_@@_newtheorem_dutch_title_tl}
% \end{macrocode}
% The following line ensures footnotes and, more specifically, autocitations
% (which are in footnotes) are handled in theorems' notes (i.e. in their
% optional argument).
% \begin{macrocode}
- \makesavenoteenv{#2}
+ \makesavenoteenv{#2}
% \end{macrocode}
%
% \begin{macrocode}
- \bool_if:NF {\g_@@_no_numbered_theorem_bool} {
- \ifcsmacro{#2*}{%
- \RenewDocumentEnvironment{#2*}{o}
- {
- \IfNoValueTF {##1}
- { \begin{#2_@@_nonumbered} }
- { \begin{#2_@@_nonumbered}[##1] }
- }{
- \end{#2_@@_nonumbered}
- }
- }{
- \NewDocumentEnvironment{#2*}{o}
+ \bool_if:NF {\g_@@_no_numbered_theorem_bool} {
+ \ifcsmacro{#2*}{%
+ \RenewDocumentEnvironment{#2*}{o}
{
\IfNoValueTF {##1}
{ \begin{#2_@@_nonumbered} }
@@ -3956,15 +4064,25 @@ Running "make install" installs the files in the local TeX tree.
}{
\end{#2_@@_nonumbered}
}
+ }{
+ \NewDocumentEnvironment{#2*}{o}
+ {
+ \IfNoValueTF {##1}
+ { \begin{#2_@@_nonumbered} }
+ { \begin{#2_@@_nonumbered}[##1] }
+ }{
+ \end{#2_@@_nonumbered}
+ }
+ }
}
- }
% \end{macrocode}
%
% We add to the list of counters we want to be able to easily set to zero the
% ones associated to the (numbered) theorem environments (defined either by the
% class or by the user):
% \begin{macrocode}
- \clist_put_right:Nn \g_@@_counters_to_be_reset_clist {#2}
+ \clist_put_right:Nn \g_@@_counters_to_be_reset_clist {#2}
+ }
}
% \end{macrocode}
%
@@ -4290,12 +4408,6 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\bool_new:N \g_@@_grad_used_bool
\NewDocumentCommand \grad {} {%
- \bool_if:NTF \g_@@_gradient_nabla_bool {
- \operatorname{\nabla}
- }{
- \operatorname{grad}
- }%
- \peek_after:Nw \@@_opx_check:
\bool_if:NTF \g_@@_grad_used_bool {
\bool_if:nT { (\g_@@_gradient_nabla_bool && !\g_@@_gradient_nabla_control_bool)
|| ( !\g_@@_gradient_nabla_bool && \g_@@_gradient_nabla_control_bool) } {
@@ -4305,6 +4417,12 @@ Running "make install" installs the files in the local TeX tree.
\bool_gset_eq:NN \g_@@_gradient_nabla_control_bool \g_@@_gradient_nabla_bool
\bool_gset_true:N \g_@@_grad_used_bool
}
+ \bool_if:NTF \g_@@_gradient_nabla_bool {
+ \operatorname{\nabla}
+ }{
+ \operatorname{grad}
+ }%
+ \peek_after:Nw \@@_opx_check:
}
\DeclareMathOperator{\Div}{div}
\NewDocumentCommand \curl {} {%
@@ -4381,15 +4499,15 @@ Running "make install" installs the files in the local TeX tree.
\NewDocumentCommand \set { m O{} } {
\if@display
\tl_if_empty:nTF {#2} {%
- \__nwejm_set*{#1}
+ \_@@_set*{#1}
}{
- \__nwejm_set*{#1\l__nwejm_given_tl #2}
+ \_@@_set*{#1\l_@@_given_tl #2}
}
\else
\tl_if_empty:nTF {#2} {%
- \__nwejm_set{#1}
+ \_@@_set{#1}
}{
- \__nwejm_set{#1\l__nwejm_given_tl #2}
+ \_@@_set{#1\l_@@_given_tl #2}
}
\fi
}
@@ -4740,14 +4858,14 @@ Running "make install" installs the files in the local TeX tree.
% \end{macrocode}
%
% \begin{macrocode}
-\tl_new:N \g_@@_printer_text_tl%
-\cs_new_protected:Nn \@@_printer_text:n
+\tl_new:N \g_@@_graphicdesign_text_tl%
+\cs_new_protected:Nn \@@_graphicdesign_text:n
{
- \tl_gset:Nn \g_@@_printer_text_tl { #1 }
+ \tl_gset:Nn \g_@@_graphicdesign_text_tl { #1 }
}
-\NewDocumentCommand \printertext {m}
+\NewDocumentCommand \graphicdesigntext {m}
{
- \_@@_printer_text:n {#1}%
+ \_@@_graphicdesign_text:n {#1}%
}
% \end{macrocode}
%
@@ -4786,11 +4904,21 @@ Running "make install" installs the files in the local TeX tree.
disable%
}
}
- \bool_if:NF {\g_@@_inside_pages_bool} {
+% \end{macrocode}
+%
+% If the cover production is asked, we automatically load some libraries, make
+% some configurations and display it (and only it). Otherwise, we automatically
+% display the table of contents.
+% \begin{macrocode}
+ \bool_if:NTF {\g_@@_cover_bool} {
\g_@@_display_frontcover_tl
+ \g_@@_display_backcover_tl
\g_@@_display_inside_frontcover_tl
- }
+ \g_@@_display_inside_backcover_tl
+ \end{document}
+ }{
\tableofcontents
+ }
}
% \end{macrocode}
%
@@ -4967,7 +5095,7 @@ Running "make install" installs the files in the local TeX tree.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Printer text
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\printingservice{Derycke, Jean-Jacques}{Universit\'{e} de Lille 1}{France}{}
+\graphicdesign{Luu, Patricia and Rémond, Catherine}{Universit\'{e} de Lille 1}{France}{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Authors instructions
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5110,7 +5238,7 @@ Running "make install" installs the files in the local TeX tree.
%
\ProvideDictTranslation{received}{re\c cu}
\ProvideDictTranslation{accepted}{accept\'{e}}
-\ProvideDictTranslation{online}{en\space ligne}
+\ProvideDictTranslation{online}{en~ligne}
%
\ProvideDictTranslation{hypothesis}{hypoth\`{e}se}
\ProvideDictTranslation{plural-hypothesis}{hypoth\`{e}ses}
@@ -5824,7 +5952,7 @@ dutch
\computerengineer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\classmaintainer{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\fontdesigner{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
-\printingservice{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
+\graphicdesign{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\computerassistance{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\secretary{%<Last name%>, %<First name%>}{%<affiliation%>}{%<country%>}{%<email%>}#n
\issuesetup{number=%<positive integer%>}#n
@@ -5832,7 +5960,7 @@ dutch
\inputarticle{file}#i
\inputarticle[path]{file}#i
\fontdesignertext{text}#n
-\printertext{text}#n
+\graphicdesigntext{text}#n
% \end{macrocode}
%
% \begin{macrocode}
@@ -5860,8 +5988,10 @@ dutch
%
% \Finale
-% Local Variables:
-% mode: doctex
-% ispell-local-dictionary: "english"
-% TeX-master: t
-% End:
+%%% Local Variables:
+%%% mode: tex
+%%% eval: (doctex-mode)
+%%% ispell-local-dictionary: "english"
+%%% TeX-command-default: "TeX"
+%%% TeX-master: t
+%%% End:
diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.ins b/Master/texmf-dist/source/latex/nwejm/nwejm.ins
deleted file mode 100644
index 372dc5301fb..00000000000
--- a/Master/texmf-dist/source/latex/nwejm/nwejm.ins
+++ /dev/null
@@ -1,101 +0,0 @@
-%%
-%% This is file `nwejm.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `install')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
-\input l3docstrip.tex
-\Msg{********************************************************}
-\Msg{* Installation}
-\Msg{* Class: nwejm 2016/06/10 v0.97}
-\Msg{* for the journal}
-\Msg{* "North-Western European Journal of Mathematics" (DB)}
-\Msg{********************************************************}
-\keepsilent
-\askforoverwritefalse
-\preamble
--------:| -----------------------------------------------------------------
- nwejm:| Class for the journal "North-Western European Journal of Mathematics"
- Author:| Denis Bitouze
- E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-License:| Released under the LaTeX Project Public License v1.3c or later
- See:| http://www.latex-project.org/lppl.txt
-
-\endpreamble
-\postamble
-
-Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License (LPPL), either
-version 1.3c of this license or (at your option) any later
-version. The latest version of this license is in the file:
-
-http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status) by
-Denis Bitouze.
-
-This work consists of the file nwejm.dtx and a Makefile.
-Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-Running "make inst" installs the files in the user's TeX tree.
-Running "make install" installs the files in the local TeX tree.
-
-\endpostamble
-\def\NWEJM@classname{\jobname}
-\def\NWEJM@addons{addons}
-\def\NWEJM@documentation{documentation}
-\usedir{/}
-\generate{
- \nopreamble\nopostamble
- \file{README.md}{\from{\jobname.dtx}{readme}}
-}%
-\usedir{tex/latex/\NWEJM@classname}
-\generate{%
- \file{\NWEJM@classname.cls}{\from{\jobname.dtx}{class}}
- \file{\NWEJM@classname art.cls}{\from{\jobname.dtx}{class-article}}
- \file{\NWEJM@classname.dbx}{\from{\jobname.dtx}{datamodel}}
- \file{\NWEJM@classname.cbx}{\from{\jobname.dtx}{citestyle}}
- \file{\NWEJM@classname.bbx}{\from{\jobname.dtx}{bibstyle}}
- \file{\NWEJM@classname.lbx}{\from{\jobname.dtx}{languagemodel}}
- \nopreamble\nopostamble
- \file{\NWEJM@classname.cfg}{\from{\jobname.dtx}{configuration}}
- \file{\NWEJM@classname-english.trsl}{\from{\jobname.dtx}{english}}
- \file{\NWEJM@classname-french.trsl}{\from{\jobname.dtx}{french}}
- \file{\NWEJM@classname-german.trsl}{\from{\jobname.dtx}{german}}
- \file{\NWEJM@classname-dutch.trsl}{\from{\jobname.dtx}{dutch}}
-}%
-\usedir{tex/latex/\NWEJM@classname/images}
-\generate{%
- \nopreamble\nopostamble
- \file{\NWEJM@classname-logos-collection.tex}{\from{\jobname.dtx}{logos-collection}}
-}%
-\endbatchfile
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.ins'.
diff --git a/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf b/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf
new file mode 100644
index 00000000000..9b990691e19
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nwejm/images/logo-painleve.pdf
@@ -0,0 +1,317 @@
+%PDF-1.5 %
+1 0 obj <</Metadata 2 0 R/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <</Length 9760/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.0-c060 61.134777, 2010/02/12-17:32:00 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
+ <xmp:CreatorTool>Adobe Illustrator CS5</xmp:CreatorTool>
+ <xmp:CreateDate>2016-07-01T11:20:37+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2016-07-01T11:20:37+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2016-07-01T11:20:37+02:00</xmp:MetadataDate>
+ <xmp:Thumbnails>
+ <rdf:Alt>
+ <rdf:li rdf:parseType="Resource">
+ <xmpGImg:width>256</xmpGImg:width>
+ <xmpGImg:height>184</xmpGImg:height>
+ <xmpGImg:format>JPEG</xmpGImg:format>
+ <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAuAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVklxBGeLyKrH&#xA;oCQDjatLcQMCVkUgDkaEdB3+WKqhNNz0xVwNdx0xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV5h+bF0yatBAkEVwW06dmDwm4mUGaJOcESlSXHPrXY&#xA;VOY+aNlw9UL6XsfPuUdSign0rQxcCGaN9PX1rW4vxp91KAY2FQXAO4rICOu3fLYfSHJxfSPchm0y&#xA;0kkgf6ra3KtFyKR600RjDhS3J/VkL1Jbiw6UP82TZsr8ky31pdfoqS0tbZWjknuRHqH1ub1FMcKs&#xA;ImHJEfgxO7UPetcVZnirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVUJ7GznkWSaFHkT7DkDkPkeowUtLJ9J0qfj69nBNwBC+pGj0B605A9cKqP+HtA5cv0&#xA;Zacv5vQjr/xHFUTHYWMU7XEdvEk77PMqKHPbdgK9sVV8VdirsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdir//2Q==</xmpGImg:image>
+ </rdf:li>
+ </rdf:Alt>
+ </xmp:Thumbnails>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+ xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+ <xmpTPg:NPages>1</xmpTPg:NPages>
+ <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+ <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+ <xmpTPg:MaxPageSize rdf:parseType="Resource">
+ <stDim:w>419.999514</stDim:w>
+ <stDim:h>297.000132</stDim:h>
+ <stDim:unit>Millimeters</stDim:unit>
+ </xmpTPg:MaxPageSize>
+ <xmpTPg:PlateNames>
+ <rdf:Seq>
+ <rdf:li>Cyan</rdf:li>
+ <rdf:li>Magenta</rdf:li>
+ <rdf:li>Yellow</rdf:li>
+ <rdf:li>Black</rdf:li>
+ </rdf:Seq>
+ </xmpTPg:PlateNames>
+ <xmpTPg:SwatchGroups>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Groupe de nuances par défaut</xmpG:groupName>
+ <xmpG:groupType>0</xmpG:groupType>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpTPg:SwatchGroups>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">PaulPainlevé-logo-cmjn</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+ xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+ xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
+ <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+ <xmpMM:DocumentID>xmp.did:04801174072068118C14951806C0E8B9</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:469d09bb-a317-284a-afe1-29b99da83110</xmpMM:InstanceID>
+ <xmpMM:OriginalDocumentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</xmpMM:OriginalDocumentID>
+ <xmpMM:DerivedFrom rdf:parseType="Resource">
+ <stRef:instanceID>uuid:7259676c-0c82-0e4f-9077-a7135f0a57a2</stRef:instanceID>
+ <stRef:documentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</stRef:documentID>
+ <stRef:originalDocumentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</stRef:originalDocumentID>
+ <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+ </xmpMM:DerivedFrom>
+ <xmpMM:History>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:04801174072068118C14951806C0E8B9</stEvt:instanceID>
+ <stEvt:when>2016-07-01T11:20:32+02:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CS5</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpMM:History>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>Adobe PDF library 9.90</pdf:Producer>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end="w"?> endstream endobj 3 0 obj <</Count 1/Kids[5 0 R]/Type/Pages>> endobj 5 0 obj <</ArtBox[0.0 0.0 1190.55 841.89]/BleedBox[0.0 0.0 1190.55 841.89]/Contents 6 0 R/MediaBox[0.0 0.0 1190.55 841.89]/Parent 3 0 R/Resources<</ExtGState<</GS0 7 0 R>>/Properties<</MC0<</Color[20224 32768 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(Calque 1)/Visible true>>>>/Shading<</Sh0 8 0 R>>>>/TrimBox[0.0 0.0 1190.55 841.89]/Type/Page>> endobj 6 0 obj <</Filter/FlateDecode/Length 20163>>stream
+H\Wl +̹z?R'vX؀,"M7䏿q/ӟ>~Wb%c^뷏pz;^Ǐ=\3xZp%_.%Ϗx2x.3+q3!5녗ǿ7 8UtxzWoҸ$L W.+M]2A0(؍rMr{,Cm΄|!"X|fxR"*$d.
+FAD8~ ~ 5p.wnUdo _Pj^8g')="e OvkQ6m1n>8/>ۻ+qHddD9C1KO!IOJ4E3Mƕr&Lg퓕 L!sΓ4w"~X4K b:-[ M(5k2:(,_o,V3Iq**FT t<r""PX {(Pí٫!aq bӐ
+ϩ9d//
+_]'["
+Lh5LϿU1]/2d!+F2z.˰w3_ Ã;@n G"ZS1T]`6 GX a) -AJ=n!+}=:*eSbx{ti&k{/|W6[w6OZf@Y
+R۴n*X B.lF!+7򖦙b%X}d}tbbҼ΁0l
+@^O[O;l1V9I+MȔ:y_v&)([F0mm<Vi%4ܙ[=(7INdi/h2.
+tޡZ4y*xTO$Ʃ0l<  ;L* A5'2<7n
+m@Pld!9Cz8*/>Hڟ1vA 7U Q,4
+UmRtZ33Jtp=JdWԗT8G!XJgMNǎ8{hBb5C5RXJ%0ROniz҂,Yî5 #Rp׼KgV=@Mc+5ĂZ:Xc27ŗ2Rߝ]lZ"Sk3HrD!VX-aD| lQZMȜ<5GB*XsLM-&iRyf)qp)/}7
+*ۖFW]uN#'Jėt]l TDb|!/(8#6TT nU:mԊ-u7HN=9H(NJUj8HN1lVRABh؇{sqL
+|{܀%|tL;LẄtB 8sZE= vZ?=
+Y~[-6W̩N _
+ redUWp9,Mh
+⫦׸n_ZGtt+.,tͪ@7zĔ8g2+ٙ^5 _UDz,<ANc2Pbvt7 ҴZLec%UCʊRm{kqy;CF[_DƯ[Z+?*N
+<wS'NKga;TEj=..&PI"mdyݥT*#7
+SF<l'(fu&3(䘆vTDSW]0y<!ʂJXjM>e ud9\[=Nb<Zc5T76(fQi ò?:ݶxOG\W`YrKsde-(Iђ\nZgmd7K?^n(.7U+&#&G];DF*]b"ƵdEb'Z|h<wwSjbʑ M0ƢGVOD5AqY)z{<b&Fj9)e^73R-eͣwi2֕-H+g-
+1:65nD]IpSWT2xH5ZvN2Ɏ#Oh?ÍmdUJ % @ tS-cpt ܑ&Y08]Ӭ'o:<W3{_6^k7cH juV5XӟvB)'\мKm1}ܱ[6dٛSl_\eͥϮ5+67Bt~(gcs)ʦ >z"_yBUd Z5tqb d
+G-bm%?rH1"\Rf^8'
+s/3'sǤj,=v1\k5 "<U5Fi&)mL HyްL/m۰cU1P^=jcB_R'\׿<qXm#t`J}ĐN>m|3E!_Rk48p}DMqӇ̟4b |5# u%:'} nYlR=Z@:V, `u;`2j&&. gwZǥ:֓ЫSյTJ2%<@95OdnYgAþ3h )5lO*3j\Ei%l7gvʪd\ޯ?m<}>FϷ>(Av<zRоpY6i`ASaR7#'M92uyԒWy3tɈ{-QGAmqG$BlyV*nn.o ƛulj\&zQV6 di>E2P $av*wE
+d,'ݞ 5+(NVkLηd wR2uvXHڟ N+iV[\v:], h\H?VLXO%`נ9cͮ Ig\?xE7=iPBh
+fxPOP^}k۬t~uŸWb W,ɲvאggbJ}t.t@$-MwJ#6yZP;Re5,O$t7Hj#
+-+zo P;PhlS:Y[볏B=.Mz2F/0^*);f/Db xAE GVƒc R$DsnZW_5?gƟGv?5y5PvrWW?{IQ-pb _ZE7~B)}XE f@P$@U ěPkct8ۉo>,,AD/\)%"\(yDEeQ^Qia^Na3ɐ SJǻl,>0i8 ꭹ"Η?+ݢ3~W1"P[ߏ6%IWfz,n*Kr´ADAoZ ũ~w|?^G|dJ`TQWBݦTO@^sߵ;)<:DJ۸8*7##w
+YJi(RllU5NC m#HCuhMFXqԡ[g㐏Ǘl؟V3g{%Ք7+"t]Wm>PZkUǿ _aspn4γ?: '!8tZ9d ;85%)1Yf #.fqmx
+5er-?c?f?=AdXM$a*
+8*қ ԟ[*`:ov#U;ɯ0VeYf#o L20$p es':6, dq=W54!&?=MXVm'0P_|"Hxj6&W"[
+ EHjKbBс+5.s4?L[Y٧##XN b:3qq3U SqS{.|. cT_Q;KHRWO.gS
+uuq
+4/U {G-6rCco8ÞOcDTK. buZGe461%n46 ƵG0Z
+=HO&J֮@@%F9r&#Lr!2<=`.c7#W I y,\-
+p/#R&o/؉pQR
+Ľ\326!YLe.]0&-OY66cr!tr4^ $p{b:Mj:G)R%[1cZ5TLz۬k׼=J/Yԍ_ڙgIP$%8OJ; W'Â1/
+A!jZj*#5T+s@l߉UΪ]pmCk."Tq>ԤQ {^H'{`QORL*G VRS-@Ba'?8~•Jea0˹CNO@ > HwZF?VnTw}?71Z7<IK,c]{3Kt)9UK궃s?ȹ~ B osqU?nvUXǕEgɞJҲ!8c>b
+>IODqf}6#q2':~'Zwڞe;΂C ~Jyhz^N,N=O6jʥ1hn<cgcWO ;Ư[
+'~V%t\
+ﱈ -BqKNkOqk߮z^L_8V=̀SDc% :nh@s hE%[_h\d vH d0C_8 ҭjʺP X `_z-J]Ϥ1wZ_|j%Yӫu{2 } 2?]Ge6iS|(({w/*VdaNKqƞUGHHZsabrCqb<-O7EbX<ղEuR)k\oaTj 77Ɉ=?Hص1p2ʃaZR?c
+C UH\vb hIS`꼢U0y]!m}"-vVnOPיmCڑkkq1. ̦l]dƎ)KB6.R>o˵zvDݥ ?;C>Ys*52h?@S>ߖXN&p>8 jSY">)̛5(EM%BmXT+d (2 j19}plnJ6_[^'[O]1Fa+JǷ듃['QR0H " mv0+svNH\c
+H\q%qTZ̤qK'W Z&QQeUws9`A(\iJ
+NM=4MDUzzfiZ(۔#$
+!Q*HadU5)%t23T i?cA%읎8M fGQȔ7ozmA|.ŦkȂfԸK)ʂBR ͑C
+PW5! m!KDÝg×W3#)%M f+{Ԙ¶B [9SVc-
+q uY~BjXIni/HM}􈏆@i_Y]5xE|°0L)uF'@8qzb⋎Qq5*&]m u\&`w2sa7P@QI 7
+cjڊ=r9^; Rq(ban )`YV%?%6̀d6GU)nWɭѩ" GD%lt?O`J:(wQa7a)C9S>Yܒ({PhRdC>%&<*bS:7I
+i
+tB0WA1p.mX.ʠ_<5fL_\ZLч"d{w6ʅoJa1"!
+ ָM9[;YPb%c95ȳ}%h0ז?l͐9QHx}]E/h;:y'ؚHBWZn["&mrL
+yj$s9ݷJ"L?/}ƌ ~koNe#nND*Q"dlKZT8LjnfeӈP bâOf|a Cr/PMJ*(ap[Sܟ[x9RF p ^`hsM,;5#r4Mȧ}E F4HXi=ս~}Lcvw
+KMSNf/x;&u&IY-B SBϙ%]W6G4K<G
+螺09*gu-0KQ;dn&Rϫ\U&*EV ̞<p Gc'OXtz:eLMYU4X;K!q9@pg6ژ]b=ͱsiT5~Pg lؙS[S1Mn\2/rbQ# GB&>|3teoR
+;T1"Sbsk2;-hǹ/}d-h?~<_]<yc?Hb=9ᤵzN2QL(;ճnX hj,跡o\)KחǺc+ ~O`kࣷ26VbGEͻ zvh/i =i̓j}o2CZkVުbޟt _hbt;`r{~},#Hpt7lO0Ҳ&à#Iވh+Ԇwz7iդwV"ѥ7+^ +#]b/#^}윛ÖC+9$g޽F:ZWckLe0}GX(!&Lp^|ˊlMpn:r R A:ӒVq- 1yT 4<5J[sDJ&%/8MFzyc4ҹ AG٥xnZ:gE۩*u#*LӾސ Iw_?QZ04A̫QL*FND!5E JkшJ PxpƆvYk< Wx\iAw!hQXR5p
+puunb)N,ձbVPd&y 40!U:j\.^ą~Pl.tw5q=gI HA^
+O4(ze7,N`ׄ*kxT@CRIe a]*9Ibtf1{[euui8q *=/$k/f#fO<ɪ=oà kAn lvTO9f+Be"}q=dbp+ x>p%lLn mo."
+e*t^jjt1G8M恇
+rEEIqHBƏ'T6bL:<?$NAaCLYӵAi@))%gj.ZRj&Yi8pWFn}6 vmben_>!oa<A-cQnLNxq m=.nm^3ȭ![%e]*F5+u/t1
+ն%YXUn*FO#tap~IU:r@kPQ<|Ga좩y|Qdm4C9˒‚G|ǖ/{ޛJe/&u^EyvmZ#rU¦@23K?mU{`Y~M^jϲIFQޡSj@-~E]ĕЬli>5(Y}шx8#׫4[yuhQELiE@>k%y6^`ݙnTe>#_4g:$ ]WSMNt8A^ea˼ܠ=n1dp܍S m5:E@>X2{PI)3Wrw6NiLJxYu۠߼ˋX.L;")PK՜KArPTbX\<%v /= Jg&vG'd>TD)a:N||y{HvT'3,EǐDMRWj*m?[S )AhuYmJJ ɶE6Дg<%x.o2nk#dfb+`HiK~*wr'vw)Mޑ1d>^8(Z9SR@C'4#Iָ߯Sn
+tT5pZ53"&kbӐXE;<DEgc6@%zn`VE[.:V՞!`ElNz6c~ȳ.aFd*'2*ryj80 4q _g
+_Bz HW苡X{UÏGו s`HD%p-_O*eyp2pCRSE6 w]!'A )(UTݜA%g7n
+aLh}󏌦w٪Zڇd
+iOd5Y#9/4BK'oUP»T
+hD#uġc…6u<qg($BkE&=c=)A='N)
+ϻnhb-|ߥ
+ _r?Ka m=FQ%
+'6SԆ«ؠd_[iCl'
+ٴtnJt.rR\62VNIA1=z{K xPr6WI򏧽}nz;ֻ`6ázj\Xb c%bjII\xa5-G탺Ѩ`(ghjI b|bPtbJlW
+ʆEgè.XFKm (G΍@Zyr93CT`bʁp8G:g;4 fR9E
+ycL/d_908N6L jV WhM DPCE«EtnCk!)$8
+cLɲ ~*ΪB~=963ɧ#|s/g*
+|/,Dpx;CkS8d3
+C$Eɼ Z-|鳟̳S>EG#ДxQ~MҹʡRߡ_g($eG§Yg6tZO~1 j6~?o2q ^hR_B놞}&f8 7;v@f!s]샏.ՁA*PCP8/Z< @&2eDھ !ocqlYS}x~ -\u:C]1#%+X-;_"x^O _0oWiAg3ĘLjѯ@(3Kγk2yɩʡ;$Xg"$M*3IZ0byln/x"jI,e3hሮbL/IɎgZ~=B&d׽`򧬊<|yuC*
+T)
+y++;|v3~ŝ> Mݿ@w_5wp",,*6 veAB_s@IHo#';Eif'<,!GC7tO4L/u. "0!Ꙧ(^<1tdD4A&L\%,SMlFDu5![
+ ێ -c]GR%uvLLomˌ-6HԿC`$p+:@KSͩ,V`,zq{ xw6nm]R'ӚYtbvlmHS P$ }2ii`6ƣ !488Dq*w(e5;}HHoCtBO[lβaVjpVY?t8:b8Hv:^cu߼nWz<OR*i\I= ,>Jo`
+0000000016 00000 n
+0000000076 00000 n
+0000009912 00000 n
+0000000000 00000 f
+0000009963 00000 n
+0000010340 00000 n
+0000030969 00000 n
+0000030573 00000 n
+0000030714 00000 n
+0000030741 00000 n
+0000030836 00000 n
+0000031081 00000 n
+trailer <</Size 13/Root 1 0 R/Info 12 0 R/ID[<E5DA620FFC83489F877501727B344A4E><8FE733E04F504FEB9047877C524FDCAB>]>> startxref 31293 %%EOF 2 0 obj <</Length 9760/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.2-c001 63.139439, 2010/09/27-13:37:26 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
+ <xmp:CreatorTool>Adobe Illustrator CS5</xmp:CreatorTool>
+ <xmp:CreateDate>2016-07-01T11:20:37+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2016-07-01T11:22:37+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2016-07-01T11:22:37+02:00</xmp:MetadataDate>
+ <xmp:Thumbnails>
+ <rdf:Alt>
+ <rdf:li rdf:parseType="Resource">
+ <xmpGImg:width>256</xmpGImg:width>
+ <xmpGImg:height>184</xmpGImg:height>
+ <xmpGImg:format>JPEG</xmpGImg:format>
+ <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAuAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVklxBGeLyKrH&#xA;oCQDjatLcQMCVkUgDkaEdB3+WKqhNNz0xVwNdx0xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV5h+bF0yatBAkEVwW06dmDwm4mUGaJOcESlSXHPrXY&#xA;VOY+aNlw9UL6XsfPuUdSign0rQxcCGaN9PX1rW4vxp91KAY2FQXAO4rICOu3fLYfSHJxfSPchm0y&#xA;0kkgf6ra3KtFyKR600RjDhS3J/VkL1Jbiw6UP82TZsr8ky31pdfoqS0tbZWjknuRHqH1ub1FMcKs&#xA;ImHJEfgxO7UPetcVZnirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVUJ7GznkWSaFHkT7DkDkPkeowUtLJ9J0qfj69nBNwBC+pGj0B605A9cKqP+HtA5cv0&#xA;Zacv5vQjr/xHFUTHYWMU7XEdvEk77PMqKHPbdgK9sVV8VdirsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdir//2Q==</xmpGImg:image>
+ </rdf:li>
+ </rdf:Alt>
+ </xmp:Thumbnails>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+ xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+ <xmpTPg:NPages>1</xmpTPg:NPages>
+ <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+ <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+ <xmpTPg:MaxPageSize rdf:parseType="Resource">
+ <stDim:w>419.999514</stDim:w>
+ <stDim:h>297.000132</stDim:h>
+ <stDim:unit>Millimeters</stDim:unit>
+ </xmpTPg:MaxPageSize>
+ <xmpTPg:PlateNames>
+ <rdf:Seq>
+ <rdf:li>Cyan</rdf:li>
+ <rdf:li>Magenta</rdf:li>
+ <rdf:li>Yellow</rdf:li>
+ <rdf:li>Black</rdf:li>
+ </rdf:Seq>
+ </xmpTPg:PlateNames>
+ <xmpTPg:SwatchGroups>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Groupe de nuances par défaut</xmpG:groupName>
+ <xmpG:groupType>0</xmpG:groupType>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpTPg:SwatchGroups>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">PaulPainlevé-logo-cmjn</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+ xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+ xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
+ <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+ <xmpMM:DocumentID>xmp.did:04801174072068118C14951806C0E8B9</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:4e27f3eb-70b1-1e41-8861-b9e083adacc9</xmpMM:InstanceID>
+ <xmpMM:OriginalDocumentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</xmpMM:OriginalDocumentID>
+ <xmpMM:DerivedFrom rdf:parseType="Resource">
+ <stRef:instanceID>uuid:7259676c-0c82-0e4f-9077-a7135f0a57a2</stRef:instanceID>
+ <stRef:documentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</stRef:documentID>
+ <stRef:originalDocumentID>uuid:cb528f62-dff5-2049-8580-871f81ffb042</stRef:originalDocumentID>
+ <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+ </xmpMM:DerivedFrom>
+ <xmpMM:History>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:04801174072068118C14951806C0E8B9</stEvt:instanceID>
+ <stEvt:when>2016-07-01T11:20:32+02:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CS5</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpMM:History>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>Adobe PDF library 9.90</pdf:Producer>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end="w"?> endstream endobj 5 0 obj <</ArtBox[0.0 0.0 1190.55 841.89]/BleedBox[0.0 0.0 1190.55 841.89]/Contents 6 0 R/MediaBox[527.688 310.254 661.247 368.682]/Parent 3 0 R/Resources<</ExtGState<</GS0 7 0 R>>/Properties<</MC0<</Color[20224 32768 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(Calque 1)/Visible true>>>>/Shading<</Sh0 8 0 R>>>>/TrimBox[0.0 0.0 1190.55 841.89]/Type/Page>> endobj 12 0 obj <</CreationDate(D:20160701112037+02'00')/Creator(Adobe Illustrator CS5)/ModDate(D:20160701112237+02'00')/Producer(Adobe PDF library 9.90)/Title(
+2 1 0000031702 00000 n
+5 1 0000041538 00000 n
+12 1 0000041924 00000 n
+trailer <</Size 13/Root 1 0 R/Info 12 0 R/ID[<E5DA620FFC83489F877501727B344A4E><F82F8246992643CF93D852276B65B6F7>]/Prev 31293>> startxref 42136 %%EOF \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf b/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf
new file mode 100644
index 00000000000..3e580ad78c2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nwejm/images/logo-ul1-ufr-math.pdf
@@ -0,0 +1,249 @@
+%PDF-1.5 %
+1 0 obj <</Metadata 2 0 R/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <</Length 17936/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.0-c060 61.134777, 2010/02/12-17:32:00 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">UL1-UFR-MATHEMATIQUES-CS5-2014</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
+ <xmp:MetadataDate>2016-07-01T11:03:06+02:00</xmp:MetadataDate>
+ <xmp:ModifyDate>2016-07-01T11:03:06+02:00</xmp:ModifyDate>
+ <xmp:CreateDate>2016-07-01T11:03:06+02:00</xmp:CreateDate>
+ <xmp:CreatorTool>Adobe Illustrator CS5</xmp:CreatorTool>
+ <xmp:Thumbnails>
+ <rdf:Alt>
+ <rdf:li rdf:parseType="Resource">
+ <xmpGImg:width>256</xmpGImg:width>
+ <xmpGImg:height>84</xmpGImg:height>
+ <xmpGImg:format>JPEG</xmpGImg:format>
+ <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAVAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXiP5tf&#xA;m15v8seb30rSngW0WCKQCSIO3Jwa71zIxYhIWXpuyuysOfDxzu7PVhn/AEMJ+Yv+/bX/AJED+uWe&#xA;BF2X+h/Tf0vm7/oYT8xf9+2v/Igf1x8CK/6H9N/S+bv+hhPzF/37a/8AIgf1x8CK/wCh/Tf0vm7/&#xA;AKGE/MX/AH7a/wDIgf1x8CK/6H9N/S+b3O88zapD+Uk/mhCn6Vj0B9TUlf3f1hbIzj4f5efbMSQo&#xA;l47VYxDLKI5RkR8ix/zd+YPmHSvyDg872rQjXJNO0u7Zmj5RepePbrL8FelJmpvgaE98zfm/+Xfl&#xA;jUZdN1vVxa38HD1rYQzyuqugcORFG/wcW+107dcVX3nnGzTzNpSRaxB+irzS7jUhaLBLLJPDGFcX&#xA;EUyKyBFRvs/aau2Ko9/PnlNNB03Xmv8A/cTrEsEGnXAimPqyXR4wqECeovI/zKKd6Yqll3+cX5a2&#xA;nmU+WrjXIU1hZVtnh4SmNZmbiImmCGFXrtQvt3xVc35ufl6vmL/Dh1Yfpr6w9o9oILhiksZIYSOs&#xA;ZRBtXkzAU3rQHFVvl/8AOD8u/MGuJoekat9a1GUO0CCC4SOURV5mOV41jcCnZvlirBdS/Om503yj&#xA;5M1JNYg1eTWtbjttQ1C20+7jifT1lkS49KJk5rKlFVV+025VTiqafmX+bMWja/p2i23mHTtBtrqB&#xA;Lm8v7m3uby7jV2+FUt409OLktPinI69MVeq29xBcwR3FvIssEyLJFKhDKyMKqykdQQcVX4q7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXy9/zkJ/5MWX/mFg/UczMH0vcez/APi3+cUn/KfyXpfm&#xA;/wA0PpWpSzw262sk4e2ZFfkjIoFXSQU+LwyWWZiLDk9q6yenxccQCbrf4s8/Mf8AJDyp5Z8majrd&#xA;hd38t3aej6aTyQtGfUnjiPIJCjfZc98rx5iTTquzu2s2fNHHIRo3yvuJ73iGZD07sVfW9no9xrX5&#xA;LQaNbMqXGpeW1s4Xf7IeexEalvarZr5/UXzbXf3+T+vL73kHm/zB5n1L8k4vy5h8ma4PMNnZ2dne&#xA;sbRjbKmmtG7SxzKWEnqCAcQvWu3vFxXoEWjXb/mV+ZF1LYyNBd6PZQWs7REpL/o8okjjYijb8eSj&#xA;2riqQfl3oerx61+XH12wuI4bbyzeW16ZYnVY3Z0AikLD4WIGynFUD5S8qeaW8zaB5A1DT508u+Rt&#xA;Vu9XTVJFb0LiEfHpixyEUaRXuG5r2A9sVSLSvLHmGDUrryp5og12404a412umaVpcYgvg9x6sd3P&#xA;qZYfuxWrLVeIFOvRV6T+Xel3Vrqn5oTXum3DRXmqzvDGIykl1D6J2hZ+AflUhTypU9cVYh+Wkvmr&#xA;T/Mvl3SPLI8yx+XI3nTWNJ8xWMaRWcABKiO74rvz+yqnf7xiqWaPonmTT/yM8h3J0W+nuPL3miHV&#xA;tQ02KB/rYtoLi4LMsLAOftr2716b4qqeb9K80Q+d/Nv1oa1b+XvNcVvOjaNpKXt1eQm3WNrJrhq/&#xA;VWSnGlN+pI7qvoPy5ZWtj5e0yxtLeS0tbW0ggt7ScgyxRxxqiRyEF6sqih3O+KphirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVfL3/OQn/kxZf+YWD9RzMwfS9x7P8A+Lf5xV/+ccv+U/l/5gJv&#xA;+TkeOf6WPtD/AIuP6w+4vX/zy/8AJW63/wBGv/UXDlGH6g892J/jUPj/ALkvk7M1752Kvs7yGwXy&#xA;J5dZjRRpdmST0A+rpmvn9RfNtd/f5P68vvYlqX51eX7jzZ5c0Hyvqdjqr6jqDWmqKheRo4liZw8T&#xA;Kyr9oAcviGRcVk5/MnyEPMH+Hjr1mNaEgg+peqvP1Saen4c67ca1xVB/mP5x1Pyz/hf6hFDL+m/M&#xA;Fho9166u3G3u/U9Ro+DJSQcBxJqPY4qmPmPWr7T9W0C1trmwgi1G7aC5jvTKJpUEZbhaen8Pq1FT&#xA;z2pirz7Vvzh8zWf5eefvMkVtZG+8reYJ9H0+NklMT28Vzbwq0wEoZpOM7VKsorTbFXofmbz35O8r&#xA;tAnmDV7bTZLqv1dJ3ozAEAsFFTxBO56Yqm9le2d/Zw3tlOlzaXKLLb3ETB43RhVWVhUEEYqrYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+YP8AnIaNl/MRmPR7OBl+XxL+sZmYPpe4&#xA;9nz/AIP/AJxVf+ccv+U/l/5gJv8Ak5Hjn+lj7Q/4uP6w+4vX/wA8v/JW63/0a/8AUXDlGH6g892J&#xA;/jUPj/uS+aPLfk3zN5kuPR0bT5bqho8wHGJP9eRqIPlWuZcpgc3tdTrMWEXOVff8kv1XTrjTNUvN&#xA;NueP1ixnktpuBqvOJyjcTtUVXCDYtuxZBOAkOUhfzfVUWnahqf5Ix6dpxpqF75aW3tN+P72WxCIK&#xA;9viPXMCf1F85139/k/ry+95X5cvdNvJvys0fTtCvbLU/LlxHH5gMmny26QS/VTHIZZSgSs03x9d6&#xA;1O+RcVIPJmiz/XtP8qeb3uLe80/WjdT6dZaNK15eT/WGZLubUaMnoVavJP2BQdjir178+Uuo9K8p&#xA;6nDaXF5b6N5n03Ub9LWNppEtoBLzcIu53YD6cVS7zH5msPNvmbyHeaLBePb2GtuLtp7S4t+Aa1ej&#xA;ETIh47/a6YqwjXdP1ib8u/zg8sx6XenVpvMU2sW0XoScZrOa9tnWSJ6Uf4IGYgdsVXefNUvbnz6n&#xA;miNm0rRPMGix21jq17o02pSwOjyLLbxwU/czMW6MOLV8MVe1fldpemaX+X+h2Olx3UVjFb1iS/i9&#xA;C5q7M7tLF+yWdi1P14qynFXYq7FXYq7FVCXULCK4+rS3MUdyY2nELOqv6SEBpOJNeKk7t0xpmMci&#xA;LANckA3m7ymssELa1YCa5CNbRm6hDSLJshQcqsG/Zp1yXCe5t/KZaJ4JUOex2VdM8y+XdVlaHS9V&#xA;s7+VF5PHbXEUzKtaVIRmIGAxI5scmnyYxc4yj7wQqahremafdWNreTelPqUpgsk4u3OQKWK1UELs&#xA;P2qYgIhhlMEgbRFlG4Gp2KuxV2KuxV2KuxV2KuxV2KvCv+clfLEzHTfMsKco0X6jeEfs/EXhY+xL&#xA;MK/LMnTy6PU+zmpA4sR94/S8i8pebtY8qauuq6S0YuAhidZU5o8bEEqRseqjoQcvnASFF6HV6SGe&#xA;HBPk9K82/nfpnmv8vdT0a7spLHWJxB6XA+pA/p3EcjUbZlPFSaEfTlMcJjK3S6TsWeDURmDxQF+/&#xA;kUXqX/OQdnpej2uleVNNXnBCkZurheEKsFAb04UIJ37sR8jgjgJ5tWLsCU5meaXM8hz+bxjUb+61&#xA;HULnULt/UuryV57hwAvKSVi7mgoBVj2zJAp6bHjEIiI5AU+x/IP/ACgvlz/tl2X/AFDpmvn9RfON&#xA;d/f5P68vvY/5G/NG68z+btb8u3OgXGiy6PFHLyu3HqyrKxCn0Qg4AgVB5muRcVrXPzTGm39/ZxWd&#xA;tK1rfWunxzTXwhhBuUkdpbmURSpbqhhZAKsxagKrUVVW3X5pXMVxKkWmQSQ28WoyzSNeOrEae0qg&#xA;RBbd1f1DD+0y0rtyxVT0383BqGo2tkumJZNMbtZ11C7FtKrWciQvDFH6b+tN6slCgYAAVDGoxVFe&#xA;XfzKuNVvdBtLmwtraTW4p5qxXjTen6SlkQKbeJ2ZgrE8lRRT4WY7YqzrFXYq7FXYqkvm3zjoXlTT&#xA;BqOsTNHC7+lEiIXd5CC3FQPZT1IGSjEnk5Ol0mTPLhgN2AWX5w3vmC4C6bbfUbNjs8hDzMPH+Vfl&#xA;v88mcdO4PY8cQ9Z4j9j0bQZHktebsWc0JYmpOVl0+pAEtmO+btH1w+ZYNY0+wbUYTpd3pskMMkMc&#xA;iSTsro59d4lKfDQ0NR4HJRIqnJ0uWHhGEjw+uMuvS+60p8leQ/Mmk6wklzcy2dvBpen2zNbG2eO4&#xA;lt+ZlicSpJIFFacl4E12PhKUwfm36zXY8kNhZM5He9gao7ED70v8heVtd8rX3lufzBw9FrSbToUm&#xA;nto2srqaZpFjj4MvridRsBzYH2wzkDdN2u1OPPHIMf8AOEtgfUAOflw/ALPMnl/ztJ5niu5ZHWVd&#xA;WmbSL+e7iWzSGW1KWscVs0vL1VkrzpFybxOAEUnT58AxUP5g4gAeKxL1G65Vy32ZN+XGl+crGS7P&#xA;mGa7b1IoR6VwySxCZARI8MhvL2T4+pBSNfBR0wTI6OF2hlwyrwwOvLu6WOCI+2R82cZW6x2KuxV2&#xA;KuxV2KuxV2KuxVDalptjqdhPp9/Cs9ncoY54W6Mp+X4HCDTPHklCQlE0Q+dfO3/OP3mLTbiS48uA&#xA;6rpxqyw1VbmMeBBoJPmu/tmVDOOr2Gi7fxzFZfTL7P2POrjyr5ntpDFcaRexSDqr28qn8Vy3jHe7&#xA;mOrxEWJx+YTjQvyr8/a1KqW2jzwxN1uLpTbxAePKQLy/2IORlliHHz9qafGN5A+7dlOtf846+c7G&#xA;xS4sZ7fU5gtZ7WImNwe/pmTirj7j7ZAZw4GH2hwylUgYjv8A7Hv3kq2uLXyboNtcxtDcQadaRzRO&#xA;CrI6QIrKwO4IIocxpncvJ6yQlmmRuDKX3sR8uaVqkP54+b9Sls549OudO0+O2vXjdYZHRfjVJCOD&#xA;Fe4B2yLjIx9V84XN5rNslsIFg1K1htWksJnSS1knjikl5NwSTgj8+SsaBdxTFUZ50uPMti81zo9u&#xA;l0kWm3tykH1Rp3a6iMYijDIa/vfWY8QtW4mnfFUlm8z+d/rUoi04uY7KKezjbS7v/SJ5HZJ63B4L&#xA;AUAUem8fIjfcdFVFvNH5lwXtokHlqNrWSObmUhkVop1e/wCCEniPTlW2t/j2oWHZ1oqr+XfOvnyf&#xA;SfV1HSZnvJINQNjXT7u09ee3S2a2WaJzIbYPJJNGPUYcgnIHFUBpnnr8z5W0P6zo0ptLu8liu7n9&#xA;GXUMjRK1uF5wPIWtBSWb95LVT6YI60KqJi85/mKbPUZJtNeK5gsoJrOE6fesHnkSEyL+7R6lWdwF&#xA;rUEbigJxV6RZPO9nA9wOM7RoZhx4UcqC3wcpOO/bm1PE4q85/Pjy1rnmHQdLsdGs3vLn68GZUoAq&#xA;+i45OzEKoqepOXYZAHd3fYepx4ckpTNDh/SEP+Xn5O3Gj20UuuXKtcAA/VbepUf60hAr9A+nBPJZ&#xA;2bNf2wMhIxjbvP6nqMMEMEYjiUIg6AZU6KUjI2Xm/n/y35n1Tz7pF3oLtaXNnYTmHUJEk+rLI0io&#xA;0cjoDQtE70HjlkCADbt9DqMUMEhk3BkNuvLp8aYxYjz55W8qfo/RLPVFuI7rUHicW4kSQJKPT9SM&#xA;2l1KxkXdTyjU7/FXJ7E7udPwM+biyGFVHry23r1RG3+cfJuTQvM0utH1odSWa48z6fqDcLSsCQtD&#xA;8dwsvolKxM3AhmIFPiWtTjYr4KM+IQ24dsMo/Vvd8qvrz+5GXGs/mtKLEzWzxPaCdoNQmsJJHedL&#xA;l4x6sdvZXbqHtqf3axV5V59sAEWuOHSC6POtuIcuEHYmcf4u/i9yYNqn5ovelRLfRwzXGtRfDZQ8&#xA;YorRPUsHUtAf71vgBYkOOm++Co/c0+FpeH+GwMf8R3v6uvT7FjeYvzMnv9CiW21G3F1+j01blbIY&#xA;AtzFS5kRfqbGIxPu3qXHwt+wVw1HdP5fTCM94muLh332O38W9+UfjaQaHD590Xy/piaVp11JqdjY&#xA;X8ci3WnrW3l9dCscExgR3Uxs0igOwdtt6UBlRLl5zgyZJcchwylHlLmKPMX8DsKTnTfN/nh9YmSG&#xA;6vtR0qz1GS2uGawT6yInsucPqwxW8cifvzueAp+1tgMR9jjZNLg4BYjGZhf1bXxb0TKuXn7nWvmL&#xA;82y2km6Sa3Rra2lmaSzmZZZDI31hJ47ayuXjfjQKOUQHX4sajustPpPVVHc/xDbuq5i/9l8GT/l5&#xA;qfm67u7+PXvrUyRKphu5IDa2rl3Y8YYZrSzuVKrQHk0g/wArIzA6OFr8eGIj4de67PxIlKP+59zN&#xA;8rdY7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqoW&#xA;9jY20s8tvbxQy3LepcyRoqtI4FOTkAFjTapxtlKciACbrkr4sXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq//Z</xmpGImg:image>
+ </rdf:li>
+ </rdf:Alt>
+ </xmp:Thumbnails>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+ xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+ xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
+ <xmpMM:InstanceID>uuid:00b048e2-6ee4-fc46-aa5a-04f0ab81e8a9</xmpMM:InstanceID>
+ <xmpMM:DocumentID>xmp.did:03801174072068118C14951806C0E8B9</xmpMM:DocumentID>
+ <xmpMM:OriginalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</xmpMM:OriginalDocumentID>
+ <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+ <xmpMM:DerivedFrom rdf:parseType="Resource">
+ <stRef:instanceID>uuid:899818cc-5ae4-5840-b293-910c4f0a8dc4</stRef:instanceID>
+ <stRef:documentID>xmp.did:0A801174072068118083F68E64D14A1A</stRef:documentID>
+ <stRef:originalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</stRef:originalDocumentID>
+ <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+ </xmpMM:DerivedFrom>
+ <xmpMM:History>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:0180117407206811822AC81757AED2E9</stEvt:instanceID>
+ <stEvt:when>2014-11-26T11:11:34+01:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CS6 (Macintosh)</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:0A801174072068118083F68E64D14A1A</stEvt:instanceID>
+ <stEvt:when>2014-12-04T14:49:05+01:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CS6 (Macintosh)</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:03801174072068118C14951806C0E8B9</stEvt:instanceID>
+ <stEvt:when>2016-07-01T11:02:58+02:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CS5</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpMM:History>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/">
+ <illustrator:StartupProfile>Print</illustrator:StartupProfile>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+ xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#"
+ xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+ <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+ <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+ <xmpTPg:NPages>1</xmpTPg:NPages>
+ <xmpTPg:MaxPageSize rdf:parseType="Resource">
+ <stDim:w>188.463604</stDim:w>
+ <stDim:h>60.000472</stDim:h>
+ <stDim:unit>Millimeters</stDim:unit>
+ </xmpTPg:MaxPageSize>
+ <xmpTPg:Fonts>
+ <rdf:Bag>
+ <rdf:li rdf:parseType="Resource">
+ <stFnt:fontName>Verdana-Bold</stFnt:fontName>
+ <stFnt:fontFamily>Verdana</stFnt:fontFamily>
+ <stFnt:fontFace>Bold</stFnt:fontFace>
+ <stFnt:fontType>Open Type</stFnt:fontType>
+ <stFnt:versionString>Version 5.02</stFnt:versionString>
+ <stFnt:composite>False</stFnt:composite>
+ <stFnt:fontFileName>Verdana Bold.ttf</stFnt:fontFileName>
+ </rdf:li>
+ </rdf:Bag>
+ </xmpTPg:Fonts>
+ <xmpTPg:PlateNames>
+ <rdf:Seq>
+ <rdf:li>Cyan</rdf:li>
+ <rdf:li>Magenta</rdf:li>
+ <rdf:li>Yellow</rdf:li>
+ <rdf:li>Black</rdf:li>
+ </rdf:Seq>
+ </xmpTPg:PlateNames>
+ <xmpTPg:SwatchGroups>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Groupe de nuances par défaut</xmpG:groupName>
+ <xmpG:groupType>0</xmpG:groupType>
+ <xmpG:Colorants>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>Blanc</xmpG:swatchName>
+ <xmpG:mode>CMYK</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:cyan>0.000000</xmpG:cyan>
+ <xmpG:magenta>0.000000</xmpG:magenta>
+ <xmpG:yellow>0.000000</xmpG:yellow>
+ <xmpG:black>0.000000</xmpG:black>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 J=0 N=100</xmpG:swatchName>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:tint>100.000000</xmpG:tint>
+ <xmpG:mode>CMYK</xmpG:mode>
+ <xmpG:cyan>0.000000</xmpG:cyan>
+ <xmpG:magenta>0.000000</xmpG:magenta>
+ <xmpG:yellow>0.000000</xmpG:yellow>
+ <xmpG:black>100.000000</xmpG:black>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=30 M=100 J=25 N=0</xmpG:swatchName>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:tint>100.000000</xmpG:tint>
+ <xmpG:mode>CMYK</xmpG:mode>
+ <xmpG:cyan>30.000002</xmpG:cyan>
+ <xmpG:magenta>100.000000</xmpG:magenta>
+ <xmpG:yellow>25.000000</xmpG:yellow>
+ <xmpG:black>0.000000</xmpG:black>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpG:Colorants>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpTPg:SwatchGroups>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>Adobe PDF library 9.90</pdf:Producer>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end="w"?> endstream endobj 3 0 obj <</Count 1/Kids[5 0 R]/Type/Pages>> endobj 5 0 obj <</ArtBox[0.0 0.0 534.228 170.08]/BleedBox[0.0 0.0 534.228 170.08]/Contents 6 0 R/MediaBox[0.0 0.0 534.228 170.08]/Parent 3 0 R/Resources<</ColorSpace<</CS0 7 0 R>>/ExtGState<</GS0 8 0 R>>/Font<</TT0 9 0 R>>/ProcSet[/PDF/Text]/Properties<</MC0<</Color[20224 32768 65535]/Dimmed false/Editable true/Preview false/Printed true/Title(Calque 1)/Visible true>>>>/Shading<</Sh0 10 0 R>>>>/TrimBox[0.0 0.0 534.228 170.08]/Type/Page>> endobj 6 0 obj <</Filter/FlateDecode/Length 5073>>stream
+HWˎWtLfq>>l ^`{ ؿwD&Y]=XXCUE&>~?pzIҖՊn"z߯sן/t/o6ٖ֫--wVe+-_e3VZ[</T|ʊ
+ؘ*h.?!RO y DS?a~zNސ41" !e3gr {e#Ca3\;}b,Jy7KecqɹWKNUNŕOecqsucyٱ\^v./;W988VzDVRf#{﫞 O
+?ɤ >D8fdC#u(;J7 ѐR$iL|JȚSwG{xo5/HVW й=NG6Dmݥ0qwIܖ w5Z#_,BY@A){D-V+wO(qt)BSnZW=k7a>
+[cԩLs_TJ~cᨅE890m-y7nl0Fni#R
+{̼EѝS^
+(9^c]
+!WZ4S5.=AGqXފw;\:x=^x:?c&PNߐ%hROUAvP;sCw06(tX3N$P=N$JH$OA~:A52i~R?TABSѲ Qt%ER%y"l*gHGla ?Pϐݺ%: S)>õuW'2);4'' %OwD[*IstYHҽZc7X60);$< 8. =峝
+~1z~=z~9D_N/珢Out LEяp*w@颤!S xS1ѩgS'Bk`Ft#ztK7Tm֬Z,I'RTm&J(2Bn
+$OIϵ[J:%qzpy5N}:{!:kn<vU;/ٽTOLH*JP t/!#gq BdvQ&O;4Y{O ymI Iz}DZj5!z?be䢃5. +="UYiNcz?Te<zL#/x+q'`sQPH.k6k=zw4~RTyjhiȋ9QQ$/Lμ)vWߛuP>^c~ѣ:trh^,zu#8`qrp|6A46p\%ثxD@?+COJCv}0Ά.ٴ?[nOhcGk2xPr{ifi-Q^WnT&r2L'4WgC:R_ @6\`jgXOK0tfT,~K|m$ aPb=OVt1.Yչ/[BoȠfvJ69nLLfs`pZPr"8)@LFfwuaFEpY tRrM-WM_dC]2<P4\l%UgWtW /?$CI`Õ'V+Nhe$||L{=uX$Vh)j]G%HN(<-O3gܱ:akl^~ &t QqT6O(lĬ?ox[vLX5'#8?3VŹY^`Ba-uq}1 אM |ƾÊȍ aNz!say1{Dr򃹌{`ٺ7⭚ ) ̚[/'}zVC Vk[B`~Jaq]bTb>Od =%pCǟD+:Yr"xrGR0p {a x f >Yk;v2Zʂ-YoU[i-|m?sܟT_;Nu-*KZ'149׳РǚI5p5L}:yӛ
+٠o!!hf$??%_G[\W5!*9M%F^wj$ICV8iIRw$$^*T֮<h\G9`1!J!"#.Wι`k=cU;sծ8F7>O>&C@/X|zΑaw"<h n6H8bT9h&6Wd-erȵS6*
+"[#3j'MZ}|x@ߛs^!JXŇѻdӑij̬w_KMk q19E;Di%n-t@GD#8
+{TчP0ӬH%q6ʗ%S
+-(.Rq`U'9|q,Mz RƋ i$L{ny{IVBt
+)$.e^KꠍrYJ0a|c{>lo7}cdNe'{.ٿ >mz>q=>5vzٸ5TLs=m\W7>s^w~fz}ӎlD'Dgu'zKtwۉt;1=}ݡzI&cʍ}}۸o<'q;݋m>F,BW-oܜ6T`z[Now?:~YuEijӫKe-V>VH7(+W- O}v }k5r2Nѐfz3L>C%=ͭt%һhO-(=IeT\aվIπF]T<Ҧ<oʓ<iMy\xTXhchwιHy
+viŕ>& ]9C{Ԟ*qJM{n2j]|e⣵I&+N9 3]O'ms%U&2էh< ]ag{Bs60g^duhx RP9e )#lHpOW+J!
+UCI4׭]'
+
+ ION\
+Na ,G?gV>RX6(C[knmPԆ:Ԑįn;3$nɗfFG
+yF狍0Z*k17f68!9
+ìp*aO᷿_]_\w?'+ӏ?_3_x}ݯ/`
+{2 index 1.000000 cvr exch sub 4 1 roll 1 index 1.000000 cvr exch sub
+4 1 roll 0 index 1.000000 cvr exch sub 4 1 roll 1.000000 4 1
+roll 7 -1 roll 1.000000 cvr exch sub 7 1 roll 6 -1 roll 1.000000
+cvr exch sub 6 1 roll 5 -1 roll 1.000000 cvr exch sub 5 1
+roll 4 -1 roll 1.000000 cvr exch sub 4 1 roll pop pop pop } endstream endobj 13 0 obj <</Process 17 0 R/Subtype/NChannel>> endobj 17 0 obj <</ColorSpace/DeviceCMYK/Components[/Cyan/Magenta/Yellow/Black]>> endobj 9 0 obj <</BaseFont/HNNHGC+Verdana-Bold/Encoding/WinAnsiEncoding/FirstChar 32/FontDescriptor 18 0 R/LastChar 233/Subtype/TrueType/Type/Font/Widths[342 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 650 0 0 0 0 0 0 948 0 0 0 0 782 0 0 812 0 0 0 0 0 0 0 0 0 0 0 668 0 0 699 664 0 0 712 342 0 0 0 1058 0 0 0 699 0 593 456 712 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 664]>> endobj 18 0 obj <</Ascent 1072/CapHeight 727/Descent -303/Flags 32/FontBBox[-550 -303 1707 1072]/FontFamily(Verdana)/FontFile2 19 0 R/FontName/HNNHGC+Verdana-Bold/FontStretch/Normal/FontWeight 700/ItalicAngle 0/StemV 176/Type/FontDescriptor/XHeight 548>> endobj 19 0 obj <</Filter/FlateDecode/Length 7946/Length1 14428>>stream
+HVTG!6lş ؈MH,Q1vEAAb%APEł={#OE7YWn`lٙs{g|ɐޭg1+m%C#ﷸ8`k¨XK7`lâ#uxTZL ;q6P%GW
+8>S5Pݫ
+x_o۵Q;un{|ڳg?ӷ_ !aÆ9**zرq 'M8iӦϘ9k/Xh˾2y_WĪik֮Xac&yKmwܵ{}>po'N:}.^B+W][ wYRHOB &rq)ӹ$(RVOv\9_ ZU6XK&her-E[mrM!0٦ TϜ_vQw}t=@o $}R˥zQw.hefi3:@c10U1U7ٚMM3ý"b2g#,-KWO+Cƭ|-
+ wLWHʵ5%)$dmF۠ek{#[$4szToIoPH"b  9 -JX),-X _`ο)[-|NbGO/<-NO+^ܦE{O.Q8LO/|UԻ0dщ=ݜ–Ew~'09ټƬ*yXh`5''FG'z?z 0)-ىw%%IbY)I?hQ6l;OŗyK<Eý|ZL d<L,<`#֩z4WexgXM" ?9^` 6+ E0#g8 8s8\\%d#OWpyc|9aH(!
+1X"xC"c阄S7}lhؑ(+vbgvaW~nJ*'~^9/?p q00?*[2! e҆`5Vg D!XcmpG2h֡=bC'e=:3x׸{O.4r,&r3t:6S8ـ وk|qLa*Ws\uzfr=Yf*۹9]=Ko~~<C<ox߲1Їy'yygyyA"/їMK?^f*:o&o1Y@3ﰐE{rh( )h,+
+?Xfh!+JTR~%W.R+8/dv-]؍\1SqN{l-2Qd%f[D*&"G3L9K
+".$l+[TR2rQWۦõt_%!Y1W4U83URYs*UzZE)F <VXA5XoTSPIP1/"S GQZ
+Lר*T &['6ikӭʤ-vk'-hsy|ιs9aY-f24QX"_)~Ie~ݽNK:rߠ}5:rr,N&Σ?ȥc*ص V*R&d^4yQ[l1wfɱqkc6 m@A<݁ U)dl NEB*y&@R3x*V)Wº)sƺ=Ѭ/NhTc}\l#:f *y30A"1'8ԌQUbK,qRZNx;wtN ˝K{_JM&>080!LN+HcS1m9&vbnvܰaU@`W.Xz4{L/47a8œeQhCœR D&R$ZYuU) `]u4k'i;QnH)at6b
+֓o
+/~R}! ]]@4Sw0Qhl6MRauxKa&bضYv[mYKyݚNQS,c%&vHRVadt!,4gzˎ5 Vw4BW()hEITJQ6g^E Lg 9Fk Ǩ~VC}(xlԱ`_wuGM6tcǃtc~[-L ==ēQ2;WX8"KJALNEo WccdD{&;3YT ;=4<3s犏:`r;U[Ur{B\1{Pg4$pt6Z+MiyWԅS{HN-Rw+X#IDՐDn/X&H^\_̜}<CBࢯ-
+1g`nʵum[;7tmkM,oh у}oۻ*|Ux?\v$~cKwR§ 8.|MݮpλիObJñ~gpuw!6<h}pc<-nME^T]0ߐ,\^"Α$Om$nɵdI+f<FTϊsLܼ;@8SϜ9yW<!E ;eYAt8:Rvk{oYGL-[:Ju@Ee'̼y<j~̚\bfk"5Pjf7[SF$#H'"H5!d81˿6/y(8GtbwUzb25{z0R]sjj|U8ҖG;r軐o@2<ۅIJ.ގ*1@ki>e+JV]"$6h2 {Xg]pRǷU-譛Tc;&w߼
+hJ쏑7&ڄ(f.,{aSxY&-t*SCl G7kR,L9:b?Ō^*Tyݳ9Q.Q bT^ Tl*k*5Ziu4(iv$ jh*j3M'3Ɍc)Z>{P!L:{{C[NTV_q$E'eT'O4lHxcST-¹HL*72OV82)GVQVEV *m~il O?Y%LUNCՃwcF32rȀ ?i??hDzG҃ӣgwˎ{pYx ?.ٙz
+m\\=} 2{NK,L59ny4y%y@yuzN)goK_68\)};r5臏%'أx|!A =9CU-Hf~QKů^-!C()B 7/9? #X]K0w9#0s+r(3Ov4fSNEl ³ԥ7/&&6Fl_Sś&Qޢ- 4y/qP3Vl^s-{3SU{iڕJ :)Qb}93ӽhwƮ%4cr=Ȋd/S" -|%S<FM˝X#xD3S2gf^]<bqׄK-)>kKc;~2YxOuG z6$2ϪJiiq.|wfS
+Σ#)F#'c;ZIC`]gƻM&=}Uׅ4^'XHr7JfX`4QD )7%GYm W7-PwRi\LLiOgD%-zU\5v~[`0w{\n:^{QG O4I;I 2Zͤ,=`l$>>
+9ꀓ3½~%{&d=b=E?WȂwq[;be;~gZ,se>2'l;Srʖ^ P.Zl c J߹oޥqv0Q VhX#mqC񟣭zUzj7h.4uG`|lE(6jۆ9>+rͶIʚƺ"u "agy}2Zu>[[DKvGn;~5s`ڶ<Y:
+x@
+F0V+H%5^c!57Z:µwH>*frq,28kQ˼NFq"e>+.ڠΑLXH^t/Wrak!_IF
+0 e~(89yCkEP7[ڎҙ,6"\4-KsCK[چcKQt&Enΰ:+ԯȪ<&YJP /kY{hpHSYJʨ$z[Z[[v6yHxg.Kʤ6$),i0j"LS/ 3و1o" ӰHHZPT>L 呈$ 3*W#P2ׄJDOUi0A;j˰$%\="lVD \cDAVA# mAٞ{v?3plF~ӈj8#Cm\}fW+nt1s0EVw
+j֌gu 9A?Z#5:
+7Gz[Ɵyj9gN6ODŽ~<KYt94OWD1}*~2UDߛ6wQ.nwEPCNRHPobk0O} '\'8!E3nnqe_c[؍o~q"_}9zKǓnK'>+gQ ybJۘ^B^1z!goJℓ$}s1:ʎrOV&}t2VK'
+Wƞcnv:i#o6Gz@{q~+GbJiA~%ʹҢJjKi^n%}JT<*lٚSYx,
+ӜJ /x ;7lv:sYmr3Nޖ9]B\qvC ɇ_"q.@O:A't6yFH9]sу^ө&RNMN"#<^0EO.:hI^cJzCTUǘ2s 桠Pce;umtZy1ڿʙ`
+0000000016 00000 n
+0000000076 00000 n
+0000018089 00000 n
+0000000000 00000 f
+0000018140 00000 n
+0000018582 00000 n
+0000023866 00000 n
+0000033846 00000 n
+0000024967 00000 n
+0000023724 00000 n
+0000023939 00000 n
+0000024379 00000 n
+0000024832 00000 n
+0000024081 00000 n
+0000024183 00000 n
+0000024284 00000 n
+0000024885 00000 n
+0000025561 00000 n
+0000025816 00000 n
+0000033958 00000 n
+trailer <</Size 21/Root 1 0 R/Info 20 0 R/ID[<061F882C99F04B1C80D7B05754BEE5DE><71EE748C7BC741868044126CBF28351E>]>> startxref 34152 %%EOF \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-cover-background.jpg b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-cover-background.jpg
new file mode 100644
index 00000000000..e3fa6346e5d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-cover-background.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-federation-recherche-math-npdc-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-federation-recherche-math-npdc-logo.pdf
index ddc8e34dcb3..ddc8e34dcb3 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-federation-recherche-math-npdc-logo.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-federation-recherche-math-npdc-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-fields-institute-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-fields-institute-logo.pdf
index 320d3c67a91..320d3c67a91 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-fields-institute-logo.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-fields-institute-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-kwg-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-kwg-logo.pdf
index 4f1b9c7e0c5..4f1b9c7e0c5 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-kwg-logo.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-kwg-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.pdf
new file mode 100644
index 00000000000..e8610a45ce8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo-NB.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.pdf
new file mode 100644
index 00000000000..55185bb049c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.pdf
index 5d8d781164c..0243803e366 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.tex b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.tex
index b32baede8a4..b32baede8a4 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-logos-collection.tex
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-logos-collection.tex
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-smf-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-smf-logo.pdf
index 3ab1a5ac68e..3ab1a5ac68e 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-smf-logo.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-smf-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nwejm/nwejm-sml-logo.pdf b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-sml-logo.pdf
index 3bd23456f80..3bd23456f80 100644
--- a/Master/texmf-dist/doc/latex/nwejm/nwejm-sml-logo.pdf
+++ b/Master/texmf-dist/tex/latex/nwejm/images/nwejm-sml-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl
deleted file mode 100644
index 2c3fe6c3d10..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl
+++ /dev/null
@@ -1,39 +0,0 @@
-\ProvideDictionaryFor{Dutch}{nwejm}
-\ProvideDictTranslation{theorem}{stelling}
-\ProvideDictTranslation{corollary}{gevolg}
-\ProvideDictTranslation{conjecture}{vermoeden}
-\ProvideDictTranslation{remark}{opmerking}
-\ProvideDictTranslation{axiom}{axioma}
-\ProvideDictTranslation{definition}{definitie}
-\ProvideDictTranslation{example}{voorbeeld}
-\ProvideDictTranslation{lemma}{lemma}
-\ProvideDictTranslation{notation}{notatie}
-\ProvideDictTranslation{proposition}{eigenschap}
-\ProvideDictTranslation{proof}{bewijs}
-\ProvideDictTranslation{plural-theorem}{stellingen}
-\ProvideDictTranslation{plural-corollary}{gevolgen}
-\ProvideDictTranslation{plural-conjecture}{vermoedens}
-\ProvideDictTranslation{plural-remark}{opmerkingen}
-\ProvideDictTranslation{plural-axiom}{axioma's}
-\ProvideDictTranslation{plural-definition}{definities}
-\ProvideDictTranslation{plural-example}{voorbeelden}
-\ProvideDictTranslation{plural-lemma}{lemma's}
-\ProvideDictTranslation{plural-notation}{notaties}
-\ProvideDictTranslation{plural-proposition}{eigenschappen}
-\ProvideDictTranslation{plural-proof}{bewijzen}
-\ProvideDictTranslation{volume-abbreviated}{deel}
-\ProvideDictTranslation{plural-keyword}{trefwoorden}
-\ProvideDictTranslation{received}{ontvangen}
-\ProvideDictTranslation{accepted}{aanvaard}
-\ProvideDictTranslation{online}{online}
-\ProvideDictTranslation{hypothesis}{hypothese}
-\ProvideDictTranslation{plural-hypothesis}{hypotheses}
-\ProvideDictTranslation{assertion}{aanname}
-\ProvideDictTranslation{plural-assertion}{aannames}
-\ProvideDictTranslation{century}{eeuw}
-\ProvideDictTranslation{before-christ}{v.Chr}
-\ProvideDictTranslation{Acknowledgments}{Dankwoord}
-\ProvideDictTranslation{idest}{dat~wil~zeggen}
-\ProvideDictTranslation{ie}{d.w.z}
-\ProvideDictTranslation{Idest}{Dat~wil~zeggen}
-\ProvideDictTranslation{Ie}{D.w.z}
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl
deleted file mode 100644
index 56300b39dd8..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl
+++ /dev/null
@@ -1,39 +0,0 @@
-\ProvideDictionaryFor{English}{nwejm}
-\ProvideDictTranslation{theorem}{theorem}
-\ProvideDictTranslation{corollary}{corollary}
-\ProvideDictTranslation{conjecture}{conjecture}
-\ProvideDictTranslation{remark}{remark}
-\ProvideDictTranslation{axiom}{axiom}
-\ProvideDictTranslation{definition}{definition}
-\ProvideDictTranslation{example}{example}
-\ProvideDictTranslation{lemma}{lemma}
-\ProvideDictTranslation{notation}{notation}
-\ProvideDictTranslation{proposition}{proposition}
-\ProvideDictTranslation{proof}{proof}
-\ProvideDictTranslation{plural-theorem}{theorems}
-\ProvideDictTranslation{plural-corollary}{corollaries}
-\ProvideDictTranslation{plural-conjecture}{conjectures}
-\ProvideDictTranslation{plural-remark}{remarks}
-\ProvideDictTranslation{plural-axiom}{axioms}
-\ProvideDictTranslation{plural-definition}{definitions}
-\ProvideDictTranslation{plural-example}{examples}
-\ProvideDictTranslation{plural-lemma}{lemmas}
-\ProvideDictTranslation{plural-notation}{notations}
-\ProvideDictTranslation{plural-proposition}{propositions}
-\ProvideDictTranslation{plural-proof}{proofs}
-\ProvideDictTranslation{volume-abbreviated}{vol.}
-\ProvideDictTranslation{plural-keyword}{keywords}
-\ProvideDictTranslation{received}{received}
-\ProvideDictTranslation{accepted}{accepted}
-\ProvideDictTranslation{online}{online}
-\ProvideDictTranslation{hypothesis}{hypothesis}
-\ProvideDictTranslation{plural-hypothesis}{hypotheses}
-\ProvideDictTranslation{assertion}{assertion}
-\ProvideDictTranslation{plural-assertion}{assertions}
-\ProvideDictTranslation{century}{century}
-\ProvideDictTranslation{before-christ}{BC}
-\ProvideDictTranslation{Acknowledgments}{Acknowledgments}
-\ProvideDictTranslation{idest}{id~est}
-\ProvideDictTranslation{ie}{i.e}
-\ProvideDictTranslation{Idest}{Id~est}
-\ProvideDictTranslation{Ie}{I.e}
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl
deleted file mode 100644
index 26e7d8a1371..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl
+++ /dev/null
@@ -1,39 +0,0 @@
-\ProvideDictionaryFor{French}{nwejm}
-\ProvideDictTranslation{theorem}{th\'{e}or\`{e}me}
-\ProvideDictTranslation{corollary}{corollaire}
-\ProvideDictTranslation{conjecture}{conjecture}
-\ProvideDictTranslation{remark}{remarque}
-\ProvideDictTranslation{axiom}{axiome}
-\ProvideDictTranslation{definition}{d\'{e}finition}
-\ProvideDictTranslation{example}{exemple}
-\ProvideDictTranslation{lemma}{lemme}
-\ProvideDictTranslation{notation}{notation}
-\ProvideDictTranslation{proposition}{proposition}
-\ProvideDictTranslation{proof}{preuve}
-\ProvideDictTranslation{plural-theorem}{th\'{e}or\`{e}mes}
-\ProvideDictTranslation{plural-corollary}{corollaires}
-\ProvideDictTranslation{plural-conjecture}{conjectures}
-\ProvideDictTranslation{plural-remark}{remarques}
-\ProvideDictTranslation{plural-axiom}{axiomes}
-\ProvideDictTranslation{plural-definition}{d\'{e}finitions}
-\ProvideDictTranslation{plural-example}{exemples}
-\ProvideDictTranslation{plural-lemma}{lemmes}
-\ProvideDictTranslation{plural-notation}{notations}
-\ProvideDictTranslation{plural-proposition}{propositions}
-\ProvideDictTranslation{plural-proof}{preuves}
-\ProvideDictTranslation{volume-abbreviated}{vol.}
-\ProvideDictTranslation{plural-keyword}{mots-cl\'{e}s}
-\ProvideDictTranslation{received}{re\c cu}
-\ProvideDictTranslation{accepted}{accept\'{e}}
-\ProvideDictTranslation{online}{en\space ligne}
-\ProvideDictTranslation{hypothesis}{hypoth\`{e}se}
-\ProvideDictTranslation{plural-hypothesis}{hypoth\`{e}ses}
-\ProvideDictTranslation{assertion}{assertion}
-\ProvideDictTranslation{plural-assertion}{assertions}
-\ProvideDictTranslation{century}{si\`{e}cle}
-\ProvideDictTranslation{before-christ}{av.~J.-C}
-\ProvideDictTranslation{Acknowledgments}{Remerciements}
-\ProvideDictTranslation{idest}{c'est-\`{a}-dire}
-\ProvideDictTranslation{ie}{c.-\`{a}-d}
-\ProvideDictTranslation{Idest}{C'est-\`{a}-dire}
-\ProvideDictTranslation{Ie}{C.-\`{a}-d}
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl
deleted file mode 100644
index f22f5f9ad01..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl
+++ /dev/null
@@ -1,39 +0,0 @@
-\ProvideDictionaryFor{German}{nwejm}
-\ProvideDictTranslation{theorem}{Theorem}
-\ProvideDictTranslation{corollary}{Korollar}
-\ProvideDictTranslation{conjecture}{Vermutung}
-\ProvideDictTranslation{remark}{Bemerkung}
-\ProvideDictTranslation{axiom}{Axiom}
-\ProvideDictTranslation{definition}{Definition}
-\ProvideDictTranslation{example}{Beispiel}
-\ProvideDictTranslation{lemma}{Lemma}
-\ProvideDictTranslation{notation}{Bezeichnung}
-\ProvideDictTranslation{proposition}{Proposition}
-\ProvideDictTranslation{proof}{Beweis}
-\ProvideDictTranslation{plural-theorem}{S^^c3^^a4tze}
-\ProvideDictTranslation{plural-corollary}{Korollare}
-\ProvideDictTranslation{plural-conjecture}{Vermutungen}
-\ProvideDictTranslation{plural-remark}{Bemerkungen}
-\ProvideDictTranslation{plural-axiom}{Axiome}
-\ProvideDictTranslation{plural-definition}{Definitionen}
-\ProvideDictTranslation{plural-example}{Beispiele}
-\ProvideDictTranslation{plural-lemma}{Lemmata}
-\ProvideDictTranslation{plural-notation}{Bezeichnungen}
-\ProvideDictTranslation{plural-proposition}{Propositionen}
-\ProvideDictTranslation{proofs}{Beweise}
-\ProvideDictTranslation{volume-abbreviated}{Bd}
-\ProvideDictTranslation{plural-keyword}{Schl^^c3^^bcsselbegriffe}
-\ProvideDictTranslation{received}{empfangen}
-\ProvideDictTranslation{accepted}{angenommen}
-\ProvideDictTranslation{online}{online}
-\ProvideDictTranslation{hypothesis}{Hypothese}
-\ProvideDictTranslation{plural-hypothesis}{Hypothesen}
-\ProvideDictTranslation{assertion}{Behauptung}
-\ProvideDictTranslation{plural-assertion}{Behauptungen}
-\ProvideDictTranslation{century}{Jhdt}
-\ProvideDictTranslation{before-christ}{v.~Chr}
-\ProvideDictTranslation{Acknowledgments}{Best^^c3^^a4tigungen}
-\ProvideDictTranslation{idest}{das~hei^^c3^^9ft}
-\ProvideDictTranslation{ie}{d.~h}
-\ProvideDictTranslation{Idest}{Das~hei^^c3^^9ft}
-\ProvideDictTranslation{Ie}{D~h}
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
deleted file mode 100644
index 7a7eebff3ce..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
+++ /dev/null
@@ -1,116 +0,0 @@
-%%
-%% This is file `nwejm.bbx',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `bibstyle')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
-\ProvidesFile{nwejm.bbx}
-[2016/04/01 v 0.1 nwejm bibliographic style (DB)]
-
-\RequireBibliographyStyle{authoryear}
-
-\DeclareNameFormat{giveninits-last}{%
- \nameparts{#1}
- \usebibmacro{name:given-family}
- {\namepartfamily}
- {\namepartgiveni}
- {\namepartprefix}
- {\namepartsuffix}%
- \usebibmacro{name:andothers}%
-}
-\renewbibmacro*{doi+eprint+url}{%
- \iftoggle{bbx:doi}%
- {%
- \iffieldundef{doi}%
- {}%
- {%
- \begingroup%
- \edef\URLorDOI{%
- \detokenize{http://dx.doi.org/}%
- \thefield{doi}%
- }%
- \iffieldequals{url}{\URLorDOI}%
- {\endgroup}%
- {%
- \endgroup%
- \printfield{doi}%
- }%
- }%
- }%
- {}%
- \newunit\newblock%
- \iftoggle{bbx:eprint}%
- {\usebibmacro{eprint}}%
- {}%
- \newunit\newblock%
- \iftoggle{bbx:url}%
- {\usebibmacro{url+urldate}}%
- {}%
-}
-\renewbibmacro{in:}{%
- \ifentrytype{article}{}{\printtext{\bibstring{in}\intitlepunct}}%
-}
-\renewbibmacro*{journal}{%
- \iffieldundef{shortjournal}%
- {%
- \iffieldundef{journaltitle}%
- {}%
- {%
- \printtext[journaltitle]%
- {%
- \printfield[titlecase]{journaltitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}%
- }%
- }%
- }%
- {\printtext[journaltitle]{\printfield[titlecase]{shortjournal}}}%
-}
-\renewbibmacro*{volume+number+eid}{%
- \printfield{volume}%
- \setunit*{\addnbthinspace}%
- \printfield{number}%
- \setunit{\addcomma\space}%
- \printfield{eid}%
-}
-\DeclareFieldFormat[article]{volume}{\mkbibbold{#1}}
-\DeclareFieldFormat[book]{volume}{\mkbibbold{#1}}
-\DeclareFieldFormat[article]{number}{\mkbibparens{#1}}
-\DeclareLabeldate{%
- \field{date}%
- \field{eventdate}%
- \field{origdate}%
- \field{urldate}%
- \field{pubstate}%
- \literal{nodate}%
-}
-\renewcommand*\bibnamedelimc{\addnbspace}
-\renewcommand*\bibnamedelimd{\addnbspace}
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.bbx'.
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
deleted file mode 100644
index 3382d2d0112..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
+++ /dev/null
@@ -1,140 +0,0 @@
-%%
-%% This is file `nwejm.cbx',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `citestyle')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
-\ProvidesFile{nwejm.cbx}
-[2016/04/01 v 0.1 nwejm citation style (DB)]
-
-\RequireCitationStyle{authoryear}
-
-\ExecuteBibliographyOptions{giveninits,ibidtracker=constrict}
-
-\renewrobustcmd{\blx@mkbibfootnote}[2]{%
- \iftoggle{blx@footnote}%
- {\blx@warning{Nested notes}%
- \addspace\mkbibparens{#2}}%
- {\unspace%
- \ifnum\blx@notetype=\tw@%
- \expandafter\@firstoftwo%
- \else%
- \expandafter\@secondoftwo%
- \fi%
- {\csuse{blx@theendnote#1}{\protecting{\blxmkbibnote{end}{#2}}}}%
- {%
- \patchcmd\@makefnmark%
- {\normalfont}%
- {\normalfont\bfseries}%
- {}{}%
- \csuse{footnote#1}{\protecting{\blxmkbibnote{foot}{#2}}}%
- }%
- }%
-}
-\renewcommand*{\mkcitation}[1]{%
- \patchcmd\@makefnmark%
- {\normalfont}%
- {\normalfont\bfseries}%
- {}{}%
- \footnote{#1}%
-}
-\newbibmacro*{cite:title}{%
- \printtext[bibhyperref]{%
- \printfield[citetitle]{labeltitle}}}
-\providecommand*{\mkibid}[1]{#1}
-\newbibmacro*{cite:ibid}{%
- \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
-}
-\newbibmacro*{nwejm:cite}{%
- \iffieldundef{shorthand}{%
- {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
- {\usebibmacro{cite:ibid}}%
- {%
- \ifthenelse{%
- \ifnameundef{labelname}%
- }{%
- \usebibmacro{cite:label}%
- \setunit{\addcomma\space}%
- }{%
- \printnames{labelname}%
- \ifthenelse{%
- \iffieldundef{labelyear}%
- }{%
- }{%
- \setunit{\addcomma\space}%
- \usebibmacro{cite:labelyear+extrayear}%
- \ifthenelse{%
- \iffieldundef{labeltitle}%
- }{%
- }{%
- \setunit{\addcomma\space}%
- \usebibmacro{cite:title}%
- }%
- }%
- }%
- }%
- }%
- }{%
- \usebibmacro{cite:shorthand}%
- }%
-}
-\DeclareCiteCommand{\nwejmfootcite}[\mkbibfootnote]
-{\usebibmacro{prenote}}%
-{\usebibmacro{citeindex}%
- \usebibmacro{nwejm:cite}}
-{%
- \ifcurrentbaselanguage{french}{%
- \parindent=\parindentFFN%
- \addtolength{\parindent}{\widthof{\dotFFN\kernFFN}}%
- }{%
- \parindent=\footnotemargin%
- }%
- \multicitedelim\newline\indent%
-}
-{\usebibmacro{postnote}}%
-\DeclareMultiCiteCommand{\nwejmfootcites}[\mkbibfootnote]{\nwejmfootcite}
-{\addsemicolon\space}
-\DeclareAutoCiteCommand{nwejmfootcite}{\nwejmfootcite}{\nwejmfootcites}
-
-\DeclareCiteCommand{\textcite}
- {\boolfalse{cbx:parens}}
- {\usebibmacro{citeindex}%
- \iffirstcitekey
- {\setcounter{textcitetotal}{1}}
- {\stepcounter{textcitetotal}%
- \textcitedelim}%
- \iffootnote{\usebibmacro{nwejm:cite}}{\usebibmacro{textcite}}}
- {\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}
- {\usebibmacro{textcite:postnote}}
-
-\ExecuteBibliographyOptions{autocite=nwejmfootcite}
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.cbx'.
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.cfg b/Master/texmf-dist/tex/latex/nwejm/nwejm.cfg
deleted file mode 100644
index 5bb9161a7cf..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cfg
+++ /dev/null
@@ -1,131 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Journal data
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\journalsetup{%
- publisher = \nwejm,
- address = UFR de Math\'{e}matiques -- B\^atiment M2 -- Bureau 10\newline
- Universit\'{e} Lille 1 -- Cit\'{e} Scientifique\newline
- 59655 Villeneuve d'Ascq,
- phone = +33 (0)3 20 43 42 33,
- email = aurore.smets@univ-lille1.fr,
- url = http://math.univ-lille1.fr/~nwejm/,
- issn =
-}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Editor in chief
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\editorinchief{Nicaise, Serge}{Universit\'{e} de Valenciennes et du Hainaut Cambr\'{e}sis
-}{France}{serge.nicaise@univ-valenciennes.fr}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Fields editor
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\fieldseditor{Craig, Walter}{McMaster University}{Canada}{craig@math.mcmaster.ca}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Managing editor
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\managingeditor{Wicker, Nicolas}{Universit\'{e} Lille 1}{France}{Nicolas.Wicker@math.univ-lille1.fr}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Editors
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\editor{Apel, Thomas}{Universit{\"a}t der Bundeswehr M^^c3^^bcnchen}{Germany}{thomas.apel@unibw.de}
-\editor{Beauchard, Karine}{\textsc{ens} Rennes}{France}{Karine.Beauchard@math.polytechnique.fr}
-\editor{von Below, Joachim}{Universit\'{e} du Littoral C\^{o}te d'Opale}{France}{vonbelow@lmpa.univ-littoral.fr}
-\editor{Biernacki, Christophe}{Universit\'{e} de Lille 1}{France}{christophe.biernacki@math.univ-lille1.fr}
-\editor{Chainais-Hillairet, Claire}{Universit\'{e} de Lille 1}{France}{claire.chainais@math.univ-lille1.fr}
-\editor{Dauge, Monique}{Universit\'{e} de Rennes I}{France}{monique.dauge@univ-rennes1.fr}
-\editor{David, Sinnou}{Universit\'{e} Paris VI}{France}{david@math.jussieu.fr}
-\editor{Davydov, Youri}{Universit\'{e} de Lille 1}{France}{youri.davydov@math.univ-lille1.fr}
-\editor{D\`{e}bes, Pierre}{Universit\'{e} de Lille 1}{France}{pierre.debes@math.univ-lille1.fr}
-\editor{Demailly, Jean-Pierre}{Universit\'{e} de Grenoble 1}{France}{jean-pierre.demailly@ujf-grenoble.fr}
-\editor{Droniou, J\'{e}r\^{o}me}{Monash University}{Australia}{jerome.droniou@monash.edu}
-\editor{El Kacimi, Aziz}{Universit\'{e} de Valenciennes et du Hainaut Cambr\'{e}sis}{France}{aziz.elkacimi@univ-valenciennes.fr}
-\editor{Fleischmann, Peter}{University of Kent}{United Kingdom}{p.fleischmann@kent.ac.uk}
-\editor{Fresse, Beno^^c3^^aet}{Universit\'{e} de Lille 1}{France}{benoit.fresse@math.univ-lille1.fr}
-\editor{Fricain, Emmanuel}{Universit\'{e} de Lille 1}{France}{emmanuel.fricain@math.univ-lille1.fr}
-\editor{Gaffney, Eamonn}{Oxford University}{United Kingdom}{gaffney@maths.ox.ac.uk}
-\editor{Gloria, Antoine}{Universit\'{e} Libre de Bruxelles}{Belgium}{antoine.gloria@ulb.ac.be}
-\editor{Godefroy, Gilles}{Universit\'{e} Paris VI}{France}{godefroy@math.jussieu.fr}
-\editor{Grosse-Erdmann, Karl}{Universit\'{e} de Mons}{Belgium}{kg.grosse-erdmann@umons.ac.be}
-\editor{Guo, Bao-Zhu}{Academy of Mathematics and Systems Science, Academia Sinica, Beijing}{China}{bzguo@iss.ac.cn}
-\editor{Lambrechts, Pascal}{Universit\'{e} Catholique de Louvain}{Belgium}{pascal.lambrechts@uclouvain.be}
-\editor{Lef\`{e}vre, Pascal}{Universit\'{e} d'Artois}{France}{pascal.lefevre@univ-artois.fr}
-\editor{Leroy, Andr\'{e}}{Universit\'{e} d'Artois}{France}{andreleroy55@gmail.com}
-\editor{Loeb, Jean-Jacques}{Universit\'{e} d'Angers}{France}{jean-jacques.loeb@univ-angers.fr}
-\editor{Luca, Florian}{University of Witwatersrand}{South-Africa}{florian.luca@wits.ac.za}
-\editor{Matom{\"a}ki Kaisa}{University of Turku}{Finland}{ksmato@utu.fi}
-\editor{Michaux, Christian}{Universit\'{e} de Mons}{Belgium}{christian.michaux@umons.ac.be}
-\editor{Moerdijk, Ieke}{Radboud University Nijmegen}{Netherlands}{i.moerdijk@math.ru.nl}
-\editor{Murua, Alejandro}{Universit\'{e} de Montr\'{e}al}{Canada}{murua@dms.umontreal.ca}
-\editor{Nakamura, Hiroaki}{Osaka University}{Japan}{nakamura@math.sci.osaka-u.ac.jp}
-\editor{van Neerven, Jan}{Delft University of Technology}{Netherlands}{j.m.a.m.vanneerven@tudelft.nl}
-\editor{Nicaise, Johannes}{Katholieke Universiteit Leuven}{Belgium}{Johannes.Nicaise@wis.kuleuven.be}
-\editor{Norvaisa, Rimas}{Vilnius University}{Lituany}{rimas.norvaisa@mii.vu.lt}
-\editor{Peccati, Giovanni}{University of Luxembourg}{Luxembourg}{giovanni.peccati@gmail.com}
-\editor{Pirashvili, Teimuraz}{University of Leicester}{United Kingdom}{tp59@le.ac.uk}
-\editor{Ramar\'{e}, Olivier}{Universit\'{e} de Lille 1}{France}{olivier.ramare@math.univ-lille1.fr}
-\editor{Roelly, Sylvie}{University of Potsdam}{Germany}{roelly@math.uni-potsdam.de}
-\editor{Stubbe, Isar}{Universit\'{e} du Littoral C\^{o}te d'Opale}{France}{isar.stubbe@lmpa.univ-littoral.fr}
-\editor{Suquet, Charles}{Universit\'{e} de Lille 1}{France}{charles.suquet@math.univ-lille1.fr}
-\editor{Tazzioli, Rossana}{Universit\'{e} de Lille 1}{France}{rossana.tazzioli@math.univ-lille1.fr}
-\editor{Tignol, Jean-Pierre}{Universit\'{e} Catholique de Louvain}{Belgium}{jean-pierre.tignol@uclouvain.be}
-\editor{Wu, Jie}{Institut Elie Cartan}{France}{jie.wu@univ-lorraine.fr}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Secretary
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\secretary{Smets, Aurore}{}{}{}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LaTeX class designer (and maintainer(s))
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\classdesigner{Bitouz\'{e}, Denis}{Universit\'{e} du Littoral C\^{o}te d'Opale}{France}{denis.bitouze@lmpa.univ-littoral.fr}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Computer engineer
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\computerengineer{Huart, S\'{e}bastien}{Universit\'{e} de Lille 1}{France}{}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Font designer text
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\fontdesignertext{We make use of \href{http://ctan.org/pkg/kpfonts}{Kp-Fonts},
- the set of fonts designed by Christophe Caignaert.}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Printer text
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\printingservice{Derycke, Jean-Jacques}{Universit\'{e} de Lille 1}{France}{}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Authors instructions
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\authorsinstructions{%
- \begin{description}
- \item[Articles submission:] Upon submission, the authors have only to provide
- a file in the \textsc{pdf} format. Once the paper is accepted or subject to
- minor revisions, the authors have to ensure that it agrees with the journal
- format.
- \item[\LaTeX{} details:]\
- \begin{description}
- \item[\LaTeX{} class:] We strongly encourage the authors to prepare their
- article to appear in the \href{\l__nwejm_journal_url_tl}{\nwejm} journal with
- the dedicated \href{http://ctan.org/pkg/nwejm}{\textsf{nwejmart}} \LaTeX{}
- class (currently,
- \href{http://mirrors.ctan.org/macros/latex/contrib/nwejm/doc/documentation/nwejm.pdf}{documented
- only in French}), available with \textsf{MiKTeX} and \textsf{TeX~Live}
- distributions.
- \item[Incompatibilities:]\
- \begin{itemize}
- \item Our production system is \emph{not} compatible with the
- \href{http://ctan.org/pkg/xypic}{\textsf{xypic} bundle}. For commutative
- diagramms, please use instead the user-friendly and modern
- \href{http://ctan.org/pkg/xypic}{\textsf{tikz-cd}} package.
- \item We much more prefer graphics \emph{not} created with
- \href{http://ctan.org/topic/pstricks}{\textsf{PSTricks} and
- derived}. Consider using
- \href{http://ctan.org/pkg/pgf}{\textsf{PGF/TikZ}} or
- \href{http://ctan.org/topic/pgf-tikz}{derived packages}.
- \end{itemize}
- In case you really need one of these packages, please contact us.
- \item[Bibliography:] The bibliography must be provided as a \texttt{.bib}
- file in the format of the
- \href{http://ctan.org/pkg/biblatex}{\textsf{biblatex}} package.
- \item[Figures:] The figures must be provided in \textsc{pdf} or \textsc{eps}
- formats.
- \end{description}
- \end{description}
-}
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
index 19e0f832d7a..1774e09eb2b 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
@@ -31,9 +31,16 @@
\msg_new:nnnn{nwejm}{Issue~number~needed}{Option~`#1'~needed!}
{Please~specify~`#1=<number>', ~otherwise~`<number>'~will~be~set~to
~`\int_use:N\c__nwejm_first_issue_number_int'.}%
-\msg_new:nnn{nwejm}{Wrong~main~file~name!}{The~ main~ file~ should~ be~ named~
- `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\jobname.tex'.~ Please~ rename~
+\msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{The~ issue's~ main~ file~
+ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~
+ `\c_sys_jobname_str.tex'.~ Please~ rename~ the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Wrong~cover's~main~file~name!}{The~ cover~ file~
+ should~ /not/~ be~ named~ as~ the~ issue's~ main~ file~
+ `\tl_use:N\c__nwejm_main_file_name_tl.tex'.~ Please~ rename~
the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Main~file~needs~to~be~compiled!}{The~ issue's~ main~ file~
+ (`\tl_use:N\c__nwejm_main_file_name_tl.tex')~ should~ be~ compiled~ at~ least~
+ once~ before~ the~ cover~ can~ be~ generated.}%
\msg_new:nnnn{nwejmart}{Unknown~choice}{Choice~`#3'~invalid!}
{Please~specify~#1=#2.}%
\msg_new:nnn{nwejmart}{Unknown~tag}{There~ isn't~ any~ affiliation~ tagged~
@@ -72,17 +79,13 @@
\bool_new:N \g__nwejm_cover_bool
\bool_new:N \g__nwejm_coverpage_bool
\bool_new:N \g__nwejm_inside_pages_bool
+\bool_new:N \g__nwejm_show_binding_bool
\keys_define:nn { nwejm }
{
pagegrid .dim_gset:N = \g__nwejm_pagegrid_dim,
pagegrid .default:n = {\c__nwejm_pagegrid_dim},
- forauthors .code:n = {%
- \bool_gset_true:N \g__nwejm_for_authors_bool%
- \bool_gset_true:N \g__nwejm_inside_pages_bool%
- },%
- forprinter .bool_gset:N = \g__nwejm_for_printer_bool,
output .choice:,
- output / frontcover .code:n = {%
+ output / cover .code:n = {%
\bool_gset_true:N \g__nwejm_for_printer_bool%
\bool_gset_true:N \g__nwejm_cover_bool%
},%
@@ -90,10 +93,9 @@
\bool_gset_true:N \g__nwejm_for_printer_bool%
\bool_gset_true:N \g__nwejm_inside_pages_bool%
},%
- output / backcover .code:n = {%
- \bool_gset_true:N \g__nwejm_for_printer_bool%
- },%
- output / web .code:n = {%
+ binding .dim_gset:N = \g__nwejm_binding_dim,
+ showbinding .code:n = {%
+ \bool_gset_true:N \g__nwejm_show_binding_bool%
},%
}%
\keys_define:nn { nwejm }
@@ -121,13 +123,8 @@
}
\PassOptionsToPackage{french,ngerman,dutch,english}{babel}
\PassOptionsToPackage{french,ngerman,dutch,english}{varioref}
-\RequirePackage{silence}
-\WarningFilter[nwejm]{kpfonts}{With 'easyscsl' option, don't fit together}
-\WarningFilter[nwejm]{etex}{Extended allocation already in use}
-\WarningFilter[nwejm]{etoc}{package tocvsec2 detected and its modification of}
-\ActivateWarningFilters[nwejm]
\RequirePackage[l2tabu,orthodox]{nag}
-\pdftex_if_engine:TF
+\sys_if_engine_pdftex:TF
{
\RequirePackage[utf8]{inputenc}
}{
@@ -135,7 +132,6 @@
\DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ }
}
\RequirePackage[T1]{fontenc}
-\RequirePackage[group=false,subpreambles,sort]{standalone}%
\RequirePackage[pagestyles]{titlesec}%
\RequirePackage{graphicx}%
\RequirePackage{import}%
@@ -148,7 +144,35 @@
\RequirePackage{currfile}
\RequirePackage{zref-xr}%
\RequirePackage[multiple]{footmisc}%
-\RequirePackage[svgnames]{xcolor}%
+\RequirePackage{xcolor}%
+\bool_if:NTF {\g__nwejm_cover_bool} {
+ \RequirePackage{tcolorbox}
+ \RequirePackage{tikzpagenodes}
+ \ExplSyntaxOff
+ \usetikzlibrary{calc,backgrounds}
+ \ExplSyntaxOn
+ \tcbuselibrary{skins}
+ \tcbset{__nwejm_title_cover/.style={%
+ colback=white,
+ colframe=blue!37!white,
+ colupper=blue,
+ width=14cm,
+ fontupper=\fontsize{9mm}{9mm}\fontseries{bx}\selectfont\sffamily,
+ halign=center,
+ valign=center,
+ % boxsep=3mm,
+ boxrule=3mm,
+ left=\c_zero_dim,
+ right=\c_zero_dim,
+ sharp~corners,
+ rounded~corners=northwest,
+ % draft
+ }
+ }
+ \RequirePackage{tkz-berge}
+}{
+\RequirePackage[group=false,subpreambles,sort]{standalone}%
+}
\RequirePackage{xspace}%
\RequirePackage[autostyle]{csquotes}%
\RequirePackage{array}
@@ -191,9 +215,9 @@
\int_new:N \g__nwejm_articles_int
\clist_new:N \g__nwejm_counters_to_be_reset_clist
\int_const:Nn \c__nwejm_first_issue_number_int { 1 }
-\int_const:Nn \c__nwejm_first_issue_year_int { 2016 }
+\int_const:Nn \c__nwejm_first_issue_year_int { 2015 }
\int_const:Nn \c__nwejm_first_issue_month_int { 1 }
-\int_const:Nn \c__nwejm_interval_in_months_int { 6 }
+\int_const:Nn \c__nwejm_interval_in_months_int { 12 }
\tl_const:Nn \c__nwejm_backcover_tableofcontents_string_tl {Volume's~Contents}
\tl_const:Nn \c__nwejm_editorinchief_string_tl {Editor~in~Chief}
\tl_const:Nn \c__nwejm_associate_editors_string_tl {Associate~Editors}
@@ -205,13 +229,18 @@
\tl_const:Nn \c__nwejm_isbn_string_tl {\textsc{isbn}}
\tl_const:Nn \c__nwejm_latexclass_string_tl {\LaTeX{}~class}
\tl_const:Nn \c__nwejm_computer_engineering_string_tl {Computer~engineering~issues}
-\tl_const:Nn \c__nwejm_printer_string_tl {Printing~service}
+\tl_const:Nn \c__nwejm_graphicdesign_string_tl {Graphic~design}
\tl_const:Nn \c__nwejm_configuration_file_string_tl {nwejm.cfg}
-\tl_const:Nn \c__nwejm_frontcover_header_left_string_tl {
- \int_use:N\g__nwejm_issue_year_int%
-}
-\tl_const:Nn \c__nwejm_frontcover_header_right_string_tl {
- Number\space\int_use:N\g__nwejm_issue_number_int%
+\bool_if:NT {\g__nwejm_cover_bool} {
+ \tl_const:Nn \c__nwejm_frontcover_left_string_tl {
+ Number\c_space_tl\c__nwejm_issue_number_tl%
+ }
+ \tl_const:Nn \c__nwejm_frontcover_right_string_tl {
+ \c__nwejm_issue_year_tl%
+ }
+ \tl_const:Nn \c__nwejm_frontcover_string_tl {
+ \c__nwejm_frontcover_left_string_tl\c_space_tl--\c_space_tl\c__nwejm_frontcover_right_string_tl%
+ }
}
\tl_const:Nn \c__nwejm_backmatter_directory_string_tl {backmatter}
\tl_const:Nn \c__nwejm_issue_backcover_text_file_string_tl {backcover}
@@ -229,6 +258,8 @@
bibliography~of~your~article~to~appear~in~the~next~issue~of~the
\c__nwejm_journal_title_string_tl.~The~current~layout~may~not~be~the~final~one.%
}
+\tl_const:Nn \c__nwejm_cover_background_image_tl {nwejm-cover-background.jpg}
+\definecolor{__nwejm_cover_background_color_tl}{rgb}{0.16,0.22,0.56}
\tl_const:Nn \c__nwejm_msc_string_tl {\textsc{msc}}
\tl_const:Nn \c__nwejm_colon_tl {
\ifcurrentbaselanguage{french}{\FBcolonspace}{}:
@@ -239,6 +270,7 @@
\tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm}
\tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_job_name_tl\c__nwejm_issue_bib_file_suffix_string_tl.bib}
\tl_const:Nn \c__nwejm_issue_bib_path_string_tl {\c__nwejm_issue_bib_file_string_tl}
+\tl_const:Nn \c__nwejm_issue_number_year_file_string_tl {\c__nwejm_main_file_name_tl.iny}
\tl_const:Nn \c__nwejm_issue_bib_key_tl {\int_use:N \g__nwejm_issue_number_int}
\tl_const:Nn \c__nwejm_journal_short_title_string_tl {\textsc{nwejm}}
\tl_const:Nn \c__nwejm_journal_title_string_tl {
@@ -259,7 +291,7 @@
\bool_new:N \g__nwejm_date_specified_bool
\dim_const:Nn \c__nwejm_layoutheight_dim { 240mm}
\dim_const:Nn \c__nwejm_layoutwidth_dim { 170mm}
-\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 5mm}
+\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 10mm }
\bool_if:NTF {\g__nwejm_for_printer_bool} {
\dim_const:Nn \c__nwejm_potential_layoutoffset_dim { \c__nwejm_printer_layoutoffset_dim}
}{
@@ -271,16 +303,19 @@
\int_const:Nn \c__nwejm_thresold_d_int {96}
\int_const:Nn \c__nwejm_thresold_e_int {104}
\int_const:Nn \c__nwejm_thresold_f_int {120}
-\dim_const:Nn \c__nwejm_bindingoffset_a_dim {3mm}
-\dim_const:Nn \c__nwejm_bindingoffset_b_dim {3.5mm}
-\dim_const:Nn \c__nwejm_bindingoffset_c_dim {3.9mm}
-\dim_const:Nn \c__nwejm_bindingoffset_d_dim {4.1mm}
-\dim_const:Nn \c__nwejm_bindingoffset_e_dim {4.5mm}
-\dim_const:Nn \c__nwejm_bindingoffset_f_dim {5mm}
-\zexternaldocument[self]{\jobname}%
+\dim_const:Nn \c__nwejm_bindingoffset_a_dim {6mm}
+\dim_const:Nn \c__nwejm_bindingoffset_b_dim {7mm}
+\dim_const:Nn \c__nwejm_bindingoffset_c_dim {7.8mm}
+\dim_const:Nn \c__nwejm_bindingoffset_d_dim {8.2mm}
+\dim_const:Nn \c__nwejm_bindingoffset_e_dim {9mm}
+\dim_const:Nn \c__nwejm_bindingoffset_f_dim {10mm}
\int_new:N \g__nwejm_total_pages_number_int%
\int_new:N \g__nwejm_total_inside_pages_number_int%
-\int_gset:Nn \g__nwejm_total_pages_number_int { \zref@extractdefault{selfLastPage}{abspage}{0} }
+\zexternaldocument[self]{\c__nwejm_main_file_name_tl}
+\int_gset:Nn \g__nwejm_total_pages_number_int
+{
+ \zref@extractdefault{selfLastPage}{abspage}{0}
+}
\int_gset:Nn \g__nwejm_total_inside_pages_number_int { \g__nwejm_total_pages_number_int - 4 }
\int_compare:nNnTF {\g__nwejm_total_inside_pages_number_int}<{\c__nwejm_thresold_a_int}
{
@@ -314,17 +349,26 @@
}
}
\bool_if:NTF {\g__nwejm_cover_bool} {
- \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ \dim_compare:nTF {\g__nwejm_binding_dim > \c_zero_dim} {%
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \g__nwejm_binding_dim }
+ }{
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ }
}{
\dim_const:Nn \c__nwejm_potential_bindingoffset_dim {\c_zero_dim}
}
-\dim_const:Nn \c__nwejm_paperheight_dim { \c__nwejm_layoutheight_dim+2\c__nwejm_potential_layoutoffset_dim}
+\dim_const:Nn \c__nwejm_paperheight_dim {
+ \c__nwejm_layoutheight_dim
+ +
+ 2\c__nwejm_potential_layoutoffset_dim
+}
\bool_if:NTF {\g__nwejm_cover_bool} {
\dim_const:Nn \c__nwejm_paperwidth_dim {
\c__nwejm_layoutwidth_dim
+
\c__nwejm_potential_layoutoffset_dim
- +\c__nwejm_potential_bindingoffset_dim
+ +
+ .5\c__nwejm_potential_bindingoffset_dim
}
}{
\dim_const:Nn \c__nwejm_paperwidth_dim {
@@ -338,11 +382,9 @@
\dim_const:Nn \c__nwejm_topmargin_dim { 20mm}
\dim_const:Nn \c__nwejm_topmargin_frontcover_dim {
\c__nwejm_topmargin_dim
- % + 30mm
}
\dim_const:Nn \c__nwejm_topmargin_inside_cover_dim {
\c__nwejm_topmargin_dim
- % +10mm
}
\dim_const:Nn \c__nwejm_topmargin_front_matter_dim {
\c__nwejm_topmargin_inside_cover_dim
@@ -350,8 +392,6 @@
\dim_const:Nn \c__nwejm_headsep_dim { 9.5mm}
\dim_const:Nn \c__nwejm_headsep_frontcover_dim {
\c__nwejm_headsep_dim
- % +31mm
- % -\c__nwejm_potential_layoutoffset_dim
}
\dim_const:Nn \c__nwejm_headsep_inside_frontcover_dim {
\c__nwejm_headsep_dim
@@ -369,16 +409,9 @@
\dim_const:Nn \c__nwejm_right_minipage_frontcover_dim { .6\linewidth }
\dim_const:Nn \c__nwejm_innermargin_dim { 23mm }
\dim_const:Nn \c__nwejm_outermargin_dim { 30mm }
-\dim_const:Nn \c__nwejm_inside_cover_box_width_dim { 150mm }%
-\dim_const:Nn \c__nwejm_innermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- - \c__nwejm_potential_bindingoffset_dim
- % + \c__nwejm_adjustmargin_dim
-}
-\dim_const:Nn \c__nwejm_outermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- % - \c__nwejm_adjustmargin_dim
-}
+\dim_const:Nn \c__nwejm_inside_cover_textwidth_dim { 145mm }%
+\dim_const:Nn \c__nwejm_outermargin_inside_frontcover_dim { 15mm }
+\dim_const:Nn \c__nwejm_outermargin_inside_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_innermargin_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_outermargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
\dim_const:Nn \c__nwejm_topmargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
@@ -386,70 +419,58 @@
\dim_const:Nn \c__nwejm_front_matter_extra_innermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_front_matter_extra_outermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_inside_cover_offset_dim { \c_zero_dim }%
+\dim_const:Nn \c__nwejm_logos_rectangle_thickness_dim { 3.1mm }
+\dim_const:Nn \c__nwejm_logos_rectangle_height_dim { 33mm }
\geometry{%
papersize={\c__nwejm_paperwidth_dim,\c__nwejm_paperheight_dim}
}
+\bool_if:NT {\g__nwejm_inside_pages_bool} {
+ \geometry{showcrop}
+}
\bool_if:NTF {\g__nwejm_cover_bool} {
- \dim_show:N \c__nwejm_topmargin_frontcover_dim
- \dim_show:N \c__nwejm_headsep_frontcover_dim
- \dim_show:N \c__nwejm_headheight_dim
\tl_const:Nn \c__nwejm_frontcover_geometry_tl {%
- ,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
- ,layoutvoffset=\c__nwejm_potential_layoutoffset_dim
- ,bindingoffset=\c__nwejm_potential_bindingoffset_dim
- ,top=\c__nwejm_topmargin_frontcover_dim
- ,top=\c__nwejm_topmargin_frontcover_dim
- ,headsep=\c__nwejm_headsep_frontcover_dim
- ,headheight=\c__nwejm_headheight_dim
- ,bottom=\c__nwejm_bottom_frontcover_dim
- ,footskip=\c__nwejm_footskip_dim
- ,outer=\c__nwejm_margin_frontcover_dim
- ,inner=\c__nwejm_potential_layoutoffset_dim
+ ,layoutheight=\c__nwejm_layoutheight_dim
+ ,layoutwidth=\c__nwejm_layoutwidth_dim
+ ,layoutoffset=\c__nwejm_potential_layoutoffset_dim
+ ,ignoreall%
,nomarginpar%
+ ,noheadfoot%
+ ,margin=\c_zero_dim
}%
}{
\tl_const:Nn \c__nwejm_frontcover_geometry_tl {%
- ,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
+ ,layoutheight=\c__nwejm_layoutheight_dim
+ ,layoutwidth=\c__nwejm_layoutwidth_dim
,layoutoffset=\c__nwejm_potential_layoutoffset_dim
- ,bindingoffset=\c__nwejm_potential_bindingoffset_dim
- ,top=\c__nwejm_topmargin_frontcover_dim
- ,headsep=\c__nwejm_headsep_frontcover_dim
- ,headheight=\c__nwejm_headheight_dim
- ,bottom=\c__nwejm_bottom_frontcover_dim
- ,footskip=\c__nwejm_footskip_dim
- ,hmargin=\c__nwejm_margin_frontcover_dim
+ ,ignoreall%
,nomarginpar%
+ ,noheadfoot%
+ ,margin=\c_zero_dim
}%
}
\bool_if:NTF {\g__nwejm_cover_bool} {
\tl_const:Nn \c__nwejm_inside_cover_geometry_tl {%
,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
- ,layoutvoffset=\c__nwejm_potential_layoutoffset_dim
- ,bindingoffset=\c__nwejm_potential_bindingoffset_dim
+ ,layoutoffset=\c__nwejm_potential_layoutoffset_dim
,top=\c__nwejm_topmargin_inside_cover_dim
,headheight=\c__nwejm_headheight_dim
,headsep=\c__nwejm_headsep_inside_frontcover_dim
,bottom=\c__nwejm_botmargin_dim
,footskip=\c__nwejm_footskip_dim
- ,inner=\c__nwejm_innermargin_inside_cover_dim-\c__nwejm_potential_layoutoffset_dim
- ,outer=\c__nwejm_outermargin_inside_cover_dim+\c__nwejm_potential_layoutoffset_dim
,nomarginpar%
+ ,textwidth=\c__nwejm_inside_cover_textwidth_dim
}%
}{
\tl_const:Nn \c__nwejm_inside_cover_geometry_tl {%
,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
,layoutoffset=\c__nwejm_potential_layoutoffset_dim
- ,bindingoffset=\c__nwejm_potential_bindingoffset_dim
,top=\c__nwejm_topmargin_inside_cover_dim
,headheight=\c__nwejm_headheight_dim
,headsep=\c__nwejm_headsep_inside_frontcover_dim
,bottom=\c__nwejm_botmargin_dim
,footskip=\c__nwejm_footskip_dim
- % ,inner=1cm
- % ,outer=1cm
- ,inner=\c__nwejm_innermargin_inside_cover_dim
- ,outer=\c__nwejm_outermargin_inside_cover_dim
,nomarginpar%
+ ,textwidth=\c__nwejm_inside_cover_textwidth_dim
}%
}
\tl_const:Nn \c__nwejm_front_matter_geometry_tl {%
@@ -501,16 +522,6 @@
}%
\bool_if:NF {\g__nwejm_coverpage_bool} {
\bool_if:NF {\g__nwejm_inside_pages_bool} {
- \preto\@enddocumenthook{
- \cleardoublepage
- \pagenumbering{roman}%
- \setcounter{page}{\c_three}
- \bool_gset_true:N \g__nwejm_backmatter_bool
- \g__nwejm_display_inside_backcover_tl
- \newpage
- \@openrightfalse
- \g__nwejm_display_backcover_tl
- }%
}%
}%
\bool_new:N \g__nwejm_tableofcontents_already_used_bool
@@ -538,60 +549,18 @@
}
\bool_gset_true:N \g__nwejm_tableofcontents_already_used_bool
}%
- % \box_new:N \l__nwejm_journal_frontcover_logo_box
- % \box_new:N \l__nwejm_journal_volume_box
- % \AfterEndPreamble{%
- % \hbox_set:Nn \l__nwejm_journal_volume_box
- % {
- % \color{Navy}
- % \LARGE
- % \bfseries
- % \sffamily
- % \adjustbox{stack=l}{%
- % \c__nwejm_frontcover_header_left_string_tl
- % \\\c__nwejm_frontcover_header_right_string_tl
- % }
- % }
- % \hbox_set:Nn \l__nwejm_journal_frontcover_logo_box
- % {
- % \includegraphics[width=3cm]{ nwejm-logo }
- % }
- % \hbox_set_to_wd:Nnn \l__nwejm_journal_frontcover_logo_box { 1cm }
- % {
- % \box_move_down:nn
- % {
- % \box_ht:N \l__nwejm_journal_frontcover_logo_box / 2
- % -
- % \box_ht:N \l__nwejm_journal_volume_box / 2
- % }
- % {
- % \box_use:N \l__nwejm_journal_frontcover_logo_box
- % }
- % }
\newpagestyle{__nwejm_frontcover_ps}[]{%
\sethead
- {
- \color{Navy}
- \Large
- \bfseries
- \sffamily
- \adjustbox{stack=l}{%
- \c__nwejm_frontcover_header_left_string_tl
- \\\c__nwejm_frontcover_header_right_string_tl
- }
- }%
{}%
- {%
- % \l__nwejm_journal_frontcover_logo_box
- {\includegraphics[width=1cm]{ nwejm-logo }}
- }%
+ {}%
+ {}%
%
\setfoot%
{}%
{}%
{}%
}%
-\newpagestyle{__nwejm_inside_frontcover_ps}[]{%
+\newpagestyle{__nwejm_inside_cover_ps}[]{%
\sethead%
{}%
{}%
@@ -624,28 +593,6 @@
{\thepage}%
{}%
}%
-\newpagestyle{__nwejm_inside_backcover_ps}[]{%
- \sethead%
- {}%
- {}%
- {}%
- %
- \setfoot%
- {}%
- {}%
- {}%
-}%
-\newpagestyle{__nwejm_backcover_ps}[]{%
- \sethead
- {}%
- {}%
- {}%
- %
- \setfoot%
- {}%
- {}%
- {}%
-}%
\tl_new:N \l__nwejm_section_header_tl
\tl_set:Nn \l__nwejm_section_header_tl {
\ifthesection{%
@@ -691,7 +638,7 @@
\bfseries%
\adjustbox{stack=l}{%
\c__nwejm_journal_title_string_tl
- \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\space\int_use:N \g__nwejm_issue_number_int
+ \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g__nwejm_issue_number_int
}
}
\hbox_set:Nn \l__nwejm_journal_logo_box
@@ -751,13 +698,13 @@
url .tl_set:N = \l__nwejm_journal_url_tl,
issn .tl_set:N = \l__nwejm_journal_issn_tl,
isbn .tl_set:N = \l__nwejm_journal_isbn_tl,
- publisher .value_required:,
- address .value_required:,
- phone .value_required:,
- email .value_required:,
- url .value_required:,
- issn .value_required:,
- isbn .value_required:,
+ publisher .value_required:n = true,
+ address .value_required:n = true,
+ phone .value_required:n = true,
+ email .value_required:n = true,
+ url .value_required:n = true,
+ issn .value_required:n = true,
+ isbn .value_required:n = true,
}
\int_new:N \g__nwejm_issue_number_int
\int_new:N \g__nwejm_issue_month_int
@@ -767,7 +714,7 @@
{
number .int_gset:N = \g__nwejm_issue_number_int,
volume .int_gset:N = \g__nwejm_issue_volume_int,
- volume .value_required:,
+ volume .value_required:n = true,
volume .initial:n = 0,
}
\keys_define:nn { nwejm/dates }
@@ -784,9 +731,9 @@
\tl_gset:Nn \g__nwejm_online_date_tl {#1}
\bool_gset_true:N \g__nwejm_date_specified_bool
},
- received .value_required:,
- accepted .value_required:,
- online .value_required:,
+ received .value_required:n = true,
+ accepted .value_required:n = true,
+ online .value_required:n = true,
}
\quark_new:N \q__nwejm
\int_new:N \l_author_int
@@ -820,8 +767,8 @@
\msg_error:nnn{__nwejm}{Unknown~tag}{#1}
}
},
- affiliation .value_required:,
- affiliationtagged .value_required:,
+ affiliation .value_required:n = true,
+ affiliationtagged .value_required:n = true,
}
\tl_new:N \l__nwejm_newtheorem_style_tl
\keys_define:nn { nwejm / newtheorem }
@@ -831,11 +778,11 @@
title / english .tl_set:N = \l__nwejm_newtheorem_english_title_tl,
title / german .tl_set:N = \l__nwejm_newtheorem_german_title_tl,
title / dutch .tl_set:N = \l__nwejm_newtheorem_dutch_title_tl,
- title .value_required:,
- title / french .value_required:,
- title / english .value_required:,
- title / german .value_required:,
- title / dutch .value_required:,
+ title .value_required:n = true,
+ title / french .value_required:n = true,
+ title / english .value_required:n = true,
+ title / german .value_required:n = true,
+ title / dutch .value_required:n = true,
%
style .choice:,
style / theorem .code:n = {\__nwejm_theorem_style:n {theorem}},
@@ -878,14 +825,6 @@
\emph{\c__nwejm_journal_title_string_tl}
}%
}
-\tl_new:N \l__nwejm_pdftitle_string_tl
-\tl_new:N \l__nwejm_pdfauthor_string_tl
-\tl_set:Nn \l__nwejm_pdftile_string_tl {
- \c__nwejm_journal_title_string_tl\space--\space{}N^^c2^^b0\int_use:N\g__nwejm_issue_number_int
-}
-\tl_set:Nn \l__nwejm_pdfauthor_string_tl {
- \g__nwejm_nwejm_string_tl
-}
\cs_new_protected:Nn \__nwejm_email:n
{
\href{mailto:#1}{\nolinkurl{#1}}%
@@ -948,9 +887,9 @@
\__nwejm_citeauthor_no_giveninits:n {\c__nwejm_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex}%
]
\l__nwejm_people_affiliation_tl%
- \space%
+ \c_space_tl%
(\l__nwejm_people_country_tl)%
- % ,\space%
+ % ,\c_space_tl%
% \__nwejm_email:n {\l__nwejm_people_email_tl}
\DTLiflastrow{%
}{%
@@ -987,67 +926,175 @@
\exp_not:V\DTLcurrentindex}%
\tl_if_empty:NF \l__nwejm_people_email_tl
{
- \space(\__nwejm_email:n {\l__nwejm_people_email_tl})
+ \c_space_tl(\__nwejm_email:n {\l__nwejm_people_email_tl})
}
}
}
}
}
+\cs_new_protected:Nn \__nwejm_binding_text:n
+{
+ \Large
+ \color{white}
+ \bfseries
+ \sffamily
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90] at (current~page.#1)
+ {
+ \maxsizebox*{!}{\c__nwejm_potential_bindingoffset_dim}{\c__nwejm_journal_title_string_tl}
+ } ;
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90,anchor=east] at
+ ($ (current~page.south~#1)!.2!(current~page.north~#1) $)
+ {
+ \maxsizebox*{!}{\c__nwejm_potential_bindingoffset_dim}{\c__nwejm_frontcover_left_string_tl}
+ } ;
+ \node[outer~sep=0pt,inner~sep=0pt,rotate=90,anchor=west] at ($
+ (current~page.south~#1)!.8!(current~page.north~#1) $)
+ {
+ \maxsizebox*{!}{\c__nwejm_potential_bindingoffset_dim}{\c__nwejm_issue_year_tl}
+ } ;
+}
+\cs_new_protected:Nn \__nwejm_grWheelComplete:nn
+{
+ \begingroup%
+ \setkeys[GR]{cl}{#1}%
+ \grStar[#1]{#2}%
+ \pgfmathsetcounter{tkz@gr@a}{#2-1}%
+ \edef\tkz@auxctp{\thetkz@gr@a}%
+ \foreach \ia in {0,...,\tkz@auxctp}%
+ {\foreach \ib in {\ia,...,\tkz@auxctp}%
+ {\Edge(\cmdGR@cl@prefix\ia)(\cmdGR@cl@prefix\ib)}%
+ }%
+ \endgroup%
+}
\tl_new:N \g__nwejm_display_frontcover_tl%
\tl_gset:Nn \g__nwejm_display_frontcover_tl {%
\bool_gset_true:N \g__nwejm_frontcover_bool
\pagestyle{__nwejm_frontcover_ps}%
\exp_after:wN\newgeometry\exp_after:wN{\c__nwejm_frontcover_geometry_tl}%
- \noindent%
- \bool_if:NTF {\g__nwejm_cover_bool} {
- \hspace*{-\c__nwejm_potential_layoutoffset_dim}
- }{
- \hspace*{-2\c__nwejm_potential_layoutoffset_dim}
- }
- {
- \mbox{}
- \vfill
- \begin{center}
- \Huge%
- \bfseries%
- \sffamily%
- \itshape%
- \color{Navy}%
- \c__nwejm_journal_front_cover_title_string_tl%
- \end{center}
- }
- \vfill%
+ \begin{tikzpicture}[remember~picture,overlay]
+ \NoAutoSpacing
+ \begin{pgfonlayer}{background}
+ \file_if_exist:nTF {\c__nwejm_cover_background_image_tl}{
+ \node[anchor=north~east,outer~sep=0pt,inner~sep=0pt] at (current~page.north~east) {
+ \reflectbox{%
+ \includegraphics[width=\paperheight,height=\c__nwejm_paperwidth_dim,angle=90]{
+ \c__nwejm_cover_background_image_tl
+ }%
+ }
+ };
+ }{
+ \fill[__nwejm_cover_background_color_tl] (current~page.north~east) rectangle
+ (current~page.south~west);
+ }
+ \end{pgfonlayer}
+ \__nwejm_binding_text:n {east}
+ \end{tikzpicture}
+ \begin{tikzpicture}[
+ remember~picture,
+ overlay,
+ shift={(current~page~text~area.center)},
+ scale=0.5,
+ every~node/.style={scale=0.5}
+ ]
+ \SetGraphShadeColor{white}{blue}{white}%
+ \tikzset{%
+ VertexStyle/.style = {%
+ shape = circle,%
+ fill = white,%
+ minimum~size = 3.5cm,%
+ draw%
+ }%
+ }%
+ \SetVertexNoLabel%
+ \__nwejm_grWheelComplete:nn {RA=9}{6}
+ \AssignVertexLabel{a}{%
+ \includegraphics[height=25mm]{nwejm-fields-institute-logo},%
+ \includegraphics[height=25mm]{nwejm-federation-recherche-math-npdc-logo},%
+ \includegraphics[height=10mm]{nwejm-kwg-logo},%
+ \includegraphics[height=20mm]{nwejm-smf-logo},%
+ \includegraphics[height=12mm]{nwejm-sml-logo},%
+ \includegraphics[height=25mm]{nwejm-logo}%
+ };%
+ \end{tikzpicture}
+ \begin{tikzpicture}[remember~picture,overlay]
+ % left horizontal lower white rule
+ \fill[white]
+ ([xshift=.95\c__nwejm_layoutwidth_dim,yshift=\c__nwejm_logos_rectangle_height_dim]current~page~text~area.south~west)
+ rectangle
+ ++(-.85\c__nwejm_layoutwidth_dim,\c__nwejm_logos_rectangle_thickness_dim)
+ ;
+ % left vertical white rule
+ \fill[white]
+ ([xshift=10mm,yshift=\c__nwejm_logos_rectangle_height_dim]current~page~text~area.south~west)
+ rectangle
+ ([xshift=10mm-\c__nwejm_logos_rectangle_thickness_dim,yshift=-\c__nwejm_logos_rectangle_height_dim+\c__nwejm_logos_rectangle_thickness_dim]current~page~text~area.north~west) ;
+ % left horizontal upper white rule
+ \fill[white]
+ ([xshift=.95\c__nwejm_layoutwidth_dim,yshift=-\c__nwejm_logos_rectangle_height_dim+\c__nwejm_logos_rectangle_thickness_dim]current~page~text~area.north~west)
+ rectangle
+ ([xshift=.6\c__nwejm_layoutwidth_dim,yshift=-\c__nwejm_logos_rectangle_height_dim]current~page~text~area.north~west) ;
+ % crop marks
+ \draw [white]
+ ([xshift=-2.5mm]current~page~text~area.north~west) --
+ ([xshift=-7.5mm]current~page~text~area.north~west);
+ \draw [white]
+ ([yshift=2.5mm]current~page~text~area.north~west) --
+ ([yshift=7.5mm]current~page~text~area.north~west);
+ \draw [white]
+ ([xshift=-2.5mm]current~page~text~area.south~west) --
+ ([xshift=-7.5mm]current~page~text~area.south~west);
+ \draw [white]
+ ([yshift=-2.5mm]current~page~text~area.south~west) --
+ ([yshift=-7.5mm]current~page~text~area.south~west);
+ % binding limit
+ \bool_if:NT {\g__nwejm_show_binding_bool} {
+ \draw[green]
+ ([xshift=-.5\c__nwejm_potential_bindingoffset_dim]current~page.north~east) --
+ ([xshift=-.5\c__nwejm_potential_bindingoffset_dim]current~page.south~east);
+ }
+ \end{tikzpicture}
\clearpage%
\bool_gset_false:N \g__nwejm_frontcover_bool
}
\tl_new:N \g__nwejm_display_inside_frontcover_tl%
\tl_gset:Nn \g__nwejm_display_inside_frontcover_tl {%
\bool_gset_true:N \g__nwejm_inside_frontcover_bool%
- \pagestyle{__nwejm_inside_frontcover_ps}%
- \exp_after:wN\newgeometry\exp_after:wN{\c__nwejm_inside_cover_geometry_tl}%
+ \pagestyle{__nwejm_inside_cover_ps}%
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c__nwejm_inside_cover_geometry_tl
+ ,outer=\c__nwejm_outermargin_inside_frontcover_dim
+ }%
+ % \tikz[remember~picture,overlay] {%
+ % \draw [green]
+ % (current~page~text~area.south~west)
+ % rectangle
+ % (current~page~text~area.north~east)
+ % ;
+ % }
+ \setlist[description,1]{font=\scshape\bfseries}
\footnotesize%
\begin{multicols*}{2}
\setlength{\columnsep}{1mm}
\begin{description}[leftmargin=2em]
- \item[\textsc{\c__nwejm_editorinchief_string_tl}] \
+ \item[\c__nwejm_editorinchief_string_tl] \
\begin{description}[leftmargin=1em]
\__nwejm_display_people_by_role:n {editorinchief}
\end{description}
\bigskip
\par
- \item[\textsc{\c__nwejm_associate_editors_string_tl}] \
+ \item[\c__nwejm_associate_editors_string_tl] \
\begin{description}[leftmargin=1em]
\__nwejm_display_people_by_role:n {editor}
\end{description}
\bigskip
\par
- \item[\textsc{\c__nwejm_field_editor_string_tl}] \
+ \item[\c__nwejm_field_editor_string_tl] \
\begin{description}[leftmargin=1em]
\__nwejm_display_people_by_role:n {fieldseditor}
\end{description}
\bigskip
\par
- \item[\textsc{\c__nwejm_managing_editor_string_tl}] \
+ \item[\c__nwejm_managing_editor_string_tl] \
\begin{description}[leftmargin=1em]
\__nwejm_display_people_by_role:n {managingeditor}
\end{description}
@@ -1061,66 +1108,131 @@
\tl_new:N \g__nwejm_display_inside_backcover_tl%
\tl_gset:Nn \g__nwejm_display_inside_backcover_tl {%
\bool_gset_true:N \g__nwejm_inside_backcover_bool%
- \pagestyle{__nwejm_inside_backcover_ps}%
- % \exp_after:wN\newgeometry\exp_after:wN{\c__nwejm_inside_cover_geometry_tl}%
- % \file_if_exist:nT { \c__nwejm_authors_instructions_file_tl } {%
- \bool_if:NTF {\g__nwejm_no_inside_backcover_bool} {
- \hbox{}
- }{%
- % \small%
- \begin{description}[leftmargin=1em]
- \item[\c__nwejm_authors_instructions_string_tl{}:] \
- \g__nwejm_authors_instructions_tl
- \item[\c__nwejm_editorial_secretariat_string_tl{}:] \ \par%
- % \l__nwejm_journal_publisher_tl%
- % \par%
- % \space\textendash{}\space%
- \__nwejm_display_people_by_role:n { secretary }\par
- \l__nwejm_journal_address_tl\par%
- \c__nwejm_phone_string_tl{}:~\l__nwejm_journal_phone_tl{}\par%
- \__nwejm_email:n {\l__nwejm_journal_email_tl}
- \newline%
- % \space\textendash{}\space
- \url{\l__nwejm_journal_url_tl}
- \item[\c__nwejm_issn_string_tl{}:] \l__nwejm_journal_issn_tl
- \tl_if_empty:NF \l__nwejm_journal_isbn_tl
- {%
- \item[\c__nwejm_isbn_string_tl{}:] \l__nwejm_journal_isbn_tl
- }
- \item[\c__nwejm_latexclass_string_tl{}:]
- \__nwejm_display_people_by_role:n { classdesigner }
- \item[\c__nwejm_computer_engineering_string_tl{}:] %\g__nwejm_printer_text_tl
- \__nwejm_display_people_by_role:n { computerengineer }
- \item[\c__nwejm_printer_string_tl{}:] %\g__nwejm_printer_text_tl
- \__nwejm_display_people_by_role:n { printingservice }
- \end{description}
- \g__nwejm_font_designer_text_tl
- }
- % }{%
- % \hbox{}
+ \pagestyle{__nwejm_inside_cover_ps}%
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c__nwejm_inside_cover_geometry_tl
+ ,outer=\c__nwejm_outermargin_inside_backcover_dim
+ }%
+ % \tikz[remember~picture,overlay] {%
+ % \draw [purple]
+ % (current~page~text~area.south~west)
+ % rectangle
+ % (current~page~text~area.north~east)
+ % ;
% }
+ \setlist[description,1]{font=\scshape\bfseries}
+ \begin{description}[leftmargin=1em]
+ \item[\c__nwejm_authors_instructions_string_tl{}:] \
+ \g__nwejm_authors_instructions_tl
+ \item[\c__nwejm_editorial_secretariat_string_tl{}:] \ \par%
+ % \l__nwejm_journal_publisher_tl%
+ % \par%
+ % \c_space_tl\textendash{}\c_space_tl%
+ \__nwejm_display_people_by_role:n { secretary }\par
+ \l__nwejm_journal_address_tl\par%
+ \c__nwejm_phone_string_tl{}:~\l__nwejm_journal_phone_tl{}\par%
+ \__nwejm_email:n {\l__nwejm_journal_email_tl}
+ \newline%
+ % \c_space_tl\textendash{}\c_space_tl
+ \url{\l__nwejm_journal_url_tl}
+ \tl_if_empty:NF \l__nwejm_journal_issn_tl
+ {%
+ \item[\c__nwejm_issn_string_tl{}:] \l__nwejm_journal_issn_tl
+ }
+ \tl_if_empty:NF \l__nwejm_journal_isbn_tl
+ {%
+ \item[\c__nwejm_isbn_string_tl{}:] \l__nwejm_journal_isbn_tl
+ }
+ \item[\c__nwejm_latexclass_string_tl{}:]
+ \__nwejm_display_people_by_role:n { classdesigner }
+ \item[\c__nwejm_computer_engineering_string_tl{}:] %\g__nwejm_printer_text_tl
+ \__nwejm_display_people_by_role:n { computerengineer }
+ \item[\c__nwejm_graphicdesign_string_tl{}:] %\g__nwejm_graphicdesign_text_tl
+ \__nwejm_display_people_by_role:n { graphicdesign }
+ \end{description}
+ \g__nwejm_font_designer_text_tl
\bool_gset_false:N \g__nwejm_inside_backcover_bool
}
\tl_new:N \g__nwejm_short_toc_tl%
-\tl_gset:Nn \g__nwejm_short_toc_tl {%
- \begingroup
- \etocstandardlines
- \etocsetnexttocdepth{chapter}
- \renewcommand{\etocbkgcolorcmd}{\color{Navy!5}}
- \renewcommand{\etocbelowtocskip}{0pt\relax}
- \fboxsep1ex
- \etocframedstyle [1]{\fbox{\makebox[.5\linewidth]{\etocfontminusone\c__nwejm_backcover_tableofcontents_string_tl}}}
- \tableofcontents
- \endgroup
-}
\tl_new:N \g__nwejm_display_backcover_tl%
\tl_gset:Nn \g__nwejm_display_backcover_tl {%
\bool_gset_true:N \g__nwejm_backcover_bool
-\g__nwejm_short_toc_tl
-\vfill{}
- \begin{center}
- \includegraphics[height=.4\textheight]{nwejm-logos-collection.pdf}
- \end{center}
+ \exp_after:wN\newgeometry\exp_after:wN{%
+ \c__nwejm_frontcover_geometry_tl
+ ,layouthoffset=.5\c__nwejm_potential_bindingoffset_dim
+ }%
+ \bool_gset_true:N \g__nwejm_backcover_bool
+ \begin{tikzpicture}[remember~picture,overlay]
+ \NoAutoSpacing
+ \begin{pgfonlayer}{background}
+ \file_if_exist:nTF {\c__nwejm_cover_background_image_tl}{
+ \node[anchor=north~west,outer~sep=0pt,inner~sep=0pt] at (current~page.north~west) {
+ \includegraphics[width=\paperheight,height=\c__nwejm_paperwidth_dim,angle=90]{\c__nwejm_cover_background_image_tl}%
+ };
+ }{
+ \fill[__nwejm_cover_background_color_tl] (current~page.north~east) rectangle
+ (current~page.south~west);
+ }
+ \end{pgfonlayer}
+ \__nwejm_binding_text:n {west}
+ \end{tikzpicture}
+ \noindent%
+ \begin{tikzpicture}[remember~picture,overlay]
+ % journal title
+ \node [anchor=north,yshift=-\c__nwejm_layoutwidth_dim/20] at (current~page~text~area.north) {
+ \begin{tcolorbox}[__nwejm_title_cover]
+ North-Western~European\\[.5cm]
+ Journal~of~Mathematics
+ \end{tcolorbox}
+ };
+ % circular node for NWEJM logo
+ \node[anchor=center,circle,fill=white,minimum~size=8.2cm] at
+ ([yshift=-\c__nwejm_layoutheight_dim/2]current~page~text~area.north)
+ {\includegraphics[height=5.5cm]{nwejm-logo}};
+ % right vertical white rule
+ \fill[white]
+ ([xshift=-10mm,yshift=\c__nwejm_logos_rectangle_height_dim]current~page~text~area.south~east)
+ rectangle
+ ([xshift=-10mm+\c__nwejm_logos_rectangle_thickness_dim,yshift=\c__nwejm_logos_rectangle_height_dim+14cm]current~page~text~area.south~east) ;
+ % right horizontal white rule
+ \fill[white]
+ ([yshift=\c__nwejm_logos_rectangle_height_dim+\c__nwejm_logos_rectangle_thickness_dim]current~page~text~area.south~west)
+ rectangle
+ ([xshift=.35\c__nwejm_layoutwidth_dim,yshift=\c__nwejm_logos_rectangle_height_dim]current~page~text~area.south~west) ;
+ % number and year node
+ \node[anchor=base~east] at
+ ([xshift=-1.2cm,yshift=\c__nwejm_logos_rectangle_height_dim]current~page~text~area.south~east)
+ {\color{white}\bfseries\sffamily\c__nwejm_frontcover_string_tl} ;
+ % % white rectangle for university and laboratory logos
+ \fill [white]
+ ([yshift=\c__nwejm_logos_rectangle_height_dim-7.5mm]current~page~text~area.south~west)
+ rectangle (current~page.south~east);
+ % laboratory logo
+ \node[anchor=south~east] at ([xshift=-10mm]current~page~text~area.south~east)
+ {\includegraphics[height=.66\c__nwejm_logos_rectangle_height_dim]{logo-painleve}} ;
+ % university logo
+ \node[anchor=south~west] at (current~page~text~area.south~west)
+ {\includegraphics[height=.66\c__nwejm_logos_rectangle_height_dim]{logo-ul1-ufr-math}} ;
+ % crop marks
+ \draw [white]
+ ([xshift=2.5mm]current~page~text~area.north~east) --
+ ([xshift=7.5mm]current~page~text~area.north~east);
+ \draw [white]
+ ([yshift=2.5mm]current~page~text~area.north~east) --
+ ([yshift=7.5mm]current~page~text~area.north~east);
+ \draw
+ ([xshift=2.5mm]current~page~text~area.south~east) --
+ ([xshift=7.5mm]current~page~text~area.south~east);
+ \draw
+ ([yshift=-2.5mm]current~page~text~area.south~east) --
+ ([yshift=-7.5mm]current~page~text~area.south~east);
+ % binding limit
+ \bool_if:NT {\g__nwejm_show_binding_bool} {
+ \draw[green]
+ ([xshift=.5\c__nwejm_potential_bindingoffset_dim]current~page.north~west) --
+ ([xshift=.5\c__nwejm_potential_bindingoffset_dim]current~page.south~west);
+ }
+ \end{tikzpicture}
}
\cs_new_protected:Nn \__nwejm_date:nn
{
@@ -1130,7 +1242,7 @@
{
\tl_if_eq:NNF {\c__nwejm_date_received_tl} {#1} { \c__nwejm_dates_separator_tl }
\tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
- \c__nwejm_colon_tl\space
+ \c__nwejm_colon_tl\c_space_tl
\DTMdate{#2}%
}
}
@@ -1145,38 +1257,37 @@
\tl_gclear:N \g__nwejm_acception_date_tl
\tl_gclear:N \g__nwejm_online_date_tl
}
-\seq_new:N \l__nwejm_keywords_seq
-\tl_new:N \l__nwejm_keywords_tl
-\NewDocumentCommand \keywords { m } {
- \seq_clear:N \l__nwejm_keywords_seq
- \tl_clear:N \l__nwejm_keywords_tl
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- \seq_set_map:NNn \l__nwejm_keywords_seq \l_tmpa_seq {
- ##1
- }
- \tl_set:Nn \l__nwejm_keywords_tl { \seq_use:Nn \l__nwejm_keywords_seq {,~} }
+\tl_new:N \g__nwejm_keywords_tl
+\NewDocumentCommand \keywords { O{} m } {
+ \tl_gclear:N \g__nwejm_keywords_tl
+ \tl_clear:N \l_tmpb_clist
+ \clist_set:Nn \l_tmpb_clist {#2}
+ \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } }
}
-\seq_new:N \l__nwejm_msc_seq
-\tl_new:N \l__nwejm_msc_tl
+\tl_new:N \g__nwejm_msc_tl
\NewDocumentCommand \msc { m } {
- \seq_clear:N \l__nwejm_msc_seq
- \tl_clear:N \l__nwejm_msc_tl
- %
- % does what the name suggests, set a sequence from the clist
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- % applies final arg to each element of second seq and stores result in first seq
- \seq_set_map:NNn \l__nwejm_msc_seq \l_tmpa_seq {
- ##1
+ \tl_gclear:N \g__nwejm_msc_tl
+ \tl_clear:N \l_tmpa_clist
+ \clist_set:Nn \l_tmpa_clist {#1}
+ \tl_set:Nn \g__nwejm_msc_tl { \clist_use:Nnnn \l_tmpa_clist { ,~ } { ,~ } { ,~ } }
+%%<class-article> \hypersetup{pdfmsc=\g_@@_msc_tl}
+}
+\str_if_eq_x:nnTF \c_sys_jobname_str \c__nwejm_main_file_name_tl {
+ \bool_if:NT {\g__nwejm_cover_bool} {
+ \msg_error:nn{nwejm}{Wrong~cover's~main~file~name!}
}
- %
- % \seq_use puts the items from the seq back in the input with ",~" as a separator
- \tl_set:Nn \l__nwejm_msc_tl {\seq_use:Nn \l__nwejm_msc_seq {,~}}
-%%<class-article> \hypersetup{pdfmsc=\l_@@_msc_tl}
-}
-\tl_new:N \l__nwejm_jobname_tl
-\tl_set:Nn \l__nwejm_jobname_tl {\jobname}
-\str_if_eq_x:nnF \l__nwejm_jobname_tl \c__nwejm_main_file_name_tl { \msg_error:nn{nwejm}{Wrong~main~file~name!} }
-%% \enquote{R\'{e}dacteur(s) en chef}.
+}{
+ \bool_if:NTF {\g__nwejm_cover_bool} {
+ \file_if_exist:nTF { \c__nwejm_issue_number_year_file_string_tl }
+ {
+ \file_input:n {\c__nwejm_issue_number_year_file_string_tl}
+ }{
+ \msg_error:nn{nwejm}{Main~file~needs~to~be~compiled!}
+ }
+ }{
+ \msg_error:nn{nwejm}{Wrong~issue's~main~file~name!}
+ }
+}
\NewDocumentCommand \editorinchief {mmmm}
{
\__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{editorinchief}
@@ -1209,9 +1320,9 @@
{
\__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{fontdesigner}
}
-\NewDocumentCommand \printingservice {mmmm}
+\NewDocumentCommand \graphicdesign {mmmm}
{
- \__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{printingservice}
+ \__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{graphicdesign}
}
\NewDocumentCommand \computerassistance {mmmm}
{
@@ -1223,8 +1334,6 @@
}
\NewDocumentCommand \issuesetup { m } {
\keys_set:nn { nwejm/issuesetup } {#1}
-\hypersetup{pdftitle=\l__nwejm_pdftitle_string_tl}
-\hypersetup{pdfauthor=\l__nwejm_pdfauthor_string_tl}
\int_compare:nNnT {\g__nwejm_issue_number_int}<{1}
{
\int_gset:Nn \g__nwejm_issue_number_int { \c__nwejm_first_issue_number_int }
@@ -1259,6 +1368,24 @@
\g__nwejm_issue_age_in_years_int + \c__nwejm_first_issue_year_int
}
}%
+ \bool_if:NT {\g__nwejm_cover_bool} {
+ \hypersetup{
+ pdftitle=\c__nwejm_journal_title_string_tl\c_space_tl--\c_space_tl\c__nwejm_frontcover_left_string_tl\c_space_tl--\c_space_tl\int_use:N\g__nwejm_issue_year_int,
+ pdfauthor=\c__nwejm_journal_title_string_tl\c_space_tl(editor)
+ }
+ }
+ \iow_new:N \g__nwejm_issue_number_year_out_iow
+ \iow_open:Nn \g__nwejm_issue_number_year_out_iow {\c__nwejm_issue_number_year_file_string_tl}
+ \iow_now:Nx \g__nwejm_issue_number_year_out_iow {
+ \tl_const:Nn \token_to_str:N \c__nwejm_issue_number_tl {
+ \int_eval:n {\g__nwejm_issue_number_int}
+ }
+ \iow_newline:
+ \tl_const:Nn \token_to_str:N \c__nwejm_issue_year_tl {
+ \int_eval:n {\g__nwejm_issue_year_int}
+ }
+ }
+ \iow_close:N \g__nwejm_issue_number_year_out_iow
}
\NewDocumentCommand \journalsetup { m } {
\keys_set:nn { nwejm/journalsetup } { #1 }
@@ -1273,16 +1400,16 @@
\addto\extrasfrench{%
\def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}%
\def\reftextfacebefore{page~\reftextvario{ci-contre}%
- {pr\^^e2^^80^^99ec\^^e2^^80^^99edente}}%
+ {pr\’ec\’edente}}%
\def\reftextafter
{page~suivante}%
\def\reftextbefore
- {page~pr\^^e2^^80^^99ec\^^e2^^80^^99edente}%
+ {page~pr\’ec\’edente}%
\def\reftextcurrent
- {de~la~pr\^^e2^^80^^99esente~page}%
+ {de~la~pr\’esente~page}%
\def\reftextfaraway#1{page~\pageref{#1}}%
\def\reftextpagerange#1#2{pages~\pageref{#1}--\pageref{#2}}%
- \def\reftextlabelrange#1#2{\ref{#1}~\^^e2^^80^^98a~\ref{#2}}%
+ \def\reftextlabelrange#1#2{\ref{#1}~\‘a~\ref{#2}}%
}
\addto\extrasngerman{%
\def\reftextfaceafter {auf~der~n\"achsten~Seite}%
@@ -1305,7 +1432,7 @@
\def\reftextbefore {op~de~\reftextvario{vorige~\refpagename}%
{\refpagename\ hiervoor}}%
\def\reftextcurrent {op~deze~\refpagename}%
- \def\reftextfaraway#1{op~\refpagename\space\pageref{#1}}
+ \def\reftextfaraway#1{op~\refpagename\c_space_tl\pageref{#1}}
}
\addto\extrasenglish{%
\def\reftextfaceafter {on~the~\reftextvario{facing}{next}~page}%
@@ -1489,7 +1616,7 @@
\tl_gset:Nn \g__nwejm_citeauthor_tl {%
\DeclareNameAlias{labelname}{default}%
\group_begin:
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
}%
@@ -1510,7 +1637,7 @@
\AtNextCitekey{\defcounter{maxnames}{100}}
\group_begin:
\DeclareNameAlias{labelname}{default}%
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
\cs_set_eq:NN \multinamedelim \__nwejm_orig_multinamedelim
@@ -1617,11 +1744,11 @@
\c__nwejm_colon_tl
}
}
- \space\l__nwejm_keywords_tl.
+ \c_space_tl\g__nwejm_keywords_tl.
}
\tl_set:Nn \l__nwejm_msc_box_tl
{%
- \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\space\l__nwejm_msc_tl.
+ \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\c_space_tl\g__nwejm_msc_tl.
}
\tl_set:Nn \l__nwejm_abstract_box_tl
{%
@@ -1651,7 +1778,7 @@
}
\bool_if:nF { \tl_if_empty_p:N \g__nwejm_short_subtitle_tl }
{
- .\space\g__nwejm_short_subtitle_tl
+ .\c_space_tl\g__nwejm_short_subtitle_tl
}
}
\tl_set:Nn \g__nwejm_title_for_toc_tl
@@ -1664,10 +1791,10 @@
{
\texorpdfstring{%
\AtNextCitekey{\defcounter{maxnames}{100}}
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}{}
}{%
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}%
}
}
@@ -1696,14 +1823,14 @@
\thispagestyle{__nwejm_article_title_ps}%
\l__nwejm_abstract_box_tl%
\normalsize
-\tl_if_empty:NTF \l__nwejm_keywords_tl {
+\tl_if_empty:NTF \g__nwejm_keywords_tl {
\msg_warning:nn{nwejmart}{No~keyword}
}{
\l__nwejm_keywords_box_tl
\par%
\vskip .5em%
}
-\tl_if_empty:NTF \l__nwejm_msc_tl {
+\tl_if_empty:NTF \g__nwejm_msc_tl {
\msg_warning:nn{nwejmart}{No~MSC}
}{
\l__nwejm_msc_box_tl
@@ -1719,7 +1846,7 @@
\tl_clear:N \l__nwejm_people_first_last_names_tl%
}
\AtEndPreamble{\file_input:n {\c__nwejm_configuration_file_string_tl}}
-\DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}{`}{'}
+\DeclarePlainStyle{«~}{~»}{`}{'}
\setcounter{topnumber}{3}
\renewcommand{\topfraction}{0.8}
\addtolength{\skip\footins}{.25\baselineskip}
@@ -1818,10 +1945,10 @@
}
\cs_new_protected:Nn \__nwejm_century_suffix:n
{
- \space{}
+ \c_space_tl{}
\GetTranslation{century}%
\int_compare:nNnT { #1 } < { 0 }{
- \space
+ \c_space_tl
\GetTranslation{before-christ}
}{
}
@@ -1921,7 +2048,6 @@
\cs_set_eq:NN \__nwejm_orig_newtheorem \newtheorem
\cs_new_protected:Nn \__nwejm_new_theorem:nnnnn
{
- \AtBeginDocument{%
\IfTranslation{English}{#1}{%
}{%
\DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
@@ -1938,80 +2064,71 @@
}{%
\DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
}
- }
- \__nwejm_orig_newtheorem{#1}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- }
+ \__nwejm_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ }
}
\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnn { nVVVV }
\RenewDocumentCommand \newtheorem { O{} m }
{
- \tl_clear:N \l__nwejm_newtheorem_style_tl
- \tl_clear:N \l__nwejm_newtheorem_title_tl
- \tl_clear:N \l__nwejm_newtheorem_french_title_tl
- \tl_clear:N \l__nwejm_newtheorem_english_title_tl
- \tl_clear:N \l__nwejm_newtheorem_german_title_tl
- \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
- %
- \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
- #2
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nn \l__nwejm_newtheorem_style_tl {
- theorem
- }
- \__nwejm_theorem_style:n {theorem}
- \IfNoValueF {#1}
- {
- \keys_set:nn { nwejm / newtheorem } { #1 }
- \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
- \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
+ \AtBeginDocument{
+ \tl_clear:N \l__nwejm_newtheorem_style_tl
+ \tl_clear:N \l__nwejm_newtheorem_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_french_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_english_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_german_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
+ %
+ \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
+ #2
}
- }
- %
- \__nwejm_new_theorem:nVVVV
- {#2}
- {\l__nwejm_newtheorem_english_title_tl}
- {\l__nwejm_newtheorem_french_title_tl}
- {\l__nwejm_newtheorem_german_title_tl}
- {\l__nwejm_newtheorem_dutch_title_tl}
- \makesavenoteenv{#2}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \ifcsmacro{#2*}{%
- \RenewDocumentEnvironment{#2*}{o}
- {
- \IfNoValueTF {##1}
- { \begin{#2__nwejm_nonumbered} }
- { \begin{#2__nwejm_nonumbered}[##1] }
- }{
- \end{#2__nwejm_nonumbered}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nn \l__nwejm_newtheorem_style_tl {
+ theorem
+ }
+ \__nwejm_theorem_style:n {theorem}
+ \IfNoValueF {#1}
+ {
+ \keys_set:nn { nwejm / newtheorem } { #1 }
+ \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
+ \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
}
- }{
- \NewDocumentEnvironment{#2*}{o}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ }
+ }
+ %
+ \__nwejm_new_theorem:nVVVV
+ {#2}
+ {\l__nwejm_newtheorem_english_title_tl}
+ {\l__nwejm_newtheorem_french_title_tl}
+ {\l__nwejm_newtheorem_german_title_tl}
+ {\l__nwejm_newtheorem_dutch_title_tl}
+ \makesavenoteenv{#2}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \ifcsmacro{#2*}{%
+ \RenewDocumentEnvironment{#2*}{o}
{
\IfNoValueTF {##1}
{ \begin{#2__nwejm_nonumbered} }
@@ -2019,9 +2136,19 @@
}{
\end{#2__nwejm_nonumbered}
}
+ }{
+ \NewDocumentEnvironment{#2*}{o}
+ {
+ \IfNoValueTF {##1}
+ { \begin{#2__nwejm_nonumbered} }
+ { \begin{#2__nwejm_nonumbered}[##1] }
+ }{
+ \end{#2__nwejm_nonumbered}
+ }
+ }
}
- }
- \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ }
}
\newtheorem{theorem}
\newtheorem{corollary}
@@ -2302,12 +2429,6 @@
}
\bool_new:N \g__nwejm_grad_used_bool
\NewDocumentCommand \grad {} {%
- \bool_if:NTF \g__nwejm_gradient_nabla_bool {
- \operatorname{\nabla}
- }{
- \operatorname{grad}
- }%
- \peek_after:Nw \__nwejm_opx_check:
\bool_if:NTF \g__nwejm_grad_used_bool {
\bool_if:nT { (\g__nwejm_gradient_nabla_bool && !\g__nwejm_gradient_nabla_control_bool)
|| ( !\g__nwejm_gradient_nabla_bool && \g__nwejm_gradient_nabla_control_bool) } {
@@ -2317,6 +2438,12 @@
\bool_gset_eq:NN \g__nwejm_gradient_nabla_control_bool \g__nwejm_gradient_nabla_bool
\bool_gset_true:N \g__nwejm_grad_used_bool
}
+ \bool_if:NTF \g__nwejm_gradient_nabla_bool {
+ \operatorname{\nabla}
+ }{
+ \operatorname{grad}
+ }%
+ \peek_after:Nw \__nwejm_opx_check:
}
\DeclareMathOperator{\Div}{div}
\NewDocumentCommand \curl {} {%
@@ -2575,14 +2702,14 @@
{
\__nwejm_font_designer_text:n {#1}%
}
-\tl_new:N \g__nwejm_printer_text_tl%
-\cs_new_protected:Nn \__nwejm_printer_text:n
+\tl_new:N \g__nwejm_graphicdesign_text_tl%
+\cs_new_protected:Nn \__nwejm_graphicdesign_text:n
{
- \tl_gset:Nn \g__nwejm_printer_text_tl { #1 }
+ \tl_gset:Nn \g__nwejm_graphicdesign_text_tl { #1 }
}
-\NewDocumentCommand \printertext {m}
+\NewDocumentCommand \graphicdesigntext {m}
{
- \__nwejm_printer_text:n {#1}%
+ \__nwejm_graphicdesign_text:n {#1}%
}
\NewDocumentCommand \nwejm { s } {
\IfBooleanTF {#1}
@@ -2605,11 +2732,15 @@
disable%
}
}
- \bool_if:NF {\g__nwejm_inside_pages_bool} {
+ \bool_if:NTF {\g__nwejm_cover_bool} {
\g__nwejm_display_frontcover_tl
+ \g__nwejm_display_backcover_tl
\g__nwejm_display_inside_frontcover_tl
- }
+ \g__nwejm_display_inside_backcover_tl
+ \end{document}
+ }{
\tableofcontents
+ }
}
\AfterEndPreamble{%
\titleformat{\chapter}[block]
@@ -2630,7 +2761,7 @@
{(0,0)\hfuzz=\maxdimen\begin}
{}{}
%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
+%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
deleted file mode 100644
index f1e28a4e9fa..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
+++ /dev/null
@@ -1,34 +0,0 @@
-%%
-%% This is file `nwejm.dbx',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `datamodel')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.dbx'.
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
deleted file mode 100644
index d609bd329d4..00000000000
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
+++ /dev/null
@@ -1,42 +0,0 @@
-%%
-%% This is file `nwejm.lbx',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nwejm.dtx (with options: `languagemodel')
-%% -------:| -----------------------------------------------------------------
-%% nwejm:| Class for the journal "North-Western European Journal of Mathematics"
-%% Author:| Denis Bitouze
-%% E-mail:| denis.bitouze@lmpa.univ-littoral.fr
-%% License:| Released under the LaTeX Project Public License v1.3c or later
-%% See:| http://www.latex-project.org/lppl.txt
-%%
- \ProvidesFile{nwejm.lbx}
- \InheritBibliographyExtras{french}% extras are inherited from French...
- \DeclareBibliographyStrings{%
- inherit = {french},% .... as well as all the keys
- number = {{\no}{\no}},
- volume = {{volume}{vol\adddot}},
- volumes = {{volumes}{vol\adddot}},
- }
-%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Denis Bitouze.
-%%
-%% This work consists of the file nwejm.dtx and a Makefile.
-%% Running "make" generates the derived files README, nwejm.pdf and nwejm.cls.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
-%%
-%% End of file `nwejm.lbx'.
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
index 40f4f720284..e2b54a0dac5 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
@@ -31,9 +31,16 @@
\msg_new:nnnn{nwejm}{Issue~number~needed}{Option~`#1'~needed!}
{Please~specify~`#1=<number>', ~otherwise~`<number>'~will~be~set~to
~`\int_use:N\c__nwejm_first_issue_number_int'.}%
-\msg_new:nnn{nwejm}{Wrong~main~file~name!}{The~ main~ file~ should~ be~ named~
- `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\jobname.tex'.~ Please~ rename~
+\msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{The~ issue's~ main~ file~
+ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~
+ `\c_sys_jobname_str.tex'.~ Please~ rename~ the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Wrong~cover's~main~file~name!}{The~ cover~ file~
+ should~ /not/~ be~ named~ as~ the~ issue's~ main~ file~
+ `\tl_use:N\c__nwejm_main_file_name_tl.tex'.~ Please~ rename~
the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Main~file~needs~to~be~compiled!}{The~ issue's~ main~ file~
+ (`\tl_use:N\c__nwejm_main_file_name_tl.tex')~ should~ be~ compiled~ at~ least~
+ once~ before~ the~ cover~ can~ be~ generated.}%
\msg_new:nnnn{nwejmart}{Unknown~choice}{Choice~`#3'~invalid!}
{Please~specify~#1=#2.}%
\msg_new:nnn{nwejmart}{Unknown~tag}{There~ isn't~ any~ affiliation~ tagged~
@@ -125,13 +132,8 @@
\bool_if:NF {\g__nwejm_language_specified_bool} {
\__nwejm_language:n {english}
}
-\RequirePackage{silence}
-\WarningFilter[nwejm]{kpfonts}{With 'easyscsl' option, don't fit together}
-\WarningFilter[nwejm]{etex}{Extended allocation already in use}
-\WarningFilter[nwejm]{etoc}{package tocvsec2 detected and its modification of}
-\ActivateWarningFilters[nwejm]
\RequirePackage[l2tabu,orthodox]{nag}
-\pdftex_if_engine:TF
+\sys_if_engine_pdftex:TF
{
\RequirePackage[utf8]{inputenc}
}{
@@ -145,7 +147,7 @@
\RequirePackage{xr}
\RequirePackage{currfile}
\RequirePackage[multiple]{footmisc}%
-\RequirePackage[svgnames]{xcolor}%
+\RequirePackage{xcolor}%
\RequirePackage{xspace}%
\RequirePackage[autostyle]{csquotes}%
\RequirePackage{array}
@@ -185,9 +187,9 @@
\int_new:N \g__nwejm_articles_int
\clist_new:N \g__nwejm_counters_to_be_reset_clist
\int_const:Nn \c__nwejm_first_issue_number_int { 1 }
-\int_const:Nn \c__nwejm_first_issue_year_int { 2016 }
+\int_const:Nn \c__nwejm_first_issue_year_int { 2015 }
\int_const:Nn \c__nwejm_first_issue_month_int { 1 }
-\int_const:Nn \c__nwejm_interval_in_months_int { 6 }
+\int_const:Nn \c__nwejm_interval_in_months_int { 12 }
\tl_const:Nn \c__nwejm_main_file_name_tl {issue}
\tl_const:Nn \c__nwejm_date_received_tl {received}
\tl_const:Nn \c__nwejm_date_accepted_tl {accepted}
@@ -200,6 +202,8 @@
bibliography~of~your~article~to~appear~in~the~next~issue~of~the
\c__nwejm_journal_title_string_tl.~The~current~layout~may~not~be~the~final~one.%
}
+\tl_const:Nn \c__nwejm_cover_background_image_tl {nwejm-cover-background.jpg}
+\definecolor{__nwejm_cover_background_color_tl}{rgb}{0.16,0.22,0.56}
\tl_const:Nn \c__nwejm_msc_string_tl {\textsc{msc}}
\tl_const:Nn \c__nwejm_colon_tl {
\ifcurrentbaselanguage{french}{\FBcolonspace}{}:
@@ -210,6 +214,7 @@
\tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm}
\tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_job_name_tl\c__nwejm_issue_bib_file_suffix_string_tl.bib}
\tl_const:Nn \c__nwejm_issue_bib_path_string_tl {\c__nwejm_issue_bib_file_string_tl}
+\tl_const:Nn \c__nwejm_issue_number_year_file_string_tl {\c__nwejm_main_file_name_tl.iny}
\tl_const:Nn \c__nwejm_issue_bib_key_tl {\int_use:N \g__nwejm_issue_number_int}
\tl_const:Nn \c__nwejm_journal_short_title_string_tl {\textsc{nwejm}}
\tl_const:Nn \c__nwejm_journal_title_string_tl {
@@ -230,24 +235,33 @@
\bool_new:N \g__nwejm_date_specified_bool
\dim_const:Nn \c__nwejm_layoutheight_dim { 240mm}
\dim_const:Nn \c__nwejm_layoutwidth_dim { 170mm}
-\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 5mm}
+\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 10mm }
\bool_if:NTF {\g__nwejm_for_printer_bool} {
\dim_const:Nn \c__nwejm_potential_layoutoffset_dim { \c__nwejm_printer_layoutoffset_dim}
}{
\dim_const:Nn \c__nwejm_potential_layoutoffset_dim {\c_zero_dim}
}
\bool_if:NTF {\g__nwejm_cover_bool} {
- \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ \dim_compare:nTF {\g__nwejm_binding_dim > \c_zero_dim} {%
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \g__nwejm_binding_dim }
+ }{
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ }
}{
\dim_const:Nn \c__nwejm_potential_bindingoffset_dim {\c_zero_dim}
}
-\dim_const:Nn \c__nwejm_paperheight_dim { \c__nwejm_layoutheight_dim+2\c__nwejm_potential_layoutoffset_dim}
+\dim_const:Nn \c__nwejm_paperheight_dim {
+ \c__nwejm_layoutheight_dim
+ +
+ 2\c__nwejm_potential_layoutoffset_dim
+}
\bool_if:NTF {\g__nwejm_cover_bool} {
\dim_const:Nn \c__nwejm_paperwidth_dim {
\c__nwejm_layoutwidth_dim
+
\c__nwejm_potential_layoutoffset_dim
- +\c__nwejm_potential_bindingoffset_dim
+ +
+ .5\c__nwejm_potential_bindingoffset_dim
}
}{
\dim_const:Nn \c__nwejm_paperwidth_dim {
@@ -261,11 +275,9 @@
\dim_const:Nn \c__nwejm_topmargin_dim { 20mm}
\dim_const:Nn \c__nwejm_topmargin_frontcover_dim {
\c__nwejm_topmargin_dim
- % + 30mm
}
\dim_const:Nn \c__nwejm_topmargin_inside_cover_dim {
\c__nwejm_topmargin_dim
- % +10mm
}
\dim_const:Nn \c__nwejm_topmargin_front_matter_dim {
\c__nwejm_topmargin_inside_cover_dim
@@ -273,8 +285,6 @@
\dim_const:Nn \c__nwejm_headsep_dim { 9.5mm}
\dim_const:Nn \c__nwejm_headsep_frontcover_dim {
\c__nwejm_headsep_dim
- % +31mm
- % -\c__nwejm_potential_layoutoffset_dim
}
\dim_const:Nn \c__nwejm_headsep_inside_frontcover_dim {
\c__nwejm_headsep_dim
@@ -292,16 +302,9 @@
\dim_const:Nn \c__nwejm_right_minipage_frontcover_dim { .6\linewidth }
\dim_const:Nn \c__nwejm_innermargin_dim { 23mm }
\dim_const:Nn \c__nwejm_outermargin_dim { 30mm }
-\dim_const:Nn \c__nwejm_inside_cover_box_width_dim { 150mm }%
-\dim_const:Nn \c__nwejm_innermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- - \c__nwejm_potential_bindingoffset_dim
- % + \c__nwejm_adjustmargin_dim
-}
-\dim_const:Nn \c__nwejm_outermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- % - \c__nwejm_adjustmargin_dim
-}
+\dim_const:Nn \c__nwejm_inside_cover_textwidth_dim { 145mm }%
+\dim_const:Nn \c__nwejm_outermargin_inside_frontcover_dim { 15mm }
+\dim_const:Nn \c__nwejm_outermargin_inside_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_innermargin_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_outermargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
\dim_const:Nn \c__nwejm_topmargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
@@ -309,9 +312,14 @@
\dim_const:Nn \c__nwejm_front_matter_extra_innermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_front_matter_extra_outermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_inside_cover_offset_dim { \c_zero_dim }%
+\dim_const:Nn \c__nwejm_logos_rectangle_thickness_dim { 3.1mm }
+\dim_const:Nn \c__nwejm_logos_rectangle_height_dim { 33mm }
\geometry{%
papersize={\c__nwejm_paperwidth_dim,\c__nwejm_paperheight_dim}
}
+\bool_if:NT {\g__nwejm_inside_pages_bool} {
+ \geometry{showcrop}
+}
\tl_const:Nn \c__nwejm_main_geometry_tl {%
,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
,layoutoffset=\c__nwejm_potential_layoutoffset_dim
@@ -431,7 +439,7 @@
{
number .int_gset:N = \g__nwejm_issue_number_int,
volume .int_gset:N = \g__nwejm_issue_volume_int,
- volume .value_required:,
+ volume .value_required:n = true,
volume .initial:n = 0,
}
\keys_define:nn { nwejm/dates }
@@ -448,9 +456,9 @@
\tl_gset:Nn \g__nwejm_online_date_tl {#1}
\bool_gset_true:N \g__nwejm_date_specified_bool
},
- received .value_required:,
- accepted .value_required:,
- online .value_required:,
+ received .value_required:n = true,
+ accepted .value_required:n = true,
+ online .value_required:n = true,
}
\quark_new:N \q__nwejm
\int_new:N \l_author_int
@@ -484,8 +492,8 @@
\msg_error:nnn{__nwejm}{Unknown~tag}{#1}
}
},
- affiliation .value_required:,
- affiliationtagged .value_required:,
+ affiliation .value_required:n = true,
+ affiliationtagged .value_required:n = true,
}
\tl_new:N \l__nwejm_newtheorem_style_tl
\keys_define:nn { nwejm / newtheorem }
@@ -495,11 +503,11 @@
title / english .tl_set:N = \l__nwejm_newtheorem_english_title_tl,
title / german .tl_set:N = \l__nwejm_newtheorem_german_title_tl,
title / dutch .tl_set:N = \l__nwejm_newtheorem_dutch_title_tl,
- title .value_required:,
- title / french .value_required:,
- title / english .value_required:,
- title / german .value_required:,
- title / dutch .value_required:,
+ title .value_required:n = true,
+ title / french .value_required:n = true,
+ title / english .value_required:n = true,
+ title / german .value_required:n = true,
+ title / dutch .value_required:n = true,
%
style .choice:,
style / theorem .code:n = {\__nwejm_theorem_style:n {theorem}},
@@ -542,14 +550,6 @@
\emph{\c__nwejm_journal_title_string_tl}
}%
}
-\tl_new:N \l__nwejm_pdftitle_string_tl
-\tl_new:N \l__nwejm_pdfauthor_string_tl
-\tl_set:Nn \l__nwejm_pdftile_string_tl {
- \c__nwejm_journal_title_string_tl\space--\space{}N^^c2^^b0\int_use:N\g__nwejm_issue_number_int
-}
-\tl_set:Nn \l__nwejm_pdfauthor_string_tl {
- \g__nwejm_nwejm_string_tl
-}
\cs_new_protected:Nn \__nwejm_email:n
{
\href{mailto:#1}{\nolinkurl{#1}}%
@@ -594,7 +594,7 @@
{
\tl_if_eq:NNF {\c__nwejm_date_received_tl} {#1} { \c__nwejm_dates_separator_tl }
\tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
- \c__nwejm_colon_tl\space
+ \c__nwejm_colon_tl\c_space_tl
\DTMdate{#2}%
}
}
@@ -609,34 +609,26 @@
\tl_gclear:N \g__nwejm_acception_date_tl
\tl_gclear:N \g__nwejm_online_date_tl
}
-\seq_new:N \l__nwejm_keywords_seq
-\tl_new:N \l__nwejm_keywords_tl
-\NewDocumentCommand \keywords { m } {
- \seq_clear:N \l__nwejm_keywords_seq
- \tl_clear:N \l__nwejm_keywords_tl
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- \seq_set_map:NNn \l__nwejm_keywords_seq \l_tmpa_seq {
- ##1
+\tl_new:N \g__nwejm_keywords_tl
+\NewDocumentCommand \keywords { O{} m } {
+ \tl_gclear:N \g__nwejm_keywords_tl
+ \tl_clear:N \l_tmpb_clist
+ \clist_set:Nn \l_tmpb_clist {#2}
+ \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } }
+ \tl_if_empty:nTF {#1} {%
+ \hypersetup{pdfkeywords={\g__nwejm_keywords_tl}}
+ }{
+ \clist_set:Nn \l_tmpb_clist {#1}
+ \hypersetup{pdfkeywords={\clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ }}}
}
- \tl_set:Nn \l__nwejm_keywords_tl { \seq_use:Nn \l__nwejm_keywords_seq {,~} }
- \hypersetup{pdfkeywords=\l__nwejm_keywords_tl}
}
-\seq_new:N \l__nwejm_msc_seq
-\tl_new:N \l__nwejm_msc_tl
+\tl_new:N \g__nwejm_msc_tl
\NewDocumentCommand \msc { m } {
- \seq_clear:N \l__nwejm_msc_seq
- \tl_clear:N \l__nwejm_msc_tl
- %
- % does what the name suggests, set a sequence from the clist
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- % applies final arg to each element of second seq and stores result in first seq
- \seq_set_map:NNn \l__nwejm_msc_seq \l_tmpa_seq {
- ##1
- }
- %
- % \seq_use puts the items from the seq back in the input with ",~" as a separator
- \tl_set:Nn \l__nwejm_msc_tl {\seq_use:Nn \l__nwejm_msc_seq {,~}}
-%%<class-article> \hypersetup{pdfmsc=\l_@@_msc_tl}
+ \tl_gclear:N \g__nwejm_msc_tl
+ \tl_clear:N \l_tmpa_clist
+ \clist_set:Nn \l_tmpa_clist {#1}
+ \tl_set:Nn \g__nwejm_msc_tl { \clist_use:Nnnn \l_tmpa_clist { ,~ } { ,~ } { ,~ } }
+%%<class-article> \hypersetup{pdfmsc=\g_@@_msc_tl}
}
\file_if_exist:nT { \c__nwejm_main_file_name_tl.aux }
@@ -812,7 +804,7 @@
\tl_gset:Nn \g__nwejm_citeauthor_tl {%
\DeclareNameAlias{labelname}{default}%
\group_begin:
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
}%
@@ -833,7 +825,7 @@
\AtNextCitekey{\defcounter{maxnames}{100}}
\group_begin:
\DeclareNameAlias{labelname}{default}%
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
\cs_set_eq:NN \multinamedelim \__nwejm_orig_multinamedelim
@@ -939,11 +931,11 @@
\c__nwejm_colon_tl
}
}
- \space\l__nwejm_keywords_tl.
+ \c_space_tl\g__nwejm_keywords_tl.
}
\tl_set:Nn \l__nwejm_msc_box_tl
{%
- \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\space\l__nwejm_msc_tl.
+ \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\c_space_tl\g__nwejm_msc_tl.
}
\tl_set:Nn \l__nwejm_abstract_box_tl
{%
@@ -973,7 +965,7 @@
}
\bool_if:nF { \tl_if_empty_p:N \g__nwejm_short_subtitle_tl }
{
- .\space\g__nwejm_short_subtitle_tl
+ .\c_space_tl\g__nwejm_short_subtitle_tl
}
}
\hypersetup{pdftitle=\g__nwejm_partial_title_for_toc_tl}
@@ -987,10 +979,10 @@
{
\texorpdfstring{%
\AtNextCitekey{\defcounter{maxnames}{100}}
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}{}
}{%
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}%
}
}
@@ -1020,14 +1012,14 @@
\thispagestyle{__nwejm_article_title_ps}%
\l__nwejm_abstract_box_tl%
\normalsize
-\tl_if_empty:NTF \l__nwejm_keywords_tl {
+\tl_if_empty:NTF \g__nwejm_keywords_tl {
\msg_warning:nn{nwejmart}{No~keyword}
}{
\l__nwejm_keywords_box_tl
\par%
\vskip .5em%
}
-\tl_if_empty:NTF \l__nwejm_msc_tl {
+\tl_if_empty:NTF \g__nwejm_msc_tl {
\msg_warning:nn{nwejmart}{No~MSC}
}{
\l__nwejm_msc_box_tl
@@ -1043,7 +1035,7 @@
\tl_gclear:N \g__nwejm_people_email_tl
\tl_clear:N \l__nwejm_people_first_last_names_tl%
}
-\DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}{`}{'}
+\DeclarePlainStyle{«~}{~»}{`}{'}
\setcounter{topnumber}{3}
\renewcommand{\topfraction}{0.8}
\addtolength{\skip\footins}{.25\baselineskip}
@@ -1142,10 +1134,10 @@
}
\cs_new_protected:Nn \__nwejm_century_suffix:n
{
- \space{}
+ \c_space_tl{}
\GetTranslation{century}%
\int_compare:nNnT { #1 } < { 0 }{
- \space
+ \c_space_tl
\GetTranslation{before-christ}
}{
}
@@ -1245,7 +1237,6 @@
\cs_set_eq:NN \__nwejm_orig_newtheorem \newtheorem
\cs_new_protected:Nn \__nwejm_new_theorem:nnnnn
{
- \AtBeginDocument{%
\IfTranslation{English}{#1}{%
}{%
\DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
@@ -1262,80 +1253,71 @@
}{%
\DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
}
- }
- \__nwejm_orig_newtheorem{#1}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- }
+ \__nwejm_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ }
}
\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnn { nVVVV }
\RenewDocumentCommand \newtheorem { O{} m }
{
- \tl_clear:N \l__nwejm_newtheorem_style_tl
- \tl_clear:N \l__nwejm_newtheorem_title_tl
- \tl_clear:N \l__nwejm_newtheorem_french_title_tl
- \tl_clear:N \l__nwejm_newtheorem_english_title_tl
- \tl_clear:N \l__nwejm_newtheorem_german_title_tl
- \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
- %
- \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
- #2
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nn \l__nwejm_newtheorem_style_tl {
- theorem
- }
- \__nwejm_theorem_style:n {theorem}
- \IfNoValueF {#1}
- {
- \keys_set:nn { nwejm / newtheorem } { #1 }
- \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
- \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
+ \AtBeginDocument{
+ \tl_clear:N \l__nwejm_newtheorem_style_tl
+ \tl_clear:N \l__nwejm_newtheorem_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_french_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_english_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_german_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
+ %
+ \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
+ #2
}
- }
- %
- \__nwejm_new_theorem:nVVVV
- {#2}
- {\l__nwejm_newtheorem_english_title_tl}
- {\l__nwejm_newtheorem_french_title_tl}
- {\l__nwejm_newtheorem_german_title_tl}
- {\l__nwejm_newtheorem_dutch_title_tl}
- \makesavenoteenv{#2}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \ifcsmacro{#2*}{%
- \RenewDocumentEnvironment{#2*}{o}
- {
- \IfNoValueTF {##1}
- { \begin{#2__nwejm_nonumbered} }
- { \begin{#2__nwejm_nonumbered}[##1] }
- }{
- \end{#2__nwejm_nonumbered}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nn \l__nwejm_newtheorem_style_tl {
+ theorem
+ }
+ \__nwejm_theorem_style:n {theorem}
+ \IfNoValueF {#1}
+ {
+ \keys_set:nn { nwejm / newtheorem } { #1 }
+ \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
+ \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
}
- }{
- \NewDocumentEnvironment{#2*}{o}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ }
+ }
+ %
+ \__nwejm_new_theorem:nVVVV
+ {#2}
+ {\l__nwejm_newtheorem_english_title_tl}
+ {\l__nwejm_newtheorem_french_title_tl}
+ {\l__nwejm_newtheorem_german_title_tl}
+ {\l__nwejm_newtheorem_dutch_title_tl}
+ \makesavenoteenv{#2}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \ifcsmacro{#2*}{%
+ \RenewDocumentEnvironment{#2*}{o}
{
\IfNoValueTF {##1}
{ \begin{#2__nwejm_nonumbered} }
@@ -1343,9 +1325,19 @@
}{
\end{#2__nwejm_nonumbered}
}
+ }{
+ \NewDocumentEnvironment{#2*}{o}
+ {
+ \IfNoValueTF {##1}
+ { \begin{#2__nwejm_nonumbered} }
+ { \begin{#2__nwejm_nonumbered}[##1] }
+ }{
+ \end{#2__nwejm_nonumbered}
+ }
+ }
}
- }
- \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ }
}
\newtheorem{theorem}
\newtheorem{corollary}
@@ -1626,12 +1618,6 @@
}
\bool_new:N \g__nwejm_grad_used_bool
\NewDocumentCommand \grad {} {%
- \bool_if:NTF \g__nwejm_gradient_nabla_bool {
- \operatorname{\nabla}
- }{
- \operatorname{grad}
- }%
- \peek_after:Nw \__nwejm_opx_check:
\bool_if:NTF \g__nwejm_grad_used_bool {
\bool_if:nT { (\g__nwejm_gradient_nabla_bool && !\g__nwejm_gradient_nabla_control_bool)
|| ( !\g__nwejm_gradient_nabla_bool && \g__nwejm_gradient_nabla_control_bool) } {
@@ -1641,6 +1627,12 @@
\bool_gset_eq:NN \g__nwejm_gradient_nabla_control_bool \g__nwejm_gradient_nabla_bool
\bool_gset_true:N \g__nwejm_grad_used_bool
}
+ \bool_if:NTF \g__nwejm_gradient_nabla_bool {
+ \operatorname{\nabla}
+ }{
+ \operatorname{grad}
+ }%
+ \peek_after:Nw \__nwejm_opx_check:
}
\DeclareMathOperator{\Div}{div}
\NewDocumentCommand \curl {} {%
@@ -1906,14 +1898,14 @@
{
\__nwejm_font_designer_text:n {#1}%
}
-\tl_new:N \g__nwejm_printer_text_tl%
-\cs_new_protected:Nn \__nwejm_printer_text:n
+\tl_new:N \g__nwejm_graphicdesign_text_tl%
+\cs_new_protected:Nn \__nwejm_graphicdesign_text:n
{
- \tl_gset:Nn \g__nwejm_printer_text_tl { #1 }
+ \tl_gset:Nn \g__nwejm_graphicdesign_text_tl { #1 }
}
-\NewDocumentCommand \printertext {m}
+\NewDocumentCommand \graphicdesigntext {m}
{
- \__nwejm_printer_text:n {#1}%
+ \__nwejm_graphicdesign_text:n {#1}%
}
\NewDocumentCommand \nwejm { s } {
\IfBooleanTF {#1}
@@ -1944,7 +1936,7 @@
{(0,0)\hfuzz=\maxdimen\begin}
{}{}
%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
+%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either