nwejm (11mar24)

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

18 files changed, 85 insertions, 57 deletions

diff --git a/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md b/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md
index b4dc25d266f..b246e978265 100644
--- a/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/nwejm/CHANGELOG.md
@@ -1,5 +1,12 @@
 # [Unreleased]
 
+# [1.0.6] - 2024-02-08
+
+## Fixed
+- (First) Page numbers could be not the same in whole issue and in standalone
+  articles.
+- Minor tweaks in the code.
+
 # [1.0.5] - 2022-09-21
 
 ## Fixed
diff --git a/Master/texmf-dist/doc/latex/nwejm/README.md b/Master/texmf-dist/doc/latex/nwejm/README.md
index 51b2bfc3918..d61c3674a25 100644
--- a/Master/texmf-dist/doc/latex/nwejm/README.md
+++ b/Master/texmf-dist/doc/latex/nwejm/README.md
@@ -8,7 +8,7 @@ new journal “North-Western European Journal of Mathematics”.
 
 Release
 -------
-2022-09-21 v1.0.5
+2024-02-08 v1.0.6
 
 Development
 -----------
diff --git a/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.pdf b/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.pdf
index b6723ddf7d5..ff0487f25c8 100644
--- a/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.tex b/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.tex
index 57e382120f1..9c6f0a214ca 100644
--- a/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.tex
+++ b/Master/texmf-dist/doc/latex/nwejm/english/nwejm-en.tex
@@ -9,8 +9,8 @@
 
 \documentclass[english,nolocaltoc]{nwejmart}
 %
-\DTMsavedate{release-date}{2022-09-21}
-\newcommand{\releaseversion}{1.0.5}
+\DTMsavedate{release-date}{2024-02-08}
+\newcommand{\releaseversion}{1.0.6}
 %
 \usepackage[nwejm]{denisbdoc}
 \usepackage{tabulary}
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf
index cc2aa090f70..93f7b52ce2d 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf
index 9d486cc5208..e494f1446ad 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf
index 83cbf7c07b3..d96142e5285 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf
index 50ae92ace9d..c387c8e46ab 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
index cfedc3e9401..269480c9b81 100644
--- a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.pdf b/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.pdf
index 2f80d2cac4d..0935c8c4a7b 100644
--- a/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.pdf
+++ b/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.pdf
diff --git a/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.tex b/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.tex
index 6923a6d8cbe..891c0d0ef7a 100644
--- a/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.tex
+++ b/Master/texmf-dist/doc/latex/nwejm/french/nwejm-fr.tex
@@ -9,8 +9,8 @@
 %
 \documentclass[french,nolocaltoc]{nwejmart}
 %
-\DTMsavedate{release-date}{2022-09-21}
-\newcommand{\releaseversion}{1.0.5}
+\DTMsavedate{release-date}{2024-02-08}
+\newcommand{\releaseversion}{1.0.6}
 %
 \usepackage[nwejm]{denisbdoc}
 \usepackage{tabulary}
@@ -37,6 +37,17 @@
   ^^^^27e9% Right-Pointing Angle Bracket
   ^^00}
 \lst@RestoreCatcodes
