summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/nwejm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-29 22:39:29 +0000
committerKarl Berry <karl@freefriends.org>2020-01-29 22:39:29 +0000
commit917f764bece8b19f3a434616b9826d23962bcb2d (patch)
treed6cde656094b0a655599e1d5be9c49d9c9291d57 /Master/texmf-dist/tex/latex/nwejm
parent545710eeb010f4584dbd96f9905fe948e58cf744 (diff)
nwejm (29jan20)
git-svn-id: svn://tug.org/texlive/trunk@53597 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/nwejm')
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.cls158
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejm.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejmart.cls87
6 files changed, 143 insertions, 110 deletions
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx
index 3bf9f125f10..6866f29678f 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-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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 431ce78aa79..13a85c8771e 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-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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 5e1af9fd9fd..8c0323329b6 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cls
@@ -18,8 +18,8 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesExplClass
{nwejm}
- {2019/03/18}
- {0.98f}
+ {2020-01-28}
+ {1.0.0}
{
Class for the journal "North-Western European Journal of Mathematics".
}
@@ -138,13 +138,25 @@
\RequirePackage{graphicx}%
\RequirePackage{adjustbox}%
\RequirePackage{xr}
-\RequirePackage{currfile}
\RequirePackage[multiple]{footmisc}%
\RequirePackage{marginnote}%
\RequirePackage{refcount}%
\RequirePackage{xcolor}%
\RequirePackage{afterpage}%
\RequirePackage{ifoddpage}%
+\RequirePackage{placeins}%
+\RequirePackage{xspace}%
+\RequirePackage[autostyle]{csquotes}%
+\RequirePackage{array}
+\RequirePackage{booktabs}
+\RequirePackage{mathtools}
+\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
+\RequirePackage{rsfso}
+\RequirePackage{esvect}
+\RequirePackage[easyscsl,noDcommand]{kpfonts}
+\RequirePackage{geometry}
+\RequirePackage{translations}%
+\RequirePackage{currfile}
\RequirePackage{import}%
\bool_if:nT { \g__nwejm_for_authors_bool } {
\RequirePackage{draftwatermark}[2006/06/30]%
@@ -180,18 +192,6 @@
\RequirePackage[group=false,subpreambles,sort]{standalone}%
}
\RequirePackage{datatool}%
-\RequirePackage{placeins}%
-\RequirePackage{xspace}%
-\RequirePackage[autostyle]{csquotes}%
-\RequirePackage{array}
-\RequirePackage{booktabs}
-\RequirePackage{mathtools}
-\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
-\RequirePackage{rsfso}
-\RequirePackage{esvect}
-\RequirePackage[easyscsl,noDcommand]{kpfonts}
-\RequirePackage{geometry}
-\RequirePackage{translations}%
\RequirePackage{fmtcount}%
\RequirePackage{babel}%
\RequirePackage{varioref}
@@ -237,6 +237,8 @@
\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_graphicdesign_string_tl {Graphic~design}
+\tl_const:Nn \c__nwejm_publication_director_string_tl {Directeur~de~la~publication}
+\tl_const:Nn \c__nwejm_composed_by_string_tl {Composition}
\tl_const:Nn \c__nwejm_configuration_file_string_tl {nwejm.cfg}
\bool_if:NT {\g__nwejm_cover_bool} {
\tl_const:Nn \c__nwejm_frontcover_left_string_tl {
@@ -645,7 +647,7 @@
\bfseries%
\adjustbox{stack=l}{%
\c__nwejm_journal_title_string_tl
- \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g__nwejm_issue_number_int
+ \\\text_titlecase:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g__nwejm_issue_number_int
}
}
\hbox_set:Nn \l__nwejm_journal_logo_box
@@ -940,11 +942,15 @@
\medskip%
}
}{
- \__nwejm_citeauthor_no_giveninits:n {\c__nwejm_issue_bib_key_tl -#1-
- \exp_not:V\DTLcurrentindex}%
- \tl_if_empty:NF \l__nwejm_people_email_tl
- {
- \c_space_tl(\__nwejm_email:n {\l__nwejm_people_email_tl})
+ \tl_if_in:NnTF \l__nwejm_people_role_tl { publicationdirector } {
+ \__nwejm_citeauthor_no_giveninits:n {\c__nwejm_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex},~
+ \l__nwejm_people_affiliation_tl%
+ }{
+ \__nwejm_citeauthor_no_giveninits:n {\c__nwejm_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex}%
+ \tl_if_empty:NF \l__nwejm_people_email_tl
+ {
+ \c_space_tl(\__nwejm_email:n {\l__nwejm_people_email_tl})
+ }
}
}
}
@@ -1170,6 +1176,20 @@
\__nwejm_display_people_by_role:n { graphicdesign }
\end{description}
\g__nwejm_font_designer_text_tl
+ \par
+ \vspace*{\stretch{1}}
+ \selectlanguage{french}
+ \shorthandon{;:!?}
+ \begin{description}
+ \item[\c__nwejm_publication_director_string_tl{}~:]
+ \__nwejm_display_people_by_role:n { publicationdirector }
+ \item[\c__nwejm_composed_by_string_tl{}~:]
+ \__nwejm_display_people_by_role:n { composer }
+ \end{description}
+ \DTMlangsetup*{showdayofmonth=false}
+ \centering
+ \g__nwejm_masthead_tl
+ \selectlanguage{english}
\bool_gset_false:N \g__nwejm_inside_backcover_bool
}
\tl_new:N \g__nwejm_short_toc_tl%
@@ -1260,7 +1280,7 @@
\tl_if_empty:NF {#2}
{
\tl_if_eq:NNF {\c__nwejm_date_received_tl} {#1} { \c__nwejm_dates_separator_tl }
- \tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
+ \text_titlecase:n { \exp_args:No \GetTranslation{#1} }
\c__nwejm_colon_tl\c_space_tl
\DTMdate{#2}%
}
@@ -1291,7 +1311,7 @@
\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 {
+\str_if_eq:eeTF \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!}
}
@@ -1353,6 +1373,14 @@
{
\__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{secretary}
}
+\NewDocumentCommand \publicationdirector {mmmm}
+{
+ \__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{publicationdirector}
+}
+\NewDocumentCommand \composer {mmmm}
+{
+ \__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{composer}
+}
\NewDocumentCommand \issuesetup { m } {
\keys_set:nn { nwejm/issuesetup } {#1}
\int_compare:nNnT {\g__nwejm_issue_number_int}<{1}
@@ -1418,6 +1446,13 @@
\tl_gset:Nn \g__nwejm_authors_instructions_tl {#1}
}
}
+\tl_new:N \g__nwejm_masthead_tl
+\NewDocumentCommand \masthead { +m } {
+ \IfNoValueF {#1}
+ {
+ \tl_gset:Nn \g__nwejm_masthead_tl {#1}
+ }
+}
\vref@addto\extrasfrench{%
\def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}%
\def\reftextfacebefore{page~\reftextvario{ci-contre}%
@@ -1496,11 +1531,11 @@
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{#1}
}
}{%
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{plural-#1}
}
}
@@ -1610,7 +1645,7 @@
\clist_map_inline:Nn \g__nwejm_counters_to_be_reset_clist {
\@ifundefined{c@##1}{
}{
- \setcounter{##1}{\c_zero}
+ \setcounter{##1}{\c_zero_int}
}
}
\glsresetall
@@ -1871,7 +1906,7 @@
\noindent
{
\bfseries
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-keyword}
\c__nwejm_colon_tl
}
@@ -2044,22 +2079,22 @@
\int_set:Nn \l__nwejm_abs_int {\int_abs:n {#1}}
\ifcurrentbaselanguage{english}{
\int_use:N \l__nwejm_abs_int
- \int_set:Nn \l_tmpa_int {\int_mod:nn {\l__nwejm_abs_int} {\c_one_hundred}}
+ \int_set:Nn \l_tmpa_int {\int_mod:nn {\l__nwejm_abs_int} { 100 }}
\int_case:nnF
{ \l_tmpa_int }
{
- { \c_eleven } { \fmtord{th} }
- { \c_twelve } { \fmtord{th} }
- { \c_thirteen } { \fmtord{th} }
+ { 11 } { \fmtord{th} }
+ { 12 } { \fmtord{th} }
+ { 13 } { \fmtord{th} }
}{
- \int_set:Nn \l_tmpb_int {\int_mod:nn {\l__nwejm_abs_int} {\c_ten}}
+ \int_set:Nn \l_tmpb_int {\int_mod:nn {\l__nwejm_abs_int} { 10 }}
\int_case:nnF
{ \l_tmpb_int }
{
- { \c_zero } { \fmtord{th} }
- { \c_one } { \fmtord{st} }
- { \c_two } { \fmtord{nd} }
- { \c_three } { \fmtord{rd} }
+ { 0 } { \fmtord{th} }
+ { 1 } { \fmtord{st} }
+ { 2 } { \fmtord{nd} }
+ { 3 } { \fmtord{rd} }
}{
\fmtord{th}
}
@@ -2196,42 +2231,41 @@
{
\IfTranslation{English}{#1}{%
}{%
- \DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
+ \DeclareTranslation{English}{#1}{\text_titlecase:n{#2}}%
}
\IfTranslation{French}{#1}{%
}{%
- \DeclareTranslation{French}{#1}{\tl_mixed_case:n{#3}}%
+ \DeclareTranslation{French}{#1}{\text_titlecase:n{#3}}%
}
\IfTranslation{German}{#1}{%
}{%
- \DeclareTranslation{German}{#1}{\tl_mixed_case:n{#4}}%
+ \DeclareTranslation{German}{#1}{\text_titlecase:n{#4}}%
}
\IfTranslation{Dutch}{#1}{%
}{%
- \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
+ \DeclareTranslation{Dutch}{#1}{\text_titlecase:n{#5}}%
}
%
\IfTranslation{English}{#1-plural}{%
}{%
- \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}%
+ \DeclareTranslation{English}{#1-plural}{\text_titlecase:n{#6}}%
}
\IfTranslation{French}{#1-plural}{%
}{%
- \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}%
+ \DeclareTranslation{French}{#1-plural}{\text_titlecase:n{#7}}%
}
\IfTranslation{German}{#1-plural}{%
}{%
- \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}%
+ \DeclareTranslation{German}{#1-plural}{\text_titlecase:n{#8}}%
}
\IfTranslation{Dutch}{#1-plural}{%
}{%
- \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}%
+ \DeclareTranslation{Dutch}{#1-plural}{\text_titlecase:n{#9}}%
}
- \__nwejm_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \__nwejm_orig_newtheorem{#1}{\text_titlecase:n{ \GetTranslation{#1} }}
\bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\text_titlecase:n{ \GetTranslation{#1} }}
}
-
}
\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV }
\RenewDocumentCommand \newtheorem { O{} m }
@@ -2366,11 +2400,11 @@
\clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
}
\ifcurrentbaselanguage{french}{%
- \crefname{#2}{\tl_lower_case:n{ \GetTranslation{#2} }}{\tl_lower_case:n{ \GetTranslation{#2-plural} }}
+ \crefname{#2}{\text_lowercase:n{ \GetTranslation{#2} }}{\text_lowercase:n{ \GetTranslation{#2-plural} }}
}{%
\crefname{#2}{\GetTranslation{#2}}{\GetTranslation{#2-plural}}
}
- \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }}
+ \Crefname{#2}{\text_titlecase:n{ \GetTranslation{#2} }}{\text_titlecase:n{ \GetTranslation{#2-plural} }}
}
\newtheorem{theorem}
\newtheorem{corollary}
@@ -2424,20 +2458,20 @@
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
\Crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -2457,12 +2491,12 @@
\normalfont
(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$\c_math_subscript_token\mathsf{\arabic*}$),
ref=(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$_\mathsf{\arabic*}$
)
@@ -2473,11 +2507,11 @@
\GetTranslation{plural-#1}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -2515,7 +2549,7 @@
}
\tl_if_empty:cT {l__nwejm_newenumeration_#2_label_tl} {
\tl_set:cV {l__nwejm_newenumeration_#2_label_tl} {
- \tl_upper_case:n {
+ \text_uppercase:n {
\tl_head:f {
\tl_use:c {l__nwejm_newenumeration_#2_singular_tl}
}
@@ -2549,11 +2583,11 @@
\tl_use:c {l__nwejm_newenumeration_#1_plural_tl}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l__nwejm_newenumeration_#1_singular_tl}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l__nwejm_newenumeration_#1_plural_tl}
}
}
@@ -3264,7 +3298,7 @@
\expandafter\def\expandafter\pdfstringdefPreHook
\expandafter{%
\pdfstringdefPreHook
- \renewcommand{\acrshort}[1]{\tl_upper_case:n {\glsentryshort{##1}}}%
+ \renewcommand{\acrshort}[1]{\text_uppercase:n {\glsentryshort{##1}}}%
}
\@ifpackageloaded{draftwatermark}{%
\SetWatermarkColor{gray!10}%
@@ -3330,7 +3364,7 @@
}
\ExplSyntaxOff
%%
-%% Copyright (C) 2015-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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 607ec309228..6ad76a5683b 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-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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 2650a70dee5..5c60fe65557 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-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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 509a7234fce..0f0091be478 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
@@ -18,8 +18,8 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesExplClass
{nwejmart}
- {2019/03/18}
- {0.98f}
+ {2020-01-28}
+ {1.0.0}
{
Class for the journal "North-Western European Journal of Mathematics".
}
@@ -150,7 +150,6 @@
\RequirePackage{graphicx}%
\RequirePackage{adjustbox}%
\RequirePackage{xr}
-\RequirePackage{currfile}
\RequirePackage[multiple]{footmisc}%
\RequirePackage{marginnote}%
\RequirePackage{refcount}%
@@ -169,6 +168,7 @@
\RequirePackage[easyscsl,noDcommand]{kpfonts}
\RequirePackage{geometry}
\RequirePackage{translations}%
+\RequirePackage{currfile}
\RequirePackage{fmtcount}%
\RequirePackage{babel}%
\RequirePackage{varioref}
@@ -582,7 +582,7 @@
\tl_if_empty:NF {#2}
{
\tl_if_eq:NNF {\c__nwejm_date_received_tl} {#1} { \c__nwejm_dates_separator_tl }
- \tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
+ \text_titlecase:n { \exp_args:No \GetTranslation{#1} }
\c__nwejm_colon_tl\c_space_tl
\DTMdate{#2}%
}
@@ -705,11 +705,11 @@
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{#1}
}
}{%
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{plural-#1}
}
}
@@ -816,7 +816,7 @@
\clist_map_inline:Nn \g__nwejm_counters_to_be_reset_clist {
\@ifundefined{c@##1}{
}{
- \setcounter{##1}{\c_zero}
+ \setcounter{##1}{\c_zero_int}
}
}
\glsresetall
@@ -1076,7 +1076,7 @@
\noindent
{
\bfseries
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-keyword}
\c__nwejm_colon_tl
}
@@ -1251,22 +1251,22 @@
\int_set:Nn \l__nwejm_abs_int {\int_abs:n {#1}}
\ifcurrentbaselanguage{english}{
\int_use:N \l__nwejm_abs_int
- \int_set:Nn \l_tmpa_int {\int_mod:nn {\l__nwejm_abs_int} {\c_one_hundred}}
+ \int_set:Nn \l_tmpa_int {\int_mod:nn {\l__nwejm_abs_int} { 100 }}
\int_case:nnF
{ \l_tmpa_int }
{
- { \c_eleven } { \fmtord{th} }
- { \c_twelve } { \fmtord{th} }
- { \c_thirteen } { \fmtord{th} }
+ { 11 } { \fmtord{th} }
+ { 12 } { \fmtord{th} }
+ { 13 } { \fmtord{th} }
}{
- \int_set:Nn \l_tmpb_int {\int_mod:nn {\l__nwejm_abs_int} {\c_ten}}
+ \int_set:Nn \l_tmpb_int {\int_mod:nn {\l__nwejm_abs_int} { 10 }}
\int_case:nnF
{ \l_tmpb_int }
{
- { \c_zero } { \fmtord{th} }
- { \c_one } { \fmtord{st} }
- { \c_two } { \fmtord{nd} }
- { \c_three } { \fmtord{rd} }
+ { 0 } { \fmtord{th} }
+ { 1 } { \fmtord{st} }
+ { 2 } { \fmtord{nd} }
+ { 3 } { \fmtord{rd} }
}{
\fmtord{th}
}
@@ -1403,42 +1403,41 @@
{
\IfTranslation{English}{#1}{%
}{%
- \DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
+ \DeclareTranslation{English}{#1}{\text_titlecase:n{#2}}%
}
\IfTranslation{French}{#1}{%
}{%
- \DeclareTranslation{French}{#1}{\tl_mixed_case:n{#3}}%
+ \DeclareTranslation{French}{#1}{\text_titlecase:n{#3}}%
}
\IfTranslation{German}{#1}{%
}{%
- \DeclareTranslation{German}{#1}{\tl_mixed_case:n{#4}}%
+ \DeclareTranslation{German}{#1}{\text_titlecase:n{#4}}%
}
\IfTranslation{Dutch}{#1}{%
}{%
- \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
+ \DeclareTranslation{Dutch}{#1}{\text_titlecase:n{#5}}%
}
%
\IfTranslation{English}{#1-plural}{%
}{%
- \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}%
+ \DeclareTranslation{English}{#1-plural}{\text_titlecase:n{#6}}%
}
\IfTranslation{French}{#1-plural}{%
}{%
- \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}%
+ \DeclareTranslation{French}{#1-plural}{\text_titlecase:n{#7}}%
}
\IfTranslation{German}{#1-plural}{%
}{%
- \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}%
+ \DeclareTranslation{German}{#1-plural}{\text_titlecase:n{#8}}%
}
\IfTranslation{Dutch}{#1-plural}{%
}{%
- \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}%
+ \DeclareTranslation{Dutch}{#1-plural}{\text_titlecase:n{#9}}%
}
- \__nwejm_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \__nwejm_orig_newtheorem{#1}{\text_titlecase:n{ \GetTranslation{#1} }}
\bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\text_titlecase:n{ \GetTranslation{#1} }}
}
-
}
\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV }
\RenewDocumentCommand \newtheorem { O{} m }
@@ -1573,11 +1572,11 @@
\clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
}
\ifcurrentbaselanguage{french}{%
- \crefname{#2}{\tl_lower_case:n{ \GetTranslation{#2} }}{\tl_lower_case:n{ \GetTranslation{#2-plural} }}
+ \crefname{#2}{\text_lowercase:n{ \GetTranslation{#2} }}{\text_lowercase:n{ \GetTranslation{#2-plural} }}
}{%
\crefname{#2}{\GetTranslation{#2}}{\GetTranslation{#2-plural}}
}
- \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }}
+ \Crefname{#2}{\text_titlecase:n{ \GetTranslation{#2} }}{\text_titlecase:n{ \GetTranslation{#2-plural} }}
}
\newtheorem{theorem}
\newtheorem{corollary}
@@ -1631,20 +1630,20 @@
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
\Crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -1664,12 +1663,12 @@
\normalfont
(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$\c_math_subscript_token\mathsf{\arabic*}$),
ref=(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$_\mathsf{\arabic*}$
)
@@ -1680,11 +1679,11 @@
\GetTranslation{plural-#1}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -1722,7 +1721,7 @@
}
\tl_if_empty:cT {l__nwejm_newenumeration_#2_label_tl} {
\tl_set:cV {l__nwejm_newenumeration_#2_label_tl} {
- \tl_upper_case:n {
+ \text_uppercase:n {
\tl_head:f {
\tl_use:c {l__nwejm_newenumeration_#2_singular_tl}
}
@@ -1756,11 +1755,11 @@
\tl_use:c {l__nwejm_newenumeration_#1_plural_tl}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l__nwejm_newenumeration_#1_singular_tl}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l__nwejm_newenumeration_#1_plural_tl}
}
}
@@ -2461,7 +2460,7 @@
\__nwejm_printbibliography[heading=__nwejm_subbibliography,resetnumbers,#1]
\bool_if:NF \g__nwejm_nolocaltoc_bool {
\newpage
- \setcounter{page}{\c_zero}
+ \setcounter{page}{\c_zero_int}
\pagenumbering{roman}%
\etocarticlestylenomarks
\etocsetlevel{chapter}{6}
@@ -2479,7 +2478,7 @@
\expandafter\def\expandafter\pdfstringdefPreHook
\expandafter{%
\pdfstringdefPreHook
- \renewcommand{\acrshort}[1]{\tl_upper_case:n {\glsentryshort{##1}}}%
+ \renewcommand{\acrshort}[1]{\text_uppercase:n {\glsentryshort{##1}}}%
}
\@ifpackageloaded{draftwatermark}{%
\SetWatermarkColor{gray!10}%
@@ -2534,7 +2533,7 @@
}
\ExplSyntaxOff
%%
-%% Copyright (C) 2015-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+%% Copyright (C) 2015-2020 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