From fdcf5fd90a27314abf7b130fd1e7a7bba0a3fa6a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 18 Mar 2019 21:15:59 +0000 Subject: nwejm (18mar19) git-svn-id: svn://tug.org/texlive/trunk@50447 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/nwejm/README.md | 2 +- .../doc/latex/nwejm/examples/article-in-dutch.pdf | Bin 188169 -> 188075 bytes .../latex/nwejm/examples/article-in-english.pdf | Bin 183993 -> 183751 bytes .../doc/latex/nwejm/examples/article-in-french.pdf | Bin 238973 -> 239260 bytes .../doc/latex/nwejm/examples/article-in-german.pdf | Bin 189411 -> 189437 bytes .../texmf-dist/doc/latex/nwejm/examples/issue.pdf | Bin 381764 -> 382128 bytes .../texmf-dist/doc/latex/nwejm/examples/sample.pdf | Bin 182211 -> 182364 bytes .../latex/nwejm/french/documentation/kpfonts.sty | 1678 -------------------- .../latex/nwejm/french/documentation/nwejm-fr.bib | 8 +- .../latex/nwejm/french/documentation/nwejm-fr.pdf | Bin 534939 -> 568729 bytes .../latex/nwejm/french/documentation/nwejm-fr.tex | 447 ++++-- Master/texmf-dist/source/latex/nwejm/nwejm.dtx | 475 +++++- Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl | 2 + .../texmf-dist/tex/latex/nwejm/nwejm-english.trsl | 2 + .../texmf-dist/tex/latex/nwejm/nwejm-french.trsl | 2 + .../texmf-dist/tex/latex/nwejm/nwejm-german.trsl | 2 + Master/texmf-dist/tex/latex/nwejm/nwejm.bbx | 6 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cbx | 55 +- Master/texmf-dist/tex/latex/nwejm/nwejm.cls | 308 +++- Master/texmf-dist/tex/latex/nwejm/nwejm.dbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejm.lbx | 2 +- Master/texmf-dist/tex/latex/nwejm/nwejmart.cls | 295 +++- 22 files changed, 1309 insertions(+), 1977 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty diff --git a/Master/texmf-dist/doc/latex/nwejm/README.md b/Master/texmf-dist/doc/latex/nwejm/README.md index f728b287408..9898194051e 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 ------- -2018/04/07 v0.98e +2019/03/18 v0.98f Development ----------- 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 51c35acd0f4..ea1377925e0 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-dutch.pdf differ 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 af882fb4a8b..f22973941b9 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-english.pdf differ 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 3b31806dcf5..a333ca930b6 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-french.pdf differ 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 373d29e2353..9f226a86f4c 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/article-in-german.pdf differ diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf index 647fb89b7de..9ed713d94af 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/issue.pdf differ diff --git a/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf b/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf index fc89bf0836a..98ab36d4256 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf and b/Master/texmf-dist/doc/latex/nwejm/examples/sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty b/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty deleted file mode 100644 index 2e81411b34d..00000000000 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/kpfonts.sty +++ /dev/null @@ -1,1678 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -% -\ProvidesPackage{kpfonts} - [2010/08/20 v3.31] - -\newif\ifkp@math \kp@mathtrue -\newif\ifkp@text \kp@texttrue -\newif\ifkp@sf \kp@sftrue -\newif\ifkp@tt \kp@tttrue -\newif\ifkp@upgrk -\newif\ifkp@slGrk -\newif\ifkp@upRm -\newif\ifkp@mathscr \kp@mathscrtrue -\newif\ifkp@calasscr -\newif\ifkp@oldReIm -\newif\ifkp@osn -\newif\ifkp@osnm -\newif\ifkp@os -\newif\ifkp@osm -\newif\ifkp@vos -\newif\ifkp@vosm -\newif\ifkp@lighttext -\newif\ifkp@lightmath -\newif\ifkp@rmx -\newif\ifkp@warning \kp@warningtrue -\newif\ifkp@amsmath \kp@amsmathtrue -\newif\ifkp@textcomp \kp@textcomptrue -\newif\ifkp@narrowiints -\newif\ifkp@partialup -\newif\ifkp@largesmallcaps -\newif\ifkp@Dcommand \kp@Dcommandtrue -\newif\ifkp@nofligatures -\newif\ifkp@Qtail -\newif\ifkp@widermath -\newif\ifkp@sfmath -\newif\ifkp@sfmathbb -\newif\ifkp@rmmathbb -\newif\ifkp@easyscsl - -\DeclareOption{nomath} {\kp@mathfalse} -\DeclareOption{notext} {\kp@textfalse} -\DeclareOption{nosf} {\kp@sffalse} -\DeclareOption{nott} {\kp@ttfalse} -\DeclareOption{onlyrm} {\kp@ttfalse\kp@sffalse} -\DeclareOption{uprightgreeks} {\kp@upgrktrue} -\DeclareOption{slantedGreeks} {\kp@slGrktrue} -\DeclareOption{uprightRoman} {\kp@upRmtrue} -\DeclareOption{upright} {\kp@upRmtrue\kp@upgrktrue} -\DeclareOption{frenchstyle} {\kp@upRmtrue\kp@upgrktrue} -\DeclareOption{nomathscript} {\kp@mathscrfalse} -\DeclareOption{mathcalasscript} {\kp@calasscrtrue} -\DeclareOption{classicReIm} {\kp@oldReImtrue} -\DeclareOption{oldstylenums} {\kp@osntrue} -\DeclareOption{oldstyle} {\kp@ostrue\kp@Qtailtrue} -\DeclareOption{oldstylemath} {\kp@osmtrue} -\DeclareOption{oldstylenumsmath} {\kp@osnmtrue} -\DeclareOption{fulloldstylenums} {\kp@osntrue\kp@osnmtrue} -\DeclareOption{fulloldstyle} {\kp@ostrue\kp@osmtrue\kp@Qtailtrue} -\DeclareOption{veryoldstyle} {\kp@vostrue\kp@Qtailtrue} -\DeclareOption{veryoldstylemath} {\kp@vosmtrue} -\DeclareOption{fullveryoldstyle} {\kp@vostrue\kp@vosmtrue\kp@Qtailtrue} -\DeclareOption{light} {\kp@lighttexttrue\kp@lightmathtrue} -\DeclareOption{lighttext} {\kp@lighttexttrue} -\DeclareOption{lightmath} {\kp@lightmathtrue} -\DeclareOption{rmx} {\kp@rmxtrue} -\DeclareOption{nowarning} {\kp@warningfalse} -\DeclareOption{noamsmath} {\kp@amsmathfalse} -\DeclareOption{notextcomp} {\kp@textcompfalse} -\DeclareOption{narrowiints} {\kp@narrowiintstrue} -\DeclareOption{partialup} {\kp@partialuptrue} -\DeclareOption{largesmallcaps} {\kp@largesmallcapstrue} -\DeclareOption{easyscsl} {\kp@easyscsltrue} -\DeclareOption{noDcommand} {\kp@Dcommandfalse} -\DeclareOption{nofligatures} {\kp@nofligaturestrue} -\DeclareOption{widermath} {\kp@widermathtrue} -\DeclareOption{sfmath} {\kp@sfmathtrue} -\DeclareOption{sfmathbb} {\kp@sfmathbbtrue} -\DeclareOption{rmmathbb} {\kp@rmmathbbtrue} -\DeclareOption{intlimits} {\let\kp@ilimits\displaylimits} -\DeclareOption{fullintlimits} {\let\kp@ilimits\limits} -\DeclareOption{nointlimits} {\let\kp@ilimits\nolimits} -\DeclareOption{sumlimits} {\let\kp@slimits\displaylimits} -\DeclareOption{fullsumlimits} {\let\kp@slimits\limits} -\DeclareOption{nosumlimits} {\let\kp@slimits\nolimits} -\DeclareOption{namelimits} {\PassOptionsToPackage{namelimits}{amsmath}} -\DeclareOption{nonamelimits} {\PassOptionsToPackage{nonamelimits}{amsmath}} -\DeclareOption{leqno} {\PassOptionsToPackage{leqno}{amsmath}} -\DeclareOption{reqno} {\PassOptionsToPackage{reqno}{amsmath}} -\DeclareOption{centertags} {\PassOptionsToPackage{centertags}{amsmath}} -\DeclareOption{tbtags} {\PassOptionsToPackage{tbtags}{amsmath}} -\ExecuteOptions{nointlimits,sumlimits} -\ProcessOptions\relax - -\ifkp@text\ifkp@textcomp\RequirePackage[full]{textcomp}\fi\fi -\ifkp@math\ifkp@amsmath\RequirePackage{amsmath}\fi\fi -\ifkp@text\ifkp@easyscsl\RequirePackage{ifthen}\fi\fi - -\renewcommand{\bfdefault}{b} - -%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Stupid oldstyle options % -%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ifkp@osn\ifkp@os\kp@osnfalse\fi\fi -\ifkp@osn\ifkp@vos\kp@osnfalse\fi\fi -\ifkp@os\ifkp@vos\kp@osfalse\fi\fi -\ifkp@os\ifkp@nofligatures\kp@nofligaturesfalse\fi\fi -\ifkp@vos\ifkp@nofligatures\kp@nofligaturesfalse\fi\fi - -\ifkp@osnm\ifkp@osm\kp@osnmfalse\fi\fi -\ifkp@osnm\ifkp@vosm\kp@osnmfalse\fi\fi -\ifkp@osm\ifkp@vosm\kp@osmfalse\fi\fi - -\ifkp@math\else\kp@osnmfalse\kp@osmfalse\kp@vosmfalse\fi -\ifkp@text\else\kp@osnfalse\kp@osfalse\kp@vosfalse\fi - -%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Stupid \mathbb options % -%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ifkp@sfmathbb\ifkp@rmmathbb - \kp@sfmathbbfalse\kp@rmmathbbfalse - \PackageError{kpfonts}% - {'sfmathbb' and 'rmmathbb' options are incompatible and ignored} -\fi\fi - -%%%%%%%% -% Text % -%%%%%%%% - -\ifkp@text - \ifkp@warning - \ifkp@os -%%% To prevent this warning, use the 'nowarning' option %%% - \PackageWarning{kpfonts}% - {With 'oldstyle' or 'fulloldstyle' option and T1 encoding,\MessageBreak - 'Thorn' and 'thorn' are unavailable.} -%%% To prevent this warning, use the 'nowarning' option %%% - \fi % end os - \ifkp@vos -%%% To prevent this warning, use the 'nowarning' option %%% - \PackageWarning{kpfonts}% - {With 'veryoldstyle' or 'fullveryoldstyle' option and T1 encoding,\MessageBreak - 'Ng', 'Thorn', 'thorn' and 'eth' are unavailable.} -%%% To prevent this warning, use the 'nowarning' option %%% - \fi % end vos - \ifkp@easyscsl -%%% To prevent this warning, use the 'nowarning' option %%% - \PackageWarning{kpfonts}% - {With 'easyscsl' option, don't fit together\MessageBreak - \textsl or \slshape and \textsc or \scshape\MessageBreak - with non 'kpfonts' fonts.} -%%% To prevent this warning, use the 'nowarning' option %%% - \fi % end vos - \fi % end warning -% -%%% easyscsl, courtesy from François Pétiard -% - \ifkp@easyscsl - \renewcommand{\itshape}{\not@math@alphabet\itshape\mathit% - \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% - \fontshape\itdefault}\selectfont} - \renewcommand{\scshape}{\not@math@alphabet\scshape\relax% - \ifthenelse{\equal{\f@shape}{\sldefault}}{\fontshape{scsl}}{% - \ifthenelse{\equal{\f@shape}{\itdefault}}{\fontshape{scsl}}{\fontshape\scdefault}}\selectfont} - \renewcommand{\slshape}{\not@math@alphabet\slshape\relax% - \ifthenelse{\equal{\f@shape}{\scdefault}}{\fontshape{scsl}}{% - \fontshape\sldefault}\selectfont} - \fi -% -%%% famille, petitesmajuscules, style, f-ligatures and Q tail -% - \ifkp@rmx\def\kp@famille{x} - \else - \ifkp@lighttext\def\kp@famille{l} - \else\def\kp@famille{} - \fi\fi - \ifkp@vos\def\kp@style{vos} - \else\ifkp@os\def\kp@style{os} - \else\ifkp@osn\def\kp@style{osn} - \else\def\kp@style{} - \fi\fi\fi - \ifkp@largesmallcaps\def\kp@petitesmajuscules{k}\def\kp@othersc{} - \else\def\kp@petitesmajuscules{}\def\kp@othersc{k} - \fi - \ifkp@nofligatures\def\kp@flig{f} - \else\def\kp@flig{} - \fi - \ifkp@Qtail\def\kp@othertail{} - \else\def\kp@othertail{os} - \fi - \ifkp@vos\def\kp@otherctst{} - \else\ifkp@os\def\kp@otherctst{} - \else\def\kp@otherctst{os} - \fi\fi -% -%%% start rm -% - \renewcommand{\rmdefault}{jkp\kp@famille\kp@petitesmajuscules\kp@flig\kp@style} -% -%%% start sf -% - \ifkp@sf - \renewcommand{\sfdefault}{jkpss\kp@petitesmajuscules\kp@flig\kp@style} - \fi -% -%%% start tt -% - \ifkp@tt - \renewcommand{\ttdefault}{jkptt\kp@style} - \fi -% -%%% New slanted small-caps shape -% - \newcommand{\textscsl}[1]{% - \begingroup% - \fontshape{scsl}\selectfont#1% - \endgroup} - \newcommand{\scslshape}{\fontshape{scsl}\selectfont} -% -%%% Courtesy from Christian Tellechea, package xstring -% -\def\SiFonteContient#1#2{% - \begingroup - \edef\temp@@a{#1}\edef\temp@@a{\detokenize\expandafter{\temp@@a}}% - \edef\temp@@b{#2}\edef\temp@@b{\detokenize\expandafter{\temp@@b}}% - \expandafter\expandafter\expandafter - \endgroup - \expandafter\expandafter\expandafter - \@SiFonteContient - \expandafter\expandafter\expandafter - {\expandafter\temp@@a\expandafter}\expandafter{\temp@@b}} - -\def\@SiFonteContient#1#2#3#4{% - \def\@@SiFonteContient##1#2##2\@nil{\ifx\@empty##2\@empty#4\else#3\fi}% - \@@SiFonteContient#1\@delimit#2\@nil} -% -%%% Other sc, other scsl -% - - \newcommand{\otherscshape}{% - \SiFonteContient{\fontname\the\font}{tt}{}{% - \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp@othersc\kp@flig\kp@style}}{% - \fontfamily{jkp\kp@famille\kp@othersc\kp@flig\kp@style}}}% - \fontshape{sc}\selectfont% - \ifkp@largesmallcaps\kp@largesmallcapsfalse\else\kp@largesmallcapstrue\fi% - \ifkp@largesmallcaps\def\kp@petitesmajuscules{k}\def\kp@othersc{}% - \else\def\kp@petitesmajuscules{}\def\kp@othersc{k}\fi}% - \newcommand{\textothersc}[1]{% - \begingroup% - \otherscshape#1% - \endgroup} - \newcommand{\otherscslshape}{% - \SiFonteContient{\fontname\the\font}{tt}{}{% - \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp@othersc\kp@flig\kp@style}}{% - \fontfamily{jkp\kp@famille\kp@othersc\kp@flig\kp@style}}}% - \fontshape{scsl}\selectfont% - \ifkp@largesmallcaps\kp@largesmallcapsfalse\else\kp@largesmallcapstrue\fi% - \ifkp@largesmallcaps\def\kp@petitesmajuscules{k}\def\kp@othersc{}% - \else\def\kp@petitesmajuscules{}\def\kp@othersc{k}\fi}% - \newcommand{\textotherscsl}[1]{% - \begingroup% - \otherscslshape#1% - \endgroup} -% -%%% Other Q and other smallcap q tails -% - \newcommand{\othertailQ}{% - \begingroup% - \SiFonteContient{\fontname\the\font}{tt}{}{% - \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp@othertail}}{% - \fontfamily{jkp\kp@famille\kp@othertail}}}% - \selectfont{}Q% - \endgroup} -% - \newcommand{\othertailscq}{% - \begingroup% - \SiFonteContient{\fontname\the\font}{tt}{}{% - \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp@petitesmajuscules\kp@othertail}}{% - \fontfamily{jkp\kp@famille\kp@petitesmajuscules\kp@othertail}}}% - \fontshape{sc}\selectfont{}q% - \endgroup} -% - \newcommand{\othertailscslq}{% - \begingroup% - \SiFonteContient{\fontname\the\font}{tt}{}{% - \SiFonteContient{\fontname\the\font}{ss}{\fontfamily{jkpss\kp@petitesmajuscules\kp@othertail}}{% - \fontfamily{jkp\kp@famille\kp@petitesmajuscules\kp@othertail}}}% - \fontshape{scsl}\selectfont{}q% - \endgroup} - -% -\fi % end text -% - - -%%%%%%%% -% Math % -%%%%%%%% - -\ifkp@math - - -% -%%% \kp@famillem \kp@stylem and \kp@widerm -% - - \ifkp@lightmath\def\kp@famillem{l} - \else\def\kp@famillem{} - \fi - - \ifkp@vosm\def\kp@stylem{vos} - \else\ifkp@osm\def\kp@stylem{os} - \else\ifkp@osnm\def\kp@stylem{osn} - \else\def\kp@stylem{} - \fi\fi\fi - \ifkp@nofligatures\def\kp@fligm{f} - \else\def\kp@fligm{} - \fi - - \ifkp@widermath\def\kp@widerm{w} - \else\def\kp@widerm{} - \fi - \ifkp@sfmath\def\kp@widerm{}\fi - -% -%%% \kp@stylemi et \kp@stylemath -% - - \ifkp@vosm\def\kp@stylemi{vos} - \else\def\kp@stylemi{}\fi - - \ifkp@sfmath - \def\kp@stylemath{ss} - \else - \def\kp@stylemath{} - \fi - -% -%%% New math Versions -% - -\DeclareMathVersion{rm} -\DeclareMathVersion{boldrm} -\DeclareMathVersion{sf} -\DeclareMathVersion{boldsf} - -% Roman - - \ifkp@sfmath - \DeclareSymbolFont{operators}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n} - \SetSymbolFont{operators}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \else - \DeclareSymbolFont{operators}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n} - \SetSymbolFont{operators}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \fi - \SetSymbolFont{operators}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n} - \SetSymbolFont{operators}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetSymbolFont{operators}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n} - \SetSymbolFont{operators}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - - \def\operator@font{\mathgroup\symoperators} - - \DeclareMathAlphabet{\mathrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathrm}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathrm}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathrm}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathrm}{sf}{OT1}{jkp\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathrm}{boldsf}{OT1}{jkp\kp@fligm\kp@stylem}{b}{n} - - \DeclareSymbolFontAlphabet{\mathupright}{operators} - \let\mathup\mathupright - - \ifkp@sfmath - \DeclareMathAlphabet{\mathbf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathbf}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \else - \DeclareMathAlphabet{\mathbf}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathbf}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \fi - \SetMathAlphabet{\mathbf}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathbf}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathbf}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathbf}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - - \ifkp@sfmath - \DeclareMathAlphabet{\mathit}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{it} - \SetMathAlphabet{\mathit}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{it} - \else - \DeclareMathAlphabet{\mathit}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{it} - \SetMathAlphabet{\mathit}{bold}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{it} - \fi - \SetMathAlphabet{\mathit}{rm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{m}{it} - \SetMathAlphabet{\mathit}{boldrm}{OT1}{jkp\kp@famillem\kp@fligm\kp@stylem}{b}{it} - \SetMathAlphabet{\mathit}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{it} - \SetMathAlphabet{\mathit}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{it} - - -% Sans Serif - - \DeclareMathAlphabet{\mathsf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathsf}{bold}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathsf}{rm}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathsf}{boldrm}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - \SetMathAlphabet{\mathsf}{sf}{OT1}{jkpss\kp@fligm\kp@stylem}{m}{n} - \SetMathAlphabet{\mathsf}{boldsf}{OT1}{jkpss\kp@fligm\kp@stylem}{b}{n} - -% Typewriter - - \DeclareMathAlphabet{\mathtt}{OT1}{jkptt\kp@stylem}{m}{n} - \SetMathAlphabet{\mathtt}{bold}{OT1}{jkptt\kp@stylem}{b}{n} - \SetMathAlphabet{\mathtt}{rm}{OT1}{jkptt\kp@stylem}{m}{n} - \SetMathAlphabet{\mathtt}{boldrm}{OT1}{jkptt\kp@stylem}{b}{n} - \SetMathAlphabet{\mathtt}{sf}{OT1}{jkptt\kp@stylem}{m}{n} - \SetMathAlphabet{\mathtt}{boldsf}{OT1}{jkptt\kp@stylem}{b}{n} - -% Math Italic - - \ifkp@sfmath - \DeclareSymbolFont{letters}{OML}{jkpss\kp@stylemi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{jkpss\kp@stylemi}{bx}{it} - \else - \DeclareSymbolFont{letters}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{bx}{it} - \fi - \SetSymbolFont{letters}{rm}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it} - \SetSymbolFont{letters}{boldrm}{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{bx}{it} - \SetSymbolFont{letters}{sf}{OML}{jkpss\kp@stylemi}{m}{it} - \SetSymbolFont{letters}{boldsf}{OML}{jkpss\kp@stylemi}{bx}{it} - \DeclareFontSubstitution{OML}{jkp\kp@famillem\kp@stylemi\kp@widerm}{m}{it} - -% Math Italic A - - \ifkp@sfmath - \DeclareSymbolFont{lettersA}{U}{jkpssmia}{m}{it} - \SetSymbolFont{lettersA}{bold}{U}{jkpssmia}{bx}{it} - \else - \DeclareSymbolFont{lettersA}{U}{jkp\kp@famillem mia\kp@widerm}{m}{it} - \SetSymbolFont{lettersA}{bold}{U}{jkp\kp@famillem mia\kp@widerm}{bx}{it} - \fi - \SetSymbolFont{lettersA}{rm}{U}{jkp\kp@famillem mia\kp@widerm}{m}{it} - \SetSymbolFont{lettersA}{boldrm}{U}{jkp\kp@famillem mia\kp@widerm}{bx}{it} - \SetSymbolFont{lettersA}{sf}{U}{jkpssmia}{m}{it} - \SetSymbolFont{lettersA}{boldsf}{U}{jkpssmia}{bx}{it} - \DeclareFontSubstitution{U}{jkp\kp@famillem mia\kp@widerm}{m}{it} - - \DeclareSymbolFontAlphabet{\mathfrak}{lettersA} - - -% Math Symbol - - \ifkp@sfmath - \DeclareSymbolFont{symbols}{OMS}{jkp}{m}{n} - \SetSymbolFont{symbols}{bold}{OMS}{jkp}{bx}{n} - \else - \DeclareSymbolFont{symbols}{OMS}{jkp\kp@famillem\kp@widerm}{m}{n} - \SetSymbolFont{symbols}{bold}{OMS}{jkp\kp@famillem\kp@widerm}{bx}{n} - \fi - \SetSymbolFont{symbols}{rm}{OMS}{jkp\kp@famillem\kp@widerm}{m}{n} - \SetSymbolFont{symbols}{boldrm}{OMS}{jkp\kp@famillem\kp@widerm}{bx}{n} - \SetSymbolFont{symbols}{sf}{OMS}{jkp}{m}{n} - \SetSymbolFont{symbols}{boldsf}{OMS}{jkp}{bx}{n} - \DeclareFontSubstitution{OMS}{jkp\kp@famillem\kp@widerm}{m}{n} - -\ifkp@amsmath{ - \renewcommand{\AmSfont}{% - \usefont{OMS}{jkp\kp@famillem\kp@widerm}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}}}\fi - - \DeclareSymbolFontAlphabet{\symb@ls@lph@}{symbols} - - -% Math Symbols A (AMSa) - - - \DeclareSymbolFont{AMSa}{U}{jkpsya}{m}{n} - \SetSymbolFont{AMSa}{bold}{U}{jkpsya}{bx}{n} - \SetSymbolFont{AMSa}{rm}{U}{jkpsya}{m}{n} - \SetSymbolFont{AMSa}{boldrm}{U}{jkpsya}{bx}{n} - \SetSymbolFont{AMSa}{sf}{U}{jkpsya}{m}{n} - \SetSymbolFont{AMSa}{boldsf}{U}{jkpsya}{bx}{n} - \DeclareFontSubstitution{U}{jkpsya}{m}{n} - - -% Math Symbols B (AMSb) - -\ifkp@rmmathbb - \ifkp@sfmath - \DeclareSymbolFont{AMSb}{U}{jkpsyb}{m}{n}% rmmathbb, sfmath - \SetSymbolFont{AMSb}{bold}{U}{jkpsyb}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n} - \else - \DeclareSymbolFont{AMSb}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}% rmmathbb - \SetSymbolFont{AMSb}{bold}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsyb}{bx}{n} - \fi -\else - \ifkp@sfmathbb - \ifkp@sfmath - \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmathbb, sfmath - \SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n} - \else - \DeclareSymbolFont{AMSb}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n}% sfmathbb - \SetSymbolFont{AMSb}{bold}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkpss\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkpss\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n} - \fi - \else - \ifkp@sfmath - \DeclareSymbolFont{AMSb}{U}{jkpsssyb}{m}{n}% sfmath - \SetSymbolFont{AMSb}{bold}{U}{jkpsssyb}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n} - \else - \DeclareSymbolFont{AMSb}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n}% default - \SetSymbolFont{AMSb}{bold}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{rm}{U}{jkp\kp@famillem syb\kp@widerm}{m}{n} - \SetSymbolFont{AMSb}{boldrm}{U}{jkp\kp@famillem syb\kp@widerm}{bx}{n} - \SetSymbolFont{AMSb}{sf}{U}{jkpsssyb}{m}{n} - \SetSymbolFont{AMSb}{boldsf}{U}{jkpsssyb}{bx}{n} - \fi - \fi -\fi - - \DeclareFontSubstitution{U}{jkp\kp@famillem syb\kp@widerm}{m}{n} - \DeclareSymbolFontAlphabet{\mathbb}{AMSb} - - -% Math Symbols C - - \ifkp@sfmath - \DeclareSymbolFont{symbolsC}{U}{jkpsyc}{m}{n} - \SetSymbolFont{symbolsC}{bold}{U}{jkpsyc}{bx}{n} - \else - \DeclareSymbolFont{symbolsC}{U}{jkp\kp@famillem syc}{m}{n} - \SetSymbolFont{symbolsC}{bold}{U}{jkp\kp@famillem syc}{bx}{n} - \fi - \SetSymbolFont{symbolsC}{rm}{U}{jkp\kp@famillem syc}{m}{n} - \SetSymbolFont{symbolsC}{boldrm}{U}{jkp\kp@famillem syc}{bx}{n} - \SetSymbolFont{symbolsC}{sf}{U}{jkpsyc}{m}{n} - \SetSymbolFont{symbolsC}{boldsf}{U}{jkpsyc}{bx}{n} - \DeclareFontSubstitution{U}{jkp\kp@famillem syc}{m}{n} - - -% Math Symbols D - -\ifkp@calasscr - \let\mathcal\undefined - \ifkp@sfmath - \DeclareMathAlphabet{\mathcal}{U}{jkpsyd}{m}{n} - \SetMathAlphabet{\mathcal}{bold}{U}{jkpsyd}{bx}{n} - \else - \DeclareMathAlphabet{\mathcal}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n} - \SetMathAlphabet{\mathcal}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n} - \fi - \SetMathAlphabet{\mathcal}{rm}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n} - \SetMathAlphabet{\mathcal}{boldrm}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n} - \SetMathAlphabet{\mathcal}{sf}{U}{jkpsyd}{m}{n} - \SetMathAlphabet{\mathcal}{boldsf}{U}{jkpsyd}{bx}{n} - \ifkp@mathscr - \DeclareSymbolFontAlphabet{\mathscr}{symbols} - \fi -\else - \ifkp@mathscr - \ifkp@sfmath - \DeclareMathAlphabet{\mathscr}{U}{jkpsyd}{m}{n} - \SetMathAlphabet{\mathscr}{bold}{U}{jkpsyd}{bx}{n} - \else - \DeclareMathAlphabet{\mathscr}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n} - \SetMathAlphabet{\mathscr}{bold}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n} - \fi - \SetMathAlphabet{\mathscr}{rm}{U}{jkp\kp@famillem syd\kp@widerm}{m}{n} - \SetMathAlphabet{\mathscr}{boldrm}{U}{jkp\kp@famillem syd\kp@widerm}{bx}{n} - \SetMathAlphabet{\mathscr}{sf}{U}{jkpsyd}{m}{n} - \SetMathAlphabet{\mathscr}{boldsf}{U}{jkpsyd}{bx}{n} - \fi -\fi - -% Math Extension - - \ifkp@sfmath - \DeclareSymbolFont{largesymbols}{OMX}{jkpss}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{jkpss}{bx}{n} - \else - \DeclareSymbolFont{largesymbols}{OMX}{jkp\kp@famillem}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{jkp\kp@famillem}{bx}{n} - \fi - \SetSymbolFont{largesymbols}{rm}{OMX}{jkp\kp@famillem}{m}{n} - \SetSymbolFont{largesymbols}{boldrm}{OMX}{jkp\kp@famillem}{bx}{n} - \SetSymbolFont{largesymbols}{sf}{OMX}{jkpss}{m}{n} - \SetSymbolFont{largesymbols}{boldsf}{OMX}{jkpss}{bx}{n} - \DeclareFontSubstitution{OMX}{jkp\kp@famillem}{m}{n} - - -% Math Extension A - - \ifkp@sfmath - \DeclareSymbolFont{largesymbolsA}{U}{jkpexa}{m}{n} - \SetSymbolFont{largesymbolsA}{bold}{U}{jkpexa}{bx}{n} - \else - \DeclareSymbolFont{largesymbolsA}{U}{jkp\kp@famillem exa}{m}{n} - \SetSymbolFont{largesymbolsA}{bold}{U}{jkp\kp@famillem exa}{bx}{n} - \fi - \SetSymbolFont{largesymbolsA}{rm}{U}{jkp\kp@famillem exa}{m}{n} - \SetSymbolFont{largesymbolsA}{boldrm}{U}{jkp\kp@famillem exa}{bx}{n} - \SetSymbolFont{largesymbolsA}{sf}{U}{jkpexa}{m}{n} - \SetSymbolFont{largesymbolsA}{boldsf}{U}{jkpexa}{bx}{n} - \DeclareFontSubstitution{U}{jkp\kp@famillem exa}{m}{n} - - -% Math fonts Sizes and Additional Math Spaces - - -\def\defaultscriptratio{.76} -\def\defaultscriptscriptratio{.6} -\DeclareMathSizes{5} {6} {6} {6} -\DeclareMathSizes{6} {6} {6} {6} -\DeclareMathSizes{7} {6.8} {6} {6} -\DeclareMathSizes{8} {8} {6.8} {6} -\DeclareMathSizes{9} {9} {7.6} {6} -\DeclareMathSizes{10} {10} {7.6} {6} -\DeclareMathSizes{10.95}{10.95}{8.3} {6} -\DeclareMathSizes{11} {11} {8.3} {6} -\DeclareMathSizes{12} {12} {9} {7} -\DeclareMathSizes{14.4} {14.4} {10} {8} -\DeclareMathSizes{17.28}{17.28}{12} {9} -\DeclareMathSizes{20.74}{20.74}{14.4}{10} -\DeclareMathSizes{24.88}{24.88}{17.28}{12} - -\ifkp@widermath - \thinmuskip=3mu - \medmuskip=4mu plus 1.5mu minus 3mu - \thickmuskip=5mu plus 4mu -\else - \thinmuskip=2mu - \medmuskip=3mu plus 1.5mu minus 3mu - \thickmuskip=4mu plus 3mu -\fi - -% Common Macros - - -\def\re@DeclareMathSymbol#1#2#3#4{% - \let#1=\undefined - \DeclareMathSymbol{#1}{#2}{#3}{#4}} - -\def\re@DeclareMathDelimiter#1#2#3#4#5#6{% - \let#1=\undefined - \DeclareMathDelimiter{#1}{#2}{#3}{#4}{#5}{#6}} - -\def\re@DeclareMathAccent#1#2#3#4{% - \let#1=\undefined - \DeclareMathAccent{#1}{#2}{#3}{#4}} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Operator Definition % -%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\re@DeclareMathSymbol{\kppounds}{\mathord}{operators}{139} - -% \pounds classic bug in math mode - -\let\oldpounds\pounds% -\def\pounds{% - \relax\ifmmode\kppounds% - \else\oldpounds\fi} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Italic (jkpmi) Definition % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ifkp@partialup\re@DeclareMathSymbol{\partial}{\mathord}{letters}{128}\fi -\re@DeclareMathSymbol{\partialup}{\mathord}{letters}{128} -\re@DeclareMathSymbol{\partialsl}{\mathord}{letters}{64} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symbol (jkpsy) Definition % synomymes and \Re, \Im -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \let\circledplus\oplus - \let\circledminus\ominus - \let\circledtimes\otimes - \let\circledslash\oslash - \let\circleddot\odot - -\ifkp@oldReIm - \re@DeclareMathSymbol{\Re}{\mathord}{lettersA}{82} - \re@DeclareMathSymbol{\Im}{\mathord}{lettersA}{73} -\fi - - -\re@DeclareMathSymbol{\varemptyset}{\mathord}{symbols}{128} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symbol A Definitions % AMSa -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\re@DeclareMathSymbol{\boxdot}{\mathbin}{AMSa}{0} -\re@DeclareMathSymbol{\boxplus}{\mathbin}{AMSa}{1} -\re@DeclareMathSymbol{\boxtimes}{\mathbin}{AMSa}{2} -\re@DeclareMathSymbol{\square}{\mathord}{AMSa}{3} -\re@DeclareMathSymbol{\blacksquare}{\mathord}{AMSa}{4} -\re@DeclareMathSymbol{\centerdot}{\mathbin}{AMSa}{5} -\re@DeclareMathSymbol{\lozenge}{\mathord}{AMSa}{6} -\re@DeclareMathSymbol{\blacklozenge}{\mathord}{AMSa}{7} -\re@DeclareMathSymbol{\circlearrowright}{\mathrel}{AMSa}{8} -\re@DeclareMathSymbol{\circlearrowleft}{\mathrel}{AMSa}{9} -\re@DeclareMathSymbol{\rightleftharpoons}{\mathrel}{AMSa}{10} -\re@DeclareMathSymbol{\leftrightharpoons}{\mathrel}{AMSa}{11} -\re@DeclareMathSymbol{\boxminus}{\mathbin}{AMSa}{12} -\re@DeclareMathSymbol{\Vdash}{\mathrel}{AMSa}{13} -\re@DeclareMathSymbol{\Vvdash}{\mathrel}{AMSa}{14} -\re@DeclareMathSymbol{\vDash}{\mathrel}{AMSa}{15} -\re@DeclareMathSymbol{\twoheadrightarrow}{\mathrel}{AMSa}{16} -\re@DeclareMathSymbol{\twoheadleftarrow}{\mathrel}{AMSa}{17} -\re@DeclareMathSymbol{\leftleftarrows}{\mathrel}{AMSa}{18} -\re@DeclareMathSymbol{\rightrightarrows}{\mathrel}{AMSa}{19} -\re@DeclareMathSymbol{\upuparrows}{\mathrel}{AMSa}{20} -\re@DeclareMathSymbol{\downdownarrows}{\mathrel}{AMSa}{21} -\re@DeclareMathSymbol{\upharpoonright}{\mathrel}{AMSa}{22} - \let\restriction\upharpoonright -\re@DeclareMathSymbol{\downharpoonright}{\mathrel}{AMSa}{23} -\re@DeclareMathSymbol{\upharpoonleft}{\mathrel}{AMSa}{24} -\re@DeclareMathSymbol{\downharpoonleft}{\mathrel}{AMSa}{25} -\re@DeclareMathSymbol{\rightarrowtail}{\mathrel}{AMSa}{26} -\re@DeclareMathSymbol{\leftarrowtail}{\mathrel}{AMSa}{27} -\re@DeclareMathSymbol{\leftrightarrows}{\mathrel}{AMSa}{28} -\re@DeclareMathSymbol{\rightleftarrows}{\mathrel}{AMSa}{29} -\re@DeclareMathSymbol{\Lsh}{\mathrel}{AMSa}{30} -\re@DeclareMathSymbol{\Rsh}{\mathrel}{AMSa}{31} -\re@DeclareMathSymbol{\rightsquigarrow}{\mathrel}{AMSa}{32} -\re@DeclareMathSymbol{\leftrightsquigarrow}{\mathrel}{AMSa}{33} -\re@DeclareMathSymbol{\looparrowleft}{\mathrel}{AMSa}{34} -\re@DeclareMathSymbol{\looparrowright}{\mathrel}{AMSa}{35} -\re@DeclareMathSymbol{\circeq}{\mathrel}{AMSa}{36} -\re@DeclareMathSymbol{\succsim}{\mathrel}{AMSa}{37} -\re@DeclareMathSymbol{\gtrsim}{\mathrel}{AMSa}{38} -\re@DeclareMathSymbol{\gtrapprox}{\mathrel}{AMSa}{39} -\re@DeclareMathSymbol{\multimap}{\mathrel}{AMSa}{40} -\re@DeclareMathSymbol{\therefore}{\mathrel}{AMSa}{41} -\re@DeclareMathSymbol{\because}{\mathrel}{AMSa}{42} -\re@DeclareMathSymbol{\doteqdot}{\mathrel}{AMSa}{43} - \let\Doteq\doteqdot -\re@DeclareMathSymbol{\triangleq}{\mathrel}{AMSa}{44} -\re@DeclareMathSymbol{\precsim}{\mathrel}{AMSa}{45} -\re@DeclareMathSymbol{\lesssim}{\mathrel}{AMSa}{46} -\re@DeclareMathSymbol{\lessapprox}{\mathrel}{AMSa}{47} -\re@DeclareMathSymbol{\eqslantless}{\mathrel}{AMSa}{48} -\re@DeclareMathSymbol{\eqslantgtr}{\mathrel}{AMSa}{49} -\re@DeclareMathSymbol{\curlyeqprec}{\mathrel}{AMSa}{50} -\re@DeclareMathSymbol{\curlyeqsucc}{\mathrel}{AMSa}{51} -\re@DeclareMathSymbol{\preccurlyeq}{\mathrel}{AMSa}{52} -\re@DeclareMathSymbol{\leqq}{\mathrel}{AMSa}{53} -\re@DeclareMathSymbol{\leqslant}{\mathrel}{AMSa}{54} -\re@DeclareMathSymbol{\lessgtr}{\mathrel}{AMSa}{55} -\re@DeclareMathSymbol{\backprime}{\mathord}{AMSa}{56} -\re@DeclareMathSymbol{\risingdotseq}{\mathrel}{AMSa}{58} -\re@DeclareMathSymbol{\fallingdotseq}{\mathrel}{AMSa}{59} -\re@DeclareMathSymbol{\succcurlyeq}{\mathrel}{AMSa}{60} -\re@DeclareMathSymbol{\geqq}{\mathrel}{AMSa}{61} -\re@DeclareMathSymbol{\geqslant}{\mathrel}{AMSa}{62} -\re@DeclareMathSymbol{\gtrless}{\mathrel}{AMSa}{63} -\re@DeclareMathSymbol{\sqsubset}{\mathrel}{AMSa}{64} -\re@DeclareMathSymbol{\sqsupset}{\mathrel}{AMSa}{65} -\re@DeclareMathSymbol{\vartriangleright}{\mathrel}{AMSa}{66} -\re@DeclareMathSymbol{\vartriangleleft}{\mathrel}{AMSa}{67} -\re@DeclareMathSymbol{\trianglerighteq}{\mathrel}{AMSa}{68} -\re@DeclareMathSymbol{\trianglelefteq}{\mathrel}{AMSa}{69} -\re@DeclareMathSymbol{\bigstar}{\mathord}{AMSa}{70} -\re@DeclareMathSymbol{\between}{\mathrel}{AMSa}{71} -\re@DeclareMathSymbol{\blacktriangledown}{\mathord}{AMSa}{72} -\re@DeclareMathSymbol{\blacktriangleright}{\mathrel}{AMSa}{73} -\re@DeclareMathSymbol{\blacktriangleleft}{\mathrel}{AMSa}{74} -\re@DeclareMathSymbol{\vartriangle}{\mathrel}{AMSa}{77} -\re@DeclareMathSymbol{\blacktriangle}{\mathord}{AMSa}{78} -\re@DeclareMathSymbol{\triangledown}{\mathord}{AMSa}{79} -\re@DeclareMathSymbol{\eqcirc}{\mathrel}{AMSa}{80} -\re@DeclareMathSymbol{\lesseqgtr}{\mathrel}{AMSa}{81} -\re@DeclareMathSymbol{\gtreqless}{\mathrel}{AMSa}{82} -\re@DeclareMathSymbol{\lesseqqgtr}{\mathrel}{AMSa}{83} -\re@DeclareMathSymbol{\gtreqqless}{\mathrel}{AMSa}{84} -\re@DeclareMathSymbol{\Rrightarrow}{\mathrel}{AMSa}{86} -\re@DeclareMathSymbol{\Lleftarrow}{\mathrel}{AMSa}{87} -\re@DeclareMathSymbol{\veebar}{\mathbin}{AMSa}{89} -\re@DeclareMathSymbol{\barwedge}{\mathbin}{AMSa}{90} -\re@DeclareMathSymbol{\doublebarwedge}{\mathbin}{AMSa}{91} -\re@DeclareMathSymbol{\angle}{\mathord}{AMSa}{92} -\re@DeclareMathSymbol{\measuredangle}{\mathord}{AMSa}{93} -\re@DeclareMathSymbol{\sphericalangle}{\mathord}{AMSa}{94} -\re@DeclareMathSymbol{\varpropto}{\mathrel}{AMSa}{95} -\re@DeclareMathSymbol{\smallsmile}{\mathrel}{AMSa}{96} -\re@DeclareMathSymbol{\smallfrown}{\mathrel}{AMSa}{97} -\re@DeclareMathSymbol{\Subset}{\mathrel}{AMSa}{98} -\re@DeclareMathSymbol{\Supset}{\mathrel}{AMSa}{99} -\re@DeclareMathSymbol{\Cup}{\mathbin}{AMSa}{100} - \let\doublecup\Cup -\re@DeclareMathSymbol{\Cap}{\mathbin}{AMSa}{101} - \let\doublecap\Cap -\re@DeclareMathSymbol{\curlywedge}{\mathbin}{AMSa}{102} -\re@DeclareMathSymbol{\curlyvee}{\mathbin}{AMSa}{103} -\re@DeclareMathSymbol{\leftthreetimes}{\mathbin}{AMSa}{104} -\re@DeclareMathSymbol{\rightthreetimes}{\mathbin}{AMSa}{105} -\re@DeclareMathSymbol{\subseteqq}{\mathrel}{AMSa}{106} -\re@DeclareMathSymbol{\supseteqq}{\mathrel}{AMSa}{107} -\re@DeclareMathSymbol{\bumpeq}{\mathrel}{AMSa}{108} -\re@DeclareMathSymbol{\Bumpeq}{\mathrel}{AMSa}{109} -\re@DeclareMathSymbol{\lll}{\mathrel}{AMSa}{110} - \let\llless\lll -\re@DeclareMathSymbol{\ggg}{\mathrel}{AMSa}{111} - \let\gggtr\ggg -\re@DeclareMathDelimiter\ulcorner{\mathopen}{AMSa}{112}{AMSa}{112} -\re@DeclareMathDelimiter\urcorner{\mathclose}{AMSa}{113}{AMSa}{113} -\re@DeclareMathSymbol{\circledS}{\mathord}{AMSa}{115} -\re@DeclareMathSymbol{\pitchfork}{\mathrel}{AMSa}{116} -\re@DeclareMathSymbol{\dotplus}{\mathbin}{AMSa}{117} -\re@DeclareMathSymbol{\backsim}{\mathrel}{AMSa}{118} -\re@DeclareMathSymbol{\backsimeq}{\mathrel}{AMSa}{119} -\re@DeclareMathDelimiter\llcorner{\mathopen}{AMSa}{120}{AMSa}{120} -\re@DeclareMathDelimiter\lrcorner{\mathclose}{AMSa}{121}{AMSa}{121} -\re@DeclareMathSymbol{\complement}{\mathord}{AMSa}{123} -\re@DeclareMathSymbol{\intercal}{\mathbin}{AMSa}{124} -\re@DeclareMathSymbol{\circledcirc}{\mathbin}{AMSa}{125} -\re@DeclareMathSymbol{\circledast}{\mathbin}{AMSa}{126} -\re@DeclareMathSymbol{\circleddash}{\mathbin}{AMSa}{127} - -\let\Box=\square % LaTeX symbol -\re@DeclareMathSymbol{\rhd}{\mathbin}{AMSa}{66} % LaTeX symbol -\re@DeclareMathSymbol{\lhd}{\mathbin}{AMSa}{67} % LaTeX symbol -\re@DeclareMathSymbol{\unrhd}{\mathbin}{AMSa}{68} % LaTeX symbol -\re@DeclareMathSymbol{\unlhd}{\mathbin}{AMSa}{69} % LaTeX symbol - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symbol B Definitions % AMSb -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\re@DeclareMathSymbol{\lvertneqq}{\mathrel}{AMSb}{0} -\re@DeclareMathSymbol{\gvertneqq}{\mathrel}{AMSb}{1} -\re@DeclareMathSymbol{\nleq}{\mathrel}{AMSb}{2} -\re@DeclareMathSymbol{\ngeq}{\mathrel}{AMSb}{3} -\re@DeclareMathSymbol{\nless}{\mathrel}{AMSb}{4} -\re@DeclareMathSymbol{\ngtr}{\mathrel}{AMSb}{5} -\re@DeclareMathSymbol{\nprec}{\mathrel}{AMSb}{6} -\re@DeclareMathSymbol{\nsucc}{\mathrel}{AMSb}{7} -\re@DeclareMathSymbol{\lneqq}{\mathrel}{AMSb}{8} -\re@DeclareMathSymbol{\gneqq}{\mathrel}{AMSb}{9} -\re@DeclareMathSymbol{\nleqslant}{\mathrel}{AMSb}{10} -\re@DeclareMathSymbol{\ngeqslant}{\mathrel}{AMSb}{11} -\re@DeclareMathSymbol{\lneq}{\mathrel}{AMSb}{12} -\re@DeclareMathSymbol{\gneq}{\mathrel}{AMSb}{13} -\re@DeclareMathSymbol{\npreceq}{\mathrel}{AMSb}{14} -\re@DeclareMathSymbol{\nsucceq}{\mathrel}{AMSb}{15} -\re@DeclareMathSymbol{\precnsim}{\mathrel}{AMSb}{16} -\re@DeclareMathSymbol{\succnsim}{\mathrel}{AMSb}{17} -\re@DeclareMathSymbol{\lnsim}{\mathrel}{AMSb}{18} -\re@DeclareMathSymbol{\gnsim}{\mathrel}{AMSb}{19} -\re@DeclareMathSymbol{\nleqq}{\mathrel}{AMSb}{20} -\re@DeclareMathSymbol{\ngeqq}{\mathrel}{AMSb}{21} -\re@DeclareMathSymbol{\precneqq}{\mathrel}{AMSb}{22} -\re@DeclareMathSymbol{\succneqq}{\mathrel}{AMSb}{23} -\re@DeclareMathSymbol{\precnapprox}{\mathrel}{AMSb}{24} -\re@DeclareMathSymbol{\succnapprox}{\mathrel}{AMSb}{25} -\re@DeclareMathSymbol{\lnapprox}{\mathrel}{AMSb}{26} -\re@DeclareMathSymbol{\gnapprox}{\mathrel}{AMSb}{27} -\re@DeclareMathSymbol{\nsim}{\mathrel}{AMSb}{28} -\re@DeclareMathSymbol{\ncong}{\mathrel}{AMSb}{29} -\re@DeclareMathSymbol{\diagup}{\mathord}{AMSb}{30} -\re@DeclareMathSymbol{\diagdown}{\mathord}{AMSb}{31} -\re@DeclareMathSymbol{\varsubsetneq}{\mathrel}{AMSb}{32} -\re@DeclareMathSymbol{\varsupsetneq}{\mathrel}{AMSb}{33} -\re@DeclareMathSymbol{\nsubseteqq}{\mathrel}{AMSb}{34} -\re@DeclareMathSymbol{\nsupseteqq}{\mathrel}{AMSb}{35} -\re@DeclareMathSymbol{\subsetneqq}{\mathrel}{AMSb}{36} -\re@DeclareMathSymbol{\supsetneqq}{\mathrel}{AMSb}{37} -\re@DeclareMathSymbol{\varsubsetneqq}{\mathrel}{AMSb}{38} -\re@DeclareMathSymbol{\varsupsetneqq}{\mathrel}{AMSb}{39} -\re@DeclareMathSymbol{\subsetneq}{\mathrel}{AMSb}{40} -\re@DeclareMathSymbol{\supsetneq}{\mathrel}{AMSb}{41} -\re@DeclareMathSymbol{\nsubseteq}{\mathrel}{AMSb}{42} -\re@DeclareMathSymbol{\nsupseteq}{\mathrel}{AMSb}{43} -\re@DeclareMathSymbol{\nparallel}{\mathrel}{AMSb}{44} -\re@DeclareMathSymbol{\nmid}{\mathrel}{AMSb}{45} -\re@DeclareMathSymbol{\nshortmid}{\mathrel}{AMSb}{46} -\re@DeclareMathSymbol{\nshortparallel}{\mathrel}{AMSb}{47} -\re@DeclareMathSymbol{\nvdash}{\mathrel}{AMSb}{48} -\re@DeclareMathSymbol{\nVdash}{\mathrel}{AMSb}{49} -\re@DeclareMathSymbol{\nvDash}{\mathrel}{AMSb}{50} -\re@DeclareMathSymbol{\nVDash}{\mathrel}{AMSb}{51} -\re@DeclareMathSymbol{\ntrianglerighteq}{\mathrel}{AMSb}{52} -\re@DeclareMathSymbol{\ntrianglelefteq}{\mathrel}{AMSb}{53} -\re@DeclareMathSymbol{\ntriangleleft}{\mathrel}{AMSb}{54} -\re@DeclareMathSymbol{\ntriangleright}{\mathrel}{AMSb}{55} -\re@DeclareMathSymbol{\nleftarrow}{\mathrel}{AMSb}{56} -\re@DeclareMathSymbol{\nrightarrow}{\mathrel}{AMSb}{57} -\re@DeclareMathSymbol{\nLeftarrow}{\mathrel}{AMSb}{58} -\re@DeclareMathSymbol{\nRightarrow}{\mathrel}{AMSb}{59} -\re@DeclareMathSymbol{\nLeftrightarrow}{\mathrel}{AMSb}{60} -\re@DeclareMathSymbol{\nleftrightarrow}{\mathrel}{AMSb}{61} -\re@DeclareMathSymbol{\divideontimes}{\mathbin}{AMSb}{62} -\re@DeclareMathSymbol{\varnothing}{\mathord}{AMSb}{63} -\re@DeclareMathSymbol{\nexists}{\mathord}{AMSb}{64} -\re@DeclareMathSymbol{\Finv}{\mathord}{AMSb}{96} -\re@DeclareMathSymbol{\Game}{\mathord}{AMSb}{97} -\re@DeclareMathSymbol{\mho}{\mathord}{AMSb}{102} -\re@DeclareMathSymbol{\eth}{\mathord}{AMSb}{103} -\re@DeclareMathSymbol{\eqsim}{\mathrel}{AMSb}{104} -\re@DeclareMathSymbol{\beth}{\mathord}{AMSb}{105} -\re@DeclareMathSymbol{\gimel}{\mathord}{AMSb}{106} -\re@DeclareMathSymbol{\daleth}{\mathord}{AMSb}{107} -\re@DeclareMathSymbol{\lessdot}{\mathbin}{AMSb}{108} -\re@DeclareMathSymbol{\gtrdot}{\mathbin}{AMSb}{109} -\re@DeclareMathSymbol{\ltimes}{\mathbin}{AMSb}{110} -\re@DeclareMathSymbol{\rtimes}{\mathbin}{AMSb}{111} -\re@DeclareMathSymbol{\shortmid}{\mathrel}{AMSb}{112} -\re@DeclareMathSymbol{\shortparallel}{\mathrel}{AMSb}{113} -\re@DeclareMathSymbol{\smallsetminus}{\mathbin}{AMSb}{114} -\re@DeclareMathSymbol{\thicksim}{\mathrel}{AMSb}{115} -\re@DeclareMathSymbol{\thickapprox}{\mathrel}{AMSb}{116} -\re@DeclareMathSymbol{\approxeq}{\mathrel}{AMSb}{117} -\re@DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{119} -\re@DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{118} -\re@DeclareMathSymbol{\curvearrowleft}{\mathrel}{AMSb}{120} -\re@DeclareMathSymbol{\curvearrowright}{\mathrel}{AMSb}{121} -\re@DeclareMathSymbol{\digamma}{\mathord}{AMSb}{122} -\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123} -\re@DeclareMathSymbol{\Bbbk}{\mathord}{AMSb}{124} -\re@DeclareMathSymbol{\hslash}{\mathord}{AMSb}{125} -\re@DeclareMathSymbol{\hbar}{\mathord}{AMSb}{126} -\re@DeclareMathSymbol{\backepsilon}{\mathrel}{AMSb}{127} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symbol C Definitions % symbolsC -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\re@DeclareMathSymbol{\mappedfromchar}{\mathrel}{symbolsC}{0} - \def\mappedfrom{\leftarrow\mappedfromchar} - \def\longmappedfrom{\longleftarrow\mappedfromchar} -\re@DeclareMathSymbol{\Mapstochar}{\mathrel}{symbolsC}{1} - \def\Mapsto{\Mapstochar\Rightarrow} - \def\Longmapsto{\Mapstochar\Longrightarrow} -\re@DeclareMathSymbol{\Mappedfromchar}{\mathrel}{symbolsC}{2} - \def\Mappedfrom{\Leftarrow\Mappedfromchar} - \def\Longmappedfrom{\Longleftarrow\Mappedfromchar} -\re@DeclareMathSymbol{\mmapstochar}{\mathrel}{symbolsC}{3} - \def\mmapsto{\mmapstochar\rightarrow} - \def\longmmapsto{\mmapstochar\longrightarrow} -\re@DeclareMathSymbol{\mmappedfromchar}{\mathrel}{symbolsC}{4} - \def\mmappedfrom{\leftarrow\mmappedfromchar} - \def\longmmappedfrom{\longleftarrow\mmappedfromchar} -\re@DeclareMathSymbol{\Mmapstochar}{\mathrel}{symbolsC}{5} - \def\Mmapsto{\Mmapstochar\Rightarrow} - \def\Longmmapsto{\Mmapstochar\Longrightarrow} -\re@DeclareMathSymbol{\Mmappedfromchar}{\mathrel}{symbolsC}{6} - \def\Mmappedfrom{\Leftarrow\Mmappedfromchar} - \def\Longmmappedfrom{\Longleftarrow\Mmappedfromchar} -\re@DeclareMathSymbol{\medcirc}{\mathbin}{symbolsC}{7} -\re@DeclareMathSymbol{\medbullet}{\mathbin}{symbolsC}{8} -\re@DeclareMathSymbol{\varparallel}{\mathrel}{symbolsC}{9} -\re@DeclareMathSymbol{\varparallelinv}{\mathrel}{symbolsC}{10} -\re@DeclareMathSymbol{\nvarparallel}{\mathrel}{symbolsC}{11} -\re@DeclareMathSymbol{\nvarparallelinv}{\mathrel}{symbolsC}{12} -\re@DeclareMathSymbol{\colonapprox}{\mathrel}{symbolsC}{13} -\re@DeclareMathSymbol{\colonsim}{\mathrel}{symbolsC}{14} -\re@DeclareMathSymbol{\Colonapprox}{\mathrel}{symbolsC}{15} -\re@DeclareMathSymbol{\Colonsim}{\mathrel}{symbolsC}{16} -\re@DeclareMathSymbol{\doteq}{\mathrel}{symbolsC}{17} -\re@DeclareMathSymbol{\multimapinv}{\mathrel}{symbolsC}{18} -\re@DeclareMathSymbol{\multimapboth}{\mathrel}{symbolsC}{19} -\re@DeclareMathSymbol{\multimapdot}{\mathrel}{symbolsC}{20} -\re@DeclareMathSymbol{\multimapdotinv}{\mathrel}{symbolsC}{21} -\re@DeclareMathSymbol{\multimapdotboth}{\mathrel}{symbolsC}{22} -\re@DeclareMathSymbol{\multimapdotbothA}{\mathrel}{symbolsC}{23} -\re@DeclareMathSymbol{\multimapdotbothB}{\mathrel}{symbolsC}{24} -\re@DeclareMathSymbol{\VDash}{\mathrel}{symbolsC}{25} -\re@DeclareMathSymbol{\VvDash}{\mathrel}{symbolsC}{26} -\re@DeclareMathSymbol{\cong}{\mathrel}{symbolsC}{27} -\re@DeclareMathSymbol{\preceqq}{\mathrel}{symbolsC}{28} -\re@DeclareMathSymbol{\succeqq}{\mathrel}{symbolsC}{29} -\re@DeclareMathSymbol{\nprecsim}{\mathrel}{symbolsC}{30} -\re@DeclareMathSymbol{\nsuccsim}{\mathrel}{symbolsC}{31} -\re@DeclareMathSymbol{\nlesssim}{\mathrel}{symbolsC}{32} -\re@DeclareMathSymbol{\ngtrsim}{\mathrel}{symbolsC}{33} -\re@DeclareMathSymbol{\nlessapprox}{\mathrel}{symbolsC}{34} -\re@DeclareMathSymbol{\ngtrapprox}{\mathrel}{symbolsC}{35} -\re@DeclareMathSymbol{\npreccurlyeq}{\mathrel}{symbolsC}{36} -\re@DeclareMathSymbol{\nsucccurlyeq}{\mathrel}{symbolsC}{37} -\re@DeclareMathSymbol{\ngtrless}{\mathrel}{symbolsC}{38} -\re@DeclareMathSymbol{\nlessgtr}{\mathrel}{symbolsC}{39} -\re@DeclareMathSymbol{\nbumpeq}{\mathrel}{symbolsC}{40} -\re@DeclareMathSymbol{\nBumpeq}{\mathrel}{symbolsC}{41} -\re@DeclareMathSymbol{\nbacksim}{\mathrel}{symbolsC}{42} -\re@DeclareMathSymbol{\nbacksimeq}{\mathrel}{symbolsC}{43} -\re@DeclareMathSymbol{\neq}{\mathrel}{symbolsC}{44} - \let\ne=\neq -\re@DeclareMathSymbol{\nasymp}{\mathrel}{symbolsC}{45} -\re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} -\re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} -\re@DeclareMathSymbol{\napprox}{\mathrel}{symbolsC}{48} -\re@DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49} -\re@DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50} -\re@DeclareMathSymbol{\nll}{\mathrel}{symbolsC}{51} -\re@DeclareMathSymbol{\ngg}{\mathrel}{symbolsC}{52} -\re@DeclareMathSymbol{\nthickapprox}{\mathrel}{symbolsC}{53} -\re@DeclareMathSymbol{\napproxeq}{\mathrel}{symbolsC}{54} -\re@DeclareMathSymbol{\nprecapprox}{\mathrel}{symbolsC}{55} -\re@DeclareMathSymbol{\nsuccapprox}{\mathrel}{symbolsC}{56} -\re@DeclareMathSymbol{\npreceqq}{\mathrel}{symbolsC}{57} -\re@DeclareMathSymbol{\nsucceqq}{\mathrel}{symbolsC}{58} -\re@DeclareMathSymbol{\nsimeq}{\mathrel}{symbolsC}{59} -\re@DeclareMathSymbol{\notin}{\mathrel}{symbolsC}{60} -\re@DeclareMathSymbol{\notni}{\mathrel}{symbolsC}{61} - \let\notowns=\notni -\re@DeclareMathSymbol{\nSubset}{\mathrel}{symbolsC}{62} -\re@DeclareMathSymbol{\nSupset}{\mathrel}{symbolsC}{63} -\re@DeclareMathSymbol{\nsqsubseteq}{\mathrel}{symbolsC}{64} -\re@DeclareMathSymbol{\nsqsupseteq}{\mathrel}{symbolsC}{65} -\re@DeclareMathSymbol{\coloneqq}{\mathrel}{symbolsC}{66} -\re@DeclareMathSymbol{\eqqcolon}{\mathrel}{symbolsC}{67} -\re@DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{68} -\re@DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{69} -\re@DeclareMathSymbol{\Coloneqq}{\mathrel}{symbolsC}{70} -\re@DeclareMathSymbol{\Eqqcolon}{\mathrel}{symbolsC}{71} -\re@DeclareMathSymbol{\Coloneq}{\mathrel}{symbolsC}{72} -\re@DeclareMathSymbol{\Eqcolon}{\mathrel}{symbolsC}{73} -\re@DeclareMathSymbol{\strictif}{\mathrel}{symbolsC}{74} -\re@DeclareMathSymbol{\strictfi}{\mathrel}{symbolsC}{75} -\re@DeclareMathSymbol{\strictiff}{\mathrel}{symbolsC}{76} -\re@DeclareMathSymbol{\invamp}{\mathbin}{symbolsC}{77} -\re@DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsA}{48} -\re@DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsA}{49} -\re@DeclareMathSymbol{\Lbag}{\mathopen}{symbolsC}{80} -\re@DeclareMathSymbol{\Rbag}{\mathclose}{symbolsC}{81} -\re@DeclareMathSymbol{\circledless}{\mathrel}{symbolsC}{82} -\re@DeclareMathSymbol{\circledgtr}{\mathrel}{symbolsC}{83} -\re@DeclareMathSymbol{\circledwedge}{\mathbin}{symbolsC}{84} -\re@DeclareMathSymbol{\circledvee}{\mathbin}{symbolsC}{85} -\re@DeclareMathSymbol{\circledbar}{\mathbin}{symbolsC}{86} -\re@DeclareMathSymbol{\circledbslash}{\mathbin}{symbolsC}{87} -\re@DeclareMathSymbol{\lJoin}{\mathrel}{symbolsC}{88} -\re@DeclareMathSymbol{\rJoin}{\mathrel}{symbolsC}{89} -\re@DeclareMathSymbol{\Join}{\mathrel}{symbolsC}{90} - \let\lrJoin=\Join -\re@DeclareMathSymbol{\openJoin}{\mathrel}{symbolsC}{91} -\re@DeclareMathSymbol{\lrtimes}{\mathrel}{symbolsC}{92} -% \let\bowtie\lrtimes -\re@DeclareMathSymbol{\opentimes}{\mathrel}{symbolsC}{93} -\re@DeclareMathSymbol{\Diamond}{\mathord}{symbolsC}{94} -\re@DeclareMathSymbol{\Diamondblack}{\mathord}{symbolsC}{95} -\re@DeclareMathSymbol{\nplus}{\mathbin}{symbolsC}{96} -\re@DeclareMathSymbol{\nsqsubset}{\mathrel}{symbolsC}{97} -\re@DeclareMathSymbol{\nsqsupset}{\mathrel}{symbolsC}{98} -\re@DeclareMathSymbol{\dashleftarrow}{\mathrel}{symbolsC}{99} -\re@DeclareMathSymbol{\dashrightarrow}{\mathrel}{symbolsC}{100} - \let\dasharrow\dashrightarrow -\re@DeclareMathSymbol{\dashleftrightarrow}{\mathrel}{symbolsC}{101} -\re@DeclareMathSymbol{\leftsquigarrow}{\mathrel}{symbolsC}{102} -\re@DeclareMathSymbol{\ntwoheadrightarrow}{\mathrel}{symbolsC}{103} -\re@DeclareMathSymbol{\ntwoheadleftarrow}{\mathrel}{symbolsC}{104} -\re@DeclareMathSymbol{\boxast}{\mathbin}{symbolsC}{105} -\re@DeclareMathSymbol{\boxbslash}{\mathbin}{symbolsC}{106} -\re@DeclareMathSymbol{\boxbar}{\mathbin}{symbolsC}{107} -\re@DeclareMathSymbol{\boxslash}{\mathbin}{symbolsC}{108} -\re@DeclareMathSymbol{\Wr}{\mathbin}{symbolsC}{109} -\re@DeclareMathSymbol{\lambdaslash}{\mathord}{symbolsC}{110} -\re@DeclareMathSymbol{\lambdabar}{\mathord}{symbolsC}{111} -\re@DeclareMathSymbol{\varclubsuit}{\mathord}{symbolsC}{112} -\re@DeclareMathSymbol{\vardiamondsuit}{\mathord}{symbolsC}{113} -\re@DeclareMathSymbol{\varheartsuit}{\mathord}{symbolsC}{114} -\re@DeclareMathSymbol{\varspadesuit}{\mathord}{symbolsC}{115} -\re@DeclareMathSymbol{\Nearrow}{\mathrel}{symbolsC}{116} -\re@DeclareMathSymbol{\Searrow}{\mathrel}{symbolsC}{117} -\re@DeclareMathSymbol{\Nwarrow}{\mathrel}{symbolsC}{118} -\re@DeclareMathSymbol{\Swarrow}{\mathrel}{symbolsC}{119} -\re@DeclareMathSymbol{\Top}{\mathord}{symbolsC}{120} -\re@DeclareMathSymbol{\Bot}{\mathord}{symbolsC}{121} -\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121} -\re@DeclareMathSymbol\leadstoext{\mathrel}{symbolsC}{122} -\re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123} -\re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124} -\re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125} -\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18} -\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19} -\re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128} -\re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129} -\re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130} -\re@DeclareMathSymbol{\boxdotleft}{\mathrel}{symbolsC}{131} -\re@DeclareMathSymbol{\Diamondright}{\mathrel}{symbolsC}{132} -\re@DeclareMathSymbol{\Diamondleft}{\mathrel}{symbolsC}{133} -\re@DeclareMathSymbol{\Diamonddotright}{\mathrel}{symbolsC}{134} -\re@DeclareMathSymbol{\Diamonddotleft}{\mathrel}{symbolsC}{135} -\re@DeclareMathSymbol{\boxRight}{\mathrel}{symbolsC}{136} -\re@DeclareMathSymbol{\boxLeft}{\mathrel}{symbolsC}{137} -\re@DeclareMathSymbol{\boxdotRight}{\mathrel}{symbolsC}{138} -\re@DeclareMathSymbol{\boxdotLeft}{\mathrel}{symbolsC}{139} -\re@DeclareMathSymbol{\DiamondRight}{\mathrel}{symbolsC}{140} -\re@DeclareMathSymbol{\DiamondLeft}{\mathrel}{symbolsC}{141} -\re@DeclareMathSymbol{\DiamonddotRight}{\mathrel}{symbolsC}{142} -\re@DeclareMathSymbol{\DiamonddotLeft}{\mathrel}{symbolsC}{143} -\re@DeclareMathSymbol{\Diamonddot}{\mathord}{symbolsC}{144} -\re@DeclareMathSymbol{\circleright}{\mathrel}{symbolsC}{145} -\re@DeclareMathSymbol{\circleleft}{\mathrel}{symbolsC}{146} -\re@DeclareMathSymbol{\circleddotright}{\mathrel}{symbolsC}{147} - \let\circledotright\circleddotright -\re@DeclareMathSymbol{\circleddotleft}{\mathrel}{symbolsC}{148} - \let\circledotleft\circleddotleft -\re@DeclareMathSymbol{\multimapbothvert}{\mathrel}{symbolsC}{149} -\re@DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150} -\re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151} -\re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152} - - -%%%%%%%%%%%%%%%%%%%%%%%%%% -% Greek letter's options % -%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Absolute reference - -\re@DeclareMathSymbol{\Gammasl}{\mathord}{letters}{0} -\re@DeclareMathSymbol{\Deltasl}{\mathord}{letters}{1} -\re@DeclareMathSymbol{\Thetasl}{\mathord}{letters}{2} -\re@DeclareMathSymbol{\Lambdasl}{\mathord}{letters}{3} -\re@DeclareMathSymbol{\Xisl}{\mathord}{letters}{4} -\re@DeclareMathSymbol{\Pisl}{\mathord}{letters}{5} -\re@DeclareMathSymbol{\Sigmasl}{\mathord}{letters}{6} -\re@DeclareMathSymbol{\Upsilonsl}{\mathord}{letters}{7} -\re@DeclareMathSymbol{\Phisl}{\mathord}{letters}{8} -\re@DeclareMathSymbol{\Psisl}{\mathord}{letters}{9} -\re@DeclareMathSymbol{\Omegasl}{\mathord}{letters}{10} - -\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{00} -\re@DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{01} -\re@DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersA}{02} -\re@DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersA}{03} -\re@DeclareMathSymbol{\Xiup}{\mathalpha}{lettersA}{04} -\re@DeclareMathSymbol{\Piup}{\mathalpha}{lettersA}{05} -\re@DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersA}{06} -\re@DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersA}{07} -\re@DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{08} -\re@DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{09} -\re@DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersA}{10} - -\re@DeclareMathSymbol{\alphaup}{\mathord}{lettersA}{11} -\re@DeclareMathSymbol{\betaup}{\mathord}{lettersA}{12} -\re@DeclareMathSymbol{\gammaup}{\mathord}{lettersA}{13} -\re@DeclareMathSymbol{\deltaup}{\mathord}{lettersA}{14} -\re@DeclareMathSymbol{\epsilonup}{\mathord}{lettersA}{15} -\re@DeclareMathSymbol{\zetaup}{\mathord}{lettersA}{16} -\re@DeclareMathSymbol{\etaup}{\mathord}{lettersA}{17} -\re@DeclareMathSymbol{\thetaup}{\mathord}{lettersA}{18} -\re@DeclareMathSymbol{\iotaup}{\mathord}{lettersA}{19} -\re@DeclareMathSymbol{\kappaup}{\mathord}{lettersA}{20} -\re@DeclareMathSymbol{\lambdaup}{\mathord}{lettersA}{21} -\re@DeclareMathSymbol{\muup}{\mathord}{lettersA}{22} -\re@DeclareMathSymbol{\nuup}{\mathord}{lettersA}{23} -\re@DeclareMathSymbol{\xiup}{\mathord}{lettersA}{24} -\re@DeclareMathSymbol{\piup}{\mathord}{lettersA}{25} -\re@DeclareMathSymbol{\rhoup}{\mathord}{lettersA}{26} -\re@DeclareMathSymbol{\sigmaup}{\mathord}{lettersA}{27} -\re@DeclareMathSymbol{\tauup}{\mathord}{lettersA}{28} -\re@DeclareMathSymbol{\upsilonup}{\mathord}{lettersA}{29} -\re@DeclareMathSymbol{\phiup}{\mathord}{lettersA}{30} -\re@DeclareMathSymbol{\chiup}{\mathord}{lettersA}{31} -\re@DeclareMathSymbol{\psiup}{\mathord}{lettersA}{32} -\re@DeclareMathSymbol{\omegaup}{\mathord}{lettersA}{33} -\re@DeclareMathSymbol{\varepsilonup}{\mathord}{lettersA}{34} -\re@DeclareMathSymbol{\varthetaup}{\mathord}{lettersA}{35} -\re@DeclareMathSymbol{\varpiup}{\mathord}{lettersA}{36} -\re@DeclareMathSymbol{\varrhoup}{\mathord}{lettersA}{37} -\re@DeclareMathSymbol{\varsigmaup}{\mathord}{lettersA}{38} -\re@DeclareMathSymbol{\varphiup}{\mathord}{lettersA}{39} - -\let\varkappaup\varkappa -\let\digammaup\digamma - -\re@DeclareMathSymbol{\alphasl}{\mathord}{letters}{11} -\re@DeclareMathSymbol{\betasl}{\mathord}{letters}{12} -\re@DeclareMathSymbol{\gammasl}{\mathord}{letters}{13} -\re@DeclareMathSymbol{\deltasl}{\mathord}{letters}{14} -\re@DeclareMathSymbol{\epsilonsl}{\mathord}{letters}{15} -\re@DeclareMathSymbol{\zetasl}{\mathord}{letters}{16} -\re@DeclareMathSymbol{\etasl}{\mathord}{letters}{17} -\re@DeclareMathSymbol{\thetasl}{\mathord}{letters}{18} -\re@DeclareMathSymbol{\iotasl}{\mathord}{letters}{19} -\re@DeclareMathSymbol{\kappasl}{\mathord}{letters}{20} -\re@DeclareMathSymbol{\lambdasl}{\mathord}{letters}{21} -\re@DeclareMathSymbol{\musl}{\mathord}{letters}{22} -\re@DeclareMathSymbol{\nusl}{\mathord}{letters}{23} -\re@DeclareMathSymbol{\xisl}{\mathord}{letters}{24} -\re@DeclareMathSymbol{\pisl}{\mathord}{letters}{25} -\re@DeclareMathSymbol{\rhosl}{\mathord}{letters}{26} -\re@DeclareMathSymbol{\sigmasl}{\mathord}{letters}{27} -\re@DeclareMathSymbol{\tausl}{\mathord}{letters}{28} -\re@DeclareMathSymbol{\slsilonsl}{\mathord}{letters}{29} -\re@DeclareMathSymbol{\phisl}{\mathord}{letters}{30} -\re@DeclareMathSymbol{\chisl}{\mathord}{letters}{31} -\re@DeclareMathSymbol{\psisl}{\mathord}{letters}{32} -\re@DeclareMathSymbol{\omegasl}{\mathord}{letters}{33} -\re@DeclareMathSymbol{\varepsilonsl}{\mathord}{letters}{34} -\re@DeclareMathSymbol{\varthetasl}{\mathord}{letters}{35} -\re@DeclareMathSymbol{\varpisl}{\mathord}{letters}{36} -\re@DeclareMathSymbol{\varrhosl}{\mathord}{letters}{37} -\re@DeclareMathSymbol{\varsigmasl}{\mathord}{letters}{38} -\re@DeclareMathSymbol{\varphisl}{\mathord}{letters}{39} - -\let\varkappasl\varkappa -\let\digammasl\digamma - -% Relative reference - -\ifkp@upgrk % lowercase - - \re@DeclareMathSymbol{\alpha}{\mathord}{lettersA}{11} - \re@DeclareMathSymbol{\beta}{\mathord}{lettersA}{12} - \re@DeclareMathSymbol{\gamma}{\mathord}{lettersA}{13} - \re@DeclareMathSymbol{\delta}{\mathord}{lettersA}{14} - \re@DeclareMathSymbol{\epsilon}{\mathord}{lettersA}{15} - \re@DeclareMathSymbol{\zeta}{\mathord}{lettersA}{16} - \re@DeclareMathSymbol{\eta}{\mathord}{lettersA}{17} - \re@DeclareMathSymbol{\theta}{\mathord}{lettersA}{18} - \re@DeclareMathSymbol{\iota}{\mathord}{lettersA}{19} - \re@DeclareMathSymbol{\kappa}{\mathord}{lettersA}{20} - \re@DeclareMathSymbol{\lambda}{\mathord}{lettersA}{21} - \re@DeclareMathSymbol{\mu}{\mathord}{lettersA}{22} - \re@DeclareMathSymbol{\nu}{\mathord}{lettersA}{23} - \re@DeclareMathSymbol{\xi}{\mathord}{lettersA}{24} - \re@DeclareMathSymbol{\pi}{\mathord}{lettersA}{25} - \re@DeclareMathSymbol{\rho}{\mathord}{lettersA}{26} - \re@DeclareMathSymbol{\sigma}{\mathord}{lettersA}{27} - \re@DeclareMathSymbol{\tau}{\mathord}{lettersA}{28} - \re@DeclareMathSymbol{\upsilon}{\mathord}{lettersA}{29} - \re@DeclareMathSymbol{\phi}{\mathord}{lettersA}{30} - \re@DeclareMathSymbol{\chi}{\mathord}{lettersA}{31} - \re@DeclareMathSymbol{\psi}{\mathord}{lettersA}{32} - \re@DeclareMathSymbol{\omega}{\mathord}{lettersA}{33} - \re@DeclareMathSymbol{\varepsilon}{\mathord}{lettersA}{34} - \re@DeclareMathSymbol{\vartheta}{\mathord}{lettersA}{35} - \re@DeclareMathSymbol{\varpi}{\mathord}{lettersA}{36} - \re@DeclareMathSymbol{\varrho}{\mathord}{lettersA}{37} - \re@DeclareMathSymbol{\varsigma}{\mathord}{lettersA}{38} - \re@DeclareMathSymbol{\varphi}{\mathord}{lettersA}{39} - - \re@DeclareMathSymbol{\otheralpha}{\mathord}{letters}{11} - \re@DeclareMathSymbol{\otherbeta}{\mathord}{letters}{12} - \re@DeclareMathSymbol{\othergamma}{\mathord}{letters}{13} - \re@DeclareMathSymbol{\otherdelta}{\mathord}{letters}{14} - \re@DeclareMathSymbol{\otherepsilon}{\mathord}{letters}{15} - \re@DeclareMathSymbol{\otherzeta}{\mathord}{letters}{16} - \re@DeclareMathSymbol{\othereta}{\mathord}{letters}{17} - \re@DeclareMathSymbol{\othertheta}{\mathord}{letters}{18} - \re@DeclareMathSymbol{\otheriota}{\mathord}{letters}{19} - \re@DeclareMathSymbol{\otherkappa}{\mathord}{letters}{20} - \re@DeclareMathSymbol{\otherlambda}{\mathord}{letters}{21} - \re@DeclareMathSymbol{\othermu}{\mathord}{letters}{22} - \re@DeclareMathSymbol{\othernu}{\mathord}{letters}{23} - \re@DeclareMathSymbol{\otherxi}{\mathord}{letters}{24} - \re@DeclareMathSymbol{\otherpi}{\mathord}{letters}{25} - \re@DeclareMathSymbol{\otherrho}{\mathord}{letters}{26} - \re@DeclareMathSymbol{\othersigma}{\mathord}{letters}{27} - \re@DeclareMathSymbol{\othertau}{\mathord}{letters}{28} - \re@DeclareMathSymbol{\otherupsilon}{\mathord}{letters}{29} - \re@DeclareMathSymbol{\otherphi}{\mathord}{letters}{30} - \re@DeclareMathSymbol{\otherchi}{\mathord}{letters}{31} - \re@DeclareMathSymbol{\otherpsi}{\mathord}{letters}{32} - \re@DeclareMathSymbol{\otheromega}{\mathord}{letters}{33} - \re@DeclareMathSymbol{\othervarepsilon}{\mathord}{letters}{34} - \re@DeclareMathSymbol{\othervartheta}{\mathord}{letters}{35} - \re@DeclareMathSymbol{\othervarpi}{\mathord}{letters}{36} - \re@DeclareMathSymbol{\othervarrho}{\mathord}{letters}{37} - \re@DeclareMathSymbol{\othervarsigma}{\mathord}{letters}{38} - \re@DeclareMathSymbol{\othervarphi}{\mathord}{letters}{39} - -\else - - \re@DeclareMathSymbol{\alpha}{\mathord}{letters}{11} - \re@DeclareMathSymbol{\beta}{\mathord}{letters}{12} - \re@DeclareMathSymbol{\gamma}{\mathord}{letters}{13} - \re@DeclareMathSymbol{\delta}{\mathord}{letters}{14} - \re@DeclareMathSymbol{\epsilon}{\mathord}{letters}{15} - \re@DeclareMathSymbol{\zeta}{\mathord}{letters}{16} - \re@DeclareMathSymbol{\eta}{\mathord}{letters}{17} - \re@DeclareMathSymbol{\theta}{\mathord}{letters}{18} - \re@DeclareMathSymbol{\iota}{\mathord}{letters}{19} - \re@DeclareMathSymbol{\kappa}{\mathord}{letters}{20} - \re@DeclareMathSymbol{\lambda}{\mathord}{letters}{21} - \re@DeclareMathSymbol{\mu}{\mathord}{letters}{22} - \re@DeclareMathSymbol{\nu}{\mathord}{letters}{23} - \re@DeclareMathSymbol{\xi}{\mathord}{letters}{24} - \re@DeclareMathSymbol{\pi}{\mathord}{letters}{25} - \re@DeclareMathSymbol{\rho}{\mathord}{letters}{26} - \re@DeclareMathSymbol{\sigma}{\mathord}{letters}{27} - \re@DeclareMathSymbol{\tau}{\mathord}{letters}{28} - \re@DeclareMathSymbol{\upsilon}{\mathord}{letters}{29} - \re@DeclareMathSymbol{\phi}{\mathord}{letters}{30} - \re@DeclareMathSymbol{\chi}{\mathord}{letters}{31} - \re@DeclareMathSymbol{\psi}{\mathord}{letters}{32} - \re@DeclareMathSymbol{\omega}{\mathord}{letters}{33} - \re@DeclareMathSymbol{\varepsilon}{\mathord}{letters}{34} - \re@DeclareMathSymbol{\vartheta}{\mathord}{letters}{35} - \re@DeclareMathSymbol{\varpi}{\mathord}{letters}{36} - \re@DeclareMathSymbol{\varrho}{\mathord}{letters}{37} - \re@DeclareMathSymbol{\varsigma}{\mathord}{letters}{38} - \re@DeclareMathSymbol{\varphi}{\mathord}{letters}{39} - - \re@DeclareMathSymbol{\otheralpha}{\mathord}{lettersA}{11} - \re@DeclareMathSymbol{\otherbeta}{\mathord}{lettersA}{12} - \re@DeclareMathSymbol{\othergamma}{\mathord}{lettersA}{13} - \re@DeclareMathSymbol{\otherdelta}{\mathord}{lettersA}{14} - \re@DeclareMathSymbol{\otherepsilon}{\mathord}{lettersA}{15} - \re@DeclareMathSymbol{\otherzeta}{\mathord}{lettersA}{16} - \re@DeclareMathSymbol{\othereta}{\mathord}{lettersA}{17} - \re@DeclareMathSymbol{\othertheta}{\mathord}{lettersA}{18} - \re@DeclareMathSymbol{\otheriota}{\mathord}{lettersA}{19} - \re@DeclareMathSymbol{\otherkappa}{\mathord}{lettersA}{20} - \re@DeclareMathSymbol{\otherlambda}{\mathord}{lettersA}{21} - \re@DeclareMathSymbol{\othermu}{\mathord}{lettersA}{22} - \re@DeclareMathSymbol{\othernu}{\mathord}{lettersA}{23} - \re@DeclareMathSymbol{\otherxi}{\mathord}{lettersA}{24} - \re@DeclareMathSymbol{\otherpi}{\mathord}{lettersA}{25} - \re@DeclareMathSymbol{\otherrho}{\mathord}{lettersA}{26} - \re@DeclareMathSymbol{\othersigma}{\mathord}{lettersA}{27} - \re@DeclareMathSymbol{\othertau}{\mathord}{lettersA}{28} - \re@DeclareMathSymbol{\otherupsilon}{\mathord}{lettersA}{29} - \re@DeclareMathSymbol{\otherphi}{\mathord}{lettersA}{30} - \re@DeclareMathSymbol{\otherchi}{\mathord}{lettersA}{31} - \re@DeclareMathSymbol{\otherpsi}{\mathord}{lettersA}{32} - \re@DeclareMathSymbol{\otheromega}{\mathord}{lettersA}{33} - \re@DeclareMathSymbol{\othervarepsilon}{\mathord}{lettersA}{34} - \re@DeclareMathSymbol{\othervartheta}{\mathord}{lettersA}{35} - \re@DeclareMathSymbol{\othervarpi}{\mathord}{lettersA}{36} - \re@DeclareMathSymbol{\othervarrho}{\mathord}{lettersA}{37} - \re@DeclareMathSymbol{\othervarsigma}{\mathord}{lettersA}{38} - \re@DeclareMathSymbol{\othervarphi}{\mathord}{lettersA}{39} - -\fi - -\let\othervarkappa\varkappa -\let\otherdigamma\digamma - -\ifkp@slGrk % uppercase - - \re@DeclareMathSymbol{\Gamma}{\mathord}{letters}{0} - \re@DeclareMathSymbol{\Delta}{\mathord}{letters}{1} - \re@DeclareMathSymbol{\Theta}{\mathord}{letters}{2} - \re@DeclareMathSymbol{\Lambda}{\mathord}{letters}{3} - \re@DeclareMathSymbol{\Xi}{\mathord}{letters}{4} - \re@DeclareMathSymbol{\Pi}{\mathord}{letters}{5} - \re@DeclareMathSymbol{\Sigma}{\mathord}{letters}{6} - \re@DeclareMathSymbol{\Upsilon}{\mathord}{letters}{7} - \re@DeclareMathSymbol{\Phi}{\mathord}{letters}{8} - \re@DeclareMathSymbol{\Psi}{\mathord}{letters}{9} - \re@DeclareMathSymbol{\Omega}{\mathord}{letters}{10} - - \re@DeclareMathSymbol{\otherGamma}{\mathord}{lettersA}{00} - \re@DeclareMathSymbol{\otherDelta}{\mathord}{lettersA}{01} - \re@DeclareMathSymbol{\otherTheta}{\mathord}{lettersA}{02} - \re@DeclareMathSymbol{\otherLambda}{\mathord}{lettersA}{03} - \re@DeclareMathSymbol{\otherXi}{\mathord}{lettersA}{04} - \re@DeclareMathSymbol{\otherPi}{\mathord}{lettersA}{05} - \re@DeclareMathSymbol{\otherSigma}{\mathord}{lettersA}{06} - \re@DeclareMathSymbol{\otherUpsilon}{\mathord}{lettersA}{07} - \re@DeclareMathSymbol{\otherPhi}{\mathord}{lettersA}{08} - \re@DeclareMathSymbol{\otherPsi}{\mathord}{lettersA}{09} - \re@DeclareMathSymbol{\otherOmega}{\mathord}{lettersA}{10} - - \re@DeclareMathSymbol{\varGamma}{\mathord}{lettersA}{00} - \re@DeclareMathSymbol{\varDelta}{\mathord}{lettersA}{01} - \re@DeclareMathSymbol{\varTheta}{\mathord}{lettersA}{02} - \re@DeclareMathSymbol{\varLambda}{\mathord}{lettersA}{03} - \re@DeclareMathSymbol{\varXi}{\mathord}{lettersA}{04} - \re@DeclareMathSymbol{\varPi}{\mathord}{lettersA}{05} - \re@DeclareMathSymbol{\varSigma}{\mathord}{lettersA}{06} - \re@DeclareMathSymbol{\varUpsilon}{\mathord}{lettersA}{07} - \re@DeclareMathSymbol{\varPhi}{\mathord}{lettersA}{08} - \re@DeclareMathSymbol{\varPsi}{\mathord}{lettersA}{09} - \re@DeclareMathSymbol{\varOmega}{\mathord}{lettersA}{10} - -\else - - \re@DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{00} - \re@DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{01} - \re@DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{02} - \re@DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{03} - \re@DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{04} - \re@DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{05} - \re@DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{06} - \re@DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{07} - \re@DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{08} - \re@DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{09} - \re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10} - - \re@DeclareMathSymbol{\otherGamma}{\mathord}{letters}{0} - \re@DeclareMathSymbol{\otherDelta}{\mathord}{letters}{1} - \re@DeclareMathSymbol{\otherTheta}{\mathord}{letters}{2} - \re@DeclareMathSymbol{\otherLambda}{\mathord}{letters}{3} - \re@DeclareMathSymbol{\otherXi}{\mathord}{letters}{4} - \re@DeclareMathSymbol{\otherPi}{\mathord}{letters}{5} - \re@DeclareMathSymbol{\otherSigma}{\mathord}{letters}{6} - \re@DeclareMathSymbol{\otherUpsilon}{\mathord}{letters}{7} - \re@DeclareMathSymbol{\otherPhi}{\mathord}{letters}{8} - \re@DeclareMathSymbol{\otherPsi}{\mathord}{letters}{9} - \re@DeclareMathSymbol{\otherOmega}{\mathord}{letters}{10} - - \re@DeclareMathSymbol{\varGamma}{\mathord}{letters}{0} - \re@DeclareMathSymbol{\varDelta}{\mathord}{letters}{1} - \re@DeclareMathSymbol{\varTheta}{\mathord}{letters}{2} - \re@DeclareMathSymbol{\varLambda}{\mathord}{letters}{3} - \re@DeclareMathSymbol{\varXi}{\mathord}{letters}{4} - \re@DeclareMathSymbol{\varPi}{\mathord}{letters}{5} - \re@DeclareMathSymbol{\varSigma}{\mathord}{letters}{6} - \re@DeclareMathSymbol{\varUpsilon}{\mathord}{letters}{7} - \re@DeclareMathSymbol{\varPhi}{\mathord}{letters}{8} - \re@DeclareMathSymbol{\varPsi}{\mathord}{letters}{9} - \re@DeclareMathSymbol{\varOmega}{\mathord}{letters}{10} - -\fi - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Extension (jkpex) Definition % largesymbols -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\DeclareMathAccent{\widearc}{\mathord}{largesymbols}{134} -\DeclareMathAccent{\widearcarrow}{\mathord}{largesymbols}{140} -\DeclareMathAccent{\wideOarc}{\mathord}{largesymbols}{140} -\DeclareMathAccent{\wideparen}{\mathord}{largesymbols}{146} - -\newcommand{\widering}[1]{\overset{\smash{\vbox to .2ex{% - \hbox{$\mathring{}$}}}}{\wideparen{#1}}} - -\renewcommand{\int}{\intop\kp@ilimits} -\renewcommand{\oint}{\ointop\kp@ilimits} - -\re@DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{96} - \def\coprod{\coprodop\kp@slimits} -\re@DeclareMathSymbol{\bigveeop}{\mathop}{largesymbols}{87} - \def\bigvee{\bigveeop\kp@slimits} -\re@DeclareMathSymbol{\bigwedgeop}{\mathop}{largesymbols}{86} - \def\bigwedge{\bigwedgeop\kp@slimits} -\re@DeclareMathSymbol{\biguplusop}{\mathop}{largesymbols}{85} - \def\biguplus{\biguplusop\kp@slimits} -\re@DeclareMathSymbol{\bigcapop}{\mathop}{largesymbols}{84} - \def\bigcap{\bigcapop\kp@slimits} -\re@DeclareMathSymbol{\bigcupop}{\mathop}{largesymbols}{83} - \def\bigcup{\bigcupop\kp@slimits} -\re@DeclareMathSymbol{\prodop}{\mathop}{largesymbols}{81} - \def\prod{\prodop\kp@slimits} -\re@DeclareMathSymbol{\sumop}{\mathop}{largesymbols}{80} - \def\sum{\sumop\kp@slimits} -\re@DeclareMathSymbol{\bigotimesop}{\mathop}{largesymbols}{78} - \def\bigotimes{\bigotimesop\kp@slimits} -\re@DeclareMathSymbol{\bigoplusop}{\mathop}{largesymbols}{76} - \def\bigoplus{\bigoplusop\kp@slimits} -\re@DeclareMathSymbol{\bigodotop}{\mathop}{largesymbols}{74} - \def\bigodot{\bigodotop\kp@slimits} -\re@DeclareMathSymbol{\bigsqcupop}{\mathop}{largesymbols}{70} - \def\bigsqcup{\bigsqcupop\kp@slimits} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Extension A (jkpexa) Definition % largesymbolsA -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\re@DeclareMathSymbol{\bignplusop}{\mathop}{largesymbolsA}{0} - \def\bignplus{\bignplusop\kp@slimits} -\re@DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsA}{2} - \def\bigsqcupplus{\bigsqcupplusop\kp@slimits} -\re@DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsA}{4} - \def\bigsqcapplus{\bigsqcapplusop\kp@slimits} -\re@DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsA}{6} - \def\bigsqcap{\bigsqcapop\kp@slimits} - -\def\narrowiints{\ifkp@narrowiints10\else0\fi} - -\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsA}{\narrowiints8} - \def\oiint{\oiintop\kp@ilimits} - -\def\narrowiints{\ifkp@narrowiints1\else0\fi} - -\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsA}{10} - \def\ointctrclockwise{\ointctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsA}{12} - \def\ointclockwise{\ointclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsA}{14} - \def\sqint{\sqintop\kp@ilimits} -\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsA}{16} -%\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18} -%\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32} -\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsA}{\narrowiints33} - \def\iint{\iintop\kp@ilimits} -\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsA}{\narrowiints35} - \def\iiint{\iiintop\kp@ilimits} -\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsA}{\narrowiints37} - \def\iiiint{\iiiintop\kp@ilimits} -\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsA}{\narrowiints39} - \def\idotsint{\idotsintop\kp@ilimits} -\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsA}{\narrowiints41} - \def\oiiint{\oiiintop\kp@ilimits} -\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsA}{43} - \def\varointctrclockwise{\varointctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsA}{45} - \def\varointclockwise{\varointclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsA}{62} - \def\fint{\fintop\kp@ilimits} -\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints64} - \def\oiintctrclockwise{\oiintctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints66} - \def\varoiintclockwise{\varoiintclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints68} - \def\oiiintctrclockwise{\oiiintctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints70} - \def\varoiiintclockwise{\varoiiintclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints72} - \def\oiintclockwise{\oiintclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints74} - \def\varoiintctrclockwise{\varoiintctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsA}{\narrowiints76} - \def\oiiintclockwise{\oiiintclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsA}{\narrowiints78} - \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\kp@ilimits} -\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsA}{\narrowiints80} - \def\sqiint{\sqiintop\kp@ilimits} -\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsA}{\narrowiints82} - \def\sqiiint{\sqiiintop\kp@ilimits} -\re@DeclareMathSymbol{\varintop}{\mathop}{largesymbolsA}{84} - \def\varint{\varintop\kp@ilimits} -\re@DeclareMathSymbol{\variintop}{\mathop}{largesymbolsA}{\narrowiints86} - \def\variint{\variintop\kp@ilimits} -\re@DeclareMathSymbol{\variiintop}{\mathop}{largesymbolsA}{\narrowiints88} - \def\variiint{\variiintop\kp@ilimits} -\re@DeclareMathSymbol{\variiiintop}{\mathop}{largesymbolsA}{\narrowiints90} - \def\variiiint{\variiiintop\kp@ilimits} -\re@DeclareMathSymbol{\varidotsintop}{\mathop}{largesymbolsA}{\narrowiints92} - \def\varidotsint{\varidotsintop\kp@ilimits} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Common Macros, too -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% Use math italic, not text, version of dot, in \vdots and \ddots definitions -\def\vdots{\vbox{\baselineskip4\p@ \lineskiplimit\z@ - \kern6\p@\hbox{$\m@th.$}\hbox{$\m@th.$}\hbox{$\m@th.$}}} -\def\ddots{\mathinner{\mkern1mu\raise7\p@ - \vbox{\kern7\p@\hbox{$\m@th.$}}\mkern2mu - \raise4\p@\hbox{$\m@th.$}\mkern2mu\raise\p@\hbox{$\m@th.$}\mkern1mu}} - - -%%% For \underbrace and \overbrace: -%%% use brace extenstion bar (in "20 of jkpexa) instead of vrule (Acroread Bug...) -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32} -\def\downbracefill{$\m@th% - \braceld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu% - \braceru\bracelu% - \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\bracerd$} -\def\upbracefill{$\m@th% - \bracelu\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu% - \bracerd\braceld% - \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\braceru$} - -%%% \not redefined: -%%% \not= becomes \ne -%%% \not< becomes \nless -%%% \not> becomes \ngtr -%%% if \notXXX is defined, \not\XXX becomes \notXXX; -%%% if \nXXX is defined, \not\XXX becomes \nXXX; -%%% otherwise, \not\XXX is done in the usual way. -\DeclareMathSymbol{\n@tch@r}{\mathrel}{symbols}{54} - -\DeclareRobustCommand*{\not}[1]{% - \ifx #1=\ne\else - \ifx #1<\nless\else - \ifx #1>\ngtr\else - \n@t@@n{#1}\fi\fi\fi} - -\def\n@t@@n#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\not@n@{#1}}% - {\@nameuse{\@gtempa}}} -\def\not@n@#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\n@tch@r #1}% - {\@nameuse{\@gtempa}}} - -%%%%%%%%%%%%%%%%%%% -% \D close integral -%%%%%%%%%%%%%%%%%%% - -\ifkp@Dcommand - \DeclareMathSymbol{\kp@D}{\mathord}{operators}{100} - \def\D#1{\mathclose{\,\ifkp@upRm\kp@D% - \else\mathit{d}% - \fi}#1} -\fi - -%%%%%%%%%%%% -% new arrows -%%%%%%%%%%%% - -\let\kp@ora\overrightarrow -\def\overrightarrow#1{\,\kp@ora{#1\:}} - -\let\kp@ura\underrightarrow -\def\underrightarrow#1{\,\kp@ura{#1\,}} - -\let\kp@ola\overleftarrow -\def\overleftarrow#1{\kp@ola{\:#1}\,} - -\let\kp@ula\underleftarrow -\def\underleftarrow#1{\kp@ula{\,#1}\,} - -%%% -\fi %%% End of no-math option -%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% \classicstylenums and \olstylenums -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\def\classicstylenums#1{{\fontfamily{jkp\kp@stylemath\kp@famillem}\selectfont #1}} - -%%% - -\let\kp@osn\oldstylenums - -\ifkp@os - \ifkp@osm % fulloldstyle - \def\oldstylenums#1{#1} - \else - \ifkp@vosm % oldstyle and veryoldstylemath - \def\oldstylenums#1{#1} - \else % oldstyle - \def\oldstylenums#1{% - \relax\ifmmode\kp@osn{#1}% - \else#1\fi} - \fi - \fi -\else - \ifkp@vos - \ifkp@vosm % fullveryoldstyle - \def\oldstylenums#1{#1} - \else - \ifkp@osm % veryoldstyle and oldstylemath - \def\oldstylenums#1{#1} - \else % veryoldstyle - \def\oldstylenums#1{% - \relax\ifmmode\kp@osn{#1}% - \else#1\fi} - \fi - \fi - \else - \ifkp@osm % oldstylemath - \def\oldstylenums#1{% - \relax\ifmmode#1% - \else\kp@osn{#1}\fi} - \else - \ifkp@vosm % veryoldstylemath - \def\oldstylenums#1{% - \relax\ifmmode#1% - \else\kp@osn{#1}\fi} - \fi - \fi - \fi -\fi - -\endinput diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib index b376f128712..2dd0abb3549 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.bib @@ -5,8 +5,8 @@ @Online{Bitouze, Title = {Conférence \LaTeX{} \no6}, Author = {Bitouzé, Denis}, - 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}, + Date = {2019-03-17}, + Url = {https://frama.link/en-ligne6}, Language = {french}, Organization = {Université du Littoral Côte d'Opale}, Subtitle = {Bibliographie (biber/biblatex), citations d'extraits}, @@ -15,8 +15,8 @@ @Online{Bitouze7, Title = {Conférence \LaTeX{} \no7}, Author = {Bitouzé, Denis}, - 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}, + Date = {2019-03-17}, + Url = {https://frama.link/en-ligne7}, Language = {french}, Organization = {Université du Littoral Côte d'Opale}, Subtitle = {Glossaires et (liste d’)acronymes, index}, 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 index 7f83add137c..556fa88645e 100644 Binary files a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf and b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex index a004e1facf5..1aa617a01bd 100644 --- a/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex +++ b/Master/texmf-dist/doc/latex/nwejm/french/documentation/nwejm-fr.tex @@ -1,12 +1,18 @@ \documentclass[french,nolocaltoc]{nwejmart} % -\DTMsavedate{release-date}{2018-04-07} -\newcommand{\releaseversion}{0.98e} +\DTMsavedate{release-date}{2019-03-18} +\newcommand{\releaseversion}{0.98f} % \usepackage{denisbdoc} \usepackage{tabulary} \usepackage[firstpage]{draftwatermark} % +\makeatletter +\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} +\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} +\reversemarginpar +\makeatother +% \indexsetup{level=\section*,toclevel=section,noclearpage} \makeindex[columns=2] \tcbset{index format=off} @@ -33,7 +39,14 @@ \newacronym{tdm}{tdm}{table des matières} % \newtheorem{article} -\newtheorem[title=Fait,style=definition]{fact} +\newtheorem[style=definition]{fait} +\newtheorem[title=expérience]{experience} +\newtheorem[title-plural=anneaux]{anneau} +\newtheorem[title=idéal,title-plural=idéaux]{ideal} +% +\newenumeration{conventions} +\newenumeration[singular=cas]{cas} +\newenumeration[singular=règle,plural=règles]{regles} % \DeclareMathOperator{\cat}{Cat} \newcommand{\mybinop}{\mathbin{*}} @@ -58,9 +71,9 @@ affiliation={% \etocarticlestylenomarks \localtableofcontents % -\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{\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 @@ -158,10 +171,10 @@ options de classe suivantes. \begin{docKey}{english}{}{pas de valeur, option par défaut} Cette option définit l'anglais comme langue de l'article. \end{docKey} -\begin{docKey}{french}{}{} +\begin{docKey}{french}{}{pas de valeur} Cette option définit le français comme langue de l'article. \end{docKey} -\begin{docKey}{german}{}{} +\begin{docKey}{german}{}{pas de valeur} Cette option définit l'allemand comme langue de l'article. Elle a pour alias \docAuxKey{ngerman}. \begin{dbremark}{Option de \package*{babel} sous-jacente à l'option @@ -169,9 +182,9 @@ options de classe suivantes. L'option de langue \refKey{german} de la \nwejmauthorcl{} appelle en sous-main l'option \docAuxKey*{ngerman} du \Package*{babel}. \end{dbremark} - \begin{docKey}{dutch}{}{} - Cette option définit le néerlandais comme langue de l'article. \end{docKey} +\begin{docKey}{dutch}{}{pas de valeur} + Cette option définit le néerlandais comme langue de l'article. \end{docKey} \begin{dbremark}{Langue par défaut de l'article}{} @@ -273,7 +286,7 @@ finale. \end{itemize} \end{docCommand} -\begin{bodycode} +\begin{bodycode}[listing options={deletekeywords={[2]title}}] \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 @@ -321,8 +334,7 @@ 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. -\begin{docKey}{affiliation}{={\oarg{tag}\marg{affiliation}}}{pas de valeur par défaut, - initialement vide} +\begin{docKey}{affiliation}{={\oarg{tag}\marg{affiliation}}}{pas de valeur par défaut,\\initialement vide} Cette clé permet de définir une (unique) \meta{affiliation}. Pour un auteur ayant plusieurs affiliations, cette clé est utilisée autant de fois que nécessaire. @@ -396,10 +408,10 @@ et \refKey{affiliationtagged} suivantes. forme d'une liste séparée par des virgules. La métadonnée \enquote{Mots-clés} 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 métadonnées 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. + automatiquement les \meta{mots clés} spécifiés. Dans le cas où ceux-ci + contiennent des caractères (notamment des mathématiques) non admis en + métadonnées des fichiers \file{PDF} , 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}}] @@ -434,7 +446,7 @@ Le titre proprement dit de l'article, regroupant tous les éléments saisis à l \end{itemize} \end{docCommand} -\begin{bodycode}[listing options={deletekeywords={[5]keywords}}] +\begin{bodycode}[listing options={deletekeywords={[2]title,article},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 @@ -469,7 +481,7 @@ Le titre proprement dit de l'article, regroupant tous les éléments saisis à l un article. \end{docCommand} -\begin{bodycode} +\begin{bodycode}[listing options={deletekeywords={[2]first}}] \acknowledgments{% The first author's research was supported by the Hungarian National Science Foundation Grants K81658 and K104183. Research conducted @@ -539,20 +551,23 @@ cf. par exemple][en français]{Bitouze}. \item Construire, dans un \meta{fichier bibliographique}\footnote{De tels fichiers sont d'extension \file{.bib}.}, une base bibliographique. - Nous conseillons pour ce faire de recourir à un logiciel dédié, par exemple - \href{http://jabref.sourceforge.net/}{\program{JabRef}} à configurer en se - rendant dans le menu \menuentry{Options>Preferences} et, dans l'onglet : - \begin{itemize} - \item \menuentry{Général}\footnote{On pourra en profiter pour changer la langue de - l'interface dans la liste déroulante \menuentry{Language}.}, en choisissant - \menuentry{UTF8} dans la liste déroulante \menuentry{Default encoding} ; - \item \menuentry{Advanced}, en cochant l'option \menuentry{BibLaTeX mode} ; - \end{itemize} + Pour ce faire, nous recommandons de recourir à un logiciel dédié, par exemple + \href{http://jabref.sourceforge.net/}{\program{JabRef}} que nous conseillons + de configurer en visitant le menu + \menuentry{Options>Preferences>General} et en choisissant dans les listes + déroulantes : + \begin{description} + \item[\menuentry{Default encoding} :] \menuentry{UTF8} ; + \item[\menuentry{Default bibliography mode} :] \menuentry{biblatex}. + \end{description} + On pourra en profiter pour changer la langue de l'interface dans la liste + déroulante \menuentry{Language}. On n'oubliera pas de donner à chaque référence bibliographique une \meta{clé} permettant de l'identifier de façon unique dans la base - bibliographique\footnote{Sous \program{JabRef}, on pourra se faire aider pour - cela par l'icône en forme de \enquote{baguette magique} ou de clé.}. + bibliographique\footnote{Sous \program{JabRef}, l'icône en forme de + \enquote{baguette magique} ou de clé aide à générer ladite + \meta{clé}.}. \item Dans le fichier source \file{.tex} : \begin{enumerate} \item \emph{En préambule}, utiliser la commande \docAuxCommand{addbibresource} @@ -565,11 +580,11 @@ cf. par exemple][en français]{Bitouze}. \docAuxCommand{cite}.}\footnote{La référence est alors détaillée en note de bas de page.} ou, éventuellement, \docAuxCommand{textcite}\footnote{La 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é}) : + du \Package*{biblatex} pour citer des références bibliographiques (chacune + pourvue d'une \meta{clé}) : \begin{bodycode}[listing options={alsolanguage={[biblatex]TeX}}] -\autocite{"\meta{clé}"} -\textcite{"\meta{clé}"} +...\autocite{"\meta{clé1}"}... \textcite{"\meta{clé2}"} ... +...\autocite{"\meta{clé3,clé4}"}... \textcite{"\meta{clé5,clé6}"} ... \end{bodycode} \item À la fin du document, faire figurer la liste des références bibliographiques au moyen de la commande \refCom{printbibliography}. @@ -587,7 +602,7 @@ cf. par exemple][en français]{Bitouze}. Par exemple, si le \File{.bib} contient : -\begin{bodycode}[listing only,listing options={alsolanguage={[biblatex]TeX},deletekeywords={[2]series}}] +\begin{bodycode}[listing only,listing options={alsolanguage={[biblatex]TeX},deletekeywords={[2]series,geometry}}] @Book{ har, author = {Hartshorne, Robin}, title = {Algebraic geometry}, @@ -621,8 +636,8 @@ alors, le source \file{.tex} suivant : \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 -second assertion, see \textcite[theorem~(0.4)]{shin}. +Kawamata-Viehweg vanishing\autocite[Theorem~4.3.1]{laz1}. For the +second assertion, see \textcite[Theorem~(0.4)]{shin}. % \printbibliography \end{bodycode} @@ -637,14 +652,19 @@ donne le texte figurant dans l'encadré intitulé \enquote{Exemple de } \makeatother \ExplSyntaxOff +\renewcommand{\thempfootnote}{\arabic{mpfootnote}} +% \begin{bodycode}[text only,float,title={Exemple de bibliographie},label=biblio] +\StandardFootnotes 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}. +vanishing\autocite[Theorem~4.3.1]{laz1}. For the second assertion, see +\textcite[Theorem~(0.4)]{shin}. % \printbibliography[heading=origsectionnotintoc,category=examples] \end{bodycode} +% +\renewcommand{\thempfootnote}{\alph{mpfootnote}} \section{Commandes propres aux mathématiques} \label{sec:comm-propr-aux} @@ -750,7 +770,7 @@ La \nwejmauthorcl{} : \subsubsection{Ensembles définis} -\begin{docCommand}{set}{\marg{définition}\oarg{caractérisation}} +\begin{docCommand}[doc updated=2019-03-18]{set}{\marg{définition}\oarg{caractérisation}} Cette commande affiche l'ensemble défini par \meta{définition}, avec une éventuelle \meta{caractérisation}\footnote{Partie suivant \enquote{tels que}.}. @@ -935,7 +955,7 @@ de délimiteurs au moyen de la commande \refCom{NewPairedDelimiter}. right=\rfloor, subscript=\text{eff} } -\begin{preamblecode} +\begin{preamblecode}[listing options={morekeywords={[2]left,right,subscript}}] \NewPairedDelimiter{\floor}{ left=\lfloor, right=\rfloor, @@ -1011,8 +1031,7 @@ usuelle \refCom{DeclareMathOperator}. \DeclareMathOperator{\cat}{Cat} \end{preamblecode} \begin{bodycode}[listing and text,listing options={deletekeywords={example},deletekeywords={[4]all}}] -A standard example is $\cat$, the $2$-category of all (small) -categories. +A standard example is $\cat$, the $2$-category of all (small) ideals. \end{bodycode} \subsubsection{(Usage avancé) Précautions en cas d'opérations binaires non @@ -1047,7 +1066,7 @@ le déclarer au moyen de la commande \refCom{BinaryOperators}. \subsection{Divers} \begin{dbremark}{Commandes propres au français (bis)}{} - Les commandes suivantes ne sont définies redéfinies que pour les articles en + Les commandes suivantes ne sont redéfinies que pour les articles en français. \end{dbremark} @@ -1064,7 +1083,7 @@ Pour faciliter la composition des théorèmes et objets analogues, la \nwejmauthorcl{} fournit des environnements prêts à l'emploi et permet d'en créer de nouveaux si besoin est (cf. commande \refCom{newtheorem}). -\subsubsection{Environnements de type \enquote{théorème} prédéfinis} +\subsubsection{Environnements prédéfinis} \label{sec:envir-de-type} La \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis par la @@ -1107,13 +1126,10 @@ La \vref{env-theorems} liste les théorèmes et objets analogues prédéfinis pa \end{theorem} \begin{definition}[congruence modulo $n$] Soit $n$ un entier supérieur ou égal à $2$. Deux entiers $a$ et $b$ - sont dits congruents modulo $n$ si $a - b \in n\bbZ$ + sont dits congruents modulo $n$ si $a - b \in n\bbZ$. \end{definition} \begin{remark*} - Une des plus belles relations mathématiques est : - \[ - e^{i\pi}+1=0. - \] + Une des plus belles relations mathématiques est $\E[i\pi]+1=0$. \end{remark*} \begin{proof} Tout ce qui est rare est cher. Or un cheval bon marché est rare. @@ -1141,7 +1157,7 @@ Style & Titre récurrent & Contenu \label{env-theorems-styles} \end{table} -\subsubsection{Environnements de type \enquote{théorème} personnels} +\subsubsection{Environnements définis par l'utilisateur} \label{sec:envir-de-type-1} Si les environnements de \enquote{théorème} fournis par la classe ne suffisent @@ -1159,65 +1175,138 @@ pas, la commande \refCom{newtheorem} permet d'en créer de nouveaux. Cette commande crée également l'environnement étoilé \meta{nom}|*| produisant des occurrences \emph{non} numérotées de ce \enquote{théorème}. - Si les valeurs par défaut du titre récurrent (\meta{Nom}) ou du style - (\docValue{theorem}) ne conviennent pas, il suffit spécifier celles souhaitées - en \meta{option(s)} au moyen des clés \refKey{title} et \refKey{style} - suivantes. - \begin{docKey}{title}{={\meta{titre récurrent}}}{pas de - valeur par défaut, initialement vide} - Cette clé permet de spécifier un \meta{titre récurrent} différent de - \meta{Nom}, valable quelle que soit la langue de l'article. - \end{docKey} +\begin{preamblecode}[listing options={deletekeywords={[2]article}}] +\newtheorem{article} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]article,label}}] +\begin{article*}[dit premier] +Les hommes naissent et demeurent libres et égaux en droits [...] +\end{article*} +\begin{article}[dit premier]\label{premier} +Les hommes naissent et demeurent libres et égaux en droits [...] +\end{article} +L'\vref{premier} est le plus célèbre. +\end{bodycode} + + Si la valeur par défaut du style (\docValue{theorem}) ne convient pas, il + suffit de spécifier en \meta{option(s)} celle souhaitée au moyen de la clé + \refKey{style} suivante. \begin{docKey}{style}{=\docValue{theorem}\textbar\docValue{definition}\textbar\docValue{proof}}{pas de valeur par défaut,\\initialement \docValue{theorem}} Cette clé permet de spécifier le style du \enquote{théorème} à créer, au moyen des valeurs \docValue{theorem}, \docValue{definition} et \docValue{proof}. \end{docKey} +\begin{preamblecode} +\newtheorem[style=definition]{fait} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{fait}\label{majeure} +Tout ce qui est rare est cher. +\end{fait} +\begin{fait}\label{mineure} +Un cheval bon marché est rare. +\end{fait} +En vertu des \cref{mineure,majeure}, un cheval bon marché est +cher. +\end{bodycode} - Si besoin est, il est même possible de spécifier des titres récurrents - différents selon la langue utilisée au moyen des clés suivantes : - \begin{docKey}{title/english}{={\meta{titre récurrent en anglais}}}{pas de - valeur par défaut,\\initialement vide} - \end{docKey} - \begin{docKey}{title/french}{={\meta{titre récurrent en français}}}{pas de - valeur par défaut,\\initialement vide} - \end{docKey} - \begin{docKey}{title/german}{={\meta{titre récurrent en allemand}}}{pas de - valeur par défaut,\\initialement vide} + Si la valeur par défaut du titre récurrent (\meta{Nom}) ne convient pas, il + suffit de spécifier en \meta{option(s)} celle souhaitée au moyen de la clé + \refKey{title} suivante. + \begin{docKey}{title}{={\meta{titre récurrent}}}{pas de + valeur par défaut, initialement vide} + Cette clé permet de spécifier un \meta{titre récurrent} différent de + \meta{Nom}, valable quelle que soit la langue de l'article. \end{docKey} - \begin{docKey}{title/dutch}{={\meta{titre récurrent en néerlandais}}}{pas de - valeur par défaut,\\initialement vide} - Ces clés permettent de spécifier un \meta{titre récurrent} différent - de \meta{Nom} pour la langue correspondante. +\begin{preamblecode} +\newtheorem[title=expérience]{experience} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{experience}\label{un} +On lance un dé à 6 faces [...] +\end{experience} +\begin{experience}\label{deux} +On lance deux dés à 6 faces [...] +\end{experience} +Les \vref{un,deux} mettent en évidence [...] +\end{bodycode} + + On remarque que, en cas de références croisées au moyen de la commande + recommandée\footnote{Cf. \vref{sec-references-croisees}} \refCom{vref} (ou + \refCom{cref}), le titre récurrent du ou des \enquote{théorèmes} référencés + est automatiquement ajouté à la référence et ce, éventuellement sous sa forme + plurielle. Par défaut, cette dernière est obtenue en ajoutant un \enquote{s} + final à \meta{nom} ou au \meta{titre récurrent} fixée par l'option + \refKey{title}. Si cette forme plurielle doit être construite différemment, il + convient de le spécifier en \meta{option(s)} au moyen de la clé + \refKey{title-plural} suivante. + \begin{docKey}{title-plural}{={\meta{forme plurielle du titre récurrent}}}{pas de + valeur\\par défaut, initialement vide} + Cette clé permet de spécifier la forme plurielle du titre récurrent. \end{docKey} +\begin{preamblecode} +\newtheorem[title-plural=anneaux]{anneau} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{anneau}\label{anneau} +Considérons un anneau : [...] +\end{anneau} +\begin{anneau}\label{anneau-bis} +Considérons un autre anneau : [...] +\end{anneau} +Les \vref{anneau,anneau-bis} admettent [...] +\end{bodycode} \begin{preamblecode} -\newtheorem{article} -\newtheorem[title/french=Fait,style=definition]{fact} +\newtheorem[title=idéal,title-plural=idéaux]{ideal} \end{preamblecode} -\begin{bodycode}[listing and text] -\begin{article}[dit premier] -Les hommes naissent et demeurent libres et égaux en droits [...] -\end{article} -\begin{fact*} -Tout ce qui est rare est cher. -\end{fact*} -\begin{fact} -Un cheval bon marché est rare. -\end{fact} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{ideal}\label{ideal} +Considérons un idéal : [...] +\end{ideal} +\begin{ideal}\label{ideal-bis} +Considérons un autre idéal : [...] +\end{ideal} +Les \vref{ideal,ideal-bis} admettent [...] \end{bodycode} + + % Si besoin est, il est même possible de spécifier des titres récurrents + % différents selon la langue utilisée au moyen des clés suivantes : + % \begin{docKey}{title/english}{={\meta{titre récurrent en anglais}}}{pas de + % valeur par défaut,\\initialement vide} + % \end{docKey} + % \begin{docKey}{title/french}{={\meta{titre récurrent en français}}}{pas de + % valeur par défaut,\\initialement vide} + % \end{docKey} + % \begin{docKey}{title/german}{={\meta{titre récurrent en allemand}}}{pas de + % valeur par défaut,\\initialement vide} + % \end{docKey} + % \begin{docKey}{title/dutch}{={\meta{titre récurrent en néerlandais}}}{pas de + % valeur par défaut,\\initialement vide} + % Ces clés permettent de spécifier un \meta{titre récurrent} différent + % de \meta{Nom} pour la langue correspondante. + % \end{docKey} \end{docCommand} -\subsection{Listes d'hypothèses ou d'assertions} +\subsection{Énumérations} \label{sec:list-dhyp-ou} -Dans les articles en mathématiques, il est fréquent que les auteurs aient -à lister des assertions ou des hypothèses et à s'y référer. Pour ce faire, la -\nwejmauthorcl{} fournit deux environnements qui s'emploient comme l'habituel -environnement \docAuxEnvironment{enumerate} de listes ordonnées (numérotées) : -\refEnv{assertions} et \refEnv{hypotheses}, dans lesquels chaque assertion ou -hypothèse est introduite par la commande \docAuxCommand{item}. +Pour faciliter la composition des énumérations (d'hypothèses, d'assertions, de +conditions, etc.), la \nwejmauthorcl{} fournit des environnements prêts +à l'emploi et permet d'en créer de nouveaux si besoin est (cf. commande +\refCom{newenumeration}). + +\subsubsection{Énumérations prédéfinies} +\label{sec:predefinies-:-listes} + +Dans les articles en mathématiques, il est fréquent d'énumérer des assertions, +hypothèses ou conditions et de s'y référer. Pour ce faire, la \nwejmauthorcl{} +fournit trois environnements qui s'emploient comme l'habituel environnement +\docAuxEnvironment{enumerate} de listes ordonnées (numérotées) : +\refEnv{assertions}, \refEnv{hypotheses} et \refEnv{conditions}, dans lesquels +chaque assertion, hypothèse ou condition est introduite par la commande +\docAuxCommand{item}. \begin{docEnvironment}[doclang/environment content=assertions]{assertions}{} Cet environnement compose une liste d'assertions. @@ -1225,10 +1314,13 @@ hypothèse est introduite par la commande \docAuxCommand{item}. \begin{docEnvironment}[doclang/environment content=hypothèses]{hypotheses}{} Cet environnement compose une liste d'hypothèses. \end{docEnvironment} +\begin{docEnvironment}[doc new=2019-03-18,doclang/environment content=conditions]{conditions}{} + Cet environnement compose une liste de conditions. +\end{docEnvironment} -\begin{bodycode}[listing and text] +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] \begin{axiom}\label{mon-axiome} - Chacune des assertions suivantes est admise. + 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. @@ -1238,6 +1330,103 @@ En vertu des \vref{rare-cher,cheval} de l'\vref{mon-axiome}, un cheval bon marché est cher. \end{bodycode} +\subsubsection{Énumérations définies par l'utilisateur} + +Si les énumérations fournies par la classe ne suffisent pas, il est possible +d'en créer de nouvelles au moyen de la commande \refCom{newenumeration}. + +\begin{docCommand}[doc new=2019-03-18]{newenumeration}{\oarg{option(s)}\marg{nom}} + Cette commande crée un nouvel environnement \LaTeX{}, \meta{nom}, qui + s'emploie comme l'habituel environnement \docAuxEnvironment{enumerate} de + listes ordonnées (numérotées) dans lequel chaque item à énumérer + est introduit par la commande \docAuxCommand{item}. + +\begin{preamblecode} +\newenumeration{conventions} +\end{preamblecode} +\begin{bodycode}[listing and text] +\begin{conventions} +\item Le cheval est bon marché. +\item Le cheval est cher. +\end{conventions} +\end{bodycode} + + On constate que chaque item énuméré est introduit par un label par défaut + constitué de l'initiale du \meta{nom} et indexé par un chiffre arabe, le tout + entre parenthèses. Si ce label ne convient pas, il suffit de spécifier celui + souhaité en \meta{option(s)} au moyen de la clé \refKey{label}. + \begin{docKey}{label}{={\meta{label}}}{pas de + valeur par défaut, initialement initiale du \meta{nom}} + Cette clé permet de spécifier un \meta{label} différent de l'initiale du + \meta{nom} de l'environnement. + \end{docKey} +\renewenumeration[label=K]{conventions} +\begin{preamblecode} +\newenumeration[label=K]{conventions} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{conventions} +\item\label{k-one} Le cheval est bon marché. +\item\label{k-two} Le cheval est cher. +\end{conventions} +Cf. \vref{k-one}. Cf. \vref{k-one,k-two}. +\end{bodycode} + +On remarque que, en cas de références croisées au moyen de la commande +recommandée\footnote{Cf. \vref{sec-references-croisees}} \refCom{vref} (ou +\refCom{cref}), le \meta{nom} de la ou des énumérations référencées est +automatiquement ajouté à la référence et ce, sous ses formes singulière ou +plurielle selon les cas. Par défaut, la forme : +\begin{description} +\item[plurielle] est le \meta{nom} ; +\item[singulière] est obtenue en supprimant la dernière lettre\footnote{Supposée être + souvent un \enquote{s}.} du \meta{nom}. +\end{description} +Si ces formes singulière ou plurielle doivent être construites différemment, il +convient de le spécifier en \meta{option(s)} au moyen des clés +\refKey{singular} et \refKey{plural} suivantes. + \begin{docKey}{singular}{={\meta{forme singulière de l'énumération}}}{pas de + valeurpar défaut,\\initialement vide} + Cette clé permet de spécifier la forme singulière de l'énumération. + \end{docKey} + \begin{docKey}{plural}{={\meta{forme plurielle de l'énumération}}}{pas de + valeur par défaut,\\initialement vide} + Cette clé permet de spécifier la forme plurielle de l'énumération. + \end{docKey} +\begin{preamblecode} +\newenumeration[singular=cas]{cas} % Sinon, forme sing. = « ca ». +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{cas} +\item\label{case-one} Le cheval est bon marché. +\item\label{case-two} Le cheval est cher. +\end{cas} +Cf. \vref{case-one}. Cf. \vref{case-one,case-two}. +\end{bodycode} + +\begin{preamblecode} +\newenumeration[singular=règle,plural=règles]{regles} +\end{preamblecode} +\begin{bodycode}[listing and text,listing options={deletekeywords={[2]label}}] +\begin{regles} +\item\label{regle-one} Le cheval est bon marché. +\item\label{regle-two} Le cheval est cher. +\end{regles} +Cf. \vref{regle-one}. Cf. \vref{regle-one,regle-two}. +\end{bodycode} +% +\end{docCommand} + +Au besoin, la commande \refCom{renewenumeration} permet de redéfinir une +énumération préalablement définie au moyen de la commande +\refCom{newenumeration}. + +\begin{docCommand}[doc new=2019-03-18]{renewenumeration}{\oarg{option(s)}\marg{nom}} + Cette commande reféfinit l'environnement d'énumération \meta{nom}. Ses + \meta{option(s)} sont les mêmes que celles de la commande + \refCom{newenumeration}. +\end{docCommand} + \section{Commandes généralistes} \label{sec:comm-gener} @@ -1312,8 +1501,8 @@ On soupçonne que non \aside*{par exemple on s'attend à ce que \section{Sélection d'outils fournis par des packages tiers} -Cette section donne une liste d'outils (commandes et environnements) fournis par -des packages automatiquement chargés par la +Cette section liste un certain nombre d'outils (commandes et environnements) +fournis par des packages automatiquement chargés par la \nwejmauthorcl\footnote{L'\vref{sec-packages-charges-ou-pas} liste ceux dont les fonctionnalités peuvent être utiles aux auteurs.}. @@ -1332,30 +1521,52 @@ des packages automatiquement chargés par la \subsection{Références croisées} \label{sec-references-croisees} -Le \Package*{cleveref}, utilisé conjointement avec le \Package*{varioref}, rend la -commande \refCom{vref} de ce dernier très puissante. +\DeclareFixedFootnote{\objets}{Section, équation, théorème, figure, tableau, + etc.} + +Le \Package*{cleveref} rend puissante la gestion des références croisées. Il +fournit notamment les commandes \refCom{cref} et \refCom{vref} suivantes. + +\begin{docCommand}{cref}{\brackets{\meta{label$_1$},...,\meta{label$_n$}}} + Si un ou plusieurs objets\objets{} sont labellisés au moyen de + \lstinline[deletekeywords={[2]label}]|\label{|\meta{label$_1$}|}|,..., + \lstinline[deletekeywords={[2]label}]|\label{|\meta{label$_n$}|}|, la commande + \refCom{cref} : + \begin{itemize} + \item en affiche les numéros\footnote{Entourés de parenthèses quand c'est + l'usage, p. ex. pour les équations.} ; + \item en détecte les natures\objets{} et affiche avant leurs numéros les mots clés + correspondants\footnote{Fonctionnalité fournie par le \Package{cleveref}.}, + automatiquement traduit dans la langue de l'article\footnote{Fonctionnalité + fournie par la \nwejmauthorcl.}. + \end{itemize} + % +\begin{bodycode}[listing and text] +On se reportera aux \cref{sec-titre,sec-auteurs} [...] +\end{bodycode} +\end{docCommand} -\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 - |\label{|\meta{label}|}| et : +\begin{docCommand}{vref}{\brackets{\meta{label$_1$},...,\meta{label$_n$}}} + Cette commande : \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}.} ; - \item détecte la nature de cet objet et fait précéder le numéro de celui-ci du - mot clé correspondant\footnote{Fonctionnalité fournie par le - \Package{cleveref}.} automatiquement traduit dans la langue de - l'article\footnote{Fonctionnalité fournie par la \nwejmauthorcl.} ; - \item fait de la référence à l'objet (numéro et éventuel numéro de page) un - lien hypertexte vers l'objet\footnote{Fonctionnalité fournie par le - \Package{hyperref}.}. + \item reprend les fonctionnalités de \refCom{cref} ; + \item affiche\footnote{Ou pas selon le contexte.} après les numéros des objets + référencés les (numéros de) pages où ils se situent\footnote{Fonctionnalité + fournie par le \Package{varioref}.}. \end{itemize} + + % \begin{bodycode}[listing and text] -[...] on se reportera à l'\vref{sec-canevas-de-fichier} pour un -canevas de fichier source [...] +On se reportera aux \vref{sec-titre,sec-auteurs} [...] \end{bodycode} \end{docCommand} +\begin{dbremark}{Liens hypertextes vers l'objet référencé}{} + Les numéros et éventuels \aside{numéros de} pages des références croisées + créées avec \refCom{cref} et \refCom{vref} sont des liens hypertextes vers les + objets référencés\footnote{Fonctionnalité fournie par le \Package{hyperref}.}. +\end{dbremark} + % \begin{dbremark}{\docAuxCommand{ref} et \docAuxCommand{eqref} : clones de \protect\refCom{vref}}{} % Les traditionnelles commandes \docAuxCommand{ref} et \docAuxCommand{eqref} ont % été redéfinies par la \nwejmauthorcl pour fonctionner de façon identique @@ -1504,6 +1715,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é}. +\renewcommand{\thempfootnote}{\arabic{mpfootnote}} \begin{bodycode}[listing and text,listing options={alsolanguage={[biblatex]TeX},alsolanguage={[csquotes]TeX},deletekeywords={[3]footnote}}] \citeauthor{Bitouze} précise que : \blockcquote{Bitouze}{% @@ -1513,6 +1725,7 @@ Il lui répondit : \enquote{Courteline disait: \enquote{Passer dépassant 3~lignes.}.% }. \end{bodycode} +\renewcommand{\thempfootnote}{\alph{mpfootnote}} \end{docCommand} La commande \refCom{blockcquote} admet des arguments optionnels permettant @@ -1574,10 +1787,10 @@ 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={alsolanguage={[hyperref]TeX},deletekeywords={math},deletekeywords={[2]url}}] +\begin{bodycode}[listing and text,listing options={alsolanguage={[hyperref]TeX},deletekeywords={math},deletekeywords={[2]url,math}}] \begin{enumerate} -\item Les données que j’ai rassemblées [...] -\item Les données que j’ai recueillies sont +\item Les données que j'ai rassemblées [...] +\item Les données que j'ai recueillies sont \begin{enumerate*} \item disponibles publiquement sur internet : pages Web et CV des conférenciers ; diff --git a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx index 129e60adbd5..a5efc1fe1e6 100644 --- a/Master/texmf-dist/source/latex/nwejm/nwejm.dtx +++ b/Master/texmf-dist/source/latex/nwejm/nwejm.dtx @@ -13,7 +13,7 @@ new journal "North-Western European Journal of Mathematics". Release ------- -2018/04/07 v0.98e +2019/03/18 v0.98f Development ----------- @@ -44,7 +44,7 @@ https://github.com/dbitouze/nwejm. \input l3docstrip.tex \Msg{********************************************************} \Msg{* Installation} -\Msg{* Class: nwejm 2018/04/07 v0.98e} +\Msg{* Class: nwejm 2019/03/18 v0.98f} \Msg{* for the journal} \Msg{* "North-Western European Journal of Mathematics" (DB)} \Msg{********************************************************} @@ -61,7 +61,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later \endpreamble \postamble -Copyright (C) 2015-2018 by Denis Bitouze +Copyright (C) 2015-2019 by Denis Bitouze This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -174,6 +174,29 @@ Running "make install" installs the files in the local TeX tree. % %\maketitle % +% \changes{v0.98f}{2019/03/18}{% +% \begin{itemize} +% \item ix page numbers of the standalone articles were not deduced from the +% whole issue. +% \item Fix wrong languages switches in the whole issue. +% \item Command for easily create new enumerations. +% \item ×\fixpagenumber× command to manually control the page numbers (to be used +% instead of \setcounter{page}). +% \item Fix language dependant glossaries' rules were correctly applied. +% \item Fix layouts were likely different between ×issue× and ×article× versions. +% \item Fix unique (auto)citations with multiple keys in case of French. +% \item Temporary trick in order to avoid inappropriate capitalization of the +% initial after periods abbreviating journals (see +% \url{https://github.com/plk/biblatex/issues/851}). +% \item ×authoryear× bib and cite style changed for ×authoryear-comp×. +% \item "Such that" symbol in sets definitions now is ×\vert× instead of ×\slash×. +% \item New built-in enumeration: conditions. +% \item Plural forms of (new) theorems now handled. +% \item hyperfootnotes now true since it happens bib footnotes texts are not on +% the page as footnotes marks. +% \item Documentation improved. +% \end{itemize} +% }% % \changes{v0.98e}{2018/04/07}{Package \package{mathrsfs} replaced by % \Package{rsfso}. Documentation slighty improved.}% % \changes{v0.98d}{2017/02/14}{No functional changes: this new version only @@ -289,8 +312,8 @@ Running "make install" installs the files in the local TeX tree. \ProvidesExplClass % {nwejm} % {nwejmart} - {2018/04/07} - {0.98e} + {2019/03/18} + {0.98f} { Class for the journal "North-Western European Journal of Mathematics". } @@ -369,19 +392,7 @@ Running "make install" installs the files in the local TeX tree. %<*class> % \end{macrocode} % -% \begin{macro}{\c_@@_pagegrid_dim} -% We declare the constant dimension of the pagegrid, when enabled. -% \begin{macrocode} -\dim_const:Nn \c_@@_pagegrid_dim { 1mm} -% \end{macrocode} -% \end{macro} -% -% We define some class options: -% \begin{itemize} -% \item "pagegrid" in order to draw a grid on each page, in order to check the -% layout (most debugging purpose), -% \item ... -% \end{itemize} +% We define some class options. % % \begin{macrocode} \bool_new:N \g_@@_for_authors_bool @@ -395,8 +406,6 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \keys_define:nn { nwejm } { - pagegrid .dim_gset:N = \g_@@_pagegrid_dim, - pagegrid .default:n = {\c_@@_pagegrid_dim}, output .choice:, output / cover .code:n = {% \bool_gset_true:N \g_@@_for_printer_bool% @@ -750,11 +759,6 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% \item Print page grid in background: -% \begin{macrocode} -\RequirePackage[foreground]{pagegrid}% -% \end{macrocode} -% % \item Tools to load and manipulate data: % \begin{macrocode} \RequirePackage{datatool}% @@ -899,8 +903,8 @@ Running "make install" installs the files in the local TeX tree. % % \item Hypertext marks: % \begin{macrocode} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% -\AtBeginDocument{% +\RequirePackage[pdfencoding=unicode,final]{hyperref}% +\AtEndPreamble{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% % \end{macrocode} @@ -1932,10 +1936,13 @@ Running "make install" installs the files in the local TeX tree. % version of the class (the first pages are for the table of contents which % was decided to be in frontmatter), % \item mainmatter\footnote{Page numbers in arabic, right page style, right -% geometry of the page.} in the \enquote{article} version of the class. +% geometry of the page.} in the \enquote{article} version of the class. In +% this case, we also use the \enquote{main geometry} of the \enquote{issue} +% version of the class, otherwise, the layouts of the two versions are likely +% to be different. % \end{itemize} % \begin{macrocode} -% \AtBeginDocument{\g_@@_mainmatter_switch_tl} +% \AfterEndPreamble{\g_@@_mainmatter_switch_tl} % \end{macrocode} % % \section{Options} @@ -2179,6 +2186,17 @@ Running "make install" installs the files in the local TeX tree. title / german .value_required:n = true, title / dutch .value_required:n = true, % + title-plural .tl_set:N = \l_@@_newtheorem_title_plural_tl, + title-plural / french .tl_set:N = \l_@@_newtheorem_french_title_plural_tl, + title-plural / english .tl_set:N = \l_@@_newtheorem_english_title_plural_tl, + title-plural / german .tl_set:N = \l_@@_newtheorem_german_title_plural_tl, + title-plural / dutch .tl_set:N = \l_@@_newtheorem_dutch_title_plural_tl, + title-plural .value_required:n = true, + title-plural / french .value_required:n = true, + title-plural / english .value_required:n = true, + title-plural / german .value_required:n = true, + title-plural / dutch .value_required:n = true, + % style .choice:, style / theorem .code:n = {\_@@_theorem_style:n {theorem}}, style / definition .code:n = {\_@@_theorem_style:n {definition}}, @@ -2823,10 +2841,18 @@ Running "make install" installs the files in the local TeX tree. % %\file_if_exist:nT { \c_@@_main_file_name_tl.aux } %{\externaldocument[@@-]{\c_@@_main_file_name_tl} -% \AtBeginDocument{\setcounter{page}{\number\numexpr\getpagerefnumber{@@-\currfilebase}}} +% \AfterEndPreamble{\setcounter{page}{\number\numexpr\getpagerefnumber{@@-\currfilebase}}} %} % \end{macrocode} % +% In case one wants to manually control the page numbers, the following macro +% ×\fixpagenumber{...}× has to be used instead of ×\setcounter{page}{...}×. +% \begin{macrocode} +\NewDocumentCommand \fixpagenumber { m } { +%\setcounter{page}{#1} +} +% \end{macrocode} +% % \section{User level commands} % % Here, we gather all the user level (public) commands. @@ -3217,30 +3243,83 @@ Running "make install" installs the files in the local TeX tree. % % We create a variant of the "\input" macro to be use for the input of each % article: it starts a new \package{biblatex}'s "refsection" and reset to zero -% some counters. +% some counters. It also redefine the glossaries' rules since glossaries' +% acronyms' suffix in effect are not for the last loaded language (see +% \url{https://tex.stackexchange.com/q/475788/18401}). % \begin{macrocode} \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection - \tl_if_eq:nnTF { #1 } { german } {% - \selectlanguage{ngerman} - }{ - \tl_if_eq:nnTF { #1 } { french } {% - \selectlanguage{french} - \g_@@_french_crefname_tl - }{ - \selectlanguage{#1} + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} + \renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} + \StandardFootnotes + \str_case:nn {#1} { + {english} { + \selectlanguage{english} + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% } - }% + {german} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {ngerman} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {french} { + \selectlanguage{french} % \end{macrocode} % % Though we switch to \pkg{babel}'s ×french×, footnotes are not displayed as % French ones in the issue. The following fixes this trouble. % \begin{macrocode} - \tl_if_eq:nnTF { #1 } { french } {% - \FrenchFootnotes - }{% - \StandardFootnotes - } + \FrenchFootnotes + \g__nwejm_french_crefname_tl + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}% + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{} + \renewcommand*{\glsupacrpluralsuffix}{} + } + {dutch} { + \selectlanguage{dutch} + \renewcommand*{\glossaryname}{Woordenlijst}% + \renewcommand*{\acronymname}{Acroniemen}% + \renewcommand*{\entryname}{Benaming}% + \renewcommand*{\descriptionname}{Beschrijving}% + \renewcommand*{\symbolname}{Symbool}% + \renewcommand*{\pagelistname}{Pagina's}% + \renewcommand*{\glssymbolsgroupname}{Symbolen}% + \renewcommand*{\glsnumbersgroupname}{Cijfers}% + } + }% % \end{macrocode} % % We reset setup possibly chosen in previous articles. @@ -3317,7 +3396,6 @@ Running "make install" installs the files in the local TeX tree. \iow_now:Nx \g_@@_bib_out_iow {% @periodical{\c_@@_issue_bib_key_tl,\iow_newline: issuetitle = {\exp_not:f\c_@@_journal_title_string_tl},\iow_newline: - date = {\g_@@_bib_issue_date_tl},\iow_newline: number = \int_use:N \g_@@_issue_number_int,\iow_newline: % issn = {\l_@@_journal_issn_tl},\iow_newline: options = {skipbib}\iow_newline: @@ -3604,7 +3682,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % We enforce all the previous floats to be processed before a new article starts -% (this is already done in "acknowledgments"environment but is repeated here if +% (this is already done in "acknowledgments" environment but is repeated here if % what is before provides floats but not acknowledgments). % \begin{macrocode} % \FloatBarrier% @@ -4174,7 +4252,7 @@ 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 +\cs_new_protected:Nn \_@@_new_theorem:nnnnnnnnn { \IfTranslation{English}{#1}{% }{% @@ -4192,12 +4270,30 @@ Running "make install" installs the files in the local TeX tree. }{% \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}% } + % + \IfTranslation{English}{#1-plural}{% + }{% + \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}% + } + \IfTranslation{French}{#1-plural}{% + }{% + \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}% + } + \IfTranslation{German}{#1-plural}{% + }{% + \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}% + } + \IfTranslation{Dutch}{#1-plural}{% + }{% + \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}% + } \_@@_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 } +\cs_generate_variant:Nn \_@@_new_theorem:nnnnnnnnn { nVVVVVVVV } % \end{macrocode} % % Then, we define a public command, similar to "\newtheorem", based on @@ -4213,6 +4309,12 @@ Running "make install" installs the files in the local TeX tree. \tl_clear:N \l_@@_newtheorem_german_title_tl \tl_clear:N \l_@@_newtheorem_dutch_title_tl % + \tl_clear:N \l_@@_newtheorem_title_plural_tl + \tl_clear:N \l_@@_newtheorem_french_title_plural_tl + \tl_clear:N \l_@@_newtheorem_english_title_plural_tl + \tl_clear:N \l_@@_newtheorem_german_title_plural_tl + \tl_clear:N \l_@@_newtheorem_dutch_title_plural_tl + % \tl_set:Nn \l_@@_newtheorem_english_title_tl { #2 } @@ -4225,13 +4327,26 @@ Running "make install" installs the files in the local TeX tree. \tl_set:Nf \l_@@_newtheorem_dutch_title_tl { \l_@@_newtheorem_english_title_tl } - \tl_set:Nn \l_@@_newtheorem_style_tl { - theorem + % + \tl_set:Nf \l_@@_newtheorem_english_title_plural_tl { + \l_@@_newtheorem_english_title_tl s } + \tl_set:Nf \l_@@_newtheorem_french_title_plural_tl { + \l_@@_newtheorem_english_title_plural_tl + } + \tl_set:Nf \l_@@_newtheorem_german_title_plural_tl { + \l_@@_newtheorem_english_title_plural_tl + } + \tl_set:Nf \l_@@_newtheorem_dutch_title_plural_tl { + \l_@@_newtheorem_english_title_plural_tl + } + % \_@@_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 { @@ -4250,14 +4365,47 @@ Running "make install" installs the files in the local TeX tree. \l_@@_newtheorem_title_tl } } + % + \tl_if_empty:NT \l_@@_newtheorem_title_plural_tl {% + \tl_if_empty:NTF \l_@@_newtheorem_title_tl {% + \tl_set:Nn \l_@@_newtheorem_title_plural_tl { #2 s } + }{% + \tl_set:Nf \l_@@_newtheorem_title_plural_tl { \l_@@_newtheorem_title_tl s } + } + } + \tl_set:Nf \l_@@_newtheorem_english_title_plural_tl + { + \l_@@_newtheorem_title_plural_tl + } + \tl_set:Nf \l_@@_newtheorem_french_title_plural_tl + { + \l_@@_newtheorem_title_plural_tl + } + \tl_set:Nf \l_@@_newtheorem_german_title_plural_tl + { + \l_@@_newtheorem_title_plural_tl + } + \tl_set:Nf \l_@@_newtheorem_dutch_title_plural_tl + { + \l_@@_newtheorem_title_plural_tl + } + % + % \tl_set:Nn \l_@@_newtheorem_style_tl { + % theorem + % } } % - \_@@_new_theorem:nVVVV + \_@@_new_theorem:nVVVVVVVV {#2} {\l_@@_newtheorem_english_title_tl} {\l_@@_newtheorem_french_title_tl} {\l_@@_newtheorem_german_title_tl} {\l_@@_newtheorem_dutch_title_tl} + {\l_@@_newtheorem_english_title_plural_tl} + {\l_@@_newtheorem_french_title_plural_tl} + {\l_@@_newtheorem_german_title_plural_tl} + {\l_@@_newtheorem_dutch_title_plural_tl} + {\l_@@_newtheorem_style_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 @@ -4296,6 +4444,12 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \clist_put_right:Nn \g_@@_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}{\GetTranslation{#2}}{\GetTranslation{#2-plural}} + } + \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }} } % \end{macrocode} % @@ -4381,14 +4535,15 @@ Running "make install" installs the files in the local TeX tree. } % \end{macrocode} % -% \subsection{Assertions and hypotheses enumerations} +% \subsection{Assertions, hypotheses and conditions enumerations} % % An environment for assertions' and hypotheses enumerations are provided in % order to display them homogeneously: % \begin{macrocode} \clist_set:Nn \l_tmpa_clist {% hypothesis, - assertion% + assertion,% + condition% } \clist_map_inline:Nn \l_tmpa_clist { \newlist{#1}{enumerate}{1} @@ -4422,6 +4577,109 @@ Running "make install" installs the files in the local TeX tree. } } } +% \end{macrocode} +% +% Public command for easily create new environments of enumerations. The mandatory +% argument is the name of the environment which is (a priori) the plural form of +% the name of the enumeration; the optional argument let us specify: +% \begin{itemize} +% \item the singular form if it is not obtained by removing the last letter to the plural +% form, +% \item the plural form if it is not the same as the environment's name, +% \item the label form if it is not the same as the initial of the singular form. +% \end{itemize} +% +% \begin{macrocode} +\cs_new_protected:Npn \_@@_tl_pop_right:n #1 + { + \tl_reverse:f + { + \tl_tail:f + { + \tl_reverse:n { #1 } + } + } + } +\cs_generate_variant:Nn \tl_reverse:n { f } +\cs_generate_variant:Nn \_@@_tl_pop_right:n { v } + +\cs_new_protected:Npn \_@@_start_newenumeration:nn #1 #2 +{ + \keys_define:nn { nwejm/newenumeration } + { + singular .tl_set:c = {l_@@_newenumeration_#2_singular_tl}, + plural .tl_set:c = {l_@@_newenumeration_#2_plural_tl}, + label .tl_set:c = {l_@@_newenumeration_#2_label_tl}, + } + \IfNoValueF {#1} + { + \keys_set:nn { nwejm/newenumeration } { #1 } + } + \tl_if_empty:cT {l_@@_newenumeration_#2_plural_tl} { + \tl_set:cn {l_@@_newenumeration_#2_plural_tl} {#2} + } + \tl_if_empty:cT {l_@@_newenumeration_#2_singular_tl} { + \tl_set:cV {l_@@_newenumeration_#2_singular_tl} {\_@@_tl_pop_right:v {l_@@_newenumeration_#2_plural_tl}} + } + \tl_if_empty:cT {l_@@_newenumeration_#2_label_tl} { + \tl_set:cV {l_@@_newenumeration_#2_label_tl} { + \tl_upper_case:n { + \tl_head:f { + \tl_use:c {l_@@_newenumeration_#2_singular_tl} + } + } + } + } +} +\cs_new_protected:Npn \_@@_end_newenumeration:n #1 +{ + \tl_set:cn {l_@@_newenumeration_#1_reference_tl} { + \textsf{ + \tl_use:c {l_@@_newenumeration_#1_label_tl} + } + } + \setlist[#1]{% + label= + \normalfont + ( + \tl_use:c {l_@@_newenumeration_#1_reference_tl} + $\c_math_subscript_token{\mathsf{\arabic*}}$ + ), + ref= + ( + \tl_use:c {l_@@_newenumeration_#1_reference_tl} + $_\mathsf{\arabic*}$ + ) + } + \crefname{#1i}{ + \tl_use:c {l_@@_newenumeration_#1_singular_tl} + }{% + \tl_use:c {l_@@_newenumeration_#1_plural_tl} + } + \Crefname{#1i}{ + \tl_mixed_case:n{ + \tl_use:c {l_@@_newenumeration_#1_singular_tl} + } + }{% + \tl_mixed_case:n{ + \tl_use:c {l_@@_newenumeration_#1_plural_tl} + } + } +} +% +\NewDocumentCommand{\newenumeration}{O{}m} +{ + \_@@_start_newenumeration:nn {#1}{#2} + \newlist{#2}{enumerate}{1} + \_@@_end_newenumeration:n {#2} +} +\NewDocumentCommand{\renewenumeration}{O{}m} +{ + \_@@_start_newenumeration:nn {#1}{#2} + \renewlist{#2}{enumerate}{1} + \_@@_end_newenumeration:n {#2} +} +% \NewDocumentEnvironment{hypotheses}{} { \begin{hypothesis} @@ -4434,17 +4692,27 @@ Running "make install" installs the files in the local TeX tree. }{ \end{assertion} } +\NewDocumentEnvironment{conditions}{} +{ + \begin{condition} + }{ + \end{condition} +} % \end{macrocode} % % We borrow the following code provided by Enrico Gregorio (see % \url{http://tex.stackexchange.com/q/289913/18401}) in order to improve the -% operators defined with ×\DeclareMathOperator×. +% operators defined with ×\DeclareMathOperator×. We still provide a starred +% version of this command for new operators that should have subscripts and +% superscripts placed in ‘limits’ position above and below. % \begin{macrocode} -\RenewDocumentCommand{\DeclareMathOperator}{mm} +\RenewDocumentCommand{\DeclareMathOperator}{smm} { - \NewDocumentCommand{#1}{} + \NewDocumentCommand{#2}{} { - \operatorname{#2} + \IfBooleanTF {#1} + {\operatorname*{#3}} + {\operatorname{#3}} \peek_after:Nw \@@_opx_check: } } @@ -4708,7 +4976,7 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \tl_new:N \l_@@_given_tl \tl_set:Nn \l_@@_given_tl { - \nonscript\:\delimsize\slash + \nonscript\:\delimsize\vert \allowbreak \nonscript\: \mathopen{} @@ -5497,17 +5765,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \begin{macrocode} -\AtBeginDocument{% - \dim_if_exist:NTF \g_@@_pagegrid_dim {% - \pagegridsetup{% - enable,% - step=\g_@@_pagegrid_dim% - } - }{% - \pagegridsetup{% - disable% - } - } +\AfterEndPreamble{% % \end{macrocode} % % If the cover production is asked, we automatically load some libraries, make @@ -5521,7 +5779,7 @@ Running "make install" installs the files in the local TeX tree. \g_@@_display_inside_backcover_tl \end{document} }{ - \tableofcontents + \tableofcontents } } % \end{macrocode} @@ -5779,6 +6037,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{assertion}{assertion} \ProvideDictTranslation{plural-assertion}{assertions} % +\ProvideDictTranslation{condition}{condition} +\ProvideDictTranslation{plural-condition}{conditions} +% \ProvideDictTranslation{century}{century} \ProvideDictTranslation{before-christ}{BC} % @@ -5841,6 +6102,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{assertion}{assertion} \ProvideDictTranslation{plural-assertion}{assertions} % +\ProvideDictTranslation{condition}{condition} +\ProvideDictTranslation{plural-condition}{conditions} +% \ProvideDictTranslation{century}{si\`{e}cle} \ProvideDictTranslation{before-christ}{av.~J.-C} % @@ -5903,6 +6167,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{assertion}{Behauptung} \ProvideDictTranslation{plural-assertion}{Behauptungen} % +\ProvideDictTranslation{condition}{Voraussetzung} +\ProvideDictTranslation{plural-condition}{Voraussetzungen} +% \ProvideDictTranslation{century}{Jhdt} \ProvideDictTranslation{before-christ}{v.~Chr} % @@ -5965,6 +6232,9 @@ Running "make install" installs the files in the local TeX tree. \ProvideDictTranslation{assertion}{aanname} \ProvideDictTranslation{plural-assertion}{aannames} % +\ProvideDictTranslation{condition}{voorwaarde} +\ProvideDictTranslation{plural-condition}{voorwaarden} +% \ProvideDictTranslation{century}{eeuw} \ProvideDictTranslation{before-christ}{v.Chr} % @@ -6047,8 +6317,7 @@ Running "make install" installs the files in the local TeX tree. \ProvidesFile{nwejm.bbx} [2016/04/01 v 0.1 nwejm bibliographic style (DB)] -\RequireBibliographyStyle{authoryear} - +\RequireBibliographyStyle{authoryear-comp} % \end{macrocode} % % We create a name format that prints the initial(s) of the first name(s) before @@ -6153,6 +6422,13 @@ Running "make install" installs the files in the local TeX tree. \renewcommand*\bibnamedelimd{\addnbspace} % \end{macrocode} % +% A temporary trick in order to avoid inappropriate capitalization of the +% initial after periods abbreviating journals (see +% \url{https://github.com/plk/biblatex/issues/851}). +% \begin{macrocode} +\DeclareFieldFormat{journaltitle}{\mkbibemph{#1\isdot}} +% \end{macrocode} +% % \begin{macrocode} % % \end{macrocode} @@ -6165,7 +6441,7 @@ Running "make install" installs the files in the local TeX tree. \ProvidesFile{nwejm.cbx} [2016/04/01 v 0.1 nwejm citation style (DB)] -\RequireCitationStyle{authoryear} +\RequireCitationStyle{authoryear-comp} \ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page} @@ -6291,7 +6567,15 @@ Running "make install" installs the files in the local TeX tree. } {\usebibmacro{postnote}}% \DeclareMultiCiteCommand{\nwejmfootcites}[\mkbibfootnote]{\nwejmfootcite} -{\addsemicolon\space} +{% + \ifcurrentbaselanguage{french}{% + \parindent=\parindentFFN% + \addtolength{\parindent}{\widthof{\dotFFN\kernFFN}}% + }{% + \parindent=\footnotemargin% + }% + \multicitedelim\newline\indent% +} % \end{macrocode} % % We now declare the definitions for the ×\autocite× and ×\autocites× commands @@ -6299,18 +6583,37 @@ Running "make install" installs the files in the local TeX tree. % \begin{macrocode} \DeclareAutoCiteCommand{nwejmfootcite}{\nwejmfootcite}{\nwejmfootcites} -\DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}} - {\usebibmacro{citeindex}% - \iffirstcitekey - {\setcounter{textcitetotal}{1}} +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} {\stepcounter{textcitetotal}% - \textcitedelim}% - \iffootnote{\usebibmacro{nwejm:cite}}{\printtext[bibhyperref]{\usebibmacro{textcite}}}} - {\ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}} - {\usebibmacro{textcite:postnote}} + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + + % \DeclareCiteCommand{\textcite} + % {\boolfalse{cbx:parens}} + % {\usebibmacro{citeindex}% + % \iffirstcitekey + % {\setcounter{textcitetotal}{1}} + % {\stepcounter{textcitetotal}% + % \textcitedelim}% + % \iffootnote{\usebibmacro{nwejm:cite}}{\printtext[bibhyperref]{\usebibmacro{textcite}}}} + % {\ifbool{cbx:parens} + % {\bibcloseparen\global\boolfalse{cbx:parens}} + % {}} + % {\usebibmacro{textcite:postnote}} % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl index ea422625bfc..a6d8e56b6e3 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-dutch.trsl @@ -30,6 +30,8 @@ \ProvideDictTranslation{plural-hypothesis}{hypotheses} \ProvideDictTranslation{assertion}{aanname} \ProvideDictTranslation{plural-assertion}{aannames} +\ProvideDictTranslation{condition}{voorwaarde} +\ProvideDictTranslation{plural-condition}{voorwaarden} \ProvideDictTranslation{century}{eeuw} \ProvideDictTranslation{before-christ}{v.Chr} \ProvideDictTranslation{Acknowledgments}{Dankwoord} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl index 3eae7b8fc2a..3008244591a 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-english.trsl @@ -30,6 +30,8 @@ \ProvideDictTranslation{plural-hypothesis}{hypotheses} \ProvideDictTranslation{assertion}{assertion} \ProvideDictTranslation{plural-assertion}{assertions} +\ProvideDictTranslation{condition}{condition} +\ProvideDictTranslation{plural-condition}{conditions} \ProvideDictTranslation{century}{century} \ProvideDictTranslation{before-christ}{BC} \ProvideDictTranslation{Acknowledgments}{Acknowledgments} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl index e940fea43ba..54cfcc76ec7 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-french.trsl @@ -30,6 +30,8 @@ \ProvideDictTranslation{plural-hypothesis}{hypoth\`{e}ses} \ProvideDictTranslation{assertion}{assertion} \ProvideDictTranslation{plural-assertion}{assertions} +\ProvideDictTranslation{condition}{condition} +\ProvideDictTranslation{plural-condition}{conditions} \ProvideDictTranslation{century}{si\`{e}cle} \ProvideDictTranslation{before-christ}{av.~J.-C} \ProvideDictTranslation{Acknowledgments}{Remerciements} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl b/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl index 1cfd8add9b1..0b492cb0424 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm-german.trsl @@ -30,6 +30,8 @@ \ProvideDictTranslation{plural-hypothesis}{Hypothesen} \ProvideDictTranslation{assertion}{Behauptung} \ProvideDictTranslation{plural-assertion}{Behauptungen} +\ProvideDictTranslation{condition}{Voraussetzung} +\ProvideDictTranslation{plural-condition}{Voraussetzungen} \ProvideDictTranslation{century}{Jhdt} \ProvideDictTranslation{before-christ}{v.~Chr} \ProvideDictTranslation{Acknowledgments}{Bestätigungen} diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx index 82f0fe34099..3bf9f125f10 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.bbx @@ -15,8 +15,7 @@ \ProvidesFile{nwejm.bbx} [2016/04/01 v 0.1 nwejm bibliographic style (DB)] -\RequireBibliographyStyle{authoryear} - +\RequireBibliographyStyle{authoryear-comp} \DeclareNameFormat{giveninits-last}{% \nameparts{#1} \usebibmacro{name:given-family} @@ -95,8 +94,9 @@ } \renewcommand*\bibnamedelimc{\addnbspace} \renewcommand*\bibnamedelimd{\addnbspace} +\DeclareFieldFormat{journaltitle}{\mkbibemph{#1\isdot}} %% -%% Copyright (C) 2015-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% 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 bcedf42dbeb..431ce78aa79 100644 --- a/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx +++ b/Master/texmf-dist/tex/latex/nwejm/nwejm.cbx @@ -15,7 +15,7 @@ \ProvidesFile{nwejm.cbx} [2016/04/01 v 0.1 nwejm citation style (DB)] -\RequireCitationStyle{authoryear} +\RequireCitationStyle{authoryear-comp} \ExecuteBibliographyOptions{giveninits,ibidtracker=constrict,pagetracker=page} @@ -101,24 +101,51 @@ } {\usebibmacro{postnote}}% \DeclareMultiCiteCommand{\nwejmfootcites}[\mkbibfootnote]{\nwejmfootcite} -{\addsemicolon\space} +{% + \ifcurrentbaselanguage{french}{% + \parindent=\parindentFFN% + \addtolength{\parindent}{\widthof{\dotFFN\kernFFN}}% + }{% + \parindent=\footnotemargin% + }% + \multicitedelim\newline\indent% +} \DeclareAutoCiteCommand{nwejmfootcite}{\nwejmfootcite}{\nwejmfootcites} -\DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}} - {\usebibmacro{citeindex}% - \iffirstcitekey - {\setcounter{textcitetotal}{1}} +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} {\stepcounter{textcitetotal}% - \textcitedelim}% - \iffootnote{\usebibmacro{nwejm:cite}}{\printtext[bibhyperref]{\usebibmacro{textcite}}}} - {\ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}} - {\usebibmacro{textcite:postnote}} + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + + % \DeclareCiteCommand{\textcite} + % {\boolfalse{cbx:parens}} + % {\usebibmacro{citeindex}% + % \iffirstcitekey + % {\setcounter{textcitetotal}{1}} + % {\stepcounter{textcitetotal}% + % \textcitedelim}% + % \iffootnote{\usebibmacro{nwejm:cite}}{\printtext[bibhyperref]{\usebibmacro{textcite}}}} + % {\ifbool{cbx:parens} + % {\bibcloseparen\global\boolfalse{cbx:parens}} + % {}} + % {\usebibmacro{textcite:postnote}} \ExecuteBibliographyOptions{autocite=nwejmfootcite} %% -%% Copyright (C) 2015-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% 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 9ea63768715..5e1af9fd9fd 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} - {2018/04/07} - {0.98e} + {2019/03/18} + {0.98f} { Class for the journal "North-Western European Journal of Mathematics". } @@ -75,7 +75,6 @@ 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.}% -\dim_const:Nn \c__nwejm_pagegrid_dim { 1mm} \bool_new:N \g__nwejm_for_authors_bool \bool_new:N \g__nwejm_for_printer_bool \bool_new:N \g__nwejm_cover_bool @@ -84,8 +83,6 @@ \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}, output .choice:, output / cover .code:n = {% \bool_gset_true:N \g__nwejm_for_printer_bool% @@ -182,7 +179,6 @@ }{ \RequirePackage[group=false,subpreambles,sort]{standalone}% } -\RequirePackage[foreground]{pagegrid}% \RequirePackage{datatool}% \RequirePackage{placeins}% \RequirePackage{xspace}% @@ -209,8 +205,8 @@ \RequirePackage{footnote}% \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% -\AtBeginDocument{% +\RequirePackage[pdfencoding=unicode,final]{hyperref}% +\AtEndPreamble{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} @@ -795,6 +791,17 @@ title / german .value_required:n = true, title / dutch .value_required:n = true, % + title-plural .tl_set:N = \l__nwejm_newtheorem_title_plural_tl, + title-plural / french .tl_set:N = \l__nwejm_newtheorem_french_title_plural_tl, + title-plural / english .tl_set:N = \l__nwejm_newtheorem_english_title_plural_tl, + title-plural / german .tl_set:N = \l__nwejm_newtheorem_german_title_plural_tl, + title-plural / dutch .tl_set:N = \l__nwejm_newtheorem_dutch_title_plural_tl, + title-plural .value_required:n = true, + title-plural / french .value_required:n = true, + title-plural / english .value_required:n = true, + title-plural / german .value_required:n = true, + title-plural / dutch .value_required:n = true, + % style .choice:, style / theorem .code:n = {\__nwejm_theorem_style:n {theorem}}, style / definition .code:n = {\__nwejm_theorem_style:n {definition}}, @@ -1300,6 +1307,8 @@ \msg_error:nn{nwejm}{Wrong~issue's~main~file~name!} } } +\NewDocumentCommand \fixpagenumber { m } { +} \NewDocumentCommand \editorinchief {mmmm} { \__nwejm_people:nnnnn {#1}{#2}{#3}{#4}{editorinchief} @@ -1521,21 +1530,72 @@ } \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection - \tl_if_eq:nnTF { #1 } { german } {% - \selectlanguage{ngerman} - }{ - \tl_if_eq:nnTF { #1 } { french } {% + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} + \renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} + \StandardFootnotes + \str_case:nn {#1} { + {english} { + \selectlanguage{english} + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% + } + {german} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {ngerman} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {french} { \selectlanguage{french} + \FrenchFootnotes \g__nwejm_french_crefname_tl - }{ - \selectlanguage{#1} + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}% + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{} + \renewcommand*{\glsupacrpluralsuffix}{} + } + {dutch} { + \selectlanguage{dutch} + \renewcommand*{\glossaryname}{Woordenlijst}% + \renewcommand*{\acronymname}{Acroniemen}% + \renewcommand*{\entryname}{Benaming}% + \renewcommand*{\descriptionname}{Beschrijving}% + \renewcommand*{\symbolname}{Symbool}% + \renewcommand*{\pagelistname}{Pagina's}% + \renewcommand*{\glssymbolsgroupname}{Symbolen}% + \renewcommand*{\glsnumbersgroupname}{Cijfers}% } }% - \tl_if_eq:nnTF { #1 } { french } {% - \FrenchFootnotes - }{% - \StandardFootnotes - } \bool_gset_false:N \g__nwejm_gradient_nabla_bool \bool_gset_false:N \g__nwejm_gradient_nabla_control_bool \bool_gset_false:N \g__nwejm_grad_used_bool @@ -1570,7 +1630,6 @@ \iow_now:Nx \g__nwejm_bib_out_iow {% @periodical{\c__nwejm_issue_bib_key_tl,\iow_newline: issuetitle = {\exp_not:f\c__nwejm_journal_title_string_tl},\iow_newline: - date = {\g__nwejm_bib_issue_date_tl},\iow_newline: number = \int_use:N \g__nwejm_issue_number_int,\iow_newline: % issn = {\l__nwejm_journal_issn_tl},\iow_newline: options = {skipbib}\iow_newline: @@ -2133,7 +2192,7 @@ } } \cs_set_eq:NN \__nwejm_orig_newtheorem \newtheorem -\cs_new_protected:Nn \__nwejm_new_theorem:nnnnn +\cs_new_protected:Nn \__nwejm_new_theorem:nnnnnnnnn { \IfTranslation{English}{#1}{% }{% @@ -2151,12 +2210,30 @@ }{% \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}% } + % + \IfTranslation{English}{#1-plural}{% + }{% + \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}% + } + \IfTranslation{French}{#1-plural}{% + }{% + \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}% + } + \IfTranslation{German}{#1-plural}{% + }{% + \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}% + } + \IfTranslation{Dutch}{#1-plural}{% + }{% + \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}% + } \__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 } +\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV } \RenewDocumentCommand \newtheorem { O{} m } { \AtBeginDocument{ @@ -2167,6 +2244,12 @@ \tl_clear:N \l__nwejm_newtheorem_german_title_tl \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl % + \tl_clear:N \l__nwejm_newtheorem_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_french_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_english_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_german_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_dutch_title_plural_tl + % \tl_set:Nn \l__nwejm_newtheorem_english_title_tl { #2 } @@ -2179,13 +2262,26 @@ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl { \l__nwejm_newtheorem_english_title_tl } - \tl_set:Nn \l__nwejm_newtheorem_style_tl { - theorem + % + \tl_set:Nf \l__nwejm_newtheorem_english_title_plural_tl { + \l__nwejm_newtheorem_english_title_tl s + } + \tl_set:Nf \l__nwejm_newtheorem_french_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl } + \tl_set:Nf \l__nwejm_newtheorem_german_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_dutch_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl + } + % \__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 { @@ -2204,14 +2300,47 @@ \l__nwejm_newtheorem_title_tl } } + % + \tl_if_empty:NT \l__nwejm_newtheorem_title_plural_tl {% + \tl_if_empty:NTF \l__nwejm_newtheorem_title_tl {% + \tl_set:Nn \l__nwejm_newtheorem_title_plural_tl { #2 s } + }{% + \tl_set:Nf \l__nwejm_newtheorem_title_plural_tl { \l__nwejm_newtheorem_title_tl s } + } + } + \tl_set:Nf \l__nwejm_newtheorem_english_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_french_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_german_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_dutch_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + % + % \tl_set:Nn \l__nwejm_newtheorem_style_tl { + % theorem + % } } % - \__nwejm_new_theorem:nVVVV + \__nwejm_new_theorem:nVVVVVVVV {#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} + {\l__nwejm_newtheorem_english_title_plural_tl} + {\l__nwejm_newtheorem_french_title_plural_tl} + {\l__nwejm_newtheorem_german_title_plural_tl} + {\l__nwejm_newtheorem_dutch_title_plural_tl} + {\l__nwejm_newtheorem_style_tl} \makesavenoteenv{#2} \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} { \ifcsmacro{#2*}{% @@ -2236,6 +2365,12 @@ } \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}{\GetTranslation{#2}}{\GetTranslation{#2-plural}} + } + \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }} } \newtheorem{theorem} \newtheorem{corollary} @@ -2312,7 +2447,8 @@ } \clist_set:Nn \l_tmpa_clist {% hypothesis, - assertion% + assertion,% + condition% } \clist_map_inline:Nn \l_tmpa_clist { \newlist{#1}{enumerate}{1} @@ -2346,6 +2482,94 @@ } } } +\cs_new_protected:Npn \__nwejm_tl_pop_right:n #1 + { + \tl_reverse:f + { + \tl_tail:f + { + \tl_reverse:n { #1 } + } + } + } +\cs_generate_variant:Nn \tl_reverse:n { f } +\cs_generate_variant:Nn \__nwejm_tl_pop_right:n { v } + +\cs_new_protected:Npn \__nwejm_start_newenumeration:nn #1 #2 +{ + \keys_define:nn { nwejm/newenumeration } + { + singular .tl_set:c = {l__nwejm_newenumeration_#2_singular_tl}, + plural .tl_set:c = {l__nwejm_newenumeration_#2_plural_tl}, + label .tl_set:c = {l__nwejm_newenumeration_#2_label_tl}, + } + \IfNoValueF {#1} + { + \keys_set:nn { nwejm/newenumeration } { #1 } + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_plural_tl} { + \tl_set:cn {l__nwejm_newenumeration_#2_plural_tl} {#2} + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_singular_tl} { + \tl_set:cV {l__nwejm_newenumeration_#2_singular_tl} {\__nwejm_tl_pop_right:v {l__nwejm_newenumeration_#2_plural_tl}} + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_label_tl} { + \tl_set:cV {l__nwejm_newenumeration_#2_label_tl} { + \tl_upper_case:n { + \tl_head:f { + \tl_use:c {l__nwejm_newenumeration_#2_singular_tl} + } + } + } + } +} +\cs_new_protected:Npn \__nwejm_end_newenumeration:n #1 +{ + \tl_set:cn {l__nwejm_newenumeration_#1_reference_tl} { + \textsf{ + \tl_use:c {l__nwejm_newenumeration_#1_label_tl} + } + } + \setlist[#1]{% + label= + \normalfont + ( + \tl_use:c {l__nwejm_newenumeration_#1_reference_tl} + $\c_math_subscript_token{\mathsf{\arabic*}}$ + ), + ref= + ( + \tl_use:c {l__nwejm_newenumeration_#1_reference_tl} + $_\mathsf{\arabic*}$ + ) + } + \crefname{#1i}{ + \tl_use:c {l__nwejm_newenumeration_#1_singular_tl} + }{% + \tl_use:c {l__nwejm_newenumeration_#1_plural_tl} + } + \Crefname{#1i}{ + \tl_mixed_case:n{ + \tl_use:c {l__nwejm_newenumeration_#1_singular_tl} + } + }{% + \tl_mixed_case:n{ + \tl_use:c {l__nwejm_newenumeration_#1_plural_tl} + } + } +} +\NewDocumentCommand{\newenumeration}{O{}m} +{ + \__nwejm_start_newenumeration:nn {#1}{#2} + \newlist{#2}{enumerate}{1} + \__nwejm_end_newenumeration:n {#2} +} +\NewDocumentCommand{\renewenumeration}{O{}m} +{ + \__nwejm_start_newenumeration:nn {#1}{#2} + \renewlist{#2}{enumerate}{1} + \__nwejm_end_newenumeration:n {#2} +} \NewDocumentEnvironment{hypotheses}{} { \begin{hypothesis} @@ -2358,11 +2582,19 @@ }{ \end{assertion} } -\RenewDocumentCommand{\DeclareMathOperator}{mm} +\NewDocumentEnvironment{conditions}{} +{ + \begin{condition} + }{ + \end{condition} +} +\RenewDocumentCommand{\DeclareMathOperator}{smm} { - \NewDocumentCommand{#1}{} + \NewDocumentCommand{#2}{} { - \operatorname{#2} + \IfBooleanTF {#1} + {\operatorname*{#3}} + {\operatorname{#3}} \peek_after:Nw \__nwejm_opx_check: } } @@ -2581,7 +2813,7 @@ \cs_set_eq:NN \emptyset \varnothing \tl_new:N \l__nwejm_given_tl \tl_set:Nn \l__nwejm_given_tl { - \nonscript\:\delimsize\slash + \nonscript\:\delimsize\vert \allowbreak \nonscript\: \mathopen{} @@ -3072,17 +3304,7 @@ } \xspace } -\AtBeginDocument{% - \dim_if_exist:NTF \g__nwejm_pagegrid_dim {% - \pagegridsetup{% - enable,% - step=\g__nwejm_pagegrid_dim% - } - }{% - \pagegridsetup{% - disable% - } - } +\AfterEndPreamble{% \bool_if:NTF {\g__nwejm_cover_bool} { \g__nwejm_display_frontcover_tl \g__nwejm_display_backcover_tl @@ -3090,7 +3312,7 @@ \g__nwejm_display_inside_backcover_tl \end{document} }{ - \tableofcontents + \tableofcontents } } \AfterEndPreamble{% @@ -3108,7 +3330,7 @@ } \ExplSyntaxOff %% -%% Copyright (C) 2015-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% 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 08a5934249f..607ec309228 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-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% 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 22649bb4c72..2650a70dee5 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-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% 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 be444ea3ccf..509a7234fce 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} - {2018/04/07} - {0.98e} + {2019/03/18} + {0.98f} { Class for the journal "North-Western European Journal of Mathematics". } @@ -182,8 +182,8 @@ \RequirePackage{footnote}% \RequirePackage[backend=biber,style=nwejm]{biblatex}% \ExecuteBibliographyOptions{defernumbers=true,dashed=false,uniquename=init,backref,safeinputenc} -\RequirePackage[hyperfootnotes=false,pdfencoding=unicode,final]{hyperref}% -\AtBeginDocument{% +\RequirePackage[pdfencoding=unicode,final]{hyperref}% +\AtEndPreamble{% \hypersetup{hidelinks,hypertexnames=false,breaklinks}% }% \RequirePackage[all]{hypcap} @@ -408,7 +408,7 @@ \graphicspath{{\c__nwejm_issue_images_path_string_tl//}{../\c__nwejm_issue_images_path_string_tl//}} % \glsdisablehyper } - \AtBeginDocument{\g__nwejm_mainmatter_switch_tl} + \AfterEndPreamble{\g__nwejm_mainmatter_switch_tl} \int_new:N \g__nwejm_issue_number_int \int_new:N \g__nwejm_issue_month_int \int_new:N \g__nwejm_issue_year_int @@ -487,6 +487,17 @@ title / german .value_required:n = true, title / dutch .value_required:n = true, % + title-plural .tl_set:N = \l__nwejm_newtheorem_title_plural_tl, + title-plural / french .tl_set:N = \l__nwejm_newtheorem_french_title_plural_tl, + title-plural / english .tl_set:N = \l__nwejm_newtheorem_english_title_plural_tl, + title-plural / german .tl_set:N = \l__nwejm_newtheorem_german_title_plural_tl, + title-plural / dutch .tl_set:N = \l__nwejm_newtheorem_dutch_title_plural_tl, + title-plural .value_required:n = true, + title-plural / french .value_required:n = true, + title-plural / english .value_required:n = true, + title-plural / german .value_required:n = true, + title-plural / dutch .value_required:n = true, + % style .choice:, style / theorem .code:n = {\__nwejm_theorem_style:n {theorem}}, style / definition .code:n = {\__nwejm_theorem_style:n {definition}}, @@ -611,7 +622,10 @@ \file_if_exist:nT { \c__nwejm_main_file_name_tl.aux } {\externaldocument[__nwejm-]{\c__nwejm_main_file_name_tl} - \AtBeginDocument{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} + \AfterEndPreamble{\setcounter{page}{\number\numexpr\getpagerefnumber{__nwejm-\currfilebase}}} +} +\NewDocumentCommand \fixpagenumber { m } { +\setcounter{page}{#1} } \vref@addto\extrasfrench{% \def\reftextfaceafter {page~\reftextvario{ci-contre}{suivante}}% @@ -725,21 +739,72 @@ } \NewDocumentCommand \inputarticle { O{english} m } {% \newrefsection - \tl_if_eq:nnTF { #1 } { german } {% - \selectlanguage{ngerman} - }{ - \tl_if_eq:nnTF { #1 } { french } {% + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} + \renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} + \StandardFootnotes + \str_case:nn {#1} { + {english} { + \selectlanguage{english} + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% + } + {german} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {ngerman} { + \selectlanguage{ngerman} + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}% + } + {french} { \selectlanguage{french} + \FrenchFootnotes \g__nwejm_french_crefname_tl - }{ - \selectlanguage{#1} + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}% + \renewcommand*{\glspluralsuffix}{s} + \renewcommand*{\glsacrpluralsuffix}{} + \renewcommand*{\glsupacrpluralsuffix}{} + } + {dutch} { + \selectlanguage{dutch} + \renewcommand*{\glossaryname}{Woordenlijst}% + \renewcommand*{\acronymname}{Acroniemen}% + \renewcommand*{\entryname}{Benaming}% + \renewcommand*{\descriptionname}{Beschrijving}% + \renewcommand*{\symbolname}{Symbool}% + \renewcommand*{\pagelistname}{Pagina's}% + \renewcommand*{\glssymbolsgroupname}{Symbolen}% + \renewcommand*{\glsnumbersgroupname}{Cijfers}% } }% - \tl_if_eq:nnTF { #1 } { french } {% - \FrenchFootnotes - }{% - \StandardFootnotes - } \inputfrom{./}{#2} \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist { footnote, @@ -771,7 +836,6 @@ \iow_now:Nx \g__nwejm_bib_out_iow {% @periodical{\c__nwejm_issue_bib_key_tl,\iow_newline: issuetitle = {\exp_not:f\c__nwejm_journal_title_string_tl},\iow_newline: - date = {\g__nwejm_bib_issue_date_tl},\iow_newline: number = \int_use:N \g__nwejm_issue_number_int,\iow_newline: % issn = {\l__nwejm_journal_issn_tl},\iow_newline: options = {skipbib}\iow_newline: @@ -1335,7 +1399,7 @@ } } \cs_set_eq:NN \__nwejm_orig_newtheorem \newtheorem -\cs_new_protected:Nn \__nwejm_new_theorem:nnnnn +\cs_new_protected:Nn \__nwejm_new_theorem:nnnnnnnnn { \IfTranslation{English}{#1}{% }{% @@ -1353,12 +1417,30 @@ }{% \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}% } + % + \IfTranslation{English}{#1-plural}{% + }{% + \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}% + } + \IfTranslation{French}{#1-plural}{% + }{% + \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}% + } + \IfTranslation{German}{#1-plural}{% + }{% + \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}% + } + \IfTranslation{Dutch}{#1-plural}{% + }{% + \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}% + } \__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 } +\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnnnnnn { nVVVVVVVV } \RenewDocumentCommand \newtheorem { O{} m } { \AtBeginDocument{ @@ -1369,6 +1451,12 @@ \tl_clear:N \l__nwejm_newtheorem_german_title_tl \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl % + \tl_clear:N \l__nwejm_newtheorem_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_french_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_english_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_german_title_plural_tl + \tl_clear:N \l__nwejm_newtheorem_dutch_title_plural_tl + % \tl_set:Nn \l__nwejm_newtheorem_english_title_tl { #2 } @@ -1381,13 +1469,26 @@ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl { \l__nwejm_newtheorem_english_title_tl } - \tl_set:Nn \l__nwejm_newtheorem_style_tl { - theorem + % + \tl_set:Nf \l__nwejm_newtheorem_english_title_plural_tl { + \l__nwejm_newtheorem_english_title_tl s } + \tl_set:Nf \l__nwejm_newtheorem_french_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_german_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_dutch_title_plural_tl { + \l__nwejm_newtheorem_english_title_plural_tl + } + % \__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 { @@ -1406,14 +1507,47 @@ \l__nwejm_newtheorem_title_tl } } + % + \tl_if_empty:NT \l__nwejm_newtheorem_title_plural_tl {% + \tl_if_empty:NTF \l__nwejm_newtheorem_title_tl {% + \tl_set:Nn \l__nwejm_newtheorem_title_plural_tl { #2 s } + }{% + \tl_set:Nf \l__nwejm_newtheorem_title_plural_tl { \l__nwejm_newtheorem_title_tl s } + } + } + \tl_set:Nf \l__nwejm_newtheorem_english_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_french_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_german_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + \tl_set:Nf \l__nwejm_newtheorem_dutch_title_plural_tl + { + \l__nwejm_newtheorem_title_plural_tl + } + % + % \tl_set:Nn \l__nwejm_newtheorem_style_tl { + % theorem + % } } % - \__nwejm_new_theorem:nVVVV + \__nwejm_new_theorem:nVVVVVVVV {#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} + {\l__nwejm_newtheorem_english_title_plural_tl} + {\l__nwejm_newtheorem_french_title_plural_tl} + {\l__nwejm_newtheorem_german_title_plural_tl} + {\l__nwejm_newtheorem_dutch_title_plural_tl} + {\l__nwejm_newtheorem_style_tl} \makesavenoteenv{#2} \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} { \ifcsmacro{#2*}{% @@ -1438,6 +1572,12 @@ } \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}{\GetTranslation{#2}}{\GetTranslation{#2-plural}} + } + \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }} } \newtheorem{theorem} \newtheorem{corollary} @@ -1514,7 +1654,8 @@ } \clist_set:Nn \l_tmpa_clist {% hypothesis, - assertion% + assertion,% + condition% } \clist_map_inline:Nn \l_tmpa_clist { \newlist{#1}{enumerate}{1} @@ -1548,6 +1689,94 @@ } } } +\cs_new_protected:Npn \__nwejm_tl_pop_right:n #1 + { + \tl_reverse:f + { + \tl_tail:f + { + \tl_reverse:n { #1 } + } + } + } +\cs_generate_variant:Nn \tl_reverse:n { f } +\cs_generate_variant:Nn \__nwejm_tl_pop_right:n { v } + +\cs_new_protected:Npn \__nwejm_start_newenumeration:nn #1 #2 +{ + \keys_define:nn { nwejm/newenumeration } + { + singular .tl_set:c = {l__nwejm_newenumeration_#2_singular_tl}, + plural .tl_set:c = {l__nwejm_newenumeration_#2_plural_tl}, + label .tl_set:c = {l__nwejm_newenumeration_#2_label_tl}, + } + \IfNoValueF {#1} + { + \keys_set:nn { nwejm/newenumeration } { #1 } + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_plural_tl} { + \tl_set:cn {l__nwejm_newenumeration_#2_plural_tl} {#2} + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_singular_tl} { + \tl_set:cV {l__nwejm_newenumeration_#2_singular_tl} {\__nwejm_tl_pop_right:v {l__nwejm_newenumeration_#2_plural_tl}} + } + \tl_if_empty:cT {l__nwejm_newenumeration_#2_label_tl} { + \tl_set:cV {l__nwejm_newenumeration_#2_label_tl} { + \tl_upper_case:n { + \tl_head:f { + \tl_use:c {l__nwejm_newenumeration_#2_singular_tl} + } + } + } + } +} +\cs_new_protected:Npn \__nwejm_end_newenumeration:n #1 +{ + \tl_set:cn {l__nwejm_newenumeration_#1_reference_tl} { + \textsf{ + \tl_use:c {l__nwejm_newenumeration_#1_label_tl} + } + } + \setlist[#1]{% + label= + \normalfont + ( + \tl_use:c {l__nwejm_newenumeration_#1_reference_tl} + $\c_math_subscript_token{\mathsf{\arabic*}}$ + ), + ref= + ( + \tl_use:c {l__nwejm_newenumeration_#1_reference_tl} + $_\mathsf{\arabic*}$ + ) + } + \crefname{#1i}{ + \tl_use:c {l__nwejm_newenumeration_#1_singular_tl} + }{% + \tl_use:c {l__nwejm_newenumeration_#1_plural_tl} + } + \Crefname{#1i}{ + \tl_mixed_case:n{ + \tl_use:c {l__nwejm_newenumeration_#1_singular_tl} + } + }{% + \tl_mixed_case:n{ + \tl_use:c {l__nwejm_newenumeration_#1_plural_tl} + } + } +} +\NewDocumentCommand{\newenumeration}{O{}m} +{ + \__nwejm_start_newenumeration:nn {#1}{#2} + \newlist{#2}{enumerate}{1} + \__nwejm_end_newenumeration:n {#2} +} +\NewDocumentCommand{\renewenumeration}{O{}m} +{ + \__nwejm_start_newenumeration:nn {#1}{#2} + \renewlist{#2}{enumerate}{1} + \__nwejm_end_newenumeration:n {#2} +} \NewDocumentEnvironment{hypotheses}{} { \begin{hypothesis} @@ -1560,11 +1789,19 @@ }{ \end{assertion} } -\RenewDocumentCommand{\DeclareMathOperator}{mm} +\NewDocumentEnvironment{conditions}{} { - \NewDocumentCommand{#1}{} + \begin{condition} + }{ + \end{condition} +} +\RenewDocumentCommand{\DeclareMathOperator}{smm} +{ + \NewDocumentCommand{#2}{} { - \operatorname{#2} + \IfBooleanTF {#1} + {\operatorname*{#3}} + {\operatorname{#3}} \peek_after:Nw \__nwejm_opx_check: } } @@ -1783,7 +2020,7 @@ \cs_set_eq:NN \emptyset \varnothing \tl_new:N \l__nwejm_given_tl \tl_set:Nn \l__nwejm_given_tl { - \nonscript\:\delimsize\slash + \nonscript\:\delimsize\vert \allowbreak \nonscript\: \mathopen{} @@ -2297,7 +2534,7 @@ } \ExplSyntaxOff %% -%% Copyright (C) 2015-2018 by Denis Bitouze +%% Copyright (C) 2015-2019 by Denis Bitouze %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either -- cgit v1.2.3