+
+\NewDocumentCommand{\myarrow}{}{{\fontfamily{pzd}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont\char213}}
+\RenewDocumentCommand\tcb@ref@doc{msm}{%
+  \hyperref[#1:#3]{\texttt{\ref*{#1:#3}}%
+  \IfBooleanTF{#2}{}{%
+    \ifnum\getpagerefnumber{#1:#3}=\thepage\relax%
+    \else%
+      \up*{\myarrow%
+      \,\kvtcb@text@pageshort\,\pageref*{#1:#3}}%
+    \fi}}%
+}
 \makeatother
 %
 \indexsetup{level=\section*,toclevel=section,noclearpage}
diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
index 73840d7333d..f5efe4c4f1a 100644
--- a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
+++ b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx
@@ -27,7 +27,7 @@
 % This field contains the version of the package.
 % The value is optional.
 % The value is restricted to 32 characters.
-\version{1.0.5 2022-09-21}
+\version{1.0.6 2024-02-08}
 % -------------------------------------------------------------------------
 % This field contains the name of the author(s).
 % The value is optional.
@@ -144,6 +144,13 @@ This update consists only in a logo file renamed as requested by Karl Berry.
 %    \end{macrocode}
 # [Unreleased]
 
+# [1.0.6] - 2024-02-08
+
+## Fixed
+- (First) Page numbers could be not the same in whole issue and in standalone
+  articles.
+- Minor tweaks in the code.
+
 # [1.0.5] - 2022-09-21
 
 ## Fixed
@@ -292,7 +299,7 @@ new journal “North-Western European Journal of Mathematics”.
 
 Release
 -------
-2022-09-21 v1.0.5
+2024-02-08 v1.0.6
 
 Development
 -----------
@@ -323,7 +330,7 @@ https://github.com/dbitouze/nwejm.
 \input l3docstrip.tex
 \Msg{********************************************************}
 \Msg{* Installation}
-\Msg{* Class: nwejm 2022-09-21 v1.0.5}
+\Msg{* Class: nwejm 2024-02-08 v1.0.6}
 \Msg{* for the journal}
 \Msg{* "North-Western European Journal of Mathematics" (DB)}
 \Msg{********************************************************}
@@ -340,7 +347,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
 \endpreamble
 \postamble
 
-Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -561,14 +568,6 @@ Running "make install" installs the files in the local TeX tree.
 % commands.
 %
 % \begin{itemize}
-% \item A generic document command parser:
-%    \begin{macrocode}
-\RequirePackage{xparse}
-%    \end{macrocode}
-% \item \LaTeXe{} option processing using \LaTeX3 keys:
-%    \begin{macrocode}
-\RequirePackage{l3keys2e}
-%    \end{macrocode}
 % % \item Sorting lists (since \Pkg{l3sort} is about to move from `experimental'
 % % to `stable' status, the \File{l3sort.sty} will be removed soonish):
 % %    \begin{macrocode}
@@ -607,8 +606,8 @@ Running "make install" installs the files in the local TeX tree.
 \ProvidesExplClass
 %<class>  {nwejm}
 %<class-article>  {nwejmart}
-  {2022-09-21}
-  {1.0.5}
+  {2024-02-08}
+  {1.0.6}
   {
     Class for the journal "North-Western European Journal of Mathematics".
   }
@@ -685,6 +684,12 @@ Running "make install" installs the files in the local TeX tree.
 %<class-article>   current~ article.}%
 %    \end{macrocode}
 %
+%   In order to automatically fix the first page number each of the articles, we
+%   define a related integer.
+%    \begin{macrocode}
+\int_new:N \l_@@_first_page_number_int%
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</class|class-article>
 %    \end{macrocode}
@@ -830,7 +835,7 @@ Running "make install" installs the files in the local TeX tree.
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProcessKeysOptions { nwejm }
+\ProcessKeyOptions [nwejm]
 %    \end{macrocode}
 %
 % \subsection{Class loading}
@@ -904,6 +909,12 @@ Running "make install" installs the files in the local TeX tree.
 \RequirePackage[l2tabu,orthodox]{nag}
 %    \end{macrocode}
 %
+% \item Extension to \Pkg{amsmath}: correct various bugs/defeciencies in amsmath
+%   and useful tools for mathematical typesetting:
+%    \begin{macrocode}
+\RequirePackage{mathtools}
+%    \end{macrocode}
+%
 % \item In case of \hologo{pdfTeX} engine, we enforce \pkg{fontenc} to be
 %   loaded with its \docAuxKey*{T1} option. Otherwise \pkg{fontspec},
 %   convenient for both \hologo{XeLaTeX} and \hologo{LuaLaTeX}, is loaded by the
@@ -926,7 +937,7 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \item Unicode mathematics support for \hologo{XeTeX} and \hologo{LuaTeX}:
 %    \begin{macrocode}
-  \RequirePackage{unicode-math}
+  \RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
 %    \end{macrocode}
 %
 % \item OTF version of the Kp-fonts for both roman and sans-serif font, but
@@ -1013,12 +1024,6 @@ Running "make install" installs the files in the local TeX tree.
 \RequirePackage{booktabs}
 %    \end{macrocode}
 %
-% \item Extension to \Pkg{amsmath}: correct various bugs/defeciencies in amsmath
-%   and useful tools for mathematical typesetting:
-%    \begin{macrocode}
-\RequirePackage{mathtools}
-%    \end{macrocode}
-%
 % \item Extensions to theorem environments:
 %    \begin{macrocode}
 \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
@@ -1149,6 +1154,11 @@ Running "make install" installs the files in the local TeX tree.
 \RequirePackage{babel}%
 %    \end{macrocode}
 %
+% \item :
+%    \begin{macrocode}
+\RequirePackage{listings}%
+%    \end{macrocode}
+%
 % \item Intelligent page references:
 %    \begin{macrocode}
 \RequirePackage{varioref}
@@ -1325,7 +1335,7 @@ Running "make install" installs the files in the local TeX tree.
 %    \end{macrocode}
 % For the field editor.
 %    \begin{macrocode}
-\tl_const:Nn \c_@@_field_editor_string_tl {Field~Editor}
+\tl_const:Nn \c_@@_field_editor_string_tl {Fields~Editor}
 %    \end{macrocode}
 % For the editorial secretariat.
 %    \begin{macrocode}
@@ -3186,11 +3196,11 @@ Running "make install" installs the files in the local TeX tree.
 %<class-article>\file_if_exist:nTF { \c_@@_main_file_name_tl.aux }
 %<class-article>{
 %<class-article>   \externaldocument[@@-]{\c_@@_main_file_name_tl}
-%<class-article>   \cs_generate_variant:Nn \int_set:Nn { Nx }
-%<class-article>   \int_set:Nx \l_tmpa_int {\number\numexpr\getpagerefnumber{@@-\currfilebase}}
-%<class-article>   \int_compare:nNnTF {\l_tmpa_int} > {0}
+%<class-article>   \cs_generate_variant:Nn \int_set:Nn { Ne }
+%<class-article>   \int_set:Ne \l_@@_first_page_number_int {\number\numexpr\getpagerefnumber{@@-\currfilebase}}
+%<class-article>   \int_compare:nNnTF {\l_@@_first_page_number_int} > {0}
 %<class-article>   {
-%<class-article>     \AddToHook{begindocument/end}{\setcounter{page}{\l_tmpa_int}}
+%<class-article>     \AddToHook{begindocument/end}{\setcounter{page}{\l_@@_first_page_number_int}}
 %<class-article>   }{
 %<class-article>     \msg_error:nn{nwejmart}{Something~wrong~with~page~numbers}
 %<class-article>   }
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
index b9caa5115de..06ec4f063eb 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
@@ -96,7 +96,7 @@
 \renewcommand*\bibnamedelimd{\addnbspace}
 \DeclareFieldFormat{journaltitle}{\mkbibemph{#1\isdot}}
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@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.cbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
index 0a57247c06a..082f50302be 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx
@@ -145,7 +145,7 @@
  %  {\usebibmacro{textcite:postnote}}
 \ExecuteBibliographyOptions{autocite=nwejmfootcite}
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@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.cls b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
index 97913ffce73..189373f953a 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
@@ -12,14 +12,12 @@
 %% License:| Released under the LaTeX Project Public License v1.3c or later
 %%     See:| http://www.latex-project.org/lppl.txt
 %% 
-\RequirePackage{xparse}
-\RequirePackage{l3keys2e}
 \RequirePackage{etoolbox}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesExplClass
   {nwejm}
-  {2022-09-21}
-  {1.0.5}
+  {2024-02-08}
+  {1.0.6}
   {
     Class for the journal "North-Western European Journal of Mathematics".
   }
@@ -75,6 +73,7 @@
   size~parameter~specified~ (`#1')~is~ not~ allowed:~ only~ `0',~`1'~(or~
   `\string\big'),~`2'~(or~ `\string\Big'),~`3'~(or~ `\string\big'g)~and~`4'~(or~
   `\string\Bigg')~ are ~ allowed. ~ It~ will~ be~ ignored.}%
+\int_new:N \l__nwejm_first_page_number_int%
 \bool_new:N \g__nwejm_for_authors_bool
 \bool_new:N \g__nwejm_for_printer_bool
 \bool_new:N \g__nwejm_cover_bool
@@ -112,7 +111,7 @@
     \PassOptionsToClass{draft}{book}
   },%
 }%
-\ProcessKeysOptions { nwejm }
+\ProcessKeyOptions [nwejm]
 \LoadClass { book }
 \PassOptionsToPackage{export}{adjustbox}%
 \PassOptionsToPackage{fleqn}{amsmath}%
@@ -126,12 +125,13 @@
 \PassOptionsToPackage{french,ngerman,dutch,english}{babel}
 \PassOptionsToPackage{french,ngerman,dutch,english}{varioref}
 \RequirePackage[l2tabu,orthodox]{nag}
+\RequirePackage{mathtools}
 \sys_if_engine_pdftex:TF
 {
   \RequirePackage[T1]{fontenc}
   \RequirePackage[noDcommand]{kpfonts}
 }{
-  \RequirePackage{unicode-math}
+  \RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
   \RequirePackage[noDcommand]{kpfonts-otf}
   \setmonofont[Scale = MatchLowercase]{Latin Modern Mono}
 }
@@ -150,7 +150,6 @@
 \RequirePackage[autostyle]{csquotes}%
 \RequirePackage{array}
 \RequirePackage{booktabs}
-\RequirePackage{mathtools}
 \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
 \RequirePackage{esvect}
 \RequirePackage{geometry}
@@ -193,6 +192,7 @@
 \RequirePackage{datatool}%
 \RequirePackage{fmtcount}%
 \RequirePackage{babel}%
+\RequirePackage{listings}%
 \RequirePackage{varioref}
 \RequirePackage{subcaption}
 \RequirePackage{tocvsec2}
@@ -228,7 +228,7 @@
 \tl_const:Nn \c__nwejm_editorinchief_string_tl {Editor~in~Chief}
 \tl_const:Nn \c__nwejm_associate_editors_string_tl {Associate~Editors}
 \tl_const:Nn \c__nwejm_managing_editor_string_tl {Managing~Editor}
-\tl_const:Nn \c__nwejm_field_editor_string_tl {Field~Editor}
+\tl_const:Nn \c__nwejm_field_editor_string_tl {Fields~Editor}
 \tl_const:Nn \c__nwejm_editorial_secretariat_string_tl {Secretariat}
 \tl_const:Nn \c__nwejm_phone_string_tl {Tel.}
 \tl_const:Nn \c__nwejm_issn_string_tl {\textsc{issn}}
@@ -3395,7 +3395,7 @@
 }
 \ExplSyntaxOff
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@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
index ac793fb1505..dedc16569c5 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.dbx
@@ -13,7 +13,7 @@
 %%     See:| http://www.latex-project.org/lppl.txt
 %% 
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@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.lbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
index b810e0ddceb..ca0ffd091ea 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.lbx
@@ -21,7 +21,7 @@
     volumes          = {{volumes}{vol\adddot}},
   }
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@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/nwejmart.cls b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
index 9247a377e1c..b39e77f6c9f 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
@@ -12,14 +12,12 @@
 %% License:| Released under the LaTeX Project Public License v1.3c or later
 %%     See:| http://www.latex-project.org/lppl.txt
 %% 
-\RequirePackage{xparse}
-\RequirePackage{l3keys2e}
 \RequirePackage{etoolbox}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesExplClass
   {nwejmart}
-  {2022-09-21}
-  {1.0.5}
+  {2024-02-08}
+  {1.0.6}
   {
     Class for the journal "North-Western European Journal of Mathematics".
   }
@@ -83,6 +81,7 @@
    `\string\inputarticle\string{\c_sys_jobname_str\string}'~ and~ the~ resulting~
    `\c__nwejm_main_file_name_tl.pdf'~ actually~ contains~ the~ content~ of~ the~
    current~ article.}%
+\int_new:N \l__nwejm_first_page_number_int%
 \bool_new:N \g__nwejm_language_specified_bool
 \cs_new_protected:Nn \__nwejm_language:n
 {
@@ -135,7 +134,7 @@
     \bool_gset_true:N \g__nwejm_nolocaltoc_bool
   },%
 }%
-\ProcessKeysOptions { nwejm }
+\ProcessKeyOptions [nwejm]
 \LoadClass { book }
 \PassOptionsToPackage{export}{adjustbox}%
 \PassOptionsToPackage{fleqn}{amsmath}%
@@ -144,12 +143,13 @@
   \__nwejm_language:n {english}
 }
 \RequirePackage[l2tabu,orthodox]{nag}
+\RequirePackage{mathtools}
 \sys_if_engine_pdftex:TF
 {
   \RequirePackage[T1]{fontenc}
   \RequirePackage[noDcommand]{kpfonts}
 }{
-  \RequirePackage{unicode-math}
+  \RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
   \RequirePackage[noDcommand]{kpfonts-otf}
   \setmonofont[Scale = MatchLowercase]{Latin Modern Mono}
 }
@@ -168,7 +168,6 @@
 \RequirePackage[autostyle]{csquotes}%
 \RequirePackage{array}
 \RequirePackage{booktabs}
-\RequirePackage{mathtools}
 \RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
 \RequirePackage{esvect}
 \RequirePackage{geometry}
@@ -176,6 +175,7 @@
 \RequirePackage{currfile}
 \RequirePackage{fmtcount}%
 \RequirePackage{babel}%
+\RequirePackage{listings}%
 \RequirePackage{varioref}
 \RequirePackage{subcaption}
 \RequirePackage{tocvsec2}
@@ -634,11 +634,11 @@
 \file_if_exist:nTF { \c__nwejm_main_file_name_tl.aux }
 {
    \externaldocument[__nwejm-]{\c__nwejm_main_file_name_tl}
-   \cs_generate_variant:Nn \int_set:Nn { Nx }
-   \int_set:Nx \l_tmpa_int {\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}
-   \int_compare:nNnTF {\l_tmpa_int} > {0}
+   \cs_generate_variant:Nn \int_set:Nn { Ne }
+   \int_set:Ne \l__nwejm_first_page_number_int {\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}
+   \int_compare:nNnTF {\l__nwejm_first_page_number_int} > {0}
    {
-     \AddToHook{begindocument/end}{\setcounter{page}{\l_tmpa_int}}
+     \AddToHook{begindocument/end}{\setcounter{page}{\l__nwejm_first_page_number_int}}
    }{
      \msg_error:nn{nwejmart}{Something~wrong~with~page~numbers}
    }
@@ -2487,7 +2487,7 @@
 }
 \ExplSyntaxOff
 %% 
-%% Copyright (C) 2015-2022 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2024 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either